LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am d6aae2e8: Merge "Cleanup framework test defs." into froyo

Browse Source 
Merge commit 'd6aae2e84b337bb887cf5fcc21b613a4d4151eb6' into froyo-plus-aosp

* commit 'd6aae2e84b337bb887cf5fcc21b613a4d4151eb6':
  Cleanup framework test defs.
This commit is contained in:
Brett Chabot
2010-04-01 21:49:57 -07:00
committed by Android Git Automerger
parent e7f73ba185 d6aae2e84b
commit 1e1b24bad8
1 changed files with 74 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

206
testrunner/test_defs.xml
View File

@@ -29,19 +29,6 @@ See test_defs.xsd for more information.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://schemas.android.com/testrunner/test_defs/1.0 test_defs.xsd"> xsi:schemaLocation="http://schemas.android.com/testrunner/test_defs/1.0 test_defs.xsd">
<!-- system-wide tests -->
<test name="framework"
build_path="frameworks/base/tests/FrameworkTest"
package="com.android.frameworktest.tests"
coverage_target="framework"
continuous="true" />
<test name="android"
build_path="frameworks/base/tests/AndroidTests"
package="com.android.unit_tests"
coverage_target="framework"
continuous="true" />
<!-- frameworks tests --> <!-- frameworks tests -->
<test name="frameworks-core" <test name="frameworks-core"
build_path="frameworks/base/core/tests/coretests" build_path="frameworks/base/core/tests/coretests"
@@ -91,56 +78,12 @@ See test_defs.xsd for more information.
coverage_target="framework" coverage_target="framework"
continuous="true" /> continuous="true" />
<!-- end of framework tests -->
<!-- subset of the android tests for just the database tests -->
<!--test name="database"
build_path="frameworks/base/core/tests/coretests"
package="com.android.frameworks.coretests"
coverage_target="framework" /-->
<test name="account"
build_path="frameworks/base/core/tests/coretests"
package="com.android.frameworks.coretests"
class="android.accounts.AccountManagerServiceTest"
coverage_target="framework" />
<test name="smoke"
build_path="frameworks/base/tests/SmokeTest"
package="com.android.smoketest.tests"
coverage_target="framework"
continuous="true" />
<test name="core" <test name="core"
build_path="frameworks/base/tests/CoreTests" build_path="frameworks/base/tests/CoreTests"
package="android.core" package="android.core"
coverage_target="framework" coverage_target="framework"
continuous="true" /> continuous="true" />
<test name="apidemos"
build_path="development/samples/ApiDemos"
package="com.example.android.apis.tests"
coverage_target="ApiDemos" />
<test name="launchperf"
build_path="development/apps/launchperf"
package="com.android.launchperf"
runner=".SimpleActivityLaunchPerformance"
coverage_target="framework" />
<!-- targeted framework tests -->
<test name="heap"
build_path="frameworks/base/tests/AndroidTests"
package="com.android.unit_tests"
class="com.android.unit_tests.HeapTest"
coverage_target="framework" />
<!--test name="activity"
build_path="frameworks/base/tests/AndroidTests"
package="com.android.unit_tests"
class="com.android.unit_tests.activity.ActivityTests"
coverage_target="framework" /-->
<test name="keystore-unit" <test name="keystore-unit"
build_path="frameworks/base/keystore/tests" build_path="frameworks/base/keystore/tests"
package="android.security.tests" package="android.security.tests"
@@ -148,26 +91,6 @@ See test_defs.xsd for more information.
coverage_target="framework" coverage_target="framework"
continuous="true" /> continuous="true" />
<!-- obsolete?
<test name="deadlock"
build_path="frameworks/base/tests/Deadlock"
package="com.android.deadlock.tests"
coverage_target="framework" />
-->
<test name="contentprovideroperation"
build_path="frameworks/base/core/tests/coretests"
package="com.android.frameworks.coretests"
class="android.content.ContentProviderOperationTest"
coverage_target="framework" />
<test name="tablemerger"
build_path="frameworks/base/tests/FrameworkTest"
package="com.android.frameworktest.tests"
class="com.google.android.gsf.AbstractTableMergerTest"
coverage_target="framework" />
<test name="imf" <test name="imf"
build_path="frameworks/base/tests/ImfTest" build_path="frameworks/base/tests/ImfTest"
package="com.android.imftest.tests" package="com.android.imftest.tests"
@@ -185,6 +108,75 @@ See test_defs.xsd for more information.
build_path="frameworks/base/common/tests" build_path="frameworks/base/common/tests"
package="com.android.common.tests" /> package="com.android.common.tests" />
<!-- end of framework tests -->
<!-- media framework tests -->
<test name="media"
build_path="frameworks/base/media/tests/MediaFrameworkTest"
package="com.android.mediaframeworktest"
runner=".MediaFrameworkTestRunner"
coverage_target="framework"
continuous="true" />
<test name="mediaapitest"
build_path="frameworks/base/media/tests/MediaFrameworkTest"
package="com.android.mediaframeworktest"
class="com.android.mediaframeworktest.functional.MediaPlayerApiTest"
runner=".MediaFrameworkTestRunner"
coverage_target="framework" />
<test name="mediarecordertest"
build_path="frameworks/base/media/tests/MediaFrameworkTest"
package="com.android.mediaframeworktest"
class="com.android.mediaframeworktest.functional.MediaRecorderTest"
runner=".MediaFrameworkTestRunner"
coverage_target="framework" />
<test name="mediastresstest"
build_path="frameworks/base/media/tests/MediaFrameworkTest"
package="com.android.mediaframeworktest"
runner=".MediaRecorderStressTestRunner"
coverage_target="framework" />
<test name="mediamemorystress"
build_path="frameworks/base/media/tests/MediaFrameworkTest"
package="com.android.mediaframeworktest"
runner=".MediaFrameworkPerfTestRunner"
coverage_target="framework" />
<test name="mediaunit"
build_path="frameworks/base/media/tests/MediaFrameworkTest"
package="com.android.mediaframeworktest"
runner=".MediaFrameworkUnitTestRunner"
coverage_target="framework" />
<!-- end of media framework tests -->
<!-- targeted framework tests -->
<test name="account"
build_path="frameworks/base/core/tests/coretests"
package="com.android.frameworks.coretests"
class="android.accounts.AccountManagerServiceTest"
coverage_target="framework" />
<test name="smoke"
build_path="frameworks/base/tests/SmokeTest"
package="com.android.smoketest.tests"
coverage_target="framework"
continuous="true" />
<test name="launchperf"
build_path="development/apps/launchperf"
package="com.android.launchperf"
runner=".SimpleActivityLaunchPerformance"
coverage_target="framework" />
<test name="contentprovideroperation"
build_path="frameworks/base/core/tests/coretests"
package="com.android.frameworks.coretests"
class="android.content.ContentProviderOperationTest"
coverage_target="framework" />
<!-- cts tests --> <!-- cts tests -->
<test name="cts-permission" <test name="cts-permission"
@@ -201,7 +193,7 @@ See test_defs.xsd for more information.
runner="android.test.InstrumentationTestRunner" runner="android.test.InstrumentationTestRunner"
coverage_target="framework" coverage_target="framework"
continuous="true" continuous="true"
cts="true" /> suite="true" />
<test name="cts-process" <test name="cts-process"
build_path="cts/tests/tests/process" build_path="cts/tests/tests/process"
@@ -379,6 +371,10 @@ See test_defs.xsd for more information.
<!-- end of cts tests --> <!-- end of cts tests -->
<!-- selected app tests --> <!-- selected app tests -->
<test name="apidemos"
build_path="development/samples/ApiDemos"
package="com.example.android.apis.tests" />
<test name="browser" <test name="browser"
build_path="packages/apps/Browser" build_path="packages/apps/Browser"
package="com.android.browser" package="com.android.browser"
@@ -446,44 +442,6 @@ See test_defs.xsd for more information.
class="com.android.email.SmallTests" class="com.android.email.SmallTests"
coverage_target="Email" /> coverage_target="Email" />
<test name="media"
build_path="frameworks/base/media/tests/MediaFrameworkTest"
package="com.android.mediaframeworktest"
runner=".MediaFrameworkTestRunner"
coverage_target="framework"
continuous="true" />
<test name="mediaapitest"
build_path="frameworks/base/media/tests/MediaFrameworkTest"
package="com.android.mediaframeworktest"
class="com.android.mediaframeworktest.functional.MediaPlayerApiTest"
runner=".MediaFrameworkTestRunner"
coverage_target="framework" />
<test name="mediarecordertest"
build_path="frameworks/base/media/tests/MediaFrameworkTest"
package="com.android.mediaframeworktest"
class="com.android.mediaframeworktest.functional.MediaRecorderTest"
runner=".MediaFrameworkTestRunner"
coverage_target="framework" />
<test name="mediastresstest"
build_path="frameworks/base/media/tests/MediaFrameworkTest"
package="com.android.mediaframeworktest"
runner=".MediaRecorderStressTestRunner"
coverage_target="framework" />
<test name="mediamemorystress"
build_path="frameworks/base/media/tests/MediaFrameworkTest"
package="com.android.mediaframeworktest"
runner=".MediaFrameworkPerfTestRunner"
coverage_target="framework" />
<test name="mediaunit"
build_path="frameworks/base/media/tests/MediaFrameworkTest"
package="com.android.mediaframeworktest"
runner=".MediaFrameworkUnitTestRunner"
coverage_target="framework" />
<test name="musicplayer" <test name="musicplayer"
build_path="packages/apps/Music" build_path="packages/apps/Music"
@@ -491,14 +449,6 @@ See test_defs.xsd for more information.
runner=".MusicPlayerFunctionalTestRunner" runner=".MusicPlayerFunctionalTestRunner"
coverage_target="Music" /> coverage_target="Music" />
<!-- obsolete?
<test name="mediaprov"
build_path="tests/MediaProvider"
package="com.android.mediaprovidertests"
runner=".MediaProviderTestsInstrumentation"
coverage_target="MediaProvider" />
-->
<test name="mms" <test name="mms"
build_path="packages/apps/Mms" build_path="packages/apps/Mms"
package="com.android.mms.tests" package="com.android.mms.tests"
@@ -523,14 +473,6 @@ See test_defs.xsd for more information.
coverage_target="QuickSearchBox" coverage_target="QuickSearchBox"
continuous="true" /> continuous="true" />
<!-- obsolete?
<test name="ringtone"
build_path="tests/RingtoneSettings"
package="com.android.ringtonesettingstests"
runner=".RingtoneSettingsInstrumentationTestRunner"
coverage_target="Settings" />
-->
<!-- native tests --> <!-- native tests -->
<!-- Bionic C++ --> <!-- Bionic C++ -->