diff --git a/.travis.yml b/.travis.yml index 2e27079..14fc014 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,3 @@ language: android before_install: - mkdir "$ANDROID_HOME/licenses" || true - echo -e "\nd56f5187479451eabf01fb78af6dfcb131a6481e\n24333f8a63b6825ea9c5514f83c2829b004d1fee" > "$ANDROID_HOME/licenses/android-sdk-license" -before_script: - - sdkmanager "system-images;android-21;default;armeabi-v7a" - - sdkmanager "emulator" - - echo no | avdmanager create avd -f -n fastscroller_test_emulator -k "system-images;android-21;default;armeabi-v7a" - - $ANDROID_HOME/emulator/emulator -avd fastscroller_test_emulator -no-audio -no-window & - - android-wait-for-emulator - - adb shell input keyevent 82 & diff --git a/indicator-fast-scroll/build.gradle b/indicator-fast-scroll/build.gradle index b48a336..20d04df 100644 --- a/indicator-fast-scroll/build.gradle +++ b/indicator-fast-scroll/build.gradle @@ -14,6 +14,8 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + testOptions.unitTests.includeAndroidResources = true + // TODO replace with https://issuetracker.google.com/issues/72050365 once released. libraryVariants.all { it.generateBuildConfig.enabled = false @@ -30,8 +32,8 @@ dependencies { implementation 'androidx.core:core-ktx:1.0.1' - testImplementation 'junit:junit:4.12' - androidTestImplementation "androidx.test.ext:junit:1.0.0" - androidTestImplementation 'androidx.test:rules:1.1.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0' + testImplementation "androidx.test.ext:junit:1.1.1" + testImplementation 'androidx.test:rules:1.2.0' + testImplementation 'androidx.test.espresso:espresso-core:3.2.0' + testImplementation 'org.robolectric:robolectric:4.3' } diff --git a/indicator-fast-scroll/src/androidTest/AndroidManifest.xml b/indicator-fast-scroll/src/test/AndroidManifest.xml similarity index 100% rename from indicator-fast-scroll/src/androidTest/AndroidManifest.xml rename to indicator-fast-scroll/src/test/AndroidManifest.xml diff --git a/indicator-fast-scroll/src/androidTest/java/com/reddit/indicatorfastscroll/TestActivity.kt b/indicator-fast-scroll/src/test/java/com/reddit/indicatorfastscroll/TestActivity.kt similarity index 100% rename from indicator-fast-scroll/src/androidTest/java/com/reddit/indicatorfastscroll/TestActivity.kt rename to indicator-fast-scroll/src/test/java/com/reddit/indicatorfastscroll/TestActivity.kt diff --git a/indicator-fast-scroll/src/androidTest/java/com/reddit/indicatorfastscroll/TestItemIndicatorsBuilder.kt b/indicator-fast-scroll/src/test/java/com/reddit/indicatorfastscroll/TestItemIndicatorsBuilder.kt similarity index 100% rename from indicator-fast-scroll/src/androidTest/java/com/reddit/indicatorfastscroll/TestItemIndicatorsBuilder.kt rename to indicator-fast-scroll/src/test/java/com/reddit/indicatorfastscroll/TestItemIndicatorsBuilder.kt diff --git a/indicator-fast-scroll/src/androidTest/java/com/reddit/indicatorfastscroll/Tests.kt b/indicator-fast-scroll/src/test/java/com/reddit/indicatorfastscroll/Tests.kt similarity index 97% rename from indicator-fast-scroll/src/androidTest/java/com/reddit/indicatorfastscroll/Tests.kt rename to indicator-fast-scroll/src/test/java/com/reddit/indicatorfastscroll/Tests.kt index 982ec1f..131af69 100644 --- a/indicator-fast-scroll/src/androidTest/java/com/reddit/indicatorfastscroll/Tests.kt +++ b/indicator-fast-scroll/src/test/java/com/reddit/indicatorfastscroll/Tests.kt @@ -13,8 +13,12 @@ import org.junit.Assert.assertEquals import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith +import org.robolectric.annotation.Config +import org.robolectric.annotation.LooperMode @RunWith(AndroidJUnit4::class) +@Config(sdk = [21], qualifiers = "xhdpi") +@LooperMode(LooperMode.Mode.PAUSED) @LargeTest class Tests { diff --git a/indicator-fast-scroll/src/androidTest/res/layout/test.xml b/indicator-fast-scroll/src/test/res/layout/test.xml similarity index 100% rename from indicator-fast-scroll/src/androidTest/res/layout/test.xml rename to indicator-fast-scroll/src/test/res/layout/test.xml diff --git a/indicator-fast-scroll/src/androidTest/res/values/dimens.xml b/indicator-fast-scroll/src/test/res/values/dimens.xml similarity index 100% rename from indicator-fast-scroll/src/androidTest/res/values/dimens.xml rename to indicator-fast-scroll/src/test/res/values/dimens.xml diff --git a/indicator-fast-scroll/src/androidTest/res/values/styles.xml b/indicator-fast-scroll/src/test/res/values/styles.xml similarity index 100% rename from indicator-fast-scroll/src/androidTest/res/values/styles.xml rename to indicator-fast-scroll/src/test/res/values/styles.xml