handle test error

baomingyu · Mar 11, 2024 · 774caa7 · 774caa7
1 parent b4fc462
commit 774caa7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/...-json/src/test/java/org/apache/inlong/sort/formats/json/FieldToRowDataConvertersTest.java b/...-json/src/test/java/org/apache/inlong/sort/formats/json/FieldToRowDataConvertersTest.java
@@ -36,6 +36,7 @@
 import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.TimeZone;
 import java.util.concurrent.ThreadLocalRandom;
 
 import static org.apache.flink.table.api.DataTypes.ARRAY;
@@ -126,10 +127,11 @@ public void testConvertToTimestamp() throws IOException {
 
  @Test
  public void testConvertToTimestampWithLocalZone() throws IOException {
+ TimeZone.setDefault(TimeZone.getDefault().getTimeZone("GMT+0"));
  FieldToRowDataConverter converter =
  converters.createConverter(TIMESTAMP_WITH_LOCAL_TIME_ZONE().getLogicalType());
  TimestampData expected = TimestampData.fromTimestamp(new Timestamp(0));
- assertEquals(expected, converter.convert("1970-01-01 08:00:00Z"));
+ assertEquals(expected, converter.convert("1970-01-01 00:00:00Z"));
  }
 
  @Test

diff --git a/...data-json/src/test/java/org/apache/inlong/sort/formats/json/JsonRowDataSerDeTestBase.java b/...data-json/src/test/java/org/apache/inlong/sort/formats/json/JsonRowDataSerDeTestBase.java
@@ -35,6 +35,7 @@
 import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.TimeZone;
 import java.util.concurrent.ThreadLocalRandom;
 
 import static org.apache.flink.table.api.DataTypes.ARRAY;
@@ -68,6 +69,7 @@ public abstract class JsonRowDataSerDeTestBase {
 
  @Before
  public void init() {
+ TimeZone.setDefault(TimeZone.getDefault().getTimeZone("GMT+0"));
  byte[] bytes = new byte[10];
  ThreadLocalRandom.current().nextBytes(bytes);
  String base64Str = Base64.getEncoder().encodeToString(bytes);
@@ -119,7 +121,7 @@ public void init() {
  + " \"time\":\"00:00:01\",\n"
  + " \"timestamp3\":\"1970-01-01T00:00:01.123\",\n"
  + " \"timestamp9\":\"1970-01-01T00:00:01.123456789\",\n"
- + " \"timestampWithLocalZone\":\"1970-01-01T08:00:01.123Z\",\n"
+ + " \"timestampWithLocalZone\":\"1970-01-01T00:00:01.123Z\",\n"
  + " \"map\":{\n"
  + " \"element\":123\n"
  + " },\n"

diff --git a/...src/test/java/org/apache/inlong/sort/formats/json/JsonRowDataSerializationSchemaTest.java b/...src/test/java/org/apache/inlong/sort/formats/json/JsonRowDataSerializationSchemaTest.java
@@ -25,8 +25,6 @@
 import org.junit.rules.ExpectedException;
 
 import java.io.IOException;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
 
 import static org.apache.inlong.sort.formats.base.TextFormatOptions.CHARSET;
 import static org.apache.inlong.sort.formats.base.TextFormatOptionsUtil.ISO_8601;
@@ -46,11 +44,6 @@ public class JsonRowDataSerializationSchemaTest extends JsonRowDataSerDeTestBase
 
  @Test
  public void testSerialize() throws IOException {
- ZoneId zoneId = ZoneId.ofOffset("UTC", ZoneOffset.of("+8"));
- System.out.println(zoneId);
-
- ZoneId defaultZone = ZoneId.systemDefault();
- System.out.println(defaultZone);
  JsonRowDataSerializationSchema.Builder serBuilder = JsonRowDataSerializationSchema.builder(rowType);
  JsonRowDataSerializationSchema serializationSchema = serBuilder.setCharset(CHARSET.defaultValue())
  .setTimestampFormat(ISO_8601)

diff --git a/...-json/src/test/java/org/apache/inlong/sort/formats/json/RowDataToFieldConvertersTest.java b/...-json/src/test/java/org/apache/inlong/sort/formats/json/RowDataToFieldConvertersTest.java
@@ -35,6 +35,7 @@
 import java.sql.Timestamp;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.TimeZone;
 import java.util.concurrent.ThreadLocalRandom;
 
 import static org.apache.flink.table.api.DataTypes.ARRAY;
@@ -125,12 +126,12 @@ public void testConvertTimestamp() {
 
  @Test
  public void testConvertTimestampWithLocalZone() {
+ TimeZone.setDefault(TimeZone.getDefault().getTimeZone("GMT+0"));
  RowDataToFieldConverter converter =
  converters.createConverter(TIMESTAMP_WITH_LOCAL_TIME_ZONE().getLogicalType());
  TimestampData testTimestampData = TimestampData.fromTimestamp(new Timestamp(0));
  // assertEquals("1970-01-01 00:00:00Z", converter.convert(testTimestampData));
- assertTrue("1970-01-01 00:00:00Z".equals(converter.convert(testTimestampData))
- || "1970-01-01 08:00:00Z".equals(converter.convert(testTimestampData)));
+ assertTrue("1970-01-01 00:00:00Z".equals(converter.convert(testTimestampData)));
  }
 
  @Test