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

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

Merge "Migrate frameworks/base/lowpan/tests to androidx.test"

parents a1824a27 23655a4e

lowpan/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 \

	guava \

	mockito-target-minus-junit4 \

	frameworks-base-testutils \

lowpan/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.lowpan.test"

        android:label="Frameworks LoWPAN API Tests">

    </instrumentation>

lowpan/tests/AndroidTest.xml

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

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

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

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

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

    </test>

</configuration>

lowpan/tests/README.md

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ runtests.sh -e class android.net.lowpan.LowpanManagerTest 
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

lowpan/tests/runtests.sh

+1 −1
Original line number Diff line number Diff line
@@ -21,4 +21,4 @@ adb wait-for-device 


adb install -r -g "$OUT/data/app/FrameworksLowpanApiTests/FrameworksLowpanApiTests.apk"



adb shell am instrument -w "$@" 'android.net.lowpan.test/android.support.test.runner.AndroidJUnitRunner'
 
adb shell am instrument -w "$@" 'android.net.lowpan.test/androidx.test.runner.AndroidJUnitRunner'