Author: oheger
Date: Sun Jun 14 18:53:33 2015
New Revision: 1685441

URL: http://svn.apache.org/r1685441
Log:
Made test more robust.

This test failed in the ant build because the were small differences in the
external forms of URLs. The configuration files behind the URLs are now
loaded and compared.

Modified:
    
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestClasspathLocationStrategy.java

Modified: 
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestClasspathLocationStrategy.java
URL: 
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestClasspathLocationStrategy.java?rev=1685441&r1=1685440&r2=1685441&view=diff
==============================================================================
--- 
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestClasspathLocationStrategy.java
 (original)
+++ 
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestClasspathLocationStrategy.java
 Sun Jun 14 18:53:33 2015
@@ -16,12 +16,14 @@
  */
 package org.apache.commons.configuration2.io;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
 import java.net.URL;
 
 import org.apache.commons.configuration2.ConfigurationAssert;
+import org.apache.commons.configuration2.XMLConfiguration;
+import org.apache.commons.configuration2.builder.fluent.Configurations;
+import org.apache.commons.configuration2.ex.ConfigurationException;
 import org.easymock.EasyMock;
 import org.junit.Before;
 import org.junit.Test;
@@ -54,14 +56,16 @@ public class TestClasspathLocationStrate
      * Tests a successful location of a provided resource name.
      */
     @Test
-    public void testLocateSuccess()
+    public void testLocateSuccess() throws ConfigurationException
     {
         FileLocator locator =
                 FileLocatorUtils.fileLocator().fileName(FILE_NAME)
                         .basePath("somePath").create();
         URL url = strategy.locate(fileSystem, locator);
-        assertEquals("Wrong URL", ConfigurationAssert.getTestURL(FILE_NAME)
-                .toExternalForm(), url.toExternalForm());
+        Configurations configurations = new Configurations();
+        XMLConfiguration config1 = configurations.xml(url);
+        XMLConfiguration config2 = 
configurations.xml(ConfigurationAssert.getTestURL(FILE_NAME));
+        ConfigurationAssert.assertConfigurationEquals(config1, config2);
     }
 
     /**


Reply via email to