From 1fb1f23e6308c029b060d4f930bdee7243bb2694 Mon Sep 17 00:00:00 2001 From: ORDTesters Date: Thu, 22 Nov 2018 16:21:19 -0800 Subject: [PATCH] Fixing flaky tests in DateTest4_indian and DateTest5_iso8601 --- .../alibaba/json/bvt/serializer/date/DateTest4_indian.java | 6 ++++++ .../alibaba/json/bvt/serializer/date/DateTest5_iso8601.java | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/test/java/com/alibaba/json/bvt/serializer/date/DateTest4_indian.java b/src/test/java/com/alibaba/json/bvt/serializer/date/DateTest4_indian.java index caf641cf98..b4844e4737 100644 --- a/src/test/java/com/alibaba/json/bvt/serializer/date/DateTest4_indian.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/date/DateTest4_indian.java @@ -5,8 +5,14 @@ import org.junit.Assert; import java.util.Date; +import java.util.Locale; +import java.util.TimeZone; public class DateTest4_indian extends TestCase { + protected void setUp() throws Exception { + JSON.defaultTimeZone = TimeZone.getTimeZone("Asia/Shanghai"); + JSON.defaultLocale = Locale.CHINA; + } public void test_date() throws Exception { Date date1 = JSON.parseObject("{\"gmtCreate\":\"2018-09-11T21:29:34+0530\"}", VO.class).getGmtCreate(); diff --git a/src/test/java/com/alibaba/json/bvt/serializer/date/DateTest5_iso8601.java b/src/test/java/com/alibaba/json/bvt/serializer/date/DateTest5_iso8601.java index aa9159dc67..1af740a245 100644 --- a/src/test/java/com/alibaba/json/bvt/serializer/date/DateTest5_iso8601.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/date/DateTest5_iso8601.java @@ -4,8 +4,14 @@ import junit.framework.TestCase; import java.util.Date; +import java.util.Locale; +import java.util.TimeZone; public class DateTest5_iso8601 extends TestCase { + protected void setUp() throws Exception { + JSON.defaultTimeZone = TimeZone.getTimeZone("Asia/Shanghai"); + JSON.defaultLocale = Locale.CHINA; + } public void test_date() throws Exception { Date date1 = JSON.parseObject("{\"gmtCreate\":\"2018-09-12\"}", VO.class).getGmtCreate();