X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=plans%2Fso%2Fintegration-etsi-testing%2Fso-simulators%2Fsdc-simulator%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fso%2Fsdcsimulator%2Fcontroller%2FCatalogControllerTest.java;h=57db74c35f3e1ee523d5e9a0398173b2be9192a2;hb=5c4fc23ce2d42abac893c8a462bba8c6872d7b60;hp=d7ae74bbb05f6702196ae8454a2745650317c963;hpb=87a7fca8a3db019e191447526b3e291514aa0725;p=integration%2Fcsit.git

diff --git a/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/test/java/org/onap/so/sdcsimulator/controller/CatalogControllerTest.java b/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/test/java/org/onap/so/sdcsimulator/controller/CatalogControllerTest.java
index d7ae74bb..57db74c3 100644
--- a/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/test/java/org/onap/so/sdcsimulator/controller/CatalogControllerTest.java
+++ b/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/test/java/org/onap/so/sdcsimulator/controller/CatalogControllerTest.java
@@ -29,7 +29,9 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.onap.so.sdcsimulator.models.Metadata;
 import org.onap.so.sdcsimulator.models.ResourceAssetInfo;
+import org.onap.so.sdcsimulator.models.ResourceMetadata;
 import org.onap.so.sdcsimulator.models.ServiceAssetInfo;
+import org.onap.so.sdcsimulator.models.ServiceMetadata;
 import org.onap.so.sdcsimulator.utils.Constants;
 import org.onap.so.simulator.model.UserCredentials;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,6 +60,10 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 @Configuration
 public class CatalogControllerTest {
 
+    private static final String SUB_CATEGORY = "Network Service";
+
+    private static final String DISTRIBUTION_STATUS = "DISTRIBUTED";
+
     private static final String SERVICE_ID = "9bb8c882-44a1-4b67-a12c-5a998e18d6ba";
 
     private static final String RESOURCE_ID = "73522444-e8e9-49c1-be29-d355800aa349";
@@ -97,6 +103,7 @@ public class CatalogControllerTest {
         assertEquals(HttpStatus.OK, response.getStatusCode());
         assertTrue(response.hasBody());
         assertEquals(1, response.getBody().size());
+        assertEquals(SUB_CATEGORY, response.getBody().iterator().next().getSubCategory());
 
     }
 
@@ -110,6 +117,7 @@ public class CatalogControllerTest {
         assertEquals(HttpStatus.OK, response.getStatusCode());
         assertTrue(response.hasBody());
         assertEquals(1, response.getBody().size());
+        assertEquals(DISTRIBUTION_STATUS, response.getBody().iterator().next().getDistributionStatus());
 
     }
 
@@ -130,15 +138,16 @@ public class CatalogControllerTest {
 
         final String url = getBaseUrl() + "/resources/" + RESOURCE_ID + "/metadata";
 
-        final ResponseEntity<Metadata> response =
-                restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(getHttpHeaders()), Metadata.class);
+        final ResponseEntity<ResourceMetadata> response =
+                restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(getHttpHeaders()), ResourceMetadata.class);
 
 
         assertEquals(HttpStatus.OK, response.getStatusCode());
         assertTrue(response.hasBody());
-        final Metadata actual = response.getBody();
+        final ResourceMetadata actual = response.getBody();
         assertEquals(8, actual.getResources().size());
         assertEquals(3, actual.getArtifacts().size());
+        assertEquals(SUB_CATEGORY, actual.getSubCategory());
 
     }
 
@@ -147,15 +156,16 @@ public class CatalogControllerTest {
 
         final String url = getBaseUrl() + "/services/" + SERVICE_ID + "/metadata";
 
-        final ResponseEntity<Metadata> response =
-                restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(getHttpHeaders()), Metadata.class);
+        final ResponseEntity<ServiceMetadata> response =
+                restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(getHttpHeaders()), ServiceMetadata.class);
 
 
         assertEquals(HttpStatus.OK, response.getStatusCode());
         assertTrue(response.hasBody());
-        final Metadata actual = response.getBody();
+        final ServiceMetadata actual = response.getBody();
         assertEquals(1, actual.getResources().size());
         assertEquals(1, actual.getArtifacts().size());
+        assertEquals(DISTRIBUTION_STATUS, actual.getDistributionStatus());
 
     }