summaryrefslogtreecommitdiffstats
path: root/test-runner
Commit message (Collapse)AuthorAgeFilesLines
* am 029074ff: fix buildFred Quintana2009-12-101-7/+0
| | | | | | | Merge commit '029074ff0fca198676997c7453cfffa932361081' into eclair-mr2-plus-aosp * commit '029074ff0fca198676997c7453cfffa932361081': fix build
* am 563bfade: fix a build breakageFred Quintana2009-12-101-10/+1
| | | | | | | Merge commit '563bfade6601f3410681b3cd8b069ed22af5b048' into eclair-mr2-plus-aosp * commit '563bfade6601f3410681b3cd8b069ed22af5b048': fix a build breakage
* am 8280c2b1: Implement new MockContentProvider. Also make ContentProvider ↵Daisuke Miyakawa2009-12-042-49/+262
|\ | | | | | | | | | | | | | | | | aware of the class. Merge commit '8280c2b15f6875b2d387c05df23d264864eb9cd5' into eclair-mr2-plus-aosp * commit '8280c2b15f6875b2d387c05df23d264864eb9cd5': Implement new MockContentProvider. Also make ContentProvider aware of the class.
| * Implement new MockContentProvider. Also make ContentProvider aware of the class.Daisuke Miyakawa2009-12-042-49/+262
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the old MockContentProvider to MockIContentProvider since it is more appropriate name. Detail: Current developers inevitably depend on the backend used by ContentProvider, which is useful but not ideal nor "testable" from the view of them. Current MockContentResolver only accepts exact "ContentProvider" class, not IContentProvider interface, since we want to hide "IContentProvider" while the old MockContentProvider implements IContentProvider and as a result some methods we want to hide may be exposed to the public SDK now and probably for the future. On the other hand, ContentProvider is not interface but an exact class heavily depends on the internal logic and not suitable for external developers to use for tests. The new MockContentProvider introduces the mock implementation for ContentProvider. It extends ContentProvider, so "is" ContentProvider, but tries to avoid depending on any backend System like IPC in Android, etc. This should be useful from the view of application developers who do not want to be confused with ContentProvider/ContentResolver backend implementation "at all" and want to use MockContentResolver without any other ContentProvider implementations tightly connected to the external worlds.
* | am 6e045e0a: am e0cadd7c: Merge change Iffbb6e55 into eclairJack Wang2009-11-165-128/+106
|\ \ | |/ | | | | | | | | | | Merge commit '6e045e0aa1b465e9e989d3058a5d2fa13dcf026b' into eclair-mr2-plus-aosp * commit '6e045e0aa1b465e9e989d3058a5d2fa13dcf026b': Make perf metrics collection & output via instrumentation simpler
| * am e0cadd7c: Merge change Iffbb6e55 into eclairJack Wang2009-11-165-128/+106
| |\ | | | | | | | | | | | | | | | | | | Merge commit 'e0cadd7cd811a674df62279dec00d17678b2c501' into eclair-mr2 * commit 'e0cadd7cd811a674df62279dec00d17678b2c501': Make perf metrics collection & output via instrumentation simpler
| | * Make perf metrics collection & output via instrumentation simplerJack Wang2009-11-105-128/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added includeDetailedStats metadata to TimedTest for collecting additional metrics like memory usage and binder transactions - Added PerformanceCollectorTestCase interface for hard-typing test class as performance test while still able to inherit from instrumenation test classes - Reverted previous changes to PerformanceTestBase, will deprecate PerformanceTestBase/Case in a future CL - Removed 'performance.' prefix from keys written to instrumentation output
* | | am 227ba207: am e8228afb: Merge change I92cdc5ed into eclairJack Wang2009-10-301-7/+22
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '227ba2072df1474a0b3abaae7c415f152d32bcc2' into eclair-mr2-plus-aosp * commit '227ba2072df1474a0b3abaae7c415f152d32bcc2': PerformanceCollector: Collect & report perf measurements in key/value form
| * | am e8228afb: Merge change I92cdc5ed into eclairJack Wang2009-10-301-7/+22
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'e8228afb2bd005ae25ce58719f9d678389b26a16' into eclair-mr2 * commit 'e8228afb2bd005ae25ce58719f9d678389b26a16': PerformanceCollector: Collect & report perf measurements in key/value form
| | * PerformanceCollector: Collect & report perf measurements in key/value formJack Wang2009-10-281-7/+22
| | | | | | | | | | | | | | | | | | | | | - Added new functions to PerformanceCollector and PerformanceResultsWriter - Modified unit tests to test new functionality and fix flakiness reported in 2218327 and 2118268 - Added PerformanceCollectorTest to small suite
* | | am 54616f34: Make MockCursor class a part of public SDK.Daisuke Miyakawa2009-10-211-0/+264
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '54616f3435e67029006d2f77462c61ed0635a3f6' into eclair-mr2-plus-aosp * commit '54616f3435e67029006d2f77462c61ed0635a3f6': Make MockCursor class a part of public SDK.
| * | Make MockCursor class a part of public SDK.Daisuke Miyakawa2009-10-221-0/+264
| |/ | | | | | | | | | | | | With this class, external developers will be able to reduce their redundant work related to testing around ContentProvider/ContentResolver. Internal Issue number: 2181010
* | am 348b92bd: Merge change Iee227ace into eclairMike Lockwood2009-10-081-1/+2
|\ \ | |/ | | | | | | | | | | Merge commit '348b92bd513087369ac682e29620d7829fa1381b' into eclair-plus-aosp * commit '348b92bd513087369ac682e29620d7829fa1381b': GPS: Fix problem with SUPL when SUPL APN is already active.
| * GPS: Fix problem with SUPL when SUPL APN is already active.Mike Lockwood2009-10-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Use ConnectivityManager.CONNECTIVITY_ACTION broadcast in LocationManagerService to notify GPS when SUPL connection is ready instead of TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED, which is not sent in all cases. Expand LocationProvider.updateNetworkState() to include NetworkInfo object. Fixes bug b/2155661 Change-Id: Iee227ace7d536b36cf7973e3e6a8b7a621ce6565 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | am 5bba632d: - hide Entity and all its references - remove updateEntity and ↵Fred Quintana2009-10-071-8/+3
|\ \ | |/ | | | | | | | | | | | | | | insertEntity, since they are not used - add the RawContacts.Entity class, which is used in lieu of the android.content.Entity Merge commit '5bba632d877c2878384ff21566c8eb6a1a22f37b' into eclair-plus-aosp * commit '5bba632d877c2878384ff21566c8eb6a1a22f37b': - hide Entity and all its references
| * - hide Entity and all its referencesFred Quintana2009-10-061-8/+3
| | | | | | | | | | | | | | - remove updateEntity and insertEntity, since they are not used - add the RawContacts.Entity class, which is used in lieu of the android.content.Entity
* | am f7ae77cd: account manager api review changesFred Quintana2009-10-071-3/+2
|\ \ | |/ | | | | | | | | | | Merge commit 'f7ae77cd67f1a3993b8e56c1af4720a7adf4e69d' into eclair-plus-aosp * commit 'f7ae77cd67f1a3993b8e56c1af4720a7adf4e69d': account manager api review changes
| * account manager api review changesFred Quintana2009-10-051-3/+2
| |
* | am 3348f14b: Remove GAIA stringCostin Manolache2009-09-291-1/+1
|\ \ | |/ | | | | | | | | | | Merge commit '3348f14b3d46b172a5b557f81aac526b7e8bf5fb' into eclair-plus-aosp * commit '3348f14b3d46b172a5b557f81aac526b7e8bf5fb': Remove GAIA string
| * Remove GAIA stringCostin Manolache2009-09-291-1/+1
| |
* | am 093f5810: Merge change 27238 into eclairDianne Hackborn2009-09-261-0/+5
|\ \ | |/ | | | | | | | | | | Merge commit '093f581090d8cf98f5877746d924107f7695dd8b' into eclair-plus-aosp * commit '093f581090d8cf98f5877746d924107f7695dd8b': The touch screen is probably a feature.
| * The touch screen is probably a feature.Dianne Hackborn2009-09-261-0/+5
| | | | | | | | | | | | Also extend the feature APIs a bit. Change-Id: I99e932d7f4e61edb0e20f75c55e9831e4b59a14d
* | am a382cb81: Merge change 25929 into eclairDianne Hackborn2009-09-191-0/+7
|\ \ | |/ | | | | | | | | | | Merge commit 'a382cb81187437aa389dc131687e181ceaefa8ba' into eclair-plus-aosp * commit 'a382cb81187437aa389dc131687e181ceaefa8ba': Add API to send an ordered sticky broadcast.
| * Add API to send an ordered sticky broadcast.Dianne Hackborn2009-09-191-0/+7
| | | | | | | | Change-Id: Ida7081204e226db0cd07ff618c08e308a909ec0c
* | am fa82f22f: Fix issue #2093608: Calendar widget takes a few seconds to launchDianne Hackborn2009-09-171-0/+8
|\ \ | |/ | | | | | | | | | | Merge commit 'fa82f22f1d8c4c828bdf9b670006be4f4fec772e' into eclair-plus-aosp * commit 'fa82f22f1d8c4c828bdf9b670006be4f4fec772e': Fix issue #2093608: Calendar widget takes a few seconds to launch
| * Fix issue #2093608: Calendar widget takes a few seconds to launchDianne Hackborn2009-09-171-0/+8
| | | | | | | | | | | | | | | | | | | | | | Avert your eyes! The key change here is that RemoteViews can now call a Context API to start its pending intent, which inside of the activity manager we can use to determine to cancel the timeout delay for external entities to disrupt the home screen. Change-Id: If097cf7478cbed7a3c04a304050bd7fd5703d197
* | merge from open-source masterJean-Baptiste Queru2009-09-161-1/+1
|\ \ | |/ |/|
| * Merge change 10326Android Code Review2009-09-151-1/+1
| |\ | | | | | | | | | | | | * changes: Javadoc used startApplication() which doesnt exists, changed to createApplication()
| | * Javadoc used startApplication() which doesnt exists, changed to ↵Simon Schoar2009-06-101-1/+1
| | | | | | | | | | | | createApplication()
| * | donut snapshotJean-Baptiste Queru2009-08-111-1/+10
| | |
| * | donut snapshotJean-Baptiste Queru2009-07-312-0/+6
| | |
| * | donut snapshotJean-Baptiste Queru2009-07-215-19/+57
| | |
| * | donut snapshotJean-Baptiste Queru2009-05-208-90/+186
| |/
* | Performance measurement framework:Jack Wang2009-09-113-110/+280
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + For bug 1810508 - Added PerformanceCollector class to collect runtime and memory usage data * Moved performance snapshotting from Intrumentation to PerformanceCollector - Added PerformanceResultsWriter interface which defines functions for reporting performance data + Framework integration - Added TimedTest annotation to automatically time tests and write results to instrumentation output - Modified PerformanceTestBase to add collection hooks and wrapper methods - Modified WatcherResultPrinter in InstrumentationTestRunner to implement PerformanceResultsWriter for instrumentation output of performance data - Modified InstrumentationTestRunner and AndroidTestRunner to pass writer instance to test
* | Override getAccounts to return an empty AccountSet in MockAccountManager. ↵Cynthia Wong2009-09-031-0/+5
| | | | | | | | This used to throw an NPE instead since IAccountManagerService is set to NULL.
* | Add platform infrastructure for features.Dianne Hackborn2009-08-271-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces a new mechanism to define features associated with a platform, query the current device for the available features, and enforce that apps requiring features that aren't available can't be installed. Also now allows uses-library to specify that a library is optional, so the lack of such a library will not prevent the app from being installed (but if it does exist it will be correctly linked into the app). Change-Id: I5b369b46cfa0b3d37c9e08fd14ef1098a978e67b
* | Fix bug 1546445: Correct spelling errors in APIJack Wang2009-08-252-3/+12
| | | | | | | | | | - InstrumentationTestCase.injectInsrumentation - AndroidTestRunner.setInstrumentaiton
* | I am getting tired of the java doc warnings, so fix them.Dianne Hackborn2009-08-242-0/+2
| | | | | | | | Change-Id: I2205eebae419eaf4a0992c9f5b7cd807eb843fe1
* | Fix bug 2056252: ↵Jack Wang2009-08-171-1/+1
| | | | | | | | | | | | android.test.AndroidTestRunnerTest:testRunTestWithNullListener is failing - Verify mInstrumentation is not null before calling getContext()
* | Add new API to compare certs of two UIDs.Dianne Hackborn2009-08-121-0/+5
| |
* | Adding "test context" to AndroidTestCaseDmitri Plotnikov2009-08-032-5/+9
| |
* | Merge change 8886Android (Google) Code Review2009-07-281-1/+10
|\ \ | | | | | | | | | | | | * changes: Fix broken calendar tests.
| * | Fix broken calendar tests.Ken Shirriff2009-07-281-1/+10
| | | | | | | | | | | | | | | | | | | | | The tests end up in the widget code, which calls getResources(). This needs to be supported by the mock. bug=1985641
* | | resolved conflicts for merge of f0d83fd9 to masterDianne Hackborn2009-07-281-0/+1
|\ \ \
| * | | Updates from API review.Dianne Hackborn2009-07-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * AccessibilityService -- document onBind() to not be implemented. * GestureLibrary.getLearner() -- needs to be hidden. * IntentSender -- remove protected constructors, document that it is retrieved from a PendingIntent. * Hide permissions: SHUTDOWN, STOP_APP_SWITCHES. * Context -- hide BACKUP_SERVICE. * ContextWrapper -- hide getSharedPrefs bla h blah * Intent.parseUri() -- fix docs. * ApplicationInfo.FLAG_TEST_ONLY?!? * Hide MockContext.getSharedPrefs blah blah
* | | | Add getCacheDir() to RenamingDelegatingContext.Andrew Stadler2009-07-241-0/+30
| |/ / |/| | | | | | | | This allows providers under ProviderTestCase2 to access getCacheDir().
* | | Merge change 6223Android (Google) Code Review2009-07-091-0/+5
|\ \ \ | | | | | | | | | | | | | | | | * changes: Changes for new sync.
| * | | Changes for new sync.Ken Shirriff2009-07-061-0/+5
| | | | | | | | | | | | | | | | | | | | Add ContentValues-based RecurrenceSet processing. Add test stub needed by SSL caching.
* | | | am 870e09fc: Fixes #1963229. Introduces Context#isRestricted().Romain Guy2009-07-061-0/+5
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Merge commit '870e09fcd2dfdc12ac318962efd28b0420c562bb' * commit '870e09fcd2dfdc12ac318962efd28b0420c562bb': Fixes #1963229. Introduces Context#isRestricted().
| * | | Fixes #1963229. Introduces Context#isRestricted().Romain Guy2009-07-061-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A restricted Context is a special type of Context that prevents specific features from being used. For instance, android:onClick, used by View, can be dangerous when used from within apps widgets. By using a restricted Context to inflate apps widgets, widgets providers are prevented from using android:onClick.