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

Commit 5fb84993 authored by koushik panuganti's avatar koushik panuganti Committed by Koushik Panuganti
Browse files

Migrate packages/services/Telecomm to androidx.test 

See go/jetpack-test-android-migration

Test: mmma packages/services/Telecomm
Change-Id: I7b9049dc66c959de033d42f0b5c2dbd6bdd7bf62
parent b85296aa

Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -27,7 +27,7 @@ android_test { 
        "android-ex-camera2",

        "android-ex-camera2",

        "guava",

        "guava",

        "mockito-target-inline",

        "mockito-target-inline",

        "android-support-test",

        "androidx.test.rules",

        "platform-test-annotations",

        "platform-test-annotations",

        "androidx.legacy_legacy-support-core-ui",

        "androidx.legacy_legacy-support-core-ui",

        "androidx.legacy_legacy-support-core-utils",

        "androidx.legacy_legacy-support-core-utils",

scripts/telecom_testing.sh

+2 −2
Original line number Original line Diff line number Diff line
@@ -58,12 +58,12 @@ _lite_test_general() { 
      build_dir="packages/services/Telecomm/tests"

      build_dir="packages/services/Telecomm/tests"

      apk_loc="data/app/TelecomUnitTests/TelecomUnitTests.apk"

      apk_loc="data/app/TelecomUnitTests/TelecomUnitTests.apk"

      package_prefix="com.android.server.telecom.tests"

      package_prefix="com.android.server.telecom.tests"

      instrumentation="android.support.test.runner.AndroidJUnitRunner";;

      instrumentation="androidx.test.runner.AndroidJUnitRunner";;

    "telephony")

    "telephony")

      build_dir="frameworks/opt/telephony/tests/"

      build_dir="frameworks/opt/telephony/tests/"

      apk_loc="data/app/FrameworksTelephonyTests/FrameworksTelephonyTests.apk"

      apk_loc="data/app/FrameworksTelephonyTests/FrameworksTelephonyTests.apk"

      package_prefix="com.android.frameworks.telephonytests"

      package_prefix="com.android.frameworks.telephonytests"

      instrumentation="android.support.test.runner.AndroidJUnitRunner";;

      instrumentation="androidx.test.runner.AndroidJUnitRunner";;

  esac

  esac





  local T=$(gettop)

  local T=$(gettop)

tests/AndroidManifest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -52,7 +52,7 @@ 
        adb shell am instrument -w -e class com.android.server.telecom.tests.unit.FooUnitTest \

        adb shell am instrument -w -e class com.android.server.telecom.tests.unit.FooUnitTest \

                               com.android.server.telecom.tests/android.test.InstrumentationTestRunner

                               com.android.server.telecom.tests/android.test.InstrumentationTestRunner

    -->

    -->

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

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

            android:targetPackage="com.android.server.telecom.tests"

            android:targetPackage="com.android.server.telecom.tests"

            android:label="Telecomm application tests"

            android:label="Telecomm application tests"

            android:debuggable="true"/>

            android:debuggable="true"/>

tests/AndroidTest.xml

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

    <option name="test-tag" value="TelecomUnitTests" />

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

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

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

        <option name="package" value="com.android.server.telecom.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"/>

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

    </test>

    </test>

</configuration>
 
</configuration>

tests/src/com/android/server/telecom/tests/AnalyticsTests.java

+12 −13
Original line number Original line Diff line number Diff line
@@ -16,10 +16,18 @@ 




package com.android.server.telecom.tests;

package com.android.server.telecom.tests;





import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.assertNull;

import static org.junit.Assert.assertTrue;

import static org.mockito.Matchers.any;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.mock;



import android.content.Context;

import android.content.Context;

import android.os.Build;

import android.os.Build;

import android.os.Handler;

import android.os.Looper;

import android.telecom.CallAudioState;

import android.telecom.CallAudioState;

import android.telecom.Connection;

import android.telecom.Connection;

import android.telecom.DisconnectCause;

import android.telecom.DisconnectCause;
@@ -31,11 +39,12 @@ import android.telecom.TelecomAnalytics; 
import android.telecom.TelecomManager;

import android.telecom.TelecomManager;

import android.telecom.VideoCallImpl;

import android.telecom.VideoCallImpl;

import android.telecom.VideoProfile;

import android.telecom.VideoProfile;

import android.support.test.filters.FlakyTest;

import android.test.suitebuilder.annotation.MediumTest;

import android.test.suitebuilder.annotation.MediumTest;

import android.test.suitebuilder.annotation.SmallTest;

import android.test.suitebuilder.annotation.SmallTest;

import android.util.Base64;

import android.util.Base64;





import androidx.test.filters.FlakyTest;



import com.android.internal.util.IndentingPrintWriter;

import com.android.internal.util.IndentingPrintWriter;

import com.android.server.telecom.Analytics;

import com.android.server.telecom.Analytics;

import com.android.server.telecom.CallAudioRouteStateMachine;

import com.android.server.telecom.CallAudioRouteStateMachine;
@@ -59,16 +68,6 @@ import java.util.Set; 
import java.util.concurrent.CountDownLatch;

import java.util.concurrent.CountDownLatch;

import java.util.concurrent.TimeUnit;

import java.util.concurrent.TimeUnit;





import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.assertNull;

import static org.junit.Assert.assertTrue;

import static org.mockito.Matchers.any;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.mock;



@RunWith(JUnit4.class)

@RunWith(JUnit4.class)

public class AnalyticsTests extends TelecomSystemTest {

public class AnalyticsTests extends TelecomSystemTest {

    @Override

    @Override