From e7dc68f18f339a9f8a7c4c4761dec828cdfa48dc Mon Sep 17 00:00:00 2001 From: nick Date: Thu, 2 Nov 2023 12:21:37 +0200 Subject: [PATCH 1/4] tbDate:fix bug now --- .../main/java/org/thingsboard/script/api/tbel/TbDate.java | 5 ++++- .../java/org/thingsboard/script/api/tbel/TbDateTest.java | 8 +++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbDate.java b/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbDate.java index ce43f8caf4..dbd388e9c0 100644 --- a/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbDate.java +++ b/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbDate.java @@ -218,9 +218,12 @@ public class TbDate implements Serializable, Cloneable { return opt; } - public long now() { + public static long now() { return Instant.now().toEpochMilli(); } + public static String nowToString() { + return Instant.now().toString(); + } public long parseSecond() { return instant.getEpochSecond(); 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 afc82eaad9..3e71e9ba96 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 @@ -29,7 +29,6 @@ import org.thingsboard.common.util.JacksonUtil; import java.time.DateTimeException; import java.time.ZoneId; -import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; import java.util.Locale; @@ -40,6 +39,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; @@ -484,6 +484,12 @@ class TbDateTest { Assert.assertEquals(expected, d.toLocaleString()); } + @Test + public void TestNow() { + assertTrue(TbDate.now() > 0); + assertNotNull(TbDate.nowToString()); + } + @Test public void TestToUTC() { Assert.assertEquals(-2209075200000L, TbDate.UTC(0)); From e4277cd79c974e9ef107905a286da3cb4a1e1725 Mon Sep 17 00:00:00 2001 From: nick Date: Thu, 2 Nov 2023 16:13:46 +0200 Subject: [PATCH 2/4] tbDate:fix bug now comments 1 --- .../main/java/org/thingsboard/script/api/tbel/TbDate.java | 4 ---- .../java/org/thingsboard/script/api/tbel/TbDateTest.java | 6 ------ 2 files changed, 10 deletions(-) diff --git a/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbDate.java b/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbDate.java index dbd388e9c0..71ee73de30 100644 --- a/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbDate.java +++ b/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbDate.java @@ -221,10 +221,6 @@ public class TbDate implements Serializable, Cloneable { public static long now() { return Instant.now().toEpochMilli(); } - public static String nowToString() { - return Instant.now().toString(); - } - public long parseSecond() { return instant.getEpochSecond(); } 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 3e71e9ba96..5076d1940b 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 @@ -484,12 +484,6 @@ class TbDateTest { Assert.assertEquals(expected, d.toLocaleString()); } - @Test - public void TestNow() { - assertTrue(TbDate.now() > 0); - assertNotNull(TbDate.nowToString()); - } - @Test public void TestToUTC() { Assert.assertEquals(-2209075200000L, TbDate.UTC(0)); From 3eed08e5c867c150d4609c56833d8ecf4c51f752 Mon Sep 17 00:00:00 2001 From: nick Date: Thu, 2 Nov 2023 16:17:31 +0200 Subject: [PATCH 3/4] tbDate:fix bug now comments 2 --- .../test/java/org/thingsboard/script/api/tbel/TbDateTest.java | 1 - 1 file changed, 1 deletion(-) 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 5076d1940b..3ec00acfe2 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 @@ -39,7 +39,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; From 83039ccedfc2624cecdff2a8e15b39ddc3eda9a8 Mon Sep 17 00:00:00 2001 From: nick Date: Thu, 2 Nov 2023 16:36:15 +0200 Subject: [PATCH 4/4] tbDate:fix bug now comments 2 --- .../java/org/thingsboard/script/api/tbel/TbDateTest.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 3ec00acfe2..ea951d8a51 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 @@ -21,6 +21,8 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import lombok.extern.slf4j.Slf4j; +import org.assertj.core.api.Assertions; +import org.assertj.core.data.Offset; import org.junit.Assert; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; @@ -28,6 +30,7 @@ import org.mvel2.ConversionException; import org.thingsboard.common.util.JacksonUtil; import java.time.DateTimeException; +import java.time.Instant; import java.time.ZoneId; import java.util.ArrayList; import java.util.List; @@ -763,6 +766,11 @@ class TbDateTest { Assert.assertEquals("22:15:30 Eastern Standard Time", d1.toTimeString("UTC", "America/New_York")); } + @Test + public void testNow() { + Assertions.assertThat(TbDate.now()).isCloseTo(Instant.now().toEpochMilli(), Offset.offset(1000L)); + } + private void testResultChangeDateTime(TbDate d) { int localOffset = ZoneId.systemDefault().getRules().getOffset(d.getInstant()).getTotalSeconds(); TbDateTestEntity tbDateTestEntity = new TbDateTestEntity(d.getFullYear(), d.getMonth(), d.getDate(), (d.getHours() - (localOffset/60/60)));