commit 71ade56cbf72c38be4e7aa80a234184034d03b69
author Ray Milkey <ray@onlab.us> Wed Feb 18 15:08:07 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Fri Feb 20 00:59:03 2015 +0000
tree ae6ccbd94654e6f120bb917b1c9fd5e4b7840396
parent 97cf7c4138428d706e1dce459f58958569a706fc

Refactor Intent subsystem to eliminate using FlowRuleBatchOperation

Change-Id: Iee76dac5fa9935713ffc370b34ac47d9286ff351

core/net/src/test/java/org/onosproject/net/intent/impl/PathConstraintCalculationTest.java

diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/PathConstraintCalculationTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/PathConstraintCalculationTest.java
index 9f69e65..5a5611b 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/PathConstraintCalculationTest.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/PathConstraintCalculationTest.java
@@ -17,9 +17,10 @@
 
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 
 import org.junit.Test;
-import org.onosproject.net.flow.FlowRuleBatchOperation;
+import org.onosproject.net.flow.FlowRuleOperation;
 import org.onosproject.net.flow.TrafficSelector;
 import org.onosproject.net.flow.TrafficTreatment;
 import org.onosproject.net.intent.AbstractIntentTest;
@@ -96,9 +97,9 @@
      *
      * @param compiledIntents list of compiled intents
      * @param resourceService service to use for resource allocation requests
-     * @return
+     * @return fow rule entries
      */
-    private List<FlowRuleBatchOperation> installIntents(List<Intent> compiledIntents,
+    private List<Set<FlowRuleOperation>> installIntents(List<Intent> compiledIntents,
                                                         LinkResourceService resourceService) {
         final PathIntent path = (PathIntent) compiledIntents.get(0);
 
@@ -192,7 +193,7 @@
         assertThat(compiledIntents, notNullValue());
         assertThat(compiledIntents, hasSize(1));
 
-        final List<FlowRuleBatchOperation> flowOperations =
+        final List<Set<FlowRuleOperation>> flowOperations =
                 installIntents(compiledIntents, resourceService);
 
         assertThat(flowOperations, notNullValue());
@@ -241,7 +242,7 @@
         assertThat(compiledIntents, notNullValue());
         assertThat(compiledIntents, hasSize(1));
 
-        final List<FlowRuleBatchOperation> flowOperations =
+        final List<Set<FlowRuleOperation>> flowOperations =
                 installIntents(compiledIntents, resourceService);
 
         assertThat(flowOperations, notNullValue());