Stitching to new ModelContext V1

Issue-ID: LOG-401
Change-Id: Icaa0bf5d5c66a9a101adc9650c19a5b1e8dcf1da
Signed-off-by: Tait,Trevor(rt0435) <rtait@amdocs.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/src/test/java/org/onap/pomba/contextbuilder/networkdiscovery/unittest/service/NetworkDiscoveryContextBuilderTest.java b/src/test/java/org/onap/pomba/contextbuilder/networkdiscovery/unittest/service/NetworkDiscoveryContextBuilderTest.java
index 5485535..19af1f3 100644
--- a/src/test/java/org/onap/pomba/contextbuilder/networkdiscovery/unittest/service/NetworkDiscoveryContextBuilderTest.java
+++ b/src/test/java/org/onap/pomba/contextbuilder/networkdiscovery/unittest/service/NetworkDiscoveryContextBuilderTest.java
@@ -255,15 +255,14 @@ public class NetworkDiscoveryContextBuilderTest {
     }
 
     private NetworkDiscoveryNotification simulateNetworkDiscoveryNotification() {
-        NetworkDiscoveryNotification notification = new NetworkDiscoveryNotification();
         Resource myResource = new Resource();
         myResource.setId("25fb07ab-0478-465e-a021-6384ac299671");
         myResource.setType("vserver");
         DataQuality dataQuality = new DataQuality();
         dataQuality.setStatus(DataQuality.Status.ok);
         myResource.setDataQuality(dataQuality);
-        List<Attribute> attributeList = new ArrayList<>();;
         Attribute attribute = new Attribute();
+        List<Attribute> attributeList = new ArrayList<>();
         attribute.setName("vserver-id");
         attribute.setValue("25fb07ab-0478-465e-a021-6384ac299671");
         attribute.setDataQuality(dataQuality);
@@ -315,6 +314,7 @@ public class NetworkDiscoveryContextBuilderTest {
         attributeList.add(attribute);
         myResource.setAttributeList(attributeList);
 
+        NetworkDiscoveryNotification notification = new NetworkDiscoveryNotification();
         notification.setResources(Arrays.asList(myResource));
         notification.setAckFinalIndicator(true);
         notification.setCode(200);
@@ -325,7 +325,6 @@ public class NetworkDiscoveryContextBuilderTest {
     }
 
     private void simulateNetworkDiscoveryInfoList() {
-        NetworkDiscoveryInfoAccess networkDiscoveryInfoAccess = new NetworkDiscoveryInfoAccess();
 
         String requestId2 = "2131__2";
         List<String> related_request_list = new ArrayList<>();
@@ -337,6 +336,8 @@ public class NetworkDiscoveryContextBuilderTest {
         notif1.setResourceType(resourceType);
         notif1.setResourceId(resourceId);
         notif1.setRelatedRequestIdList(related_request_list);
+
+        NetworkDiscoveryInfoAccess networkDiscoveryInfoAccess = new NetworkDiscoveryInfoAccess();
         networkDiscoveryInfoAccess.updateList(requestId, notif1);
 
         NetworkDiscoveryRspInfo notif2 = new NetworkDiscoveryRspInfo();