Removes ugly cast from GithubBrowserSample

Author: JoseAlcerreca

GithubBrowserSample/app/src/androidTest/java/com/android/example/github/ui/repo/RepoFragmentTest.kt

@@ -70,7 +70,7 @@ class RepoFragmentTest {
     val countingAppExecutors = CountingAppExecutorsRule()
     @Rule
     @JvmField
-    val dataBindingIdlingResourceRule = DataBindingIdlingResourceRule()
+    val dataBindingIdlingResourceRule = DataBindingIdlingResourceRule<RepoFragment>()
 
     private val navController = mock<NavController>()
     private val repoLiveData = MutableLiveData<Resource<Repo>>()

GithubBrowserSample/app/src/androidTest/java/com/android/example/github/ui/search/SearchFragmentTest.kt

@@ -69,7 +69,7 @@ class SearchFragmentTest {
     val countingAppExecutors = CountingAppExecutorsRule()
     @Rule
     @JvmField
-    val dataBindingIdlingResourceRule = DataBindingIdlingResourceRule()
+    val dataBindingIdlingResourceRule = DataBindingIdlingResourceRule<SearchFragment>()
 
     private lateinit var mockBindingAdapter: FragmentBindingAdapters
     private lateinit var viewModel: SearchViewModel
@@ -180,4 +180,4 @@ class SearchFragmentTest {
     private fun listMatcher(): RecyclerViewMatcher {
         return RecyclerViewMatcher(R.id.repo_list)
     }
-}
+}

GithubBrowserSample/app/src/androidTest/java/com/android/example/github/ui/user/UserFragmentTest.kt

@@ -64,7 +64,7 @@ class UserFragmentTest {
     val countingAppExecutors = CountingAppExecutorsRule()
     @Rule
     @JvmField
-    val dataBindingIdlingResourceRule = DataBindingIdlingResourceRule()
+    val dataBindingIdlingResourceRule = DataBindingIdlingResourceRule<UserFragment>()
     private lateinit var viewModel: UserViewModel
     private lateinit var mockBindingAdapter: FragmentBindingAdapters
     private val navController = mock<NavController>()
@@ -198,4 +198,4 @@ class UserFragmentTest {
         repoListData.postValue(Resource.success(repos))
         return repos
     }
-}
+}

GithubBrowserSample/app/src/androidTest/java/com/android/example/github/util/DataBindingIdlingResource.kt

@@ -34,7 +34,7 @@ import java.util.UUID
  * calling [monitorFragment] with a [FragmentScenario], thereby monitoring all bindings in that
  * fragment and any child views.
  */
-class DataBindingIdlingResource : IdlingResource {
+class DataBindingIdlingResource<F : Fragment> : IdlingResource {
     // list of registered callbacks
     private val idlingCallbacks = mutableListOf<IdlingResource.ResourceCallback>()
     // give it a unique id to workaround an espresso bug where you cannot register/unregister
@@ -44,14 +44,14 @@ class DataBindingIdlingResource : IdlingResource {
     // onTransitionToIdle callbacks if Espresso never thought we were idle in the first place.
     private var wasNotIdle = false
 
-    private lateinit var scenario: FragmentScenario<out Fragment>
+    private lateinit var scenario: FragmentScenario<F>
 
     override fun getName() = "DataBinding $id"
 
     /**
      * Sets the fragment from a [FragmentScenario] to be used from [DataBindingIdlingResource].
      */
-    fun monitorFragment(fragmentScenario: FragmentScenario<out Fragment>) {
+    fun monitorFragment(fragmentScenario: FragmentScenario<F>) {
         scenario = fragmentScenario
     }
 
@@ -67,7 +67,7 @@ class DataBindingIdlingResource : IdlingResource {
         } else {
             wasNotIdle = true
             // check next frame
-            (scenario as FragmentScenario<Fragment>).onFragment { fragment ->
+            scenario.onFragment { fragment ->
                 fragment.view?.postDelayed({
                     if (fragment.view != null) {
                         isIdleNow
@@ -87,7 +87,7 @@ class DataBindingIdlingResource : IdlingResource {
      */
     private fun getBindings(): List<ViewDataBinding> {
         lateinit var bindings: List<ViewDataBinding>
-        (scenario as FragmentScenario<Fragment>).onFragment {  fragment ->
+        scenario.onFragment {  fragment ->
             bindings = fragment.requireView().flattenHierarchy().mapNotNull { view ->
                 DataBindingUtil.getBinding<ViewDataBinding>(view)
             }

GithubBrowserSample/app/src/androidTest/java/com/android/example/github/util/DataBindingIdlingResourceRule.kt

@@ -25,10 +25,10 @@ import org.junit.runner.Description
 /**
  * A JUnit rule that registers an idling resource for all fragment views that use data binding.
  */
-class DataBindingIdlingResourceRule() : TestWatcher() {
-    private val idlingResource = DataBindingIdlingResource()
+class DataBindingIdlingResourceRule<F : Fragment>() : TestWatcher() {
+    private val idlingResource = DataBindingIdlingResource<F>()
 
-    fun monitorFragment(fragmentScenario: FragmentScenario<out Fragment>) {
+    fun monitorFragment(fragmentScenario: FragmentScenario<F>) {
         idlingResource.monitorFragment(fragmentScenario)
     }
 

GithubBrowserSample/app/src/androidTest/java/com/android/example/github/util/DataBindingIdlingResourceTest.kt

@@ -48,12 +48,12 @@ import java.util.concurrent.atomic.AtomicBoolean
 
 @RunWith(AndroidJUnit4::class)
 class DataBindingIdlingResourceTest {
-    private val idlingResource = DataBindingIdlingResource()
+    private val idlingResource = DataBindingIdlingResource<TestFragment>()
     private lateinit var scenario: FragmentScenario<TestFragment>
 
     @Before
     fun init() {
-        scenario = launchFragmentInContainer<TestFragment>()
+        scenario = launchFragmentInContainer()
         idlingResource.monitorFragment(scenario)
         IdlingRegistry.getInstance().register(idlingResource)
         Espresso.onIdle()