Enable TestZoneOffsetParser and FileTimeTest

Fix the issue in TestZoneOffsetParser PiperOrigin-RevId: 595843999
michaelyousrie · Jan 5, 2024 · 5e0f8ba · 5e0f8ba
1 parent 0fe3bc4
commit 5e0f8ba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/...latform/libcore/ojluni/src/test/java/time/test/java/time/format/TestZoneOffsetParser.java b/...latform/libcore/ojluni/src/test/java/time/test/java/time/format/TestZoneOffsetParser.java
@@ -316,7 +316,7 @@ public void test_parse_endStringMatch_EmptyUTC(String pattern, String parse, Zon
     @DataProvider
     public static Object[][] provider_bigOffsets() {
         return new Object[][] {
-            {"+HH", "+59", 59 * 3600},
+            {"+HH", "+19", 19 * 3600},
             {"+HH", "-19", -(19 * 3600)},
 
             {"+HHMM", "+1801", 18 * 3600 + 1 * 60},

diff --git a/jre_emul/test_sources.mk b/jre_emul/test_sources.mk
@@ -260,11 +260,6 @@ MOCKWEBSERVER_SOURCES = \
 
 NATIVE_SOURCES = dalvik_system_JniTest.cpp
 
-# TODO(b/265202484): packages that are commmented need to be moved for Java 11
-# or fixed because of ICU difference between each xcode version.
-# java/nio/file/attribute/FileTimeTest.java \
-# test/java/time/format/TestZoneOffsetParser.java \
-
 # TODO(b/311402728): RSAPrivateKey generation fails, returning invalid object type.
 # tests/security/interfaces/RSAPrivateCrtKeyTest.java \
 
@@ -320,7 +315,7 @@ TEST_SOURCES := \
     com/google/j2objc/security/IosSecureRandomImplTest.java \
     com/google/j2objc/util/NativeTimeZoneTest.java \
     dalvik/system/JniTest.java \
-    libcore/icu/NativeDecimalFormatTest.java \
+    java/nio/file/attribute/FileTimeTest.java \
     jsr166/AbstractExecutorServiceTest.java \
     jsr166/AbstractQueueTest.java \
     jsr166/AbstractQueuedLongSynchronizerTest.java \
@@ -404,6 +399,7 @@ TEST_SOURCES := \
     j2objc/java/util/TreeMapTest.java \
     j2objc/java/util/WeakHashMapTest.java \
     j2objc/java/util/regex/MatcherTest.java \
+    libcore/icu/NativeDecimalFormatTest.java \
     libcore/io/PosixTest.java \
     libcore/java/lang/CharacterTest.java \
     libcore/java/net/URLConnectionTest.java \
@@ -1375,6 +1371,7 @@ TEST_SOURCES := \
     tests/api/java/lang/reflect/ProxyTest.java \
     tests/java/security/AlgorithmParameterGeneratorSpiTest.java \
     tests/java/security/SecureClassLoaderTest.java \
+    test/java/time/format/TestZoneOffsetParser.java \
     tests/security/cert/CRLExceptionTest.java \
     tests/security/cert/CRLTest.java \
     tests/security/cert/CertPathBuilderExceptionTest.java \