You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by ep...@apache.org on 2003/11/11 16:09:00 UTC
cvs commit: jakarta-commons-sandbox/configuration/src/test/org/apache/commons/configuration TestConfigurationUtils.java
epugh 2003/11/11 07:09:00
Modified: configuration/src/test/org/apache/commons/configuration
TestConfigurationUtils.java
Log:
Better way of doing platform independent test then hokey System.getProperty check!
Revision Changes Path
1.5 +4 -13 jakarta-commons-sandbox/configuration/src/test/org/apache/commons/configuration/TestConfigurationUtils.java
Index: TestConfigurationUtils.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/configuration/src/test/org/apache/commons/configuration/TestConfigurationUtils.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestConfigurationUtils.java 11 Nov 2003 15:02:07 -0000 1.4
+++ TestConfigurationUtils.java 11 Nov 2003 15:09:00 -0000 1.5
@@ -130,19 +130,7 @@
URL url = ConfigurationUtils.getURL(null, "config.xml");
assertEquals("file", url.getProtocol());
assertEquals("", url.getHost());
- String urlAsString =
- ConfigurationUtils.getURL("/data", "config.xml").toString();
- // linux and windows represent root urls differently.
- if (System.getProperty("os.name").indexOf("Win") == -1)
- {
- assertEquals("file:/data/config.xml", urlAsString);
-
- }
- else
- {
- assertTrue(urlAsString.endsWith(":/data/config.xml") && urlAsString.startsWith("file:/"));
-
- }
+
assertEquals(
"http://localhost:8080/webapp/config/config.xml",
ConfigurationUtils
@@ -164,5 +152,8 @@
assertEquals(
absFile.toURL(),
ConfigurationUtils.getURL(null, absFile.getAbsolutePath()));
+
+ assertEquals(absFile.toURL(),
+ ConfigurationUtils.getURL(absFile.getParent(), "config.xml"));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org