Diff of /jakarta/commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestConfigurationFactory.java
Parent Directory
| 
Revision Log
| 
Patch
--- jakarta/commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestConfigurationFactory.java 2005/07/27 15:08:56 225535
+++ jakarta/commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestConfigurationFactory.java 2005/07/27 15:36:40 225536
@@ -78,45 +78,51 @@ public class TestConfigurationFactory ex
public void testLoadingConfiguration() throws Exception
{
- factory.setConfigurationFileName(
- testDigesterFile.toString());
+ factory.setConfigurationFileName(testDigesterFile.toString());
+
+ compositeConfiguration = (CompositeConfiguration) factory.getConfiguration();
+
+ assertEquals("Number of configurations", 4, compositeConfiguration.getNumberOfConfigurations());
+ assertEquals(PropertiesConfiguration.class, compositeConfiguration.getConfiguration(0).getClass());
+ assertEquals(XMLPropertiesConfiguration.class, compositeConfiguration.getConfiguration(1).getClass());
+ assertEquals(XMLConfiguration.class, compositeConfiguration.getConfiguration(2).getClass());
+
+ // check the first configuration
+ PropertiesConfiguration pc = (PropertiesConfiguration) compositeConfiguration.getConfiguration(0);
+ assertNotNull("Make sure we have a fileName: " + pc.getFileName(), pc.getFileName());
+
+ // check some properties
+ assertTrue("Make sure we have loaded our key", compositeConfiguration.getBoolean("test.boolean"));
+ assertEquals("I'm complex!", compositeConfiguration.getProperty("element2.subelement.subsubelement"));
+ assertEquals("property in the XMLPropertiesConfiguration", "value1", compositeConfiguration.getProperty("key1"));
+ }
+
+ public void testLoadingConfigurationWithRulesXML() throws Exception
+ {
+ factory.setConfigurationFileName(testDigesterFile.toString());
+ factory.setDigesterRules(digesterRules.toURL());
+
+ compositeConfiguration = (CompositeConfiguration) factory.getConfiguration();
- compositeConfiguration =
- (CompositeConfiguration) factory.getConfiguration();
+ assertEquals("Number of configurations", 4, compositeConfiguration.getNumberOfConfigurations());
+ assertEquals(PropertiesConfiguration.class, compositeConfiguration.getConfiguration(0).getClass());
+ //assertEquals(XMLPropertiesConfiguration.class, compositeConfiguration.getConfiguration(1).getClass()); // doesn't work
+ assertEquals(XMLConfiguration.class, compositeConfiguration.getConfiguration(2).getClass());
+
+ // check the first configuration
+ PropertiesConfiguration pc = (PropertiesConfiguration) compositeConfiguration.getConfiguration(0);
+ assertNotNull("Make sure we have a fileName: " + pc.getFileName(), pc.getFileName());
+
+ // check some properties
+ assertTrue("Make sure we have loaded our key", pc.getBoolean("test.boolean"));
+ assertTrue("Make sure we have loaded our key", compositeConfiguration.getBoolean("test.boolean"));
- assertEquals(
- "Verify how many configs",
- 3,
- compositeConfiguration.getNumberOfConfigurations());
- assertEquals(
- PropertiesConfiguration.class,
- compositeConfiguration.getConfiguration(0).getClass());
- PropertiesConfiguration pc =
- (PropertiesConfiguration) compositeConfiguration.getConfiguration(
- 0);
-
- assertNotNull(
- "Make sure we have a fileName:" + pc.getFileName(),
- pc.getFileName());
-
- assertTrue(
- "Make sure we have loades our key",
- compositeConfiguration.getBoolean("test.boolean"));
- assertEquals(
- "I'm complex!",
- compositeConfiguration.getProperty(
- "element2.subelement.subsubelement"));
-
- configuration = compositeConfiguration;
- assertEquals(
- "I'm complex!",
- configuration.getProperty("element2.subelement.subsubelement"));
+ assertEquals("I'm complex!", compositeConfiguration.getProperty("element2.subelement.subsubelement"));
}
public void testLoadingConfigurationReverseOrder() throws Exception
{
- factory.setConfigurationFileName(
- testDigesterFileReverseOrder.toString());
+ factory.setConfigurationFileName(testDigesterFileReverseOrder.toString());
configuration = factory.getConfiguration();
@@ -128,47 +134,6 @@ public class TestConfigurationFactory ex
assertEquals("1", configuration.getProperty("test.short"));
}
- public void testLoadingConfigurationWithRulesXML() throws Exception
- {
- factory.setConfigurationFileName(testDigesterFile.toString());
- factory.setDigesterRules(digesterRules.toURL());
-
- compositeConfiguration = (CompositeConfiguration) factory.getConfiguration();
-
- assertEquals(
- "Verify how many configs",
- 3,
- compositeConfiguration.getNumberOfConfigurations());
-
- assertEquals(
- PropertiesConfiguration.class,
- compositeConfiguration.getConfiguration(0).getClass());
-
- PropertiesConfiguration pc =
- (PropertiesConfiguration) compositeConfiguration.getConfiguration(
- 0);
- assertNotNull(
- "Make sure we have a fileName:" + pc.getFileName(),
- pc.getFileName());
- assertTrue(
- "Make sure we have loaded our key",
- pc.getBoolean("test.boolean"));
-
- assertTrue(
- "Make sure we have loaded our key",
- compositeConfiguration.getBoolean("test.boolean"));
-
- assertEquals(
- "I'm complex!",
- compositeConfiguration.getProperty(
- "element2.subelement.subsubelement"));
-
- configuration = compositeConfiguration;
- assertEquals(
- "I'm complex!",
- configuration.getProperty("element2.subelement.subsubelement"));
- }
-
public void testLoadingConfigurationNamespaceAware() throws Exception
{
factory.setConfigurationFileName(testDigesterFileNamespaceAware.toString());
@@ -318,82 +283,44 @@ public class TestConfigurationFactory ex
private void checkUnionConfig() throws Exception
{
compositeConfiguration = (CompositeConfiguration) factory.getConfiguration();
- assertEquals(
- "Verify how many configs",
- 3,
- compositeConfiguration.getNumberOfConfigurations());
+ assertEquals("Verify how many configs", 3, compositeConfiguration.getNumberOfConfigurations());
// Test if union was constructed correctly
Object prop = compositeConfiguration.getProperty("tables.table.name");
assertTrue(prop instanceof Collection);
assertEquals(3, ((Collection) prop).size());
- assertEquals(
- "users",
- compositeConfiguration.getProperty("tables.table(0).name"));
- assertEquals(
- "documents",
- compositeConfiguration.getProperty("tables.table(1).name"));
- assertEquals(
- "tasks",
- compositeConfiguration.getProperty("tables.table(2).name"));
-
- prop =
- compositeConfiguration.getProperty(
- "tables.table.fields.field.name");
+ assertEquals("users", compositeConfiguration.getProperty("tables.table(0).name"));
+ assertEquals("documents", compositeConfiguration.getProperty("tables.table(1).name"));
+ assertEquals("tasks", compositeConfiguration.getProperty("tables.table(2).name"));
+
+ prop = compositeConfiguration.getProperty("tables.table.fields.field.name");
assertTrue(prop instanceof Collection);
assertEquals(17, ((Collection) prop).size());
- assertEquals(
- "smtp.mydomain.org",
- compositeConfiguration.getString("mail.host.smtp"));
- assertEquals(
- "pop3.mydomain.org",
- compositeConfiguration.getString("mail.host.pop"));
+ assertEquals("smtp.mydomain.org", compositeConfiguration.getString("mail.host.smtp"));
+ assertEquals("pop3.mydomain.org", compositeConfiguration.getString("mail.host.pop"));
// This was overriden
- assertEquals(
- "masterOfPost",
- compositeConfiguration.getString("mail.account.user"));
- assertEquals(
- "topsecret",
- compositeConfiguration.getString("mail.account.psswd"));
+ assertEquals("masterOfPost", compositeConfiguration.getString("mail.account.user"));
+ assertEquals("topsecret", compositeConfiguration.getString("mail.account.psswd"));
// This was overriden, too, but not in additional section
- assertEquals(
- "enhanced factory",
- compositeConfiguration.getString("test.configuration"));
+ assertEquals("enhanced factory", compositeConfiguration.getString("test.configuration"));
}
private void checkCompositeConfiguration() throws Exception
{
compositeConfiguration = (CompositeConfiguration) factory.getConfiguration();
- assertEquals(
- "Verify how many configs",
- 2,
- compositeConfiguration.getNumberOfConfigurations());
-
- assertEquals(
- PropertiesConfiguration.class,
- compositeConfiguration.getConfiguration(0).getClass());
-
- PropertiesConfiguration pc =
- (PropertiesConfiguration) compositeConfiguration.getConfiguration(
- 0);
- assertNotNull(
- "Make sure we have a fileName:" + pc.getFileName(),
- pc.getFileName());
- assertTrue(
- "Make sure we have loaded our key",
- pc.getBoolean("test.boolean"));
-
- assertTrue(
- "Make sure we have loaded our key",
- compositeConfiguration.getBoolean("test.boolean"));
+ assertEquals("Verify how many configs", 2, compositeConfiguration.getNumberOfConfigurations());
+ assertEquals(PropertiesConfiguration.class, compositeConfiguration.getConfiguration(0).getClass());
+ PropertiesConfiguration pc = (PropertiesConfiguration) compositeConfiguration.getConfiguration(0);
+ assertNotNull("Make sure we have a fileName:" + pc.getFileName(), pc.getFileName());
+ assertTrue("Make sure we have loaded our key", pc.getBoolean("test.boolean"));
+ assertTrue("Make sure we have loaded our key", compositeConfiguration.getBoolean("test.boolean"));
- Object property = compositeConfiguration.getProperty(
- "element2.subelement.subsubelement");
+ Object property = compositeConfiguration.getProperty("element2.subelement.subsubelement");
assertNull("Should have returned a null", property);
}
}
