aboutsummaryrefslogtreecommitdiffstats
path: root/catalog-model
diff options
context:
space:
mode:
authorvasraz <vasyl.razinkov@est.tech>2019-10-15 10:23:08 +0100
committerOfir Sonsino <ofir.sonsino@intl.att.com>2020-01-26 09:17:08 +0000
commitcb7a00bf89efca5b784120e990f79c475347e89d (patch)
tree2e434c227f7ac2bf3ba024f9496ded1f399554b9 /catalog-model
parentc113cc3f10f72013a66c2eb5a52ab8460da196f9 (diff)
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
Diffstat (limited to 'catalog-model')
-rw-r--r--catalog-model/src/main/java/org/openecomp/sdc/be/model/LifeCycleTransitionEnum.java51
-rw-r--r--catalog-model/src/test/java/org/openecomp/sdc/be/model/LifeCycleTransitionEnumTest.java76
2 files changed, 70 insertions, 57 deletions
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/LifeCycleTransitionEnum.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/LifeCycleTransitionEnum.java
index 2fabef955d..365e65f8a1 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/LifeCycleTransitionEnum.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/LifeCycleTransitionEnum.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.
@@ -24,13 +24,17 @@ public enum LifeCycleTransitionEnum {
CHECKOUT("checkout"),
CHECKIN("checkin"),
+ CERTIFICATION_REQUEST("certificationRequest"),
UNDO_CHECKOUT("undoCheckout"),
+ CANCEL_CERTIFICATION("cancelCertification"),
+ START_CERTIFICATION("startCertification"),
+ FAIL_CERTIFICATION("failCertification"),
CERTIFY("certify"),
DISTRIBUTE("distribute");
String displayName;
- LifeCycleTransitionEnum(String displayName) {
+ LifeCycleTransitionEnum(final String displayName) {
this.displayName = displayName;
}
@@ -38,28 +42,41 @@ public enum LifeCycleTransitionEnum {
return displayName;
}
- public static LifeCycleTransitionEnum getFromDisplayName(String name) {
- if (name.equalsIgnoreCase(LifeCycleTransitionEnum.CHECKOUT.getDisplayName())) {
- return LifeCycleTransitionEnum.CHECKOUT;
+ public static LifeCycleTransitionEnum getFromDisplayName(final String name) {
+ if (name.equalsIgnoreCase(CHECKOUT.getDisplayName())) {
+ return CHECKOUT;
}
- if (name.equalsIgnoreCase(LifeCycleTransitionEnum.CHECKIN.getDisplayName())) {
- return LifeCycleTransitionEnum.CHECKIN;
+ if (name.equalsIgnoreCase(CHECKIN.getDisplayName())) {
+ return CHECKIN;
}
- if (name.equalsIgnoreCase(LifeCycleTransitionEnum.UNDO_CHECKOUT.getDisplayName())) {
- return LifeCycleTransitionEnum.UNDO_CHECKOUT;
+ if (name.equalsIgnoreCase(CERTIFICATION_REQUEST.getDisplayName())) {
+ return CERTIFICATION_REQUEST;
}
- if (name.equalsIgnoreCase(LifeCycleTransitionEnum.CERTIFY.getDisplayName())) {
- return LifeCycleTransitionEnum.CERTIFY;
+ if (name.equalsIgnoreCase(UNDO_CHECKOUT.getDisplayName())) {
+ return UNDO_CHECKOUT;
}
- if (name.equalsIgnoreCase(LifeCycleTransitionEnum.DISTRIBUTE.getDisplayName())) {
- return LifeCycleTransitionEnum.DISTRIBUTE;
- } else
+ if (name.equalsIgnoreCase(CANCEL_CERTIFICATION.getDisplayName())) {
+ return CANCEL_CERTIFICATION;
+ }
+ if (name.equalsIgnoreCase(START_CERTIFICATION.getDisplayName())) {
+ return START_CERTIFICATION;
+ }
+ if (name.equalsIgnoreCase(FAIL_CERTIFICATION.getDisplayName())) {
+ return FAIL_CERTIFICATION;
+ }
+ if (name.equalsIgnoreCase(CERTIFY.getDisplayName())) {
+ return CERTIFY;
+ }
+ if (name.equalsIgnoreCase(DISTRIBUTE.getDisplayName())) {
+ return DISTRIBUTE;
+ } else {
throw new IllegalArgumentException(name + " value does not match any of LifeCycleTransitionEnum values");
+ }
}
public static String valuesAsString() {
- StringBuilder sb = new StringBuilder();
- for (LifeCycleTransitionEnum op : LifeCycleTransitionEnum.values()) {
+ final StringBuilder sb = new StringBuilder();
+ for (final LifeCycleTransitionEnum op : LifeCycleTransitionEnum.values()) {
sb.append(op.getDisplayName()).append(" ");
}
return sb.toString();
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);
+ }
}