Automatic merge branch 'current-stable' into 'develop'

AndBible · Jan 7, 2023 · f0321dd · f0321dd
2 parents 60ae7ad + f9b90c7
commit f0321dd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/app/src/test/java/net/bible/android/control/page/window/WindowControlTest.kt b/app/src/test/java/net/bible/android/control/page/window/WindowControlTest.kt
@@ -49,6 +49,7 @@ import org.hamcrest.Matchers.hasItem
 import org.junit.After
 import org.junit.Assert.assertThat
 import org.junit.Before
+import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mockito.mock
@@ -60,6 +61,7 @@ import javax.inject.Provider
 
 @RunWith(RobolectricTestRunner::class)
 @Config(application = TestBibleApplication::class, sdk=[TEST_SDK])
+@Ignore("Let's ignore these for now (see #2451)")
 class WindowControlTest {
     private var windowControl: WindowControl? = null
     private val windowRepository get() = windowControl!!.windowRepository

diff --git a/app/src/test/java/net/bible/android/control/page/window/WindowSynchronisationTest.kt b/app/src/test/java/net/bible/android/control/page/window/WindowSynchronisationTest.kt
@@ -43,6 +43,7 @@ import javax.inject.Provider
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.CoreMatchers.not
 import org.junit.Assert.assertThat
+import org.junit.Ignore
 import org.junit.runner.RunWith
 import org.mockito.Mockito
 import org.mockito.Mockito.mock
@@ -51,6 +52,7 @@ import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
 @Config(application = TestBibleApplication::class, sdk=[TEST_SDK])
+@Ignore("Let's ignore these for now (see #2451)")
 class WindowSynchronisationTest {
 
     private var windowControl: WindowControl? = null