From a19351091f5f75eee0ada2e291b22011a346686d Mon Sep 17 00:00:00 2001 From: Kuamr Shubham Date: Tue, 10 Mar 2020 15:42:25 +0530 Subject: [PATCH] Shubham, Ankit | Add. Properties of deployment info to be mandatory --- .../api/Manifest/schema/deployment.json | 13 ++++++++++++- .../DeploymentPortal/api/Manifest/SchemaTest.java | 9 +++++++++ .../Manifest/schema/TestData/invalidDeployment.json | 2 ++ 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 src/test/java/com/DeploymentPortal/api/Manifest/schema/TestData/invalidDeployment.json diff --git a/src/main/java/com/DeploymentPortal/api/Manifest/schema/deployment.json b/src/main/java/com/DeploymentPortal/api/Manifest/schema/deployment.json index 11367932..019f6548 100644 --- a/src/main/java/com/DeploymentPortal/api/Manifest/schema/deployment.json +++ b/src/main/java/com/DeploymentPortal/api/Manifest/schema/deployment.json @@ -54,5 +54,16 @@ "healthChecks": { "$ref": "file:/Users/kumarshubham/Downloads/Deployment-Portal/src/main/java/com/DeploymentPortal/api/Manifest/schema/healthChecks.json" } - } + }, + "required": [ + "cluster", + "name", + "timeout", + "healthChecks", + "namespace", + "exposedPorts", + "loadBalancer", + "environmentVariables", + "instance" + ] } \ 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 70525859..50a8ccbd 100644 --- a/src/test/java/com/DeploymentPortal/api/Manifest/SchemaTest.java +++ b/src/test/java/com/DeploymentPortal/api/Manifest/SchemaTest.java @@ -146,4 +146,13 @@ public class SchemaTest { assertTrue(validationUtils.isJsonValid(schemaFile, jsonFile)); } + + @Test + void expectFalseWhenFewPropertiesOfDeploymentAreMissing() throws IOException, ProcessingException { + File schemaFile = new File(schemaPath + "deployment.json"); + File jsonFile = new File(testData + "invalidDeployment.json"); + ValidationUtils validationUtils = new ValidationUtils(); + + assertFalse(validationUtils.isJsonValid(schemaFile, jsonFile)); + } } diff --git a/src/test/java/com/DeploymentPortal/api/Manifest/schema/TestData/invalidDeployment.json b/src/test/java/com/DeploymentPortal/api/Manifest/schema/TestData/invalidDeployment.json new file mode 100644 index 00000000..7a73a41b --- /dev/null +++ b/src/test/java/com/DeploymentPortal/api/Manifest/schema/TestData/invalidDeployment.json @@ -0,0 +1,2 @@ +{ +} \ No newline at end of file