Clean up netconf-api tests

[netconf.git] / netconf / netconf-api / src / test / java / org / opendaylight / netconf / api / messages / NetconfHelloMessageTest.java

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 8d5107dc5f65efe7b708208773d7f00d1c312938..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
@@ -5,37 +5,27 @@
  * 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 static org.junit.Assert.assertTrue;
 
-import com.google.common.base.Optional;
+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));
     }
 }