Introduce support for JSON as a test result type, including sample test case.
Change-Id: If2e0454e30b62f52311e156beed0024f615669ce
Reviewed-on: http://fulliautomatix.ics.uci.edu:8443/92
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Till Westmann <westmann@gmail.com>
diff --git a/asterix-app/src/test/java/edu/uci/ics/asterix/test/dml/DmlTest.java b/asterix-app/src/test/java/edu/uci/ics/asterix/test/dml/DmlTest.java
index 0f2aeb8..7efca6f 100644
--- a/asterix-app/src/test/java/edu/uci/ics/asterix/test/dml/DmlTest.java
+++ b/asterix-app/src/test/java/edu/uci/ics/asterix/test/dml/DmlTest.java
@@ -65,7 +65,8 @@
}
asterixLoad.execute();
File enlistFile = new File(ENLIST_FILE);
- String resultFileName = TestsUtils.aqlExtToResExt(enlistFile.getName());
+ int dot = enlistFile.getName().lastIndexOf('.');
+ String resultFileName = enlistFile.getName().substring(0, dot + 1) + ".adm";
File expectedFile = new File(PATH_EXPECTED + SEPARATOR + resultFileName);
File actualFile = new File(PATH_ACTUAL + SEPARATOR + resultFileName);
// Khurram
diff --git a/asterix-app/src/test/resources/runtimets/queries/json/int01/int01.1.query.aql b/asterix-app/src/test/resources/runtimets/queries/json/int01/int01.1.query.aql
new file mode 100644
index 0000000..3b8e816
--- /dev/null
+++ b/asterix-app/src/test/resources/runtimets/queries/json/int01/int01.1.query.aql
@@ -0,0 +1 @@
+[ 1, 2 ]
diff --git a/asterix-app/src/test/resources/runtimets/results/json/int01/int01.1.json b/asterix-app/src/test/resources/runtimets/results/json/int01/int01.1.json
new file mode 100644
index 0000000..3448068
--- /dev/null
+++ b/asterix-app/src/test/resources/runtimets/results/json/int01/int01.1.json
@@ -0,0 +1,7 @@
+{ "orderedlist": [ { "int32":
+1
+}
+, { "int32":
+2
+}
+ ] }
diff --git a/asterix-app/src/test/resources/runtimets/testsuite.xml b/asterix-app/src/test/resources/runtimets/testsuite.xml
index 6344bc1..50f5ce2 100644
--- a/asterix-app/src/test/resources/runtimets/testsuite.xml
+++ b/asterix-app/src/test/resources/runtimets/testsuite.xml
@@ -5117,4 +5117,11 @@
</compilation-unit>
</test-case>
</test-group>
+ <test-group name="json">
+ <test-case FilePath="json">
+ <compilation-unit name="int01">
+ <output-dir compare="JSON">int01</output-dir>
+ </compilation-unit>
+ </test-case>
+ </test-group>
</test-suite>