From a198f22bf1df5d145441f8a2f9163be93bfc8707 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 18 Oct 2022 22:16:48 +0200 Subject: [PATCH] Clean up netconf-api tests Remove unneeded throws declaration, @Before instantiation and use of mockito internals. Change-Id: I7831f67d408c45582f1d97e8e21719700847b08d Signed-off-by: Robert Varga (cherry picked from commit 699f38ff6723788eeb1a43bc0c536f9c018c8417) --- ...tconfHelloMessageAdditionalHeaderTest.java | 23 ++++++------------- .../api/messages/NetconfHelloMessageTest.java | 17 ++++---------- 2 files changed, 11 insertions(+), 29 deletions(-) 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 5de0f0a35c..d3693707fc 100644 --- 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 df0e4bc738..e4280840cc 100644 --- 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 caps; - - @Before - public void setUp() { - caps = Sets.newSet("cap1"); - } + private final Set 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)); } } -- 2.36.6