Update to androidx & introduce Truth assertions (#153)

Author: Marcel Schnelle

buildSrc/src/main/kotlin/Artifacts.kt

@@ -46,7 +46,7 @@ object Artifacts {
    */
   object Instrumentation {
     private val groupId = "de.mannodermaus.junit5"
-    private val currentVersion = "0.2.3-SNAPSHOT"
+    private val currentVersion = "0.3.0-SNAPSHOT"
     val latestStableVersion = "0.2.2"
 
     val Library = Deployed(

buildSrc/src/main/kotlin/Libs.kt

@@ -8,13 +8,13 @@ import kotlin.String
 object Libs {
     /**
      * https://developer.android.com/testing */
-    const val espresso_core: String = "com.android.support.test.espresso:espresso-core:" +
+    const val espresso_core: String = "androidx.test.espresso:espresso-core:" +
             Versions.espresso_core
 
     /**
      * https://developer.android.com/testing */
-    const val com_android_support_test_runner: String = "com.android.support.test:runner:" +
-            Versions.com_android_support_test_runner
+    const val androidx_test_runner: String = "androidx.test:runner:" +
+            Versions.androidx_test_runner
 
     /**
      * https://developer.android.com/studio */
@@ -52,9 +52,14 @@ object Libs {
             Versions.gradle_bintray_plugin
 
     /**
-     * http://github.com/square/assertj-android/ */
-    const val assertj_android: String = "com.squareup.assertj:assertj-android:" +
-            Versions.assertj_android
+     * https://github.com/google/truth */
+    const val truth: String = "com.google.truth:truth:" +
+            Versions.truth
+
+    /**
+     * https://dl.google.com/dl/android/maven2 */
+    const val truth_android: String = "androidx.test.ext:truth:" +
+            Versions.truth_android
 
     /**
      * http://commons.apache.org/proper/commons-io/ */

buildSrc/src/main/kotlin/Versions.kt

@@ -7,9 +7,9 @@ import kotlin.String
  *
  * YOU are responsible for updating manually the dependency version. */
 object Versions {
-    const val espresso_core: String = "3.0.1" // available: "3.0.2"
+    const val espresso_core: String = "3.1.1"
 
-    const val com_android_support_test_runner: String = "1.0.2" 
+    const val androidx_test_runner: String = "1.1.1"
 
     const val aapt2: String = "3.2.1-4818971" 
 
@@ -27,7 +27,9 @@ object Versions {
 
     const val gradle_bintray_plugin: String = "1.8.4" 
 
-    const val assertj_android: String = "1.2.0" 
+    const val truth: String = "0.43"
+
+    const val truth_android: String = "1.1.0"
 
     const val commons_io: String = "2.6" 
 

instrumentation/api/build.gradle.kts

@@ -22,7 +22,7 @@ android {
     multiDexEnabled = true
 
     // Usually, this is automatically applied through the Gradle Plugin
-    testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner"
+    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     testInstrumentationRunnerArgument("runnerBuilder",
         "de.mannodermaus.junit5.AndroidJUnit5Builder")
   }
@@ -75,20 +75,21 @@ configurations {
 
 dependencies {
   implementation(Libs.kotlin_stdlib)
-  implementation(Libs.com_android_support_test_runner)
+  implementation(Libs.androidx_test_runner)
   implementation(Libs.junit_jupiter_api)
 
   // This is required by the "instrumentation-runner" companion library,
   // since it can't provide any JUnit 5 runtime libraries itself
   // due to fear of prematurely incrementing the minSdkVersion requirement.
   runtimeOnly(Libs.junit_platform_runner)
 
+  commonTestImplementation(Libs.truth)
   commonTestImplementation(Libs.assertj_core)
   commonTestImplementation(Libs.mockito_core)
   commonTestImplementation(Libs.junit_jupiter_api)
   commonTestImplementation(Libs.junit_jupiter_engine)
 
-  androidTestImplementation(Libs.assertj_android)
+  androidTestImplementation(Libs.truth_android)
   androidTestImplementation(Libs.espresso_core)
 
   androidTestRuntimeOnly(project(":runner"))

instrumentation/api/src/androidTest/kotlin/de/mannodermaus/junit5/test/ActivityTestIntegrationTests.kt

@@ -1,17 +1,17 @@
 package de.mannodermaus.junit5.test
 
 import android.content.Intent
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.assertion.ViewAssertions.matches
-import android.support.test.espresso.matcher.ViewMatchers.withId
-import android.support.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.truth.content.IntentSubject.assertThat
 import de.mannodermaus.junit5.ActivityAlreadyLaunchedException
 import de.mannodermaus.junit5.ActivityNotLaunchedException
 import de.mannodermaus.junit5.ActivityTest
 import de.mannodermaus.junit5.Tested
 import de.mannodermaus.junit5.test.activities.FirstActivity
 import de.mannodermaus.junit5.test.activities.OtherActivity
-import org.assertj.android.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertThrows
@@ -67,7 +67,7 @@ class ActivityTestIntegrationTests {
   @Test
   @ActivityTest(
       FirstActivity::class,
-      launchFlags = Intent.FLAG_ACTIVITY_NO_HISTORY)
+      launchFlags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_NO_HISTORY)
   @DisplayName("Launch Flags are properly applied")
   fun launchFlagsAreProperlyApplied(activity: FirstActivity) {
     assertIntentHasFlag(activity.intent, Intent.FLAG_ACTIVITY_NO_HISTORY)
@@ -102,14 +102,15 @@ class ActivityTestIntegrationTests {
       action = "custom.intent.action"
       putExtra("extraArgument", "YOLO")
       putExtra("intArgument", 1337)
-      addFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT)
+      addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT)
     }
 
     val activity = tested.launchActivity(intent)
-    assertThat(activity.intent)
-        .hasAction("custom.intent.action")
-        .hasExtra("extraArgument", "YOLO")
-        .hasExtra("intArgument", 1337)
+    assertThat(activity.intent).apply {
+      hasAction("custom.intent.action")
+      extras().string("extraArgument").isEqualTo("YOLO")
+      extras().integer("intArgument").isEqualTo(1337)
+    }
 
     assertIntentHasFlag(activity.intent, Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT)
   }

instrumentation/api/src/androidTest/kotlin/de/mannodermaus/junit5/test/JavaInteropVerificationTests.java

@@ -9,10 +9,10 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static org.assertj.android.api.Assertions.assertThat;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.ext.truth.content.IntentSubject.assertThat;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -46,7 +46,7 @@ void testedApiRoundTrip(Tested<FirstActivity> tested) {
 
     Instrumentation.ActivityResult result = tested.getActivityResult();
     assertThat(result.getResultCode()).isEqualTo(Activity.RESULT_OK);
-    assertThat(result.getResultData()).hasExtra("returnValue", 1337);
+    assertThat(result.getResultData()).extras().integer("returnValue").isEqualTo(1337);
 
     FirstActivity retrieved = tested.getActivity();
     assertThat(launched).isEqualTo(retrieved);

instrumentation/api/src/main/kotlin/de/mannodermaus/junit5/ActivityTest.kt

@@ -5,17 +5,12 @@ import android.app.Instrumentation
 import android.app.Instrumentation.ActivityResult
 import android.content.Intent
 import android.os.Bundle
-import android.support.annotation.VisibleForTesting
-import android.support.test.InstrumentationRegistry
-import android.support.test.runner.MonitoringInstrumentation
 import android.util.Log
+import androidx.annotation.VisibleForTesting
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.runner.MonitoringInstrumentation
 import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.extension.AfterTestExecutionCallback
-import org.junit.jupiter.api.extension.BeforeTestExecutionCallback
-import org.junit.jupiter.api.extension.ExtendWith
-import org.junit.jupiter.api.extension.ExtensionContext
-import org.junit.jupiter.api.extension.ParameterContext
-import org.junit.jupiter.api.extension.ParameterResolver
+import org.junit.jupiter.api.extension.*
 import org.junit.platform.commons.support.AnnotationSupport
 import java.lang.reflect.Parameter
 import java.lang.reflect.ParameterizedType
@@ -62,7 +57,7 @@ private const val LOG_TAG = "ActivityTest"
 annotation class ActivityTest(
     val value: KClass<out Activity>,
     val targetPackage: String = ABSENT_TARGET_PACKAGE,
-    val launchFlags: Int = NO_FLAGS_SET,
+    val launchFlags: Int = Intent.FLAG_ACTIVITY_NEW_TASK,
     val initialTouchMode: Boolean = DEFAULT_INITIAL_TOUCH_MODE,
     val launchActivity: Boolean = DEFAULT_LAUNCH_ACTIVITY)
 
@@ -181,7 +176,8 @@ internal class TestedImpl<out T : Activity>(
   // Used to override the default Instrumentation, obtained from the registry
   // (primary application: Unit Testing)
   private var _instrumentation: Instrumentation? = null
-  private val instrumentation get() = _instrumentation ?: InstrumentationRegistry.getInstrumentation()
+  private val instrumentation
+    get() = _instrumentation ?: InstrumentationRegistry.getInstrumentation()
 
   private var _activity: T? = null
   override val activity get() = _activity
@@ -200,7 +196,7 @@ internal class TestedImpl<out T : Activity>(
     if (startIntent.component == null) {
       // Fall back to the default Target Context's package name if none is set
       val targetPackage = if (this.targetPackage == ABSENT_TARGET_PACKAGE) {
-        InstrumentationRegistry.getTargetContext().packageName
+        InstrumentationRegistry.getInstrumentation().targetContext.packageName
       } else {
         this.targetPackage
       }
@@ -285,12 +281,12 @@ internal class TestedImpl<out T : Activity>(
     val type = parameterTypes[index]
 
     return when (type) {
-    // Possibly a developer error; throw a descriptive exception
+      // Possibly a developer error; throw a descriptive exception
       is ParameterType.InvalidTestedWrapper -> throw UnexpectedActivityException(
           expected = this.activityClass,
           actual = type.actual)
 
-    // Otherwise, communicate only valid parameter types
+      // Otherwise, communicate only valid parameter types
       else -> type.valid
     }
   }
@@ -366,22 +362,22 @@ internal class ActivityTestExtension : BeforeTestExecutionCallback, ParameterRes
   /* ParameterResolver */
 
   override fun supportsParameter(parameterContext: ParameterContext,
-      extensionContext: ExtensionContext): Boolean {
+                                 extensionContext: ExtensionContext): Boolean {
     return delegate.validateParameterAt(parameterContext.index)
   }
 
   override fun resolveParameter(parameterContext: ParameterContext,
-      extensionContext: ExtensionContext): Any? {
+                                extensionContext: ExtensionContext): Any? {
     val parameterType = delegate.parameterTypeAt(parameterContext.index)
 
     return when (parameterType) {
-    // val parameter: Activity
+      // val parameter: Activity
       ParameterType.Activity -> delegate.activity
 
-    // val parameter: Tested<Activity>
+      // val parameter: Tested<Activity>
       ParameterType.ValidTestedWrapper -> delegate
 
-    // Otherwise, library error (supportsParameter() should filter it)
+      // Otherwise, library error (supportsParameter() should filter it)
       else -> throw IllegalArgumentException(
           "Unexpected ParameterType resolution requested for '$parameterType'")
     }

instrumentation/sample/build.gradle.kts

@@ -77,12 +77,12 @@ dependencies {
   testRuntimeOnly(Libs.junit_jupiter_engine)
 
   androidTestImplementation(Libs.junit)
-  androidTestImplementation(Libs.com_android_support_test_runner)
+  androidTestImplementation(Libs.androidx_test_runner)
 
   // Android Instrumentation Tests wth JUnit 5
   androidTestImplementation(Libs.junit_jupiter_api)
   androidTestRuntimeOnly(Libs.junit_jupiter_engine)
   androidTestRuntimeOnly(Libs.junit_platform_runner)
-  androidTestImplementation(Libs.android_instrumentation_test)
-  androidTestRuntimeOnly(Libs.android_instrumentation_test_runner)
+  androidTestImplementation(project(":api"))
+  androidTestRuntimeOnly(project(":runner"))
 }

plugin/android-junit5-tests/src/test/kotlin/de/mannodermaus/gradle/plugins/junit5/FunctionalTests.kt

@@ -21,7 +21,6 @@ import java.nio.file.Paths
 
 /**
  * Created by Marcel Schnelle on 2018/06/19.
- * Copyright © 2018 TenTen Technologies Limited. All rights reserved.
  */
 
 // Data holder for an invocation of a functional test.

plugin/android-junit5-tests/src/test/kotlin/de/mannodermaus/gradle/plugins/junit5/UtilTests.kt

@@ -5,7 +5,6 @@ import org.junit.jupiter.api.Test
 
 /**
  * Created by Marcel Schnelle on 2018/06/28.
- * Copyright © 2018 TenTen Technologies Limited. All rights reserved.
  */
 class IncludeExcludeContainerTests {