1 files changed, 12 insertions, 55 deletions

diff --git a/pnfsimulator/integration/src/test/java/org/onap/pnfsimulator/integration/OptionalTemplatesTest.java b/pnfsimulator/integration/src/test/java/org/onap/pnfsimulator/integration/OptionalTemplatesTest.java
index a5ffe4d..50ad1cd 100644
--- a/pnfsimulator/integration/src/test/java/org/onap/pnfsimulator/integration/OptionalTemplatesTest.java
+++ b/pnfsimulator/integration/src/test/java/org/onap/pnfsimulator/integration/OptionalTemplatesTest.java
@@ -23,22 +23,16 @@ package org.onap.pnfsimulator.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 com.mongodb.MongoClient;
-import com.mongodb.MongoClientOptions;
-import com.mongodb.MongoCredential;
-import com.mongodb.ServerAddress;
-import com.mongodb.client.FindIterable;
-import com.mongodb.client.MongoCollection;
-import com.mongodb.client.MongoCursor;
-import com.mongodb.client.MongoDatabase;
 import java.time.Instant;
-import java.net.Inet4Address;
-import java.net.NetworkInterface;
-import java.net.SocketException;
 import java.net.UnknownHostException;
-import java.util.Collections;
+
 import org.assertj.core.api.Assertions;
 import org.bson.Document;
 import org.junit.After;
@@ -50,22 +44,13 @@ import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.http.HttpStatus;
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = {Main.class, TestConfiguration.class}, webEnvironment = WebEnvironment.DEFINED_PORT)
 public class OptionalTemplatesTest {
 
-    private static final String PNF_SIMULATOR_DB = "pnf_simulator";
-    private static final String COMMON_EVENT_HEADER = "commonEventHeader";
-    private static final String PNF_SIMULATOR_DB_PSWD = "zXcVbN123!";
-    private static final String PNF_SIMULATOR_DB_USER = "pnf_simulator_user";
-    private static final String PATCHED = "patched";
-    private static final String SINGLE_EVENT_URL = "http://0.0.0.0:5000/simulator/event";
-
-    @Autowired
-    VesSimulatorController vesSimulatorController;
-
     @Autowired
     private VesSimulatorService vesSimulatorService;
 
@@ -109,8 +94,8 @@ public class OptionalTemplatesTest {
             .when()
             .post(SINGLE_EVENT_URL)
             .then()
-            .statusCode(202)
-            .body("message", equalTo("One-time direct event sent successfully"));
+            .statusCode(HttpStatus.ACCEPTED.value())
+            .body("message", equalTo("Accepted"));
 
         //then
         long afterExecution = Instant.now().getEpochSecond();
@@ -124,7 +109,7 @@ public class OptionalTemplatesTest {
             .get("sourceName").getAsString()).isEqualTo("Single_sourceName");
         assertThat(value
             .getAsJsonObject(COMMON_EVENT_HEADER)
-            .get("eventId1").getAsString().length()).isEqualTo(20);
+            .get("eventId1").getAsString()).hasSize(20);
         assertThat(value
             .getAsJsonObject(COMMON_EVENT_HEADER)
             .get("eventId2").getAsString()).isEqualTo("10");
@@ -160,8 +145,8 @@ public class OptionalTemplatesTest {
             .when()
             .post(SINGLE_EVENT_URL)
             .then()
-            .statusCode(202)
-            .body("message", equalTo("One-time direct event sent successfully"));
+            .statusCode(HttpStatus.ACCEPTED.value())
+            .body("message", equalTo("Accepted"));
 
         //then
         Mockito.verify(vesSimulatorService,
@@ -173,32 +158,4 @@ public class OptionalTemplatesTest {
             .isEqualTo("{\"commonEventHeader\":{\"sourceName\":\"HistoricalEvent\",\"version\":3}}");
     }
 
-    private Document findSourceNameInMongoDB() throws UnknownHostException {
-        MongoCredential credential = MongoCredential
-            .createCredential(PNF_SIMULATOR_DB_USER, PNF_SIMULATOR_DB, PNF_SIMULATOR_DB_PSWD.toCharArray());
-        MongoClient mongoClient = new MongoClient(new ServerAddress(Inet4Address.getLocalHost(), 27017),
-            credential, MongoClientOptions.builder().build());
-        MongoDatabase pnfSimulatorDb = mongoClient.getDatabase(PNF_SIMULATOR_DB);
-        MongoCollection<Document> table = pnfSimulatorDb.getCollection("eventData");
-        Document searchQuery = new Document();
-        searchQuery.put(PATCHED, new Document("$regex", ".*" + "HistoricalEvent" + ".*"));
-        FindIterable<Document> findOfPatched = table.find(searchQuery);
-        Document dbObject = null;
-        MongoCursor<Document> cursor = findOfPatched.iterator();
-        if (cursor.hasNext()) {
-            dbObject = cursor.next();
-        }
-        return dbObject;
-    }
-
-    private String getCurrentIpAddress() throws SocketException {
-        return Collections.list(NetworkInterface.getNetworkInterfaces()).stream()
-            .flatMap(i -> Collections.list(i.getInetAddresses()).stream())
-            .filter(ip -> ip instanceof Inet4Address)
-            .map(e -> (Inet4Address) e)
-            .findFirst()
-            .orElseThrow(RuntimeException::new)
-            .getHostAddress();
-    }
-
 }