From 61571e7b5119793bbbfb8942db5765d16fbd4fdf Mon Sep 17 00:00:00 2001 From: FrancescoFioraEst Date: Mon, 20 Nov 2023 10:07:44 +0000 Subject: Fix missing error message in ACM Issue-ID: POLICY-4872 Change-Id: I2f7769a3bb1f6aa168f8d59ff99cb0774aee5ed7 Signed-off-by: FrancescoFioraEst --- .../rest/CommissioningControllerTest.java | 25 +++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'runtime-acm/src/test') diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/commissioning/rest/CommissioningControllerTest.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/commissioning/rest/CommissioningControllerTest.java index b2e151126..6c5417286 100755 --- a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/commissioning/rest/CommissioningControllerTest.java +++ b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/commissioning/rest/CommissioningControllerTest.java @@ -47,6 +47,7 @@ import org.onap.policy.clamp.models.acm.messages.rest.commissioning.PrimeOrder; import org.onap.policy.clamp.models.acm.persistence.provider.AcDefinitionProvider; import org.onap.policy.clamp.models.acm.persistence.provider.ParticipantProvider; import org.onap.policy.models.tosca.authorative.concepts.ToscaDataType; +import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeTemplate; import org.onap.policy.models.tosca.authorative.concepts.ToscaProperty; import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; import org.springframework.beans.factory.annotation.Autowired; @@ -112,7 +113,29 @@ class CommissioningControllerTest extends CommonRestController { assertThat(Response.Status.BAD_REQUEST.getStatusCode()).isEqualTo(resp.getStatus()); var commissioningResponse = resp.readEntity(CommissioningResponse.class); - assertThat(commissioningResponse.getErrorDetails()).isNotNull(); + assertThat(commissioningResponse.getErrorDetails()) + .isEqualTo("org.springframework.http.converter.HttpMessageNotReadableException " + + "Bad Request Could not read JSON: java.lang.IllegalStateException: " + + "Expected BEGIN_OBJECT but was STRING at line 1 column 1 path $"); + assertThat(commissioningResponse.getAffectedAutomationCompositionDefinitions()).isNull(); + } + + @Test + void testCreateBadVersion() { + var serviceTemplateCreate = new ToscaServiceTemplate(serviceTemplate); + var x = new ToscaNodeTemplate(serviceTemplateCreate + .getToscaTopologyTemplate().getNodeTemplates().values().iterator().next()); + x.setVersion("1.0.wrong"); + serviceTemplateCreate.getToscaTopologyTemplate().getNodeTemplates().put(x.getName(), x); + + var invocationBuilder = super.sendRequest(COMMISSIONING_ENDPOINT); + var resp = invocationBuilder.post(Entity.json(serviceTemplateCreate)); + + assertThat(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode()).isEqualTo(resp.getStatus()); + var commissioningResponse = resp.readEntity(CommissioningResponse.class); + assertThat(commissioningResponse.getErrorDetails()) + .isEqualTo("java.lang.IllegalArgumentException Internal Server Error parameter " + + "\"version\": value \"1.0.wrong\", does not match regular expression \"^(\\d+.){2}\\d+$\""); assertThat(commissioningResponse.getAffectedAutomationCompositionDefinitions()).isNull(); } -- cgit 1.2.3-korg