Skip to content
This repository was archived by the owner on Aug 8, 2022. It is now read-only.

Commit eab924a

Browse files
authored
Merge pull request #251 from Shopify/fix-ci
Fix blocking tests on GitHub Action CI
2 parents 3228059 + 376c8bb commit eab924a

2 files changed

Lines changed: 27 additions & 0 deletions

File tree

.github/workflows/library_build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
instrumentationTests:
2121
name: Instrumentation Tests
2222
runs-on: macos-latest
23+
timeout-minutes: 30
2324
steps:
2425

2526
- name: Fetch Sources
@@ -40,6 +41,7 @@ jobs:
4041
name: Test Library
4142
needs: gradleValidation
4243
runs-on: ubuntu-latest
44+
timeout-minutes: 30
4345
steps:
4446

4547
# Check out current repository

Library/src/test/java/com/shopify/testify/RegionCompareTest.kt

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,39 @@ import com.nhaarman.mockitokotlin2.doAnswer
3131
import com.nhaarman.mockitokotlin2.doReturn
3232
import com.nhaarman.mockitokotlin2.mock
3333
import com.nhaarman.mockitokotlin2.whenever
34+
import com.shopify.testify.internal.processor._executorDispatcher
3435
import com.shopify.testify.internal.processor.compare.FuzzyCompare
36+
import kotlinx.coroutines.Dispatchers
37+
import kotlinx.coroutines.ExperimentalCoroutinesApi
38+
import kotlinx.coroutines.ObsoleteCoroutinesApi
39+
import kotlinx.coroutines.newSingleThreadContext
40+
import kotlinx.coroutines.test.resetMain
41+
import kotlinx.coroutines.test.setMain
42+
import org.junit.After
3543
import org.junit.Assert.assertFalse
3644
import org.junit.Assert.assertTrue
45+
import org.junit.Before
3746
import org.junit.Test
3847
import java.nio.IntBuffer
3948

49+
@ObsoleteCoroutinesApi
50+
@ExperimentalCoroutinesApi
4051
class RegionCompareTest {
4152

53+
private val mainThreadSurrogate = newSingleThreadContext("UI thread")
54+
55+
@Before
56+
fun setUp() {
57+
Dispatchers.setMain(mainThreadSurrogate)
58+
_executorDispatcher = Dispatchers.Main
59+
}
60+
61+
@After
62+
fun tearDown() {
63+
Dispatchers.resetMain()
64+
mainThreadSurrogate.close()
65+
}
66+
4267
private val rectSet = HashSet<Rect>()
4368
private val regionCompare = FuzzyCompare(null, rectSet)
4469

0 commit comments

Comments
 (0)