svn commit: r1088008 - in /commons/proper/discovery/trunk: pom.xml src/test/org/apache/commons/discovery/test/TestAll.java

[simonetripodi]

Author: simonetripodi
Date: Sat Apr  2 11:54:26 2011
New Revision: 1088008

URL: http://svn.apache.org/viewvc?rev=1088008&view=rev
Log:
tests migrated to junit4

Modified:
    commons/proper/discovery/trunk/pom.xml
    
commons/proper/discovery/trunk/src/test/org/apache/commons/discovery/test/TestAll.java

Modified: commons/proper/discovery/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/discovery/trunk/pom.xml?rev=1088008&r1=1088007&r2=1088008&view=diff
==============================================================================
--- commons/proper/discovery/trunk/pom.xml (original)
+++ commons/proper/discovery/trunk/pom.xml Sat Apr  2 11:54:26 2011
@@ -102,7 +102,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>4.8.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: 
commons/proper/discovery/trunk/src/test/org/apache/commons/discovery/test/TestAll.java
URL: 
http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/test/org/apache/commons/discovery/test/TestAll.java?rev=1088008&r1=1088007&r2=1088008&view=diff
==============================================================================
--- 
commons/proper/discovery/trunk/src/test/org/apache/commons/discovery/test/TestAll.java
 (original)
+++ 
commons/proper/discovery/trunk/src/test/org/apache/commons/discovery/test/TestAll.java
 Sat Apr  2 11:54:26 2011
@@ -16,14 +16,13 @@
  */
 package org.apache.commons.discovery.test;
 
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
+import static junit.framework.Assert.fail;
 
 import java.net.URL;
 import java.util.Properties;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
 import org.apache.commons.discovery.Resource;
 import org.apache.commons.discovery.ResourceClass;
 import org.apache.commons.discovery.ResourceClassIterator;
@@ -38,26 +37,19 @@ import org.apache.commons.discovery.tool
 import org.apache.commons.discovery.tools.ManagedProperties;
 import org.apache.commons.discovery.tools.PropertiesHolder;
 import org.apache.commons.discovery.tools.SPInterface;
+import org.junit.Test;
 
 
 /**
   * @author Richard A. Sitze
   * @version $Revision$
  */
-public class TestAll extends TestCase {
+public class TestAll {
     private static final int logLevel =
         org.apache.commons.discovery.log.SimpleLog.LOG_LEVEL_INFO;
 //        org.apache.commons.discovery.log.SimpleLog.LOG_LEVEL_DEBUG;
 
-    
-    public TestAll(String testName) {
-        super(testName);
-    }
-    
-    public static Test suite() {
-        return new TestSuite(TestAll.class);
-    }
-
+    @Test
     public void testFindDefaultImpl_1() {
         org.apache.commons.discovery.log.SimpleLog.setLevel(logLevel);
 
@@ -74,6 +66,7 @@ public class TestAll extends TestCase {
         }
     }
     
+    @Test
     public void testFindDefaultImpl_2() {
         org.apache.commons.discovery.log.SimpleLog.setLevel(logLevel);
 
@@ -90,6 +83,7 @@ public class TestAll extends TestCase {
         }
     }
     
+    @Test
     public void testCache() {
         org.apache.commons.discovery.log.SimpleLog.setLevel(logLevel);
 
@@ -115,6 +109,7 @@ public class TestAll extends TestCase {
         }
     }
     
+    @Test
     public void testRelease() {
         org.apache.commons.discovery.log.SimpleLog.setLevel(logLevel);
 
@@ -140,6 +135,7 @@ public class TestAll extends TestCase {
         }
     }
     
+    @Test
     public void testFindPropertyImpl_1() {
         org.apache.commons.discovery.log.SimpleLog.setLevel(logLevel);
 
@@ -160,6 +156,7 @@ public class TestAll extends TestCase {
         }
     }
     
+    @Test
     public void testMyFactoryManagedProperty() {
         org.apache.commons.discovery.log.SimpleLog.setLevel(logLevel);
 
@@ -184,6 +181,7 @@ public class TestAll extends TestCase {
     }
     
 
+    @Test
     public void testFindPropFileDefault() {
         org.apache.commons.discovery.log.SimpleLog.setLevel(logLevel);
 
@@ -202,6 +200,7 @@ public class TestAll extends TestCase {
         }
     }
 
+    @Test
     public void testFindServiceFileDefault() {
         org.apache.commons.discovery.log.SimpleLog.setLevel(logLevel);
 
@@ -220,6 +219,7 @@ public class TestAll extends TestCase {
         }
     }
 
+    @Test
     public void testLowLevelFind() {
         org.apache.commons.discovery.log.SimpleLog.setLevel(logLevel);
 
@@ -244,6 +244,7 @@ public class TestAll extends TestCase {
         fail("failed to load class resource: " + name);
     }
     
+    @Test
     public void testFindResources() {
         org.apache.commons.discovery.log.SimpleLog.setLevel(logLevel);
 
@@ -287,6 +288,7 @@ public class TestAll extends TestCase {
         }
     }
 
+    @Test
     public void testViaDiscoverClass() {
         org.apache.commons.discovery.log.SimpleLog.setLevel(logLevel);