Fix tests to match changes to default datetime format in JSON output.

Yaytay · Yaytay · commit 39127bce4ddb · 2025-05-20T15:52:20.000+01:00
diff --git a/query-engine/docs/query-engine-compose.yml b/query-engine/docs/query-engine-compose.yml
@@ -50,7 +50,7 @@ services:
     - 16686:16686
 
   query-engine:
-    image: ghcr.io/yaytay/query-engine-design-mode:0.0.64-1-main
+    image: ghcr.io/yaytay/query-engine-design-mode:0.0.64-2-main
     ports:
     - 2000:8080
     volumes:
diff --git a/query-engine/src/main/java/uk/co/spudsoft/query/main/Version.java b/query-engine/src/main/java/uk/co/spudsoft/query/main/Version.java
@@ -34,7 +34,7 @@ public final class Version {
   /**
    * The project version, as set in the Maven pom.xml.
    */
-  public static final String MAVEN_PROJECT_VERSION = "0.0.64-1-main";
+  public static final String MAVEN_PROJECT_VERSION = "0.0.64-2-main";
 
   private Version() {
   }
diff --git a/query-engine/src/test/java/uk/co/spudsoft/query/main/AuthQueryIT.java b/query-engine/src/test/java/uk/co/spudsoft/query/main/AuthQueryIT.java
@@ -225,7 +225,7 @@ public void testQuery() throws Exception {
             .statusCode(200)
             .extract().body().asString();
     
-    assertThat(body, startsWith("[{\"dataId\":1,\"instant\":\"1971-05-07T03:00\",\"ref\":\"antiquewhite\",\"value\":\"first\",\"children\":\"one\",\"DateField\":\"2023-05-05\",\"TimeField\":null,\"DateTimeField\":null,\"LongField\":null,\"DoubleField\":null,\"BoolField\":null,\"TextField\":null}"));
+    assertThat(body, startsWith("[{\"dataId\":1,\"instant\":\"1971-05-07T03:00:00Z\",\"ref\":\"antiquewhite\",\"value\":\"first\",\"children\":\"one\",\"DateField\":\"2023-05-05\",\"TimeField\":null,\"DateTimeField\":null,\"LongField\":null,\"DoubleField\":null,\"BoolField\":null,\"TextField\":null},{\"dataId\":2,\"instant\":\"1971-05-08T06:00:00Z\",\"ref\":\"aqua\",\"value\":\"second\",\"children\":\"two,four\",\"DateField\":\"2023-05-04\",\"TimeField\":\"23:58\",\"DateTimeField\":null,\"LongField\":null,\"DoubleField\":null,\"BoolField\":null,\"TextField\":null},"));
     
     body = given()
             .header(new Header("Authorization", "Bearer " + token))
@@ -239,7 +239,7 @@ public void testQuery() throws Exception {
             .extract().body().asString();
     
     // Note that MySQL doesn't do booleans
-    assertThat(body, startsWith("[{\"dataId\":1,\"instant\":\"1971-05-07T03:00\",\"ref\":\"antiquewhite\",\"value\":\"first\",\"children\":\"one\",\"DateField\":\"2023-05-05\",\"TimeField\":null,\"DateTimeField\":null,\"LongField\":null,\"DoubleField\":null,\"BoolField\":null,\"TextField\":null},"));
+    assertThat(body, startsWith("[{\"dataId\":1,\"instant\":\"1971-05-07T03:00:00Z\",\"ref\":\"antiquewhite\",\"value\":\"first\",\"children\":\"one\",\"DateField\":\"2023-05-05\",\"TimeField\":null,\"DateTimeField\":null,\"LongField\":null,\"DoubleField\":null,\"BoolField\":null,\"TextField\":null},{\"dataId\":2,\"instant\":\"1971-05-08T06:00:00Z\",\"ref\":\"aqua\",\"value\":\"second\",\"children\":\"two,four\",\"DateField\":\"2023-05-04\",\"TimeField\":\"23:58\",\"DateTimeField\":null,\"LongField\":null,\"DoubleField\":null,\"BoolField\":null,\"TextField\":null},"));
     
     byte[] bodyBytes = given()
             .header(new Header("Authorization", "Bearer " + token))
diff --git a/query-engine/src/test/java/uk/co/spudsoft/query/main/AuthQueryMsIT.java b/query-engine/src/test/java/uk/co/spudsoft/query/main/AuthQueryMsIT.java
@@ -230,7 +230,7 @@ public void testQuery() throws Exception {
             .statusCode(200)
             .extract().body().asString();
     
-    assertThat(body, startsWith("[{\"dataId\":1,\"instant\":\"1971-05-07T03:00\",\"ref\":\"antiquewhite\",\"value\":\"first\",\"children\":\"one\",\"DateField\":\"2023-05-05\",\"TimeField\":null,\"DateTimeField\":null,\"LongField\":null,\"DoubleField\":null,\"BoolField\":null,\"TextField\":null}"));
+    assertThat(body, startsWith("[{\"dataId\":1,\"instant\":\"1971-05-07T03:00:00Z\",\"ref\":\"antiquewhite\",\"value\":\"first\",\"children\":\"one\",\"DateField\":\"2023-05-05\",\"TimeField\":null,\"DateTimeField\":null,\"LongField\":null,\"DoubleField\":null,\"BoolField\":null,\"TextField\":null},{\"dataId\":2,\"instant\":\"1971-05-08T06:00:00Z\",\"ref\":\"aqua\",\"value\":\"second\",\"children\":\"two,four\",\"DateField\":\"2023-05-04\",\"TimeField\":\"23:58\",\"DateTimeField\":null,\"LongField\":null,\"DoubleField\":null,\"BoolField\":null,\"TextField\":null},"));
     
     body = given()
             .header(new Header("Authorization", "Bearer " + token))
@@ -244,7 +244,7 @@ public void testQuery() throws Exception {
             .extract().body().asString();
     
     // Note that MySQL doesn't do booleans
-    assertThat(body, startsWith("[{\"dataId\":1,\"instant\":\"1971-05-07T03:00\",\"ref\":\"antiquewhite\",\"value\":\"first\",\"children\":\"one\",\"DateField\":\"2023-05-05\",\"TimeField\":null,\"DateTimeField\":null,\"LongField\":null,\"DoubleField\":null,\"BoolField\":null,\"TextField\":null},"));
+    assertThat(body, startsWith("[{\"dataId\":1,\"instant\":\"1971-05-07T03:00:00Z\",\"ref\":\"antiquewhite\",\"value\":\"first\",\"children\":\"one\",\"DateField\":\"2023-05-05\",\"TimeField\":null,\"DateTimeField\":null,\"LongField\":null,\"DoubleField\":null,\"BoolField\":null,\"TextField\":null},{\"dataId\":2,\"instant\":\"1971-05-08T06:00:00Z\",\"ref\":\"aqua\",\"value\":\"second\",\"children\":\"two,four\",\"DateField\":\"2023-05-04\",\"TimeField\":\"23:58\",\"DateTimeField\":null,\"LongField\":null,\"DoubleField\":null,\"BoolField\":null,\"TextField\":null},"));
     
     byte[] bodyBytes = given()
             .header(new Header("Authorization", "Bearer " + token))
diff --git a/query-engine/src/test/java/uk/co/spudsoft/query/main/FeatureRichQueryIT.java b/query-engine/src/test/java/uk/co/spudsoft/query/main/FeatureRichQueryIT.java
@@ -140,7 +140,7 @@ public void testQuery() throws Exception {
             .statusCode(200)
             .extract().body().asString();
     
-    assertThat(body, startsWith("{\"meta\":{\"description\":\"A complex pipeline that tries to demonstrate as many features as I can cram into a single pipeline.\",\"fields\":{\"dataId\":\"integer\",\"instant\":\"datetime\",\"colour\":\"string\",\"value\":\"string\",\"children\":\"string\",\"DateField\":\"date\",\"TimeField\":\"time\",\"DateTimeField\":\"datetime\",\"LongField\":\"long\",\"DoubleField\":\"double\",\"BoolField\":\"bool\",\"TextField\":\"string\",\"child2\":\"string\",\"child3\":\"string\",\"child5\":\"string\",\"child4\":\"string\"}},\"data\":[{\"dataId\":1,\"instant\":\"1971-05-07T03:00\""));
+    assertThat(body, startsWith("{\"meta\":{\"description\":\"A complex pipeline that tries to demonstrate as many features as I can cram into a single pipeline.\",\"fields\":{\"dataId\":\"bool\",\"instant\":\"datetime\",\"colour\":\"string\",\"value\":\"string\",\"children\":\"string\",\"DateField\":\"date\",\"TimeField\":\"time\",\"DateTimeField\":\"datetime\",\"LongField\":\"bool\",\"DoubleField\":\"double\",\"BoolField\":\"bool\",\"TextField\":\"string\",\"child2\":\"string\",\"child3\":\"string\",\"child5\":\"string\",\"child4\":\"string\"}},\"data\":[{\"dataId\":1,\"instant\":\"1971-05-07T03:00:00Z\",\"colour\":\"antiquewhite\",\"value\":\"first\",\"children\":\"one\",\"DateField\":\"2023-05-05\",\"TimeField\":null,\"DateTimeField\":null,\"LongField\":null,\"DoubleField\":null,\"BoolField\":null,\"TextField\":null,\"child2\":\"one\",\"child3\":\"one\",\"child5\":\"one\",\"child4\":\"b0f56ab83929aeda\"},"));
     
     body = given()
             .queryParam("minDate", "2971-05-06")
diff --git a/query-engine/src/test/java/uk/co/spudsoft/query/main/MainJustOneQueryIT.java b/query-engine/src/test/java/uk/co/spudsoft/query/main/MainJustOneQueryIT.java
@@ -101,7 +101,7 @@ public void testQuery() throws Exception {
             .statusCode(200)
             .extract().body().asString();
     
-    assertThat(body, startsWith("[{\"dataId\":1,\"instant\":\"1971-05-07T03:00\",\"ref\":\"antiquewhite\",\"value\":\"first\",\"children\":\"one\",\"DateField\":\"2023-05-05\",\"TimeField\":null,\"DateTimeField\":null,\"LongField\":null,\"DoubleField\":null,\"BoolField\":null,\"TextField\":null}"));
+    assertThat(body, startsWith("[{\"dataId\":1,\"instant\":\"1971-05-07T03:00:00Z\",\"ref\":\"antiquewhite\",\"value\":\"first\",\"children\":\"one\",\"DateField\":\"2023-05-05\",\"TimeField\":null,\"DateTimeField\":null,\"LongField\":null,\"DoubleField\":null,\"BoolField\":null,\"TextField\":null},{\"dataId\":2,\"instant\":\"1971-05-08T06:00:00Z\",\"ref\":\"aqua\",\"value\":\"second\",\"children\":\"two,four\",\"DateField\":\"2023-05-04\",\"TimeField\":\"23:58\",\"DateTimeField\":null,\"LongField\":null,\"DoubleField\":null,\"BoolField\":null,\"TextField\":null},"));
     
     main.shutdown();
   }
diff --git a/query-engine/src/test/java/uk/co/spudsoft/query/main/MainQueryIT.java b/query-engine/src/test/java/uk/co/spudsoft/query/main/MainQueryIT.java
@@ -148,7 +148,7 @@ public void testQuery() throws Exception {
             .statusCode(200)
             .extract().body().asString();
     
-    assertThat(body, startsWith("[{\"dataId\":1,\"instant\":\"1971-05-07T03:00\",\"ref\":\"antiquewhite\",\"value\":\"first\",\"children\":\"one\",\"DateField\":\"2023-05-05\",\"TimeField\":null,\"DateTimeField\":null,\"LongField\":null,\"DoubleField\":null,\"BoolField\":null,\"TextField\":null}"));
+    assertThat(body, startsWith("[{\"dataId\":1,\"instant\":\"1971-05-07T03:00:00Z\",\"ref\":\"antiquewhite\",\"value\":\"first\",\"children\":\"one\",\"DateField\":\"2023-05-05\",\"TimeField\":null,\"DateTimeField\":null,\"LongField\":null,\"DoubleField\":null,\"BoolField\":null,\"TextField\":null},{\"dataId\":2,\"instant\":\"1971-05-08T06:00:00Z\",\"ref\":\"aqua\",\"value\":\"second\",\"children\":\"two,four\",\"DateField\":\"2023-05-04\",\"TimeField\":\"23:58\",\"DateTimeField\":null,\"LongField\":null,\"DoubleField\":null,\"BoolField\":null,\"TextField\":null},"));
     
     body = given()
             .queryParam("key", mysql.getName())
@@ -161,7 +161,7 @@ public void testQuery() throws Exception {
             .extract().body().asString();
     
     // Note that MySQL doesn't do booleans
-    assertThat(body, startsWith("[{\"dataId\":1,\"instant\":\"1971-05-07T03:00\",\"ref\":\"antiquewhite\",\"value\":\"first\",\"children\":\"one\",\"DateField\":\"2023-05-05\",\"TimeField\":null,\"DateTimeField\":null,\"LongField\":null,\"DoubleField\":null,\"BoolField\":null,\"TextField\":null},"));
+    assertThat(body, startsWith("[{\"dataId\":1,\"instant\":\"1971-05-07T03:00:00Z\",\"ref\":\"antiquewhite\",\"value\":\"first\",\"children\":\"one\",\"DateField\":\"2023-05-05\",\"TimeField\":null,\"DateTimeField\":null,\"LongField\":null,\"DoubleField\":null,\"BoolField\":null,\"TextField\":null},{\"dataId\":2,\"instant\":\"1971-05-08T06:00:00Z\",\"ref\":\"aqua\",\"value\":\"second\",\"children\":\"two,four\",\"DateField\":\"2023-05-04\",\"TimeField\":\"23:58\",\"DateTimeField\":null,\"LongField\":null,\"DoubleField\":null,\"BoolField\":null,\"TextField\":null},"));
     
     byte[] bodyBytes = given()
             .queryParam("key", postgres.getName())
diff --git a/query-engine/src/test/java/uk/co/spudsoft/query/main/MainQueryWithoutPersistenceIT.java b/query-engine/src/test/java/uk/co/spudsoft/query/main/MainQueryWithoutPersistenceIT.java
@@ -195,7 +195,7 @@ public void testQuery() throws Exception {
             .statusCode(200)
             .extract().body().asString();
     
-    assertThat(body, startsWith("[{\"dataId\":1,\"instant\":\"1971-05-07T03:00\",\"ref\":\"antiquewhite\",\"value\":\"first\",\"children\":\"one\",\"DateField\":\"2023-05-05\",\"TimeField\":null,\"DateTimeField\":null,\"LongField\":null,\"DoubleField\":null,\"BoolField\":null,\"TextField\":null}"));
+    assertThat(body, startsWith("[{\"dataId\":1,\"instant\":\"1971-05-07T03:00:00Z\",\"ref\":\"antiquewhite\",\"value\":\"first\",\"children\":\"one\",\"DateField\":\"2023-05-05\",\"TimeField\":null,\"DateTimeField\":null,\"LongField\":null,\"DoubleField\":null,\"BoolField\":null,\"TextField\":null},{\"dataId\":2,\"instant\":\"1971-05-08T06:00:00Z\",\"ref\":\"aqua\",\"value\":\"second\",\"children\":\"two,four\",\"DateField\":\"2023-05-04\",\"TimeField\":\"23:58\",\"DateTimeField\":null,\"LongField\":null,\"DoubleField\":null,\"BoolField\":null,\"TextField\":null},"));
     
     body = given()
             .queryParam("key", mysql.getName())
@@ -208,7 +208,7 @@ public void testQuery() throws Exception {
             .extract().body().asString();
     
     // Note that MySQL doesn't do booleans
-    assertThat(body, startsWith("[{\"dataId\":1,\"instant\":\"1971-05-07T03:00\",\"ref\":\"antiquewhite\",\"value\":\"first\",\"children\":\"one\",\"DateField\":\"2023-05-05\",\"TimeField\":null,\"DateTimeField\":null,\"LongField\":null,\"DoubleField\":null,\"BoolField\":null,\"TextField\":null},"));
+    assertThat(body, startsWith("[{\"dataId\":1,\"instant\":\"1971-05-07T03:00:00Z\",\"ref\":\"antiquewhite\",\"value\":\"first\",\"children\":\"one\",\"DateField\":\"2023-05-05\",\"TimeField\":null,\"DateTimeField\":null,\"LongField\":null,\"DoubleField\":null,\"BoolField\":null,\"TextField\":null},{\"dataId\":2,\"instant\":\"1971-05-08T06:00:00Z\",\"ref\":\"aqua\",\"value\":\"second\",\"children\":\"two,four\",\"DateField\":\"2023-05-04\",\"TimeField\":\"23:58\",\"DateTimeField\":null,\"LongField\":null,\"DoubleField\":null,\"BoolField\":null,\"TextField\":null},"));
     
     byte[] bodyBytes = given()
             .queryParam("key", postgres.getName())

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public final class Version {`
`34`	`34`	`/**`
`35`	`35`	`* The project version, as set in the Maven pom.xml.`
`36`	`36`	`*/`
`37`		`- public static final String MAVEN_PROJECT_VERSION = "0.0.64-1-main";`
	`37`	`+ public static final String MAVEN_PROJECT_VERSION = "0.0.64-2-main";`
`38`	`38`
`39`	`39`	`private Version() {`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ public void testQuery() throws Exception {`
`101`	`101`	`.statusCode(200)`
`102`	`102`	`.extract().body().asString();`
`103`	`103`
`104`		`- assertThat(body, startsWith("[{\"dataId\":1,\"instant\":\"1971-05-07T03:00\",\"ref\":\"antiquewhite\",\"value\":\"first\",\"children\":\"one\",\"DateField\":\"2023-05-05\",\"TimeField\":null,\"DateTimeField\":null,\"LongField\":null,\"DoubleField\":null,\"BoolField\":null,\"TextField\":null}"));`
	`104`	+ assertThat(body, startsWith("[{\"dataId\":1,\"instant\":\"1971-05-07T03:00:00Z\",\"ref\":\"antiquewhite\",\"value\":\"first\",\"children\":\"one\",\"DateField\":\"2023-05-05\",\"TimeField\":null,\"DateTimeField\":null,\"LongField\":null,\"DoubleField\":null,\"BoolField\":null,\"TextField\":null},{\"dataId\":2,\"instant\":\"1971-05-08T06:00:00Z\",\"ref\":\"aqua\",\"value\":\"second\",\"children\":\"two,four\",\"DateField\":\"2023-05-04\",\"TimeField\":\"23:58\",\"DateTimeField\":null,\"LongField\":null,\"DoubleField\":null,\"BoolField\":null,\"TextField\":null},"));
`105`	`105`
`106`	`106`	`main.shutdown();`
`107`	`107`	`}`