Move FRM tests

We have a 'mock' and 'mock.util' top-level package. Move those into the
appropriate place.

JIRA: OPNFLWPLUG-1125
Change-Id: I3b0d9a4c73da8b9c25d2709887b2c4072efd4c1c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/applications/forwardingrules-manager/src/test/java/test/mock/util/AbstractFRMTest.java b/applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/AbstractFRMTest.java
similarity index 99%
rename from applications/forwardingrules-manager/src/test/java/test/mock/util/AbstractFRMTest.java
rename to applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/AbstractFRMTest.java
index 415463d87a849c0dd9cc1902181f4c80ff05232e..fcac189403853464ba810c38f3efb2f861862ef3 100644 (file)
--- a/applications/forwardingrules-manager/src/test/java/test/mock/util/AbstractFRMTest.java
+++ b/applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/AbstractFRMTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package test.mock.util;
+package org.opendaylight.openflowplugin.applications.frm.impl;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;

diff --git a/applications/forwardingrules-manager/src/test/java/test/mock/util/ArbitratorReconcileServiceMock.java b/applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/ArbitratorReconcileServiceMock.java
similarity index 97%
rename from applications/forwardingrules-manager/src/test/java/test/mock/util/ArbitratorReconcileServiceMock.java
rename to applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/ArbitratorReconcileServiceMock.java
index e03debd0cc9ae013f8c10a58f827101cb21c1995..65df8ed9de2da41a3c65d024cb75d8791322e72e 100644 (file)
--- a/applications/forwardingrules-manager/src/test/java/test/mock/util/ArbitratorReconcileServiceMock.java
+++ b/applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/ArbitratorReconcileServiceMock.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package test.mock.util;
+package org.opendaylight.openflowplugin.applications.frm.impl;
 
 import com.google.common.util.concurrent.ListenableFuture;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.app.arbitrator.reconcile.service.rev180227.ArbitratorReconcileService;

diff --git a/applications/forwardingrules-manager/src/test/java/test/mock/FlowListenerTest.java b/applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowListenerTest.java
similarity index 99%
rename from applications/forwardingrules-manager/src/test/java/test/mock/FlowListenerTest.java
rename to applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowListenerTest.java
index 40e09de167c6860cecf40c7381cbe119df53cb57..9eccb2517642add09d6d999259510c0b9e3ed2ef 100644 (file)
--- a/applications/forwardingrules-manager/src/test/java/test/mock/FlowListenerTest.java
+++ b/applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowListenerTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package test.mock;
+package org.opendaylight.openflowplugin.applications.frm.impl;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.awaitility.Awaitility.await;
@@ -45,8 +45,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.Uint32;
 import org.opendaylight.yangtools.yang.common.Uint8;
-import test.mock.util.AbstractFRMTest;
-import test.mock.util.SalFlowServiceMock;
 
 @RunWith(MockitoJUnitRunner.class)
 public class FlowListenerTest extends AbstractFRMTest {

diff --git a/applications/forwardingrules-manager/src/test/java/test/mock/GroupListenerTest.java b/applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/GroupListenerTest.java
similarity index 98%
rename from applications/forwardingrules-manager/src/test/java/test/mock/GroupListenerTest.java
rename to applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/GroupListenerTest.java
index 922fe2c0d585e903384c2f901be13b82906dbc24..13a473d79749719640c215659a185c41cf5e2db9 100644 (file)
--- a/applications/forwardingrules-manager/src/test/java/test/mock/GroupListenerTest.java
+++ b/applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/GroupListenerTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package test.mock;
+package org.opendaylight.openflowplugin.applications.frm.impl;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.awaitility.Awaitility.await;
@@ -36,8 +36,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.N
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.Uint32;
-import test.mock.util.AbstractFRMTest;
-import test.mock.util.SalGroupServiceMock;
 
 @RunWith(MockitoJUnitRunner.class)
 public class GroupListenerTest extends AbstractFRMTest {

diff --git a/applications/forwardingrules-manager/src/test/java/test/mock/MeterListenerTest.java b/applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/MeterListenerTest.java
similarity index 98%
rename from applications/forwardingrules-manager/src/test/java/test/mock/MeterListenerTest.java
rename to applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/MeterListenerTest.java
index 5789ae11258b9dca54c744123bf23f86d43e3dc4..9876250bbd220c4479fe085703ae5fcdc5e93958 100644 (file)
--- a/applications/forwardingrules-manager/src/test/java/test/mock/MeterListenerTest.java
+++ b/applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/MeterListenerTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package test.mock;
+package org.opendaylight.openflowplugin.applications.frm.impl;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.awaitility.Awaitility.await;
@@ -36,8 +36,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.Upd
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterId;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.Uint32;
-import test.mock.util.AbstractFRMTest;
-import test.mock.util.SalMeterServiceMock;
 
 @RunWith(MockitoJUnitRunner.class)
 public class MeterListenerTest extends AbstractFRMTest {

diff --git a/applications/forwardingrules-manager/src/test/java/test/mock/NodeListenerTest.java b/applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/NodeListenerTest.java
similarity index 97%
rename from applications/forwardingrules-manager/src/test/java/test/mock/NodeListenerTest.java
rename to applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/NodeListenerTest.java
index f860ff5ae9dd79e174c1c5175e987c9602c6b157..12afb50807a270f7d3df231bc9941885430b2c67 100644 (file)
--- a/applications/forwardingrules-manager/src/test/java/test/mock/NodeListenerTest.java
+++ b/applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/NodeListenerTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package test.mock;
+package org.opendaylight.openflowplugin.applications.frm.impl;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -24,7 +24,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import test.mock.util.AbstractFRMTest;
 
 @RunWith(MockitoJUnitRunner.class)
 public class NodeListenerTest extends AbstractFRMTest {

diff --git a/applications/forwardingrules-manager/src/test/java/test/mock/util/SalBundleServiceMock.java b/applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/SalBundleServiceMock.java
similarity index 97%
rename from applications/forwardingrules-manager/src/test/java/test/mock/util/SalBundleServiceMock.java
rename to applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/SalBundleServiceMock.java
index fd274e9102d78f5cec8a1ceaac6bb965cd5cd9d1..a979d5eb0c7491ea6a0cf6f4dc645f185e4f2c9a 100644 (file)
--- a/applications/forwardingrules-manager/src/test/java/test/mock/util/SalBundleServiceMock.java
+++ b/applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/SalBundleServiceMock.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package test.mock.util;
+package org.opendaylight.openflowplugin.applications.frm.impl;
 
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.ArrayList;

diff --git a/applications/forwardingrules-manager/src/test/java/test/mock/util/SalFlowServiceMock.java b/applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/SalFlowServiceMock.java
similarity index 97%
rename from applications/forwardingrules-manager/src/test/java/test/mock/util/SalFlowServiceMock.java
rename to applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/SalFlowServiceMock.java
index ad70c52182014da73a9ac37d0fa48216d5055398..5da2ba3066ed0e90e990b306120f6fa1e5e00265 100644 (file)
--- a/applications/forwardingrules-manager/src/test/java/test/mock/util/SalFlowServiceMock.java
+++ b/applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/SalFlowServiceMock.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package test.mock.util;
+package org.opendaylight.openflowplugin.applications.frm.impl;
 
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.ArrayList;

diff --git a/applications/forwardingrules-manager/src/test/java/test/mock/util/SalGroupServiceMock.java b/applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/SalGroupServiceMock.java
similarity index 97%
rename from applications/forwardingrules-manager/src/test/java/test/mock/util/SalGroupServiceMock.java
rename to applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/SalGroupServiceMock.java
index 80931b0837aeaefe1b30c6ca919e47359f228d42..bc12ead4260816b9562e33499e66a2e07f7503cb 100644 (file)
--- a/applications/forwardingrules-manager/src/test/java/test/mock/util/SalGroupServiceMock.java
+++ b/applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/SalGroupServiceMock.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package test.mock.util;
+package org.opendaylight.openflowplugin.applications.frm.impl;
 
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.ArrayList;

diff --git a/applications/forwardingrules-manager/src/test/java/test/mock/util/SalMeterServiceMock.java b/applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/SalMeterServiceMock.java
similarity index 97%
rename from applications/forwardingrules-manager/src/test/java/test/mock/util/SalMeterServiceMock.java
rename to applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/SalMeterServiceMock.java
index 0a44f0cf3ecccbd72299830f6a32392799b5efc2..0c7af61316773b9f717420ed110daddf0b5c4410 100644 (file)
--- a/applications/forwardingrules-manager/src/test/java/test/mock/util/SalMeterServiceMock.java
+++ b/applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/SalMeterServiceMock.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package test.mock.util;
+package org.opendaylight.openflowplugin.applications.frm.impl;
 
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.ArrayList;

diff --git a/applications/forwardingrules-manager/src/test/java/test/mock/util/SalTableServiceMock.java b/applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/SalTableServiceMock.java
similarity index 95%
rename from applications/forwardingrules-manager/src/test/java/test/mock/util/SalTableServiceMock.java
rename to applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/SalTableServiceMock.java
index de53bfa18eea3b58a1b1b017f4f9623769c94c63..585469ebe2abbca52d13d9eea15a6e31cd4aa3a9 100644 (file)
--- a/applications/forwardingrules-manager/src/test/java/test/mock/util/SalTableServiceMock.java
+++ b/applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/SalTableServiceMock.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package test.mock.util;
+package org.opendaylight.openflowplugin.applications.frm.impl;
 
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.ArrayList;

diff --git a/applications/forwardingrules-manager/src/test/java/test/mock/TableFeaturesListenerTest.java b/applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/TableFeaturesListenerTest.java
similarity index 97%
rename from applications/forwardingrules-manager/src/test/java/test/mock/TableFeaturesListenerTest.java
rename to applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/TableFeaturesListenerTest.java
index 0617a1912a7e1bf2c0729f4530382f6109aebc16..2e768c5c086b5ed7d0d1669b0418ea854b76ff1d 100644 (file)
--- a/applications/forwardingrules-manager/src/test/java/test/mock/TableFeaturesListenerTest.java
+++ b/applications/forwardingrules-manager/src/test/java/org/opendaylight/openflowplugin/applications/frm/impl/TableFeaturesListenerTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package test.mock;
+package org.opendaylight.openflowplugin.applications.frm.impl;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.awaitility.Awaitility.await;
@@ -33,8 +33,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.features.TableFeaturesKey;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.Uint8;
-import test.mock.util.AbstractFRMTest;
-import test.mock.util.SalTableServiceMock;
 
 @RunWith(MockitoJUnitRunner.class)
 public class TableFeaturesListenerTest extends AbstractFRMTest {