From 8d92261020230e9a22f67c1099bc32a8d4ecce35 Mon Sep 17 00:00:00 2001
From: Vykintas Valkaitis <vykintas.valkaitis@gmail.com>
Date: Tue, 18 Dec 2018 14:50:39 +0000
Subject: [PATCH] Fix assertListItemCount not throwing error when failed bug
 (#269)

---
 .../spain/barista/assertion/BaristaListAssertions.kt      | 5 +++--
 .../spain/barista/sample/ListViewAssertionTest.kt         | 8 ++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/library/src/main/java/com/schibsted/spain/barista/assertion/BaristaListAssertions.kt b/library/src/main/java/com/schibsted/spain/barista/assertion/BaristaListAssertions.kt
index 4cf6ccc3f..0bb272ead 100644
--- a/library/src/main/java/com/schibsted/spain/barista/assertion/BaristaListAssertions.kt
+++ b/library/src/main/java/com/schibsted/spain/barista/assertion/BaristaListAssertions.kt
@@ -12,6 +12,7 @@ import com.schibsted.spain.barista.interaction.BaristaListInteractions.findListV
 import com.schibsted.spain.barista.interaction.BaristaListInteractions.findRecyclerMatcher
 import com.schibsted.spain.barista.interaction.BaristaListInteractions.scrollListToPosition
 import com.schibsted.spain.barista.internal.failurehandler.SpyFailureHandler
+import com.schibsted.spain.barista.internal.failurehandler.withFailureHandler
 import com.schibsted.spain.barista.internal.matcher.ListViewItemCountAssertion
 import com.schibsted.spain.barista.internal.matcher.RecyclerViewItemCountAssertion
 import org.hamcrest.CoreMatchers
@@ -29,10 +30,10 @@ object BaristaListAssertions {
         val listViewMatcher = findListViewMatcher(listId)
 
         try {
-            Espresso.onView(recyclerMatcher).check(RecyclerViewItemCountAssertion(expectedItemCount))
+            Espresso.onView(recyclerMatcher).withFailureHandler(spyFailureHandler).check(RecyclerViewItemCountAssertion(expectedItemCount))
         } catch (noRecyclerMatching: NoMatchingViewException) {
             try {
-                Espresso.onView(listViewMatcher).check(ListViewItemCountAssertion(expectedItemCount))
+                Espresso.onView(listViewMatcher).withFailureHandler(spyFailureHandler).check(ListViewItemCountAssertion(expectedItemCount))
             } catch (listViewError: Throwable) {
                 spyFailureHandler.resendLastError("Item count mismatch on ListView. Expected $expectedItemCount items in the list.")
             }
diff --git a/sample/src/androidTest/java/com/schibsted/spain/barista/sample/ListViewAssertionTest.kt b/sample/src/androidTest/java/com/schibsted/spain/barista/sample/ListViewAssertionTest.kt
index a7ed7af37..ccea39dad 100644
--- a/sample/src/androidTest/java/com/schibsted/spain/barista/sample/ListViewAssertionTest.kt
+++ b/sample/src/androidTest/java/com/schibsted/spain/barista/sample/ListViewAssertionTest.kt
@@ -5,6 +5,7 @@ import android.support.test.rule.ActivityTestRule
 import android.support.test.runner.AndroidJUnit4
 import com.schibsted.spain.barista.assertion.BaristaListAssertions.assertDisplayedAtPosition
 import com.schibsted.spain.barista.assertion.BaristaListAssertions.assertListItemCount
+import com.schibsted.spain.barista.internal.failurehandler.BaristaException
 import junit.framework.AssertionFailedError
 import org.junit.Rule
 import org.junit.Test
@@ -24,6 +25,13 @@ class ListViewAssertionTest {
         assertListItemCount(R.id.listview, expectedListLength)
     }
 
+    @Test(expected = BaristaException::class)
+    fun shouldFailWhenNumberOfEntriesInListViewDoesNotMatchExpected() {
+        openSimpleListActivity()
+        val expectedListLength = ListsActivity.FRUITS.size
+        assertListItemCount(R.id.listview, expectedListLength + 1)
+    }
+
     @Test
     fun shouldFindItemInListViewWithoutIdInSimpleList() {
         openSimpleListActivity()