X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Fclamp%2Fclds%2Fit%2FCldsDaoItCase.java;h=12fa2932cc34b247cf50d327630c37ed9748bd99;hb=e37c97fcba3f7b7bca4b417c712f53268ffdbf05;hp=ba37b57f8724efa1bfd0003cbc3d406941b8313f;hpb=3dc5f2a4a5c066a57ef0ce346be884b045ae73c9;p=clamp.git diff --git a/src/test/java/org/onap/clamp/clds/it/CldsDaoItCase.java b/src/test/java/org/onap/clamp/clds/it/CldsDaoItCase.java index ba37b57f..12fa2932 100644 --- a/src/test/java/org/onap/clamp/clds/it/CldsDaoItCase.java +++ b/src/test/java/org/onap/clamp/clds/it/CldsDaoItCase.java @@ -18,7 +18,7 @@ * limitations under the License. * ============LICENSE_END============================================ * =================================================================== - * ECOMP is a trademark and service mark of AT&T Intellectual Property. + * */ package org.onap.clamp.clds.it; @@ -27,7 +27,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import com.att.aft.dme2.internal.apache.commons.lang.RandomStringUtils; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; @@ -39,15 +38,16 @@ import java.util.List; import javax.ws.rs.NotFoundException; import org.apache.commons.codec.DecoderException; +import org.apache.commons.lang3.RandomStringUtils; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.onap.clamp.clds.client.req.sdc.SdcCatalogServices; import org.onap.clamp.clds.dao.CldsDao; -import org.onap.clamp.clds.model.CldsMonitoringDetails; import org.onap.clamp.clds.model.CldsDbServiceCache; import org.onap.clamp.clds.model.CldsEvent; import org.onap.clamp.clds.model.CldsModel; +import org.onap.clamp.clds.model.CldsMonitoringDetails; import org.onap.clamp.clds.model.CldsServiceData; import org.onap.clamp.clds.model.CldsTemplate; import org.onap.clamp.clds.util.ResourceFileUtil; @@ -74,9 +74,9 @@ public class CldsDaoItCase { /** * Setup the variable before the tests execution. - * + * * @throws IOException - * In case of issues when opening the files + * In case of issues when opening the files */ @Before public void setupBefore() throws IOException { @@ -152,7 +152,7 @@ public class CldsDaoItCase { newModel.setTemplateId(newTemplate.getId()); newModel.setDocText(newTemplate.getPropText()); CldsEvent.insEvent(cldsDao, newModel, "user", CldsEvent.ACTION_RESTART, CldsEvent.ACTION_STATE_COMPLETED, - "process-instance-id"); + "process-instance-id"); } @Test @@ -168,7 +168,7 @@ public class CldsDaoItCase { @Test public void testCldsServiceCache() throws GeneralSecurityException, DecoderException, IOException { CldsServiceData cldsServiceData = sdcCatalogServices - .getCldsServiceDataWithAlarmConditions("4cc5b45a-1f63-4194-8100-cd8e14248c92"); + .getCldsServiceDataWithAlarmConditions("4cc5b45a-1f63-4194-8100-cd8e14248c92"); // Test not in cache so should be null CldsServiceData cldsServiceDataCache = cldsDao.getCldsServiceCache("4cc5b45a-1f63-4194-8100-cd8e14248c92"); assertNull(cldsServiceDataCache); @@ -181,7 +181,7 @@ public class CldsDaoItCase { assertNotNull(cldsServiceDataCache.getAgeOfRecord()); assertEquals(4, cldsServiceDataCache.getCldsVfs().get(0).getCldsVfcs().size()); assertEquals("07e266fc-49ab-4cd7-8378-ca4676f1b9ec", - cldsServiceDataCache.getCldsVfs().get(0).getVfInvariantResourceUUID()); + cldsServiceDataCache.getCldsVfs().get(0).getVfInvariantResourceUUID()); assertEquals(0, cldsServiceDataCache.getCldsVfs().get(0).getCldsKPIList().size()); // Second update cldsServiceData.setCldsVfs(null);