Skip to content

Commit 3721c67

Browse files
authored
Merge pull request #583 from square/ray/fix-frag-21-test-582
Disables HelloWorkflowFragmentAppTest on API 21 b/c LeakCanary
2 parents 18c2c58 + 53cf69d commit 3721c67

File tree

3 files changed

+28
-0
lines changed

3 files changed

+28
-0
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
11
package com.squareup.sample.helloworkflowfragment
22

3+
import android.os.Build
34
import androidx.test.espresso.action.ViewActions.click
45
import androidx.test.espresso.assertion.ViewAssertions.matches
56
import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
67
import androidx.test.espresso.matcher.ViewMatchers.withText
78
import androidx.test.ext.junit.rules.ActivityScenarioRule
89
import androidx.test.ext.junit.runners.AndroidJUnit4
10+
import androidx.test.filters.SdkSuppress
911
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
1012
import com.squareup.workflow1.ui.internal.test.inAnyView
1113
import org.hamcrest.Matchers.containsString
1214
import org.junit.Rule
1315
import org.junit.Test
1416
import org.junit.runner.RunWith
1517

18+
// Life is too short to debug why LeakCanary breaks this on API 21
19+
// https://github.com/square/workflow-kotlin/issues/582
20+
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.M)
1621
@RunWith(AndroidJUnit4::class)
1722
@OptIn(WorkflowUiExperimentalApi::class)
1823
class HelloWorkflowFragmentAppTest {
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package com.squareup.sample.helloworkflowfragment
2+
3+
import androidx.test.ext.junit.runners.AndroidJUnit4
4+
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
5+
import org.junit.Test
6+
import org.junit.runner.RunWith
7+
8+
/**
9+
* Stub test to avoid failing b/c no tests when suppressing [HelloWorkflowFragmentAppTest]
10+
* on API 21.
11+
*
12+
* https://github.com/square/workflow-kotlin/issues/582
13+
*/
14+
@RunWith(AndroidJUnit4::class)
15+
@OptIn(WorkflowUiExperimentalApi::class)
16+
class StubTest {
17+
@Test fun fml() {
18+
}
19+
}

workflow-ui/container-android/src/androidTest/java/com/squareup/workflow1/ui/backstack/test/BackstackContainerTest.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package com.squareup.workflow1.ui.backstack.test
22

3+
import android.os.Build
34
import android.view.View
45
import androidx.lifecycle.Lifecycle.State.CREATED
56
import androidx.lifecycle.Lifecycle.State.RESUMED
67
import androidx.lifecycle.Lifecycle.State.STARTED
78
import androidx.test.ext.junit.rules.ActivityScenarioRule
9+
import androidx.test.filters.SdkSuppress
810
import com.google.common.truth.Truth.assertThat
911
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
1012
import com.squareup.workflow1.ui.backstack.test.fixtures.BackStackContainerLifecycleActivity
@@ -339,6 +341,8 @@ internal class BackstackContainerTest {
339341
}
340342
}
341343

344+
// https://github.com/square/workflow-kotlin/issues/559
345+
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.M)
342346
@Test fun lifecycle_replace_after_pause() {
343347
assertThat(scenario.state).isEqualTo(RESUMED)
344348
scenario.onActivity {

0 commit comments

Comments
 (0)