From cab4f1a2d22a4fb1d13b796662d006a3cd8f432d Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Thu, 11 Apr 2013 13:53:53 +0200 Subject: [PATCH] rename ehcache test configuration files from cache... to ehcache... --- .../sonia/scm/cache/CacheManagerTestBase.java | 2 -- .../scm/cache/EhConfigurationReaderTest.java | 22 +++++++++---------- .../cache/{cache.001.xml => ehcache.001.xml} | 0 .../cache/{cache.002.xml => ehcache.002.xml} | 0 .../cache/{cache.003.xml => ehcache.003.xml} | 0 .../cache/{cache.004.xml => ehcache.004.xml} | 0 .../cache/{cache.005.xml => ehcache.005.xml} | 0 .../cache/{cache.006.xml => ehcache.006.xml} | 0 .../cache/{cache.007.xml => ehcache.007.xml} | 0 9 files changed, 11 insertions(+), 13 deletions(-) rename scm-webapp/src/test/resources/sonia/scm/cache/{cache.001.xml => ehcache.001.xml} (100%) rename scm-webapp/src/test/resources/sonia/scm/cache/{cache.002.xml => ehcache.002.xml} (100%) rename scm-webapp/src/test/resources/sonia/scm/cache/{cache.003.xml => ehcache.003.xml} (100%) rename scm-webapp/src/test/resources/sonia/scm/cache/{cache.004.xml => ehcache.004.xml} (100%) rename scm-webapp/src/test/resources/sonia/scm/cache/{cache.005.xml => ehcache.005.xml} (100%) rename scm-webapp/src/test/resources/sonia/scm/cache/{cache.006.xml => ehcache.006.xml} (100%) rename scm-webapp/src/test/resources/sonia/scm/cache/{cache.007.xml => ehcache.007.xml} (100%) diff --git a/scm-webapp/src/test/java/sonia/scm/cache/CacheManagerTestBase.java b/scm-webapp/src/test/java/sonia/scm/cache/CacheManagerTestBase.java index 14d10eee20..3a58c023f6 100644 --- a/scm-webapp/src/test/java/sonia/scm/cache/CacheManagerTestBase.java +++ b/scm-webapp/src/test/java/sonia/scm/cache/CacheManagerTestBase.java @@ -39,8 +39,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import static org.hamcrest.Matchers.*; - import static org.junit.Assert.*; //~--- JDK imports ------------------------------------------------------------ diff --git a/scm-webapp/src/test/java/sonia/scm/cache/EhConfigurationReaderTest.java b/scm-webapp/src/test/java/sonia/scm/cache/EhConfigurationReaderTest.java index c501d21076..d1f6b2c5f9 100644 --- a/scm-webapp/src/test/java/sonia/scm/cache/EhConfigurationReaderTest.java +++ b/scm-webapp/src/test/java/sonia/scm/cache/EhConfigurationReaderTest.java @@ -76,7 +76,7 @@ public class EhConfigurationReaderTest public void testDefaultConfiguration() { EhConfigurationTestReader reader = - new EhConfigurationTestReader("cache.001.xml"); + new EhConfigurationTestReader("ehcache.001.xml"); Configuration c = createConfiguration(reader); checkDefaultConfiguration(c); @@ -92,7 +92,7 @@ public class EhConfigurationReaderTest public void testGlobalAttributes() { EhConfigurationTestReader reader = - new EhConfigurationTestReader("cache.006.xml"); + new EhConfigurationTestReader("ehcache.006.xml"); Configuration c = createConfiguration(reader); assertFalse(c.getUpdateCheck()); @@ -108,9 +108,9 @@ public class EhConfigurationReaderTest { //J- EhConfigurationTestReader reader = new EhConfigurationTestReader( - "cache.001.xml", - Iterators.forArray("cache.002.xml", "cache.003.xml"), - "cache.004.xml" + "ehcache.001.xml", + Iterators.forArray("ehcache.002.xml", "ehcache.003.xml"), + "ehcache.004.xml" ); //J+ @@ -130,7 +130,7 @@ public class EhConfigurationReaderTest public void testMergeWithManualConfiguration() { EhConfigurationTestReader reader = - new EhConfigurationTestReader("cache.001.xml", null, "cache.002.xml"); + new EhConfigurationTestReader("ehcache.001.xml", null, "ehcache.002.xml"); Configuration c = createConfiguration(reader); @@ -148,8 +148,8 @@ public class EhConfigurationReaderTest public void testMergeWithModuleConfigurations() { EhConfigurationTestReader reader = - new EhConfigurationTestReader("cache.001.xml", - Iterators.forArray("cache.002.xml", "cache.003.xml")); + new EhConfigurationTestReader("ehcache.001.xml", + Iterators.forArray("ehcache.002.xml", "ehcache.003.xml")); Configuration c = createConfiguration(reader); @@ -181,8 +181,8 @@ public class EhConfigurationReaderTest { //J- EhConfigurationTestReader reader = new EhConfigurationTestReader( - "cache.001.xml", - Iterators.forArray("cache.005.xml") + "ehcache.001.xml", + Iterators.forArray("ehcache.005.xml") ); //J+ Configuration c = createConfiguration(reader); @@ -198,7 +198,7 @@ public class EhConfigurationReaderTest public void testOverrideGlobalAttributes() { EhConfigurationTestReader reader = - new EhConfigurationTestReader("cache.006.xml", null, "cache.007.xml"); + new EhConfigurationTestReader("ehcache.006.xml", null, "ehcache.007.xml"); Configuration c = createConfiguration(reader); assertTrue(c.getUpdateCheck()); diff --git a/scm-webapp/src/test/resources/sonia/scm/cache/cache.001.xml b/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.001.xml similarity index 100% rename from scm-webapp/src/test/resources/sonia/scm/cache/cache.001.xml rename to scm-webapp/src/test/resources/sonia/scm/cache/ehcache.001.xml diff --git a/scm-webapp/src/test/resources/sonia/scm/cache/cache.002.xml b/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.002.xml similarity index 100% rename from scm-webapp/src/test/resources/sonia/scm/cache/cache.002.xml rename to scm-webapp/src/test/resources/sonia/scm/cache/ehcache.002.xml diff --git a/scm-webapp/src/test/resources/sonia/scm/cache/cache.003.xml b/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.003.xml similarity index 100% rename from scm-webapp/src/test/resources/sonia/scm/cache/cache.003.xml rename to scm-webapp/src/test/resources/sonia/scm/cache/ehcache.003.xml diff --git a/scm-webapp/src/test/resources/sonia/scm/cache/cache.004.xml b/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.004.xml similarity index 100% rename from scm-webapp/src/test/resources/sonia/scm/cache/cache.004.xml rename to scm-webapp/src/test/resources/sonia/scm/cache/ehcache.004.xml diff --git a/scm-webapp/src/test/resources/sonia/scm/cache/cache.005.xml b/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.005.xml similarity index 100% rename from scm-webapp/src/test/resources/sonia/scm/cache/cache.005.xml rename to scm-webapp/src/test/resources/sonia/scm/cache/ehcache.005.xml diff --git a/scm-webapp/src/test/resources/sonia/scm/cache/cache.006.xml b/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.006.xml similarity index 100% rename from scm-webapp/src/test/resources/sonia/scm/cache/cache.006.xml rename to scm-webapp/src/test/resources/sonia/scm/cache/ehcache.006.xml diff --git a/scm-webapp/src/test/resources/sonia/scm/cache/cache.007.xml b/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.007.xml similarity index 100% rename from scm-webapp/src/test/resources/sonia/scm/cache/cache.007.xml rename to scm-webapp/src/test/resources/sonia/scm/cache/ehcache.007.xml