ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlboud...@apache.org
Subject svn commit: r1514229 - in /ant/easyant/core/trunk/src/test/java/org/apache/easyant: core/ core/services/ tasks/
Date Thu, 15 Aug 2013 10:35:30 GMT
Author: jlboudart
Date: Thu Aug 15 10:35:30 2013
New Revision: 1514229

URL: http://svn.apache.org/r1514229
Log:
Remove deprecated usage of deprecated junit api

Modified:
    ant/easyant/core/trunk/src/test/java/org/apache/easyant/core/EasyAntBaseTest.java
    ant/easyant/core/trunk/src/test/java/org/apache/easyant/core/PropertiesAsAttributesTest.java
    ant/easyant/core/trunk/src/test/java/org/apache/easyant/core/services/PluginServiceTest.java
    ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/ImportDeferredTest.java
    ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/ImportTest.java
    ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/ResolvePluginsTest.java

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=1514229&r1=1514228&r2=1514229&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 Thu
Aug 15 10:35:30 2013
@@ -17,9 +17,9 @@
  */
 package org.apache.easyant.core;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 

Modified: ant/easyant/core/trunk/src/test/java/org/apache/easyant/core/PropertiesAsAttributesTest.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/test/java/org/apache/easyant/core/PropertiesAsAttributesTest.java?rev=1514229&r1=1514228&r2=1514229&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/test/java/org/apache/easyant/core/PropertiesAsAttributesTest.java
(original)
+++ ant/easyant/core/trunk/src/test/java/org/apache/easyant/core/PropertiesAsAttributesTest.java
Thu Aug 15 10:35:30 2013
@@ -17,9 +17,8 @@
  */
 package org.apache.easyant.core;
 
-import junit.framework.Assert;
-
 import org.apache.tools.ant.Project;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 

Modified: ant/easyant/core/trunk/src/test/java/org/apache/easyant/core/services/PluginServiceTest.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/test/java/org/apache/easyant/core/services/PluginServiceTest.java?rev=1514229&r1=1514228&r2=1514229&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/test/java/org/apache/easyant/core/services/PluginServiceTest.java
(original)
+++ ant/easyant/core/trunk/src/test/java/org/apache/easyant/core/services/PluginServiceTest.java
Thu Aug 15 10:35:30 2013
@@ -25,8 +25,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import junit.framework.Assert;
-
 import org.apache.easyant.core.descriptor.PropertyDescriptor;
 import org.apache.easyant.core.report.EasyAntReport;
 import org.apache.easyant.core.report.ExtensionPointReport;
@@ -37,6 +35,7 @@ import org.apache.ivy.ant.IvyAntSettings
 import org.apache.ivy.core.module.id.ModuleRevisionId;
 import org.apache.ivy.plugins.matcher.PatternMatcher;
 import org.apache.tools.ant.Project;
+import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 

Modified: ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/ImportDeferredTest.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/ImportDeferredTest.java?rev=1514229&r1=1514228&r2=1514229&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/ImportDeferredTest.java
(original)
+++ ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/ImportDeferredTest.java
Thu Aug 15 10:35:30 2013
@@ -21,8 +21,6 @@ import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 
-import junit.framework.Assert;
-
 import org.apache.easyant.core.EasyAntMagicNames;
 import org.apache.easyant.core.ant.ProjectUtils;
 import org.apache.ivy.ant.IvyConfigure;
@@ -33,6 +31,7 @@ import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.Delete;
 import org.apache.tools.ant.types.Path;
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -106,6 +105,7 @@ public class ImportDeferredTest {
         importTask.execute();
 
         Path pluginClasspath = importTask.getProject().getReference("mycompany#simpleplugin.classpath");
+        org.junit.Assert.assertNotNull(pluginClasspath);
         Assert.assertNotNull(pluginClasspath);
         Assert.assertEquals(0, pluginClasspath.list().length);
     }

Modified: ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/ImportTest.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/ImportTest.java?rev=1514229&r1=1514228&r2=1514229&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/ImportTest.java (original)
+++ ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/ImportTest.java Thu Aug
15 10:35:30 2013
@@ -21,8 +21,6 @@ import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 
-import junit.framework.Assert;
-
 import org.apache.easyant.core.EasyAntMagicNames;
 import org.apache.easyant.core.ant.ProjectUtils;
 import org.apache.ivy.ant.IvyConfigure;
@@ -32,6 +30,7 @@ import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.Delete;
 import org.apache.tools.ant.types.Path;
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 

Modified: ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/ResolvePluginsTest.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/ResolvePluginsTest.java?rev=1514229&r1=1514228&r2=1514229&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/ResolvePluginsTest.java
(original)
+++ ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/ResolvePluginsTest.java
Thu Aug 15 10:35:30 2013
@@ -21,16 +21,14 @@ import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 
-import junit.framework.Assert;
-
 import org.apache.easyant.core.EasyAntMagicNames;
-import org.apache.easyant.tasks.ResolvePlugins;
 import org.apache.ivy.ant.IvyConfigure;
 import org.apache.ivy.ant.IvyDependency;
 import org.apache.ivy.core.report.ResolveReport;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.Delete;
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 



Mime
View raw message