Fix DCAE status refresh

[clamp.git] / src / test / java / org / onap / clamp / clds / model / CldsModelTest.java

diff --git a/src/test/java/org/onap/clamp/clds/model/CldsModelTest.java b/src/test/java/org/onap/clamp/clds/model/CldsModelTest.java
index 0333bdb..0a60185 100644 (file)
--- a/src/test/java/org/onap/clamp/clds/model/CldsModelTest.java
+++ b/src/test/java/org/onap/clamp/clds/model/CldsModelTest.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.model;
@@ -26,6 +26,9 @@ package org.onap.clamp.clds.model;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+
 import javax.ws.rs.BadRequestException;
 
 import org.junit.Test;
@@ -34,6 +37,7 @@ import org.junit.Test;
  * Test org.onap.clamp.ClampDesigner.model.Model
  */
 public class CldsModelTest {
+    protected static final EELFLogger logger = EELFManager.getInstance().getLogger(CldsModelTest.class);
 
     @Test
     public void testCreateUsingControlName() {
@@ -58,75 +62,55 @@ public class CldsModelTest {
         cldsModel.validateAction("unknown");
     }
 
-    @Test
+    @Test(expected = IllegalArgumentException.class)
     public void testValidateActionFromCreate() {
         CldsModel cldsModel = new CldsModel();
         cldsModel.getEvent().setActionCd(CldsEvent.ACTION_CREATE);
         cldsModel.validateAction(CldsEvent.ACTION_SUBMIT);
         cldsModel.validateAction(CldsEvent.ACTION_TEST);
-
-        try {
-            cldsModel.validateAction(CldsEvent.ACTION_DEPLOY);
-            fail("Exception should have been sent");
-        } catch (IllegalArgumentException e) {
-
-        }
+        cldsModel.validateAction(CldsEvent.ACTION_DEPLOY);
+        fail("Exception should have been sent");
     }
 
-    @Test
+    @Test(expected = IllegalArgumentException.class)
     public void testValidateActionFromSubmitOrReSubmit() {
         CldsModel cldsModel = new CldsModel();
         cldsModel.getEvent().setActionCd(CldsEvent.ACTION_SUBMIT);
         cldsModel.validateAction(CldsEvent.ACTION_RESUBMIT);
         try {
-            cldsModel.validateAction(CldsEvent.ACTION_DEPLOY);
+            cldsModel.validateAction(CldsEvent.ACTION_RESTART);
             fail("Exception should have been sent");
         } catch (IllegalArgumentException e) {
-
+            logger.error("Exception caught IllegalArgumentException as expected", e);
         }
-
         cldsModel.getEvent().setActionCd(CldsEvent.ACTION_RESUBMIT);
         cldsModel.validateAction(CldsEvent.ACTION_RESUBMIT);
-        try {
-            cldsModel.validateAction(CldsEvent.ACTION_DEPLOY);
-            fail("Exception should have been sent");
-        } catch (IllegalArgumentException e) {
-
-        }
+        cldsModel.validateAction(CldsEvent.ACTION_RESTART);
+        fail("Exception should have been sent");
     }
 
-    @Test
+    @Test(expected = IllegalArgumentException.class)
     public void testValidateActionFromDistribute() {
         CldsModel cldsModel = new CldsModel();
         cldsModel.getEvent().setActionCd(CldsEvent.ACTION_DISTRIBUTE);
         cldsModel.validateAction(CldsEvent.ACTION_RESUBMIT);
         cldsModel.validateAction(CldsEvent.ACTION_DEPLOY);
-
-        try {
-            cldsModel.validateAction(CldsEvent.ACTION_CREATE);
-            fail("Exception should have been sent");
-        } catch (IllegalArgumentException e) {
-
-        }
+        cldsModel.validateAction(CldsEvent.ACTION_CREATE);
+        fail("Exception should have been sent");
     }
 
-    @Test
+    @Test(expected = IllegalArgumentException.class)
     public void testValidateActionFromUndeploy() {
         CldsModel cldsModel = new CldsModel();
         cldsModel.getEvent().setActionCd(CldsEvent.ACTION_UNDEPLOY);
         cldsModel.validateAction(CldsEvent.ACTION_UPDATE);
         cldsModel.validateAction(CldsEvent.ACTION_DEPLOY);
         cldsModel.validateAction(CldsEvent.ACTION_RESUBMIT);
-
-        try {
-            cldsModel.validateAction(CldsEvent.ACTION_CREATE);
-            fail("Exception should have been sent");
-        } catch (IllegalArgumentException e) {
-
-        }
+        cldsModel.validateAction(CldsEvent.ACTION_CREATE);
+        fail("Exception should have been sent");
     }
 
-    @Test
+    @Test(expected = IllegalArgumentException.class)
     public void testValidateActionFromDeploy() {
         CldsModel cldsModel = new CldsModel();
         cldsModel.getEvent().setActionCd(CldsEvent.ACTION_DEPLOY);
@@ -134,16 +118,11 @@ public class CldsModelTest {
         cldsModel.validateAction(CldsEvent.ACTION_UNDEPLOY);
         cldsModel.validateAction(CldsEvent.ACTION_UPDATE);
         cldsModel.validateAction(CldsEvent.ACTION_STOP);
-
-        try {
-            cldsModel.validateAction(CldsEvent.ACTION_CREATE);
-            fail("Exception should have been sent");
-        } catch (IllegalArgumentException e) {
-
-        }
+        cldsModel.validateAction(CldsEvent.ACTION_CREATE);
+        fail("Exception should have been sent");
     }
 
-    @Test
+    @Test(expected = IllegalArgumentException.class)
     public void testValidateActionFromRestartOrUpdate() {
         CldsModel cldsModel = new CldsModel();
         cldsModel.getEvent().setActionCd(CldsEvent.ACTION_RESTART);
@@ -151,67 +130,30 @@ public class CldsModelTest {
         cldsModel.validateAction(CldsEvent.ACTION_UPDATE);
         cldsModel.validateAction(CldsEvent.ACTION_STOP);
         cldsModel.validateAction(CldsEvent.ACTION_UNDEPLOY);
-
         try {
             cldsModel.validateAction(CldsEvent.ACTION_CREATE);
             fail("Exception should have been sent");
         } catch (IllegalArgumentException e) {
-
+            System.out.println("Exception caught IllegalArgumentException as expected");
         }
-
         cldsModel.getEvent().setActionCd(CldsEvent.ACTION_UPDATE);
         cldsModel.validateAction(CldsEvent.ACTION_DEPLOY);
         cldsModel.validateAction(CldsEvent.ACTION_UPDATE);
         cldsModel.validateAction(CldsEvent.ACTION_STOP);
         cldsModel.validateAction(CldsEvent.ACTION_UNDEPLOY);
-
-        try {
-            cldsModel.validateAction(CldsEvent.ACTION_CREATE);
-            fail("Exception should have been sent");
-        } catch (IllegalArgumentException e) {
-
-        }
-
-    }
-
-    @Test
-    public void testValidateActionFromDelete() {
-        CldsModel cldsModel = new CldsModel();
-        cldsModel.getEvent().setActionCd(CldsEvent.ACTION_DELETE);
-        cldsModel.validateAction(CldsEvent.ACTION_SUBMIT);
-
-        try {
-            cldsModel.validateAction(CldsEvent.ACTION_CREATE);
-            fail("Exception should have been sent");
-        } catch (IllegalArgumentException e) {
-
-        }
-
-        cldsModel.getEvent().setActionCd(CldsEvent.ACTION_DELETE);
-        cldsModel.getEvent().setActionStateCd(CldsEvent.ACTION_STATE_SENT);
-
-        try {
-            cldsModel.validateAction(CldsEvent.ACTION_SUBMIT);
-            fail("Exception should have been sent");
-        } catch (IllegalArgumentException e) {
-
-        }
+        cldsModel.validateAction(CldsEvent.ACTION_CREATE);
+        fail("Exception should have been sent");
     }
 
-    @Test
+    @Test(expected = IllegalArgumentException.class)
     public void testValidateActionFromStop() {
         CldsModel cldsModel = new CldsModel();
         cldsModel.getEvent().setActionCd(CldsEvent.ACTION_STOP);
         cldsModel.validateAction(CldsEvent.ACTION_UPDATE);
         cldsModel.validateAction(CldsEvent.ACTION_RESTART);
         cldsModel.validateAction(CldsEvent.ACTION_UNDEPLOY);
-
-        try {
-            cldsModel.validateAction(CldsEvent.ACTION_CREATE);
-            fail("Exception should have been sent");
-        } catch (IllegalArgumentException e) {
-
-        }
+        cldsModel.validateAction(CldsEvent.ACTION_CREATE);
+        fail("Exception should have been sent");
     }
 
     /**