Test cleanup after migration to JUnit5

Two tests cannot be migrated to JUnit5 because they depend on mdsal
tests that are not migrated. They are marked as TODO.

Some tests have been migrated but with forgotten access modifier, this
patch will clean them up.

JIRA: NETCONF-1310
Change-Id: Ic9499e3b8c6e29a8363d95dd4c1163437ca5ed15
Signed-off-by: lubos-cicut <lubos.cicut@pantheon.tech>

diff --git a/apps/callhome-provider/src/test/java/org/opendaylight/netconf/topology/callhome/CallHomeMountServiceTest.java b/apps/callhome-provider/src/test/java/org/opendaylight/netconf/topology/callhome/CallHomeMountServiceTest.java
index 43e3b1392e055e683ed7f8469f4ba9af79b56ceb..808cd4bf8d029ae0620be69a9d56714afb254c5b 100644 (file)
--- a/apps/callhome-provider/src/test/java/org/opendaylight/netconf/topology/callhome/CallHomeMountServiceTest.java
+++ b/apps/callhome-provider/src/test/java/org/opendaylight/netconf/topology/callhome/CallHomeMountServiceTest.java
@@ -38,7 +38,7 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
 
 @ExtendWith(MockitoExtension.class)
-public class CallHomeMountServiceTest {
+class CallHomeMountServiceTest {
 
     private static final SocketAddress SOCKET_ADDRESS = new InetSocketAddress("127.0.0.1", 12345);
     private static final String ID1 = "id1";

diff --git a/apps/callhome-provider/src/test/java/org/opendaylight/netconf/topology/callhome/CallHomeSshServerTest.java b/apps/callhome-provider/src/test/java/org/opendaylight/netconf/topology/callhome/CallHomeSshServerTest.java
index 559f7377da84f180813b90066e73107830228ecf..ccef9b3c24e4738a195d05d5447ba1fd20cda839 100644 (file)
--- a/apps/callhome-provider/src/test/java/org/opendaylight/netconf/topology/callhome/CallHomeSshServerTest.java
+++ b/apps/callhome-provider/src/test/java/org/opendaylight/netconf/topology/callhome/CallHomeSshServerTest.java
@@ -62,7 +62,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.mon
 import org.opendaylight.yangtools.yang.common.Uint16;
 
 @ExtendWith(MockitoExtension.class)
-public class CallHomeSshServerTest {
+class CallHomeSshServerTest {
     private static final long TIMEOUT = 5000L;
     private static final Capabilities EMPTY_CAPABILITIES = new CapabilitiesBuilder().setCapability(Set.of()).build();
     private static final String USERNAME = "username";

diff --git a/apps/callhome-provider/src/test/java/org/opendaylight/netconf/topology/callhome/CallHomeTlsServerTest.java b/apps/callhome-provider/src/test/java/org/opendaylight/netconf/topology/callhome/CallHomeTlsServerTest.java
index 8f1238d80526179fdb7bc5c438985f4fbf145139..6365148e50da537661eae239a6447a8f787a8f15 100644 (file)
--- a/apps/callhome-provider/src/test/java/org/opendaylight/netconf/topology/callhome/CallHomeTlsServerTest.java
+++ b/apps/callhome-provider/src/test/java/org/opendaylight/netconf/topology/callhome/CallHomeTlsServerTest.java
@@ -80,7 +80,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @ExtendWith(MockitoExtension.class)
-public class CallHomeTlsServerTest {
+class CallHomeTlsServerTest {
     private static final Logger LOG = LoggerFactory.getLogger("TEST");
 
     private static final AtomicInteger COUNTER = new AtomicInteger();

diff --git a/apps/yanglib-mdsal-writer/src/test/java/org/opendaylight/netconf/yanglib/writer/YangLibraryWriterSingletonIntegrationTest.java b/apps/yanglib-mdsal-writer/src/test/java/org/opendaylight/netconf/yanglib/writer/YangLibraryWriterSingletonIntegrationTest.java
index 67ca8cd5a5d0dd6ffb995f12348a183e8e5dd20d..51ac27b80fa4b847b915d920703fe56a7fc21ca8 100644 (file)
--- a/apps/yanglib-mdsal-writer/src/test/java/org/opendaylight/netconf/yanglib/writer/YangLibraryWriterSingletonIntegrationTest.java
+++ b/apps/yanglib-mdsal-writer/src/test/java/org/opendaylight/netconf/yanglib/writer/YangLibraryWriterSingletonIntegrationTest.java
@@ -20,6 +20,7 @@ import org.opendaylight.mdsal.singleton.impl.EOSClusterSingletonServiceProvider;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev190104.YangLibrary;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
+//TODO: Migrate this test to JUnit5 after migrating the mdsal tests.
 public class YangLibraryWriterSingletonIntegrationTest extends AbstractConcurrentDataBrokerTest {
     private final DOMEntityOwnershipService eos = new SimpleDOMEntityOwnershipService();
 

diff --git a/keystore/plaintext-localfile/src/test/java/org/opendaylight/netconf/keystore/plaintext/localfile/PlaintextLocalFileStorageTest.java b/keystore/plaintext-localfile/src/test/java/org/opendaylight/netconf/keystore/plaintext/localfile/PlaintextLocalFileStorageTest.java
index 12a6a185b03d507f09bfe578b30954e132d97238..553d9eb56cc6f968c869ea6e776e81dade3fdeef 100644 (file)
--- a/keystore/plaintext-localfile/src/test/java/org/opendaylight/netconf/keystore/plaintext/localfile/PlaintextLocalFileStorageTest.java
+++ b/keystore/plaintext-localfile/src/test/java/org/opendaylight/netconf/keystore/plaintext/localfile/PlaintextLocalFileStorageTest.java
@@ -40,7 +40,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
 import org.opendaylight.netconf.keystore.plaintext.api.MutablePlaintextStorage;
 
 @ExtendWith(MockitoExtension.class)
-public class PlaintextLocalFileStorageTest {
+class PlaintextLocalFileStorageTest {
 
     private static final StorageEntry ENTRY_1 = storageEntry("key-1", "value-1");
     private static final StorageEntry ENTRY_1_MODIFIED = storageEntry("key-1", "value-1-modified");

diff --git a/plugins/netconf-common-mdsal/src/test/java/org/opendaylight/netconf/common/mdsal/NormalizedDataUtilTest.java b/plugins/netconf-common-mdsal/src/test/java/org/opendaylight/netconf/common/mdsal/NormalizedDataUtilTest.java
index b743bf9046424d65be0bbb267289302847b8a0ba..e909cbcea06d9611a0d24d83d2fa81834396ed72 100644 (file)
--- a/plugins/netconf-common-mdsal/src/test/java/org/opendaylight/netconf/common/mdsal/NormalizedDataUtilTest.java
+++ b/plugins/netconf-common-mdsal/src/test/java/org/opendaylight/netconf/common/mdsal/NormalizedDataUtilTest.java
@@ -7,11 +7,11 @@
  */
 package org.opendaylight.netconf.common.mdsal;
 
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 import java.util.List;
 import javax.xml.transform.dom.DOMResult;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.opendaylight.netconf.api.xml.XmlUtil;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.NetconfState;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.Sessions;
@@ -27,9 +27,9 @@ import org.xmlunit.builder.DiffBuilder;
 import org.xmlunit.diff.DefaultNodeMatcher;
 import org.xmlunit.diff.ElementSelectors;
 
-public class NormalizedDataUtilTest {
+class NormalizedDataUtilTest {
     @Test
-    public void testWriteNormalizedNode() throws Exception {
+    void testWriteNormalizedNode() throws Exception {
         final var context = BindingRuntimeHelpers.createEffectiveModel(List.of(YangModuleInfoImpl.getInstance()));
         final var result = new DOMResult(XmlUtil.newDocument());
         NormalizedDataUtil.writeNormalizedNode(ImmutableNodes.newContainerBuilder()
@@ -58,6 +58,6 @@ public class NormalizedDataUtilTest {
             .checkForSimilar()
             .build();
 
-        assertFalse(diff.toString(), diff.hasDifferences());
+        assertFalse(diff.hasDifferences(), diff.toString());
     }
 }

diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/DataTreeChangeStreamTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/DataTreeChangeStreamTest.java
index 6aa9026eb6eab9279bb02778f8104bf879b31e1f..05f75cef786a2170d2250a87e1cb90e4fc217c50 100644 (file)
--- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/DataTreeChangeStreamTest.java
+++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/DataTreeChangeStreamTest.java
@@ -66,6 +66,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xmlunit.assertj.XmlAssert;
 
+//TODO: Migrate this test to JUnit5 after migrating the mdsal tests.
 @RunWith(MockitoJUnitRunner.StrictStubs.class)
 public class DataTreeChangeStreamTest extends AbstractConcurrentDataBrokerTest {
     private static final class TestHandler implements Sender {

diff --git a/transport/transport-http/src/test/java/org/opendaylight/netconf/transport/http/AbstractBasicAuthHandlerTest.java b/transport/transport-http/src/test/java/org/opendaylight/netconf/transport/http/AbstractBasicAuthHandlerTest.java
index cdd621660d6e21791463b69fb0360edfe9fc0c5f..6fa38a823374ea4be91c8a182501e9a4ed763f37 100644 (file)
--- a/transport/transport-http/src/test/java/org/opendaylight/netconf/transport/http/AbstractBasicAuthHandlerTest.java
+++ b/transport/transport-http/src/test/java/org/opendaylight/netconf/transport/http/AbstractBasicAuthHandlerTest.java
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-public class AbstractBasicAuthHandlerTest {
+class AbstractBasicAuthHandlerTest {
     private static final String USERNAME = "username";
     private static final String PASSWORD = "pa$$W0rd!";
     private static final String GRANTED_URI = "/granted";

diff --git a/transport/transport-http/src/test/java/org/opendaylight/netconf/transport/http/BasicAuthHandlerTest.java b/transport/transport-http/src/test/java/org/opendaylight/netconf/transport/http/BasicAuthHandlerTest.java
index ee523209bf519237fe343e8878753aaae5ae300c..b8eaa84329886635cb172fd30019a77654b405db 100644 (file)
--- a/transport/transport-http/src/test/java/org/opendaylight/netconf/transport/http/BasicAuthHandlerTest.java
+++ b/transport/transport-http/src/test/java/org/opendaylight/netconf/transport/http/BasicAuthHandlerTest.java
@@ -35,7 +35,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.http.server
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.http.server.rev240208.http.server.grouping.client.authentication.users.user.auth.type.basic.basic.PasswordBuilder;
 import org.opendaylight.yangtools.binding.util.BindingMap;
 
-public class BasicAuthHandlerTest {
+class BasicAuthHandlerTest {
     private static final String USERNAME1 = "username-1";
     private static final String USERNAME2 = "username-2";
     private static final String PASSWORD1 = "pa$$W0rd!1";