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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-01-22 19:56:17 +00:00
committed by Android (Google) Code Review
parent a1824a2700 23655a4ead
commit 6f19cbdd2f
7 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lowpan/tests/Android.mk
View File

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

2
lowpan/tests/AndroidManifest.xml
View File

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

2
lowpan/tests/AndroidTest.xml
View File

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

2
lowpan/tests/README.md
View File

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

2
lowpan/tests/runtests.sh
View File

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

7
lowpan/tests/src/android/net/lowpan/LowpanInterfaceTest.java
View File

@@ -23,15 +23,18 @@ import android.content.pm.ApplicationInfo;
import android.os.Handler;
import android.os.IBinder;
import android.os.test.TestLooper;
import android.support.test.runner.AndroidJUnit4;
import android.test.suitebuilder.annotation.SmallTest;
import java.util.Map;
import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import java.util.Map;
/** Unit tests for android.net.lowpan.LowpanInterface. */
@RunWith(AndroidJUnit4.class)
@SmallTest

4
lowpan/tests/src/android/net/lowpan/LowpanManagerTest.java
View File

@@ -26,8 +26,10 @@ import android.content.pm.ApplicationInfo;
import android.os.Handler;
import android.os.IBinder;
import android.os.test.TestLooper;
import android.support.test.runner.AndroidJUnit4;
import android.test.suitebuilder.annotation.SmallTest;
import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;