frameworks_base

mock

resolved conflicts for merge of f0d83fd9 to master

2009-07-28 15:23:21 -07:00

suitebuilder

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ActivityInstrumentationTestCase2.java

AI 147169: am: CL 147167 am: CL 147162 Emphasize in the javadoc that the "pkg" parameters to

2009-04-21 11:54:14 -07:00

ActivityInstrumentationTestCase.java

AI 147169: am: CL 147167 am: CL 147162 Emphasize in the javadoc that the "pkg" parameters to

2009-04-21 11:54:14 -07:00

ActivityTestCase.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ActivityUnitTestCase.java

AI 144107: am: CL 144098 am: CL 144093 Fix NPE in ActivityUnitTestCase.

2009-04-02 09:56:38 -07:00

AndroidTestRunner.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ApplicationTestCase.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

AssertionFailedError.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

BundlePrinter.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

BundleTestListener.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ClassPathPackageInfo.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ClassPathPackageInfoSource.java

AI 143872: am: CL 143870 am: CL 143869 Change InstrumentationTestRunner so all tests in the application are run when no other arguments are supplied, instead of running only tests in the app's package.

2009-03-31 17:07:19 -07:00

ComparisonFailure.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

DatabaseTestUtils.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

InstrumentationCoreTestRunner.java

AI 147725: Some fixes for the CTS test runner. One is a

2009-04-24 13:08:47 -07:00

InstrumentationTestRunner.java

Change code coverage to write to app data folder rather than sdcard.

2009-05-28 18:26:26 -07:00

InstrumentationUtils.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

IsolatedContext.java

Changes for new sync.

2009-07-06 10:45:38 -07:00

LaunchPerformanceBase.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

MoreAsserts.java

Fix assertContentsInOrder (bug 1790350).

2009-06-29 18:06:40 -07:00

NoExecTestResult.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

PackageInfoSources.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

PerformanceTestBase.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ProviderTestCase2.java

AI 145994: Integrate #145778 from Donut.

2009-04-13 16:11:55 -07:00

ProviderTestCase.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

RenamingDelegatingContext.java

Add getCacheDir() to RenamingDelegatingContext.

2009-07-24 10:52:21 -07:00

ServiceLocator.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ServiceTestCase.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SimpleCache.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SingleLaunchActivityTestCase.java

AI 147169: am: CL 147167 am: CL 147162 Emphasize in the javadoc that the "pkg" parameters to

2009-04-21 11:54:14 -07:00

SyncBaseInstrumentation.java

- clean up the sync settings names to:

2009-06-23 15:53:16 -07:00

TestBrowserActivity.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

TestBrowserController.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

TestBrowserControllerImpl.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

TestBrowserView.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

TestCase.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

TestCaseUtil.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

TestListActivity.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

TestLocationProvider.java

location: Replace ILocationCollector interface with new ILocationProvider method

2009-05-21 11:28:20 -04:00

TestPrinter.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

TestRecorder.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

TestRunner.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

TestRunnerView.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

TestSuiteProvider.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

TouchUtils.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ViewAsserts.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00