Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cfb30a2 authored by Kenny Root's avatar Kenny Root Committed by Android Git Automerger
Browse files

am 1ad8bf56: am f0e87175: Merge "Remove useless TestRunner" 

* commit '1ad8bf56':
  Remove useless TestRunner
parents f83d2d6f 1ad8bf56

keystore/tests/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>

keystore/tests/src/android/security/KeyStoreTest.java

+6 −2
Original line number Diff line number Diff line
@@ -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> {

keystore/tests/src/android/security/KeyStoreTestRunner.java

deleted100644 → 0
+0 −48
Original line number Diff line number Diff line 
/*

 * 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();

    }

}

keystore/tests/src/android/security/SystemKeyStoreTest.java

+6 −2
Original line number Diff line number Diff line
@@ -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> {