Support locale wrapping

Author: Daniel Jette

Ext/src/main/java/com/shopify/testify/ext/TestHarnessActivity.kt

@@ -25,6 +25,7 @@
 
 package com.shopify.testify.ext
 
+import android.content.Context
 import android.graphics.Color
 import android.os.Bundle
 import android.view.View
@@ -34,6 +35,8 @@ import androidx.annotation.VisibleForTesting
 import androidx.appcompat.app.AppCompatActivity
 import androidx.test.rule.ActivityTestRule
 import com.shopify.testify.ScreenshotRule
+import com.shopify.testify.resources.TestifyResourcesOverride
+import java.util.Locale
 
 /**
  * The TestHarnessActivity is used as scaffolding for testing arbitrary views.
@@ -42,7 +45,7 @@ import com.shopify.testify.ScreenshotRule
  * This empty activity can be used as a generic container for testing your custom [View] classes.
  */
 @VisibleForTesting
-open class TestHarnessActivity : AppCompatActivity() {
+open class TestHarnessActivity : AppCompatActivity(), TestifyResourcesOverride {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -53,11 +56,23 @@ open class TestHarnessActivity : AppCompatActivity() {
             id = R.id.harness_root
         })
 
-        if (intent?.hasExtra(EXTRA_TESTIFY_HARNESS_ACTIVITY_TITLE) == true) {
-            title = intent.getStringExtra(EXTRA_TESTIFY_HARNESS_ACTIVITY_TITLE)
+        intent.getStringExtra(EXTRA_TESTIFY_HARNESS_ACTIVITY_TITLE)?.let {
+            title = it
         }
     }
 
+    /**
+     *
+     * Starting in Android API Version 24 (Nougat), the proper way to dynamically alter an Activity's
+     * resources and locale is to wrap the base [Context] in [AppCompatActivity.attachBaseContext]
+     * with a Context that has been updated with a new [Locale]. Testify provides a helper interface,
+     * [TestifyResourcesOverride] which provides a Context extension method, [TestifyResourcesOverride.wrap].
+     *
+     */
+    override fun attachBaseContext(newBase: Context?) {
+        super.attachBaseContext(newBase?.wrap())
+    }
+
     companion object {
         const val EXTRA_TESTIFY_HARNESS_ACTIVITY_TITLE = "extra_title"
     }

Sample/src/androidTest/java/com/shopify/testify/sample/TestingResourcesCounterExampleTest.kt

@@ -24,13 +24,13 @@
 
 package com.shopify.testify.sample
 
+import android.app.Activity
 import android.os.Build
 import androidx.test.filters.SdkSuppress
 import com.nhaarman.mockitokotlin2.doReturn
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
 import com.shopify.testify.ScreenshotRule
-import com.shopify.testify.ext.TestHarnessActivity
 import com.shopify.testify.internal.exception.ActivityMustImplementResourceOverrideException
 import com.shopify.testify.internal.exception.TestMustLaunchActivityException
 import com.shopify.testify.internal.exception.TestMustWrapContextException
@@ -77,8 +77,8 @@ class TestingResourcesCounterExampleTest {
     @Test(expected = ActivityMustImplementResourceOverrideException::class)
     fun usingSetLocaleRequiresActivityToImplementResourceOverride() {
 
-        val activity = mock<TestHarnessActivity>().apply {
-            doReturn("TestHarnessActivity").whenever(this).localClassName
+        val activity = mock<Activity>().apply {
+            doReturn("Activity").whenever(this).localClassName
         }
 
         ResourceWrapper.addOverride(WrappedLocale(Locale.FRANCE))