Merge "Bug 9092: revert to org.json temporarily"

[netconf.git] / restconf / sal-rest-connector / src / test / java / org / opendaylight / controller / sal / restconf / impl / test / RestconfErrorTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfErrorTest.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfErrorTest.java
index 2fc629f686ebcc02f8e7cefca6a603129e5cfbb6..f6c7dc0483912c9f37bf36128bf4bd0744f43283 100644 (file)
--- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfErrorTest.java
+++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfErrorTest.java
@@ -37,17 +37,17 @@ public class RestconfErrorTest {
 
         private final String text;
 
-        public Contains(String text) {
+        Contains(final String text) {
             this.text = text;
         }
 
         @Override
-        public void describeTo(Description desc) {
+        public void describeTo(final Description desc) {
             desc.appendText("contains ").appendValue(text);
         }
 
         @Override
-        public boolean matches(Object arg) {
+        public boolean matches(final Object arg) {
             return arg != null && arg.toString().contains(text);
         }
     }
@@ -74,7 +74,7 @@ public class RestconfErrorTest {
 
     @Test
     public void testErrorTagStatusCodes() {
-        Map<String, Integer> lookUpMap = new HashMap<String, Integer>();
+        Map<String, Integer> lookUpMap = new HashMap<>();
 
         lookUpMap.put("in-use", 409);
         lookUpMap.put("invalid-value", 400);
@@ -96,6 +96,7 @@ public class RestconfErrorTest {
         lookUpMap.put("operation-failed", 500);
         lookUpMap.put("partial-operation", 500);
         lookUpMap.put("malformed-message", 400);
+        lookUpMap.put("resource-denied-transport", 503);
 
         for (ErrorTag tag : ErrorTag.values()) {
             Integer expectedStatusCode = lookUpMap.get(tag.getTagValue());
@@ -109,9 +110,9 @@ public class RestconfErrorTest {
         String expectedMessage = "Message";
         ErrorType expectedErrorType = ErrorType.RPC;
         ErrorTag expectedErrorTag = ErrorTag.IN_USE;
-        RestconfError e = new RestconfError(expectedErrorType, expectedErrorTag, expectedMessage);
+        RestconfError error = new RestconfError(expectedErrorType, expectedErrorTag, expectedMessage);
 
-        validateRestConfError(expectedMessage, expectedErrorType, expectedErrorTag, null, (String) null, e);
+        validateRestConfError(expectedMessage, expectedErrorType, expectedErrorTag, null, (String) null, error);
     }
 
     @Test
@@ -121,10 +122,11 @@ public class RestconfErrorTest {
         ErrorTag expectedErrorTag = ErrorTag.IN_USE;
         String expectedErrorAppTag = "application.tag";
 
-        RestconfError e = new RestconfError(expectedErrorType, expectedErrorTag, expectedMessage, expectedErrorAppTag);
+        RestconfError error =
+                new RestconfError(expectedErrorType, expectedErrorTag, expectedMessage, expectedErrorAppTag);
 
         validateRestConfError(expectedMessage, expectedErrorType, expectedErrorTag, expectedErrorAppTag, (String) null,
-                e);
+                error);
     }
 
     @Test
@@ -135,10 +137,11 @@ public class RestconfErrorTest {
         String expectedErrorAppTag = "application.tag";
         String errorInfo = "<extra><sessionid>session.id</sessionid></extra>";
 
-        RestconfError e = new RestconfError(expectedErrorType, expectedErrorTag, expectedMessage, expectedErrorAppTag,
-                errorInfo);
+        RestconfError error =
+                new RestconfError(expectedErrorType, expectedErrorTag, expectedMessage, expectedErrorAppTag, errorInfo);
 
-        validateRestConfError(expectedMessage, expectedErrorType, expectedErrorTag, expectedErrorAppTag, errorInfo, e);
+        validateRestConfError(expectedMessage, expectedErrorType, expectedErrorTag, expectedErrorAppTag, errorInfo,
+                error);
     }
 
     @Test
@@ -147,7 +150,7 @@ public class RestconfErrorTest {
         // All fields set
         RpcError rpcError = RpcResultBuilder.newError(
                 RpcError.ErrorType.PROTOCOL, ErrorTag.BAD_ATTRIBUTE.getTagValue(), "mock error-message",
-                "mock app-tag", "mock error-info", new Exception( "mock cause" ) );
+                "mock app-tag", "mock error-info", new Exception("mock cause"));
 
         validateRestConfError("mock error-message", ErrorType.PROTOCOL, ErrorTag.BAD_ATTRIBUTE, "mock app-tag",
                 "mock error-info", new RestconfError(rpcError));
@@ -155,14 +158,14 @@ public class RestconfErrorTest {
         // All fields set except 'info' - expect error-info set to 'cause'
         rpcError = RpcResultBuilder.newError(
                 RpcError.ErrorType.PROTOCOL, ErrorTag.BAD_ATTRIBUTE.getTagValue(), "mock error-message",
-                "mock app-tag", null, new Exception( "mock cause" ) );
+                "mock app-tag", null, new Exception("mock cause"));
 
         validateRestConfError("mock error-message", ErrorType.PROTOCOL, ErrorTag.BAD_ATTRIBUTE, "mock app-tag",
                 new Contains("mock cause"), new RestconfError(rpcError));
 
         // Some fields set - expect error-info set to ErrorSeverity
         rpcError = RpcResultBuilder.newError(
-                RpcError.ErrorType.RPC, ErrorTag.ACCESS_DENIED.getTagValue(), null, null, null, null );
+                RpcError.ErrorType.RPC, ErrorTag.ACCESS_DENIED.getTagValue(), null, null, null, null);
 
         validateRestConfError(null, ErrorType.RPC, ErrorTag.ACCESS_DENIED, null, "<severity>error</severity>",
                 new RestconfError(rpcError));
@@ -170,34 +173,36 @@ public class RestconfErrorTest {
         // 'tag' field not mapped to ErrorTag - expect error-tag set to
         // OPERATION_FAILED
         rpcError = RpcResultBuilder.newWarning(
-                RpcError.ErrorType.TRANSPORT, "not mapped", null, null, null, null );
+                RpcError.ErrorType.TRANSPORT, "not mapped", null, null, null, null);
 
         validateRestConfError(null, ErrorType.TRANSPORT, ErrorTag.OPERATION_FAILED, null,
                 "<severity>warning</severity>", new RestconfError(rpcError));
 
         // No fields set - edge case
-        rpcError = RpcResultBuilder.newError( null, null, null, null, null, null );
+        rpcError = RpcResultBuilder.newError(null, null, null, null, null, null);
 
-        validateRestConfError( null, ErrorType.APPLICATION, ErrorTag.OPERATION_FAILED,
-                               null, "<severity>error</severity>", new RestconfError( rpcError ) );
+        validateRestConfError(null, ErrorType.APPLICATION, ErrorTag.OPERATION_FAILED,
+                null, "<severity>error</severity>", new RestconfError(rpcError));
     }
 
-    private void validateRestConfError(String expectedMessage, ErrorType expectedErrorType, ErrorTag expectedErrorTag,
-            String expectedErrorAppTag, String errorInfo, RestconfError e) {
+    private static void validateRestConfError(final String expectedMessage, final ErrorType expectedErrorType,
+            final ErrorTag expectedErrorTag, final String expectedErrorAppTag, final String errorInfo,
+            final RestconfError error) {
 
         validateRestConfError(expectedMessage, expectedErrorType, expectedErrorTag, expectedErrorAppTag,
-                equalTo(errorInfo), e);
+                equalTo(errorInfo), error);
     }
 
-    private void validateRestConfError(String expectedMessage, ErrorType expectedErrorType, ErrorTag expectedErrorTag,
-            String expectedErrorAppTag, Matcher<String> errorInfoMatcher, RestconfError e) {
+    private static void validateRestConfError(final String expectedMessage, final ErrorType expectedErrorType,
+            final ErrorTag expectedErrorTag, final String expectedErrorAppTag, final Matcher<String> errorInfoMatcher,
+            final RestconfError error) {
 
-        assertEquals("getErrorMessage", expectedMessage, e.getErrorMessage());
-        assertEquals("getErrorType", expectedErrorType, e.getErrorType());
-        assertEquals("getErrorTag", expectedErrorTag, e.getErrorTag());
-        assertEquals("getErrorAppTag", expectedErrorAppTag, e.getErrorAppTag());
-        assertThat("getErrorInfo", e.getErrorInfo(), errorInfoMatcher);
-        e.toString(); // really just checking for NPE etc. Don't care about
+        assertEquals("getErrorMessage", expectedMessage, error.getErrorMessage());
+        assertEquals("getErrorType", expectedErrorType, error.getErrorType());
+        assertEquals("getErrorTag", expectedErrorTag, error.getErrorTag());
+        assertEquals("getErrorAppTag", expectedErrorAppTag, error.getErrorAppTag());
+        assertThat("getErrorInfo", error.getErrorInfo(), errorInfoMatcher);
+        error.toString(); // really just checking for NPE etc. Don't care about
                       // contents.
     }
 }