From cb7a00bf89efca5b784120e990f79c475347e89d Mon Sep 17 00:00:00 2001 From: vasraz Date: Tue, 15 Oct 2019 10:23:08 +0100 Subject: 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 Issue-ID: SDC-2672 --- .../sdc/be/model/LifeCycleTransitionEnum.java | 51 ++++++++++++++-------- 1 file changed, 34 insertions(+), 17 deletions(-) (limited to 'catalog-model/src/main/java') 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(); -- cgit 1.2.3-korg