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

Commit c9f79d8f authored by KOUSHIK PANUGANTI's avatar KOUSHIK PANUGANTI
Browse files

Migrate frameworks/base/wifi to androidx.test 

See go/jetpack-test-android-migration

Test: make checkbuild
Change-Id: Ia0461fe59f3bf847e5c3edd13948b1688274c876
parent 0737b181

wifi/tests/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ LOCAL_JACK_COVERAGE_INCLUDE_FILTER := $(jacoco_include) 
LOCAL_JACK_COVERAGE_EXCLUDE_FILTER := $(jacoco_exclude)



LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-test \

    androidx.test.rules \

    core-test-rules \

    guava \

    mockito-target-minus-junit4 \

wifi/tests/AndroidManifest.xml

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

    </application>



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

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

        android:targetPackage="android.net.wifi.test"

        android:label="Frameworks Wifi API Tests">

    </instrumentation>

wifi/tests/AndroidTest.xml

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

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

        <option name="package" value="android.net.wifi.test" />

        <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>

wifi/tests/README.md

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ runtests.sh -e class android.net.wifi.WifiScannerTest 
If you manually build and push the test APK to the device you can run tests using



```

adb shell am instrument -w 'android.net.wifi.test/android.support.test.runner.AndroidJUnitRunner'

adb shell am instrument -w 'android.net.wifi.test/androidx.test.runner.AndroidJUnitRunner'

```



## Adding Tests

wifi/tests/runtests.sh

+1 −1
Original line number Diff line number Diff line
@@ -22,4 +22,4 @@ adb wait-for-device 
adb install -r -g "$OUT/data/app/FrameworksWifiApiTests/FrameworksWifiApiTests.apk"



adb shell am instrument --no-hidden-api-checks -w "$@" \

  'android.net.wifi.test/android.support.test.runner.AndroidJUnitRunner'
 
  'android.net.wifi.test/androidx.test.runner.AndroidJUnitRunner'