diff options
Diffstat (limited to 'keystore/tests/src')
3 files changed, 12 insertions, 52 deletions
diff --git a/keystore/tests/src/android/security/KeyStoreTest.java b/keystore/tests/src/android/security/KeyStoreTest.java index 32cd6e2..9f35b8d 100755 --- a/keystore/tests/src/android/security/KeyStoreTest.java +++ b/keystore/tests/src/android/security/KeyStoreTest.java @@ -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> { diff --git a/keystore/tests/src/android/security/KeyStoreTestRunner.java b/keystore/tests/src/android/security/KeyStoreTestRunner.java deleted file mode 100644 index c56eeb9..0000000 --- a/keystore/tests/src/android/security/KeyStoreTestRunner.java +++ /dev/null @@ -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(); - } -} diff --git a/keystore/tests/src/android/security/SystemKeyStoreTest.java b/keystore/tests/src/android/security/SystemKeyStoreTest.java index a4d744b..ecf7cbc 100644 --- a/keystore/tests/src/android/security/SystemKeyStoreTest.java +++ b/keystore/tests/src/android/security/SystemKeyStoreTest.java @@ -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> { |