Increase test coverage

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

diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UIConstraint.java b/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UIConstraint.java
index 638e236..75d8f69 100644 (file)
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UIConstraint.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UIConstraint.java
@@ -19,11 +19,15 @@ package org.openecomp.sdc.be.ui.model;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 import java.io.Serializable;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 
 @Getter
 @Setter
+@EqualsAndHashCode
+@ToString
 public class UIConstraint implements Serializable {
 
     private String servicePropertyName;
@@ -51,30 +55,4 @@ public class UIConstraint implements Serializable {
         this.value = value;
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof UIConstraint)) {
-            return false;
-        }
-        UIConstraint that = (UIConstraint) o;
-        return Objects.equal(getServicePropertyName(), that.getServicePropertyName()) && Objects.equal(
-            getConstraintOperator(), that.getConstraintOperator()) && Objects.equal(getSourceType(),
-            that.getSourceType()) && Objects.equal(getSourceName(), that.getSourceName()) && Objects.equal(
-            getValue(), that.getValue());
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(servicePropertyName, constraintOperator, sourceType, sourceName, value);
-    }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this).add("servicePropertyName", servicePropertyName)
-            .add("constraintOperator", constraintOperator).add("sourceType", sourceType)
-            .add("sourceName", sourceName).add("value", value).toString();
-    }
 }

diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiLeftPaletteComponent.java b/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiLeftPaletteComponent.java
index d51298b..bea1e17 100644 (file)
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiLeftPaletteComponent.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiLeftPaletteComponent.java
@@ -22,11 +22,15 @@ package org.openecomp.sdc.be.ui.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import java.util.List;
+import lombok.Getter;
+import lombok.Setter;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.common.util.ICategorizedElement;
 
+@Getter
+@Setter
 public class UiLeftPaletteComponent implements ICategorizedElement {
 
     private final String uniqueId;
@@ -65,7 +69,9 @@ public class UiLeftPaletteComponent implements ICategorizedElement {
 
     private String convertListResultToString(final List<String> tags) {
         final StringBuilder sb = new StringBuilder();
-        tags.forEach(t -> sb.append(t + " "));
+        if (tags != null) {
+            tags.forEach(t -> sb.append(t + " "));
+        }
         return sb.toString().toLowerCase();
     }
 

diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/ui/model/UiLeftPaletteComponentTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/ui/model/UiLeftPaletteComponentTest.java
new file mode 100644 (file)
index 0000000..7aaf68e
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/ui/model/UiLeftPaletteComponentTest.java
@@ -0,0 +1,75 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2020, Nordix Foundation. 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.ui.model;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+import org.junit.Test;
+import org.openecomp.sdc.be.model.Product;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.Service;
+
+public class UiLeftPaletteComponentTest {
+
+    private UiLeftPaletteComponent createTestSubjectService() {
+        final Service service = new Service();
+        service.addCategory("category", "subCategory");
+        service.setTags(new ArrayList<>());
+        return new UiLeftPaletteComponent(service);
+    }
+
+    private UiLeftPaletteComponent createTestSubjectResource() {
+        final Resource resource = new Resource();
+        resource.addCategory("category", "subCategory");
+        resource.setTags(new ArrayList<>());
+        return new UiLeftPaletteComponent(resource);
+    }
+
+    @Test
+    public void getComponentTypeAsString() {
+        final UiLeftPaletteComponent testSubject = createTestSubjectResource();
+        assertThat(testSubject).isNotNull().isInstanceOf(UiLeftPaletteComponent.class);
+        assertThat(testSubject.getComponentTypeAsString()).isNotNull().isInstanceOf(String.class);
+    }
+
+    @Test
+    public void getCategoryName() {
+        final UiLeftPaletteComponent testSubject = createTestSubjectResource();
+        assertThat(testSubject).isNotNull().isInstanceOf(UiLeftPaletteComponent.class);
+        assertThat(testSubject.getCategoryName()).isNotNull().isInstanceOf(String.class);
+    }
+
+    @Test
+    public void getSubcategoryName_whenResource() {
+        final UiLeftPaletteComponent testSubject = createTestSubjectResource();
+        assertThat(testSubject).isNotNull().isInstanceOf(UiLeftPaletteComponent.class);
+        assertThat(testSubject.getSubcategoryName()).isNotNull().isInstanceOf(String.class);
+    }
+
+    @Test
+    public void getSubcategoryName_whenService() {
+        final UiLeftPaletteComponent testSubject = createTestSubjectService();
+        assertThat(testSubject).isNotNull().isInstanceOf(UiLeftPaletteComponent.class);
+        assertThat(testSubject.getSubcategoryName()).isNull();
+    }
+}