Return Set instead of Iterable in test

Method signature will be changed to Set to define equality, prepare
for that.

Change-Id: I6d0754e21196e03727400631d20d85fe4c84f903
Signed-off-by: Robert Varga <[email protected]>

diff --git a/sfc-ovs/src/test/java/org/opendaylight/sfc/ovs/AbstractDataStoreManager.java b/sfc-ovs/src/test/java/org/opendaylight/sfc/ovs/AbstractDataStoreManager.java
index 3a1fdc2fd40d1b143ca21fe09e8fb7dfd7e24a1a..efabcf3569ac1a2042e775e6a50bf42690ee912d 100644 (file)
--- a/sfc-ovs/src/test/java/org/opendaylight/sfc/ovs/AbstractDataStoreManager.java
+++ b/sfc-ovs/src/test/java/org/opendaylight/sfc/ovs/AbstractDataStoreManager.java
@@ -12,6 +12,7 @@ import static com.google.common.base.Preconditions.checkState;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSet.Builder;
 import java.io.IOException;
+import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -66,7 +67,7 @@ public class AbstractDataStoreManager extends AbstractConcurrentDataBrokerTest {
      * performance Specify a class from YANG which should be loaded
      */
     @Override
-    protected Iterable<YangModuleInfo> getModuleInfos() throws Exception {
+    protected Set<YangModuleInfo> getModuleInfos() throws Exception {
         Builder<YangModuleInfo> moduleInfoSet = ImmutableSet.<YangModuleInfo>builder();
         loadModuleInfos(ServiceFunction.class, moduleInfoSet);
         loadModuleInfos(ServiceFunctionForwarder.class, moduleInfoSet);

diff --git a/sfc-provider/src/test/java/org/opendaylight/sfc/provider/AbstractDataStoreManager.java b/sfc-provider/src/test/java/org/opendaylight/sfc/provider/AbstractDataStoreManager.java
index b96b2a45c79ad498e1b1e8e9e77800eb18b4a2d7..75f54e65d1e344961f21c8b64efe2e7c26eab737 100644 (file)
--- a/sfc-provider/src/test/java/org/opendaylight/sfc/provider/AbstractDataStoreManager.java
+++ b/sfc-provider/src/test/java/org/opendaylight/sfc/provider/AbstractDataStoreManager.java
@@ -13,6 +13,7 @@ import static com.google.common.base.Preconditions.checkState;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSet.Builder;
 import java.io.IOException;
+import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -78,7 +79,7 @@ public abstract class AbstractDataStoreManager extends AbstractConcurrentDataBro
      * YANG which should be loaded
      */
     @Override
-    protected Iterable<YangModuleInfo> getModuleInfos() throws Exception {
+    protected Set<YangModuleInfo> getModuleInfos() throws Exception {
         Builder<YangModuleInfo> moduleInfoSet = ImmutableSet.<YangModuleInfo>builder();
         loadModuleInfos(ServiceFunction.class, moduleInfoSet);
         loadModuleInfos(ServiceFunctionForwarder.class, moduleInfoSet);

diff --git a/sfc-statistics/src/test/java/org/opendaylight/sfc/statistics/testutils/AbstractDataStoreManager.java b/sfc-statistics/src/test/java/org/opendaylight/sfc/statistics/testutils/AbstractDataStoreManager.java
index 8d87f185f5fb62138abc0826dd4998632692a7c0..2da4f4a5f05022585aa56e0ebd450ef7ec5bc5ab 100644 (file)
--- a/sfc-statistics/src/test/java/org/opendaylight/sfc/statistics/testutils/AbstractDataStoreManager.java
+++ b/sfc-statistics/src/test/java/org/opendaylight/sfc/statistics/testutils/AbstractDataStoreManager.java
@@ -13,6 +13,7 @@ import static com.google.common.base.Preconditions.checkState;
 import com.google.common.collect.ImmutableSet;
 
 import java.io.IOException;
+import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -64,7 +65,7 @@ public class AbstractDataStoreManager extends AbstractConcurrentDataBrokerTest {
      * YANG which should be loaded
      */
     @Override
-    protected Iterable<YangModuleInfo> getModuleInfos() throws Exception {
+    protected Set<YangModuleInfo> getModuleInfos() throws Exception {
         ImmutableSet.Builder<YangModuleInfo> moduleInfoSet = ImmutableSet.<YangModuleInfo>builder();
         loadModuleInfos(Nodes.class, moduleInfoSet);
         loadModuleInfos(FlowCapableNode.class, moduleInfoSet);