History log of /cts/tools/utils/CollectAllTests.java
Revision Date Author Comments
11606153e749f6ea1e60ac5f52557271c8b81aaa 08-Sep-2015 Neil Fuller <nfuller@google.com> Ignore inner classes when looking for tests

An upcoming change adds a dependency on Mockito in libcore.
CollectAllTests loads all classes found in a jar file.
In order to resolve method parameters the CollectAllTests
tool needs to have all classes referenced in method signatures,
fields, superclasses, etc. on the classpath.
Mockito requires the creation of inner classes for some APIs.

Rather than add Mockito to the classpath, this change causes
CollectAllTests to ignore inner classes.

Change-Id: I0ef436d46eb1afa4994f73d8a24ce602bf36512d
92423df543c8e11070c57585a6450e7f4e9a1a42 08-Jul-2015 Stuart Scott <stuartscott@google.com> Revert "Revert "Moving to common compatibility utils.""

This reverts commit 992b459293c4dcae2a12cdf5923e3e26a476bd1a.

This change includes the fix which caused the build breakage which
caused the revert this is reverting.

bug: 21762834
Change-Id: I1df495ba219208b07a7d7c8ac99d2890052caf69
992b459293c4dcae2a12cdf5923e3e26a476bd1a 08-Jul-2015 Ian Pedowitz <ijpedowitz@google.com> Revert "Moving to common compatibility utils."

This reverts commit b054026b4d0347f958de7c4b3eaa6a52ff3d20cd.

Master is red, fixing the build by reverting all CL's merged from
b/21762834 today.

Bug: 21762834

Change-Id: Ibe31d8b615e55387ebbbd953f793f491ee30a2e8
b054026b4d0347f958de7c4b3eaa6a52ff3d20cd 06-Jul-2015 Stuart Scott <stuartscott@google.com> Moving to common compatibility utils.

bug:21762834
Change-Id: Ie0bf75bb1621308118633f41e063df40b529478d
d16b864e9537e172436bfb8a5de76e9e49fcea35 19-Jun-2015 Brian Carlstrom <bdc@google.com> Add support for "large" tagged tests to have non-default timeout

Bug: 19657861
Change-Id: Ieba63fa36a139629572eb8b288771b48980d2ef6
cd96278be2a99ddc58629302a18913178af385e0 01-Jun-2015 Narayan Kamath <narayan@google.com> Remove duplicate CTS tests from libcore cts packages.

The catch all "org" package was catching several thousand
org.apache.harmony.tests.* tests that are already covered by
other packages.

This change implements in CollectAllTests to handle multiple
prefixes being in passed in (separated by ':'s). This helps us
avoid creating a separate test APK for each java package.

bug: 20862863

(cherry picked from commit 77e47ecd4a43bd4421dfd232a8ea452cf0b6ac96)

Change-Id: I0a04248ea50f97b0574655102d3f82a7a1342690
e160f380c3633081add08f73e427113c9010ab97 01-Jun-2015 Narayan Kamath <narayan@google.com> Remove duplicate CTS tests from libcore cts packages.

The catch all "org" package was catching several thousand
org.apache.harmony.tests.* tests that are already covered by
other packages.

This change implements in CollectAllTests to handle multiple
prefixes being in passed in (separated by ':'s). This helps us
avoid creating a separate test APK for each java package.

bug: 20862863

(cherry picked from commit 77e47ecd4a43bd4421dfd232a8ea452cf0b6ac96)

Change-Id: If519b2e53ed5b840c80e20f4732068393ce86a38
77e47ecd4a43bd4421dfd232a8ea452cf0b6ac96 01-Jun-2015 Narayan Kamath <narayan@google.com> Remove duplicate CTS tests from libcore cts packages.

The catch all "org" package was catching several thousand
org.apache.harmony.tests.* tests that are already covered by
other packages.

This change implements in CollectAllTests to handle multiple
prefixes being in passed in (separated by ':'s). This helps us
avoid creating a separate test APK for each java package.

bug: 20862863
Change-Id: I44348052d20312d478bdbf6df0e561db63e18cd8
01c2b49b71b753c9dec109ba2419e5ae5d677ce0 09-Oct-2014 Stuart Scott <stuartscott@google.com> Add abi to generated XML

bug:17881028
Change-Id: Ib44fe2440535e03cf5a5a23a94f33d3bd715a2f9
b5b47cba2f924bdb5951c707ca00fa809d86af32 28-Feb-2013 Kenny Root <kroot@google.com> Add JUnit4 support to CTS

The old test tools only worked with JUnit3 tests, but this
allows both 3.x and 4.x.

Addition note:
This change is a port of Kenny Root's pending change
I5a481d0cf9a4d207eaa6ad1058529004a2bbf039 from AOSP/master.
With the changes made by Brett Chabot in internal to migrate the
test runner to one that supports JUnit4 it is simpler to apply
this change internally.

Issues with the patch have been fixed:
- it would not recognize a class that entirely relied on a
base-class for tests as a JUnit4 test. Changed usages of
getDeclaredMethods() to getMethods().
- It was accepting @RunWith tests, though cts-tradefed does not
currently deal with those.

This is the final step to have basic JUnit4 support in CTS tests.

Motivation: This is to enable the external okhttp tests to run
under CTS (as a follow-up change). Those tests are all Junit4.

Change-Id: Ia013a3386b978d6787cdec98c2086af880e679a9
a6ea2481f93a3e703de11bb1f6c656827608cea3 09-Jan-2014 Brett Chabot <brettchabot@google.com> Move to android.support.test as CTS instrumentation runner.

Also do the following related cleanup
- Remove references to deprecated BrokenTest and KnownFailure
- Switch CTS tests to build against SDK and not private
android.test.runner where possible

Bug: 12924356

Change-Id: If6151b836456eec4838f8d7d6e11c9834c007fca
c87fd6be69f1b3859e7b9d197ee7529a5c1b45ba 14-Jul-2011 Tsu Chiang Chuang <tsu@google.com> add a check to make sure that the javapackage format is correct.

Change-Id: I85c27ccfa37f588e39a17d3a507efebf12efae3b
d9f4846f8eba556b85de3beaa57118ebdb926d6b 29-May-2011 Brian Carlstrom <bdc@google.com> Make CollectAllTests tolerate runtime SecurityException

git cherry-pick -e 98194f2e1274035c224d34c3dfa5f925293d2520
022aff486648aa159fe990b38c1fb1968b2ca10d 18-May-2011 Brian Carlstrom <bdc@google.com> Tracking merge of dalvik-dev to master

React to move of Base64 in libcore for CTS
git cherry-pick --no-commit bf4c21cfbd8d8eabd2ec9af0f315d5baff626580

Breakup android.core.tests.libcore based on top level package name
git cherry-pick --no-commit 45490fa3d469f4a581ecac46ac40c7a4a9af4aaf

DexFile constructor now takes an argument.
git cherry-pick --no-commit 583eab2ec924dadebd45b1189929f1acec08c7c7

Change-Id: I9b8b717f13fdc9d4499fd9e7a7b488c7537d3f79
9a223d79b41ec9c9fa651ff675eb0249d35569af 28-Apr-2011 Tsu Chiang Chuang <tsu@google.com> New branch for vm-tests that use cts-tf framework.

Change-Id: I9927dc09027fc2298a1b1f7ee6c918ed1d36723a
9f2dab87c54f904a2bfc6d8cbcfc0d248c4e24a9 02-Apr-2011 Brian Carlstrom <bdc@google.com> Tracking merge of dalvik-dev to master

git cherry-pick --no-commit 4ba5d9c906047ae96045390e8e2e67b8bf64c7fb

git cherry-pick --no-commit d6cf903af4c5b3f6bb107d4c1a6c34713ee1ff46

git cherry-pick --no-commit 47cbcfe2e49420bcd59499cdd4cfb32fbf062e68

git cherry-pick --no-commit a83d47ae665bccf94dc7720b0b05bf4215af6863

git cherry-pick --no-commit c51299d2e2f43c13fa7514c1fb9c0089ed9a9ad8

git cherry-pick --no-commit 523fa6ab3943e18979bc9df99787a77b15177f5d

git cherry-pick --no-commit bf0712aba9e7b1114ff224fa30da159067868ef1

Change-Id: I7c0d213126b6dd8981b912b588803fd7ac382396
7eb8745f3564b35ff73f04e4c23d9e2f173e37be 22-Mar-2011 Brian Muramatsu <btmura@android.com> Ignore Tests with Side Effects

It looks like a ContentHandlerFactoryTest marked with @SideEffect is
causing subsequent luni net tests to fail even though those tests pass
on their own.

Change-Id: I60a65d4debe2484624c83ea4709dc6231b0dcb10

Conflicts:

tools/utils/CollectAllTests.java
7f64e85ec7c67eabecac377357fad2c63424d1df 18-Feb-2011 Brian Muramatsu <btmura@google.com> Include Missing Commits from gingerbread-plus-aosp

These somewhat got ignored as part of (HOW!?):

Merge remote branch 'korg/froyo' into manualmerge
C-Id: Ie74c678a6ae142d9861b6965a8ca89ff58ebfa83

A lot has changed, so its not an exact cherry-pick.

Change-Id: I5347f2c15eadf59511de11cf08e16be5f66e5b0e
01a0f536eb8b9a5dc97a5e15507d0ffe9786b578 19-Jan-2011 Brian Muramatsu <btmura@android.com> Use Vogar Expectations to Clean Up Remaining Tests

There were still some core tests that couldn't pass in the overall
CTS run that passed individually. There were also some framework
tests that are also consistently failing.

In the interest of time, these tests will be suppressed. To avoid
a multi-project change, create a expectations file in the CTS
project and use that to filter out some core tests. This approach
actually seems useful, so use to to filter out some of the
framework tests as well! This is probably easier than deleting and
adding annotations!

Change-Id: I93a94c7cf9d388da4fcf0074c6b64688535c25e4
282c6fe5b45e6a6fdac8bb9d12a2d3c60485d377 19-Jan-2011 Brian Muramatsu <btmura@android.com> Ignore Tests with Side Effects

It looks like a ContentHandlerFactoryTest marked with @SideEffect is
causing subsequent luni net tests to fail even though those tests pass
on their own.

Change-Id: I60a65d4debe2484624c83ea4709dc6231b0dcb10
5977e94bfe57100042cdf41e476d7cb971137e5f 14-Dec-2010 Brett Chabot <brettchabot@android.com> Add vogar expectation file support for CTS.

Bug 3181338

Change-Id: I97e1f8781d7b2781241aec13f1452c51ed6b91cd
168beb0b9bcca7bca5c3cea38fdca993db6ead59 21-Oct-2010 Brian Muramatsu <btmura@android.com> More CTS Test Runner Fixes

Changing the initial status of tests now to fail, and
making InstrumentationCtsTestRunner explicitly report
when it has omitted a test due to profile or feature
requirements only.

More background on why:

Initially, the starting test status was set to PASS.
This seemed like a bug, because tests that did not
get a result back from the test runner would automatically
pass.

I noticed this when adding the profile/feature annotations,
so I changed the test status to NOT_EXECUTED. However,
I discovered that batch test runner would rerun any tests
that were not executed, so any tests that were discarded
by the annotations would be rerun infinitely..

So then...I changed the test status to start off as OMITTED,
so that discarded tests which don't produce any output would
get flagged as OMITTED and not cause infinite retrying.

However, this uncovered a whole class of tests that were
being omitted due to test errors (previously marked PASS even
though they were failing). This is because the tests would
fail to execute as a batch and then CTS as part of its algorithm
would run them individually again. However, due to an error
of being unable to load the test class, they would be marked
as PASS (before the OMITTED change), because there would be
output from the runner...

By setting the default status to FAIL, there won't be any tests
that get away as PASS due to getting no output from the runner.
Unfortunately, this means any tests that aren't executed or
thrown out by annotations, will be flagged. There seems to be
a couple of tests marked with @Suppress that will need to be
changed to @BrokenTest. There is probably a more involved fix
to fix these things, but its probably not worth it at this time.

The default status also cannot be ERROR, because CTS sees both
errors and failures as the same.

Change-Id: If1d561ee0e8c4919287469238d29c72c1ba0475c
b8ed3162600d30f6d32bdf906ebb9d5fed7a6e8b 13-Jul-2010 Brian Muramatsu <btmura@google.com> Don't Run KnownFailure Tests in CTS

Bug 2814482

Don't run tests marked with the KnownFailure annotation, because
they pass/fail randomly across devices making the CTS reports noisy.

The modification in CollectAllTests will throw out known failure
tests for the android.core.* tests. Entries for these known failures
will no longer appear in the testcase repository of xml files.

The change in DescirptionGenerator throws out the known failures in
the CTS tests like android.net.cts.*. These will no longer show up
as well.

You can still use the runtest utility to run known failures, because
those do not consult the XML files to decide what test cases should
be executed. If you need to exclude KnownFailures for runtest, then
you can add a predicate in InstrumentationCtsTestRunner at the bottom
of the file.

Change-Id: Iab3433b2ab57c04f04b85d5cd95310de805482af
3da7534f2880068b90b88585c45be62751dbfd6b 13-Jan-2010 The Android Open Source Project <initial-contribution@android.com> android-2.1_r1 snapshot
8a6c9f9562a83dff4dd8ee71b5c20f714f9fcfe6 07-May-2009 Jorg Pleumann <nobody@android.com> AI 148430: Adding a new CTS test runner that is basically
a copy of the old one, but resides in android/cts
and is built and installed as part of the CTS.
This makes sure we always have the correct test
runner on a device, so we should see the various
improvements also on off-the-shelf Cupcake phones.
BUG=1537738

Automated import of CL 148430
259ced7af6a4b1b782d8d81ca88bfa9f48cfd69d 01-May-2009 Scott Su <nobody@android.com> AI 148076: CTS: Add support for @BrokenTest in DescriptionGenerator.
Tests that are annotated @BrokenTest are excluded from the test description.

Automated import of CL 148076
91b24c401bf5c6c35830e8db733dea1d1a495c14 19-Apr-2009 Urs Grob <> AI 146827: am: CL 146742 am: CL 146710 Splitting android.core.tests.apk into several smaller
apks. Each libcore module gets one apk and luni gets 4.
Original author: ursg
Merged from: //branches/cupcake/...
Original author: android-build

Automated import of CL 146827
6d0c40e7c6033d44414c857ac6ed14b2b460e890 17-Apr-2009 Urs Grob <> AI 146742: am: CL 146710 Splitting android.core.tests.apk into several smaller
apks. Each libcore module gets one apk and luni gets 4.
Original author: ursg
Merged from: //branches/cupcake/...

Automated import of CL 146742
fc77f6eddfcdb4048196024e8288d09e3bc58c48 17-Apr-2009 Urs Grob <> AI 146710: Splitting android.core.tests.apk into several smaller
apks. Each libcore module gets one apk and luni gets 4.
BUG=1789657

Automated import of CL 146710
f5a826b68a1d676766c4108a2be179e075c2f454 25-Mar-2009 Scott Su <> Automated import from //branches/donutburger/...@141370,141370
9c9be1c3a53d322de100f7419f9c2fa02e50d009 25-Mar-2009 Scott Su <> Automated import from //branches/master/...@141373,141373
7671becdf1320aa659abcb641546d636cf6a02cc 20-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake_rel/...@141571
f8057104af9cae031b544e971a52adafa7c0d9e1 16-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake_rel/...@138607