summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-11-13Merge "remove Espresso source code"HEADandroid-wear-5.0.0_r1master-soongmastermainlollipop-wear-releaseGuang Zhu
2014-11-13remove Espresso source codeGuang Zhu
Espresso has been open sourced via code.google.com, and AOSP should not carry source code bearing com.google package name Change-Id: Ic7c2edea62db89ce76cf332c20a9fbab9bae1cc1
2014-10-13am 2b6d1da1: fix UI Automator dump tool issuesGuang Zhu
* commit '2b6d1da16a4e38a9704c2c67b33aadf44a85b1d2': fix UI Automator dump tool issues
2014-10-13fix UI Automator dump tool issuesandroid-cts-5.1_r27android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-releaselollipop-devlollipop-cts-releaseGuang Zhu
AOSP bug 58733: NPE while dumping hierarchy AOSP bug 62906: smileys (surrogates) causing dump tool to crash Change-Id: Ia57686163dca3b27ee291f3114f15af98e50d914
2014-09-25am 35c05cde: Merge "Handle ignored + assumption failure" into lmp-devBrett Chabot
* commit '35c05cdef6ffdece03f1e6b9dd22f999bbc9f4f0': Handle ignored + assumption failure
2014-09-25Merge "Handle ignored + assumption failure" into lmp-devBrett Chabot
2014-09-17Handle ignored + assumption failureBrett Chabot
Also fix eclipse classpath Bug: 16684768 Change-Id: Ic699525d5dc81e74fdc28fe9b81a91c41c9151b8
2014-09-17Add null check in Annotation filter.Brett Chabot
Change-Id: I64177bb04558a653cd20cf5645db7178161eb6f7
2014-09-16am 7a552ffc: Removed bogus Looper.prepare() from onStart(). (DO NOT MERGE)Nick Korostelev
* commit '7a552ffc0bce492a7b87755490f3df7490dc357c': Removed bogus Looper.prepare() from onStart(). (DO NOT MERGE)
2014-09-15Removed bogus Looper.prepare() from onStart(). (DO NOT MERGE)Nick Korostelev
The instrumentation thread for JUnit tests is not a Looper. It calculates all tests that need to be executed, executes them, and exits, ending the instrumentation. Bug: 17418699 Change-Id: Idcfdd3369472e01996bfae5564b6cb70c3eb7724
2014-08-21Espresso support for make based builds.Jon Boekenoogen
Wallet's instrument management library (used in Phonesky) would like to write espresso based tests and are currently using make based builds. No plans to change to gradle for at least a few months and would like to use make in the interim. Change-Id: Ibd9d9b69acf447702027f1a11944816f088bf3f5
2014-08-06Merge "Fixed the ability to filter by multiple class/methods combinations" ↵Nick Korostelev
into lmp-dev
2014-08-07Fixed the ability to filter by multiple class/methods combinationsNick Korostelev
bug: 16034525 Change-Id: Id8f81b09c51f66ffd6e77bb58d9684167b2e55ba (cherry picked from commit d904d52274bafc1fd3928c6b428fed4717e30b4a)
2014-08-07Adding support for loading classes/methods from fileNick Korostelev
Added testFile argument to AndroidJunitRunner which allows to run all tests listed in a file: adb shell am instrument -w -e testFile /sdcard/tmp/testFile.txt com.android.foo/com.android.test.runner.AndroidJUnitRunner The file should contain a list of line separated test classes and methods. bug: 16031984 Change-Id: Idf3e5e12f65ed670f31dad54bf3f0e303114c755 (cherry picked from commit da785cf4556f8bfc347c8118b42c74dc0ec59f58)
2014-06-19Added androidJavadoc task to generate JavaDocsNick Korostelev
Change-Id: I63ea84184f3d9f9f9b739e5a96bcd5724ec31e70
2014-06-19Added dexmaker-mockito dependencyNick Korostelev
Change-Id: I5b0a58e64f265f34b1ce8b9e690452c2f3e3baef
2014-06-19Merge "Merge GoogleInstrumentationTestRunner features into ↵Brett Chabot
android.support.test."
2014-06-17Merge "port Espresso to Android repo"Nick Korostelev
2014-06-17port Espresso to Android repoNick Korostelev
- Completely restructured the project to match Gradle convention - Added several Android.mk to build using make. - Added build.gradle to build using Gradle. - Fixed package names to avoid conflicts - Requires several prebuilt Jars, added README to outline versions and licenses for legal. - Dependent libraries that don’t get JarJar’ed are linked to from the local prebuild maven repo. - Bumped up the version of dependent libraries that didn’t create compatibility issues - Cleaned up bin/ dir and renamed it to libs/ - Removed maven support, removed pom.xml files - Removed Android make support, removed Android.mk files - Removed testrunner and testrunner-runtime, using binaries instead. There is a separate initiative to add them to Android repo. - Separated IdlingResource to it's own library to expose and decouple this interface which is frequently referenced by code in the app-under-test - added copyright Workaround for Android Gradle plugin limitation - Created two separate modules espresso-lib-tests and espresso-contrib-tests that will include the unit tests for the corresponding libs. Current limitations: - Gradle - no current support for setting a custom ‘targetPackage’ for espressi-lib and espresso-conrib unit tests ("gradle assembleDebugTest" will not work for espressi-lib and espresso-conrib). - Intellij Gradle plugin doesn't like multiple project sharing the same "main" source and variants Note: follow these steps if encounter ClassNotFoundException when running on physical device: 1. adb shell su 2. adb shell setprop dalvik.vm.dexopt-flags v=n,o=v 3. adb shell stop installd 4. adb shell start installd 5. reinstall apks Change-Id: I356150fcecb13537d212c180adea8f2cee916b81
2014-06-13Only print suite assignment suggestions if test timing is valid.Brett Chabot
Also increase small test limit to 200ms. Change-Id: I8fa4116efecf63939e6b8e7adbbb33d306690b73
2014-06-13Merge GoogleInstrumentationTestRunner features into android.support.test.Brett Chabot
Change-Id: I07e47038b3e50234b5419499410a253d7ff89a99
2014-06-04Stop holding object references in JUnit3 tests.Brett Chabot
Bug: 15115037 Change-Id: Icfc0de62f7e1a38e277a5563313ec89132ddb8eb
2014-06-02am 85c70eeb: add a new service for sleep/wakeup loopGuang Zhu
* commit '85c70eeb6cd10cc556373e64db50c6592b5278af': add a new service for sleep/wakeup loop
2014-06-02add a new service for sleep/wakeup loopGuang Zhu
service can be launched via command line: adb shell am startservice \ -a android.test.wakeuploop.WAKEUP_SERVICE \ --el WAKEUP_INTERVAL <interval ms> optional param includes MAX_LOOP for maximum number of loops of sleep/wake cycle. Bug: 14601515 Change-Id: I50305404d547440e03ad8840292823f2b222b3a5
2014-05-02Fix junit dep.Jon Boekenoogen
Change-Id: I4e2a7209d717c2e7e3b0cf04d0b9d7a0b5ced330
2014-04-22Fix update-uiautomator-api rule.Ying Wang
Bug: 14260041 Change-Id: I013e183f653bb9251de75b020558b02972e73c2f
2014-04-11am 0123a463: Change isScreenOn() to isInteractive().Jeff Brown
* commit '0123a4631bc74080986f895de5eb8b2c017d2569': Change isScreenOn() to isInteractive().
2014-04-10Change isScreenOn() to isInteractive().Jeff Brown
Bug: 13133142 Change-Id: I01f10d4a1a946de4400157c34719ac361f61f6a1
2014-03-27Skip empty JUnit3 test cases when class path scanning.Brett Chabot
Change-Id: Ibc7310b3c52a7f41e3ccff84ac1956d80dd30760
2014-03-24Fix running methods with dollar signs.Brett Chabot
Bug: 13510976 Change-Id: I0001d5c2d085f3a3f07cbe41a89ed84234ad000d
2014-03-17Give gradle projects more human-friendly namesJustin Morey
This simplifies tapas support, and should make working with GmsCore in Android Studio easier Change-Id: Iac3628d100f73195a8768a9975a9c0b9a01dbcaa
2014-03-13Merge "Edit checkapi command parameters accordingly to check for @removed APIs."Hui Shu
2014-03-12Edit checkapi command parameters accordingly to check for @removed APIs.Hui Shu
Change-Id: Ied0126de74710720bb434aaa22bbcd46f21818e6
2014-03-11Add InstrumentationRunListener#setInstrumentationBrett Chabot
Change-Id: I5ef349654aac8772b70afeb6caabb648d4e478c0
2014-03-05Preparing to add GmsCore automated tests to Gradle buildJustin Morey
Change-Id: Icf98425b43a6fd5e34d77a9e97541d54614e8b6d
2014-02-24Add SdkSuppress and RequiresDevice filtering annotations.Brett Chabot
Bug: 12873809 Change-Id: If7211c19f7c8b8f896a3d0a151402cc4ecef038a
2014-02-21Don't report an error for empty test runs.Brett Chabot
Tests are commonly run with size or other filters. It is incorrect to report errors if a test package doesn't happen to have tests of the given size. Plus '0 tests is not an error' is the InstrumentationTestRunner behavior. Change-Id: Ifaa2abc6bffd57ff514277e8c7e4ddf33345023c
2014-02-21Add support for sharding to AndroidJunitRunnerAdam Skory
Buckets tests based on their descriptors' hashcodes. Bug: 12929805 Change-Id: Ib4bf43a836a85cef7a1f6f1483eb82514bbf9009
2014-02-20Add missing Retention and Target for FlakyTest annotation.Brett Chabot
Missed in last commit Change-Id: I66e7d43c120cc7b24857f7af729142de4181e74b
2014-02-20Add flaky test annotationBrett Chabot
Change-Id: I0d76c9c7aa68047931673284f1772fd7a135b7fc
2014-02-05Add support for specifying runlisteners via AndroidManifest.Brett Chabot
Also refactor existing listener support to simplify. Change-Id: Ib4ec9ceeba3c68b8a700161c6300ea1ab5d944a3
2014-02-03Merge "Stem TestLoader log spam."Brett Chabot
2014-02-03Stem TestLoader log spam.Brett Chabot
Change-Id: Ib7e9cac82593516d9c42ed4d423f77e342236fa0
2014-02-03Merge "Tweak -e suiteAssignment mode."Brett Chabot
2014-01-29Tweak -e suiteAssignment mode.Brett Chabot
Change suiteAssignment mode so it only outputs a message if test cases current size does not match its runtime. Also modify so it streams output instead of waiting for test end. Change-Id: I6e90ad3c7dc6e36e65b8de2c96edfe0cb226592c
2014-01-29Support multiple notAnnotation valuesBrett Chabot
Bug 12208088 Change-Id: Id2c8ec1215ee7b63d24072131eab227743d366ce
2014-01-29Fix 'e log true' test runs.Brett Chabot
The test suite used to just output a list of test names to run, instead of executing them was mistakenly skipping the entire test run. Change-Id: Ifc2ff9f47a204b06524670a0eb5d39f2ad6455ad
2014-01-29Merge "Make android.support.test work with unmodified upstream junit."Brett Chabot
2014-01-29Make android.support.test work with unmodified upstream junit.Brett Chabot
Stop depending on proposed extenstion points to upstream JUnit. Instead copy in necessary code to support JUnit3 annotation filtering, and redo injection implementation to support nested suites. Also change the package name of tests. Bug: 10749552 Change-Id: I1ff09d14afe02f265d4c9420b49f047c9c552eab
2014-01-28am 6cdf7a05: am 5c8e0271: DO NOT MERGE. Cherry pick \'Support multiple ↵Brett Chabot
notAnnotation values\' * commit '6cdf7a05a7a1437aea3c670a38b7112c5c158f2a': DO NOT MERGE. Cherry pick 'Support multiple notAnnotation values'
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 23:24:54 +0000