Fix property validation for data type in model

[sdc.git] / catalog-be / src / test / java / org / openecomp / sdc / be / components / impl / DataTypeBusinessLogicTest.java

diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/DataTypeBusinessLogicTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/DataTypeBusinessLogicTest.java
index d6b5920..3719b9b 100644 (file)
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/DataTypeBusinessLogicTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/DataTypeBusinessLogicTest.java
@@ -22,16 +22,17 @@ package org.openecomp.sdc.be.components.impl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import fj.data.Either;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.InjectMocks;
@@ -49,7 +50,9 @@ import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.tosca.ToscaPropertyType;
-import org.openecomp.sdc.be.user.IUserBusinessLogic;
+import org.openecomp.sdc.be.user.UserBusinessLogic;
+
+import fj.data.Either;
 
 public class DataTypeBusinessLogicTest {
 
@@ -63,7 +66,7 @@ public class DataTypeBusinessLogicTest {
     private ComponentsUtils componentsUtilsMock;
 
     @Mock
-    private IUserBusinessLogic userAdminMock;
+    private UserBusinessLogic userAdminMock;
 
     @Mock
     private ToscaOperationFacade toscaOperationFacadeMock;
@@ -74,6 +77,9 @@ public class DataTypeBusinessLogicTest {
     @Mock
     private ComponentInstanceBusinessLogic componentInstanceBusinessLogic;
 
+    @Mock
+    private DataTypeImportManager dataTypeImportManager;
+
     @InjectMocks
     private DataTypeBusinessLogic testInstance;
 
@@ -81,7 +87,10 @@ public class DataTypeBusinessLogicTest {
 
     @Before
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
+
+        testInstance.setToscaOperationFacade(toscaOperationFacadeMock);
+
         service = new Service();
         service.setUniqueId(COMPONENT_INSTANCE_ID);
         ComponentInstance componentInstance = new ComponentInstance();
@@ -89,7 +98,7 @@ public class DataTypeBusinessLogicTest {
         service.setComponentInstances(Collections.singletonList(componentInstance));
         DataTypeDefinition dataType = new DataTypeDefinition();
         dataType.setName(DATATYPE_NAME);
-        dataType.setDerivedFromName(ToscaPropertyType.Root.getType());
+        dataType.setDerivedFromName(ToscaPropertyType.ROOT.getType());
         List<DataTypeDefinition> dataTypes = Arrays.asList(dataType);
         service.setDataTypes(dataTypes);
 
@@ -99,8 +108,14 @@ public class DataTypeBusinessLogicTest {
         instanceInputMap.put(COMPONENT_INSTANCE_ID, Collections.singletonList(componentInstanceInput));
         instanceInputMap.put("someInputId", Collections.singletonList(new ComponentInstanceInput()));
         service.setComponentInstancesInputs(instanceInputMap);
-        when(userValidations.validateUserExists(eq(USER_ID), anyString(), eq(false))).thenReturn(new User());
-        when(userAdminMock.getUser(USER_ID, false)).thenReturn(Either.left(new User()));
+        when(userValidations.validateUserExists(eq(USER_ID))).thenReturn(new User());
+        when(userAdminMock.getUser(USER_ID, false)).thenReturn(new User());
+    }
+
+    @Test
+    public void createDataTypeByYaml() {
+        testInstance.createDataTypeFromYaml("test", "test", true);
+        verify(dataTypeImportManager, Mockito.times(1)).createDataTypes("test", "test", true);
     }
 
     @Test