Skip to content

Commit 6b0151a

Browse files
yschimkeyschimke
authored
Move androidDeviceTest to androidTest (#9405)
* Move androidDeviceTest to androidTest Rename the source directory for Android device tests to the standard `androidTest` location. * skip tests for now on 21, 23
1 parent ed800bf commit 6b0151a

File tree

8 files changed

+2
-0
lines changed

8 files changed

+2
-0
lines changed

‎android-test/build.gradle.kts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import de.mannodermaus.gradle.plugins.junit5.dsl.UnsupportedDeviceBehavior
12
import okhttp3.buildsupport.androidBuild
23

34
plugins {
@@ -108,6 +109,7 @@ dependencies {
108109
}
109110

110111
junitPlatform {
112+
instrumentationTests.behaviorForUnsupportedDevices = UnsupportedDeviceBehavior.Skip
111113
filters {
112114
excludeTags("Remote")
113115
}

android-test/src/androidDeviceTest/README.md renamed to android-test/src/androidTest/README.md

File renamed without changes.

android-test/src/androidDeviceTest/java/okhttp/android/test/OkHttpTest.kt renamed to android-test/src/androidTest/java/okhttp/android/test/OkHttpTest.kt

File renamed without changes.

android-test/src/androidDeviceTest/java/okhttp/android/test/SingleAndroidTest.kt renamed to android-test/src/androidTest/java/okhttp/android/test/SingleAndroidTest.kt

File renamed without changes.

android-test/src/androidDeviceTest/java/okhttp/android/test/StrictModeTest.kt renamed to android-test/src/androidTest/java/okhttp/android/test/StrictModeTest.kt

File renamed without changes.

android-test/src/androidDeviceTest/java/okhttp/android/test/alpn/AlpnOverrideTest.kt renamed to android-test/src/androidTest/java/okhttp/android/test/alpn/AlpnOverrideTest.kt

File renamed without changes.

android-test/src/androidDeviceTest/java/okhttp/android/test/letsencrypt/LetsEncryptClientTest.kt renamed to android-test/src/androidTest/java/okhttp/android/test/letsencrypt/LetsEncryptClientTest.kt

File renamed without changes.

android-test/src/androidDeviceTest/java/okhttp/android/test/sni/SniOverrideTest.kt renamed to android-test/src/androidTest/java/okhttp/android/test/sni/SniOverrideTest.kt

File renamed without changes.

0 commit comments

Comments
 (0)
⚡