From 365f49e445f56fad41c74e484a456b0f07e04a5b Mon Sep 17 00:00:00 2001 From: lapentafd Date: Wed, 8 Feb 2023 16:40:59 +0000 Subject: Contract Tests policy-clamp Moving Contract tests in a new package, verifying the stubbed implementation. Issue-ID: POLICY-4533 Change-Id: Ibd5c9d8b9a2685439bc9d335910882e3f2668d7d Signed-off-by: lapentafd --- .../rest/stub/CommissioningControllerStubTest.java | 89 ------------------ .../contract/CommissioningControllerStubTest.java | 89 ++++++++++++++++++ .../contract/InstantiationControllerStubTest.java | 104 +++++++++++++++++++++ .../rest/stub/InstantiationControllerStubTest.java | 104 --------------------- 4 files changed, 193 insertions(+), 193 deletions(-) delete mode 100644 runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/commissioning/rest/stub/CommissioningControllerStubTest.java create mode 100644 runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/contract/CommissioningControllerStubTest.java create mode 100644 runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/contract/InstantiationControllerStubTest.java delete mode 100644 runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/rest/stub/InstantiationControllerStubTest.java diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/commissioning/rest/stub/CommissioningControllerStubTest.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/commissioning/rest/stub/CommissioningControllerStubTest.java deleted file mode 100644 index bbc79efeb..000000000 --- a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/commissioning/rest/stub/CommissioningControllerStubTest.java +++ /dev/null @@ -1,89 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * Copyright (C) 2022-2023 Nordix Foundation. - * ================================================================================ - * 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. - * - * SPDX-License-Identifier: Apache-2.0 - * ============LICENSE_END========================================================= - */ - -package org.onap.policy.clamp.acm.runtime.commissioning.rest.stub; - -import static org.assertj.core.api.Assertions.assertThat; - -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.Response; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.onap.policy.clamp.acm.runtime.util.rest.CommonRestController; -import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; -import org.springframework.boot.test.web.server.LocalServerPort; -import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.junit.jupiter.SpringExtension; - -@ExtendWith(SpringExtension.class) -@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) -@ActiveProfiles({ "test", "stub" }) -class CommissioningControllerStubTest extends CommonRestController { - - private static final String COMMISSIONING_ENDPOINT = "compositions"; - private static final String COMPOSITION_ID = "1aeed185-a98b-45b6-af22-8d5d20485ea3"; - private static ToscaServiceTemplate serviceTemplate = new ToscaServiceTemplate(); - - @LocalServerPort - private int randomServerPort; - - @BeforeEach - public void setUpPort() { - super.setHttpPrefix(randomServerPort); - } - - @Test - void testQuery() { - var invocationBuilder = super.sendRequest(COMMISSIONING_ENDPOINT); - var respPost = invocationBuilder.get(); - assertThat(Response.Status.OK.getStatusCode()).isEqualTo(respPost.getStatus()); - } - - @Test - void testGet() { - var invocationBuilder = super.sendRequest(COMMISSIONING_ENDPOINT + "/" + COMPOSITION_ID); - var respPost = invocationBuilder.get(); - assertThat(Response.Status.OK.getStatusCode()).isEqualTo(respPost.getStatus()); - } - - @Test - void testPut() { - var invocationBuilder = super.sendRequest(COMMISSIONING_ENDPOINT + "/" + COMPOSITION_ID); - var respPost = invocationBuilder.put(Entity.json(serviceTemplate)); - assertThat(Response.Status.OK.getStatusCode()).isEqualTo(respPost.getStatus()); - } - - @Test - void testPost() { - var invocationBuilder = super.sendRequest(COMMISSIONING_ENDPOINT); - var respPost = invocationBuilder.post(Entity.json(serviceTemplate)); - assertThat(Response.Status.OK.getStatusCode()).isEqualTo(respPost.getStatus()); - } - - @Test - void testDelete() { - var invocationBuilder = super.sendRequest(COMMISSIONING_ENDPOINT + "/" + COMPOSITION_ID); - var respPost = invocationBuilder.delete(); - assertThat(Response.Status.OK.getStatusCode()).isEqualTo(respPost.getStatus()); - } -} diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/contract/CommissioningControllerStubTest.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/contract/CommissioningControllerStubTest.java new file mode 100644 index 000000000..8c956aede --- /dev/null +++ b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/contract/CommissioningControllerStubTest.java @@ -0,0 +1,89 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2022-2023 Nordix Foundation. + * ================================================================================ + * 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. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.clamp.acm.runtime.contract; + +import static org.assertj.core.api.Assertions.assertThat; + +import javax.ws.rs.client.Entity; +import javax.ws.rs.core.Response; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.onap.policy.clamp.acm.runtime.util.rest.CommonRestController; +import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; +import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.junit.jupiter.SpringExtension; + +@ExtendWith(SpringExtension.class) +@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) +@ActiveProfiles({ "test", "stub" }) +class CommissioningControllerStubTest extends CommonRestController { + + private static final String COMMISSIONING_ENDPOINT = "compositions"; + private static final String COMPOSITION_ID = "1aeed185-a98b-45b6-af22-8d5d20485ea3"; + private static ToscaServiceTemplate serviceTemplate = new ToscaServiceTemplate(); + + @LocalServerPort + private int randomServerPort; + + @BeforeEach + public void setUpPort() { + super.setHttpPrefix(randomServerPort); + } + + @Test + void testQuery() { + var invocationBuilder = super.sendRequest(COMMISSIONING_ENDPOINT); + var respPost = invocationBuilder.get(); + assertThat(Response.Status.OK.getStatusCode()).isEqualTo(respPost.getStatus()); + } + + @Test + void testGet() { + var invocationBuilder = super.sendRequest(COMMISSIONING_ENDPOINT + "/" + COMPOSITION_ID); + var respPost = invocationBuilder.get(); + assertThat(Response.Status.OK.getStatusCode()).isEqualTo(respPost.getStatus()); + } + + @Test + void testPut() { + var invocationBuilder = super.sendRequest(COMMISSIONING_ENDPOINT + "/" + COMPOSITION_ID); + var respPost = invocationBuilder.put(Entity.json(serviceTemplate)); + assertThat(Response.Status.OK.getStatusCode()).isEqualTo(respPost.getStatus()); + } + + @Test + void testPost() { + var invocationBuilder = super.sendRequest(COMMISSIONING_ENDPOINT); + var respPost = invocationBuilder.post(Entity.json(serviceTemplate)); + assertThat(Response.Status.OK.getStatusCode()).isEqualTo(respPost.getStatus()); + } + + @Test + void testDelete() { + var invocationBuilder = super.sendRequest(COMMISSIONING_ENDPOINT + "/" + COMPOSITION_ID); + var respPost = invocationBuilder.delete(); + assertThat(Response.Status.OK.getStatusCode()).isEqualTo(respPost.getStatus()); + } +} diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/contract/InstantiationControllerStubTest.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/contract/InstantiationControllerStubTest.java new file mode 100644 index 000000000..9df4df886 --- /dev/null +++ b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/contract/InstantiationControllerStubTest.java @@ -0,0 +1,104 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2022-2023 Nordix Foundation. + * ================================================================================ + * 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. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.clamp.acm.runtime.contract; + +import static org.assertj.core.api.Assertions.assertThat; + +import javax.ws.rs.client.Entity; +import javax.ws.rs.core.Response; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.onap.policy.clamp.acm.runtime.util.rest.CommonRestController; +import org.onap.policy.clamp.models.acm.concepts.AutomationComposition; +import org.onap.policy.clamp.models.acm.messages.rest.instantiation.AcInstanceStateUpdate; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; +import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.junit.jupiter.SpringExtension; + +@ExtendWith(SpringExtension.class) +@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) +@ActiveProfiles({ "test", "stub" }) +class InstantiationControllerStubTest extends CommonRestController { + + private static final String COMMISSIONING_ENDPOINT = "compositions"; + private static final String INSTANTIATION_ENDPOINT = "instances"; + private static final String COMPOSITION_ID = "1aeed185-a98b-45b6-af22-8d5d20485ea3"; + private static final String INSTANCE_ID = "709c62b3-8918-41b9-a747-d21eb79c6c23"; + + @LocalServerPort + private int randomServerPort; + + @BeforeEach + public void setUpPort() { + super.setHttpPrefix(randomServerPort); + } + + @Test + void testQuery() { + var invocationBuilder = super.sendRequest(COMMISSIONING_ENDPOINT + + "/" + COMPOSITION_ID + + "/" + INSTANTIATION_ENDPOINT); + var respPost = invocationBuilder.get(); + assertThat(Response.Status.OK.getStatusCode()).isEqualTo(respPost.getStatus()); + } + + @Test + void testGet() { + var invocationBuilder = super.sendRequest(COMMISSIONING_ENDPOINT + + "/" + COMPOSITION_ID + + "/" + INSTANTIATION_ENDPOINT + + "/" + INSTANCE_ID); + var respPost = invocationBuilder.get(); + assertThat(Response.Status.OK.getStatusCode()).isEqualTo(respPost.getStatus()); + } + + @Test + void testPut() { + var invocationBuilder = super.sendRequest(COMMISSIONING_ENDPOINT + + "/" + COMPOSITION_ID + + "/" + INSTANTIATION_ENDPOINT + + "/" + INSTANCE_ID); + var respPost = invocationBuilder.put(Entity.json(new AcInstanceStateUpdate())); + assertThat(Response.Status.OK.getStatusCode()).isEqualTo(respPost.getStatus()); + } + + @Test + void testPost() { + var invocationBuilder = super.sendRequest(COMMISSIONING_ENDPOINT + + "/" + COMPOSITION_ID + + "/" + INSTANTIATION_ENDPOINT); + var respPost = invocationBuilder.post(Entity.json(new AutomationComposition())); + assertThat(Response.Status.OK.getStatusCode()).isEqualTo(respPost.getStatus()); + } + + @Test + void testDelete() { + var invocationBuilder = super.sendRequest(COMMISSIONING_ENDPOINT + + "/" + COMPOSITION_ID + + "/" + INSTANTIATION_ENDPOINT + + "/" + INSTANCE_ID); + var respPost = invocationBuilder.delete(); + assertThat(Response.Status.OK.getStatusCode()).isEqualTo(respPost.getStatus()); + } +} diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/rest/stub/InstantiationControllerStubTest.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/rest/stub/InstantiationControllerStubTest.java deleted file mode 100644 index 819348007..000000000 --- a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/rest/stub/InstantiationControllerStubTest.java +++ /dev/null @@ -1,104 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * Copyright (C) 2022-2023 Nordix Foundation. - * ================================================================================ - * 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. - * - * SPDX-License-Identifier: Apache-2.0 - * ============LICENSE_END========================================================= - */ - -package org.onap.policy.clamp.acm.runtime.instantiation.rest.stub; - -import static org.assertj.core.api.Assertions.assertThat; - -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.Response; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.onap.policy.clamp.acm.runtime.util.rest.CommonRestController; -import org.onap.policy.clamp.models.acm.concepts.AutomationComposition; -import org.onap.policy.clamp.models.acm.messages.rest.instantiation.AcInstanceStateUpdate; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; -import org.springframework.boot.test.web.server.LocalServerPort; -import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.junit.jupiter.SpringExtension; - -@ExtendWith(SpringExtension.class) -@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) -@ActiveProfiles({ "test", "stub" }) -class InstantiationControllerStubTest extends CommonRestController { - - private static final String COMMISSIONING_ENDPOINT = "compositions"; - private static final String INSTANTIATION_ENDPOINT = "instances"; - private static final String COMPOSITION_ID = "1aeed185-a98b-45b6-af22-8d5d20485ea3"; - private static final String INSTANCE_ID = "709c62b3-8918-41b9-a747-d21eb79c6c23"; - - @LocalServerPort - private int randomServerPort; - - @BeforeEach - public void setUpPort() { - super.setHttpPrefix(randomServerPort); - } - - @Test - void testQuery() { - var invocationBuilder = super.sendRequest(COMMISSIONING_ENDPOINT - + "/" + COMPOSITION_ID - + "/" + INSTANTIATION_ENDPOINT); - var respPost = invocationBuilder.get(); - assertThat(Response.Status.OK.getStatusCode()).isEqualTo(respPost.getStatus()); - } - - @Test - void testGet() { - var invocationBuilder = super.sendRequest(COMMISSIONING_ENDPOINT - + "/" + COMPOSITION_ID - + "/" + INSTANTIATION_ENDPOINT - + "/" + INSTANCE_ID); - var respPost = invocationBuilder.get(); - assertThat(Response.Status.OK.getStatusCode()).isEqualTo(respPost.getStatus()); - } - - @Test - void testPut() { - var invocationBuilder = super.sendRequest(COMMISSIONING_ENDPOINT - + "/" + COMPOSITION_ID - + "/" + INSTANTIATION_ENDPOINT - + "/" + INSTANCE_ID); - var respPost = invocationBuilder.put(Entity.json(new AcInstanceStateUpdate())); - assertThat(Response.Status.OK.getStatusCode()).isEqualTo(respPost.getStatus()); - } - - @Test - void testPost() { - var invocationBuilder = super.sendRequest(COMMISSIONING_ENDPOINT - + "/" + COMPOSITION_ID - + "/" + INSTANTIATION_ENDPOINT); - var respPost = invocationBuilder.post(Entity.json(new AutomationComposition())); - assertThat(Response.Status.OK.getStatusCode()).isEqualTo(respPost.getStatus()); - } - - @Test - void testDelete() { - var invocationBuilder = super.sendRequest(COMMISSIONING_ENDPOINT - + "/" + COMPOSITION_ID - + "/" + INSTANTIATION_ENDPOINT - + "/" + INSTANCE_ID); - var respPost = invocationBuilder.delete(); - assertThat(Response.Status.OK.getStatusCode()).isEqualTo(respPost.getStatus()); - } -} -- cgit 1.2.3-korg