[maps-android] fix ignored tests (#11844)

GitOrigin-RevId: 90d03defbbab7a17aa811cdd2918c729f2473660

Author: natiginfo

app/src/androidTest/java/com/mapbox/maps/testapp/gestures/GestureActivityTest.kt

@@ -18,7 +18,6 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotEquals
 import org.junit.Assert.assertTrue
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import java.util.concurrent.CountDownLatch
@@ -308,7 +307,6 @@ class GestureActivityTest : BaseMapTest() {
   }
 
   @Test
-  @Ignore("Flaky test, expected:<3.0> but was:<2.8510000000000004>")
   fun quickZoom_roundTripping() {
     rule.scenario.onActivity {
       it.runOnUiThread {

app/src/androidTest/java/com/mapbox/maps/testapp/integration/surface/MapViewSurfaceModeWithRecyclerViewTest.kt

@@ -15,7 +15,6 @@ import androidx.test.uiautomator.UiObject2
 import com.mapbox.maps.testapp.examples.SurfaceRecyclerViewActivity
 import com.mapbox.maps.testapp.integration.BaseReuseIntegrationTest
 import org.hamcrest.core.Is
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -28,13 +27,14 @@ class MapViewSurfaceModeWithRecyclerViewTest : BaseReuseIntegrationTest(SurfaceR
 
   @Test
   @LargeTest
-  @Ignore("Flaky test")
   fun scrollSurfaceRecyclerView() {
     // wait extra seconds to make sure recycler view is indeed added to hierarchy
     Thread.sleep(2_000)
     device.waitForIdle()
     val recyclerObject = By.clazz(RecyclerView::class.java)
     val recyclerView: UiObject2 = device.findObject(recyclerObject)
+    // we set gesture margin to keep touches at least 100 pixels away from the edges
+    recyclerView.setGestureMargin(100)
     repeat(2) {
       onMapView(matches(isDisplayed()))
       recyclerView.scroll(Direction.DOWN, 100.0f)

app/src/androidTest/java/com/mapbox/maps/testapp/overlay/MapOverlayPluginTest.kt

@@ -10,7 +10,6 @@ import com.mapbox.maps.plugin.overlay.mapboxOverlay
 import com.mapbox.maps.testapp.BaseMapTest
 import junit.framework.Assert.*
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Test
 
 /**
@@ -40,7 +39,6 @@ class MapOverlayPluginTest : BaseMapTest() {
   }
 
   @Test
-  @Ignore("flaky test, expected:<[top: 50.0, left: 0.0, bottom: 0.0, right: 0.0]> but was:<[top: 0.0, left: 20.0, bottom: 0.0, right: 0.0]>")
   fun registerOverlay() {
     var edgeInsets = mapOverlayPlugin.getEdgeInsets()
     assertEquals(

plugin-overlay/src/main/java/com/mapbox/maps/plugin/overlay/MapOverlayPluginImpl.kt

@@ -190,7 +190,7 @@ internal class MapOverlayPluginImpl : MapOverlayPlugin {
           if (it.left - subMapRect.left < subMapRect.right - it.right) {
             // overlay rect is on the left part of MapRect, create a new MapRect with the right part
             queue.offerLast(subMapRect.updateLeft(it.right))
-          } else if (it.left - subMapRect.left < subMapRect.right - it.right) {
+          } else if (it.left - subMapRect.left > subMapRect.right - it.right) {
             // overlay rect is on the right part of MapRect, create a new MapRect with the left part
             queue.offerLast(subMapRect.updateRight(it.left))
           } else {