You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by he...@apache.org on 2003/07/06 13:33:35 UTC
cvs commit: jakarta-turbine-2/src/test/org/apache/turbine ConfigurationTest.java
henning 2003/07/06 04:33:35
Modified: src/test/org/apache/turbine ConfigurationTest.java
Log:
Removed two test cases that belong to commons-configuration and will
be added there. This allows Turbine to build again.
Revision Changes Path
1.6 +1 -108 jakarta-turbine-2/src/test/org/apache/turbine/ConfigurationTest.java
Index: ConfigurationTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/ConfigurationTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ConfigurationTest.java 20 Jun 2003 21:54:55 -0000 1.5
+++ ConfigurationTest.java 6 Jul 2003 11:33:35 -0000 1.6
@@ -152,111 +152,4 @@
}
}
- public void testConfigurationValuesInSameOrder() throws Exception
- {
- Configuration simpleConfiguration = null;
- Configuration compositeConfiguration = null;
-
- tc = new TurbineConfig(".", "/conf/test/TemplateService.properties");
-
- try
- {
- tc.initialize();
- simpleConfiguration = Turbine.getConfiguration();
- }
- finally
- {
- tc.dispose();
- }
-
- txc = new TurbineXmlConfig(".", "/conf/test/TurbineConfiguration.xml");
- try
- {
- txc.initialize();
- compositeConfiguration = Turbine.getConfiguration();
- }
- finally
- {
- txc.dispose();
- }
- Configuration a = simpleConfiguration.subset("services");
- Configuration b = compositeConfiguration.subset("services");
-
- List keysSimpleConfiguration = IteratorUtils.toList(a.getKeys());
- List keysCompositeConfiguration = IteratorUtils.toList(b.getKeys());
-
- assertTrue("Size:" + keysSimpleConfiguration.size(), keysSimpleConfiguration.size() > 0);
- assertEquals(keysSimpleConfiguration.size(), keysCompositeConfiguration.size());
-
- for (int i = 0; i < keysSimpleConfiguration.size(); i++)
- {
- assertEquals(keysSimpleConfiguration.get(i), keysCompositeConfiguration.get(i));
- }
-
- }
-
- public void testMappingInSameOrder() throws Exception
- {
- Configuration simpleConfiguration = null;
- Configuration compositeConfiguration = null;
- Configuration mapping = new BaseConfiguration();
- Configuration mapping2 = new BaseConfiguration();
-
- tc = new TurbineConfig(".", "/conf/test/TemplateService.properties");
-
- try
- {
- tc.initialize();
- simpleConfiguration = Turbine.getConfiguration();
- }
- finally
- {
- tc.dispose();
- }
-
- txc = new TurbineXmlConfig(".", "/conf/test/TurbineConfiguration.xml");
- try
- {
- txc.initialize();
- compositeConfiguration = Turbine.getConfiguration();
- }
- finally
- {
- txc.dispose();
- }
-
- for (Iterator keys = simpleConfiguration.getKeys(); keys.hasNext();)
- {
- String key = (String) keys.next();
- String[] keyParts = StringUtils.split(key, ".");
-
- if ((keyParts.length == 3) && (keyParts[0] + ".").equals(SERVICE_PREFIX) && ("." + keyParts[2]).equals(CLASSNAME_SUFFIX))
- {
- String serviceKey = keyParts[1];
-
- if (!mapping.containsKey(serviceKey))
- {
- mapping.setProperty(serviceKey, simpleConfiguration.getString(key));
- }
- }
- }
-
- for (Iterator keys = compositeConfiguration.getKeys(); keys.hasNext();)
- {
- String key = (String) keys.next();
- String[] keyParts = StringUtils.split(key, ".");
-
- if ((keyParts.length == 3) && (keyParts[0] + ".").equals(SERVICE_PREFIX) && ("." + keyParts[2]).equals(CLASSNAME_SUFFIX))
- {
- String serviceKey = keyParts[1];
-
- if (!mapping2.containsKey(serviceKey))
- {
- mapping2.setProperty(serviceKey, compositeConfiguration.getString(key));
- }
- }
- }
-
- }
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org