mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-25 06:11:05 +02:00
Code Issues Projects Releases Wiki Activity

Fix EventuallyConsistentMapImpl unit tests.

Browse Source 
Change-Id: I5d114bac40c16d0f67330ba2b4b922a4301666b2
This commit is contained in:
Madan Jampani 2015-02-19 12:31:37 -08:00
parent 04f46155be
commit b28e4ad8de
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/store/dist/src/main/java/org/onosproject/store/ecmap/EventuallyConsistentMapImpl.java vendored
View File

@ -85,7 +85,7 @@ public class EventuallyConsistentMapImpl<K, V>
private final ScheduledExecutorService backgroundExecutor; private final ScheduledExecutorService backgroundExecutor;
private final ExecutorService broadcastMessageExecutor; private ExecutorService broadcastMessageExecutor;
private volatile boolean destroyed = false; private volatile boolean destroyed = false;
private static final String ERROR_DESTROYED = " map is already destroyed"; private static final String ERROR_DESTROYED = " map is already destroyed";
@ -188,6 +188,18 @@ public class EventuallyConsistentMapImpl<K, V>
}; };
} }
/**
* Sets the executor to use for broadcasting messages and returns this
* instance for method chaining.
* @param executor executor service
* @return this instance
*/
public EventuallyConsistentMapImpl<K, V> withBroadcastMessageExecutor(ExecutorService executor) {
checkNotNull(executor, "Null executor");
broadcastMessageExecutor = executor;
return this;
}
@Override @Override
public int size() { public int size() {
checkState(!destroyed, mapName + ERROR_DESTROYED); checkState(!destroyed, mapName + ERROR_DESTROYED);

7
core/store/dist/src/test/java/org/onosproject/store/ecmap/EventuallyConsistentMapImplTest.java vendored
View File

@ -17,10 +17,10 @@ package org.onosproject.store.ecmap;
import com.google.common.collect.ComparisonChain; import com.google.common.collect.ComparisonChain;
import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.MoreExecutors;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.onlab.packet.IpAddress; import org.onlab.packet.IpAddress;
import org.onlab.util.KryoNamespace; import org.onlab.util.KryoNamespace;
@ -60,8 +60,6 @@ import static org.junit.Assert.fail;
/** /**
* Unit tests for EventuallyConsistentMapImpl. * Unit tests for EventuallyConsistentMapImpl.
*/ */
// FIXME: fix this test
@Ignore
public class EventuallyConsistentMapImplTest { public class EventuallyConsistentMapImplTest {
private EventuallyConsistentMap<String, String> ecMap; private EventuallyConsistentMap<String, String> ecMap;
@ -144,7 +142,8 @@ public class EventuallyConsistentMapImplTest {
ecMap = new EventuallyConsistentMapImpl<>(MAP_NAME, clusterService, ecMap = new EventuallyConsistentMapImpl<>(MAP_NAME, clusterService,
clusterCommunicator, clusterCommunicator,
serializer, clockService); serializer, clockService)
.withBroadcastMessageExecutor(MoreExecutors.newDirectExecutorService());
// Reset ready for tests to add their own expectations // Reset ready for tests to add their own expectations
reset(clusterCommunicator); reset(clusterCommunicator);