Skip to content

Commit e2ee0fe

Browse files
RBusarowRBusarow
committed
update LeakCanary to 2.10 
1 parent f8cb372 commit e2ee0fe

File tree

34 files changed

+37
-77
lines changed

34 files changed

+37
-77
lines changed

‎buildSrc/src/main/java/android-ui-tests.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ plugins {
99
configure<TestedExtension> {
1010
defaultConfig {
1111
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
12-
testInstrumentationRunnerArguments["listener"] = "leakcanary.FailTestOnLeakRunListener"
1312
}
1413

1514
testOptions {

‎gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ rxjava2-core = "2.2.21"
7171

7272
squareup-curtains = "1.2.2"
7373
squareup-cycler = "0.1.9"
74-
squareup-leakcanary = "2.8.1"
74+
squareup-leakcanary = "2.10"
7575
squareup-moshi = "1.13.0"
7676
squareup-okhttp = "4.9.1"
7777
squareup-okio = "3.0.0"

‎samples/compose-samples/src/androidTest/java/com/squareup/sample/compose/hellocompose/HelloComposeTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import androidx.compose.ui.test.onNodeWithText
66
import androidx.compose.ui.test.performClick
77
import androidx.test.ext.junit.runners.AndroidJUnit4
88
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
9-
import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
109
import com.squareup.workflow1.ui.internal.test.IdleAfterTestRule
1110
import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
1211
import com.squareup.workflow1.ui.internal.test.compose.settleForNextRendering
1312
import com.squareup.workflow1.ui.internal.test.retry
1413
import kotlinx.coroutines.runBlocking
14+
import leakcanary.DetectLeaksAfterTestSuccess
1515
import org.junit.Rule
1616
import org.junit.Test
1717
import org.junit.rules.RuleChain

‎samples/compose-samples/src/androidTest/java/com/squareup/sample/compose/hellocomposebinding/HelloBindingTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import androidx.compose.ui.test.onNodeWithText
66
import androidx.compose.ui.test.performClick
77
import androidx.test.ext.junit.runners.AndroidJUnit4
88
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
9-
import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
109
import com.squareup.workflow1.ui.internal.test.IdleAfterTestRule
1110
import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
11+
import leakcanary.DetectLeaksAfterTestSuccess
1212
import org.junit.Rule
1313
import org.junit.Test
1414
import org.junit.rules.RuleChain

‎samples/compose-samples/src/androidTest/java/com/squareup/sample/compose/hellocomposeworkflow/HelloComposeWorkflowTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import androidx.compose.ui.test.onNodeWithText
66
import androidx.compose.ui.test.performClick
77
import androidx.test.ext.junit.runners.AndroidJUnit4
88
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
9-
import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
109
import com.squareup.workflow1.ui.internal.test.IdleAfterTestRule
1110
import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
11+
import leakcanary.DetectLeaksAfterTestSuccess
1212
import org.junit.Rule
1313
import org.junit.Test
1414
import org.junit.rules.RuleChain

‎samples/compose-samples/src/androidTest/java/com/squareup/sample/compose/inlinerendering/InlineRenderingTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ import androidx.compose.ui.test.junit4.createAndroidComposeRule
77
import androidx.compose.ui.test.performClick
88
import androidx.test.ext.junit.runners.AndroidJUnit4
99
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
10-
import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
1110
import com.squareup.workflow1.ui.internal.test.IdleAfterTestRule
1211
import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
1312
import com.squareup.workflow1.ui.internal.test.compose.settleForNextRendering
1413
import com.squareup.workflow1.ui.internal.test.retry
1514
import kotlinx.coroutines.runBlocking
15+
import leakcanary.DetectLeaksAfterTestSuccess
1616
import org.junit.Rule
1717
import org.junit.Test
1818
import org.junit.rules.RuleChain

‎samples/compose-samples/src/androidTest/java/com/squareup/sample/compose/launcher/SampleLauncherTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
1212
import androidx.test.platform.app.InstrumentationRegistry
1313
import com.squareup.sample.compose.R
1414
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
15-
import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
1615
import com.squareup.workflow1.ui.internal.test.IdleAfterTestRule
1716
import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
17+
import leakcanary.DetectLeaksAfterTestSuccess
1818
import org.junit.Rule
1919
import org.junit.Test
2020
import org.junit.rules.RuleChain

‎samples/compose-samples/src/androidTest/java/com/squareup/sample/compose/nestedrenderings/NestedRenderingsTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import androidx.compose.ui.test.onNodeWithText
1010
import androidx.compose.ui.test.performClick
1111
import androidx.test.ext.junit.runners.AndroidJUnit4
1212
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
13-
import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
1413
import com.squareup.workflow1.ui.internal.test.IdleAfterTestRule
1514
import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
15+
import leakcanary.DetectLeaksAfterTestSuccess
1616
import org.junit.Rule
1717
import org.junit.Test
1818
import org.junit.rules.RuleChain

‎samples/compose-samples/src/androidTest/java/com/squareup/sample/compose/preview/PreviewTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import androidx.compose.ui.test.junit4.createAndroidComposeRule
66
import androidx.compose.ui.test.onNodeWithText
77
import androidx.test.ext.junit.runners.AndroidJUnit4
88
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
9-
import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
109
import com.squareup.workflow1.ui.internal.test.IdleAfterTestRule
1110
import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
11+
import leakcanary.DetectLeaksAfterTestSuccess
1212
import org.junit.Rule
1313
import org.junit.Test
1414
import org.junit.rules.RuleChain

‎samples/compose-samples/src/androidTest/java/com/squareup/sample/compose/textinput/TextInputTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ import androidx.compose.ui.test.performTextInput
1010
import androidx.compose.ui.test.performTextReplacement
1111
import androidx.test.ext.junit.runners.AndroidJUnit4
1212
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
13-
import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
1413
import com.squareup.workflow1.ui.internal.test.IdleAfterTestRule
1514
import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
1615
import com.squareup.workflow1.ui.internal.test.compose.settleForNextRendering
1716
import com.squareup.workflow1.ui.internal.test.retry
1817
import kotlinx.coroutines.runBlocking
18+
import leakcanary.DetectLeaksAfterTestSuccess
1919
import org.junit.Rule
2020
import org.junit.Test
2121
import org.junit.rules.RuleChain

‎samples/containers/app-poetry/src/androidTest/java/com/squareup/sample/poetryapp/PoetryAppTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import androidx.test.ext.junit.rules.ActivityScenarioRule
77
import androidx.test.ext.junit.runners.AndroidJUnit4
88
import com.squareup.sample.container.poetryapp.R
99
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
10-
import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
1110
import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
1211
import com.squareup.workflow1.ui.internal.test.inAnyView
12+
import leakcanary.DetectLeaksAfterTestSuccess
1313
import org.junit.Rule
1414
import org.junit.Test
1515
import org.junit.rules.RuleChain

‎samples/containers/app-raven/src/androidTest/java/com/squareup/sample/ravenapp/RavenAppTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
66
import androidx.test.ext.junit.rules.ActivityScenarioRule
77
import androidx.test.ext.junit.runners.AndroidJUnit4
88
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
9-
import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
109
import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
1110
import com.squareup.workflow1.ui.internal.test.inAnyView
11+
import leakcanary.DetectLeaksAfterTestSuccess
1212
import org.junit.Rule
1313
import org.junit.Test
1414
import org.junit.rules.RuleChain

‎samples/containers/hello-back-button/src/androidTest/java/com/squareup/sample/hellobackbutton/HelloBackButtonEspressoTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
88
import androidx.test.ext.junit.rules.ActivityScenarioRule
99
import androidx.test.ext.junit.runners.AndroidJUnit4
1010
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
11-
import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
1211
import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
1312
import com.squareup.workflow1.ui.internal.test.actuallyPressBack
1413
import com.squareup.workflow1.ui.internal.test.inAnyView
1514
import com.squareup.workflow1.ui.internal.test.retryBlocking
15+
import leakcanary.DetectLeaksAfterTestSuccess
1616
import org.junit.Rule
1717
import org.junit.Test
1818
import org.junit.rules.RuleChain

‎samples/dungeon/app/src/androidTest/java/com/squareup/sample/dungeon/DungeonAppTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
66
import androidx.test.ext.junit.rules.ActivityScenarioRule
77
import androidx.test.ext.junit.runners.AndroidJUnit4
88
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
9-
import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
109
import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
1110
import com.squareup.workflow1.ui.internal.test.inAnyView
11+
import leakcanary.DetectLeaksAfterTestSuccess
1212
import org.junit.Rule
1313
import org.junit.Test
1414
import org.junit.rules.RuleChain

‎samples/hello-workflow-fragment/src/androidTest/java/com/squareup/sample/helloworkflowfragment/HelloWorkflowFragmentAppTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
77
import androidx.test.ext.junit.rules.ActivityScenarioRule
88
import androidx.test.ext.junit.runners.AndroidJUnit4
99
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
10-
import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
1110
import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
1211
import com.squareup.workflow1.ui.internal.test.inAnyView
12+
import leakcanary.DetectLeaksAfterTestSuccess
1313
import org.hamcrest.Matchers.containsString
1414
import org.junit.Rule
1515
import org.junit.Test

‎samples/hello-workflow/src/androidTest/java/com/squareup/sample/helloworkflow/HelloWorkflowAppTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
77
import androidx.test.ext.junit.rules.ActivityScenarioRule
88
import androidx.test.ext.junit.runners.AndroidJUnit4
99
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
10-
import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
1110
import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
1211
import com.squareup.workflow1.ui.internal.test.inAnyView
12+
import leakcanary.DetectLeaksAfterTestSuccess
1313
import org.junit.Rule
1414
import org.junit.Test
1515
import org.junit.rules.RuleChain

‎samples/stub-visibility/src/androidTest/java/com/squareup/sample/stubvisibility/StubVisibilityAppTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
88
import androidx.test.ext.junit.rules.ActivityScenarioRule
99
import androidx.test.ext.junit.runners.AndroidJUnit4
1010
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
11-
import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
1211
import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
1312
import com.squareup.workflow1.ui.internal.test.inAnyView
13+
import leakcanary.DetectLeaksAfterTestSuccess
1414
import org.hamcrest.CoreMatchers.not
1515
import org.junit.Rule
1616
import org.junit.Test

‎samples/tictactoe/app/src/androidTest/java/com/squareup/sample/TicTacToeEspressoTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
1919
import com.squareup.sample.mainactivity.TicTacToeActivity
2020
import com.squareup.sample.tictactoe.R
2121
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
22-
import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
2322
import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
2423
import com.squareup.workflow1.ui.internal.test.actuallyPressBack
2524
import com.squareup.workflow1.ui.internal.test.inAnyView
2625
import com.squareup.workflow1.ui.internal.test.retryBlocking
26+
import leakcanary.DetectLeaksAfterTestSuccess
2727
import org.hamcrest.CoreMatchers.allOf
2828
import org.hamcrest.CoreMatchers.endsWith
2929
import org.junit.After

‎samples/todo-android/app/src/androidTest/java/com/squareup/sample/mainactivity/TodoAppTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import androidx.test.uiautomator.UiDevice
1212
import com.squareup.sample.todo.R
1313
import com.squareup.sample.todo.ToDoActivity
1414
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
15-
import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
1615
import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
1716
import com.squareup.workflow1.ui.internal.test.actuallyPressBack
1817
import com.squareup.workflow1.ui.internal.test.inAnyView
18+
import leakcanary.DetectLeaksAfterTestSuccess
1919
import org.hamcrest.Matchers.allOf
2020
import org.junit.After
2121
import org.junit.Before

‎workflow-ui/compose-tooling/src/androidTest/java/com/squareup/workflow1/ui/compose/tooling/LegacyPreviewViewFactoryTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import com.squareup.workflow1.ui.ViewEnvironmentKey
1818
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
1919
import com.squareup.workflow1.ui.compose.WorkflowRendering
2020
import com.squareup.workflow1.ui.compose.composeViewFactory
21-
import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
2221
import com.squareup.workflow1.ui.internal.test.IdleAfterTestRule
2322
import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
23+
import leakcanary.DetectLeaksAfterTestSuccess
2424
import org.junit.Rule
2525
import org.junit.Test
2626
import org.junit.rules.RuleChain

‎workflow-ui/compose-tooling/src/androidTest/java/com/squareup/workflow1/ui/compose/tooling/PreviewViewFactoryTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import com.squareup.workflow1.ui.ViewEnvironmentKey
1919
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
2020
import com.squareup.workflow1.ui.compose.WorkflowRendering
2121
import com.squareup.workflow1.ui.compose.composeScreenViewFactory
22-
import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
2322
import com.squareup.workflow1.ui.internal.test.IdleAfterTestRule
2423
import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
24+
import leakcanary.DetectLeaksAfterTestSuccess
2525
import org.junit.Rule
2626
import org.junit.Test
2727
import org.junit.rules.RuleChain

‎workflow-ui/compose/src/androidTest/java/com/squareup/workflow1/ui/compose/ComposeViewFactoryTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import com.squareup.workflow1.ui.ViewEnvironmentKey
2222
import com.squareup.workflow1.ui.ViewRegistry
2323
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
2424
import com.squareup.workflow1.ui.WorkflowViewStub
25-
import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
2625
import com.squareup.workflow1.ui.internal.test.IdleAfterTestRule
2726
import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
2827
import com.squareup.workflow1.ui.plus
28+
import leakcanary.DetectLeaksAfterTestSuccess
2929
import org.junit.Rule
3030
import org.junit.Test
3131
import org.junit.rules.RuleChain

‎workflow-ui/compose/src/androidTest/java/com/squareup/workflow1/ui/compose/ComposeViewTreeIntegrationTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ import com.squareup.workflow1.ui.container.BackStackScreen
3737
import com.squareup.workflow1.ui.container.BodyAndOverlaysScreen
3838
import com.squareup.workflow1.ui.container.ScreenOverlay
3939
import com.squareup.workflow1.ui.container.ScreenOverlayDialogFactory
40-
import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
4140
import com.squareup.workflow1.ui.internal.test.IdleAfterTestRule
4241
import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
4342
import com.squareup.workflow1.ui.internal.test.WorkflowUiTestActivity
4443
import com.squareup.workflow1.ui.plus
44+
import leakcanary.DetectLeaksAfterTestSuccess
4545
import org.junit.Before
4646
import org.junit.Rule
4747
import org.junit.Test

‎workflow-ui/compose/src/androidTest/java/com/squareup/workflow1/ui/compose/CompositionRootTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import androidx.compose.ui.test.junit4.createComposeRule
88
import androidx.compose.ui.test.onNodeWithText
99
import androidx.test.ext.junit.runners.AndroidJUnit4
1010
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
11-
import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
1211
import com.squareup.workflow1.ui.internal.test.IdleAfterTestRule
1312
import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
13+
import leakcanary.DetectLeaksAfterTestSuccess
1414
import org.junit.Rule
1515
import org.junit.Test
1616
import org.junit.rules.RuleChain

‎workflow-ui/compose/src/androidTest/java/com/squareup/workflow1/ui/compose/LegacyComposeViewFactoryTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import com.squareup.workflow1.ui.ViewEnvironmentKey
2323
import com.squareup.workflow1.ui.ViewRegistry
2424
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
2525
import com.squareup.workflow1.ui.WorkflowViewStub
26-
import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
2726
import com.squareup.workflow1.ui.internal.test.IdleAfterTestRule
2827
import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
2928
import com.squareup.workflow1.ui.plus
29+
import leakcanary.DetectLeaksAfterTestSuccess
3030
import org.junit.Rule
3131
import org.junit.Test
3232
import org.junit.rules.RuleChain

‎workflow-ui/compose/src/androidTest/java/com/squareup/workflow1/ui/compose/LegacyComposeViewTreeIntegrationTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ import com.squareup.workflow1.ui.ViewRegistry
3737
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
3838
import com.squareup.workflow1.ui.backstack.BackStackScreen
3939
import com.squareup.workflow1.ui.bindShowRendering
40-
import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
4140
import com.squareup.workflow1.ui.internal.test.IdleAfterTestRule
4241
import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
4342
import com.squareup.workflow1.ui.internal.test.LegacyWorkflowUiTestActivity
4443
import com.squareup.workflow1.ui.modal.HasModals
4544
import com.squareup.workflow1.ui.modal.ModalViewContainer
45+
import leakcanary.DetectLeaksAfterTestSuccess
4646
import org.junit.Before
4747
import org.junit.Rule
4848
import org.junit.Test
@@ -622,7 +622,7 @@ internal class LegacyComposeViewTreeIntegrationTest {
622622
object EmptyRendering : AndroidScreen<EmptyRendering> {
623623
override val viewFactory: ScreenViewFactory<EmptyRendering>
624624
get() = ScreenViewFactory.fromCode { _, e, c, _ ->
625-
ScreenViewHolder(e, View(c)) { _, _, -> }
625+
ScreenViewHolder(e, View(c)) { _, _ -> }
626626
}
627627
}
628628

‎workflow-ui/compose/src/androidTest/java/com/squareup/workflow1/ui/compose/LegacyWorkflowRenderingTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ import com.squareup.workflow1.ui.ViewFactory
6767
import com.squareup.workflow1.ui.ViewRegistry
6868
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
6969
import com.squareup.workflow1.ui.bindShowRendering
70-
import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
7170
import com.squareup.workflow1.ui.internal.test.IdleAfterTestRule
7271
import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
7372
import com.squareup.workflow1.ui.plus
73+
import leakcanary.DetectLeaksAfterTestSuccess
7474
import org.hamcrest.Description
7575
import org.hamcrest.TypeSafeMatcher
7676
import org.junit.Rule
@@ -114,8 +114,8 @@ internal class LegacyWorkflowRenderingTest {
114114
}
115115

116116
/**
117-
* Ensures we match the behavior of WorkflowViewStub and other containers, which only check for
118-
* a new factory when a new rendering is incompatible with the current one.
117+
* Ensures we match the behavior of WorkflowViewStub and other containers, which only check for a
118+
* new factory when a new rendering is incompatible with the current one.
119119
*/
120120
@Test fun doesNotRecompose_whenAndroidViewRendering_factoryChanged() {
121121
data class ShiftyRendering(val whichFactory: Boolean) : AndroidViewRendering<ShiftyRendering> {

‎workflow-ui/compose/src/androidTest/java/com/squareup/workflow1/ui/compose/RenderAsStateTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import com.squareup.workflow1.rendering
2424
import com.squareup.workflow1.stateless
2525
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
2626
import com.squareup.workflow1.ui.compose.RenderAsStateTest.SnapshottingWorkflow.SnapshottedRendering
27-
import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
2827
import com.squareup.workflow1.ui.internal.test.IdleAfterTestRule
2928
import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
3029
import com.squareup.workflow1.writeUtf8WithLength
@@ -37,6 +36,7 @@ import kotlinx.coroutines.test.TestScope
3736
import kotlinx.coroutines.test.UnconfinedTestDispatcher
3837
import kotlinx.coroutines.test.advanceUntilIdle
3938
import kotlinx.coroutines.test.runTest
39+
import leakcanary.DetectLeaksAfterTestSuccess
4040
import okio.ByteString
4141
import okio.ByteString.Companion.decodeBase64
4242
import org.junit.Rule

‎workflow-ui/compose/src/androidTest/java/com/squareup/workflow1/ui/compose/WorkflowRenderingTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ import com.squareup.workflow1.ui.ScreenViewHolder
6565
import com.squareup.workflow1.ui.ViewEnvironment
6666
import com.squareup.workflow1.ui.ViewRegistry
6767
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
68-
import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
6968
import com.squareup.workflow1.ui.internal.test.IdleAfterTestRule
7069
import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
7170
import com.squareup.workflow1.ui.plus
71+
import leakcanary.DetectLeaksAfterTestSuccess
7272
import org.hamcrest.Description
7373
import org.hamcrest.TypeSafeMatcher
7474
import org.junit.Rule
@@ -116,8 +116,8 @@ internal class WorkflowRenderingTest {
116116
}
117117

118118
/**
119-
* Ensures we match the behavior of WorkflowViewStub and other containers, which only check for
120-
* a new factory when a new rendering is incompatible with the current one.
119+
* Ensures we match the behavior of WorkflowViewStub and other containers, which only check for a
120+
* new factory when a new rendering is incompatible with the current one.
121121
*/
122122
@Test fun doesNotRecompose_whenAndroidViewRendering_factoryChanged() {
123123
data class ShiftyRendering(val whichFactory: Boolean) : AndroidScreen<ShiftyRendering> {

‎workflow-ui/container-android/src/androidTest/java/com/squareup/workflow1/ui/modal/test/ModalViewContainerLifecycleTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import androidx.lifecycle.LifecycleOwner
88
import androidx.test.ext.junit.rules.ActivityScenarioRule
99
import com.google.common.truth.Truth.assertThat
1010
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
11-
import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
1211
import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
1312
import com.squareup.workflow1.ui.modal.ModalViewContainer
1413
import com.squareup.workflow1.ui.modal.test.ModalViewContainerLifecycleActivity.TestRendering.LeafRendering
1514
import com.squareup.workflow1.ui.modal.test.ModalViewContainerLifecycleActivity.TestRendering.RecurseRendering
15+
import leakcanary.DetectLeaksAfterTestSuccess
1616
import org.junit.Rule
1717
import org.junit.Test
1818
import org.junit.rules.RuleChain

0 commit comments

Comments
 (0)