Sort method params in preview discovery output
Bug: 335714094
Test: test added
Change-Id: Iab601ab9ac9eddd787863034dc22410ec8ce3c75
diff --git a/build-system/integration-test/application/src/test/java/com/android/build/gradle/integration/testing/screenshot/ScreenshotTest.kt b/build-system/integration-test/application/src/test/java/com/android/build/gradle/integration/testing/screenshot/ScreenshotTest.kt
index 8900d59..2d4427b 100644
--- a/build-system/integration-test/application/src/test/java/com/android/build/gradle/integration/testing/screenshot/ScreenshotTest.kt
+++ b/build-system/integration-test/application/src/test/java/com/android/build/gradle/integration/testing/screenshot/ScreenshotTest.kt
@@ -185,7 +185,7 @@
SimpleComposable()
}
- @Preview(showBackground = true)
+ @Preview(widthDp = 800, heightDp = 800)
@Composable
fun simpleComposableTest2() {
SimpleComposable()
@@ -270,9 +270,10 @@
"methodFQN": "pkg.name.ExampleTest.simpleComposableTest2",
"methodParams": [],
"previewParams": {
- "showBackground": "true"
+ "heightDp": "800",
+ "widthDp": "800"
},
- "imageName": "pkg.name.ExampleTest.simpleComposableTest2_3d8b4969_da39a3ee"
+ "imageName": "pkg.name.ExampleTest.simpleComposableTest2_b55c4b0c_da39a3ee"
},
{
"methodFQN": "pkg.name.ExampleTest.simpleComposableTest",
@@ -303,7 +304,7 @@
val referenceScreenshotDir = appProject.projectDir.resolve("src/androidTest/screenshot/debug/").toPath()
assertThat(referenceScreenshotDir.listDirectoryEntries().map { it.name }).containsExactly(
"pkg.name.ExampleTest.simpleComposableTest_3d8b4969_da39a3ee_0.png",
- "pkg.name.ExampleTest.simpleComposableTest2_3d8b4969_da39a3ee_0.png",
+ "pkg.name.ExampleTest.simpleComposableTest2_b55c4b0c_da39a3ee_0.png",
"pkg.name.ExampleTest.multiPreviewTest_3d8b4969_da39a3ee_0.png",
"pkg.name.ExampleTest.multiPreviewTest_a45d2556_da39a3ee_0.png",
"pkg.name.ExampleTest.parameterProviderTest_da39a3ee_77e30523_0.png",
@@ -366,7 +367,7 @@
assertThat(diffDir).exists()
assertThat(diffDir.listDirectoryEntries().map { it.name }).containsExactly(
"pkg.name.ExampleTest.simpleComposableTest_3d8b4969_da39a3ee_0.png",
- "pkg.name.ExampleTest.simpleComposableTest2_3d8b4969_da39a3ee_0.png",
+ "pkg.name.ExampleTest.simpleComposableTest2_b55c4b0c_da39a3ee_0.png",
"pkg.name.ExampleTest.multiPreviewTest_3d8b4969_da39a3ee_0.png",
"pkg.name.ExampleTest.multiPreviewTest_a45d2556_da39a3ee_0.png",
"pkg.name.ExampleTest.parameterProviderTest_da39a3ee_77e30523_0.png",
diff --git a/preview/screenshot/preview-screenshot-gradle-plugin/src/main/java/com/android/tools/preview/screenshot/PreviewFinder.kt b/preview/screenshot/preview-screenshot-gradle-plugin/src/main/java/com/android/tools/preview/screenshot/PreviewFinder.kt
index 48468a1..01c3f09 100644
--- a/preview/screenshot/preview-screenshot-gradle-plugin/src/main/java/com/android/tools/preview/screenshot/PreviewFinder.kt
+++ b/preview/screenshot/preview-screenshot-gradle-plugin/src/main/java/com/android/tools/preview/screenshot/PreviewFinder.kt
@@ -121,7 +121,7 @@
private fun convertMap(map: Map<String, Any?>): Map<String, String> =
map.map { (key, value) ->
key to (if (key == "provider") (value as Type).className else value.toString())
- }.toMap()
+ }.toMap().toSortedMap()
private fun calcHexString(digest: ByteArray): String {
