merge global cache configuration attributes

This commit is contained in:
Sebastian Sdorra
2013-03-19 14:16:53 +01:00
parent 6fdede3823
commit eca0d304c6
4 changed files with 137 additions and 3 deletions

View File

@@ -84,6 +84,21 @@ public class EhConfigurationReaderTest
}
/**
* Method description
*
*/
@Test
public void testGlobalAttributes()
{
EhConfigurationTestReader reader =
new EhConfigurationTestReader("cache.006.xml");
Configuration c = createConfiguration(reader);
assertFalse(c.getUpdateCheck());
assertEquals("512M", c.getMaxBytesLocalDiskAsString());
}
/**
* Method description
*
@@ -175,6 +190,21 @@ public class EhConfigurationReaderTest
checkDefaultConfiguration(c, 170l, 18900l);
}
/**
* Method description
*
*/
@Test
public void testOverrideGlobalAttributes()
{
EhConfigurationTestReader reader =
new EhConfigurationTestReader("cache.006.xml", null, "cache.007.xml");
Configuration c = createConfiguration(reader);
assertTrue(c.getUpdateCheck());
assertEquals("1G", c.getMaxBytesLocalDiskAsString());
}
/**
* Method description
*