| Age | Commit message (Collapse) | Author |
|---|
|
* changes:
Avoid conflict with libcore.java.util.logging.OldLoggerTest
Remove more classes and resources that collide with those in libcore
|
|
If the LoggerTest#testGetLogger_WithParentNormal is run too close in
time to the OldLoggerTest#testGetLogger_WithParent then the second one
will fail. That's because they both use the same name for a logger,
check that logger does not exist before starting and then create the
logger. The only way for the tests to be run successfully is for the
logger that was created to be garbage collected between the runs.
This was detected when investigating another conflict between
logging tests from libcore and external/apache-harmony. The fix is
simply to use a different name for the logger.
Bug: 131738612
Test: atest libcore.java.util.logging \
org.apache.harmony.logging.tests.java.util.logging
Change-Id: I188e77ecd344e1d33b5c3cf65ad7f15bb87e067c
|
|
Bug: 131738612
Test: atest CtsLibcoreTestCases
Change-Id: I6d19c73447833ac1e679d623ed3c8efcbac16e5f
|
|
|
|
The atest tool cannot be used to run individual test classes if those
classes have been repackaged using jarjar. Attempting to use the
repackaged name will prevent atest from finding it, whereas using the
source name will result in a runtime message something like this:
RUNNER ERROR: Runner reported an invalid method 'null' (...#null).
Something went wrong, Skipping its reporting.
The apache harmony tests were repackaged from org.apache to
com.android.org.apache in order to avoid name collisions with test
classes in libcore. Since the change to use jarjar was made
(in I3020380c42b718bec95c91ecd4a5d29649e3a547) the duplicates have
been removed so there is no longer any need to use jarjar here.
As jarjar does not repackage resources and the tests relied on the
resources being in the same package as the test code they were
previously moved from resources/org/apache/ to
resources/com/android/org/apache/ in the following changes:
* I4a14ddc924fa265e2c302590ca76fa01f6147233
* I37fef5acedbb8b9cb9fec8fa39e7c5d8ab641f5a
* Id62ea43d7a8ee276cf2f82916a3711028b36a349
This change stops jarjar-ing and moves the resources back where
they came from.
Not only do all the tests pass, but it runs the exact same number of
tests after this change as it did before this change.
Bug: 131738612
Test: atest CtsLibcoreTestCases
Change-Id: I2b7c24e25998b8d20b3f1bc82a786b07a9456746
|
|
|
|
|
|
The removed files are duplicates of files that are part of the
core-tests-support module. Many are identical, some are different.
It is safe to remove these files as they are never used at runtime.
Bug: 131738612
Test: atest CtsLibcoreTestCases
Change-Id: I1aae9e20c592aacc4da1710b8711306436d20805
|
|
There are a number of tests that are broken due to missing methods in
some support classes at runtime. The tests build against the version
of the support class in this project which has the methods but they are
run against the version of the class from libcore which does not have
the methods.
This change removes the tests. It has no impact on our coverage as the
tests were not being run. It is needed to allow the duplicate classes
to be removed without breaking the build.
The Support_AvailTest class was removed as it was only used by
SystemProcessTest.
Bug: 131738612
Test: atest CtsLibcoreTestCases
Change-Id: I085db08daabc916d88f1466832269fc614eb7c5f
|
|
Change-Id: I62d74b59eee4faecafa881888e84b4e81e49fbc2
|
|
am: 867fa7c988
Change-Id: Icce7f5adb236b18265e1a72fe09a34f0c0b7a1df
|
|
|
|
The tests need access to implementation details
so must be explicitly set to use impl jars before we switch to
compiling against stubs by default.
Bug: 113148576
Test: build
Change-Id: I487c4fa19170379e9dd33595a41dcdc5b74cf49d
|
|
am: 90a57cb7ce
Change-Id: I976c5a82881a66c5c91eca199252e97ca48aeeaa
|
|
|
|
am: cf796a81c6
Change-Id: I158e35cf9e4ca878af096e8fc62760baec87cfe0
|
|
|
|
Collapse a test package level to aid in display aggregation.
This CL leaves redefinition classes alone as the redefined classes
are hardcoded.
Bug: 116674705
Test: mmma external/apache-harmony/jdwp
Test: m apache-harmony-jdwp-tests-hostdex vogar && art/tools/run-jdwp-tests.sh --mode=host
Test: mmma external/apache-harmony/jdwp && m vogar && art/tools/run-jdwp-tests.sh --mode=jvm
Change-Id: I63179c64d73aa4938ac237372265476f835a57c4
|
|
Bug: 116674705
Test: atest CtsJdwpTestCases
Change-Id: Icc1da57f5c21fb8cf0dbdedf9066aba1d42f9302
|
|
am: f11546bd10
Change-Id: I9d1d89bbeeaed64e2bf28b15c5e2be7ceb270354
|
|
|
|
am: 7350b0ca55
Change-Id: Iffcc21453a1ab39136acf5d7acdba55d65d37b39
|
|
|
|
This reverts commit 76b5e70d2d363618427747bb073a368ffb55687b.
Include the prepackaged harmony class file. There are no longer reasons
for embedding dex files as base64.
Partially reverts commit db3fb7d72b025d0c8d4922f8c24abdff0999274f.
Bug: 116674705
Test: mmma external/apache-harmony/jdwp
Test: m apache-harmony-jdwp-tests-hostdex vogar && art/tools/run-jdwp-tests.sh --mode=host
Change-Id: Iff70a513bc13b137948b2d9e0442c5128501c822
|
|
Bug: 116674705
Test: m
Change-Id: I6c3079266da5b650e3dbbc02cb01cc3f03afc1b2
|
|
am: 8ca08f5cac
Change-Id: I51bc78dbbee7496a76d9eba5479869e1f07d6395
|
|
|
|
This reverts commit 6c0ea5e6e8c042dce3a7ac529354d18fedc3f894.
Reason for revert: breaks on restricted manifests
Bug: 116674705
Change-Id: I71d501dccc17aae6be4523695a66309240076d69
|
|
am: 750ddd1393
Change-Id: I694421583f0c2a4e1438cdfbb83d436e87592cd0
|
|
|
|
am: 6e703103f7
Change-Id: I5dc2e3beda370fe311179fd9c00f672065724d15
|
|
|
|
Include the prepackaged harmony class file. There are no longer reasons
for embedding dex files as base64.
Partially reverts commit db3fb7d72b025d0c8d4922f8c24abdff0999274f.
Bug: 116674705
Test: mmma external/apache-harmony/jdwp
Test: m apache-harmony-jdwp-tests-hostdex vogar && art/tools/run-jdwp-tests.sh --mode=host
Change-Id: I2ae775b1799f9f2e51de277fb9a660167c117ebd
|
|
Remove string signatures in favor of the already existing helper
functions.
Bug: 116674705
Test: mmma external/apache-harmony/jdwp
Test: m apache-harmony-jdwp-tests-hostdex vogar && art/tools/run-jdwp-tests.sh --mode=host
Change-Id: I0b54b83ebb1793a93418aa682dd136c88864cdd5
|
|
am: 608d74c61d
Change-Id: Ic48ecc03e568acff3f5535c268a2f075cd6378d5
|
|
|
|
Bug: 116674705
Test: m
Change-Id: Ib38b81012b977161dfbf4673badc5087db5f2ae3
|
|
am: 31510aa689
Change-Id: Idfa4f60ae08c73af6ec6145388d0db6f103d4eb1
|
|
|
|
apache-harmony-jdwp-tests was previously also built as
apache-harmony-jdwp-tests-hostdex, which is has slightly different
behavior in the build system and defaults to only compiling against
the libcore libraries and not against framework.jar.
apache-harmony-jdwp-tests-hostdex is now an alias for
apache-harmony-jdwp-tests, which breaks builds that don't have
framework.jar in the manifest. Add no_framework_libs: true,
since the module can clearly compile against only the libcore
libraries.
Test: m checkbuild
Change-Id: Ib0a7959f810fb60cc725ec7e7bcf261b79bb6106
|
|
am: 41e65bc9a8
Change-Id: Ib8497fe2cb20dd55ec51f5e350575d5b9313d674
|
|
|
|
See build/soong/README.md for more information.
Test: mmma external/apache-harmony
Change-Id: Ia688beb8f757b20c6644ec18ffedce977435af49
|
|
am: 5992da371e
Change-Id: I1e358f0bf7d1c77f06ef13fd593a1193400c4cf0
|
|
am: 20bf67fa69
Change-Id: Ic664d8abace84576f4fbc2cf889fe68dc9d9db33
|
|
|
|
Bug: 73499927
Test: m javac-check RUN_ERROR_PRONE=true
Change-Id: Ied7e70cc30cdf47b3b2ee4d6ede1fb828cff8d96
|
|
am: 2c402d7f8c
Change-Id: I2af158853a5adf812e2bef2efaef1f121a7d778b
|
|
am: c7b2514d47
Change-Id: I595c6257f69eef538508b230cf0f2f89f11015e8
|
|
|
