improve cache unit tests

scm-webapp/src/test/java/sonia/scm/cache/CacheTestUtil.java

@@ -0,0 +1,77 @@
+/**
+ * Copyright (c) 2010, Sebastian Sdorra All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer. 2. Redistributions in
+ * binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other
+ * materials provided with the distribution. 3. Neither the name of SCM-Manager;
+ * nor the names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * http://bitbucket.org/sdorra/scm-manager
+ *
+ */
+
+
+
+package sonia.scm.cache;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.util.Collections;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+public final class CacheTestUtil
+{
+
+  /**
+   * Constructs ...
+   *
+   */
+  private CacheTestUtil() {}
+
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  public static EhCacheManager createDefaultEhCacheManager()
+  {
+    return new EhCacheManager(net.sf.ehcache.CacheManager.create());
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  public static GuavaCacheManager createDefaultGuavaCacheManager()
+  {
+    GuavaCacheConfiguration config = new GuavaCacheConfiguration();
+
+    return new GuavaCacheManager(new GuavaCacheManagerConfiguration(config,
+      Collections.EMPTY_LIST));
+  }
+}

scm-webapp/src/test/java/sonia/scm/cache/EhCacheTest.java

@@ -49,6 +49,6 @@ public class EhCacheTest extends CacheTestBase
   @Override
   protected CacheManager createCacheManager()
   {
-    return new EhCacheManager(net.sf.ehcache.CacheManager.create());
+    return CacheTestUtil.createDefaultEhCacheManager();
   }
 }

scm-webapp/src/test/java/sonia/scm/cache/GuavaCacheTest.java

@@ -33,8 +33,6 @@ package sonia.scm.cache;
 
 //~--- JDK imports ------------------------------------------------------------
 
-import java.util.Collections;
-
 /**
  *
  * @author Sebastian Sdorra
@@ -51,9 +49,6 @@ public class GuavaCacheTest extends CacheTestBase
   @Override
   protected CacheManager createCacheManager()
   {
-    GuavaCacheConfiguration config = new GuavaCacheConfiguration();
+    return CacheTestUtil.createDefaultGuavaCacheManager();
-
-    return new GuavaCacheManager(new GuavaCacheManagerConfiguration(config,
-      Collections.EMPTY_LIST));
   }
 }