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

Commit 343676e4 authored by KOUSHIK PANUGANTI's avatar KOUSHIK PANUGANTI Committed by android-build-merger
Browse files

Merge "Migrate frameworks/base/packages/Shell to androidx.test" 

am: fae40404

Change-Id: Icc87997f68dcc8256fec71d213ea754d8bd8c729
parents e9b8d290 fae40404

packages/Shell/tests/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) 
LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base android.test.mock



LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-test \

    androidx.test.rules \

    mockito-target-minus-junit4 \

    ub-uiautomator \

    junit \

packages/Shell/tests/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
        </activity>

    </application>



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

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

        android:targetPackage="com.android.shell"

        android:label="Tests for Shell" />

packages/Shell/tests/AndroidTest.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    <option name="test-tag" value="ShellTests" />

    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >

        <option name="package" value="com.android.shell.tests" />

        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />

        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />

        <option name="hidden-api-checks" value="false"/>

    </test>

</configuration>

packages/Shell/tests/src/com/android/shell/BugreportProgressServiceTest.java

+3 −4
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static com.android.shell.BugreportProgressService.findSendToAccount; 
import static junit.framework.Assert.assertEquals;

import static junit.framework.Assert.assertNull;



import static org.mockito.Matchers.anyInt;

import static org.mockito.Matchers.eq;

import static org.mockito.Mockito.when;
@@ -29,12 +28,12 @@ import android.accounts.AccountManager; 
import android.content.Context;

import android.os.UserHandle;

import android.os.UserManager;

import android.support.test.filters.SmallTest;

import android.support.test.runner.AndroidJUnit4;

import android.test.mock.MockContext;

import android.util.Pair;



import org.junit.Before;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java

+31 −31
Original line number Diff line number Diff line
@@ -42,34 +42,6 @@ import static org.junit.Assert.assertNull; 
import static org.junit.Assert.assertTrue;

import static org.junit.Assert.fail;



import java.io.BufferedOutputStream;

import java.io.BufferedWriter;

import java.io.ByteArrayOutputStream;

import java.io.File;

import java.io.FileOutputStream;

import java.io.IOException;

import java.io.InputStream;

import java.io.OutputStreamWriter;

import java.io.Writer;

import java.text.NumberFormat;

import java.util.ArrayList;

import java.util.List;

import java.util.SortedSet;

import java.util.TreeSet;

import java.util.zip.ZipEntry;

import java.util.zip.ZipInputStream;

import java.util.zip.ZipOutputStream;



import libcore.io.Streams;



import org.junit.After;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Rule;

import org.junit.Test;

import org.junit.rules.TestName;

import org.junit.runner.RunWith;



import android.app.ActivityManager;

import android.app.ActivityManager.RunningServiceInfo;

import android.app.Instrumentation;
@@ -82,9 +54,6 @@ import android.os.Bundle; 
import android.os.SystemClock;

import android.os.SystemProperties;

import android.service.notification.StatusBarNotification;

import android.support.test.InstrumentationRegistry;

import android.support.test.filters.LargeTest;

import android.support.test.runner.AndroidJUnit4;

import android.support.test.uiautomator.UiDevice;

import android.support.test.uiautomator.UiObject;

import android.support.test.uiautomator.UiObjectNotFoundException;
@@ -92,8 +61,39 @@ import android.text.TextUtils; 
import android.text.format.DateUtils;

import android.util.Log;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.LargeTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.shell.ActionSendMultipleConsumerActivity.CustomActionSendMultipleListener;



import libcore.io.Streams;



import org.junit.After;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.rules.TestName;

import org.junit.runner.RunWith;



import java.io.BufferedOutputStream;

import java.io.BufferedWriter;

import java.io.ByteArrayOutputStream;

import java.io.File;

import java.io.FileOutputStream;

import java.io.IOException;

import java.io.InputStream;

import java.io.OutputStreamWriter;

import java.io.Writer;

import java.text.NumberFormat;

import java.util.ArrayList;

import java.util.List;

import java.util.SortedSet;

import java.util.TreeSet;

import java.util.zip.ZipEntry;

import java.util.zip.ZipInputStream;

import java.util.zip.ZipOutputStream;



/**

 * Integration tests for {@link BugreportReceiver}.

 * <p>