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

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

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

parents ee00fea7 511606f5

apct-tests/perftests/utils/Android.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir) 
include $(CLEAR_VARS)

include $(CLEAR_VARS)





LOCAL_STATIC_JAVA_LIBRARIES := \

LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-test \

    androidx.test.rules \

    androidx.annotation_annotation

    androidx.annotation_annotation





# Build all java files in the java subdirectory

# Build all java files in the java subdirectory

apct-tests/perftests/utils/src/android/perftests/utils/BenchmarkState.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -20,9 +20,10 @@ import android.app.Activity; 
import android.app.Instrumentation;

import android.app.Instrumentation;

import android.os.Bundle;

import android.os.Bundle;

import android.os.Debug;

import android.os.Debug;

import android.support.test.InstrumentationRegistry;

import android.util.Log;

import android.util.Log;





import androidx.test.InstrumentationRegistry;



import java.io.File;

import java.io.File;

import java.util.ArrayList;

import java.util.ArrayList;

import java.util.concurrent.TimeUnit;

import java.util.concurrent.TimeUnit;

apct-tests/perftests/utils/src/android/perftests/utils/PerfManualStatusReporter.java

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




package android.perftests.utils;

package android.perftests.utils;





import android.support.test.InstrumentationRegistry;

import androidx.test.InstrumentationRegistry;





import org.junit.rules.TestRule;

import org.junit.rules.TestRule;

import org.junit.runner.Description;

import org.junit.runner.Description;

apct-tests/perftests/utils/src/android/perftests/utils/PerfStatusReporter.java

+5 −4
Original line number Original line Diff line number Diff line
@@ -16,16 +16,17 @@ 




package android.perftests.utils;

package android.perftests.utils;





import android.support.test.InstrumentationRegistry;

import static junit.framework.Assert.assertFalse;

import static junit.framework.Assert.assertTrue;



import android.util.Log;

import android.util.Log;





import androidx.test.InstrumentationRegistry;



import org.junit.rules.TestRule;

import org.junit.rules.TestRule;

import org.junit.runner.Description;

import org.junit.runner.Description;

import org.junit.runners.model.Statement;

import org.junit.runners.model.Statement;





import static junit.framework.Assert.assertFalse;

import static junit.framework.Assert.assertTrue;



/**

/**

 * Use this rule to make sure we report the status after the test success.

 * Use this rule to make sure we report the status after the test success.

 *

 *

apct-tests/perftests/utils/src/android/perftests/utils/ShellHelper.java

+3 −4
Original line number Original line Diff line number Diff line
@@ -17,14 +17,13 @@ package android.perftests.utils; 




import android.app.UiAutomation;

import android.app.UiAutomation;

import android.os.ParcelFileDescriptor;

import android.os.ParcelFileDescriptor;

import android.support.test.InstrumentationRegistry;

import android.text.TextUtils;

import android.text.TextUtils;

import android.util.AndroidRuntimeException;

import android.util.AndroidRuntimeException;

import android.util.Log;



import java.io.FileInputStream;





import androidx.annotation.NonNull;

import androidx.annotation.NonNull;

import androidx.test.InstrumentationRegistry;



import java.io.FileInputStream;





/**

/**

 * Provides Shell-based utilities such as running a command.

 * Provides Shell-based utilities such as running a command.