Migrate ResourceBody to ServerException

[netconf.git] / restconf / restconf-nb / src / test / java / org / opendaylight / restconf / nb / rfc8040 / databind / JsonResourceBodyTest.java

diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonResourceBodyTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonResourceBodyTest.java
index 41c3ec6767cd3c421551c37a23a54f0a1c835342..da120bc131093e015eb6e1132d7b466789368b91 100644 (file)
--- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonResourceBodyTest.java
+++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonResourceBodyTest.java
@@ -11,6 +11,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.Map;
 import org.junit.jupiter.api.Test;
+import org.opendaylight.restconf.api.ErrorMessage;
 import org.opendaylight.restconf.server.api.JsonResourceBody;
 import org.opendaylight.yangtools.yang.common.ErrorTag;
 import org.opendaylight.yangtools.yang.common.ErrorType;
@@ -98,11 +99,11 @@ class JsonResourceBodyTest extends AbstractResourceBodyTest {
               "ietf-restconf:restconf-state" : {
               }
             }"""));
-        assertEquals("""
+        assertEquals(new ErrorMessage("""
             Payload name ((urn:ietf:params:xml:ns:yang:ietf-restconf-monitoring?revision=2017-01-26)restconf-state) is \
-            different from identifier name ((ns?revision=2016-02-28)cont)""", error.getErrorMessage());
-        assertEquals(ErrorType.PROTOCOL, error.getErrorType());
-        assertEquals(ErrorTag.MALFORMED_MESSAGE, error.getErrorTag());
+            different from identifier name ((ns?revision=2016-02-28)cont)"""), error.message());
+        assertEquals(ErrorType.PROTOCOL, error.type());
+        assertEquals(ErrorTag.MALFORMED_MESSAGE, error.tag());
     }
 
     @Test
@@ -113,11 +114,11 @@ class JsonResourceBodyTest extends AbstractResourceBodyTest {
                     "depth3-lf1-key" : "one"
                   }
                 }"""));
-        assertEquals("""
+        assertEquals(new ErrorMessage("""
             Error parsing input: List entry (urn:nested:module?revision=2014-06-03)depth2-list2 is missing leaf values \
-            for [depth3-lf2-key]""", error.getErrorMessage());
-        assertEquals(ErrorType.PROTOCOL, error.getErrorType());
-        assertEquals(ErrorTag.MALFORMED_MESSAGE, error.getErrorTag());
+            for [depth3-lf2-key]"""), error.message());
+        assertEquals(ErrorType.PROTOCOL, error.type());
+        assertEquals(ErrorTag.MALFORMED_MESSAGE, error.tag());
     }
 
     @Test
@@ -147,8 +148,9 @@ class JsonResourceBodyTest extends AbstractResourceBodyTest {
                 "bar": "a"
               }
             }"""));
-        assertEquals("Error parsing input: Last unit does not have enough valid bits", error.getErrorMessage());
-        assertEquals(ErrorType.PROTOCOL, error.getErrorType());
-        assertEquals(ErrorTag.MALFORMED_MESSAGE, error.getErrorTag());
+        assertEquals(new ErrorMessage("Error parsing input: Last unit does not have enough valid bits"),
+            error.message());
+        assertEquals(ErrorType.PROTOCOL, error.type());
+        assertEquals(ErrorTag.MALFORMED_MESSAGE, error.tag());
     }
 }