Merge "Integrate sdc-tosca parser jar"

[externalapi/nbi.git] / src / test / java / org / onap / nbi / apis / assertions / ServiceCatalogAssertions.java

diff --git a/src/test/java/org/onap/nbi/apis/assertions/ServiceCatalogAssertions.java b/src/test/java/org/onap/nbi/apis/assertions/ServiceCatalogAssertions.java
index 5b68783..3789c8f 100644 (file)
--- a/src/test/java/org/onap/nbi/apis/assertions/ServiceCatalogAssertions.java
+++ b/src/test/java/org/onap/nbi/apis/assertions/ServiceCatalogAssertions.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
@@ -49,11 +48,11 @@ public class ServiceCatalogAssertions {
         assertThat(((ArrayList) service.get("resourceSpecification")).size()).isEqualTo(2);
         LinkedHashMap resource1 = (LinkedHashMap) ((ArrayList) service.get("resourceSpecification")).get(0);
         assertThat(resource1.get("name")).isEqualTo("vFW-vSINK");
-        assertThat(resource1.get("instanceName")).isEqualTo("vFW-vSINK 0");
+        assertThat(resource1.get("resourceInstanceName")).isEqualTo("vFW-vSINK 0");
+        assertThat(resource1.get("resourceType")).isEqualTo("VF");
         assertThat(resource1.get("resourceInvariantUUID")).isEqualTo("18b90934-aa82-456f-938e-e74a07a426f3");
         assertThat(resource1.get("@type")).isEqualTo("ONAPresource");
-        assertThat(resource1.get("modelCustomizationId")).isEqualTo("f7ae574e-fd5f-41e7-9b21-75e001561c96");
-        assertThat(resource1.get("modelCustomizationName")).isEqualTo("vFW-vSINK");
+        assertThat(resource1.get("modelCustomizationName")).isEqualTo("vFW-vSINK 0");
 
         assertThat(((ArrayList) service.get("serviceSpecCharacteristic")).size()).isEqualTo(4);
         ArrayList serviceSPecCharacteristics = (ArrayList) service.get("serviceSpecCharacteristic");
@@ -63,7 +62,7 @@ public class ServiceCatalogAssertions {
                 assertThat(serviceSPecCharacteristicMap.get("valueType")).isEqualTo("integer");
                 assertThat(serviceSPecCharacteristicMap.get("@type")).isEqualTo("ONAPserviceCharacteristic");
                 ArrayList serviceSpecCharacteristicValues =
-                        (ArrayList) serviceSPecCharacteristicMap.get("serviceSpecCharacteristicValue");
+                    (ArrayList) serviceSPecCharacteristicMap.get("serviceSpecCharacteristicValue");
                 for (Object serviceSpecCharacteristicValue : serviceSpecCharacteristicValues) {
                     LinkedHashMap serviceSpecCharacteristicValueMap = (LinkedHashMap) serviceSpecCharacteristicValue;
                     if (serviceSpecCharacteristicValueMap.get("value").toString().equals("2")) {
@@ -76,18 +75,20 @@ public class ServiceCatalogAssertions {
                 }
             }
         }
+
     }
 
 
 
-    public static void asserGetServiceCatalogWithoutTosca(ResponseEntity<Object> resource) {
+
+    public static void assertGetServiceCatalogWithoutTosca(ResponseEntity<Object> resource) {
         assertThat(resource.getStatusCode()).isEqualTo(HttpStatus.PARTIAL_CONTENT);
         LinkedHashMap service = (LinkedHashMap) resource.getBody();
         assertThat(service.get("id")).isEqualTo("1e3feeb0-8e36-46c6-862c-236d9c626439");
         assertThat(service.get("name")).isEqualTo("vFW");
         assertThat(service.get("invariantUUID")).isEqualTo("b58a118e-eeb9-4f6e-bdca-e292f84d17df");
         assertThat(service.get("toscaModelURL"))
-                .isEqualTo("/sdc/v1/catalog/services/1e3feeb0-8e36-46c6-862c-236d9c626439toto/toscaModel");
+            .isEqualTo("/sdc/v1/catalog/services/1e3feeb0-8e36-46c6-862c-236d9c626439toto/toscaModel");
         assertThat(service.get("distributionStatus")).isEqualTo("DISTRIBUTED");
         assertThat(service.get("version")).isEqualTo("2.0");
         assertThat(service.get("lifecycleStatus")).isEqualTo("CERTIFIED");
@@ -101,17 +102,23 @@ public class ServiceCatalogAssertions {
         assertThat(((ArrayList) service.get("resourceSpecification")).size()).isEqualTo(2);
         LinkedHashMap resource1 = (LinkedHashMap) ((ArrayList) service.get("resourceSpecification")).get(0);
         assertThat(resource1.get("name")).isEqualTo("vFW-vSINK");
-        assertThat(resource1.get("instanceName")).isEqualTo("vFW-vSINK 0");
+        assertThat(resource1.get("resourceInstanceName")).isEqualTo("vFW-vSINK 0");
+        assertThat(resource1.get("resourceType")).isEqualTo("VF");
         assertThat(resource1.get("resourceInvariantUUID")).isEqualTo("18b90934-aa82-456f-938e-e74a07a426f3");
         assertThat(resource1.get("@type")).isEqualTo("ONAPresource");
-        assertThat(resource1.get("modelCustomizationId")).isNull();
-        assertThat(resource1.get("modelCustomizationName")).isNull();
-
+        assertThat(resource1.get("modelCustomizationName")).isEqualTo("vFW-vSINK 0");
         assertThat(service.get("serviceSpecCharacteristic")).isNull();
     }
 
 
 
+
+
+
+
+
+
+
     public static void assertFindServiceCatalog(ResponseEntity<Object> resource) {
         assertThat(resource.getStatusCode()).isEqualTo(HttpStatus.OK);
         ArrayList body = (ArrayList) resource.getBody();