commit 95c9e0fdea43e5b00889fb8a4d53447ac02a7c1d
author Ray Milkey <ray@opennetworking.org> Wed May 30 14:16:37 2018 -0700
committer Ray Milkey <ray@opennetworking.org> Wed May 30 15:37:37 2018 -0700
tree 4aade57e8ae2488c5dc34b4d40ff3bf922818d1d
parent cd3e6927c405790dc67093cf6f1c2a58b0ffea80

Upgrage EasyMock to version 3.6

Change-Id: Ib87cf414ca849cb19dc68a416de1e236d917aa8c

core/net/src/test/java/org/onosproject/net/flowobjective/impl/InOrderFlowObjectiveManagerTest.java

diff --git a/core/net/src/test/java/org/onosproject/net/flowobjective/impl/InOrderFlowObjectiveManagerTest.java b/core/net/src/test/java/org/onosproject/net/flowobjective/impl/InOrderFlowObjectiveManagerTest.java
index 7ce1c16..9797442 100644
--- a/core/net/src/test/java/org/onosproject/net/flowobjective/impl/InOrderFlowObjectiveManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/flowobjective/impl/InOrderFlowObjectiveManagerTest.java
@@ -181,7 +181,9 @@
         private void recordObjective(Objective obj) {
             try {
                 Thread.sleep(new Random().nextInt(bound) + offset);
-                actualObjs.add(obj);
+                if (!actualObjs.contains(obj)) {
+                    actualObjs.add(obj);
+                }
                 obj.context().ifPresent(c -> c.onSuccess(obj));
             } catch (Exception e) {
                 obj.context().ifPresent(c -> c.onError(obj, ObjectiveError.UNKNOWN));
@@ -244,7 +246,7 @@
 
     @Test
     public void forwardTimeout() {
-        expect(mgr.flowObjectiveStore.getNextGroup(NID1)).andReturn(NGRP1).times(1);
+        expect(mgr.flowObjectiveStore.getNextGroup(NID1)).andReturn(NGRP1).times(2);
         expect(mgr.flowObjectiveStore.getNextGroup(NID2)).andReturn(NGRP2).times(2);
         replay(mgr.flowObjectiveStore);