Add netconf support to pnfsimulator.

[integration.git] / test / mocks / pnfsimulator / src / test / java / org / onap / pnfsimulator / message / MessageProviderTest.java

diff --git a/test/mocks/pnfsimulator/src/test/java/org/onap/pnfsimulator/message/MessageProviderTest.java b/test/mocks/pnfsimulator/src/test/java/org/onap/pnfsimulator/message/MessageProviderTest.java
index d462d25..41df397 100644 (file)
--- a/test/mocks/pnfsimulator/src/test/java/org/onap/pnfsimulator/message/MessageProviderTest.java
+++ b/test/mocks/pnfsimulator/src/test/java/org/onap/pnfsimulator/message/MessageProviderTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * org.onap.integration
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,6 +37,7 @@ import static org.onap.pnfsimulator.message.MessageConstants.PRIORITY;
 import static org.onap.pnfsimulator.message.MessageConstants.SEQUENCE;
 import static org.onap.pnfsimulator.message.MessageConstants.START_EPOCH_MICROSEC;
 import static org.onap.pnfsimulator.message.MessageConstants.VERSION;
+import static org.onap.pnfsimulator.message.MessageConstants.EVENT;
 
 import java.util.UUID;
 import org.json.JSONObject;
@@ -52,7 +53,7 @@ public class MessageProviderTest {
 
     @BeforeAll
     public static void setup() {
-        messageProvider = MessageProvider.getInstance();
+        messageProvider = new MessageProvider();
     }
 
     @Test
@@ -65,9 +66,10 @@ public class MessageProviderTest {
     @Test
     public void createMessage_should_create_constant_message_when_no_params_specified() {
         JSONObject message = messageProvider.createMessage(new JSONObject());
+        JSONObject event = message.getJSONObject(EVENT);
 
-        JSONObject commonEventHeader = message.getJSONObject(COMMON_EVENT_HEADER);
-        JSONObject otherFields = message.getJSONObject(OTHER_FIELDS);
+        JSONObject commonEventHeader = event.getJSONObject(COMMON_EVENT_HEADER);
+        JSONObject otherFields = event.getJSONObject(OTHER_FIELDS);
 
         JSONObject expectedCommonEventHeader = generateConstantCommonEventHeader();
         JSONObject expectedOtherFields = generateConstantOtherFields();
@@ -88,9 +90,10 @@ public class MessageProviderTest {
     public void createMessage_should_add_specified_params_to_valid_subobjects() {
         JSONObject params = new JSONObject(testParamsJson);
         JSONObject message = messageProvider.createMessage(params);
+        JSONObject event = message.getJSONObject(EVENT);
 
-        JSONObject commonEventHeader = message.getJSONObject(COMMON_EVENT_HEADER);
-        JSONObject otherFields = message.getJSONObject(OTHER_FIELDS);
+        JSONObject commonEventHeader = event.getJSONObject(COMMON_EVENT_HEADER);
+        JSONObject otherFields = event.getJSONObject(OTHER_FIELDS);
 
         assertEquals("pnfVal3", otherFields.getString("pnfKey3"));
         assertEquals("val1", commonEventHeader.getString("key1"));