Merge "Snap for 6718074 from 7c2d068af6e48e4180d36c65b76c4d36868eae13 to oreo-mr1-vts-release" into oreo-mr1-vts-release
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TimeZoneTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TimeZoneTest.java
index 0d16786..b98f230 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TimeZoneTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TimeZoneTest.java
@@ -232,11 +232,10 @@
// Any one of these might legitimately change its raw offset, though that's
// fairly unlikely, and the chances of more than one changing are very slim.
- assertTrue(ids.toString(), ids.contains("America/Dawson"));
assertTrue(ids.toString(), ids.contains("America/Tijuana"));
+ assertTrue(ids.toString(), ids.contains("America/Ensenada")); // Alias for America/Tijuana
assertTrue(ids.toString(), ids.contains("America/Vancouver"));
- assertTrue(ids.toString(), ids.contains("Canada/Pacific"));
- assertTrue(ids.toString(), ids.contains("Canada/Yukon"));
+ assertTrue(ids.toString(), ids.contains("Canada/Pacific")); // Alias for America/Vancouver
assertTrue(ids.toString(), ids.contains("Pacific/Pitcairn"));
}
diff --git a/ojluni/src/test/java/time/test/java/util/TestFormatter.java b/ojluni/src/test/java/time/test/java/util/TestFormatter.java
index 71d12f4..7b405ca 100644
--- a/ojluni/src/test/java/time/test/java/util/TestFormatter.java
+++ b/ojluni/src/test/java/time/test/java/util/TestFormatter.java
@@ -211,8 +211,8 @@
private String toZoneOffsetStr(String expected) {
// Android-changed: Android Matcher doesn't support named groups. Also GMT/Z is formatted as
- // "GMT+00:00".
- return expected.replaceAll("GMT(?:\\+00:00)|UTC|UT", "Z")
+ // "GMT+00:00" or "GMT".
+ return expected.replaceAll("GMT(?:\\+00:00)?(?=])|UTC|UT", "Z")
.replaceAll("(?:GMT|UTC)([+\\-]?[0-9]{2}:[0-9]{2})", "$1");
}
