diff options
| author | 2023-01-04 21:00:29 +0000 | |
|---|---|---|
| committer | 2023-01-04 21:00:29 +0000 | |
| commit | c317e6a26b75da0a693cbb14f673ecdd7152c433 (patch) | |
| tree | 89598216348d26570185a97d8c044de0eb69cba8 /java/tests/src | |
| parent | edde810a1add0eac7dbd2bcb544aedeb28312680 (diff) | |
| parent | f9a8f40c27f1b0188cbfa9b20af44ea04614cf93 (diff) | |
Merge "ResolverDrawerLayout: unify mCollapsibleHeight calculation." into tm-qpr-dev
Diffstat (limited to 'java/tests/src')
| -rw-r--r-- | java/tests/src/com/android/intentresolver/UnbundledChooserActivityWorkProfileTest.java | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/java/tests/src/com/android/intentresolver/UnbundledChooserActivityWorkProfileTest.java b/java/tests/src/com/android/intentresolver/UnbundledChooserActivityWorkProfileTest.java index 5a65ec1e..f1febed2 100644 --- a/java/tests/src/com/android/intentresolver/UnbundledChooserActivityWorkProfileTest.java +++ b/java/tests/src/com/android/intentresolver/UnbundledChooserActivityWorkProfileTest.java @@ -27,6 +27,7 @@ import static androidx.test.espresso.matcher.ViewMatchers.isSelected; import static androidx.test.espresso.matcher.ViewMatchers.withId; import static androidx.test.espresso.matcher.ViewMatchers.withText; +import static com.android.intentresolver.ChooserWrapperActivity.sOverrides; import static com.android.intentresolver.UnbundledChooserActivityWorkProfileTest.TestCase.ExpectedBlocker.NO_BLOCKER; import static com.android.intentresolver.UnbundledChooserActivityWorkProfileTest.TestCase.ExpectedBlocker.PERSONAL_PROFILE_ACCESS_BLOCKER; import static com.android.intentresolver.UnbundledChooserActivityWorkProfileTest.TestCase.ExpectedBlocker.PERSONAL_PROFILE_SHARE_BLOCKER; @@ -34,7 +35,6 @@ import static com.android.intentresolver.UnbundledChooserActivityWorkProfileTest import static com.android.intentresolver.UnbundledChooserActivityWorkProfileTest.TestCase.ExpectedBlocker.WORK_PROFILE_SHARE_BLOCKER; import static com.android.intentresolver.UnbundledChooserActivityWorkProfileTest.TestCase.Tab.PERSONAL; import static com.android.intentresolver.UnbundledChooserActivityWorkProfileTest.TestCase.Tab.WORK; -import static com.android.intentresolver.ChooserWrapperActivity.sOverrides; import static org.hamcrest.CoreMatchers.not; import static org.mockito.ArgumentMatchers.eq; @@ -48,9 +48,9 @@ import androidx.test.InstrumentationRegistry; import androidx.test.espresso.NoMatchingViewException; import androidx.test.rule.ActivityTestRule; -import com.android.internal.R; import com.android.intentresolver.ResolverActivity.ResolvedComponentInfo; import com.android.intentresolver.UnbundledChooserActivityWorkProfileTest.TestCase.Tab; +import com.android.internal.R; import junit.framework.AssertionFailedError; @@ -134,14 +134,13 @@ public class UnbundledChooserActivityWorkProfileTest { /* tab= */ WORK, /* expectedBlocker= */ NO_BLOCKER ), -// TODO(b/256869196) ChooserActivity goes into requestLayout loop -// new TestCase( -// /* isSendAction= */ true, -// /* hasCrossProfileIntents= */ false, -// /* myUserHandle= */ WORK_USER_HANDLE, -// /* tab= */ WORK, -// /* expectedBlocker= */ NO_BLOCKER -// ), + new TestCase( + /* isSendAction= */ true, + /* hasCrossProfileIntents= */ false, + /* myUserHandle= */ WORK_USER_HANDLE, + /* tab= */ WORK, + /* expectedBlocker= */ NO_BLOCKER + ), new TestCase( /* isSendAction= */ true, /* hasCrossProfileIntents= */ true, @@ -163,14 +162,13 @@ public class UnbundledChooserActivityWorkProfileTest { /* tab= */ PERSONAL, /* expectedBlocker= */ NO_BLOCKER ), -// TODO(b/256869196) ChooserActivity goes into requestLayout loop -// new TestCase( -// /* isSendAction= */ true, -// /* hasCrossProfileIntents= */ false, -// /* myUserHandle= */ WORK_USER_HANDLE, -// /* tab= */ PERSONAL, -// /* expectedBlocker= */ PERSONAL_PROFILE_SHARE_BLOCKER -// ), + new TestCase( + /* isSendAction= */ true, + /* hasCrossProfileIntents= */ false, + /* myUserHandle= */ WORK_USER_HANDLE, + /* tab= */ PERSONAL, + /* expectedBlocker= */ PERSONAL_PROFILE_SHARE_BLOCKER + ), new TestCase( /* isSendAction= */ true, /* hasCrossProfileIntents= */ true, |