1 files changed, 37 insertions, 29 deletions
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/ConstraintUtilTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/ConstraintUtilTest.java
index 7f7e6980e6..99987800d3 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/ConstraintUtilTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/ConstraintUtilTest.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,39 +20,47 @@
 
 package org.openecomp.sdc.be.model.tosca.constraints;
 
-import org.junit.Test;
-import org.openecomp.sdc.be.model.tosca.ToscaType;
-
-public class ConstraintUtilTest {
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-	@Test
-	public void testCheckStringType() throws Exception {
-		ToscaType propertyType = ToscaType.STRING;
+import com.fasterxml.jackson.core.type.TypeReference;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+import org.openecomp.sdc.be.model.tosca.ToscaType;
+import org.openecomp.sdc.be.model.tosca.constraints.exception.ConstraintValueDoNotMatchPropertyTypeException;
 
-		// default test
-		ConstraintUtil.checkStringType(propertyType);
-	}
+class ConstraintUtilTest {
 
-	
-	@Test
-	public void testCheckComparableType() throws Exception {
-		ToscaType propertyType = ToscaType.INTEGER;
+    @Test
+    void testCheckStringType() throws Exception {
+        assertDoesNotThrow(() -> ConstraintUtil.checkStringType(ToscaType.STRING));
+        assertThrows(ConstraintValueDoNotMatchPropertyTypeException.class, () -> ConstraintUtil.checkStringType(ToscaType.SCALAR_UNIT));
+    }
 
-		// default test
-		ConstraintUtil.checkComparableType(propertyType);
-	}
+    @Test
+    void testCheckComparableType() throws Exception {
+        assertDoesNotThrow(() -> ConstraintUtil.checkComparableType(ToscaType.INTEGER));
+        assertThrows(ConstraintValueDoNotMatchPropertyTypeException.class, () -> ConstraintUtil.checkComparableType(ToscaType.SCALAR_UNIT));
+    }
 
-	
-	@Test
-	public void testConvertToComparable() throws Exception {
-		ToscaType propertyType = ToscaType.BOOLEAN;
-		String value = "";
-		Comparable result;
+    @Test
+    void testConvertToComparable() throws Exception {
+        assertTrue(ConstraintUtil.convertToComparable(ToscaType.BOOLEAN, "true") instanceof Comparable);
+        assertThrows(IllegalArgumentException.class, () -> ConstraintUtil.convertToComparable(ToscaType.SCALAR_UNIT, "value"));
+    }
 
-		// default test
-		result = ConstraintUtil.convertToComparable(propertyType, value);
-	}
+    @Test
+    void testParseToCollection() throws Exception {
+        List<Object> list = ConstraintUtil.parseToCollection("[\"color\",\"type\"]", new TypeReference<List<Object>>() {
+        });
+        assertTrue(list instanceof List);
+        assertEquals(2, list.size());
 
-	
+        assertThrows(ConstraintValueDoNotMatchPropertyTypeException.class,
+            () -> ConstraintUtil.parseToCollection("", new TypeReference<List<Object>>() {
+            }));
+    }
 
 }