From ddd580d17edccd050c24e535d7065784640357c8 Mon Sep 17 00:00:00 2001 From: FearfulTomcat27 <1471335448@qq.com> Date: Wed, 22 Jan 2025 10:37:57 +0800 Subject: [PATCH] Fix format IT --- .../scalar/IoTDBFormatFunctionTableIT.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBFormatFunctionTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBFormatFunctionTableIT.java index f9018b65d98b..4a4c1414d3f2 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBFormatFunctionTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBFormatFunctionTableIT.java @@ -14,6 +14,7 @@ package org.apache.iotdb.relational.it.query.old.builtinfunction.scalar; +import org.apache.iotdb.db.utils.DateTimeUtils; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; import org.apache.iotdb.itbase.category.TableClusterIT; @@ -22,24 +23,27 @@ import org.junit.AfterClass; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import java.sql.Connection; import java.sql.Statement; +import java.time.LocalDate; +import java.time.ZoneId; +import static java.lang.String.format; import static org.apache.iotdb.db.it.utils.TestUtils.tableAssertTestFail; import static org.apache.iotdb.db.it.utils.TestUtils.tableResultSetEqualTest; -@Ignore @RunWith(IoTDBTestRunner.class) @Category({TableLocalStandaloneIT.class, TableClusterIT.class}) public class IoTDBFormatFunctionTableIT { private static final String DATABASE_NAME = "db"; + private static final ZoneId zoneId = ZoneId.of("Z"); + private static final String[] SQLs = new String[] { // normal cases @@ -152,7 +156,10 @@ public void testTimestampFormat() { tableResultSetEqualTest( "SELECT FORMAT('%tc', s1) FROM timestamp_table", new String[] {"_col0"}, - new String[] {"周四 1月 01 00:00:00 Z 1970,", "周四 1月 01 00:00:00 Z 1970,"}, + new String[] { + format("%tc,", DateTimeUtils.convertToZonedDateTime(10, zoneId)), + format("%tc,", DateTimeUtils.convertToZonedDateTime(20, zoneId)), + }, DATABASE_NAME); } @@ -161,7 +168,10 @@ public void testDateFormat() { tableResultSetEqualTest( "SELECT FORMAT('%1$tA, %1$tB %1$te, %1$tY', s1) FROM date_table", new String[] {"_col0"}, - new String[] {"星期一, 一月 1, 2024,", "星期二, 七月 4, 2006,"}, + new String[] { + format("%1$tA, %1$tB %1$te, %1$tY,", LocalDate.of(2024, 1, 1)), + format("%1$tA, %1$tB %1$te, %1$tY,", LocalDate.of(2006, 7, 4)) + }, DATABASE_NAME); tableResultSetEqualTest(