Fix bug about custom exceptions not being used

The bug was that custom exception config was never actually queried
because of the mismatch between the production code usages and .json config file.

Change-Id: I416ef5f45770f9bb55d5dff143277b6c62fa25ba
Issue-ID: DCAEGEN2-518
Signed-off-by: PawelSzalapski <pawel.szalapski@nokia.com>

2 files changed, 66 insertions, 61 deletions

diff --git a/src/test/java/org/onap/dcae/commonFunction/ApiExceptionTest.java b/src/test/java/org/onap/dcae/commonFunction/ApiExceptionTest.java
new file mode 100644
index 00000000..0e494030
--- /dev/null
+++ b/src/test/java/org/onap/dcae/commonFunction/ApiExceptionTest.java
@@ -0,0 +1,66 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * org.onap.dcaegen2.collectors.ves
+ * ================================================================================
+ * Copyright (C) 2018 Nokia. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.dcae.commonFunction;
+
+import static org.junit.Assert.assertEquals;
+
+import org.json.JSONObject;
+import org.junit.Test;
+import org.onap.dcae.restapi.ApiException;
+import org.onap.dcae.restapi.ApiException.ExceptionType;
+
+/**
+ * @author Pawel Szalapski (pawel.szalapski@nokia.com)
+ */
+public class ApiExceptionTest {
+
+    @Test
+    public void shouldStringifyServiceExceptionTypeAccordingToSpecification() {
+        assertEquals(ExceptionType.SERVICE_EXCEPTION.toString(), "ServiceException");
+    }
+
+    @Test
+    public void shouldStringifyPolicyExceptionTypeAccordingToSpecification() {
+        assertEquals(ExceptionType.POLICY_EXCEPTION.toString(), "PolicyException");
+    }
+
+    @Test
+    public void shouldConvertExceptionToBackwardCompatibleFormat() {
+        JSONObject responseBody = ApiException.UNAUTHORIZED_USER.toJSON();
+        assertJSONEqual(responseBody, asJSON(""
+            + "{                                             "
+            + "  'requestError': {                           "
+            + "     'PolicyException': {                     "
+            + "        'messageId': 'POL2000',                "
+            + "        'text': 'Unauthorized user'           "
+            + "     }                                        "
+            + "  }                                           "
+            + "}                                             "
+        ));
+    }
+
+    private JSONObject asJSON(String jsonString) {
+        return new JSONObject(jsonString.replace("'", "\""));
+    }
+
+    private void assertJSONEqual(JSONObject o1, JSONObject o2) {
+        assertEquals(o1.toString(), o2.toString());
+    }
+}
diff --git a/src/test/java/org/onap/dcae/vestest/TestCustomExceptionLoader.java b/src/test/java/org/onap/dcae/vestest/TestCustomExceptionLoader.java
deleted file mode 100644
index 60d791cc..00000000
--- a/src/test/java/org/onap/dcae/vestest/TestCustomExceptionLoader.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * PROJECT
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.dcae.vestest;
-
-import static java.lang.String.format;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-import static org.onap.dcae.commonFunction.CustomExceptionLoader.LookupMap;
-
-import com.att.nsa.drumlin.service.standards.HttpStatusCodes;
-import org.junit.Test;
-import org.onap.dcae.commonFunction.CommonStartup;
-import org.onap.dcae.commonFunction.CustomExceptionLoader;
-
-public class TestCustomExceptionLoader {
-
-    @Test
-    public void shouldLoadMapWithoutExceptions() {
-        CommonStartup.exceptionConfig = "./etc/ExceptionConfig.json";
-        CustomExceptionLoader.LoadMap();
-    }
-
-    @Test
-    public void shouldLookupErrorMessageOutOfStatusCodeAndReason() {
-        // given
-        CommonStartup.exceptionConfig = "./etc/ExceptionConfig.json";
-        CustomExceptionLoader.LoadMap();
-        int statusCode = HttpStatusCodes.k401_unauthorized;
-        String message = "Unauthorized user";
-
-        // when
-        String[] retarray = LookupMap(String.valueOf(statusCode), message);
-
-        // then
-        if (retarray == null) {
-            fail(format(
-                "Lookup failed, did not find value for a valid status code %s and message %s", statusCode, message));
-        } else {
-            assertEquals("\"POL2000\"", retarray[0]);
-        }
-    }
-}
-