svn commit: r1029094 - /commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/reloading/TestFileChangedReloadingStrategy.java

[oh...@apache.org]

Author: oheger
Date: Sat Oct 30 15:19:56 2010
New Revision: 1029094

URL: http://svn.apache.org/viewvc?rev=1029094&view=rev
Log:
Removed a Java 1.5 incompatibility. Fixed a deprecated warning.

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

Modified: commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/reloading/TestFileChangedReloadingStrategy.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/reloading/TestFileChangedReloadingStrategy.java?rev=1029094&r1=1029093&r2=1029094&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/reloading/TestFileChangedReloadingStrategy.java (original)
+++ commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/reloading/TestFileChangedReloadingStrategy.java Sat Oct 30 15:19:56 2010
@@ -17,9 +17,9 @@
 
 package org.apache.commons.configuration.reloading;
 
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileWriter;
-import java.io.ByteArrayOutputStream;
 import java.net.URL;
 
 import junit.framework.TestCase;
@@ -27,18 +27,18 @@ import junit.framework.TestCase;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.commons.configuration.XMLConfiguration;
-import org.apache.log4j.Logger;
+import org.apache.log4j.Appender;
 import org.apache.log4j.Layout;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
 import org.apache.log4j.PatternLayout;
-import org.apache.log4j.Appender;
 import org.apache.log4j.WriterAppender;
-import org.apache.log4j.Level;
 
 /**
  * Test case for the ReloadableConfiguration class.
  *
  * @author Emmanuel Bourg
- * @version $Revision$, $Date$
+ * @version $Id$
  */
 public class TestFileChangedReloadingStrategy extends TestCase
 {
@@ -128,7 +128,7 @@ public class TestFileChangedReloadingStr
         assertTrue(config.getBoolean("configuration.loaded"));
         FileChangedReloadingStrategy strategy = new FileChangedReloadingStrategy();
         config.setReloadingStrategy(strategy);
-        assertEquals(config.getURL().toURI().toString(), strategy.getFile().toURI().toString());
+        assertEquals(config.getURL().toExternalForm(), strategy.getFile().toURI().toURL().toExternalForm());
     }
 
     /**
@@ -139,7 +139,7 @@ public class TestFileChangedReloadingStr
     {
         XMLConfiguration config = new XMLConfiguration();
         // use some jar: URL
-        config.setURL(new URL("jar:" + new File("conf/resources.jar").getAbsoluteFile().toURL() + "!/test-jar.xml"));
+        config.setURL(new URL("jar:" + new File("conf/resources.jar").getAbsoluteFile().toURI().toURL() + "!/test-jar.xml"));
         FileChangedReloadingStrategy strategy = new FileChangedReloadingStrategy();
         config.setReloadingStrategy(strategy);
         File file = strategy.getFile();