Skip to content

Commit a24fe43

Browse files
committed
refactor: rename clearSubscribers to resetForTesting
we will do additional state clearing work in here for 21102
1 parent 7594d0d commit a24fe43

4 files changed

Lines changed: 3 additions & 10 deletions

File tree

AnkiDroid/src/main/java/com/ichi2/anki/observability/ChangeManager.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ object ChangeManager {
139139
}
140140

141141
@VisibleForTesting(otherwise = VisibleForTesting.NONE)
142-
fun clearSubscribers() {
142+
fun resetForTesting() {
143143
subscribers.size.ifNotZero { size -> Timber.d("clearing %d subscribers", size) }
144144
subscribers.clear()
145145
}

AnkiDroid/src/test/java/com/ichi2/anki/RobolectricTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ open class RobolectricTest :
148148
// W/ShadowLegacyPath: android.graphics.Path#op() not supported yet.
149149
.filter("^(?!(W/ShadowLegacyPath|D/LifecycleMonitor)).*$")
150150

151-
ChangeManager.clearSubscribers()
151+
ChangeManager.resetForTesting()
152152

153153
validateRunWithAnnotationPresent()
154154

AnkiDroid/src/test/java/com/ichi2/anki/observability/ChangeManagerTest.kt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import com.ichi2.testutils.JvmTest
2020
import org.hamcrest.MatcherAssert.assertThat
2121
import org.hamcrest.Matchers.equalTo
2222
import org.hamcrest.Matchers.greaterThan
23-
import org.junit.After
2423
import org.junit.Test
2524
import org.junit.runner.RunWith
2625
import org.junit.runners.Parameterized
@@ -32,12 +31,6 @@ import kotlin.reflect.jvm.isAccessible
3231

3332
@RunWith(RobolectricTestRunner::class)
3433
class ChangeManagerExceptionHandlingTest : JvmTest() {
35-
@After
36-
override fun tearDown() {
37-
super.tearDown()
38-
ChangeManager.clearSubscribers()
39-
}
40-
4134
@Test
4235
fun `all subscribers notified even if one throws exception`() {
4336
var firstCalled = false

AnkiDroid/src/test/java/com/ichi2/testutils/JvmTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ open class JvmTest : InMemoryAnkiTest() {
3434
@CallSuper
3535
override fun setUp() {
3636
super.setUp()
37-
ChangeManager.clearSubscribers()
37+
ChangeManager.resetForTesting()
3838
}
3939

4040
override fun setupTestDispatcher(dispatcher: TestDispatcher) {

0 commit comments

Comments
 (0)