Merge changes from topic 'feature/new-csar-installer'

[clamp.git] / src / test / java / org / onap / clamp / clds / it / CldsDaoItCase.java

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 1427c32..50858f7 100644 (file)
--- a/src/test/java/org/onap/clamp/clds/it/CldsDaoItCase.java
+++ b/src/test/java/org/onap/clamp/clds/it/CldsDaoItCase.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP CLAMP
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
  *                             reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,29 +18,35 @@
  * limitations under the License.
  * ============LICENSE_END============================================
  * ===================================================================
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ *
  */
 
 package org.onap.clamp.clds.it;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 import javax.ws.rs.NotFoundException;
 
+import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.onap.clamp.clds.AbstractItCase;
 import org.onap.clamp.clds.dao.CldsDao;
 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.CldsTemplate;
 import org.onap.clamp.clds.util.ResourceFileUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 
 /**
@@ -49,21 +55,20 @@ import org.springframework.test.context.junit4.SpringRunner;
  */
 @RunWith(SpringRunner.class)
 @SpringBootTest
-@TestPropertySource(locations = "classpath:application-no-camunda.properties")
-public class CldsDaoItCase extends AbstractItCase {
+public class CldsDaoItCase {
 
+    protected static final EELFLogger logger = EELFManager.getInstance().getLogger(CldsDaoItCase.class);
     @Autowired
     public CldsDao cldsDao;
-
     private String bpmnText;
     private String imageText;
     private String bpmnPropText;
 
     /**
      * 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 {
@@ -73,41 +78,37 @@ public class CldsDaoItCase extends AbstractItCase {
     }
 
     @Test
-    public void testModelSave() throws IOException {
+    public void testModelSave() {
+        String randomNameTemplate = RandomStringUtils.randomAlphanumeric(5);
         // Add the template first
         CldsTemplate newTemplate = new CldsTemplate();
-        newTemplate.setName("test-template");
-
+        newTemplate.setName(randomNameTemplate);
         newTemplate.setBpmnText(bpmnText);
         newTemplate.setImageText(imageText);
-
         // Save the template in DB
         cldsDao.setTemplate(newTemplate, "user");
         // Test if it's well there
-        CldsTemplate newTemplateRead = cldsDao.getTemplate("test-template");
+        CldsTemplate newTemplateRead = cldsDao.getTemplate(randomNameTemplate);
         assertEquals(bpmnText, newTemplateRead.getBpmnText());
         assertEquals(imageText, newTemplateRead.getImageText());
-
         // Save the model
         CldsModel newModel = new CldsModel();
-        newModel.setName("test-model");
-
+        String randomNameModel = RandomStringUtils.randomAlphanumeric(5);
+        newModel.setName(randomNameModel);
         newModel.setBpmnText(bpmnText);
         newModel.setImageText(imageText);
         newModel.setPropText(bpmnPropText);
         newModel.setControlNamePrefix("ClosedLoop-");
-        newModel.setTemplateName("test-template");
+        newModel.setTemplateName(randomNameTemplate);
         newModel.setTemplateId(newTemplate.getId());
         newModel.setDocText(newTemplate.getPropText());
-        newModel.setDocId(newTemplate.getPropId());
         // Save the model in DB
         cldsDao.setModel(newModel, "user");
         // Test if the model can be retrieved
-        CldsModel newCldsModel = cldsDao.getModelTemplate("test-model");
+        CldsModel newCldsModel = cldsDao.getModelTemplate(randomNameModel);
         assertEquals(bpmnText, newCldsModel.getBpmnText());
         assertEquals(imageText, newCldsModel.getImageText());
         assertEquals(bpmnPropText, newCldsModel.getPropText());
-
     }
 
     @Test(expected = NotFoundException.class)
@@ -125,21 +126,16 @@ public class CldsDaoItCase extends AbstractItCase {
         // Add the template first
         CldsTemplate newTemplate = new CldsTemplate();
         newTemplate.setName("test-template-for-event");
-
         newTemplate.setBpmnText(bpmnText);
         newTemplate.setImageText(imageText);
-
         newTemplate.save(cldsDao, "user");
-
         // Test if it's well there
         CldsTemplate newTemplateRead = CldsTemplate.retrieve(cldsDao, "test-template-for-event", false);
         assertEquals(bpmnText, newTemplateRead.getBpmnText());
         assertEquals(imageText, newTemplateRead.getImageText());
-
         // Save the model
         CldsModel newModel = new CldsModel();
         newModel.setName("test-model-for-event");
-
         newModel.setBpmnText(bpmnText);
         newModel.setImageText(imageText);
         newModel.setPropText(bpmnPropText);
@@ -147,9 +143,18 @@ public class CldsDaoItCase extends AbstractItCase {
         newModel.setTemplateName("test-template-for-event");
         newModel.setTemplateId(newTemplate.getId());
         newModel.setDocText(newTemplate.getPropText());
-        newModel.setDocId(newTemplate.getPropId());
-
         CldsEvent.insEvent(cldsDao, newModel, "user", CldsEvent.ACTION_RESTART, CldsEvent.ACTION_STATE_COMPLETED,
-                "process-instance-id");
+            "process-instance-id");
     }
+
+    @Test
+    public void testGetCldsMonitoringDetails() {
+        List<CldsMonitoringDetails> cldsMonitoringDetailsList = new ArrayList<CldsMonitoringDetails>();
+        cldsMonitoringDetailsList = cldsDao.getCLDSMonitoringDetails();
+        cldsMonitoringDetailsList.forEach(clName -> {
+            logger.info(clName.getCloseloopName());
+            assertNotNull(clName.getCloseloopName());
+        });
+    }
+
 }