From 5038c6dec6c51bdf7a5e4ff1d94ab5314c0eb3a3 Mon Sep 17 00:00:00 2001 From: "Determe, Sebastien (sd378r)" Date: Wed, 30 Aug 2017 05:57:52 -0700 Subject: [PATCH] Add a new test class Add a new test class for SdcPolicyReq class Change-Id: I8c3031a621a5fe1a2f6bc0d44988baae89a35545 Issue-Id: CLAMP-43 Signed-off-by: Determe, Sebastien (sd378r) --- .../java/org/onap/clamp/clds/model/CldsModel.java | 125 ++++++++++----------- .../clamp/clds/client/req/SdcPolicyReqTest.java | 82 ++++++++++++++ 2 files changed, 143 insertions(+), 64 deletions(-) create mode 100644 src/test/java/org/onap/clamp/clds/client/req/SdcPolicyReqTest.java diff --git a/src/main/java/org/onap/clamp/clds/model/CldsModel.java b/src/main/java/org/onap/clamp/clds/model/CldsModel.java index 59db9b58..a830f938 100644 --- a/src/main/java/org/onap/clamp/clds/model/CldsModel.java +++ b/src/main/java/org/onap/clamp/clds/model/CldsModel.java @@ -23,18 +23,18 @@ package org.onap.clamp.clds.model; +import com.att.eelf.configuration.EELFLogger; +import com.att.eelf.configuration.EELFManager; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import javax.ws.rs.BadRequestException; import javax.ws.rs.NotFoundException; -import org.jboss.resteasy.spi.BadRequestException; import org.onap.clamp.clds.dao.CldsDao; -import com.att.eelf.configuration.EELFLogger; -import com.att.eelf.configuration.EELFManager; - /** * Represent a CLDS Model. */ @@ -42,52 +42,52 @@ public class CldsModel { protected static final EELFLogger logger = EELFManager.getInstance().getLogger(CldsModel.class); protected static final EELFLogger metricsLogger = EELFManager.getInstance().getMetricsLogger(); - private static final int UUID_LENGTH = 36; - - public static final String STATUS_DESIGN = "DESIGN"; - public static final String STATUS_DISTRIBUTED = "DISTRIBUTED"; - public static final String STATUS_ACTIVE = "ACTIVE"; - public static final String STATUS_STOPPED = "STOPPED"; - public static final String STATUS_DELETING = "DELETING"; - public static final String STATUS_ERROR = "ERROR"; // manual - // intervention - // required - public static final String STATUS_UNKNOWN = "UNKNOWN"; - - private String id; - private String templateId; - private String templateName; - private String name; - private String controlNamePrefix; - private String controlNameUuid; - private String bpmnId; - private String bpmnUserid; - private String bpmnText; - private String propId; - private String propUserid; - private String propText; - private String imageId; - private String imageUserid; - private String imageText; - private String docId; - private String docUserid; - private String docText; - private String blueprintId; - private String blueprintUserid; - private String blueprintText; - private CldsEvent event; - private String status; - private List permittedActionCd; - private List cldsModelInstanceList; - - private String typeId; - private String typeName; - - private String dispatcherResponse; - - private String deploymentId; - - private boolean userAuthorizedToUpdate; + private static final int UUID_LENGTH = 36; + + public static final String STATUS_DESIGN = "DESIGN"; + public static final String STATUS_DISTRIBUTED = "DISTRIBUTED"; + public static final String STATUS_ACTIVE = "ACTIVE"; + public static final String STATUS_STOPPED = "STOPPED"; + public static final String STATUS_DELETING = "DELETING"; + public static final String STATUS_ERROR = "ERROR"; // manual + // intervention + // required + public static final String STATUS_UNKNOWN = "UNKNOWN"; + + private String id; + private String templateId; + private String templateName; + private String name; + private String controlNamePrefix; + private String controlNameUuid; + private String bpmnId; + private String bpmnUserid; + private String bpmnText; + private String propId; + private String propUserid; + private String propText; + private String imageId; + private String imageUserid; + private String imageText; + private String docId; + private String docUserid; + private String docText; + private String blueprintId; + private String blueprintUserid; + private String blueprintText; + private CldsEvent event; + private String status; + private List permittedActionCd; + private List cldsModelInstanceList; + + private String typeId; + private String typeName; + + private String dispatcherResponse; + + private String deploymentId; + + private boolean userAuthorizedToUpdate; /** * Construct empty model. @@ -243,15 +243,18 @@ public class CldsModel { permittedActionCd = Arrays.asList(CldsEvent.ACTION_DEPLOY, CldsEvent.ACTION_RESUBMIT); break; case CldsEvent.ACTION_UNDEPLOY: - permittedActionCd = Arrays.asList(CldsEvent.ACTION_UPDATE, CldsEvent.ACTION_DEPLOY, CldsEvent.ACTION_RESUBMIT); + permittedActionCd = Arrays.asList(CldsEvent.ACTION_UPDATE, CldsEvent.ACTION_DEPLOY, + CldsEvent.ACTION_RESUBMIT); break; case CldsEvent.ACTION_DEPLOY: - permittedActionCd = Arrays.asList(CldsEvent.ACTION_DEPLOY, CldsEvent.ACTION_UNDEPLOY, CldsEvent.ACTION_UPDATE, CldsEvent.ACTION_STOP); + permittedActionCd = Arrays.asList(CldsEvent.ACTION_DEPLOY, CldsEvent.ACTION_UNDEPLOY, + CldsEvent.ACTION_UPDATE, CldsEvent.ACTION_STOP); break; case CldsEvent.ACTION_RESTART: case CldsEvent.ACTION_UPDATE: // for 1702 delete is not currently implemented - permittedActionCd = Arrays.asList(CldsEvent.ACTION_DEPLOY, CldsEvent.ACTION_UPDATE, CldsEvent.ACTION_STOP, CldsEvent.ACTION_UNDEPLOY); + permittedActionCd = Arrays.asList(CldsEvent.ACTION_DEPLOY, CldsEvent.ACTION_UPDATE, + CldsEvent.ACTION_STOP, CldsEvent.ACTION_UNDEPLOY); break; case CldsEvent.ACTION_DELETE: if (getCurrentActionStateCd().equals(CldsEvent.ACTION_STATE_SENT)) { @@ -296,19 +299,13 @@ public class CldsModel { * @return */ public static CldsModel createUsingControlName(String fullControlName) { - - int len = 0; - - if (fullControlName != null) { - len = fullControlName.length(); - } - if (len < UUID_LENGTH) { - throw new BadRequestException( - "closed loop id / control name length, " + len + ", less than the minimum of: " + UUID_LENGTH); + if (fullControlName == null || fullControlName.length() < UUID_LENGTH) { + throw new BadRequestException("closed loop id / control name length, " + fullControlName.length() + + ", less than the minimum of: " + UUID_LENGTH); } CldsModel model = new CldsModel(); - model.setControlNamePrefix(fullControlName.substring(0, len - UUID_LENGTH)); - model.setControlNameUuid(fullControlName.substring(len - UUID_LENGTH)); + model.setControlNamePrefix(fullControlName.substring(0, fullControlName.length() - UUID_LENGTH)); + model.setControlNameUuid(fullControlName.substring(fullControlName.length() - UUID_LENGTH)); return model; } diff --git a/src/test/java/org/onap/clamp/clds/client/req/SdcPolicyReqTest.java b/src/test/java/org/onap/clamp/clds/client/req/SdcPolicyReqTest.java new file mode 100644 index 00000000..c2d9ae46 --- /dev/null +++ b/src/test/java/org/onap/clamp/clds/client/req/SdcPolicyReqTest.java @@ -0,0 +1,82 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP CLAMP + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights + * reserved. + * ================================================================================ + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END============================================ + * =================================================================== + * ECOMP is a trademark and service mark of AT&T Intellectual Property. + */ + +package org.onap.clamp.clds.client.req; + +import static org.junit.Assert.assertTrue; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; + +import org.junit.Test; +import org.onap.policy.asdc.Resource; +import org.onap.policy.asdc.ResourceType; +import org.onap.policy.controlloop.policy.PolicyResult; + +public class SdcPolicyReqTest { + + @Test + public void convertToResourceTest() throws NoSuchMethodException, SecurityException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException { + Method method = OperationalPolicyReq.class.getDeclaredMethod("convertToResource", List.class, + ResourceType.class); + method.setAccessible(true); + // return method.invoke(targetObject, argObjects); + OperationalPolicyReq policyReq = new OperationalPolicyReq(); + List stringList = new ArrayList<>(); + stringList.add("test1"); + stringList.add("test2"); + stringList.add("test3"); + stringList.add("test4"); + Resource resources[] = (Resource[]) method.invoke(policyReq, stringList, ResourceType.VF); + + assertTrue(resources.length == 4); + assertTrue("test1".equals(resources[0].getResourceName())); + assertTrue("test2".equals(resources[1].getResourceName())); + assertTrue("test3".equals(resources[2].getResourceName())); + assertTrue("test4".equals(resources[3].getResourceName())); + } + + @Test + public void convertToPolicyResultTest() throws NoSuchMethodException, SecurityException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException { + Method method = OperationalPolicyReq.class.getDeclaredMethod("convertToPolicyResult", List.class); + method.setAccessible(true); + // return method.invoke(targetObject, argObjects); + OperationalPolicyReq policyReq = new OperationalPolicyReq(); + List stringList = new ArrayList<>(); + stringList.add("FAILURE"); + stringList.add("SUCCESS"); + stringList.add("FAILURE_GUARD"); + stringList.add("FAILURE_TIMEOUT"); + PolicyResult policyResult[] = (PolicyResult[]) method.invoke(policyReq, stringList); + + assertTrue(policyResult.length == 4); + assertTrue(policyResult[0].equals(PolicyResult.FAILURE)); + assertTrue(policyResult[1].equals(PolicyResult.SUCCESS)); + assertTrue(policyResult[2].equals(PolicyResult.FAILURE_GUARD)); + assertTrue(policyResult[3].equals(PolicyResult.FAILURE_TIMEOUT)); + } +} -- 2.16.6