Clean up netconf-api tests

Remove unneeded throws declaration, @Before instantiation and use of
mockito internals.

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

diff --git a/netconf/netconf-api/src/test/java/org/opendaylight/netconf/api/messages/NetconfHelloMessageAdditionalHeaderTest.java b/netconf/netconf-api/src/test/java/org/opendaylight/netconf/api/messages/NetconfHelloMessageAdditionalHeaderTest.java
index 5de0f0a35c2bc4f80aa662926150ae1b38469640..d3693707fc9217c59355897a0403a254871aec79 100644 (file)
--- a/netconf/netconf-api/src/test/java/org/opendaylight/netconf/api/messages/NetconfHelloMessageAdditionalHeaderTest.java
+++ b/netconf/netconf-api/src/test/java/org/opendaylight/netconf/api/messages/NetconfHelloMessageAdditionalHeaderTest.java
@@ -5,27 +5,18 @@
  * 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 org.opendaylight.netconf.api.messages;
 
 import static org.junit.Assert.assertEquals;
 
-import org.junit.Before;
 import org.junit.Test;
 
 public class NetconfHelloMessageAdditionalHeaderTest {
-
-
-    private String customHeader = "[user;1.1.1.1:40;tcp;client;]";
-    private NetconfHelloMessageAdditionalHeader header;
-
-    @Before
-    public void setUp() throws Exception {
-        header = new NetconfHelloMessageAdditionalHeader("user", "1.1.1.1", "40", "tcp", "client");
-    }
+    private final NetconfHelloMessageAdditionalHeader header =
+        new NetconfHelloMessageAdditionalHeader("user", "1.1.1.1", "40", "tcp", "client");
 
     @Test
-    public void testGetters() throws Exception {
+    public void testGetters() {
         assertEquals(header.getAddress(), "1.1.1.1");
         assertEquals(header.getUserName(), "user");
         assertEquals(header.getPort(), "40");
@@ -34,9 +25,9 @@ public class NetconfHelloMessageAdditionalHeaderTest {
     }
 
     @Test
-    public void testStaticConstructor() throws Exception {
-        NetconfHelloMessageAdditionalHeader hdr = NetconfHelloMessageAdditionalHeader.fromString(customHeader);
-        assertEquals(hdr.toString(), this.header.toString());
-        assertEquals(hdr.toFormattedString(), this.header.toFormattedString());
+    public void testStaticConstructor() {
+        final var hdr = NetconfHelloMessageAdditionalHeader.fromString("[user;1.1.1.1:40;tcp;client;]");
+        assertEquals(hdr.toString(), header.toString());
+        assertEquals(hdr.toFormattedString(), header.toFormattedString());
     }
 }

diff --git a/netconf/netconf-api/src/test/java/org/opendaylight/netconf/api/messages/NetconfHelloMessageTest.java b/netconf/netconf-api/src/test/java/org/opendaylight/netconf/api/messages/NetconfHelloMessageTest.java
index df0e4bc73855ff86304e1df984d8acc886746fcb..e4280840cc01a94980e1a89a5df52d64563a72fd 100644 (file)
--- a/netconf/netconf-api/src/test/java/org/opendaylight/netconf/api/messages/NetconfHelloMessageTest.java
+++ b/netconf/netconf-api/src/test/java/org/opendaylight/netconf/api/messages/NetconfHelloMessageTest.java
@@ -12,29 +12,20 @@ import static org.junit.Assert.assertTrue;
 
 import java.util.Optional;
 import java.util.Set;
-import org.junit.Before;
 import org.junit.Test;
-import org.mockito.internal.util.collections.Sets;
 import org.opendaylight.netconf.api.NetconfDocumentedException;
 
 public class NetconfHelloMessageTest {
-
-    Set<String> caps;
-
-    @Before
-    public void setUp() {
-        caps = Sets.newSet("cap1");
-    }
+    private final Set<String> caps = Set.of("cap1");
 
     @Test
     public void testConstructor() throws NetconfDocumentedException {
-        NetconfHelloMessageAdditionalHeader additionalHeader = new NetconfHelloMessageAdditionalHeader("name",
-                "host", "1", "transp", "id");
-        NetconfHelloMessage message = NetconfHelloMessage.createClientHello(caps, Optional.of(additionalHeader));
+        var additionalHeader = new NetconfHelloMessageAdditionalHeader("name", "host", "1", "transp", "id");
+        var message = NetconfHelloMessage.createClientHello(caps, Optional.of(additionalHeader));
         assertTrue(NetconfHelloMessage.isHelloMessage(message));
         assertEquals(Optional.of(additionalHeader), message.getAdditionalHeader());
 
-        NetconfHelloMessage serverMessage = NetconfHelloMessage.createServerHello(caps, 100L);
+        var serverMessage = NetconfHelloMessage.createServerHello(caps, 100L);
         assertTrue(NetconfHelloMessage.isHelloMessage(serverMessage));
     }
 }