Author: jlboudart
Date: Fri Nov 15 21:49:34 2013
New Revision: 1542411
URL: http://svn.apache.org/r1542411
Log:
rename configureProject method into configureBuildLogger
Modified:
ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/AntTaskBaseTest.java
ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/LoadModuleTest.java
ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/PropertyTaskTest.java
ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/SubModuleTest.java
Modified:
ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/AntTaskBaseTest.java
URL:
http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/AntTaskBaseTest.java?rev=1542411&r1=1542410&r2=1542411&view=diff
==============================================================================
---
ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/AntTaskBaseTest.java
(original)
+++
ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/AntTaskBaseTest.java
Fri Nov 15 21:49:34 2013
@@ -25,13 +25,13 @@ import org.apache.tools.ant.Project;
public class AntTaskBaseTest {
- private AntTestListener antTestListener;
+ protected AntTestListener antTestListener;
public Project configureProject(Project project) {
- return configureProject(project, Project.MSG_INFO);
+ return configureBuildLogger(project, Project.MSG_INFO);
}
- public Project configureProject(Project project, int logLevel) {
+ public Project configureBuildLogger(Project project, int logLevel) {
antTestListener = new AntTestListener(logLevel);
project.addBuildListener(antTestListener);
return project;
Modified:
ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/LoadModuleTest.java
URL:
http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/LoadModuleTest.java?rev=1542411&r1=1542410&r2=1542411&view=diff
==============================================================================
---
ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/LoadModuleTest.java
(original)
+++
ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/LoadModuleTest.java
Fri Nov 15 21:49:34 2013
@@ -97,7 +97,7 @@ public class LoadModuleTest extends AntT
@Test
public void shouldLoadModuleWithCustomBuildModule() throws
URISyntaxException {
Project project = loadModule.getProject();
- configureProject(project, Project.MSG_DEBUG);
+ configureBuildLogger(project, Project.MSG_DEBUG);
File moduleIvyFile = new
File(this.getClass().getResource("simple/module.ivy").toURI());
loadModule.setBuildModule(moduleIvyFile);
loadModule.execute();
@@ -134,7 +134,7 @@ public class LoadModuleTest extends AntT
@Test
public void shouldNotFailWithNonExistingBuildModule() throws
URISyntaxException {
Project project = loadModule.getProject();
- configureProject(project, Project.MSG_DEBUG);
+ configureBuildLogger(project, Project.MSG_DEBUG);
File moduleIvyFile = new File("missingmodule.ivy");
loadModule.setBuildModule(moduleIvyFile);
loadModule.execute();
@@ -166,7 +166,7 @@ public class LoadModuleTest extends AntT
@Test
public void shouldLoadModuleWithCustomBuildFile() throws
URISyntaxException {
Project project = loadModule.getProject();
- configureProject(project, Project.MSG_DEBUG);
+ configureBuildLogger(project, Project.MSG_DEBUG);
File moduleAntFile = new
File(this.getClass().getResource("simple/module.ant").toURI());
loadModule.setBuildFile(moduleAntFile);
loadModule.execute();
@@ -188,7 +188,7 @@ public class LoadModuleTest extends AntT
@Test
public void shouldNotFailWithNonExistingBuildFile() throws
URISyntaxException {
Project project = loadModule.getProject();
- configureProject(project, Project.MSG_DEBUG);
+ configureBuildLogger(project, Project.MSG_DEBUG);
File moduleAntFile = new File("missingmodule.ant");
loadModule.setBuildFile(moduleAntFile);
loadModule.execute();
@@ -217,7 +217,7 @@ public class LoadModuleTest extends AntT
@Test
public void shouldNotFailWithNoArgument() throws URISyntaxException {
Project project = loadModule.getProject();
- configureProject(project, Project.MSG_DEBUG);
+ configureBuildLogger(project, Project.MSG_DEBUG);
loadModule.execute();
assertLogNotContaining("Loading build module :");
@@ -235,7 +235,7 @@ public class LoadModuleTest extends AntT
@Test
public void shouldConfigureBuildScopeRepository() throws
URISyntaxException {
Project project = loadModule.getProject();
- configureProject(project, Project.MSG_DEBUG);
+ configureBuildLogger(project, Project.MSG_DEBUG);
loadModule.setUseBuildRepository(true);
loadModule.execute();
Modified:
ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/PropertyTaskTest.java
URL:
http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/PropertyTaskTest.java?rev=1542411&r1=1542410&r2=1542411&view=diff
==============================================================================
---
ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/PropertyTaskTest.java
(original)
+++
ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/PropertyTaskTest.java
Fri Nov 15 21:49:34 2013
@@ -50,7 +50,7 @@ public class PropertyTaskTest extends An
@Test
public void shouldNotCreatePropertyWhenConfigurationDoesntMatch() {
- configureProject(propertyTask.getProject(), Project.MSG_DEBUG);
+ configureBuildLogger(propertyTask.getProject(), Project.MSG_DEBUG);
propertyTask.getProject().setProperty(EasyAntMagicNames.AVAILABLE_BUILD_CONFIGURATIONS,
"aBuildConfNotActive");
@@ -65,7 +65,7 @@ public class PropertyTaskTest extends An
@Test
public void shouldCreatePropertyWhenConfigurationMatch() {
- configureProject(propertyTask.getProject(), Project.MSG_DEBUG);
+ configureBuildLogger(propertyTask.getProject(), Project.MSG_DEBUG);
propertyTask.getProject().setProperty(EasyAntMagicNames.AVAILABLE_BUILD_CONFIGURATIONS,
"aBuildConfActive");
propertyTask.getProject().setProperty(EasyAntMagicNames.MAIN_CONFS,
"aBuildConfActive");
Modified:
ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/SubModuleTest.java
URL:
http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/SubModuleTest.java?rev=1542411&r1=1542410&r2=1542411&view=diff
==============================================================================
---
ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/SubModuleTest.java
(original)
+++
ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/SubModuleTest.java
Fri Nov 15 21:49:34 2013
@@ -84,7 +84,7 @@ public class SubModuleTest extends AntTa
@Test
public void shouldNotFailIfBuildpathAttributeIsSet() {
- configureProject(submodule.getProject(), Project.MSG_WARN);
+ configureBuildLogger(submodule.getProject(), Project.MSG_WARN);
Path path = new Path(submodule.getProject());
path.createPath();
@@ -100,7 +100,7 @@ public class SubModuleTest extends AntTa
expectedException.expect(BuildException.class);
expectedException.expectMessage("Invalid file:");
- configureProject(submodule.getProject(), Project.MSG_WARN);
+ configureBuildLogger(submodule.getProject(), Project.MSG_WARN);
Path path = new Path(submodule.getProject());
File file2 = new File("anotherfile");
@@ -114,7 +114,7 @@ public class SubModuleTest extends AntTa
@Test
public void shouldRunEvenIfNoTargetsAreSet() throws URISyntaxException {
- configureProject(submodule.getProject(), Project.MSG_DEBUG);
+ configureBuildLogger(submodule.getProject(), Project.MSG_DEBUG);
Path path = new Path(submodule.getProject());
FileSet fs = new FileSet();
@@ -134,7 +134,7 @@ public class SubModuleTest extends AntTa
@Test
public void shouldRunEvenIfTargetDoesntExistsInSubModules() throws
URISyntaxException {
- configureProject(submodule.getProject(), Project.MSG_DEBUG);
+ configureBuildLogger(submodule.getProject(), Project.MSG_DEBUG);
Path path = new Path(submodule.getProject());
FileSet fs = new FileSet();
@@ -157,7 +157,7 @@ public class SubModuleTest extends AntTa
@Test
public void shouldRunMyTargetOnBothModule() throws URISyntaxException {
- configureProject(submodule.getProject(), Project.MSG_DEBUG);
+ configureBuildLogger(submodule.getProject(), Project.MSG_DEBUG);
Path path = new Path(submodule.getProject());
FileSet fs = new FileSet();
