TestUtils is a utility class

We are subclassing TestUtils just to get at a few static methods and
constants. Turn it into a final class instead.

Change-Id: Ibb25b783b76429b9fca3ba44838e93f2755127d6
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMNotificationRouterTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMNotificationRouterTest.java
index c071c5dd1d770853af13ba99fa51e103ca45d16e..e9ee4142852f12b8e37c952eb01bbae174105067 100644 (file)
--- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMNotificationRouterTest.java
+++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMNotificationRouterTest.java
@@ -17,6 +17,7 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
+import static org.opendaylight.mdsal.dom.broker.TestUtils.TEST_CHILD;
 
 import com.google.common.collect.Multimap;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -36,7 +37,7 @@ import org.opendaylight.yangtools.concepts.AbstractListenerRegistration;
 import org.opendaylight.yangtools.util.ListenerRegistry;
 import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute;
 
-public class DOMNotificationRouterTest extends TestUtils {
+public class DOMNotificationRouterTest {
 
     @Test
     public void create() throws Exception {
@@ -170,8 +171,8 @@ public class DOMNotificationRouterTest extends TestUtils {
         }
 
         @Override
-        ListenableFuture<? extends Object> publish(DOMNotification notification,
-                Collection<AbstractListenerRegistration<? extends DOMNotificationListener>> subscribers) {
+        ListenableFuture<? extends Object> publish(final DOMNotification notification,
+                final Collection<AbstractListenerRegistration<? extends DOMNotificationListener>> subscribers) {
             if (triggerRejected) {
                 return REJECTED;
             }

diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMRpcRouterTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMRpcRouterTest.java
index 0fc7d1dceb88e7d2472c4cc2ce973901b51770bb..368eda521029c84a0e6bf79b546fbebda007fb33 100644 (file)
--- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMRpcRouterTest.java
+++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMRpcRouterTest.java
@@ -22,6 +22,7 @@ import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.verify;
+import static org.opendaylight.mdsal.dom.broker.TestUtils.getTestRpcImplementation;
 
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -63,7 +64,7 @@ import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absol
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
 @RunWith(MockitoJUnitRunner.StrictStubs.class)
-public class DOMRpcRouterTest extends TestUtils {
+public class DOMRpcRouterTest {
     private static final QName FOO = QName.create("actions", "foo");
     private static final QName BAR = QName.create(FOO, "bar");
     private static final QName BAZ = QName.create(FOO, "baz");

diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/GlobalDOMRpcRoutingTableEntryTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/GlobalDOMRpcRoutingTableEntryTest.java
index 1dfcb8eb1dcf25bcb09d93d9fc8283f213e8a0df..5d6dbb36a643fad4c743b4ca3773840a8dd82d1e 100644 (file)
--- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/GlobalDOMRpcRoutingTableEntryTest.java
+++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/GlobalDOMRpcRoutingTableEntryTest.java
@@ -16,6 +16,9 @@ import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
+import static org.opendaylight.mdsal.dom.broker.TestUtils.EXCEPTION_TEXT;
+import static org.opendaylight.mdsal.dom.broker.TestUtils.TEST_CONTAINER;
+import static org.opendaylight.mdsal.dom.broker.TestUtils.getTestRpcImplementation;
 
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.ArrayList;
@@ -32,7 +35,7 @@ import org.opendaylight.mdsal.dom.broker.util.TestModel;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.model.api.RpcDefinition;
 
-public class GlobalDOMRpcRoutingTableEntryTest extends TestUtils {
+public class GlobalDOMRpcRoutingTableEntryTest {
     @Test
     public void basicTest() {
         final Map<YangInstanceIdentifier, List<DOMRpcImplementation>> rpcImplementations = new HashMap<>();

diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/RoutedDOMRpcRoutingTableEntryTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/RoutedDOMRpcRoutingTableEntryTest.java
index 256487fcd1f4e6e4e42f6724a79bd1a1c3fc6e6d..f90c0b52e883a63284b69118d3754a5634db41f7 100644 (file)
--- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/RoutedDOMRpcRoutingTableEntryTest.java
+++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/RoutedDOMRpcRoutingTableEntryTest.java
@@ -13,6 +13,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThrows;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
+import static org.opendaylight.mdsal.dom.broker.TestUtils.TEST_CHILD;
 
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.HashMap;
@@ -24,7 +25,7 @@ import org.opendaylight.mdsal.dom.broker.DOMRpcRouter.OperationInvocation;
 import org.opendaylight.mdsal.dom.broker.util.TestModel;
 import org.opendaylight.yangtools.yang.model.api.RpcDefinition;
 
-public class RoutedDOMRpcRoutingTableEntryTest extends TestUtils {
+public class RoutedDOMRpcRoutingTableEntryTest {
     @Test
     public void basicTest()  {
         final RpcDefinition rpcDefinition = mock(RpcDefinition.class);

diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/TestUtils.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/TestUtils.java
index be05ed2934404b45b47f7f108641be9a8289a764..66fa4a587ade7da7664c05878ed1c52f9344fca4 100644 (file)
--- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/TestUtils.java
+++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/TestUtils.java
@@ -27,7 +27,7 @@ import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
 import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
 import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableMapEntryNodeBuilder;
 
-abstract class TestUtils {
+final class TestUtils {
 
     private static final MapNode OUTER_LIST = ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME)
             .withChild(ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1)).build();
@@ -61,6 +61,10 @@ abstract class TestUtils {
 
     static final String EXCEPTION_TEXT = "TestRpcImplementationException";
 
+    private TestUtils() {
+        // Hidden on purpose
+    }
+
     static TestRpcImplementation getTestRpcImplementation() {
         return new TestRpcImplementation();
     }

diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/UnknownDOMRpcRoutingTableEntryTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/UnknownDOMRpcRoutingTableEntryTest.java
index ce66a5cdd39f5ea9482e1a9490f62610fa5f5c1d..dff4b3f47dc9a9eaa2fe0e803e5b176346fab0a5 100644 (file)
--- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/UnknownDOMRpcRoutingTableEntryTest.java
+++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/UnknownDOMRpcRoutingTableEntryTest.java
@@ -10,6 +10,8 @@ package org.opendaylight.mdsal.dom.broker;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.opendaylight.mdsal.dom.broker.TestUtils.TEST_CONTAINER;
+import static org.opendaylight.mdsal.dom.broker.TestUtils.getTestRpcImplementation;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -21,7 +23,7 @@ import org.opendaylight.mdsal.dom.broker.DOMRpcRouter.OperationInvocation;
 import org.opendaylight.mdsal.dom.broker.util.TestModel;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 
-public class UnknownDOMRpcRoutingTableEntryTest extends TestUtils {
+public class UnknownDOMRpcRoutingTableEntryTest {
     private static final List<DOMRpcImplementation> TEST_LIST = new ArrayList<>();
 
     @Test