Merge "update to fix junit and coverage"

2 files changed, 19 insertions, 6 deletions

diff --git a/src/test/java/org/onap/dcae/vestest/InputJsonValidation.java b/src/test/java/org/onap/dcae/vestest/InputJsonValidation.java
index 0913608a..336cb92f 100644
--- a/src/test/java/org/onap/dcae/vestest/InputJsonValidation.java
+++ b/src/test/java/org/onap/dcae/vestest/InputJsonValidation.java
@@ -63,7 +63,7 @@ public class InputJsonValidation {
 
 		String schema=null;
 		try {
-			schema = new JsonParser().parse(new FileReader(VESCollectorJunitTest.schemaFile)).toString();
+			schema = new JsonParser().parse(new FileReader("etc/CommonEventFormat_27.2.json")).toString();
 			//System.out.println("Schema value: " + schema.toString());
 		} catch (JsonIOException e) {
 			// TODO Auto-generated catch block
@@ -108,7 +108,8 @@ public class InputJsonValidation {
 		String schema=null;
 		try {
 
-			schema = new JsonParser().parse(new FileReader(VESCollectorJunitTest.schemaFile)).toString();
+			System.out.println("XX debug" + VESCollectorJunitTest.schemaFile);
+			schema = new JsonParser().parse(new FileReader("etc/CommonEventFormat_27.2.json")).toString();
 		} catch (JsonIOException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
@@ -167,3 +168,4 @@ public class InputJsonValidation {
 	}
 
 }  
+
diff --git a/src/test/java/org/onap/dcae/vestest/VESCollectorJunitTest.java b/src/test/java/org/onap/dcae/vestest/VESCollectorJunitTest.java
index 0e737175..eb1ebfde 100644
--- a/src/test/java/org/onap/dcae/vestest/VESCollectorJunitTest.java
+++ b/src/test/java/org/onap/dcae/vestest/VESCollectorJunitTest.java
@@ -32,10 +32,11 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
 
+import org.json.JSONObject;
 import org.junit.Test;
 
 public class VESCollectorJunitTest {
-		public static String schemaFile=null;
+		public static String schemaFile="etc/CommonEventFormat_27.2.json";
 		public static String output; 
 
 
@@ -53,8 +54,12 @@ public class VESCollectorJunitTest {
 			input = new FileInputStream("etc/collector.properties");
 			try {
 				prop.load(input);
-				schemaFile=prop.getProperty("collector.schema.file");
+				//schemaFile=prop.getProperty("collector.schema.file");
 
+				JSONObject schemaFileJson = new JSONObject(prop.getProperty("collector.schema.file"));
+				System.out.println("JSON Schemafile" + schemaFileJson);
+				//schemaFile = schemaFileJson.getString("v4");
+				
 				System.out.println( "Schema file location: "+ schemaFile);
 			} catch (IOException e) {
 				// TODO Auto-generated catch block
@@ -65,7 +70,7 @@ public class VESCollectorJunitTest {
 			e.printStackTrace();
 		}
 		
-		assertEquals(message,output);
+		assertEquals("true",output);
 	}
 	
 	
@@ -78,8 +83,13 @@ public class VESCollectorJunitTest {
 			input = new FileInputStream("etc/collector.properties");
 			try {
 				prop.load(input);
-				schemaFile=prop.getProperty("collector.schema.file");
+				
+				//schemaFile=prop.getProperty("collector.schema.file");
 
+				JSONObject schemaFileJson = new JSONObject(prop.getProperty("collector.schema.file"));
+				System.out.println("JSON Schemafile" + schemaFileJson);
+				//schemaFile = schemaFileJson.getString("v4");
+				
 				System.out.println( "Schema file location: "+ schemaFile);
 			} catch (IOException e) {
 				// TODO Auto-generated catch block
@@ -107,3 +117,4 @@ public class VESCollectorJunitTest {
 	
 
 }
+