From 2dacf2e1c4b8e5f3cb31a88b98831686acc6f526 Mon Sep 17 00:00:00 2001
From: okutsu <unknown>
Date: Tue, 30 Aug 2016 14:16:16 +0900
Subject: [PATCH] 8157792: After Integrating tzdata2016d the
 test/sun/util/calendar/zi/TestZoneInfo310.java fails for "Asia/Oral" and
 "Asia/Qyzylorda" Timezones Reviewed-by: peytoia

---
 test/sun/util/calendar/zi/TestZoneInfo310.java | 16 ++++++++--------
 test/sun/util/calendar/zi/Zoneinfo.java        | 13 +++++++++++--
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/test/sun/util/calendar/zi/TestZoneInfo310.java b/test/sun/util/calendar/zi/TestZoneInfo310.java
index f6fc60efa..350464f64 100644
--- a/test/sun/util/calendar/zi/TestZoneInfo310.java
+++ b/test/sun/util/calendar/zi/TestZoneInfo310.java
@@ -22,10 +22,14 @@
  */
 
 /*
- *@test
- *@bug 8007572 8008161
- *@summary Test whether the TimeZone generated from JSR310 tzdb is the same
- *as the one from the tz data from javazic
+ * @test
+ * @bug 8007572 8008161 8157792
+ * @summary Test whether the TimeZone generated from JSR310 tzdb is the same
+ * as the one from the tz data from javazic
+ * @build BackEnd Checksum DayOfWeek Gen GenDoc Main Mappings Month
+ *        Rule RuleDay RuleRec Simple TestZoneInfo310 Time Timezone
+ *        TzIDOldMapping Zone ZoneInfoFile ZoneInfoOld ZoneRec Zoneinfo
+ * @run main TestZoneInfo310
  */
 
 import java.io.File;
@@ -163,10 +167,6 @@ public class TestZoneInfo310 {
         }
 
         for (String zid : zids_new) {
-            if (zid.equals("Asia/Oral") || zid.equals("Asia/Qyzylorda")) {
-                // JDK-8157792 tracking this issue
-                continue;
-            }
             ZoneInfoOld zi = toZoneInfoOld(TimeZone.getTimeZone(zid));
             ZoneInfoOld ziOLD = (ZoneInfoOld)ZoneInfoOld.getTimeZone(zid);
             if (! zi.equalsTo(ziOLD)) {
diff --git a/test/sun/util/calendar/zi/Zoneinfo.java b/test/sun/util/calendar/zi/Zoneinfo.java
index 9e4865518..e58fd188a 100644
--- a/test/sun/util/calendar/zi/Zoneinfo.java
+++ b/test/sun/util/calendar/zi/Zoneinfo.java
@@ -373,6 +373,7 @@ class Zoneinfo {
         tz.getOffsetIndex(zrec.getGmtOffset());
 
         int lastGmtOffsetValue = -1;
+        ZoneRec prevzrec = null;
         int currentSave = 0;
         boolean usedZone;
         for (int zindex = 0; zindex < zone.size(); zindex++) {
@@ -441,6 +442,15 @@ class Zoneinfo {
                                                                      currentSave);
                             if (zrec.hasUntil()) {
                                 if (transition >= zrec.getUntilTime(currentSave)) {
+                                    // If the GMT offset changed from the previous one,
+                                    // record fromTime as a transition.
+                                    if (!fromTimeUsed && prevzrec != null
+                                        && gmtOffset != prevzrec.getGmtOffset()) {
+                                        tz.addTransition(fromTime,
+                                                         tz.getOffsetIndex(gmtOffset+currentSave),
+                                                         tz.getDstOffsetIndex(currentSave));
+                                        fromTimeUsed = true; // for consistency
+                                    }
                                     break year_loop;
                                 }
                             }
@@ -452,8 +462,6 @@ class Zoneinfo {
                                     if (fromTime != minTime) {
                                         int prevsave;
 
-                                        ZoneRec prevzrec = zone.get(zindex - 1);
-
                                         // See if until time in the previous
                                         // ZoneRec is the same thing as the
                                         // local time in the next rule.
@@ -555,6 +563,7 @@ class Zoneinfo {
                 fromYear = zrec.getUntilYear();
                 year = zrec.getUntilYear();
             }
+            prevzrec = zrec;
         }
 
         if (tz.getDSTType() == Timezone.UNDEF_DST) {
-- 
GitLab