incubator-easyant-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlboud...@apache.org
Subject svn commit: r1389522 - in /incubator/easyant/core/trunk/src/test: java/org/apache/easyant/core/ java/org/apache/easyant/core/services/ resources/org/apache/easyant/core/
Date Mon, 24 Sep 2012 19:13:25 GMT
Author: jlboudart
Date: Mon Sep 24 19:13:25 2012
New Revision: 1389522

URL: http://svn.apache.org/viewvc?rev=1389522&view=rev
Log:
Update unit test

Modified:
    incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/ModuleInheritanceTest.java
    incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/PropertiesAsAttributesTest.java
    incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/StandardJavaProjectTest.java
    incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/services/PluginServiceTest.java
    incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/standardJavaProject.ivy

Modified: incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/ModuleInheritanceTest.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/ModuleInheritanceTest.java?rev=1389522&r1=1389521&r2=1389522&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/ModuleInheritanceTest.java
(original)
+++ incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/ModuleInheritanceTest.java
Mon Sep 24 19:13:25 2012
@@ -25,15 +25,14 @@ public class ModuleInheritanceTest exten
         configureProject(this.getResource("multimodule/myapp-core/module.ivy"), Project.MSG_INFO);
 
         // Configure easyant ivy instance
-        conf.setEasyantIvySettingsUrl(this.getClass().getResource(
-                "/org/apache/easyant/core/default-easyant-ivysettings.xml"));
+        conf.setEasyantIvySettingsUrl(this.getClass().getResource("/ivysettings-test.xml"));
 
         // init project with easyant configuration
         initProject();
     }
 
     public void clean() throws Exception {
-        executeTarget("clean:clean");
+        executeTarget("clean");
     }
 
     public void testInheritablePluginWithScopeChild() throws Exception {

Modified: incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/PropertiesAsAttributesTest.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/PropertiesAsAttributesTest.java?rev=1389522&r1=1389521&r2=1389522&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/PropertiesAsAttributesTest.java
(original)
+++ incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/PropertiesAsAttributesTest.java
Mon Sep 24 19:13:25 2012
@@ -29,8 +29,7 @@ public class PropertiesAsAttributesTest 
         configureProject(this.getResource("propertiesAsAttributes.ivy"), Project.MSG_INFO);
 
         // Configure easyant ivy instance
-        conf.setEasyantIvySettingsUrl(this.getClass().getResource(
-                "/org/apache/easyant/core/default-easyant-ivysettings.xml"));
+        conf.setEasyantIvySettingsUrl(this.getClass().getResource("/ivysettings-test.xml"));
 
         // init project with easyant configuration
         initProject();
@@ -38,7 +37,7 @@ public class PropertiesAsAttributesTest 
 
     @Test
     public void testClean() throws Exception {
-        executeTarget("clean:clean");
+        executeTarget("clean");
     }
 
     @Test

Modified: incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/StandardJavaProjectTest.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/StandardJavaProjectTest.java?rev=1389522&r1=1389521&r2=1389522&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/StandardJavaProjectTest.java
(original)
+++ incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/StandardJavaProjectTest.java
Mon Sep 24 19:13:25 2012
@@ -25,15 +25,14 @@ public class StandardJavaProjectTest ext
         configureProject(this.getResource("standardJavaProject.ivy"), Project.MSG_INFO);
 
         // Configure easyant ivy instance
-        conf.setEasyantIvySettingsUrl(this.getClass().getResource(
-                "/org/apache/easyant/core/default-easyant-ivysettings.xml"));
+        conf.setEasyantIvySettingsUrl(this.getClass().getResource("/ivysettings-test.xml"));
 
         // init project with easyant configuration
         initProject();
     }
 
     public void testClean() throws Exception {
-        executeTarget("clean:clean");
+        executeTarget("clean");
     }
 
     public void testValidate() throws Exception {
@@ -55,7 +54,7 @@ public class StandardJavaProjectTest ext
     public void testImportWithAsAttribute() throws Exception {
         testClean();
         // <ea:plugin module="javadoc" revision="0.1" as="foobar"/>
-        executeTarget("foobar:javadoc");
+        executeTarget("foobarjavadoc:javadoc");
     }
 
     public void testVerify() throws Exception {

Modified: incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/services/PluginServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/services/PluginServiceTest.java?rev=1389522&r1=1389521&r2=1389522&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/services/PluginServiceTest.java
(original)
+++ incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/services/PluginServiceTest.java
Mon Sep 24 19:13:25 2012
@@ -51,7 +51,7 @@ public class PluginServiceTest {
         // configure the ivyinstance
         Ivy ivy = IvyContext.pushNewContext().getIvy();
         ivy.setVariable(EasyAntMagicNames.EASYANT_CORE_JAR_URL, EasyAntEngine.guessEasyantCoreJarUrl().toExternalForm());
-        ivy.configure(PluginServiceTest.class.getResource("/org/apache/easyant/core/default-easyant-ivysettings.xml"));
+        ivy.configure(PluginServiceTest.class.getResource("/ivysettings-test.xml"));
         pluginService = new DefaultPluginServiceImpl(ivy);
 
     }

Modified: incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/standardJavaProject.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/standardJavaProject.ivy?rev=1389522&r1=1389521&r2=1389522&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/standardJavaProject.ivy
(original)
+++ incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/standardJavaProject.ivy
Mon Sep 24 19:13:25 2012
@@ -20,7 +20,7 @@
             <ea:property name="default.build.number" value="10"/>
         </ea:build>
         <ea:plugin module="javadoc" revision="0.9"/>
-        <ea:plugin module="javadoc" revision="0.9" as="foobar"/>
+        <ea:plugin module="javadoc" revision="0.9" as="foobar" mode="include"/>
     </info>
     <configurations>
         <conf name="default" visibility="public" description="runtime dependencies and
master artifact can be used with this conf"/>



Mime
View raw message