1 files changed, 35 insertions, 13 deletions
diff --git a/src/test/java/com/amazon/carbonado/TestUtilities.java b/src/test/java/com/amazon/carbonado/TestUtilities.java
index 4132ac8..520dba7 100644
--- a/src/test/java/com/amazon/carbonado/TestUtilities.java
+++ b/src/test/java/com/amazon/carbonado/TestUtilities.java
@@ -82,6 +82,39 @@ public class TestUtilities {
     }
 
     public static Repository buildTempRepository(String name, int capacity, boolean isMaster) {
+        RepositoryBuilder builder = newTempRepositoryBuilder(name, capacity, isMaster);
+
+        try {
+            return builder.build();
+        } catch (RepositoryException e) {
+            throw new UnsupportedOperationException("Could not create repository", e);
+        }
+    }
+
+    public static RepositoryBuilder newTempRepositoryBuilder() {
+        return newTempRepositoryBuilder("test");
+    }
+
+    public static RepositoryBuilder newTempRepositoryBuilder(boolean isMaster) {
+        return newTempRepositoryBuilder("test", isMaster);
+    }
+
+    public static RepositoryBuilder newTempRepositoryBuilder(String name) {
+        return newTempRepositoryBuilder(name, DEFAULT_CAPACITY);
+    }
+
+    public static RepositoryBuilder newTempRepositoryBuilder(String name, boolean isMaster) {
+        return newTempRepositoryBuilder(name, DEFAULT_CAPACITY, isMaster);
+    }
+
+    public static RepositoryBuilder newTempRepositoryBuilder(String name, int capacity) {
+        return newTempRepositoryBuilder(name, capacity, true);
+    }
+
+    public static RepositoryBuilder newTempRepositoryBuilder(String name,
+                                                             int capacity,
+                                                             boolean isMaster)
+    {
         BDBRepositoryBuilder builder = new BDBRepositoryBuilder();
         builder.setProduct("JE");
         builder.setName(name);
@@ -89,22 +122,11 @@ public class TestUtilities {
         builder.setCacheSize(capacity);
         builder.setLogInMemory(true);
         builder.setMaster(isMaster);
+        builder.setEnvironmentHome(makeTestDirectoryString(name));
 
-        if (sTempRepoDir == null) {
-            sTempRepoDir = makeTestDirectoryString(name);
-        }
-
-        builder.setEnvironmentHome(sTempRepoDir);
-
-        try {
-            return builder.build();
-        } catch (RepositoryException e) {
-            throw new UnsupportedOperationException("Could not create repository", e);
-        }
+        return builder;
     }
 
-    private static String sTempRepoDir;
-
     private static String sAlphabet = "abcdefghijklmnopqrstuvwxyz";
     private static Random sNumbers = new Random();