commit 8eb6ba155b8f7cedc624bc0d7f52ff1f4007e50c
author HIGUCHI Yuta <y-higuchi@ak.jp.nec.com> Sat May 21 15:01:41 2016 -0700
committer Ray Milkey <ray@onlab.us> Mon May 23 18:18:21 2016 +0000
tree 4ad042bb74b61dc9a6411dc65931788f56066b1b
parent 5acc88a7061a2121f2d21e80b21865f2d803f7fd

Consolidate code clones in Persistent* tests.

Change-Id: Ib46e300a3b3af36eab923e43f1b1faee7b1e2d38

core/store/persistence/src/test/java/org/onosproject/persistence/impl/PersistentSetTest.java

diff --git a/core/store/persistence/src/test/java/org/onosproject/persistence/impl/PersistentSetTest.java b/core/store/persistence/src/test/java/org/onosproject/persistence/impl/PersistentSetTest.java
index 39a2298..a5df479 100644
--- a/core/store/persistence/src/test/java/org/onosproject/persistence/impl/PersistentSetTest.java
+++ b/core/store/persistence/src/test/java/org/onosproject/persistence/impl/PersistentSetTest.java
@@ -17,13 +17,8 @@
 package org.onosproject.persistence.impl;
 
 import com.google.common.collect.Sets;
-import org.junit.After;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.mapdb.DB;
-import org.mapdb.DBMaker;
 import org.onosproject.store.service.Serializer;
 
 import java.util.HashSet;
@@ -40,23 +35,14 @@
 /**
  * Test suite for Persistent Set.
  */
-public class PersistentSetTest {
+public class PersistentSetTest extends MapDBTest {
 
-    private Set<Integer> set = null;
-    private DB fakeDB = null;
-
-    @Rule
-    public TemporaryFolder tmpFolder = new TemporaryFolder();
+    private PersistentSet<Integer> set = null;
 
     @Before
     public void setUp() throws Exception {
-        //Creates a db, a set within it and a basic integer serializer (async writing is off)
-        fakeDB = DBMaker
-                .newFileDB(tmpFolder.newFile("testDb"))
-                .asyncWriteEnable()
-                .closeOnJvmShutdown()
-                .make();
-        set = new PersistentSet<Integer>(new Serializer() {
+        //Creates a set within it and a basic integer serializer
+        set = new PersistentSet<>(new Serializer() {
             @Override
             public <T> byte[] encode(T object) {
                 if (object == null) {
@@ -84,20 +70,12 @@
                 num = num | bytes[2] << 8;
                 num = num | bytes[3];
 
-                return (T) new java.lang.Integer(num);
+                return (T) Integer.valueOf(num);
             }
         }, fakeDB, "set");
 
     }
 
-    @After
-    public void tearDown() throws Exception {
-        set.clear();
-        fakeDB.delete("map:map");
-        fakeDB.commit();
-        fakeDB.close();
-    }
-
     @Test
     public void testSize() throws Exception {
         //Check correct sizing throughout population