From 3c3c41f8387306d4026465998aa230f1802f01ff Mon Sep 17 00:00:00 2001 From: Tomasz Golabek Date: Fri, 12 Apr 2019 12:25:50 +0200 Subject: Some unit tests for catalog-be This is the last part of tests for info-models so at least this package should be quite nice covered by test since now. Some refactor made if needed. Change-Id: I78303ae8c5976b4a2c97422517a6df0cbae88e26 Issue-ID: SDC-2220 Signed-off-by: Tomasz Golabek --- .../openecomp/sdc/be/info/MergedArtifactInfo.java | 1 - .../org/openecomp/sdc/be/info/RelationshipData.java | 21 ++++++++++++++++++++- .../java/org/openecomp/sdc/be/info/ServiceInfo.java | 5 +++++ .../openecomp/sdc/be/info/ServiceVersionInfo.java | 5 +++++ 4 files changed, 30 insertions(+), 2 deletions(-) (limited to 'catalog-be/src/main/java') diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/info/MergedArtifactInfo.java b/catalog-be/src/main/java/org/openecomp/sdc/be/info/MergedArtifactInfo.java index 455bf40246..85618a4c9a 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/info/MergedArtifactInfo.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/info/MergedArtifactInfo.java @@ -43,7 +43,6 @@ public class MergedArtifactInfo { if (relatedGroupTemplateList != null && !relatedGroupTemplateList.isEmpty()) { this.createArtifactsGroupSet(relatedGroupTemplateList, parsetArtifactsNames); } - } public ArtifactTemplateInfo getJsonArtifactTemplate() { diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/info/RelationshipData.java b/catalog-be/src/main/java/org/openecomp/sdc/be/info/RelationshipData.java index 2b01daecd4..a1516573bc 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/info/RelationshipData.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/info/RelationshipData.java @@ -1,3 +1,22 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2018 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========================================================= + */ package org.openecomp.sdc.be.info; import com.fasterxml.jackson.annotation.JsonProperty; @@ -10,7 +29,7 @@ public final class RelationshipData { @JsonProperty("relationship-value") private String relationshipValue; - public void setRelationshipkey(String relationshipKey) { + public void setRelationshipKey(String relationshipKey) { this.relationshipKey = relationshipKey; } diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/info/ServiceInfo.java b/catalog-be/src/main/java/org/openecomp/sdc/be/info/ServiceInfo.java index 99395350cb..5a09362483 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/info/ServiceInfo.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/info/ServiceInfo.java @@ -20,6 +20,7 @@ package org.openecomp.sdc.be.info; +import com.google.common.annotations.VisibleForTesting; import java.util.List; public class ServiceInfo { @@ -27,6 +28,10 @@ public class ServiceInfo { private String name; private List versions; + @VisibleForTesting + ServiceInfo() { + } + public ServiceInfo(String serviceName, List list) { this.name = serviceName; this.versions = list; diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/info/ServiceVersionInfo.java b/catalog-be/src/main/java/org/openecomp/sdc/be/info/ServiceVersionInfo.java index 32c7c54528..fc4cb895da 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/info/ServiceVersionInfo.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/info/ServiceVersionInfo.java @@ -20,11 +20,16 @@ package org.openecomp.sdc.be.info; +import com.google.common.annotations.VisibleForTesting; + public class ServiceVersionInfo { private String version; private String url; + @VisibleForTesting + ServiceVersionInfo() {} + public ServiceVersionInfo(String serviceName, String serviceVersion, String context) { super(); this.version = serviceVersion; -- cgit 1.2.3-korg