From 58b3ef35f72a48dd52567683e8e61d1b8daf0fae Mon Sep 17 00:00:00 2001 From: Kuamr Shubham Date: Tue, 10 Mar 2020 14:17:58 +0530 Subject: [PATCH] Shubham, Ankit | Add. All the attributes of loadbalancers are mandatory --- .../api/Manifest/schema/loadBalancer.json | 3 ++- .../com/DeploymentPortal/api/Manifest/SchemaTest.java | 9 +++++++++ .../Manifest/schema/TestData/invalidLoadBalancer.json | 4 ++++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 src/test/java/com/DeploymentPortal/api/Manifest/schema/TestData/invalidLoadBalancer.json diff --git a/src/main/java/com/DeploymentPortal/api/Manifest/schema/loadBalancer.json b/src/main/java/com/DeploymentPortal/api/Manifest/schema/loadBalancer.json index da209bc9..59f35fd3 100644 --- a/src/main/java/com/DeploymentPortal/api/Manifest/schema/loadBalancer.json +++ b/src/main/java/com/DeploymentPortal/api/Manifest/schema/loadBalancer.json @@ -18,5 +18,6 @@ "endpoint": { "type": "string" } - } + }, + "required": ["type","accessPolicies","endpoint"] } \ 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 43fe0658..d96f90c2 100644 --- a/src/test/java/com/DeploymentPortal/api/Manifest/SchemaTest.java +++ b/src/test/java/com/DeploymentPortal/api/Manifest/SchemaTest.java @@ -74,4 +74,13 @@ public class SchemaTest { assertTrue(validationUtils.isJsonValid(schemaFile, jsonFile)); } + + @Test + void expectFalseWhenSomePropertiesOfLoadBalancerAreMissing() throws IOException, ProcessingException { + File schemaFile = new File(schemaPath + "loadBalancer.json"); + File jsonFile = new File(testData + "invalidLoadBalancer.json"); + ValidationUtils validationUtils = new ValidationUtils(); + + assertFalse(validationUtils.isJsonValid(schemaFile, jsonFile)); + } } diff --git a/src/test/java/com/DeploymentPortal/api/Manifest/schema/TestData/invalidLoadBalancer.json b/src/test/java/com/DeploymentPortal/api/Manifest/schema/TestData/invalidLoadBalancer.json new file mode 100644 index 00000000..cbce9ac1 --- /dev/null +++ b/src/test/java/com/DeploymentPortal/api/Manifest/schema/TestData/invalidLoadBalancer.json @@ -0,0 +1,4 @@ +{ + "type": "elb", + "endpoint": "dev-spring-boot-demo-service.np.navi-tech.in" +} \ No newline at end of file