summaryrefslogtreecommitdiffstats
path: root/common-be
diff options
context:
space:
mode:
authorPiotr Darosz <piotr.darosz@nokia.com>2019-07-18 14:28:46 +0200
committerOfir Sonsino <ofir.sonsino@intl.att.com>2019-07-21 11:50:47 +0000
commitb1eb291bf50b7aa15e5b1fc57c24f6a25a1b8fa5 (patch)
tree278c347b03c0d35da3fbd52f42d9c9028395d78d /common-be
parent706a6ce8e074157ec4708d38e1b705a5eef271cb (diff)
Can't set property for VF
Can't set property for VF due to missing setter for schemaType property Change-Id: I829a3c81586280b91634fa03f3a023b1452bcdda Issue-ID: SDC-2420 Signed-off-by: Piotr Darosz <piotr.darosz@nokia.com>
Diffstat (limited to 'common-be')
-rw-r--r--common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinition.java6
-rw-r--r--common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinitionTest.java29
2 files changed, 34 insertions, 1 deletions
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinition.java
index 218b648742..e59d9a6a62 100644
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinition.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinition.java
@@ -221,6 +221,12 @@ public class PropertyDataDefinition extends ToscaDataDefinition {
return schema;
}
+ public void setSchemaType(String schemaType) {
+ if (schema != null && schema.getProperty() != null) {
+ schema.getProperty().setType(schemaType);
+ }
+ }
+
public void setSchema(SchemaDefinition entrySchema) {
this.schema = entrySchema;
}
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinitionTest.java
index 95fe656705..899022e9ad 100644
--- a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinitionTest.java
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinitionTest.java
@@ -27,7 +27,13 @@ import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields;
import java.util.List;
-import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
public class PropertyDataDefinitionTest {
@@ -650,4 +656,25 @@ public class PropertyDataDefinitionTest {
testSubject.mergeFunction(createTestSubject(), false);
}
+
+ @Test
+ public void schemaTypeNullWhenSchemaIsNull() {
+ String sampleSchemaType = "sampleSchemaType";
+ PropertyDataDefinition testSubject = createTestSubject();
+ testSubject.setSchemaType(sampleSchemaType);
+ assertNull(testSubject.getSchemaType());
+ }
+
+ @Test
+ public void schemaTypeIsReturnedWhenSchemaisPresent() {
+ String sampleSchemaType = "sampleSchemaType";
+ SchemaDefinition schemaDefinition = new SchemaDefinition();
+ schemaDefinition.setProperty(new PropertyDataDefinition());
+
+ PropertyDataDefinition testSubject = createTestSubject();
+ testSubject.setSchema(schemaDefinition);
+ testSubject.setSchemaType(sampleSchemaType);
+
+ assertThat(testSubject.getSchemaType(), is(equalTo(sampleSchemaType)));
+ }
}