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

Commit 63acafec authored by Jesse Wilson's avatar Jesse Wilson Committed by Android (Google) Code Review
Browse files

Merge "Remove unused performance tests."

parents d69313da bd1c5da2

core/tests/coretests/AndroidManifest.xml

+40 −47
Original line number Diff line number Diff line
@@ -1052,13 +1052,6 @@ 
        <meta-data android:name="com.android.frameworks.coretests.reference"

                   android:resource="@xml/metadata_app" />



        <activity android:name="AndroidPerformanceTests" android:label="Android Performance Tests">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.UNIT_TEST" />

            </intent-filter>

        </activity>



        <!-- Application components used for activity tests -->



        <activity android:name="android.app.activity.TestedActivity"

test-runner/src/android/test/InstrumentationTestRunner.java

+0 −7
Original line number Diff line number Diff line
@@ -172,8 +172,6 @@ public class InstrumentationTestRunner extends Instrumentation implements TestSu 
    /** @hide */

    public static final String ARGUMENT_TEST_SIZE_PREDICATE = "size";

    /** @hide */

    public static final String ARGUMENT_INCLUDE_PERF = "perf";

    /** @hide */

    public static final String ARGUMENT_DELAY_MSEC = "delay_msec";



    private static final String SMALL_SUITE = "small";
@@ -305,7 +303,6 @@ public class InstrumentationTestRunner extends Instrumentation implements TestSu 
        Predicate<TestMethod> testSizePredicate = null;

        Predicate<TestMethod> testAnnotationPredicate = null;

        Predicate<TestMethod> testNotAnnotationPredicate = null;

        boolean includePerformance = false;

        String testClassesArg = null;

        boolean logOnly = false;
@@ -323,7 +320,6 @@ public class InstrumentationTestRunner extends Instrumentation implements TestSu 
            testNotAnnotationPredicate = getNotAnnotationPredicate(

                    arguments.getString(ARGUMENT_NOT_ANNOTATION));



            includePerformance = getBooleanArgument(arguments, ARGUMENT_INCLUDE_PERF);

            logOnly = getBooleanArgument(arguments, ARGUMENT_LOG_ONLY);

            mCoverage = getBooleanArgument(arguments, "coverage");

            mCoverageFilePath = arguments.getString("coverageFile");
@@ -348,9 +344,6 @@ public class InstrumentationTestRunner extends Instrumentation implements TestSu 
        if (testNotAnnotationPredicate != null) {

            testSuiteBuilder.addRequirements(testNotAnnotationPredicate);

        }

        if (!includePerformance) {

            testSuiteBuilder.addRequirements(REJECT_PERFORMANCE);

        }



        if (testClassesArg == null) {

            if (mPackageOfTests != null) {

test-runner/src/android/test/PerformanceTestBase.java

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

 * Copyright (C) 2007 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.test;



import junit.framework.TestCase;



/**

 * {@hide} Not needed for SDK.

 */

public class PerformanceTestBase extends TestCase implements PerformanceTestCase {



    public int startPerformance(PerformanceTestCase.Intermediates intermediates) {

        return 0;

    }



    public boolean isPerformanceOnly() {

        return true;

    }

}

test-runner/src/android/test/suitebuilder/TestPredicates.java

+0 −3
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package android.test.suitebuilder;



import android.test.InstrumentationTestCase;

import android.test.PerformanceTestBase;

import android.test.suitebuilder.annotation.HasAnnotation;

import android.test.suitebuilder.annotation.Suppress;

import android.test.suitebuilder.annotation.LargeTest;
@@ -43,7 +42,5 @@ public class TestPredicates { 
    public static final Predicate<TestMethod> SELECT_LARGE = new HasAnnotation(LargeTest.class);

    public static final Predicate<TestMethod> REJECT_SUPPRESSED =

            Predicates.not(new HasAnnotation(Suppress.class));

    public static final Predicate<TestMethod> REJECT_PERFORMANCE =

            Predicates.not(new AssignableFrom(PerformanceTestBase.class));



}

test-runner/src/android/test/suitebuilder/TestSuiteBuilder.java

+5 −6
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import com.android.internal.util.Predicate; 
import com.google.android.collect.Lists;

import static android.test.suitebuilder.TestGrouping.SORT_BY_FULLY_QUALIFIED_NAME;

import static android.test.suitebuilder.TestPredicates.REJECT_SUPPRESSED;

import static android.test.suitebuilder.TestPredicates.REJECT_PERFORMANCE;



import junit.framework.Test;

import junit.framework.TestCase;