From 03c062dc0d583fff34c17801e1d46a72dfe4c831 Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Tue, 19 Dec 2023 11:55:44 +0100 Subject: Refactor ErrorLogHelper - change is designed to not make any changes to the serialised objects [1] - introduce common error response object that is used for both service and policy, xml + json format - separate creation of error response and the marshalling of it - increase test coverage - use jackson object mappers for marshalling json and xml objects instead of custom MapperUtil - make code more functional - use more descriptive variable names [1] only the internal representation changes to account for both Service- and PolicyException Issue-ID: AAI-3695 Signed-off-by: Fiete Ostkamp Change-Id: I1e82bf4f0706704679d14aac98969fa00beed758 --- .../restPolicyException/PolicyExceptionTest.java | 69 ---------------------- .../restPolicyException/RequestErrorTest.java | 54 ----------------- 2 files changed, 123 deletions(-) delete mode 100644 aai-core/src/test/java/org/onap/aai/domain/restPolicyException/PolicyExceptionTest.java delete mode 100644 aai-core/src/test/java/org/onap/aai/domain/restPolicyException/RequestErrorTest.java (limited to 'aai-core') diff --git a/aai-core/src/test/java/org/onap/aai/domain/restPolicyException/PolicyExceptionTest.java b/aai-core/src/test/java/org/onap/aai/domain/restPolicyException/PolicyExceptionTest.java deleted file mode 100644 index 63f01475..00000000 --- a/aai-core/src/test/java/org/onap/aai/domain/restPolicyException/PolicyExceptionTest.java +++ /dev/null @@ -1,69 +0,0 @@ -/** - * ============LICENSE_START======================================================= - * org.onap.aai - * ================================================================================ - * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Modifications Copyright © 2018 IBM. - * ================================================================================ - * 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.aai.domain.restPolicyException; - -import static org.junit.Assert.assertEquals; - -import java.util.ArrayList; -import java.util.List; - -import org.junit.Before; -import org.junit.Test; -import org.onap.aai.AAISetup; - -public class PolicyExceptionTest extends AAISetup { - private PolicyException exception; - - @Before - public void setup() { - exception = new PolicyException(); - } - - @Test - public void testGetAdditionalProperty() throws Exception { - exception.setAdditionalProperty("property1", "value1"); - assertEquals(exception.getAdditionalProperties().get("property1"), "value1"); - } - - @Test - public void testGetMessageId() throws Exception { - exception.setMessageId("samplemessage"); - assertEquals(exception.getMessageId(), "samplemessage"); - } - - @Test - public void testGetText() throws Exception { - exception.setText("sampletext"); - assertEquals(exception.getText(), "sampletext"); - } - - @Test - public void testGetVariables() throws Exception { - List expectedVariables = new ArrayList<>(); - expectedVariables.add("firstvariable"); - expectedVariables.add("secondvariable"); - exception.setVariables(expectedVariables); - assertEquals(exception.getVariables(), expectedVariables); - - } -} diff --git a/aai-core/src/test/java/org/onap/aai/domain/restPolicyException/RequestErrorTest.java b/aai-core/src/test/java/org/onap/aai/domain/restPolicyException/RequestErrorTest.java deleted file mode 100644 index 803337aa..00000000 --- a/aai-core/src/test/java/org/onap/aai/domain/restPolicyException/RequestErrorTest.java +++ /dev/null @@ -1,54 +0,0 @@ -/** - * ============LICENSE_START======================================================= - * org.onap.aai - * ================================================================================ - * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Modifications Copyright © 2018 IBM. - * ================================================================================ - * 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.aai.domain.restPolicyException; - -import static org.junit.Assert.assertEquals; - -import org.junit.Before; -import org.junit.Test; -import org.onap.aai.AAISetup; - -public class RequestErrorTest extends AAISetup { - private RequestError reqError; - - @Before - public void setup() { - reqError = new RequestError(); - } - - @Test - public void testGetAdditionalProperty() throws Exception { - reqError.setAdditionalProperty("property1", "value1"); - assertEquals(reqError.getAdditionalProperties().get("property1"), "value1"); - } - - @Test - public void testGetPolicyException() throws Exception { - PolicyException exception = new PolicyException(); - exception.setMessageId("123"); - exception.setText("sampletext"); - reqError.setPolicyException(exception); - assertEquals(reqError.getPolicyException().getMessageId(), "123"); - assertEquals(reqError.getPolicyException().getText(), "sampletext"); - } -} -- cgit 1.2.3-korg