add additional idling resource in tool switch and change assertion

Author: foenabua

Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/LayerIntegrationTest.kt

@@ -71,6 +71,7 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import java.io.File
+import java.lang.Thread.sleep
 
 private const val FOUR_LAYERS = 4
 
@@ -583,7 +584,9 @@ class LayerIntegrationTest {
         LayerMenuViewInteraction.onLayerMenuView()
             .performOpen()
             .performSetOpacityTo(50, 0)
-            .performClose()
+
+        sleep(1000)
+        LayerMenuViewInteraction.onLayerMenuView().performClose()
 
         ToolBarViewInteraction.onToolBarView()
             .performSelectTool(ToolType.PIPETTE)

Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/util/wrappers/BottomNavigationViewInteraction.kt

@@ -32,6 +32,7 @@ import org.catrobat.paintroid.tools.ToolType
 import org.hamcrest.Matchers.allOf
 import org.catrobat.paintroid.test.espresso.util.EspressoUtils
 import org.catrobat.paintroid.test.espresso.util.UiMatcher
+import org.hamcrest.Matchers
 
 class BottomNavigationViewInteraction private constructor() :
     CustomViewInteraction(Espresso.onView(withId(R.id.pocketpaint_bottom_navigation))) {
@@ -59,13 +60,36 @@ class BottomNavigationViewInteraction private constructor() :
         var matcher = allOf(withId(R.id.icon),
                 ViewMatchers.isDescendantOfA(withId(R.id.action_current_tool)),
                 UiMatcher.withDrawable(R.drawable.ic_pocketpaint_tool_brush))
-        var assertion = ViewAssertions.matches(isDisplayed())
+        var assertion = ViewAssertions.matches(
+            Matchers.allOf(
+                isDisplayed(),
+                UiMatcher.withDrawable(toolType.drawableResource)
+            )
+        )
         EspressoUtils.assertOnView(matcher, assertion)
 
-        matcher = allOf(withId(R.id.action_current_tool), ViewMatchers.hasDescendant(withText(toolType.nameResource)))
+        matcher = allOf(withId(R.id.action_current_tool))
+        assertion = ViewAssertions.matches(
+            Matchers.allOf(
+                isDisplayed(),
+                ViewMatchers.hasDescendant(withText(toolType.nameResource))
+            )
+        )
         EspressoUtils.assertOnView(matcher, assertion)
     }
 
+    /*fun checkShowsCurrentTool(toolType: ToolType): ViewInteraction {
+        Espresso.onView(
+            allOf(
+                withId(R.id.icon),
+                ViewMatchers.isDescendantOfA(withId(R.id.action_current_tool))
+            )
+        )
+            .check(ViewAssertions.matches(UiMatcher.withDrawable(toolType.drawableResource)))
+        return Espresso.onView(withId(R.id.action_current_tool))
+            .check(ViewAssertions.matches(ViewMatchers.hasDescendant(ViewMatchers.withText(toolType.nameResource))))
+    }*/
+
     fun onColorClicked(): ViewInteraction {
         return Espresso.onView(
             allOf(

Paintroid/src/main/java/org/catrobat/paintroid/controller/DefaultToolController.kt

@@ -103,7 +103,9 @@ class DefaultToolController(
     }
 
     override fun switchTool(toolType: ToolType) {
+        idlingResource.increment()
         switchTool(createAndSetupTool(toolType))
+        idlingResource.decrement()
     }
 
     override fun hideToolOptionsView() {