Make timeZoneUpdated.qml say what went wrong on failure

Task-number: QTBUG-89889
Change-Id: I95f8e4cc6b26b1a8ab8fde2ecdd30b7b5520b6c9
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

1 files changed, 73 insertions, 19 deletions

diff --git a/tests/auto/qml/qqmllocale/data/timeZoneUpdated.qml b/tests/auto/qml/qqmllocale/data/timeZoneUpdated.qml
index ba34e005d0..21eb754c8c 100644
--- a/tests/auto/qml/qqmllocale/data/timeZoneUpdated.qml
+++ b/tests/auto/qml/qqmllocale/data/timeZoneUpdated.qml
@@ -11,13 +11,32 @@ Item {
         localDate = new Date(2012, 6-1, 1, 2, 15, 30)
         utcDate = new Date(Date.UTC(2012, 6-1, 1, 2, 15, 30))
 
-        if (localDate.getTimezoneOffset() != -600) return
-
-        if (localDate.toLocaleString() != getLocalizedForm('2012-06-01T02:15:30')) return
-        if (localDate.toISOString() != "2012-05-31T16:15:30.000Z") return
-
-        if (utcDate.toISOString() != "2012-06-01T02:15:30.000Z") return
-        if (utcDate.toLocaleString() != getLocalizedForm('2012-06-01T12:15:30')) return
+        if (localDate.getTimezoneOffset() != -600) {
+            console.log("Wrong initial time-zone offset: " + localDate.getTimezoneOffset());
+            return;
+        }
+
+        if (localDate.toLocaleString() != getLocalizedForm('2012-06-01T02:15:30')) {
+            console.log("Wrong localized string for local date-time: "
+                        + localDate.toLocaleString());
+            return;
+        }
+        if (localDate.toISOString() != "2012-05-31T16:15:30.000Z") {
+            console.log("Wrong ISO date string for local date-time: "
+                        + localDate.toISOString());
+            return;
+        }
+
+        if (utcDate.toISOString() != "2012-06-01T02:15:30.000Z") {
+            console.log("Wrong ISO string for UTC date-time: "
+                        + utcDate.toISOString());
+            return;
+        }
+        if (utcDate.toLocaleString() != getLocalizedForm('2012-06-01T12:15:30')) {
+            console.log("Wrong localized string for UTC date-time: "
+                        + utcDate.toLocaleString());
+            return;
+        }
 
         success = true
     }
@@ -28,23 +47,58 @@ Item {
         // We have changed to IST time zone - inform JS:
         Date.timeZoneUpdated()
 
-        if (localDate.getTimezoneOffset() != -330) return
-
-        if (localDate.toLocaleString() != getLocalizedForm('2012-06-01T02:15:30')) return
-        if (localDate.toISOString() != "2012-05-31T20:45:30.000Z") return
-
-        if (utcDate.toISOString() != "2012-06-01T06:45:30.000Z") return
-        if (utcDate.toLocaleString() != getLocalizedForm("2012-06-01T12:15:30")) return
+        if (localDate.getTimezoneOffset() != -330) {
+            console.log("Wrong revised time-zone offset: " + localDate.getTimezoneOffset());
+            return;
+        }
+
+        if (localDate.toLocaleString() != getLocalizedForm('2012-06-01T02:15:30')) {
+            console.log("Wrong localized string for old local date-time: "
+                        + localDate.toLocaleString());
+            return;
+        }
+        if (localDate.toISOString() != "2012-05-31T20:45:30.000Z") {
+            console.log("Wrong ISO date string for old local date-time: "
+                        + localDate.toISOString());
+            return;
+        }
+
+        if (utcDate.toISOString() != "2012-06-01T06:45:30.000Z") {
+            console.log("Wrong ISO string for old UTC date-time: "
+                        + utcDate.toISOString());
+            return;
+        }
+        if (utcDate.toLocaleString() != getLocalizedForm("2012-06-01T12:15:30")) {
+            console.log("Wrong localized string for old UTC date-time: "
+                        + utcDate.toLocaleString());
+            return;
+        }
 
         // Create new dates in this timezone
         localDate = new Date(2012, 6-1, 1, 2, 15, 30)
         utcDate = new Date(Date.UTC(2012, 6-1, 1, 2, 15, 30))
 
-        if (localDate.toLocaleString() != getLocalizedForm("2012-06-01T02:15:30")) return
-        if (localDate.toISOString() != "2012-05-31T20:45:30.000Z") return
-
-        if (utcDate.toISOString() != "2012-06-01T02:15:30.000Z") return
-        if (utcDate.toLocaleString() != getLocalizedForm("2012-06-01T07:45:30")) return
+        if (localDate.toLocaleString() != getLocalizedForm("2012-06-01T02:15:30")) {
+            console.log("Wrong localized string for fresh local date-time: "
+                        + localDate.toLocaleString());
+            return;
+        }
+        if (localDate.toISOString() != "2012-05-31T20:45:30.000Z") {
+            console.log("Wrong ISO date string for fresh local date-time: "
+                        + localDate.toISOString());
+            return;
+        }
+
+        if (utcDate.toISOString() != "2012-06-01T02:15:30.000Z") {
+            console.log("Wrong ISO string for fresh UTC date-time: "
+                        + utcDate.toISOString());
+            return;
+        }
+        if (utcDate.toLocaleString() != getLocalizedForm("2012-06-01T07:45:30")) {
+            console.log("Wrong localized string for fresh UTC date-time: "
+                        + utcDate.toLocaleString());
+            return;
+        }
 
         success = true
     }