Minimal fix for ControlTest (attempt 2)
Make minimal changes to ControlTest to get it passing;
ControlTest is not loaded by the System ClassLoader on
Android so needs to be changed. Now fixed, the test
can be removed from the knownfailures.txt list.
This commit fixes up ControlTest.test_needsReload_LStringLLocaleLStringLClassLoaderResourceBundleJ
with minimal changes. The original intent of the test wasn't
obvious in some places and those lines have been
removed.
Previously the change broke on the ART build bots but also
exited early due to a hardcoded "return". This return has
been removed and replaced with a fail().
Tested for the ART build bots with an approximation of
their vogar commandline:
vogar --toolchain d8 --language CUR --expectations art/tools/libcore_failures.txt \
--classpath out/target/common/obj/JAVA_LIBRARIES/core-tests_intermediates/classes.jar \
--classpath out/target/common/obj/JAVA_LIBRARIES/jsr166-tests_intermediates/classes.jar \
--classpath out/target/common/obj/JAVA_LIBRARIES/mockito-target_intermediates/classes.jar \
org.apache.harmony.tests.java.util.ControlTest
Test: atest CtsLibcoreTestCases
Test: See vogar details above
Bug: 13747957
Bug: 28686280
Change-Id: Ib6c24a6d977a4197350a3db1299c76fa4ac5fbdf
4 files changed