From 88b9253fc275f275d5341bfdbb67d6d679855b9f Mon Sep 17 00:00:00 2001 From: Kuamr Shubham Date: Tue, 10 Mar 2020 14:58:58 +0530 Subject: [PATCH] Shubham, Ankit | Add. All the properties of labels are mandatory --- .../com/DeploymentPortal/api/Manifest/schema/labels.json | 3 ++- .../com/DeploymentPortal/api/Manifest/SchemaTest.java | 9 +++++++++ .../api/Manifest/schema/TestData/invalidLabel.json | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 src/test/java/com/DeploymentPortal/api/Manifest/schema/TestData/invalidLabel.json diff --git a/src/main/java/com/DeploymentPortal/api/Manifest/schema/labels.json b/src/main/java/com/DeploymentPortal/api/Manifest/schema/labels.json index d8fe8d94..68b0d360 100644 --- a/src/main/java/com/DeploymentPortal/api/Manifest/schema/labels.json +++ b/src/main/java/com/DeploymentPortal/api/Manifest/schema/labels.json @@ -7,5 +7,6 @@ "micrometer-prometheus": { "enum": ["enabled","disabled"] } - } + }, + "required": ["micrometer-prometheus"] } \ No newline at end of file diff --git a/src/test/java/com/DeploymentPortal/api/Manifest/SchemaTest.java b/src/test/java/com/DeploymentPortal/api/Manifest/SchemaTest.java index 3f4c8c51..15f9b276 100644 --- a/src/test/java/com/DeploymentPortal/api/Manifest/SchemaTest.java +++ b/src/test/java/com/DeploymentPortal/api/Manifest/SchemaTest.java @@ -110,4 +110,13 @@ public class SchemaTest { assertTrue(validationUtils.isJsonValid(schemaFile, jsonFile)); } + + @Test + void expectFalseWhenLabelPropertyIsMissing() throws IOException, ProcessingException { + File schemaFile = new File(schemaPath + "labels.json"); + File jsonFile = new File(testData + "invalidLabel.json"); + ValidationUtils validationUtils = new ValidationUtils(); + + assertFalse(validationUtils.isJsonValid(schemaFile, jsonFile)); + } } diff --git a/src/test/java/com/DeploymentPortal/api/Manifest/schema/TestData/invalidLabel.json b/src/test/java/com/DeploymentPortal/api/Manifest/schema/TestData/invalidLabel.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/src/test/java/com/DeploymentPortal/api/Manifest/schema/TestData/invalidLabel.json @@ -0,0 +1 @@ +{} \ No newline at end of file