Adding tests for meter service.
Change-Id: Ic220fdaa89b421661019f1a6ef23c7b02eef127c
diff --git a/core/api/src/test/java/org/onosproject/store/service/TestConsistentMap.java b/core/api/src/test/java/org/onosproject/store/service/TestConsistentMap.java
index c45f696..0136a94 100644
--- a/core/api/src/test/java/org/onosproject/store/service/TestConsistentMap.java
+++ b/core/api/src/test/java/org/onosproject/store/service/TestConsistentMap.java
@@ -21,6 +21,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicLong;
import java.util.function.BiFunction;
import java.util.function.Function;
import java.util.function.Predicate;
@@ -38,6 +39,7 @@
private final List<MapEventListener<K, V>> listeners;
private final HashMap<K, V> map;
private final String mapName;
+ private final AtomicLong counter = new AtomicLong(0);
private TestConsistentMap(String mapName) {
map = new HashMap<>();
@@ -46,7 +48,7 @@
}
private Versioned<V> version(V v) {
- return new Versioned<>(v, 1, System.currentTimeMillis());
+ return new Versioned<>(v, counter.incrementAndGet(), System.currentTimeMillis());
}
/**
@@ -115,8 +117,12 @@
@Override
public Versioned<V> put(K key, V value) {
- Versioned<V> result = version(map.put(key, value));
- notifyListeners(mapName, INSERT, key, result);
+ Versioned<V> result = version(value);
+ if (map.put(key, value) == null) {
+ notifyListeners(mapName, INSERT, key, result);
+ } else {
+ notifyListeners(mapName, UPDATE, key, result);
+ }
return result;
}
@@ -213,6 +219,11 @@
listeners.remove(listener);
}
+ @Override
+ public Map<K, V> asJavaMap() {
+ return map;
+ }
+
public static Builder builder() {
return new Builder();
}