Increase junit TCs

1. Re-enable disabled TCs (enable = true)
2. Enable @Ignored TCs
3. Add some Assert when missing
4. Remove old unused TCs (covered in UI)

Change-Id: I900e52f4860b1fdc5bd1e529a1fe7f5c3491465b
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-2672

1 files changed, 36 insertions, 40 deletions

diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/LifeCycleTransitionEnumTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/LifeCycleTransitionEnumTest.java
index 9ae89148c1..af803eee5d 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/LifeCycleTransitionEnumTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/LifeCycleTransitionEnumTest.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,53 +20,49 @@
 
 package org.openecomp.sdc.be.model;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 public class LifeCycleTransitionEnumTest {
 
-	private LifeCycleTransitionEnum createTestSubject() {
-		return LifeCycleTransitionEnum.CERTIFY;
-	}
+    private LifeCycleTransitionEnum createTestSubject() {
+        return LifeCycleTransitionEnum.CERTIFY;
+    }
 
-	@Test
-	public void testGetDisplayName() throws Exception {
-		LifeCycleTransitionEnum testSubject;
-		String result;
+    @Test
+    public void testGetDisplayName() {
+        LifeCycleTransitionEnum testSubject;
+        String result;
 
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDisplayName();
-	}
+        // default test
+        testSubject = createTestSubject();
+        result = testSubject.getDisplayName();
+        Assert.assertNotNull(result);
+    }
 
-	@Test
-	public void testGetFromDisplayName() throws Exception {
-		String name = LifeCycleTransitionEnum.CHECKIN.getDisplayName();
-		LifeCycleTransitionEnum result;
+    @Test
+    public void testGetFromDisplayName() {
+        LifeCycleTransitionEnum result;
 
-		// default test
-		for (LifeCycleTransitionEnum iterable_element : LifeCycleTransitionEnum.values()) {
-			result = LifeCycleTransitionEnum.getFromDisplayName(iterable_element.getDisplayName());
-		}
-	}
+        // default test
+        for (LifeCycleTransitionEnum iterable_element : LifeCycleTransitionEnum.values()) {
+            result = LifeCycleTransitionEnum.getFromDisplayName(iterable_element.getDisplayName());
+            Assert.assertNotNull(result);
+        }
+    }
 
-	@Test
-	public void testGetFromDisplayNameException() throws Exception {
-		String name = LifeCycleTransitionEnum.CHECKIN.getDisplayName();
-		LifeCycleTransitionEnum result;
+    @Test(expected = IllegalArgumentException.class)
+    public void testGetFromDisplayNameException() {
+        // default test
+        LifeCycleTransitionEnum.getFromDisplayName("mock");
+    }
 
-		// default test
-		try {
-			result = LifeCycleTransitionEnum.getFromDisplayName("mock");
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-		}
-	}
+    @Test
+    public void testValuesAsString() {
+        String result;
 
-	@Test
-	public void testValuesAsString() throws Exception {
-		String result;
-
-		// default test
-		result = LifeCycleTransitionEnum.valuesAsString();
-	}
+        // default test
+        result = LifeCycleTransitionEnum.valuesAsString();
+        Assert.assertNotNull(result);
+    }
 }