svn commit: r1739117 - /jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentGraphTest.java

[frm]

Author: frm
Date: Thu Apr 14 14:17:23 2016
New Revision: 1739117

URL: http://svn.apache.org/viewvc?rev=1739117&view=rev
Log:
OAK-4205 - Delete the temporary folder created by SegmentGraphTest on tear down

Modified:
    
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentGraphTest.java

Modified: 
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentGraphTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentGraphTest.java?rev=1739117&r1=1739116&r2=1739117&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentGraphTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentGraphTest.java
 Thu Apr 14 14:17:23 2016
@@ -48,9 +48,12 @@ import org.apache.commons.io.IOUtils;
 import org.apache.jackrabbit.oak.plugins.segment.SegmentGraph.Graph;
 import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
 import org.apache.jackrabbit.oak.plugins.segment.file.FileStore.ReadOnlyStore;
+import org.apache.jackrabbit.oak.spi.security.principal.SystemPrincipal;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 
 public class SegmentGraphTest {
     private final Set<UUID> segments = newHashSet(
@@ -92,25 +95,22 @@ public class SegmentGraphTest {
         "1", singleton("0")
     );
 
-    private File storeDir;
+    @Rule
+    public TemporaryFolder storeFolder = new TemporaryFolder();
 
-    @Before
-    public void setup() throws IOException {
-        storeDir = createTempFile(SegmentGraph.class.getSimpleName(), null);
-        storeDir.delete();
-        storeDir.mkdir();
-
-        unzip(SegmentGraphTest.class.getResourceAsStream("file-store.zip"), 
storeDir);
+    private File getStoreFolder() {
+        return storeFolder.getRoot();
     }
 
-    @After
-    public void tearDown() {
-        storeDir.delete();
+    @Before
+    public void setup() throws IOException {
+        System.out.println(getStoreFolder());
+        unzip(SegmentGraphTest.class.getResourceAsStream("file-store.zip"), 
getStoreFolder());
     }
 
     @Test
     public void testSegmentGraph() throws IOException {
-        ReadOnlyStore store = FileStore.builder(storeDir).buildReadOnly();
+        ReadOnlyStore store = 
FileStore.builder(getStoreFolder()).buildReadOnly();
         try {
             Graph<UUID> segmentGraph = parseSegmentGraph(store, 
Predicates.<UUID>alwaysTrue());
             assertEquals(segments, newHashSet(segmentGraph.vertices()));
@@ -126,7 +126,7 @@ public class SegmentGraphTest {
 
     @Test
     public void testSegmentGraphWithFilter() throws IOException {
-        ReadOnlyStore store = FileStore.builder(storeDir).buildReadOnly();
+        ReadOnlyStore store = 
FileStore.builder(getStoreFolder()).buildReadOnly();
         try {
             Predicate<UUID> filter = createRegExpFilter(".*testWriter.*", 
store.getTracker());
             Graph<UUID> segmentGraph = parseSegmentGraph(store, filter);
@@ -143,7 +143,7 @@ public class SegmentGraphTest {
 
     @Test
     public void testGCGraph() throws IOException {
-        ReadOnlyStore store = FileStore.builder(storeDir).buildReadOnly();
+        ReadOnlyStore store = 
FileStore.builder(getStoreFolder()).buildReadOnly();
         try {
             Graph<String> gcGraph = SegmentGraph.parseGCGraph(store);
             assertEquals(gcGenerations, newHashSet(gcGraph.vertices()));