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

Commit 3b07fcbf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Migrate frameworks/base/apct-tests/perftests/autofill to androidx.test"

parents 6af8b022 93658916

apct-tests/perftests/autofill/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) 
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res



LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-test \

    androidx.test.rules \

    androidx.annotation_annotation \

    apct-perftests-utils

apct-tests/perftests/autofill/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -35,6 +35,6 @@ 


    </application>



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

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

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

</manifest>

apct-tests/perftests/autofill/src/android/view/autofill/AbstractAutofillPerfTestCase.java

+5 −16
Original line number Diff line number Diff line
@@ -16,34 +16,23 @@ 


package android.view.autofill;



import static org.junit.Assert.assertTrue;



import android.os.Looper;

import android.perftests.utils.PerfStatusReporter;

import android.perftests.utils.SettingsHelper;

import android.perftests.utils.SettingsStateKeeperRule;

import android.perftests.utils.ShellHelper;

import android.view.View;

import android.perftests.utils.StubActivity;

import android.provider.Settings;

import android.support.test.filters.LargeTest;

import android.support.test.rule.ActivityTestRule;

import android.support.test.InstrumentationRegistry;



import com.android.perftests.autofill.R;



import java.util.Locale;

import java.util.Collection;

import java.util.Arrays;

import androidx.test.InstrumentationRegistry;

import androidx.test.filters.LargeTest;

import androidx.test.rule.ActivityTestRule;



import org.junit.Test;

import org.junit.After;

import org.junit.Before;

import org.junit.ClassRule;

import org.junit.Rule;

import org.junit.runners.Parameterized;

import org.junit.runners.Parameterized.Parameters;

import org.junit.runner.RunWith;



import static org.junit.Assert.assertTrue;



/**

 * Base class for all autofill tests.

apct-tests/perftests/autofill/src/android/view/autofill/LoginTest.java

+6 −22
Original line number Diff line number Diff line
@@ -16,33 +16,17 @@ 


package android.view.autofill;



import android.app.Activity;

import android.os.Looper;

import android.os.Bundle;

import android.perftests.utils.PerfStatusReporter;

import android.util.Log;

import android.view.View;

import android.widget.EditText;

import static android.view.autofill.AutofillManager.AutofillCallback.EVENT_INPUT_HIDDEN;

import static android.view.autofill.AutofillManager.AutofillCallback.EVENT_INPUT_SHOWN;



import android.perftests.utils.BenchmarkState;

import android.perftests.utils.StubActivity;

import android.provider.Settings;

import android.support.test.rule.ActivityTestRule;

import android.support.test.InstrumentationRegistry;

import com.android.perftests.autofill.R;

import android.view.View;

import android.widget.EditText;



import java.util.Locale;

import java.util.Collection;

import java.util.Arrays;

import com.android.perftests.autofill.R;



import org.junit.Test;

import org.junit.After;

import org.junit.Before;

import org.junit.ClassRule;

import org.junit.Rule;

import org.junit.runner.RunWith;



import static android.view.autofill.AutofillManager.AutofillCallback.EVENT_INPUT_HIDDEN;

import static android.view.autofill.AutofillManager.AutofillCallback.EVENT_INPUT_SHOWN;



public class LoginTest extends AbstractAutofillPerfTestCase {