Fix tests.

RumbleDB · Jul 7, 2023 · f46ce37 · f46ce37
1 parent 52def99
commit f46ce37
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 5 deletions.
diff --git a/src/main/java/org/rumbledb/items/DateItem.java b/src/main/java/org/rumbledb/items/DateItem.java
@@ -26,6 +26,10 @@ public DateItem() {
         super();
         this.value = value;
         this.hasTimeZone = hasTimeZone;
+        if (!hasTimeZone) {
+            this.value = this.value.withZoneRetainFields(DateTimeZone.UTC);
+        }
+
     }
 
     DateItem(String dateTimeString) {

diff --git a/src/main/java/org/rumbledb/items/DateTimeItem.java b/src/main/java/org/rumbledb/items/DateTimeItem.java
@@ -70,6 +70,10 @@ public DateTimeItem() {
         super();
         this.value = value;
         this.hasTimeZone = hasTimeZone;
+        if (!hasTimeZone) {
+            this.value = this.value.withZoneRetainFields(DateTimeZone.UTC);
+        }
+
     }
 
     DateTimeItem(String dateTimeString) {

diff --git a/src/main/java/org/rumbledb/items/TimeItem.java b/src/main/java/org/rumbledb/items/TimeItem.java
@@ -27,6 +27,9 @@ public TimeItem() {
         super();
         this.value = value;
         this.hasTimeZone = hasTimeZone;
+        if (!hasTimeZone) {
+            this.value = this.value.withZoneRetainFields(DateTimeZone.UTC);
+        }
     }
 
     TimeItem(String dateTimeString) {
@@ -87,12 +90,24 @@ public int hashCode() {
 
     @Override
     public String getStringValue() {
-        String value = this.value.toString();
-        String zoneString = this.value.getZone() == DateTimeZone.UTC ? "Z" : value.substring(value.length() - 6);
-        value = value.substring(0, value.length() - zoneString.length());
+        String originalValue = this.value.toString();
+        if (!hasTimeZone()) {
+            String value = originalValue.substring(0, originalValue.length() - 1);
+            value = this.value.getMillisOfSecond() == 0 ? value.substring(0, value.length() - 4) : value;
+            value = value.substring(value.indexOf("T") + 1);;
+            return value;
+        }
+        if (this.value.getZone() == DateTimeZone.UTC) {
+            String value = originalValue.substring(0, originalValue.length() - 1);
+            value = this.value.getMillisOfSecond() == 0 ? value.substring(0, value.length() - 4) : value;
+            value = value.substring(value.indexOf("T") + 1);;
+            return value + "Z";
+        }
+        String zoneString = originalValue.substring(originalValue.length() - 6);
+        String value = originalValue.substring(0, originalValue.length() - 6);
         value = this.value.getMillisOfSecond() == 0 ? value.substring(0, value.length() - 4) : value;
-        int dateTimeSeparatorIndex = value.indexOf("T");
-        return value.substring(dateTimeSeparatorIndex + 1) + (this.hasTimeZone ? zoneString : "");
+        value = value.substring(value.indexOf("T") + 1);;
+        return value + zoneString;
     }
 
     @Override