svn commit: r1224636 - /commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDynamicCombinedConfiguration.java

[oh...@apache.org]

Author: oheger
Date: Sun Dec 25 19:44:04 2011
New Revision: 1224636

URL: http://svn.apache.org/viewvc?rev=1224636&view=rev
Log:
Converted tests to JUnit 4, fixed warnings.

Modified:
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDynamicCombinedConfiguration.java

Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDynamicCombinedConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDynamicCombinedConfiguration.java?rev=1224636&r1=1224635&r2=1224636&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDynamicCombinedConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDynamicCombinedConfiguration.java Sun Dec 25 19:44:04 2011
@@ -17,6 +17,11 @@
 
 package org.apache.commons.configuration;
 
+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 java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
@@ -24,12 +29,11 @@ import java.io.IOException;
 import java.io.Reader;
 import java.io.Writer;
 
-import junit.framework.TestCase;
-
 import org.apache.commons.configuration.tree.xpath.XPathExpressionEngine;
 import org.apache.commons.lang.text.StrLookup;
+import org.junit.Test;
 
-public class TestDynamicCombinedConfiguration extends TestCase
+public class TestDynamicCombinedConfiguration
 {
     private static String PATTERN = "${sys:Id}";
     private static String PATTERN1 = "target/test-classes/testMultiConfiguration_${sys:Id}.xml";
@@ -45,6 +49,7 @@ public class TestDynamicCombinedConfigur
     /** Constant for the number of loops in the multi-thread tests. */
     private static final int LOOP_COUNT = 100;
 
+    @Test
     public void testConfiguration() throws Exception
     {
         DynamicCombinedConfiguration config = new DynamicCombinedConfiguration();
@@ -74,6 +79,7 @@ public class TestDynamicCombinedConfigur
         assertEquals("a\\,b\\,c", config.getString("split/list2"));
     }
 
+    @Test
     public void testConcurrentGetAndReload() throws Exception
     {
         System.getProperties().remove("Id");
@@ -100,6 +106,7 @@ public class TestDynamicCombinedConfigur
         assertTrue(totalFailures + " failures Occurred", totalFailures == 0);
     }
 
+    @Test
     public void testConcurrentGetAndReload2() throws Exception
     {
         System.getProperties().remove("Id");
@@ -129,6 +136,7 @@ public class TestDynamicCombinedConfigur
         assertTrue(totalFailures + " failures Occurred", totalFailures == 0);
     }
 
+    @Test
     public void testConcurrentGetAndReloadMultipleClients() throws Exception
     {
         System.getProperties().remove("Id");
@@ -166,6 +174,7 @@ public class TestDynamicCombinedConfigur
         assertTrue(totalFailures + " failures Occurred", totalFailures == 0);
     }
 
+    @Test
   public void testConcurrentGetAndReloadFile() throws Exception
     {
         final int threadCount = 25;
@@ -236,6 +245,7 @@ public class TestDynamicCombinedConfigur
             this.id = id;
             this.useId = useId;
         }
+        @Override
         public void run()
         {
             failures[index] = 0;
@@ -273,6 +283,7 @@ public class TestDynamicCombinedConfigur
             combined = c;
         }
 
+        @Override
         public void run()
         {
             while (running)
@@ -327,7 +338,7 @@ public class TestDynamicCombinedConfigur
 
     public static class ThreadLookup extends StrLookup
     {
-        private static ThreadLocal id = new ThreadLocal();
+        private static ThreadLocal<String> id = new ThreadLocal<String>();
 
 
 
@@ -341,6 +352,7 @@ public class TestDynamicCombinedConfigur
             id.set(value);
         }
 
+        @Override
         public String lookup(String key)
         {
             if (key == null || !key.equals("Id"))
@@ -352,7 +364,7 @@ public class TestDynamicCombinedConfigur
             {
                 return value;
             }
-            return (String)id.get();
+            return id.get();
 
         }
     }