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

Commit 5e63b141 authored by Tenghui Zhu's avatar Tenghui Zhu Committed by Android (Google) Code Review
Browse files

Merge "Update VectorDrawablePerfTest to use JUnit 4"

parents 92f8d709 57fc7599

apct-tests/perftests/core/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


    <application>

        <uses-library android:name="android.test.runner" />

        <activity android:name="android.widget.StubActivity" />

        <activity android:name="android.perftests.utils.StubActivity" />

    </application>



    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"

apct-tests/perftests/core/src/android/widget/TextViewSetTextLocalePerfTest.java

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.os.Bundle; 
import android.util.Log;



import android.perftests.utils.BenchmarkState;

import android.perftests.utils.StubActivity;

import android.support.test.filters.LargeTest;

import android.support.test.runner.AndroidJUnit4;

import android.support.test.rule.ActivityTestRule;

apct-tests/perftests/graphics/Android.mk

+1 −3
Original line number Diff line number Diff line
@@ -3,13 +3,11 @@ include $(CLEAR_VARS) 


LOCAL_MODULE_TAGS := tests



LOCAL_STATIC_JAVA_LIBRARIES := apct-perftests-utils

LOCAL_STATIC_JAVA_LIBRARIES := apct-perftests-utils android-support-test



LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res

LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_JAVA_LIBRARIES := android.test.runner



LOCAL_PACKAGE_NAME := GraphicsPerfTests



include $(BUILD_PACKAGE)

apct-tests/perftests/graphics/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 


    <application>

        <uses-library android:name="android.test.runner" />

        <activity android:name="android.graphics.perftests.StubActivity" >

        <activity android:name="android.perftests.utils.StubActivity" >

            <intent-filter>

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

                <category android:name="android.intent.category.LAUNCHER" />
@@ -15,7 +15,7 @@ 
        <uses-library android:name="android.test.runner" />

    </application>



    <instrumentation android:name="android.test.InstrumentationTestRunner"

    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"

        android:targetPackage="com.android.frameworks.perftests"/>



</manifest>

apct-tests/perftests/graphics/src/android/graphics/perftests/StubActivity.java

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
package android.graphics.perftests;



import android.app.Activity;



public class StubActivity extends Activity {

}
 
 No newline at end of file