rename configureProject method into configureBuildLogger
git-svn-id: https://svn.apache.org/repos/asf/ant/easyant/core/trunk@1542411 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/test/java/org/apache/easyant/tasks/AntTaskBaseTest.java b/src/test/java/org/apache/easyant/tasks/AntTaskBaseTest.java
index 80b1d5f..9f8d92a 100644
--- a/src/test/java/org/apache/easyant/tasks/AntTaskBaseTest.java
+++ b/src/test/java/org/apache/easyant/tasks/AntTaskBaseTest.java
@@ -25,13 +25,13 @@
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;
diff --git a/src/test/java/org/apache/easyant/tasks/LoadModuleTest.java b/src/test/java/org/apache/easyant/tasks/LoadModuleTest.java
index 23c3c85..b128eee 100644
--- a/src/test/java/org/apache/easyant/tasks/LoadModuleTest.java
+++ b/src/test/java/org/apache/easyant/tasks/LoadModuleTest.java
@@ -97,7 +97,7 @@
@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 @@
@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 @@
@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 @@
@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 @@
@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 @@
@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();
diff --git a/src/test/java/org/apache/easyant/tasks/PropertyTaskTest.java b/src/test/java/org/apache/easyant/tasks/PropertyTaskTest.java
index 7b0ec4f..5b72c0d 100644
--- a/src/test/java/org/apache/easyant/tasks/PropertyTaskTest.java
+++ b/src/test/java/org/apache/easyant/tasks/PropertyTaskTest.java
@@ -50,7 +50,7 @@
@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 @@
@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");
diff --git a/src/test/java/org/apache/easyant/tasks/SubModuleTest.java b/src/test/java/org/apache/easyant/tasks/SubModuleTest.java
index 343b9d2..9145881 100644
--- a/src/test/java/org/apache/easyant/tasks/SubModuleTest.java
+++ b/src/test/java/org/apache/easyant/tasks/SubModuleTest.java
@@ -84,7 +84,7 @@
@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 @@
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 @@
@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 @@
@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 @@
@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();
