Remove testDb file after JUnit run
- Using TemporaryFolder rule should ensure that they'll be removed regardless of test results. Change-Id: I75539ae38aa0a8c3f8c00437f28c007422cd72c6
Showing
2 changed files
with
11 additions
and
10 deletions
... | @@ -19,12 +19,13 @@ package org.onosproject.persistence.impl; | ... | @@ -19,12 +19,13 @@ package org.onosproject.persistence.impl; |
19 | import com.google.common.collect.Maps; | 19 | import com.google.common.collect.Maps; |
20 | import org.junit.After; | 20 | import org.junit.After; |
21 | import org.junit.Before; | 21 | import org.junit.Before; |
22 | +import org.junit.Rule; | ||
22 | import org.junit.Test; | 23 | import org.junit.Test; |
24 | +import org.junit.rules.TemporaryFolder; | ||
23 | import org.mapdb.DB; | 25 | import org.mapdb.DB; |
24 | import org.mapdb.DBMaker; | 26 | import org.mapdb.DBMaker; |
25 | import org.onosproject.store.service.Serializer; | 27 | import org.onosproject.store.service.Serializer; |
26 | 28 | ||
27 | -import java.nio.file.Paths; | ||
28 | import java.util.Map; | 29 | import java.util.Map; |
29 | import java.util.Set; | 30 | import java.util.Set; |
30 | 31 | ||
... | @@ -41,6 +42,8 @@ public class PersistentMapTest { | ... | @@ -41,6 +42,8 @@ public class PersistentMapTest { |
41 | private Map<Integer, Integer> map = null; | 42 | private Map<Integer, Integer> map = null; |
42 | private DB fakeDB = null; | 43 | private DB fakeDB = null; |
43 | 44 | ||
45 | + @Rule | ||
46 | + public TemporaryFolder tmpFolder = new TemporaryFolder(); | ||
44 | 47 | ||
45 | /** | 48 | /** |
46 | * Set up the database, create a map and a direct executor to handle it. | 49 | * Set up the database, create a map and a direct executor to handle it. |
... | @@ -51,7 +54,7 @@ public class PersistentMapTest { | ... | @@ -51,7 +54,7 @@ public class PersistentMapTest { |
51 | public void setUp() throws Exception { | 54 | public void setUp() throws Exception { |
52 | //Creates a db, a map within it and a basic integer serializer (async writing is off) | 55 | //Creates a db, a map within it and a basic integer serializer (async writing is off) |
53 | fakeDB = DBMaker | 56 | fakeDB = DBMaker |
54 | - .newFileDB(Paths.get("../testDb").toFile()) | 57 | + .newFileDB(tmpFolder.newFile("testDb")) |
55 | .asyncWriteEnable() | 58 | .asyncWriteEnable() |
56 | .closeOnJvmShutdown() | 59 | .closeOnJvmShutdown() |
57 | .make(); | 60 | .make(); |
... | @@ -99,10 +102,6 @@ public class PersistentMapTest { | ... | @@ -99,10 +102,6 @@ public class PersistentMapTest { |
99 | fakeDB.delete("map:map"); | 102 | fakeDB.delete("map:map"); |
100 | fakeDB.commit(); | 103 | fakeDB.commit(); |
101 | fakeDB.close(); | 104 | fakeDB.close(); |
102 | - //This is key to prevent artifacts persisting between tests. | ||
103 | - Paths.get("../testDB").toFile().delete(); | ||
104 | - | ||
105 | - | ||
106 | } | 105 | } |
107 | 106 | ||
108 | @Test | 107 | @Test | ... | ... |
... | @@ -19,12 +19,13 @@ package org.onosproject.persistence.impl; | ... | @@ -19,12 +19,13 @@ package org.onosproject.persistence.impl; |
19 | import com.google.common.collect.Sets; | 19 | import com.google.common.collect.Sets; |
20 | import org.junit.After; | 20 | import org.junit.After; |
21 | import org.junit.Before; | 21 | import org.junit.Before; |
22 | +import org.junit.Rule; | ||
22 | import org.junit.Test; | 23 | import org.junit.Test; |
24 | +import org.junit.rules.TemporaryFolder; | ||
23 | import org.mapdb.DB; | 25 | import org.mapdb.DB; |
24 | import org.mapdb.DBMaker; | 26 | import org.mapdb.DBMaker; |
25 | import org.onosproject.store.service.Serializer; | 27 | import org.onosproject.store.service.Serializer; |
26 | 28 | ||
27 | -import java.nio.file.Paths; | ||
28 | import java.util.HashSet; | 29 | import java.util.HashSet; |
29 | import java.util.Set; | 30 | import java.util.Set; |
30 | 31 | ||
... | @@ -44,11 +45,14 @@ public class PersistentSetTest { | ... | @@ -44,11 +45,14 @@ public class PersistentSetTest { |
44 | private Set<Integer> set = null; | 45 | private Set<Integer> set = null; |
45 | private DB fakeDB = null; | 46 | private DB fakeDB = null; |
46 | 47 | ||
48 | + @Rule | ||
49 | + public TemporaryFolder tmpFolder = new TemporaryFolder(); | ||
50 | + | ||
47 | @Before | 51 | @Before |
48 | public void setUp() throws Exception { | 52 | public void setUp() throws Exception { |
49 | //Creates a db, a set within it and a basic integer serializer (async writing is off) | 53 | //Creates a db, a set within it and a basic integer serializer (async writing is off) |
50 | fakeDB = DBMaker | 54 | fakeDB = DBMaker |
51 | - .newFileDB(Paths.get("../testDb").toFile()) | 55 | + .newFileDB(tmpFolder.newFile("testDb")) |
52 | .asyncWriteEnable() | 56 | .asyncWriteEnable() |
53 | .closeOnJvmShutdown() | 57 | .closeOnJvmShutdown() |
54 | .make(); | 58 | .make(); |
... | @@ -92,8 +96,6 @@ public class PersistentSetTest { | ... | @@ -92,8 +96,6 @@ public class PersistentSetTest { |
92 | fakeDB.delete("map:map"); | 96 | fakeDB.delete("map:map"); |
93 | fakeDB.commit(); | 97 | fakeDB.commit(); |
94 | fakeDB.close(); | 98 | fakeDB.close(); |
95 | - //This is key to prevent artifacts persisting between tests. | ||
96 | - Paths.get("../testDB").toFile().delete(); | ||
97 | } | 99 | } |
98 | 100 | ||
99 | @Test | 101 | @Test | ... | ... |
-
Please register or login to post a comment