re base code

[sdc.git] / catalog-be / src / test / java / org / openecomp / sdc / be / servlets / PolicyTypesEndpointTest.java

diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/PolicyTypesEndpointTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/PolicyTypesEndpointTest.java
index b58cae5..9d65c40 100644 (file)
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/PolicyTypesEndpointTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/PolicyTypesEndpointTest.java
@@ -1,20 +1,6 @@
 package org.openecomp.sdc.be.servlets;
 
-import static java.util.Arrays.asList;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.util.List;
-
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
 import org.apache.http.HttpStatus;
-import org.glassfish.jersey.jackson.internal.jackson.jaxrs.json.JacksonJaxbJsonProvider;
-import org.glassfish.jersey.jackson.internal.jackson.jaxrs.json.JacksonJsonProvider;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.junit.Test;
 import org.openecomp.sdc.be.components.impl.PolicyTypeBusinessLogic;
@@ -25,9 +11,15 @@ import org.openecomp.sdc.be.model.PolicyTypeDefinition;
 import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.exception.ResponseFormat;
 
-import com.fasterxml.jackson.databind.DeserializationFeature;
+import javax.ws.rs.client.Invocation;
+import javax.ws.rs.core.GenericType;
+import javax.ws.rs.core.MediaType;
+import java.util.List;
 
-import fj.data.Either;
+import static java.util.Arrays.asList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 public class PolicyTypesEndpointTest extends JerseySpringBaseTest {
 
@@ -40,16 +32,14 @@ public class PolicyTypesEndpointTest extends JerseySpringBaseTest {
     protected ResourceConfig configure() {
         policyTypeBusinessLogic = mock(PolicyTypeBusinessLogic.class);
         componentUtils = mock(ComponentsUtils.class);
-        final JacksonJsonProvider jacksonJsonProvider = new JacksonJaxbJsonProvider().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         return super.configure()
-                .register(new PolicyTypesEndpoint(policyTypeBusinessLogic))
-                .register(jacksonJsonProvider);
+                .register(new PolicyTypesEndpoint(policyTypeBusinessLogic));
     }
 
     @Test
     public void getPolicyTypes() {
         List<PolicyTypeDefinition> policyTypes = buildPolicyTypesList();
-        when(policyTypeBusinessLogic.getAllPolicyTypes(USER_ID, COMPONENT_TYPE)).thenReturn(Either.left(policyTypes));
+        when(policyTypeBusinessLogic.getAllPolicyTypes(USER_ID, COMPONENT_TYPE)).thenReturn(policyTypes);
         when(componentUtils.getResponseFormat(ActionStatus.OK)).thenReturn(new ResponseFormat(HttpStatus.SC_OK));
         List<PolicyTypeDefinition> fetchedPolicyTypes = buildGetPolicyTypesCall().get(new GenericType<List<PolicyTypeDefinition>>(){});
         verifyPolicyTypesList(policyTypes, fetchedPolicyTypes);
@@ -58,22 +48,16 @@ public class PolicyTypesEndpointTest extends JerseySpringBaseTest {
     @Test
     public void getPolicyTypes_whenNoInternalComponent_passNullAsComponentType() {
         List<PolicyTypeDefinition> policyTypes = buildPolicyTypesList();
-        when(policyTypeBusinessLogic.getAllPolicyTypes(USER_ID, null)).thenReturn(Either.left(policyTypes));
+        when(policyTypeBusinessLogic.getAllPolicyTypes(USER_ID, null)).thenReturn(policyTypes);
         when(componentUtils.getResponseFormat(ActionStatus.OK)).thenReturn(new ResponseFormat(HttpStatus.SC_OK));
         List<PolicyTypeDefinition> fetchedPolicyTypes = buildGetPolicyTypesCallNoInternalComponent().get(new GenericType<List<PolicyTypeDefinition>>(){});
         verifyPolicyTypesList(policyTypes, fetchedPolicyTypes);
     }
 
-    @Test
-    public void getPolicyTypes_error() {
-        when(policyTypeBusinessLogic.getAllPolicyTypes(USER_ID, COMPONENT_TYPE)).thenReturn(Either.right(new ResponseFormat(HttpStatus.SC_INTERNAL_SERVER_ERROR)));
-        Response response = buildGetPolicyTypesCall().get();
-        assertThat(response.getStatus()).isEqualTo(500);
-    }
 
     private void verifyPolicyTypesList(List<PolicyTypeDefinition> policyTypes, List<PolicyTypeDefinition> fetchedPolicyTypes) {
         assertThat(fetchedPolicyTypes)
-                .usingElementComparatorOnFields("version", "type", "uniqueId")
+                .usingElementComparatorOnFields("version", "type", "uniqueId", "name", "icon")
                 .isEqualTo(policyTypes);
         assertThat(fetchedPolicyTypes).extracting("derivedFrom")//derivedFrom is not on the PolicyTypeMixin and should not return in response
                 .containsOnly((String)null);
@@ -93,9 +77,30 @@ public class PolicyTypesEndpointTest extends JerseySpringBaseTest {
     }
 
     private List<PolicyTypeDefinition> buildPolicyTypesList() {
-        PolicyTypeDefinition type1 = new PolicyTypeBuilder().setDerivedFrom("root").setType("type1").setUniqueId("id1").setVersion("1.0").build();
-        PolicyTypeDefinition type2 = new PolicyTypeBuilder().setDerivedFrom("type1").setType("type2").setUniqueId("id2").setVersion("1.0").build();
-        PolicyTypeDefinition type3 = new PolicyTypeBuilder().setDerivedFrom("root").setType("type3").setUniqueId("id3").setVersion("1.0").build();
+        PolicyTypeDefinition type1 = new PolicyTypeBuilder()
+                .setDerivedFrom("root")
+                .setType("type1")
+                .setUniqueId("id1")
+                .setVersion("1.0")
+                .setName("type1name")
+                .setIcon("type1Icon")
+                .build();
+        PolicyTypeDefinition type2 = new PolicyTypeBuilder()
+                .setDerivedFrom("type1")
+                .setType("type2")
+                .setUniqueId("id2")
+                .setVersion("1.0")
+                .setName("type2name")
+                .setIcon("type2con")
+                .build();
+        PolicyTypeDefinition type3 = new PolicyTypeBuilder()
+                .setDerivedFrom("root")
+                .setType("type3")
+                .setUniqueId("id3")
+                .setVersion("1.0")
+                .setName("type3name")
+                .setIcon("type3con")
+                .build();
         return asList(type1, type2, type3);
     }