Execute executePendingBindings to fix tests

Karumi · Jan 30, 2019 · a4308ad · a4308ad
1 parent 07a1e0b
commit a4308ad
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 20 deletions.
diff --git a/app/src/androidTest/java/com/karumi/jetpack/superheroes/ui/view/SuperHeroViewHolderTest.kt b/app/src/androidTest/java/com/karumi/jetpack/superheroes/ui/view/SuperHeroViewHolderTest.kt
@@ -16,53 +16,44 @@ class SuperHeroViewHolderTest : ScreenshotTest {
     @Test
     fun showsAnySuperHero() {
         val superHero = givenASuperHero()
-        val (holder, binding) = givenASuperHeroViewHolder()
+        val holder = givenASuperHeroViewHolder()
 
-        renderViewHolder(superHero, holder, binding)
+        holder.render(superHero)
 
         compareScreenshot(holder, R.dimen.super_hero_row_height)
     }
 
     @Test
     fun showsSuperHeroesWithLongNames() {
         val superHero = givenASuperHeroWithALongName()
-        val (holder, binding) = givenASuperHeroViewHolder()
+        val holder = givenASuperHeroViewHolder()
 
-        renderViewHolder(superHero, holder, binding)
+        holder.render(superHero)
 
         compareScreenshot(holder, R.dimen.super_hero_row_height)
     }
 
     @Test
     fun showsSuperHeroesWithLongDescriptions() {
         val superHero = givenASuperHeroWithALongDescription()
-        val (holder, binding) = givenASuperHeroViewHolder()
+        val holder = givenASuperHeroViewHolder()
 
-        renderViewHolder(superHero, holder, binding)
+        holder.render(superHero)
 
         compareScreenshot(holder, R.dimen.super_hero_row_height)
     }
 
     @Test
     fun showsAvengersBadge() {
         val superHero = givenASuperHero(isAvenger = true)
-        val (holder, binding) = givenASuperHeroViewHolder()
+        val holder = givenASuperHeroViewHolder()
 
-        renderViewHolder(superHero, holder, binding)
+        holder.render(superHero)
 
         compareScreenshot(holder, R.dimen.super_hero_row_height)
     }
 
-    private fun renderViewHolder(
-        superHero: SuperHero,
-        holder: SuperHeroViewHolder,
-        binding: SuperHeroRowBinding
-    ) {
-        holder.render(superHero)
-        binding.executePendingBindings()
-    }
-
-    private fun givenASuperHeroViewHolder(): Pair<SuperHeroViewHolder, SuperHeroRowBinding> =
+    private fun givenASuperHeroViewHolder(): SuperHeroViewHolder =
         runOnUi {
             val context = InstrumentationRegistry.getInstrumentation().targetContext
             val inflater = LayoutInflater.from(context)
@@ -71,7 +62,7 @@ class SuperHeroViewHolderTest : ScreenshotTest {
             SuperHeroViewHolder(
                 binding,
                 mock<SuperHeroesPresenter>(SuperHeroesPresenter::class.java)
-            ) to binding
+            )
         }
 
     private fun givenASuperHeroWithALongDescription(): SuperHero {

diff --git a/app/src/main/java/com/karumi/jetpack/superheroes/ui/view/adapter/SuperHeroViewHolder.kt b/app/src/main/java/com/karumi/jetpack/superheroes/ui/view/adapter/SuperHeroViewHolder.kt
@@ -13,5 +13,6 @@ class SuperHeroViewHolder(
     fun render(superHero: SuperHero) {
         binding.superHero = superHero
         binding.listener = listener
+        binding.executePendingBindings()
     }
 }
diff --git a/app/src/main/java/com/karumi/jetpack/superheroes/ui/view/adapter/SuperHeroesAdapter.kt b/app/src/main/java/com/karumi/jetpack/superheroes/ui/view/adapter/SuperHeroesAdapter.kt
@@ -8,7 +8,6 @@ import com.karumi.jetpack.superheroes.R
 import com.karumi.jetpack.superheroes.databinding.SuperHeroRowBinding
 import com.karumi.jetpack.superheroes.domain.model.SuperHero
 import com.karumi.jetpack.superheroes.ui.presenter.SuperHeroesListener
-import com.karumi.jetpack.superheroes.ui.presenter.SuperHeroesPresenter
 
 internal class SuperHeroesAdapter(
     private val listener: SuperHeroesListener