commit c7ccd58a55db8072ff42cb631c9e312f7c1f986d
author Morten Krogh-Jespersen <mkroghj@google.com> Thu Jun 08 09:15:03 2023 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Thu Jun 08 08:36:20 2023 +0000
tree 800f6beb3859ce9651be0eabfd628f47481460b9
parent beb267fb7cc80d5ec79d7eaa83ee36e5aad44e83

[Compose] Update ComposeSourceFileTest to test existing classes

Bug: b/286023274
Change-Id: Ic912fb1289f46a536983f40b9b6cd09581e5792b

src/test/java/com/android/tools/r8/mappingcompose/ComposeSourceFileTest.java

diff --git a/src/test/java/com/android/tools/r8/mappingcompose/ComposeSourceFileTest.java b/src/test/java/com/android/tools/r8/mappingcompose/ComposeSourceFileTest.java
index b07c55c..d155375 100644
--- a/src/test/java/com/android/tools/r8/mappingcompose/ComposeSourceFileTest.java
+++ b/src/test/java/com/android/tools/r8/mappingcompose/ComposeSourceFileTest.java
@@ -31,22 +31,34 @@
 
   private static final String mappingFoo =
       StringUtils.unixLines(
-          "# {'id':'com.android.tools.r8.mapping','version':'experimental'}",
-          "com.foo -> a:",
-          "    # {'id':'sourceFile','fileName':'Foo.kt'}");
+          "# {'id':'com.android.tools.r8.mapping','version':'2.2'}",
+          "com.foo -> A:",
+          "    # {'id':'sourceFile','fileName':'Foo.kt'}",
+          "com.bar -> B:",
+          "    # {'id':'sourceFile','fileName':'Bar.kt'}",
+          "com.baz -> C:");
   private static final String mappingBar =
       StringUtils.unixLines(
-          "# {'id':'com.android.tools.r8.mapping','version':'experimental'}",
-          "com.bar -> c:",
-          "    # {'id':'sourceFile','fileName':'Bar.kt'}",
-          "a -> b:");
+          "# {'id':'com.android.tools.r8.mapping','version':'2.2'}",
+          "A -> a:",
+          "    # {'id':'sourceFile','fileName':'some-hash-inserted-into-source-file'}",
+          "B -> b:",
+          "C -> c:",
+          "    # {'id':'sourceFile','fileName':'some-other-hash-inserted-into-source-file'}",
+          "com.qux -> d:",
+          "    # {'id':'sourceFile','fileName':'Qux.kt'}");
   private static final String mappingResult =
       StringUtils.unixLines(
-          "# {'id':'com.android.tools.r8.mapping','version':'experimental'}",
-          "com.bar -> c:",
+          "# {'id':'com.android.tools.r8.mapping','version':'2.2'}",
+          "com.bar -> b:",
           "# {'id':'sourceFile','fileName':'Bar.kt'}",
-          "com.foo -> b:",
-          "# {'id':'sourceFile','fileName':'Foo.kt'}");
+          "com.baz -> c:",
+          // TODO(b/286023274): We should not insert 'sourceFile' on composed classes.
+          "# {'id':'sourceFile','fileName':'some-other-hash-inserted-into-source-file'}",
+          "com.foo -> a:",
+          "# {'id':'sourceFile','fileName':'Foo.kt'}",
+          "com.qux -> d:",
+          "# {'id':'sourceFile','fileName':'Qux.kt'}");
 
   @Test
   public void testCompose() throws Exception {