From ca583d8f30824e26c32e39b31be9a438156b64ba Mon Sep 17 00:00:00 2001
From: Kuamr Shubham <Kumar.shubham@navi.com>
Date: Tue, 10 Mar 2020 12:16:06 +0530
Subject: [PATCH] Shubham, Ankit | Add. All the properties of instance are
 required

---
 .../api/Manifest/schema/instance.json            |  2 +-
 .../api/Manifest/SchemaTest.java                 | 16 +++++++++++++---
 .../schema/TestData/invalidInstance.json         |  4 ++++
 3 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 src/test/java/com/DeploymentPortal/api/Manifest/schema/TestData/invalidInstance.json

diff --git a/src/main/java/com/DeploymentPortal/api/Manifest/schema/instance.json b/src/main/java/com/DeploymentPortal/api/Manifest/schema/instance.json
index 8f959d97..4b8b8ccc 100644
--- a/src/main/java/com/DeploymentPortal/api/Manifest/schema/instance.json
+++ b/src/main/java/com/DeploymentPortal/api/Manifest/schema/instance.json
@@ -17,5 +17,5 @@
       "type": "string"
     }
   },
-  "required": ["count"]
+  "required": ["count","cpu","memory"]
 }
\ 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 1080612b..8ea8c810 100644
--- a/src/test/java/com/DeploymentPortal/api/Manifest/SchemaTest.java
+++ b/src/test/java/com/DeploymentPortal/api/Manifest/SchemaTest.java
@@ -11,12 +11,22 @@ import static org.junit.jupiter.api.Assertions.*;
 public class SchemaTest {
     String schemaPath = "src/main/java/com/DeploymentPortal/api/Manifest/schema/";
     String testData = "src/test/java/com/DeploymentPortal/api/Manifest/schema/TestData/";
+
     @Test
     void expectToGetTrueWhenInstanceDataIsValid() throws IOException, ProcessingException {
-        File schemaFile = new File(schemaPath+"instance.json");
-        File jsonFile = new File(testData +"validInstance.json");
+        File schemaFile = new File(schemaPath + "instance.json");
+        File jsonFile = new File(testData + "validInstance.json");
         ValidationUtils validationUtils = new ValidationUtils();
 
-        assertTrue( validationUtils.isJsonValid(schemaFile,jsonFile));
+        assertTrue(validationUtils.isJsonValid(schemaFile, jsonFile));
+    }
+
+    @Test
+    void expectFalseWhenCountIsNotPresentInInstance() throws IOException, ProcessingException {
+        File schemaFile = new File(schemaPath + "instance.json");
+        File jsonFile = new File(testData + "invalidInstance.json");
+        ValidationUtils validationUtils = new ValidationUtils();
+
+        assertFalse(validationUtils.isJsonValid(schemaFile, jsonFile));
     }
 }
diff --git a/src/test/java/com/DeploymentPortal/api/Manifest/schema/TestData/invalidInstance.json b/src/test/java/com/DeploymentPortal/api/Manifest/schema/TestData/invalidInstance.json
new file mode 100644
index 00000000..00230a99
--- /dev/null
+++ b/src/test/java/com/DeploymentPortal/api/Manifest/schema/TestData/invalidInstance.json
@@ -0,0 +1,4 @@
+{
+  "count": 1,
+  "memory": "300Mi"
+}
\ No newline at end of file