Author: jlboudart
Date: Tue Aug 20 07:38:35 2013
New Revision: 1515726
URL: http://svn.apache.org/r1515726
Log:
Fix broken unit tests due to change on basedir
Added:
ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/AntTaskBaseTest.java
- copied, changed from r1515377,
ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/BaseAntTaskTest.java
Removed:
ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/BaseAntTaskTest.java
Modified:
ant/easyant/core/trunk/module.ant
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java
ant/easyant/core/trunk/src/test/java/org/apache/easyant/core/EasyAntBaseTest.java
ant/easyant/core/trunk/src/test/java/org/apache/easyant/core/ant/ModuleIvyProjectHelperTest.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
Modified: ant/easyant/core/trunk/module.ant
URL:
http://svn.apache.org/viewvc/ant/easyant/core/trunk/module.ant?rev=1515726&r1=1515725&r2=1515726&view=diff
==============================================================================
--- ant/easyant/core/trunk/module.ant (original)
+++ ant/easyant/core/trunk/module.ant Tue Aug 20 07:38:35 2013
@@ -31,7 +31,7 @@
<property name="retrieve.dependencies" value="true" />
- <property name="test.run.excludes.pattern"
value="**/EasyAntBaseTest*,**/*AntTestListener*,**/*AntOutputStream*" />
+ <property name="test.run.excludes.pattern"
value="**/*BaseTest*,**/*AntTestListener*,**/*AntOutputStream*" />
<!-- override main artifact retrieve pattern -->
<property name="retrieve.pattern.lib.main"
value="${basedir}/lib/main/[artifact].[ext]" />
Modified:
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java
URL:
http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java?rev=1515726&r1=1515725&r2=1515726&view=diff
==============================================================================
---
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java
(original)
+++
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java
Tue Aug 20 07:38:35 2013
@@ -576,6 +576,16 @@ public class DefaultPluginServiceImpl im
Project p = buildProject(null);
Target implicitTarget = ProjectUtils.createTopLevelTarget();
p.addTarget(implicitTarget);
+
+ // calculate basedir
+ if (moduleDescriptor != null) {
+ p.setBaseDir(moduleDescriptor.getParentFile());
+ } else if (optionalAntModule != null) {
+ p.setBaseDir(optionalAntModule.getParentFile());
+ } else if (overrideAntModule != null) {
+ p.setBaseDir(overrideAntModule.getParentFile());
+ }
+
LoadModule loadModule = new LoadModule();
loadModule.setBuildModule(moduleDescriptor);
loadModule.setBuildFile(optionalAntModule);
Modified:
ant/easyant/core/trunk/src/test/java/org/apache/easyant/core/EasyAntBaseTest.java
URL:
http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/test/java/org/apache/easyant/core/EasyAntBaseTest.java?rev=1515726&r1=1515725&r2=1515726&view=diff
==============================================================================
---
ant/easyant/core/trunk/src/test/java/org/apache/easyant/core/EasyAntBaseTest.java
(original)
+++
ant/easyant/core/trunk/src/test/java/org/apache/easyant/core/EasyAntBaseTest.java
Tue Aug 20 07:38:35 2013
@@ -32,7 +32,6 @@ import org.apache.easyant.core.factory.E
import org.apache.tools.ant.BuildEvent;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.BuildListener;
-import org.apache.tools.ant.MagicNames;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.LogLevel;
import org.junit.After;
@@ -383,12 +382,10 @@ public abstract class EasyAntBaseTest {
// Configure easyant ivy instance
conf.setEasyantIvySettingsUrl(this.getClass().getResource("/ivysettings-test.xml"));
- // Configure the project basedir
File projectModule = new File(filename);
if (!projectModule.exists()) {
throw new BuildException("Project " +
projectModule.getAbsolutePath() + " does not exists");
}
- conf.getDefinedProps().put(MagicNames.PROJECT_BASEDIR,
projectModule.getParent());
}
/**
@@ -406,6 +403,11 @@ public abstract class EasyAntBaseTest {
// init the new project instance
project = new Project();
project.addBuildListener(new
AntTestListener(conf.getMsgOutputLevel()));
+ try {
+ project.setBaseDir(new File(this.getResource(".").toURI()));
+ } catch (URISyntaxException e) {
+ throw new RuntimeException("Can't configure basedir");
+ }
EasyAntEngine eaEngine = new EasyAntEngine(conf);
eaEngine.initProject(project);
}
Modified:
ant/easyant/core/trunk/src/test/java/org/apache/easyant/core/ant/ModuleIvyProjectHelperTest.java
URL:
http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/test/java/org/apache/easyant/core/ant/ModuleIvyProjectHelperTest.java?rev=1515726&r1=1515725&r2=1515726&view=diff
==============================================================================
---
ant/easyant/core/trunk/src/test/java/org/apache/easyant/core/ant/ModuleIvyProjectHelperTest.java
(original)
+++
ant/easyant/core/trunk/src/test/java/org/apache/easyant/core/ant/ModuleIvyProjectHelperTest.java
Tue Aug 20 07:38:35 2013
@@ -41,6 +41,7 @@ public class ModuleIvyProjectHelperTest
public void shouldHandleModuleIvyFile() throws URISyntaxException {
File f = new
File(this.getClass().getResource("../standardJavaProject.ivy").toURI());
Project p = new Project();
+ p.setBaseDir(new File(this.getClass().getResource(".").toURI()));
p.setNewProperty(EasyAntMagicNames.IGNORE_USER_IVYSETTINGS, "true");
p.setNewProperty(EasyAntMagicNames.GLOBAL_EASYANT_IVYSETTINGS,
this.getClass().getResource("/ivysettings-test.xml").toString());
Copied:
ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/AntTaskBaseTest.java
(from r1515377,
ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/BaseAntTaskTest.java)
URL:
http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/AntTaskBaseTest.java?p2=ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/AntTaskBaseTest.java&p1=ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/BaseAntTaskTest.java&r1=1515377&r2=1515726&rev=1515726&view=diff
==============================================================================
---
ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/BaseAntTaskTest.java
(original)
+++
ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/AntTaskBaseTest.java
Tue Aug 20 07:38:35 2013
@@ -23,7 +23,7 @@ import static org.junit.Assert.assertTha
import org.apache.tools.ant.Project;
-public class BaseAntTaskTest {
+public class AntTaskBaseTest {
private AntTestListener antTestListener;
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=1515726&r1=1515725&r2=1515726&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
Tue Aug 20 07:38:35 2013
@@ -47,7 +47,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-public class LoadModuleTest extends BaseAntTaskTest {
+public class LoadModuleTest extends AntTaskBaseTest {
private File cache;
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=1515726&r1=1515725&r2=1515726&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
Tue Aug 20 07:38:35 2013
@@ -27,7 +27,7 @@ import org.apache.tools.ant.Project;
import org.junit.Before;
import org.junit.Test;
-public class PropertyTaskTest extends BaseAntTaskTest {
+public class PropertyTaskTest extends AntTaskBaseTest {
private PropertyTask propertyTask;
