Revert "Use NoActionBar theme for default test activity"
This reverts commit 18d7693b4eba2ec6b1d1162b2154e914ba6ef25d.
Reason for revert: Blocking the Jan 6 Compose drop b/388031988
Change-Id: Ia3f7565bcead0ce4ff4a2d67e63be538c31d993e
diff --git a/compose/material/material-navigation/build.gradle b/compose/material/material-navigation/build.gradle
index 7f8be4a..a80dfb7 100644
--- a/compose/material/material-navigation/build.gradle
+++ b/compose/material/material-navigation/build.gradle
@@ -34,6 +34,7 @@
androidTestImplementation(project(":compose:test-utils"))
androidTestImplementation("androidx.navigation:navigation-testing:2.7.7")
androidTestImplementation(project(":compose:ui:ui-test-junit4"))
+ androidTestImplementation(project(":compose:ui:ui-test-manifest"))
androidTestImplementation(libs.testRunner)
androidTestImplementation(libs.junit)
androidTestImplementation(libs.truth)
diff --git a/compose/ui/ui-test-manifest/integration-tests/testapp/build.gradle b/compose/ui/ui-test-manifest/integration-tests/testapp/build.gradle
index 1997776..a0957a4 100644
--- a/compose/ui/ui-test-manifest/integration-tests/testapp/build.gradle
+++ b/compose/ui/ui-test-manifest/integration-tests/testapp/build.gradle
@@ -22,10 +22,10 @@
}
dependencies {
+
debugImplementation(project(":compose:ui:ui-test-manifest"))
implementation(project(":compose:ui:ui"))
- implementation(project(":compose:foundation:foundation"))
implementation("androidx.tracing:tracing:1.1.0")
androidTestImplementation(project(":compose:ui:ui-test-junit4"))
androidTestImplementation(libs.testRunner)
@@ -35,8 +35,4 @@
android {
compileSdk = 35
namespace = "androidx.compose.ui.test.manifest.integration.testapp"
-
- defaultConfig {
- targetSdkVersion 35
- }
}
diff --git a/compose/ui/ui-test-manifest/integration-tests/testapp/src/androidTest/java/androidx/compose/ui/test/manifest/integration/testapp/ComponentActivityLaunchesTest.kt b/compose/ui/ui-test-manifest/integration-tests/testapp/src/androidTest/java/androidx/compose/ui/test/manifest/integration/testapp/ComponentActivityLaunchesTest.kt
index 1ddeb53..6895df0 100644
--- a/compose/ui/ui-test-manifest/integration-tests/testapp/src/androidTest/java/androidx/compose/ui/test/manifest/integration/testapp/ComponentActivityLaunchesTest.kt
+++ b/compose/ui/ui-test-manifest/integration-tests/testapp/src/androidTest/java/androidx/compose/ui/test/manifest/integration/testapp/ComponentActivityLaunchesTest.kt
@@ -16,22 +16,9 @@
package androidx.compose.ui.test.manifest.integration.testapp
-import android.os.Build
-import androidx.activity.ComponentActivity
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.size
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.toPixelMap
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.platform.testTag
-import androidx.compose.ui.test.captureToImage
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.junit4.createComposeRule
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.LargeTest
-import androidx.test.filters.SdkSuppress
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
@@ -39,42 +26,11 @@
@LargeTest
@RunWith(AndroidJUnit4::class)
class ComponentActivityLaunchesTest {
- @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
+ @get:Rule val rule = createComposeRule()
@Test
- fun activity_launches() {
+ fun test() {
rule.setContent {}
// Test does not crash and does not time out
}
-
- // Regression test for b/383368165
- // When targeting SDK 35, an activity is edge-to-edge by default and the action bar will overlap
- // the content. We can only detect this by taking a screenshot, assertIsDisplayed() doesn't work
- // due to b/383368165#comment2.
- @Test
- @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
- fun activity_notCoveredByActionBar() {
- val color = Color.Red
- val size = 10
- rule.setContent {
- with(LocalDensity.current) {
- Box(Modifier.size(size.toDp()).background(color).testTag("box"))
- }
- }
-
- rule.onNodeWithTag("box").captureToImage().let {
- assert(it.width == size && it.height == size) {
- // We don't really need to test this, but better be safe then sorry
- "Screenshot size should be 10x10, but was ${it.width}x${it.height}"
- }
- val map = it.toPixelMap()
- for (y in 0 until map.height) {
- for (x in 0 until map.width) {
- assert(map[x, y] == color) {
- "Pixel at ($x, $y) is ${map[x, y]} instead of $color"
- }
- }
- }
- }
- }
}
diff --git a/compose/ui/ui-test-manifest/src/main/AndroidManifest.xml b/compose/ui/ui-test-manifest/src/main/AndroidManifest.xml
index 620129d..d96a063 100644
--- a/compose/ui/ui-test-manifest/src/main/AndroidManifest.xml
+++ b/compose/ui/ui-test-manifest/src/main/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
- <activity android:theme="@android:style/Theme.Material.Light.NoActionBar"
- android:name="androidx.activity.ComponentActivity" android:exported="true" />
+ <activity android:name="androidx.activity.ComponentActivity" android:exported="true" />
</application>
</manifest>
diff --git a/compose/ui/ui-test/src/androidInstrumentedTest/AndroidManifest.xml b/compose/ui/ui-test/src/androidInstrumentedTest/AndroidManifest.xml
index 5ceffbc..d70ca0d 100644
--- a/compose/ui/ui-test/src/androidInstrumentedTest/AndroidManifest.xml
+++ b/compose/ui/ui-test/src/androidInstrumentedTest/AndroidManifest.xml
@@ -16,7 +16,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
- <activity android:name="androidx.compose.ui.test.CustomComposeHostActivity" />
+ <activity android:name="androidx.compose.ui.test.ActivityWithActionBar" />
<activity android:name="androidx.compose.ui.test.ClickCounterActivity" />
<activity android:name="androidx.compose.ui.test.EmptyActivity" />
diff --git a/compose/ui/ui-test/src/androidInstrumentedTest/kotlin/androidx/compose/ui/test/CustomComposeHostActivity.kt b/compose/ui/ui-test/src/androidInstrumentedTest/kotlin/androidx/compose/ui/test/ActivityWithActionBar.kt
similarity index 96%
rename from compose/ui/ui-test/src/androidInstrumentedTest/kotlin/androidx/compose/ui/test/CustomComposeHostActivity.kt
rename to compose/ui/ui-test/src/androidInstrumentedTest/kotlin/androidx/compose/ui/test/ActivityWithActionBar.kt
index f40f330..4fc309f 100644
--- a/compose/ui/ui-test/src/androidInstrumentedTest/kotlin/androidx/compose/ui/test/CustomComposeHostActivity.kt
+++ b/compose/ui/ui-test/src/androidInstrumentedTest/kotlin/androidx/compose/ui/test/ActivityWithActionBar.kt
@@ -25,7 +25,7 @@
import androidx.compose.ui.platform.ComposeView
// The presence of an ActionBar follows from the theme set in AndroidManifest.xml
-class CustomComposeHostActivity : ComponentActivity() {
+class ActivityWithActionBar : ComponentActivity() {
private lateinit var composeHolder: ComposeView
override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/compose/ui/ui-test/src/androidInstrumentedTest/kotlin/androidx/compose/ui/test/BitmapCapturingTest.kt b/compose/ui/ui-test/src/androidInstrumentedTest/kotlin/androidx/compose/ui/test/BitmapCapturingTest.kt
index aaa5e16..2120a4c 100644
--- a/compose/ui/ui-test/src/androidInstrumentedTest/kotlin/androidx/compose/ui/test/BitmapCapturingTest.kt
+++ b/compose/ui/ui-test/src/androidInstrumentedTest/kotlin/androidx/compose/ui/test/BitmapCapturingTest.kt
@@ -63,7 +63,7 @@
fun createTestSet(): List<TestConfig> =
listOf(
TestConfig(ComponentActivity::class.java),
- TestConfig(CustomComposeHostActivity::class.java)
+ TestConfig(ActivityWithActionBar::class.java)
)
}
@@ -239,7 +239,7 @@
private fun setContent(content: @Composable () -> Unit) {
when (val activity = rule.activity) {
- is CustomComposeHostActivity -> activity.setContent(content)
+ is ActivityWithActionBar -> activity.setContent(content)
else -> rule.setContent(content)
}
}
diff --git a/compose/ui/ui-test/src/androidInstrumentedTest/kotlin/androidx/compose/ui/test/IsDisplayedTest.kt b/compose/ui/ui-test/src/androidInstrumentedTest/kotlin/androidx/compose/ui/test/IsDisplayedTest.kt
index a05ce4c..4311d59 100644
--- a/compose/ui/ui-test/src/androidInstrumentedTest/kotlin/androidx/compose/ui/test/IsDisplayedTest.kt
+++ b/compose/ui/ui-test/src/androidInstrumentedTest/kotlin/androidx/compose/ui/test/IsDisplayedTest.kt
@@ -70,7 +70,7 @@
fun createTestSet(): List<TestConfig> =
listOf(
TestConfig(ComponentActivity::class.java),
- TestConfig(CustomComposeHostActivity::class.java)
+ TestConfig(ActivityWithActionBar::class.java)
)
}
@@ -314,7 +314,7 @@
private fun setContent(content: @Composable () -> Unit) {
when (val activity = rule.activity) {
- is CustomComposeHostActivity -> activity.setContent(content)
+ is ActivityWithActionBar -> activity.setContent(content)
else -> rule.setContent(content)
}
}
diff --git a/compose/ui/ui-test/src/androidInstrumentedTest/kotlin/androidx/compose/ui/test/gesturescope/SendClickTest.kt b/compose/ui/ui-test/src/androidInstrumentedTest/kotlin/androidx/compose/ui/test/gesturescope/SendClickTest.kt
index 736a3a9..c38fbc1 100644
--- a/compose/ui/ui-test/src/androidInstrumentedTest/kotlin/androidx/compose/ui/test/gesturescope/SendClickTest.kt
+++ b/compose/ui/ui-test/src/androidInstrumentedTest/kotlin/androidx/compose/ui/test/gesturescope/SendClickTest.kt
@@ -24,7 +24,7 @@
import androidx.compose.ui.input.pointer.PointerInputFilter
import androidx.compose.ui.input.pointer.PointerInputModifier
import androidx.compose.ui.input.pointer.changedToUp
-import androidx.compose.ui.test.CustomComposeHostActivity
+import androidx.compose.ui.test.ActivityWithActionBar
import androidx.compose.ui.test.click
import androidx.compose.ui.test.junit4.ComposeTestRule
import androidx.compose.ui.test.junit4.createAndroidComposeRule
@@ -55,11 +55,11 @@
for (x in listOf(0.0f, squareSize - 1.0f)) {
for (y in listOf(0.0f, squareSize - 1.0f)) {
add(TestConfig(Offset(x, y), ComponentActivity::class.java))
- add(TestConfig(Offset(x, y), CustomComposeHostActivity::class.java))
+ add(TestConfig(Offset(x, y), ActivityWithActionBar::class.java))
}
}
add(TestConfig(null, ComponentActivity::class.java))
- add(TestConfig(null, CustomComposeHostActivity::class.java))
+ add(TestConfig(null, ActivityWithActionBar::class.java))
}
}
}
@@ -89,7 +89,7 @@
// Given a column of 5 small components
var contentSet = false
rule.activityRule.scenario.onActivity {
- if (it is CustomComposeHostActivity) {
+ if (it is ActivityWithActionBar) {
it.setContent { ColumnOfSquares(5) }
contentSet = true
}
diff --git a/constraintlayout/constraintlayout-compose/build.gradle b/constraintlayout/constraintlayout-compose/build.gradle
index 970db03..333e65d 100644
--- a/constraintlayout/constraintlayout-compose/build.gradle
+++ b/constraintlayout/constraintlayout-compose/build.gradle
@@ -83,6 +83,7 @@
implementation(project(":compose:material:material"))
implementation("androidx.compose.material:material-icons-core:1.6.7")
implementation(project(":compose:ui:ui-test-junit4"))
+ implementation(project(":compose:ui:ui-test-manifest"))
implementation(project(":compose:test-utils"))
}
}
