diff --git a/common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbDateTest.java b/common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbDateTest.java index 2c8c07fb26..120a776c1a 100644 --- a/common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbDateTest.java +++ b/common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbDateTest.java @@ -360,19 +360,11 @@ class TbDateTest { stringDateTZ = "2023-08-06T04:04:05.123"; d = new TbDate(stringDateTZ); Assert.assertEquals("2023-08-06 04:04:05", d.toLocaleString()); - // With pattern + locale - ok - String pattern = "hh:mm:ss a, EEE M/d/uuuu"; - stringDateTZ = "09:15:30 nachm., So. 10/09/2022"; - d = new TbDate(stringDateTZ, pattern, "de"); - Assert.assertEquals("2022-10-09 21:15:30", d.toLocaleString()); - String stringDateRFC_1123 = "Sat, 3 Jun 2023 11:05:30 GMT"; + // With TZ RFC_1123 + String stringDateRFC_1123 = "Sat, 3 Jun 2023 11:05:30 GMT"; d = new TbDate(stringDateRFC_1123); Assert.assertEquals("2023-06-03T11:05:30Z", d.toISOString()); - // without TZ - stringDateRFC_1123 = "Sat, 3 Jun 2023 11:05:30"; - d = new TbDate(stringDateRFC_1123); - Assert.assertEquals("2023-06-03 11:05:30", d.toLocaleString()); stringDateRFC_1123 = "Sat, 3 Jun 2023 01:04:05 +043056"; d = new TbDate(stringDateRFC_1123); Assert.assertEquals("2023-06-02T20:33:09Z", d.toISOString()); @@ -382,7 +374,16 @@ class TbDateTest { stringDateRFC_1123 = "Thu, 29 Feb 2024 11:05:30 -03"; d = new TbDate(stringDateRFC_1123); Assert.assertEquals("2024-02-29T14:05:30Z", d.toISOString()); + // Without TZ RFC_1123 + stringDateRFC_1123 = "Sat, 3 Jun 2023 11:05:30"; + d = new TbDate(stringDateRFC_1123); + Assert.assertEquals("2023-06-03 11:05:30", d.toLocaleString()); + // With pattern + locale - ok + String pattern = "hh:mm:ss a, EEE M/d/uuuu"; + stringDateRFC_1123 = "09:15:30 nachm., So. 10/09/2022"; + d = new TbDate(stringDateRFC_1123 , pattern, "de"); + Assert.assertEquals("2022-10-09 21:15:30", d.toLocaleString()); // failed TZ String expectedMessage = "Cannot parse value"; @@ -403,7 +404,7 @@ class TbDateTest { new TbDate(finalStringDateZ_error2); }); assertTrue(actual.getMessage().contains(expectedMessage)); - // The locale does not match the pattern + // The locale does not match the pattern RFC_1123 String finalStringDateZ_error3= "02:15:30 PM, Sun 10/09/2022"; pattern = "hh:mm:ss a, EEE M/d/uuuu"; String finalPattern = pattern; @@ -412,13 +413,14 @@ class TbDateTest { }); assertTrue(actual.getMessage().contains(expectedMessage)); - // failed DayOfWeek + // failed DayOfWeek RFC_1123 String stringDateRFC_1123_error = "Tue, 3 Jun 2023 11:05:30 GMT"; actual = assertThrows(ConversionException.class, () -> { new TbDate(stringDateRFC_1123_error); }); assertTrue(actual.getMessage().contains(expectedMessage)); } + @Test void TestParse () { String stringDateStart = "1970-01-01T00:00:00Z";