From 762545c2f1ba3480d900d39adde3b1afe3823303 Mon Sep 17 00:00:00 2001 From: eschcam Date: Mon, 29 May 2023 16:45:58 +0100 Subject: [BUG] Fix error when adding valid_values constraint Issue-ID: SDC-4515 Signed-off-by: eschcam Change-Id: Id8f951053581337504b8d75c76d2409ebd71940e --- .../constraints/ValidValuesConstraintTest.java | 165 +++++++++++++++++++++ 1 file changed, 165 insertions(+) (limited to 'catalog-model/src/test') diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/ValidValuesConstraintTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/ValidValuesConstraintTest.java index 1e03513aa4..f6c63ad186 100644 --- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/ValidValuesConstraintTest.java +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/ValidValuesConstraintTest.java @@ -20,6 +20,7 @@ package org.openecomp.sdc.be.model.tosca.constraints; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -28,7 +29,11 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.List; import org.junit.jupiter.api.Test; +import org.openecomp.sdc.be.datatypes.elements.SchemaDefinition; +import org.openecomp.sdc.be.model.PropertyDefinition; +import org.openecomp.sdc.be.model.tosca.ToscaType; import org.openecomp.sdc.be.model.tosca.constraints.exception.ConstraintValueDoNotMatchPropertyTypeException; +import org.openecomp.sdc.be.model.tosca.constraints.exception.ConstraintViolationException; class ValidValuesConstraintTest { @@ -125,4 +130,164 @@ class ValidValuesConstraintTest { result.forEach(value -> assertTrue(value instanceof String)); } + + @Test + void testValidateConstraintWithoutDefaultValue() throws ConstraintValueDoNotMatchPropertyTypeException { + PropertyDefinition prop = new PropertyDefinition(); + ValidValuesConstraint constraint = createIntegerTestSubject(); + SchemaDefinition schemaDefinition = new SchemaDefinition(); + constraint.initialize(ToscaType.INTEGER, schemaDefinition); + + prop.setType(ToscaType.INTEGER.getType()); + + assertDoesNotThrow(() -> { + constraint.validate(prop); + }); + } + + @Test + void testValidateConstraintWithDefaultValue() throws ConstraintValueDoNotMatchPropertyTypeException { + PropertyDefinition prop = new PropertyDefinition(); + ValidValuesConstraint constraint = createIntegerTestSubject(); + SchemaDefinition schemaDefinition = new SchemaDefinition(); + constraint.initialize(ToscaType.INTEGER, schemaDefinition); + + prop.setDefaultValue("2"); + prop.setType(ToscaType.INTEGER.getType()); + + assertDoesNotThrow(() -> { + constraint.validate(prop); + }); + } + @Test + void testValidateConstraintWithValue() throws ConstraintValueDoNotMatchPropertyTypeException { + PropertyDefinition prop = new PropertyDefinition(); + ValidValuesConstraint constraint = createIntegerTestSubject(); + SchemaDefinition schemaDefinition = new SchemaDefinition(); + constraint.initialize(ToscaType.INTEGER, schemaDefinition); + + prop.setValue("2"); + prop.setType(ToscaType.INTEGER.getType()); + + assertDoesNotThrow(() -> { + constraint.validate(prop); + }); + } + + @Test + void testValidateConstraintWithIncorrectDefaultValue() throws ConstraintValueDoNotMatchPropertyTypeException { + PropertyDefinition prop = new PropertyDefinition(); + ValidValuesConstraint constraint = createIntegerTestSubject(); + SchemaDefinition schemaDefinition = new SchemaDefinition(); + constraint.initialize(ToscaType.INTEGER, schemaDefinition); + + prop.setDefaultValue("1000"); + prop.setType(ToscaType.INTEGER.getType()); + + assertThrows(ConstraintViolationException.class, () -> { + constraint.validate(prop); + }); + } + + @Test + void testValidateConstraintWithInvalidDefaultValue() throws ConstraintValueDoNotMatchPropertyTypeException { + PropertyDefinition prop = new PropertyDefinition(); + ValidValuesConstraint constraint = createIntegerTestSubject(); + SchemaDefinition schemaDefinition = new SchemaDefinition(); + constraint.initialize(ToscaType.INTEGER, schemaDefinition); + + prop.setDefaultValue("A String"); + prop.setType(ToscaType.INTEGER.getType()); + + assertThrows(NumberFormatException.class, () -> { + constraint.validate(prop); + }); + } + + @Test + void testValidateConstraintWithNullProp() { + ValidValuesConstraint constraint = createIntegerTestSubject(); + + assertThrows(NullPointerException.class, () -> { + constraint.validate(null); + }); + } + + @Test + void testValidateConstraintWithListPropWithDefaultValue() throws ConstraintValueDoNotMatchPropertyTypeException { + PropertyDefinition prop = new PropertyDefinition(); + PropertyDefinition intProp = new PropertyDefinition(); + ValidValuesConstraint constraint = createIntegerTestSubject(); + SchemaDefinition schemaDefinition = new SchemaDefinition(); + constraint.initialize(ToscaType.INTEGER, schemaDefinition); + + prop.setDefaultValue("[\"2\"]"); + prop.setType(ToscaType.LIST.getType()); + + intProp.setType(ToscaType.INTEGER.getType()); + schemaDefinition.setProperty(intProp); + prop.setSchema(schemaDefinition); + + assertDoesNotThrow(() -> { + constraint.validate(prop); + }); + } + @Test + void testValidateConstraintWithListPropWithValue() throws ConstraintValueDoNotMatchPropertyTypeException { + PropertyDefinition prop = new PropertyDefinition(); + PropertyDefinition intProp = new PropertyDefinition(); + ValidValuesConstraint constraint = createIntegerTestSubject(); + SchemaDefinition schemaDefinition = new SchemaDefinition(); + constraint.initialize(ToscaType.INTEGER, schemaDefinition); + + prop.setValue("[\"2\"]"); + prop.setType(ToscaType.LIST.getType()); + + intProp.setType(ToscaType.INTEGER.getType()); + schemaDefinition.setProperty(intProp); + prop.setSchema(schemaDefinition); + + assertDoesNotThrow(() -> { + constraint.validate(prop); + }); + } + + @Test + void testValidateConstraintWithMapPropWithDefaultValue() throws ConstraintValueDoNotMatchPropertyTypeException { + PropertyDefinition prop = new PropertyDefinition(); + PropertyDefinition intProp = new PropertyDefinition(); + ValidValuesConstraint constraint = createIntegerTestSubject(); + SchemaDefinition schemaDefinition = new SchemaDefinition(); + constraint.initialize(ToscaType.INTEGER, schemaDefinition); + + prop.setDefaultValue("{\"key\": \"2\"}"); + prop.setType(ToscaType.MAP.getType()); + + intProp.setType(ToscaType.INTEGER.getType()); + schemaDefinition.setProperty(intProp); + prop.setSchema(schemaDefinition); + + assertDoesNotThrow(() -> { + constraint.validate(prop); + }); + } + @Test + void testValidateConstraintWithMapPropWithValue() throws ConstraintValueDoNotMatchPropertyTypeException { + PropertyDefinition prop = new PropertyDefinition(); + PropertyDefinition intProp = new PropertyDefinition(); + ValidValuesConstraint constraint = createIntegerTestSubject(); + SchemaDefinition schemaDefinition = new SchemaDefinition(); + constraint.initialize(ToscaType.INTEGER, schemaDefinition); + + prop.setValue("{\"key\": \"2\"}"); + prop.setType(ToscaType.MAP.getType()); + + intProp.setType(ToscaType.INTEGER.getType()); + schemaDefinition.setProperty(intProp); + prop.setSchema(schemaDefinition); + + assertDoesNotThrow(() -> { + constraint.validate(prop); + }); + } } -- cgit 1.2.3-korg