X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=blobdiff_plain;f=ONAP-PAP-REST%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpap%2Fxacml%2Frest%2Fcontroller%2FMicroServiceDictionaryControllerTest.java;h=115e30249b785675b2772aab4ab7fa8b376ef5bb;hp=e561a65b26386dbd4bec65126bbb4a59abc9056b;hb=e4ac1ef3c51fc9afe44849ada5bea8c3d6057897;hpb=279bf7ca260e3541ec3c54dcfc269a925f676c43 diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/MicroServiceDictionaryControllerTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/MicroServiceDictionaryControllerTest.java index e561a65b2..115e30249 100644 --- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/MicroServiceDictionaryControllerTest.java +++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/MicroServiceDictionaryControllerTest.java @@ -20,7 +20,6 @@ * ============LICENSE_END========================================================= */ - package org.onap.policy.pap.xacml.rest.controller; import static org.junit.Assert.assertTrue; @@ -28,12 +27,15 @@ import static org.junit.Assert.fail; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; + import java.io.BufferedReader; import java.io.StringReader; import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.List; + import javax.servlet.http.HttpServletRequest; + import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; @@ -41,7 +43,7 @@ import org.onap.policy.common.logging.flexlogger.FlexLogger; import org.onap.policy.common.logging.flexlogger.Logger; import org.onap.policy.pap.xacml.rest.util.DictionaryUtils; import org.onap.policy.rest.dao.CommonClassDao; -import org.onap.policy.rest.jpa.DCAEuuid; +import org.onap.policy.rest.jpa.DcaeUuid; import org.onap.policy.rest.jpa.MicroServiceLocation; import org.onap.policy.rest.jpa.MicroServiceModels; import org.onap.policy.rest.jpa.UserInfo; @@ -75,7 +77,7 @@ public class MicroServiceDictionaryControllerTest { List listIds = new ArrayList(); listIds.add("Jack"); - when(commonClassDao.getDataByColumn(DCAEuuid.class, "name")).thenReturn(listIds); + when(commonClassDao.getDataByColumn(DcaeUuid.class, "name")).thenReturn(listIds); List microList = new ArrayList(); microList.add("MC-Model"); @@ -83,7 +85,7 @@ public class MicroServiceDictionaryControllerTest { List listId = new ArrayList(); listId.add("smith"); - when(commonClassDao.getData(DCAEuuid.class)).thenReturn(listId); + when(commonClassDao.getData(DcaeUuid.class)).thenReturn(listId); MicroServiceModels microServiceModels = new MicroServiceModels(); doNothing().when(commonClassDao).delete(microServiceModels); @@ -141,7 +143,6 @@ public class MicroServiceDictionaryControllerTest { logger.info("testSaveMicroServiceHeaderDefaultValues: exit"); } - @Test public void testGetMicroServiceHeaderDefaultsEntityDataByName() { logger.info("testGetMicroServiceHeaderDefaultsEntityDataByName: Entering"); @@ -215,7 +216,6 @@ public class MicroServiceDictionaryControllerTest { logger.info("testRemoveMicroServiceHeaderDefaults: exit"); } - @Test public void testGetDCAEUUIDDictionaryByNameEntityData() {