OpenApi add POST request to device root

[netconf.git] / netconf / netconf-netty-util / src / test / java / org / opendaylight / netconf / nettyutil / handler / NetconfXMLToHelloMessageDecoderTest.java

diff --git a/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/handler/NetconfXMLToHelloMessageDecoderTest.java b/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/handler/NetconfXMLToHelloMessageDecoderTest.java
index 1581377f90a9e3020abd8f4d03445258b5de5c49..55b9369258513e96b2f9e19e43e5ad3d5cd3f004 100644 (file)
--- a/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/handler/NetconfXMLToHelloMessageDecoderTest.java
+++ b/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/handler/NetconfXMLToHelloMessageDecoderTest.java
@@ -5,66 +5,65 @@
  * 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.nettyutil.handler;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import java.util.ArrayList;
 import java.util.List;
 import org.hamcrest.CoreMatchers;
-import org.junit.Test;
-import org.opendaylight.netconf.api.messages.NetconfHelloMessage;
+import org.junit.jupiter.api.Test;
+import org.opendaylight.netconf.api.messages.HelloMessage;
 import org.opendaylight.netconf.api.xml.XmlUtil;
 
-public class NetconfXMLToHelloMessageDecoderTest {
+class NetconfXMLToHelloMessageDecoderTest {
 
     @Test
-    public void testDecodeWithHeader() throws Exception {
+    void testDecodeWithHeader() throws Exception {
         final ByteBuf src = Unpooled.wrappedBuffer(String.format("%s\n%s",
                 "[tomas;10.0.0.0:10000;tcp;client;]",
                 "<hello xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\"/>").getBytes());
-        final List<Object> out = Lists.newArrayList();
+        final List<Object> out = new ArrayList<>();
         new NetconfXMLToHelloMessageDecoder().decode(null, src, out);
 
         assertEquals(1, out.size());
-        assertThat(out.get(0), CoreMatchers.instanceOf(NetconfHelloMessage.class));
-        final NetconfHelloMessage hello = (NetconfHelloMessage) out.get(0);
+        final HelloMessage hello = assertInstanceOf(HelloMessage.class, out.get(0));
         assertTrue(hello.getAdditionalHeader().isPresent());
         assertEquals("[tomas;10.0.0.0:10000;tcp;client;]" + System.lineSeparator(),
-                hello.getAdditionalHeader().get().toFormattedString());
+                hello.getAdditionalHeader().orElseThrow().toFormattedString());
         assertThat(XmlUtil.toString(hello.getDocument()),
                 CoreMatchers.containsString("<hello xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\""));
     }
 
     @Test
-    public void testDecodeNoHeader() throws Exception {
+    void testDecodeNoHeader() throws Exception {
         final ByteBuf src =
                 Unpooled.wrappedBuffer("<hello xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\"/>".getBytes());
-        final List<Object> out = Lists.newArrayList();
+        final List<Object> out = new ArrayList<>();
         new NetconfXMLToHelloMessageDecoder().decode(null, src, out);
 
         assertEquals(1, out.size());
-        assertThat(out.get(0), CoreMatchers.instanceOf(NetconfHelloMessage.class));
-        final NetconfHelloMessage hello = (NetconfHelloMessage) out.get(0);
+        final HelloMessage hello = assertInstanceOf(HelloMessage.class, out.get(0));
         assertFalse(hello.getAdditionalHeader().isPresent());
     }
 
     @Test
-    public void testDecodeCaching() throws Exception {
+    void testDecodeCaching() throws Exception {
         final ByteBuf msg1 =
                 Unpooled.wrappedBuffer("<rpc-reply xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\"/>".getBytes());
         final ByteBuf msg2 =
                 Unpooled.wrappedBuffer("<rpc-reply xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\"/>".getBytes());
         final ByteBuf src =
                 Unpooled.wrappedBuffer("<hello xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\"/>".getBytes());
-        final List<Object> out = Lists.newArrayList();
+        final List<Object> out = new ArrayList<>();
         final NetconfXMLToHelloMessageDecoder decoder = new NetconfXMLToHelloMessageDecoder();
         decoder.decode(null, src, out);
         decoder.decode(null, msg1, out);
@@ -75,12 +74,12 @@ public class NetconfXMLToHelloMessageDecoderTest {
         assertEquals(2, Iterables.size(decoder.getPostHelloNetconfMessages()));
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void testDecodeNotHelloReceived() throws Exception {
+    @Test
+    void testDecodeNotHelloReceived() {
         final ByteBuf msg1 =
                 Unpooled.wrappedBuffer("<rpc-reply xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\"/>".getBytes());
-        final List<Object> out = Lists.newArrayList();
+        final List<Object> out = new ArrayList<>();
         NetconfXMLToHelloMessageDecoder decoder = new NetconfXMLToHelloMessageDecoder();
-        decoder.decode(null, msg1, out);
+        assertThrows(IllegalStateException.class, () -> decoder.decode(null, msg1, out));
     }
 }