Remove testDb file after JUnit run

- Using TemporaryFolder rule should ensure that they'll be removed
  regardless of test results.

Change-Id: I75539ae38aa0a8c3f8c00437f28c007422cd72c6

@@ -19,12 +19,13 @@ package org.onosproject.persistence.impl;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Maps;
 import org.junit.After;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 import org.mapdb.DB;
 import org.mapdb.DB;
 import org.mapdb.DBMaker;
 import org.mapdb.DBMaker;
 import org.onosproject.store.service.Serializer;
 import org.onosproject.store.service.Serializer;
 
 
-import java.nio.file.Paths;
 import java.util.Map;
 import java.util.Map;
 import java.util.Set;
 import java.util.Set;
 
 
@@ -41,6 +42,8 @@ public class PersistentMapTest {
     private Map<Integer, Integer> map = null;
     private Map<Integer, Integer> map = null;
     private DB fakeDB = null;
     private DB fakeDB = null;
 
 
+    @Rule
+    public TemporaryFolder tmpFolder = new TemporaryFolder();
 
 
     /**
     /**
      * Set up the database, create a map and a direct executor to handle it.
      * Set up the database, create a map and a direct executor to handle it.
@@ -51,7 +54,7 @@ public class PersistentMapTest {
     public void setUp() throws Exception {
     public void setUp() throws Exception {
         //Creates a db, a map within it and a basic integer serializer (async writing is off)
         //Creates a db, a map within it and a basic integer serializer (async writing is off)
         fakeDB = DBMaker
         fakeDB = DBMaker
-                .newFileDB(Paths.get("../testDb").toFile())
+                .newFileDB(tmpFolder.newFile("testDb"))
                 .asyncWriteEnable()
                 .asyncWriteEnable()
                 .closeOnJvmShutdown()
                 .closeOnJvmShutdown()
                 .make();
                 .make();
@@ -99,10 +102,6 @@ public class PersistentMapTest {
         fakeDB.delete("map:map");
         fakeDB.delete("map:map");
         fakeDB.commit();
         fakeDB.commit();
         fakeDB.close();
         fakeDB.close();
-        //This is key to prevent artifacts persisting between tests.
-        Paths.get("../testDB").toFile().delete();
-
-
     }
     }
 
 
     @Test
     @Test

@@ -19,12 +19,13 @@ package org.onosproject.persistence.impl;
 import com.google.common.collect.Sets;
 import com.google.common.collect.Sets;
 import org.junit.After;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 import org.mapdb.DB;
 import org.mapdb.DB;
 import org.mapdb.DBMaker;
 import org.mapdb.DBMaker;
 import org.onosproject.store.service.Serializer;
 import org.onosproject.store.service.Serializer;
 
 
-import java.nio.file.Paths;
 import java.util.HashSet;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.Set;
 
 
@@ -44,11 +45,14 @@ public class PersistentSetTest {
     private Set<Integer> set = null;
     private Set<Integer> set = null;
     private DB fakeDB = null;
     private DB fakeDB = null;
 
 
+    @Rule
+    public TemporaryFolder tmpFolder = new TemporaryFolder();
+
     @Before
     @Before
     public void setUp() throws Exception {
     public void setUp() throws Exception {
         //Creates a db, a set within it and a basic integer serializer (async writing is off)
         //Creates a db, a set within it and a basic integer serializer (async writing is off)
         fakeDB = DBMaker
         fakeDB = DBMaker
-                .newFileDB(Paths.get("../testDb").toFile())
+                .newFileDB(tmpFolder.newFile("testDb"))
                 .asyncWriteEnable()
                 .asyncWriteEnable()
                 .closeOnJvmShutdown()
                 .closeOnJvmShutdown()
                 .make();
                 .make();
@@ -92,8 +96,6 @@ public class PersistentSetTest {
         fakeDB.delete("map:map");
         fakeDB.delete("map:map");
         fakeDB.commit();
         fakeDB.commit();
         fakeDB.close();
         fakeDB.close();
-        //This is key to prevent artifacts persisting between tests.
-        Paths.get("../testDB").toFile().delete();
     }
     }
 
 
     @Test
     @Test