Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
See go/jetpack-test-android-migration

Test: make checkbuild
Change-Id: I2fd63c13d298e9651566171837d14cc30d05850e
This commit is contained in:
KOUSHIK PANUGANTI
2018-12-17 14:53:34 -08:00
parent 1e65287c50
commit 511606f5da
5 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apct-tests/perftests/utils/Android.mk
View File

@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \
androidx.test.rules \
androidx.annotation_annotation
# Build all java files in the java subdirectory

3
apct-tests/perftests/utils/src/android/perftests/utils/BenchmarkState.java
View File

@@ -20,9 +20,10 @@ import android.app.Activity;
import android.app.Instrumentation;
import android.os.Bundle;
import android.os.Debug;
import android.support.test.InstrumentationRegistry;
import android.util.Log;
import androidx.test.InstrumentationRegistry;
import java.io.File;
import java.util.ArrayList;
import java.util.concurrent.TimeUnit;

2
apct-tests/perftests/utils/src/android/perftests/utils/PerfManualStatusReporter.java
View File

@@ -16,7 +16,7 @@
package android.perftests.utils;
import android.support.test.InstrumentationRegistry;
import androidx.test.InstrumentationRegistry;
import org.junit.rules.TestRule;
import org.junit.runner.Description;

9
apct-tests/perftests/utils/src/android/perftests/utils/PerfStatusReporter.java
View File

@@ -16,16 +16,17 @@
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 androidx.test.InstrumentationRegistry;
import org.junit.rules.TestRule;
import org.junit.runner.Description;
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.
*

7
apct-tests/perftests/utils/src/android/perftests/utils/ShellHelper.java
View File

@@ -17,14 +17,13 @@ package android.perftests.utils;
import android.app.UiAutomation;
import android.os.ParcelFileDescriptor;
import android.support.test.InstrumentationRegistry;
import android.text.TextUtils;
import android.util.AndroidRuntimeException;
import android.util.Log;
import java.io.FileInputStream;
import androidx.annotation.NonNull;
import androidx.test.InstrumentationRegistry;
import java.io.FileInputStream;
/**
* Provides Shell-based utilities such as running a command.