diff options
Diffstat (limited to 'integration/src/test/java')
9 files changed, 42 insertions, 61 deletions
diff --git a/integration/src/test/java/org/onap/pnfsimulator/integration/BasicAvailabilityTest.java b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/BasicAvailabilityTest.java index 323243c..268d738 100644 --- a/integration/src/test/java/org/onap/pnfsimulator/integration/BasicAvailabilityTest.java +++ b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/BasicAvailabilityTest.java @@ -18,24 +18,19 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.integration; +package org.onap.integration.simulators.nfsimulator.vesclient.integration; import static io.restassured.RestAssured.given; import static io.restassured.RestAssured.when; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.onap.pnfsimulator.integration.TestUtils.getCurrentIpAddress; import com.google.gson.JsonObject; import java.io.IOException; -import java.net.Inet4Address; -import java.net.NetworkInterface; -import java.net.SocketException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.Collections; import java.util.UUID; import io.restassured.response.Response; @@ -71,7 +66,7 @@ public class BasicAvailabilityTest { @Before public void setUp() throws Exception { - currenVesSimulatorIp = getCurrentIpAddress(); + currenVesSimulatorIp = TestUtils.getCurrentIpAddress(); } @After diff --git a/integration/src/test/java/org/onap/pnfsimulator/integration/OptionalTemplatesTest.java b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/OptionalTemplatesTest.java index 50ad1cd..33dcf97 100644 --- a/integration/src/test/java/org/onap/pnfsimulator/integration/OptionalTemplatesTest.java +++ b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/OptionalTemplatesTest.java @@ -7,9 +7,9 @@ * 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. @@ -18,16 +18,11 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.integration; +package org.onap.integration.simulators.nfsimulator.vesclient.integration; import static io.restassured.RestAssured.given; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.onap.pnfsimulator.integration.TestUtils.COMMON_EVENT_HEADER; -import static org.onap.pnfsimulator.integration.TestUtils.PATCHED; -import static org.onap.pnfsimulator.integration.TestUtils.SINGLE_EVENT_URL; -import static org.onap.pnfsimulator.integration.TestUtils.findSourceNameInMongoDB; -import static org.onap.pnfsimulator.integration.TestUtils.getCurrentIpAddress; import com.google.gson.JsonObject; import java.time.Instant; @@ -58,7 +53,7 @@ public class OptionalTemplatesTest { @Before public void setUp() throws Exception { - currentVesSimulatorIp = getCurrentIpAddress(); + currentVesSimulatorIp = TestUtils.getCurrentIpAddress(); } @After @@ -92,7 +87,7 @@ public class OptionalTemplatesTest { .contentType("application/json") .body(body) .when() - .post(SINGLE_EVENT_URL) + .post(TestUtils.SINGLE_EVENT_URL) .then() .statusCode(HttpStatus.ACCEPTED.value()) .body("message", equalTo("Accepted")); @@ -105,22 +100,22 @@ public class OptionalTemplatesTest { JsonObject value = parameterCaptor.getValue(); assertThat(value - .getAsJsonObject(COMMON_EVENT_HEADER) + .getAsJsonObject(TestUtils.COMMON_EVENT_HEADER) .get("sourceName").getAsString()).isEqualTo("Single_sourceName"); assertThat(value - .getAsJsonObject(COMMON_EVENT_HEADER) + .getAsJsonObject(TestUtils.COMMON_EVENT_HEADER) .get("eventId1").getAsString()).hasSize(20); assertThat(value - .getAsJsonObject(COMMON_EVENT_HEADER) + .getAsJsonObject(TestUtils.COMMON_EVENT_HEADER) .get("eventId2").getAsString()).isEqualTo("10"); assertThat(value - .getAsJsonObject(COMMON_EVENT_HEADER) + .getAsJsonObject(TestUtils.COMMON_EVENT_HEADER) .get("eventId3").getAsString()).isEqualTo("1"); assertThat(value - .getAsJsonObject(COMMON_EVENT_HEADER) + .getAsJsonObject(TestUtils.COMMON_EVENT_HEADER) .get("eventId4").getAsInt()).isEqualTo(10); assertThat(value - .getAsJsonObject(COMMON_EVENT_HEADER) + .getAsJsonObject(TestUtils.COMMON_EVENT_HEADER) .get("eventId5").getAsLong()).isBetween(currentTimestamp, afterExecution); } @@ -143,7 +138,7 @@ public class OptionalTemplatesTest { .contentType("application/json") .body(body) .when() - .post(SINGLE_EVENT_URL) + .post(TestUtils.SINGLE_EVENT_URL) .then() .statusCode(HttpStatus.ACCEPTED.value()) .body("message", equalTo("Accepted")); @@ -153,8 +148,8 @@ public class OptionalTemplatesTest { Mockito.timeout(3000)) .sendEventToDmaapV5(parameterCaptor.capture()); - Document sourceNameInMongoDB = findSourceNameInMongoDB(); - Assertions.assertThat(sourceNameInMongoDB.get(PATCHED)) + Document sourceNameInMongoDB = TestUtils.findSourceNameInMongoDB(); + Assertions.assertThat(sourceNameInMongoDB.get(TestUtils.PATCHED)) .isEqualTo("{\"commonEventHeader\":{\"sourceName\":\"HistoricalEvent\",\"version\":3}}"); } diff --git a/integration/src/test/java/org/onap/pnfsimulator/integration/SearchInTemplatesTest.java b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/SearchInTemplatesTest.java index 9d4ff3b..a0d8742 100644 --- a/integration/src/test/java/org/onap/pnfsimulator/integration/SearchInTemplatesTest.java +++ b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/SearchInTemplatesTest.java @@ -7,9 +7,9 @@ * 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. @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.integration; +package org.onap.integration.simulators.nfsimulator.vesclient.integration; import static io.restassured.RestAssured.given; import static java.nio.file.Files.readAllBytes; diff --git a/integration/src/test/java/org/onap/pnfsimulator/integration/SingleEventTest.java b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/SingleEventTest.java index 3ad1385..7d15842 100644 --- a/integration/src/test/java/org/onap/pnfsimulator/integration/SingleEventTest.java +++ b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/SingleEventTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.integration; +package org.onap.integration.simulators.nfsimulator.vesclient.integration; import com.google.gson.JsonObject; import org.assertj.core.api.Assertions; @@ -40,10 +40,6 @@ import java.util.List; import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.stringContainsInOrder; -import static org.onap.pnfsimulator.integration.TestUtils.PATCHED; -import static org.onap.pnfsimulator.integration.TestUtils.SINGLE_EVENT_URL; -import static org.onap.pnfsimulator.integration.TestUtils.findSourceNameInMongoDB; -import static org.onap.pnfsimulator.integration.TestUtils.getCurrentIpAddress; @RunWith(SpringRunner.class) @SpringBootTest(classes = {Main.class, TestConfiguration.class}, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT) @@ -56,7 +52,7 @@ public class SingleEventTest { @Before public void setUp() throws Exception { - currentVesSimulatorIp = getCurrentIpAddress(); + currentVesSimulatorIp = TestUtils.getCurrentIpAddress(); } @After @@ -82,7 +78,7 @@ public class SingleEventTest { .contentType("application/json") .body(body) .when() - .post(SINGLE_EVENT_URL) + .post(TestUtils.SINGLE_EVENT_URL) .then() .statusCode(421) .body("message", @@ -107,7 +103,7 @@ public class SingleEventTest { .contentType("application/json") .body(body) .when() - .post(SINGLE_EVENT_URL) + .post(TestUtils.SINGLE_EVENT_URL) .then() .statusCode(HttpStatus.BAD_REQUEST.value()) .body("message", @@ -134,7 +130,7 @@ public class SingleEventTest { .contentType("application/json") .body(body) .when() - .post(SINGLE_EVENT_URL) + .post(TestUtils.SINGLE_EVENT_URL) .then() .statusCode(HttpStatus.ACCEPTED.value()) .body("message", equalTo("Accepted")); @@ -144,8 +140,8 @@ public class SingleEventTest { Mockito.timeout(3000)) .sendEventToDmaapV5(parameterCaptor.capture()); - Document sourceNameInMongoDB = findSourceNameInMongoDB(); - Assertions.assertThat(sourceNameInMongoDB.get(PATCHED)) + Document sourceNameInMongoDB = TestUtils.findSourceNameInMongoDB(); + Assertions.assertThat(sourceNameInMongoDB.get(TestUtils.PATCHED)) .isEqualTo("{\"commonEventHeader\":{\"sourceName\":\"HistoricalEvent\",\"version\":3}}"); } } diff --git a/integration/src/test/java/org/onap/pnfsimulator/integration/TemplatesManagementTest.java b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/TemplatesManagementTest.java index 7e74dd4..ecaa0db 100644 --- a/integration/src/test/java/org/onap/pnfsimulator/integration/TemplatesManagementTest.java +++ b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/TemplatesManagementTest.java @@ -7,9 +7,9 @@ * 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. @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.integration; +package org.onap.integration.simulators.nfsimulator.vesclient.integration; import static io.restassured.RestAssured.given; diff --git a/integration/src/test/java/org/onap/pnfsimulator/integration/TestConfiguration.java b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/TestConfiguration.java index 19ae050..cbfca42 100644 --- a/integration/src/test/java/org/onap/pnfsimulator/integration/TestConfiguration.java +++ b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/TestConfiguration.java @@ -7,9 +7,9 @@ * 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. @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.integration; +package org.onap.integration.simulators.nfsimulator.vesclient.integration; import org.mockito.Mockito; import org.springframework.context.annotation.Bean; diff --git a/integration/src/test/java/org/onap/pnfsimulator/integration/TestUtils.java b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/TestUtils.java index f7df5e9..8ad3ddd 100644 --- a/integration/src/test/java/org/onap/pnfsimulator/integration/TestUtils.java +++ b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/TestUtils.java @@ -1,4 +1,4 @@ -package org.onap.pnfsimulator.integration; +package org.onap.integration.simulators.nfsimulator.vesclient.integration; import com.mongodb.MongoClient; import com.mongodb.MongoClientOptions; diff --git a/integration/src/test/java/org/onap/pnfsimulator/integration/VariablesReplacement.java b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/VariablesReplacement.java index ae7970c..da93e60 100644 --- a/integration/src/test/java/org/onap/pnfsimulator/integration/VariablesReplacement.java +++ b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/VariablesReplacement.java @@ -1,15 +1,10 @@ -package org.onap.pnfsimulator.integration; +package org.onap.integration.simulators.nfsimulator.vesclient.integration; import static io.restassured.RestAssured.given; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.onap.pnfsimulator.integration.TestUtils.getCurrentIpAddress; import com.google.gson.JsonObject; -import java.net.Inet4Address; -import java.net.NetworkInterface; -import java.net.SocketException; -import java.util.Collections; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -31,7 +26,7 @@ public class VariablesReplacement { @Before public void setUp() throws Exception { - currentVesSimulatorIp = getCurrentIpAddress(); + currentVesSimulatorIp = TestUtils.getCurrentIpAddress(); } @Test diff --git a/integration/src/test/java/org/onap/pnfsimulator/integration/suites/DockerBasedTestsSuite.java b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/suites/DockerBasedTestsSuite.java index f6a4c24..16638ac 100644 --- a/integration/src/test/java/org/onap/pnfsimulator/integration/suites/DockerBasedTestsSuite.java +++ b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/suites/DockerBasedTestsSuite.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.pnfsimulator.integration.suites; +package org.onap.integration.simulators.nfsimulator.vesclient.integration.suites; import com.palantir.docker.compose.DockerComposeRule; import com.palantir.docker.compose.connection.waiting.HealthChecks; @@ -27,12 +27,12 @@ import org.junit.ClassRule; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; -import org.onap.pnfsimulator.integration.BasicAvailabilityTest; -import org.onap.pnfsimulator.integration.OptionalTemplatesTest; -import org.onap.pnfsimulator.integration.SearchInTemplatesTest; -import org.onap.pnfsimulator.integration.SingleEventTest; -import org.onap.pnfsimulator.integration.TemplatesManagementTest; -import org.onap.pnfsimulator.integration.VariablesReplacement; +import org.onap.integration.simulators.nfsimulator.vesclient.integration.OptionalTemplatesTest; +import org.onap.integration.simulators.nfsimulator.vesclient.integration.BasicAvailabilityTest; +import org.onap.integration.simulators.nfsimulator.vesclient.integration.SearchInTemplatesTest; +import org.onap.integration.simulators.nfsimulator.vesclient.integration.SingleEventTest; +import org.onap.integration.simulators.nfsimulator.vesclient.integration.TemplatesManagementTest; +import org.onap.integration.simulators.nfsimulator.vesclient.integration.VariablesReplacement; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; |