Make it possible to provide your own ActivityTestRule to AndroidComposeTestRule [153623653]

Fixed

Feature Request

Status Update

No update yet.

Description

je...@google.com

created issue #1

Apr 9, 2020 09:36AM

Since https://r.android.com/1282381 it is mandatory to use ComposeTestRule. This can be a problem for teams that have a custom ActivityTestRule with which they want to control their app's Activity, since they are now forced to use the rule created by AndroidComposeTestRule.

Solve this by adding the ActivityTestRule as a parameter to the AndroidComposeTestRule.

Comments

pa...@google.com <pa...@google.com> #2Apr 9, 2020 10:56AM

Project: platform/frameworks/support
Branch: androidx-master-dev

commit c60f33e229e31ab328ef6b59dab63b264954831c
Author: Alexandre Elias <aelias@google.com>
Date: Fri Jul 10 16:23:09 2020

Semantics no-op cleanups

Partly in response to lmr's broad code review, I did a pass of
superficial API/implementation cleanup. The main changes are:

- I changed each Boolean SemanticsProperty where false is equivalent to
not being present to take "Unit" instead. This is conceptually
clearer: it avoids questions like "can I cancel out a semantics from a
merged child by setting it to false?" Because "property = Unit" looks
weird, I also changed the style of these to "property()".

- I moved the Semantics id generator closer to where it's used, in
SemanticsModifierCore. I made it internal and an AtomicInt.
(Note that integer ids are heavily used in the Android
AccessibilityNodeInfo APIs so I can't simply remove them entirely.)

- I deleted dead code. Some examples include SemanticsHintOverrides,
a public API not connected to anything, and SemanticsPropertyKey
merge() open method which is never called. (In both cases I have
a different plan in mind for accessibility.)

Fixes: 145951226
Fixes: 145955412
Test: existing tests
Relnote: "Single-value semantics properties now use a calling style.
For example, 'semantics { hidden = true }' is now written as:
'semantics { hidden() }'."

Change-Id: Ic1afd12ea22c926babc9662f1804d80b33aa0cfc

M ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/LayoutNodeModifierBenchmark.kt
M ui/ui-core/api/0.1.0-dev15.txt
M ui/ui-core/api/current.txt
M ui/ui-core/api/public_plus_experimental_0.1.0-dev15.txt
M ui/ui-core/api/public_plus_experimental_current.txt
M ui/ui-core/api/restricted_0.1.0-dev15.txt
M ui/ui-core/api/restricted_current.txt
M ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/graphics/vector/VectorTest.kt
M ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/semantics/SemanticsTests.kt
M ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidActuals.kt
M ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidComposeView.kt
M ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidComposeViewAccessibilityDelegateCompat.kt
M ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidPopup.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/Expect.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsConfiguration.kt
D ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsHintOverrides.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsModifier.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsNode.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsOwner.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsWrapper.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/semantics/SemanticsProperties.kt
M ui/ui-foundation/api/0.1.0-dev15.txt
M ui/ui-foundation/api/current.txt
M ui/ui-foundation/api/public_plus_experimental_0.1.0-dev15.txt
M ui/ui-foundation/api/public_plus_experimental_current.txt
M ui/ui-foundation/api/restricted_0.1.0-dev15.txt
M ui/ui-foundation/api/restricted_current.txt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/Clickable.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/Dialog.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/Scroller.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/selection/Selectable.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/selection/Toggleable.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/semantics/FoundationSemanticsProperties.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/ButtonTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/CardTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/CheckboxScreenshotTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/RadioButtonScreenshotTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/ScaffoldTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/SnackbarTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/SurfaceTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/ripple/RippleIndicationTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/textfield/TextFieldScreenshotTest.kt
M ui/ui-material/src/main/java/androidx/ui/material/AppBar.kt
M ui/ui-material/src/main/java/androidx/ui/material/TextFieldImpl.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/AssertsTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/CallSemanticsActionTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/ErrorMessagesTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/FindersTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/PrintToStringTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/ScrollToTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/TextActionsTest.kt
M ui/ui-test/src/main/java/androidx/ui/test/Actions.kt
M ui/ui-test/src/main/java/androidx/ui/test/Filters.kt
M ui/ui-text/api/0.1.0-dev15.txt
M ui/ui-text/api/current.txt
M ui/ui-text/api/public_plus_experimental_0.1.0-dev15.txt
M ui/ui-text/api/public_plus_experimental_current.txt
M ui/ui-text/api/restricted_0.1.0-dev15.txt
M ui/ui-text/api/restricted_current.txt
M ui/ui-text/src/commonMain/kotlin/androidx/ui/text/CoreTextField.kt
M ui/ui-text/src/commonMain/kotlin/androidx/ui/text/TextSemanticsProperties.kt

https://android-review.googlesource.com/1360099

je...@google.com <je...@google.com> #3Apr 9, 2020 02:36PM

Good point. For now I'll upload a CL that makes AndroidComposeTestRule accept an ActivityTestRule though, to at least accommodate some of our user base.

I agree that long term it should be what you propose though, in which case we can remove the special handling for ActivityTestRule again.

ap...@google.com <ap...@google.com> #4Apr 15, 2020 01:56PM

Project: platform/frameworks/support
Branch: androidx-master-dev

commit c67b052c109fc0abf5cbae0d5fe908fd44816be1
Author: Jelle Fresen <jellefresen@google.com>
Date: Thu Apr 09 12:03:55 2020

Supply your own ActivityTestRule to AndroidComposeTestRule

Make it possible to pass your own ActivityTestRule to
AndroidComposeTestRule. This allows testers to still use ComposeTestRule
when they need their own ActivityTestRule.

Bug: 153623653
Test: ./gradlew ui:ui-test:cC
Relnote: "You can now pass a custom ActivityTestRule to
AndroidComposeTestRule"

Change-Id: I38206d4d2fc4c9b21693132b4300f31d9f7e1b75

M ui/ui-test/api/0.1.0-dev10.txt
M ui/ui-test/api/current.txt
M ui/ui-test/api/public_plus_experimental_0.1.0-dev10.txt
M ui/ui-test/api/public_plus_experimental_current.txt
M ui/ui-test/api/restricted_0.1.0-dev10.txt
M ui/ui-test/api/restricted_current.txt
M ui/ui-test/src/androidTest/java/androidx/ui/test/FirstDrawTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/MultipleActivitiesFirstDrawTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/SendClickTest.kt
M ui/ui-test/src/main/java/androidx/ui/test/ComposeTestRule.kt
M ui/ui-test/src/main/java/androidx/ui/test/android/AndroidComposeTestRule.kt

https://android-review.googlesource.com/1283933

je...@google.com <je...@google.com> #5Apr 15, 2020 06:40PM

Marked as fixed.

General solution as proposed by @pavlis will be addressed in https://issuetracker.google.com/154135019

je...@google.com <je...@google.com> Nov 10, 2020 02:23PM

Reassigned to pa...@google.com.

ap...@google.com <ap...@google.com> #6Nov 11, 2020 11:09AM

Project: platform/frameworks/support
Branch: androidx-master-dev

commit 5b0bebd168fded3237342e7aa9e7f039c5182dd2
Author: Filip Pavlis <pavlis@google.com>
Date: Mon Nov 09 18:01:52 2020

Removed dependency on specific activity rule

This removes dependency on ActivityScenarioRule from
AndroidComposeTestRule. Meaning that compose test rule can be used with
any lauchner from now on.

Test: N/A
Bug: 153623653
Bug: 154135019
Relnote: "AndroidComposeTestRule can now accept custom activity
launchers"

Change-Id: Ib828876d918f3f091b622bbeb62dd1a31c75badb

M compose/test-utils/src/androidAndroidTest/kotlin/androidx/compose/testutils/AndroidComposeTestCaseRunnerTest.kt
M compose/test-utils/src/androidMain/kotlin/androidx/compose/testutils/TestRuleExtensions.kt
M compose/ui/ui-test-junit4/api/current.txt
M compose/ui/ui-test-junit4/api/public_plus_experimental_current.txt
M compose/ui/ui-test-junit4/api/restricted_current.txt
M compose/ui/ui-test-junit4/src/androidMain/kotlin/androidx/compose/ui/test/junit4/AndroidComposeTestRule.kt
M compose/ui/ui-test-junit4/src/androidMain/kotlin/androidx/ui/test/AndroidComposeTestRule.kt
D compose/ui/ui-test-junit4/src/androidMain/kotlin/androidx/ui/test/android/AndroidComposeTestRule.kt

https://android-review.googlesource.com/1492916

Issue 153623653