diff options
| author | Joachim Sauer <jsauer@google.com> | 2017-11-17 15:32:36 +0000 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2020-05-14 09:10:23 +0000 |
| commit | eb86fbe1851d49f015ff0117e5d0ef99985efd46 (patch) | |
| tree | 6ba0b929036323281ef539ffd14ea7b221566ddd | |
| parent | b90a406ee3e66591e55a94916e32c6b79d582279 (diff) | |
| download | libcore-eb86fbe1851d49f015ff0117e5d0ef99985efd46.tar.gz | |
Fix TestFormatter test for 2020a update [O CTS]
This is a cherry-pick of the change below to make the
CtsLibcoreOjTestCases pass on the dev branch.
Bug: 155407785
====
Revert accidental change in test.
I accidentally reverted a change in TestFormatter to TestFormatter.java
in commit If50d927265136e8de964b54ae879291c7be85cfc.
Since the original change was unrelated to DecimalFormat, reverting it
was not supposed to happen in that commit.
The issue was not caught because CtsLibcoreOjTestCases wasn't run for
that test (only CtsLibcoreTestCases).
Bug: 69418703
Test: CtsLibcoreOjTestCases
Merged-In: If6a2dbb615a70739350cbae91cc33754afe2b793
Change-Id: If6a2dbb615a70739350cbae91cc33754afe2b793
(cherry picked from commit 044bd5e685b4bd9302ace9f77b7339cbe7e6f893)
(cherry picked from commit 9ff289f94f48d6b47df1c2ca91b8459ccb03b6b4)
(cherry picked from commit c96aa89371320041d38ca4e5ae628939b89079a7)
(cherry picked from commit 42dacd0e5c7434ebffdc74ef82e6838338ca4761)
| -rw-r--r-- | ojluni/src/test/java/time/test/java/util/TestFormatter.java | 4 |
1 files changed, 2 insertions, 2 deletions
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 71d12f4559f..7b405ca5cc5 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 @@ public class TestFormatter { 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"); } |