drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove useless TestRunner

Browse Source 
InstrumentationTestRunner can enumerate the test cases to run without a
special TestRunner.

Change-Id: I5a49413440ef191f28a21034a318d9a9e3f8174b
This commit is contained in:
Kenny Root
2012-08-10 12:39:15 -07:00
parent 37548994e6
commit 96ad6cb080
4 changed files with 13 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
keystore/tests/AndroidManifest.xml
View File

@ -22,7 +22,7 @@
<uses-library android:name="android.test.runner" />
</application>
<instrumentation android:name=".KeyStoreTestRunner"
<instrumentation android:name="android.test.InstrumentationTestRunner"
android:targetPackage="android.security.tests"
android:label="KeyStore Tests">
</instrumentation>

8
keystore/tests/src/android/security/KeyStoreTest.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package android.security.tests;
package android.security;
import android.app.Activity;
import android.security.KeyStore;
@ -29,7 +29,11 @@ import java.util.HashSet;
*
* Running the test suite:
*
* adb shell am instrument -w android.security.tests/.KeyStoreTestRunner
* runtest keystore-unit
*
* Or this individual test case:
*
* runtest --path frameworks/base/keystore/tests/src/android/security/KeyStoreTest.java
*/
@MediumTest
public class KeyStoreTest extends ActivityUnitTestCase<Activity> {

48
keystore/tests/src/android/security/KeyStoreTestRunner.java
View File

@ -1,48 +0,0 @@
/*
* Copyright (C) 2009 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.security.tests;
import junit.framework.TestSuite;
import android.test.InstrumentationTestRunner;
import android.test.InstrumentationTestSuite;
/**
* Instrumentation Test Runner for all KeyStore unit tests.
*
* Running all tests:
*
* runtest keystore-unit
* or
* adb shell am instrument -w android.security.tests/.KeyStoreTestRunner
*/
public class KeyStoreTestRunner extends InstrumentationTestRunner {
@Override
public TestSuite getAllTests() {
TestSuite suite = new InstrumentationTestSuite(this);
suite.addTestSuite(android.security.tests.KeyStoreTest.class);
suite.addTestSuite(android.security.tests.SystemKeyStoreTest.class);
return suite;
}
@Override
public ClassLoader getLoader() {
return KeyStoreTestRunner.class.getClassLoader();
}
}

8
keystore/tests/src/android/security/SystemKeyStoreTest.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package android.security.tests;
package android.security;
import android.app.Activity;
import android.security.SystemKeyStore;
@ -26,7 +26,11 @@ import android.test.suitebuilder.annotation.MediumTest;
*
* Running the test suite:
*
* adb shell am instrument -w android.security.tests/.KeyStoreTestRunner
* runtest keystore-unit
*
* Or this individual test case:
*
* runtest --path frameworks/base/keystore/tests/src/android/security/SystemKeyStoreTest.java
*/
@MediumTest
public class SystemKeyStoreTest extends ActivityUnitTestCase<Activity> {