commit 2bf177cfa3fca0df86733043c8ee44aaac87aa52
author Jordan Halterman <jordan@onlab.us> Thu Jun 29 01:49:08 2017 -0700
committer Ray Milkey <ray@opennetworking.org> Thu Jul 13 20:29:21 2017 +0000
tree e0e9d7dbae547c52ffff0900e68073da2067c91a
parent 2cfe8ef782a45f4b9be720c321658d29790e9764

[ONOS-6594] Upgrade to Atomix 2.0.0

Change-Id: I6534bca1c8570b4e017f682953b876da29146675

core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentTreeMapTest.java

diff --git a/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentTreeMapTest.java b/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentTreeMapTest.java
index bbaaf57..f1de625 100644
--- a/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentTreeMapTest.java
+++ b/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentTreeMapTest.java
@@ -15,16 +15,6 @@
  */
 package org.onosproject.store.primitives.resources.impl;
 
-import com.google.common.base.Throwables;
-import com.google.common.collect.Lists;
-import io.atomix.resource.ResourceType;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.onlab.util.Tools;
-import org.onosproject.store.service.MapEvent;
-import org.onosproject.store.service.MapEventListener;
-
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
@@ -33,6 +23,15 @@
 import java.util.concurrent.BlockingQueue;
 import java.util.stream.Collectors;
 
+import com.google.common.base.Throwables;
+import com.google.common.collect.Lists;
+import io.atomix.protocols.raft.proxy.RaftProxy;
+import io.atomix.protocols.raft.service.RaftService;
+import org.junit.Test;
+import org.onlab.util.Tools;
+import org.onosproject.store.service.MapEvent;
+import org.onosproject.store.service.MapEventListener;
+
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -44,7 +43,7 @@
 /**
  * Unit tests for {@link AtomixConsistentTreeMap}.
  */
-public class AtomixConsistentTreeMapTest extends AtomixTestBase {
+public class AtomixConsistentTreeMapTest extends AtomixTestBase<AtomixConsistentTreeMap> {
     private final String keyFour = "hello";
     private final String keyThree = "goodbye";
     private final String keyTwo = "foo";
@@ -60,19 +59,15 @@
                                                               valueTwo,
                                                               valueThree,
                                                               valueFour);
-    @BeforeClass
-    public static void preTestSetup() throws Throwable {
-        createCopycatServers(3);
-    }
 
-    @AfterClass
-    public static void postTestCleanup() throws Throwable {
-        clearTests();
+    @Override
+    protected RaftService createService() {
+        return new AtomixConsistentTreeMapService();
     }
 
     @Override
-    protected ResourceType resourceType() {
-        return new ResourceType(AtomixConsistentTreeMap.class);
+    protected AtomixConsistentTreeMap createPrimitive(RaftProxy proxy) {
+        return new AtomixConsistentTreeMap(proxy);
     }
 
     /**
@@ -359,7 +354,9 @@
         map.ceilingKey(keyOne).thenAccept(result -> assertNull(result))
                 .join();
         map.higherKey(keyOne).thenAccept(result -> assertNull(result)).join();
-        map.delete().join();
+
+        // TODO: delete() is not supported
+        //map.delete().join();
 
         allKeys.forEach(key -> map.put(
                 key, allValues.get(allKeys.indexOf(key)))
@@ -481,15 +478,14 @@
         map.higherKey(keyFour).thenAccept(
                 result -> assertNull(result))
                 .join();
-        map.delete().join();
 
+        // TODO: delete() is not supported
+        //map.delete().join();
     }
 
     private AtomixConsistentTreeMap createResource(String mapName) {
         try {
-            AtomixConsistentTreeMap map = createAtomixClient().
-                    getResource(mapName, AtomixConsistentTreeMap.class)
-                    .join();
+            AtomixConsistentTreeMap map = newPrimitive(mapName);
             return map;
         } catch (Throwable e) {
             throw new RuntimeException(e.toString());