dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tbel fix_bug tbDate test

Browse Source
This commit is contained in:
nick 2023-12-07 15:05:45 +02:00
parent 272cc27257
commit a12c9e11f8
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbDateTest.java
View File

@ -360,19 +360,11 @@ class TbDateTest {
stringDateTZ = "2023-08-06T04:04:05.123"; stringDateTZ = "2023-08-06T04:04:05.123";
d = new TbDate(stringDateTZ); d = new TbDate(stringDateTZ);
Assert.assertEquals("2023-08-06 04:04:05", d.toLocaleString()); 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());
// With TZ RFC_1123
String stringDateRFC_1123 = "Sat, 3 Jun 2023 11:05:30 GMT"; String stringDateRFC_1123 = "Sat, 3 Jun 2023 11:05:30 GMT";
d = new TbDate(stringDateRFC_1123); d = new TbDate(stringDateRFC_1123);
Assert.assertEquals("2023-06-03T11:05:30Z", d.toISOString()); 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"; stringDateRFC_1123 = "Sat, 3 Jun 2023 01:04:05 +043056";
d = new TbDate(stringDateRFC_1123); d = new TbDate(stringDateRFC_1123);
Assert.assertEquals("2023-06-02T20:33:09Z", d.toISOString()); 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"; stringDateRFC_1123 = "Thu, 29 Feb 2024 11:05:30 -03";
d = new TbDate(stringDateRFC_1123); d = new TbDate(stringDateRFC_1123);
Assert.assertEquals("2024-02-29T14:05:30Z", d.toISOString()); 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 // failed TZ
String expectedMessage = "Cannot parse value"; String expectedMessage = "Cannot parse value";
@ -403,7 +404,7 @@ class TbDateTest {
new TbDate(finalStringDateZ_error2); new TbDate(finalStringDateZ_error2);
}); });
assertTrue(actual.getMessage().contains(expectedMessage)); 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"; String finalStringDateZ_error3= "02:15:30 PM, Sun 10/09/2022";
pattern = "hh:mm:ss a, EEE M/d/uuuu"; pattern = "hh:mm:ss a, EEE M/d/uuuu";
String finalPattern = pattern; String finalPattern = pattern;
@ -412,13 +413,14 @@ class TbDateTest {
}); });
assertTrue(actual.getMessage().contains(expectedMessage)); assertTrue(actual.getMessage().contains(expectedMessage));
// failed DayOfWeek // failed DayOfWeek RFC_1123
String stringDateRFC_1123_error = "Tue, 3 Jun 2023 11:05:30 GMT"; String stringDateRFC_1123_error = "Tue, 3 Jun 2023 11:05:30 GMT";
actual = assertThrows(ConversionException.class, () -> { actual = assertThrows(ConversionException.class, () -> {
new TbDate(stringDateRFC_1123_error); new TbDate(stringDateRFC_1123_error);
}); });
assertTrue(actual.getMessage().contains(expectedMessage)); assertTrue(actual.getMessage().contains(expectedMessage));
} }
@Test @Test
void TestParse () { void TestParse () {
String stringDateStart = "1970-01-01T00:00:00Z"; String stringDateStart = "1970-01-01T00:00:00Z";