Refactoring fixes

This CL contains a couple of tweaks to the
refactoring support. First, update <declare-styleable>
declarations for renamed custom views. Second, update
XML in downstream projects from library projects.
Third, allow invoking the rename refactoring from XML
files from class attributes and custom view tags as well
(until now it applied only to resource names.)
Finally, update unit test golden file format to include
whether each change is enabled, and tweak the code to
disable R class changes to handle some additional
scenarios.

Change-Id: I74ccbe1b0f15ec10429f8dda7674f51f9a6f83cd

4 files changed, 102 insertions, 86 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/refactorings/core/AndroidPackageRenameParticipantTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/refactorings/core/AndroidPackageRenameParticipantTest.java
index bff6a0b..1df0b0c 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/refactorings/core/AndroidPackageRenameParticipantTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/refactorings/core/AndroidPackageRenameParticipantTest.java
@@ -41,21 +41,21 @@ public class AndroidPackageRenameParticipantTest extends RefactoringTestBase {
 
                 "CHANGES:\n" +
                 "-------\n" +
-                "* Rename package 'com.example.refactoringtest' to 'my.pkg.name'\n" +
+                "[x] Rename package 'com.example.refactoringtest' to 'my.pkg.name'\n" +
                 "\n" +
-                "* MainActivity.java - /testRefactor1/src/com/example/refactoringtest/MainActivity.java\n" +
+                "[x] MainActivity.java - /testRefactor1/src/com/example/refactoringtest/MainActivity.java\n" +
                 "  @@ -3 +3\n" +
                 "  + import com.example.refactoringtest.R;\n" +
                 "  +\n" +
                 "\n" +
                 "\n" +
-                "* activity_main.xml - /testRefactor1/res/layout/activity_main.xml\n" +
+                "[x] activity_main.xml - /testRefactor1/res/layout/activity_main.xml\n" +
                 "  @@ -33 +33\n" +
                 "  -     <fragment android:name=\"com.example.refactoringtest.MyFragment\"/>\n" +
                 "  +     <fragment android:name=\"my.pkg.name.MyFragment\"/>\n" +
                 "\n" +
                 "\n" +
-                "* AndroidManifest.xml - /testRefactor1/AndroidManifest.xml\n" +
+                "[x] AndroidManifest.xml - /testRefactor1/AndroidManifest.xml\n" +
                 "  @@ -16 +16\n" +
                 "  -             android:name=\"com.example.refactoringtest.MainActivity\"\n" +
                 "  +             android:name=\"my.pkg.name.MainActivity\"\n" +
@@ -74,7 +74,7 @@ public class AndroidPackageRenameParticipantTest extends RefactoringTestBase {
 
                 "CHANGES:\n" +
                 "-------\n" +
-                "* Rename package 'com.example.refactoringtest' to 'my.pkg.name'",
+                "[x] Rename package 'com.example.refactoringtest' to 'my.pkg.name'",
                 false);
     }
 
@@ -88,33 +88,33 @@ public class AndroidPackageRenameParticipantTest extends RefactoringTestBase {
 
                 "CHANGES:\n" +
                 "-------\n" +
-                "* Rename package 'com.example.refactoringtest' to 'my.pkg.name'\n" +
+                "[x] Rename package 'com.example.refactoringtest' to 'my.pkg.name'\n" +
                 "\n" +
-                "* MainActivity.java - /testRefactor2/src/com/example/refactoringtest/MainActivity.java\n" +
+                "[x] MainActivity.java - /testRefactor2/src/com/example/refactoringtest/MainActivity.java\n" +
                 "  @@ -3 +3\n" +
                 "  + import com.example.refactoringtest.R;\n" +
                 "  +\n" +
                 "\n" +
                 "\n" +
-                "* customviews.xml - /testRefactor2/res/layout/customviews.xml\n" +
+                "[x] customviews.xml - /testRefactor2/res/layout/customviews.xml\n" +
                 "  @@ -9 +9\n" +
                 "  -     <com.example.refactoringtest.CustomView1\n" +
                 "  +     <my.pkg.name.CustomView1\n" +
                 "\n" +
                 "\n" +
-                "* activity_main.xml - /testRefactor2/res/layout/activity_main.xml\n" +
+                "[x] activity_main.xml - /testRefactor2/res/layout/activity_main.xml\n" +
                 "  @@ -33 +33\n" +
                 "  -     <fragment android:name=\"com.example.refactoringtest.MyFragment\"/>\n" +
                 "  +     <fragment android:name=\"my.pkg.name.MyFragment\"/>\n" +
                 "\n" +
                 "\n" +
-                "* customviews.xml - /testRefactor2/res/layout-land/customviews.xml\n" +
+                "[x] customviews.xml - /testRefactor2/res/layout-land/customviews.xml\n" +
                 "  @@ -9 +9\n" +
                 "  -     <com.example.refactoringtest.CustomView1\n" +
                 "  +     <my.pkg.name.CustomView1\n" +
                 "\n" +
                 "\n" +
-                "* AndroidManifest.xml - /testRefactor2/AndroidManifest.xml\n" +
+                "[x] AndroidManifest.xml - /testRefactor2/AndroidManifest.xml\n" +
                 "  @@ -16 +16\n" +
                 "  -             android:name=\"com.example.refactoringtest.MainActivity\"\n" +
                 "  +             android:name=\"my.pkg.name.MainActivity\"\n" +
@@ -134,33 +134,33 @@ public class AndroidPackageRenameParticipantTest extends RefactoringTestBase {
 
                 "CHANGES:\n" +
                 "-------\n" +
-                "* Rename package 'com.example.refactoringtest' and subpackages to 'my.pkg.name'\n" +
+                "[x] Rename package 'com.example.refactoringtest' and subpackages to 'my.pkg.name'\n" +
                 "\n" +
-                "* MainActivity.java - /testRefactor2_renamesub/src/com/example/refactoringtest/MainActivity.java\n" +
+                "[x] MainActivity.java - /testRefactor2_renamesub/src/com/example/refactoringtest/MainActivity.java\n" +
                 "  @@ -3 +3\n" +
                 "  + import com.example.refactoringtest.R;\n" +
                 "  +\n" +
                 "\n" +
                 "\n" +
-                "* customviews.xml - /testRefactor2_renamesub/res/layout/customviews.xml\n" +
+                "[x] customviews.xml - /testRefactor2_renamesub/res/layout/customviews.xml\n" +
                 "  @@ -9 +9\n" +
                 "  -     <com.example.refactoringtest.CustomView1\n" +
                 "  +     <my.pkg.name.CustomView1\n" +
                 "\n" +
                 "\n" +
-                "* activity_main.xml - /testRefactor2_renamesub/res/layout/activity_main.xml\n" +
+                "[x] activity_main.xml - /testRefactor2_renamesub/res/layout/activity_main.xml\n" +
                 "  @@ -33 +33\n" +
                 "  -     <fragment android:name=\"com.example.refactoringtest.MyFragment\"/>\n" +
                 "  +     <fragment android:name=\"my.pkg.name.MyFragment\"/>\n" +
                 "\n" +
                 "\n" +
-                "* customviews.xml - /testRefactor2_renamesub/res/layout-land/customviews.xml\n" +
+                "[x] customviews.xml - /testRefactor2_renamesub/res/layout-land/customviews.xml\n" +
                 "  @@ -9 +9\n" +
                 "  -     <com.example.refactoringtest.CustomView1\n" +
                 "  +     <my.pkg.name.CustomView1\n" +
                 "\n" +
                 "\n" +
-                "* AndroidManifest.xml - /testRefactor2_renamesub/AndroidManifest.xml\n" +
+                "[x] AndroidManifest.xml - /testRefactor2_renamesub/AndroidManifest.xml\n" +
                 "  @@ -16 +16\n" +
                 "  -             android:name=\"com.example.refactoringtest.MainActivity\"\n" +
                 "  +             android:name=\"my.pkg.name.MainActivity\"\n" +
@@ -169,13 +169,13 @@ public class AndroidPackageRenameParticipantTest extends RefactoringTestBase {
                 "  +             android:name=\"my.pkg.name.MainActivity2\"\n" +
                 "\n" +
                 "\n" +
-                "* customviews.xml - /testRefactor2_renamesub/res/layout/customviews.xml\n" +
+                "[x] customviews.xml - /testRefactor2_renamesub/res/layout/customviews.xml\n" +
                 "  @@ -15 +15\n" +
                 "  -     <com.example.refactoringtest.subpackage.CustomView2\n" +
                 "  +     <my.pkg.name.subpackage.CustomView2\n" +
                 "\n" +
                 "\n" +
-                "* customviews.xml - /testRefactor2_renamesub/res/layout-land/customviews.xml\n" +
+                "[x] customviews.xml - /testRefactor2_renamesub/res/layout-land/customviews.xml\n" +
                 "  @@ -15 +15\n" +
                 "  -     <com.example.refactoringtest.subpackage.CustomView2\n" +
                 "  +     <my.pkg.name.subpackage.CustomView2",
@@ -192,7 +192,7 @@ public class AndroidPackageRenameParticipantTest extends RefactoringTestBase {
 
                 "CHANGES:\n" +
                 "-------\n" +
-                "* Rename package 'com.example.refactoringtest' and subpackages to 'my.pkg.name'",
+                "[x] Rename package 'com.example.refactoringtest' and subpackages to 'my.pkg.name'",
                 false);
     }
 
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/refactorings/core/RefactoringTestBase.java b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/refactorings/core/RefactoringTestBase.java
index 1a97b83..dd0d68d 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/refactorings/core/RefactoringTestBase.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/refactorings/core/RefactoringTestBase.java
@@ -146,7 +146,11 @@ public abstract class RefactoringTestBase extends AdtProjectTest {
 
             // Describe this change
             indent(sb, indent);
-            sb.append("* ");
+            if (change.isEnabled()) {
+                sb.append("[x] ");
+            } else {
+                sb.append("[ ] ");
+            }
             sb.append(changeName);
 
             IFile file = getFile(change);
@@ -580,6 +584,19 @@ public abstract class RefactoringTestBase extends AdtProjectTest {
             "    }\n" +
             "}\n";
 
+    protected static final String CUSTOM_VIEW_1_STYLES =
+            "<resources>\n" +
+            "\n" +
+            "    <!-- Aattributes for the custom view -->\n" +
+            "    <declare-styleable name=\"CustomView1\">\n" +
+            "        <attr name=\"exampleString\" format=\"string\" />\n" +
+            "        <attr name=\"exampleDimension\" format=\"dimension\" />\n" +
+            "        <attr name=\"exampleColor\" format=\"color\" />\n" +
+            "        <attr name=\"exampleDrawable\" format=\"color|reference\" />\n" +
+            "    </declare-styleable>\n" +
+            "\n" +
+            "</resources>";
+
     protected static final String CUSTOM_VIEW_2 =
             "package com.example.refactoringtest.subpackage;\n" +
             "\n" +
@@ -625,6 +642,9 @@ public abstract class RefactoringTestBase extends AdtProjectTest {
         "src/com/example/refactoringtest/CustomView1.java",
         CUSTOM_VIEW_1,
 
+        "res/values/attrs_custom_view.xml",
+        CUSTOM_VIEW_1_STYLES,
+
         "src/com/example/refactoringtest/subpackage/CustomView2.java",
         CUSTOM_VIEW_2,
 
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/refactorings/core/RenameResourceParticipantTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/refactorings/core/RenameResourceParticipantTest.java
index b7793bb..ccf6e4f 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/refactorings/core/RenameResourceParticipantTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/refactorings/core/RenameResourceParticipantTest.java
@@ -42,19 +42,19 @@ public class RenameResourceParticipantTest extends RefactoringTestBase {
 
                 "CHANGES:\n" +
                 "-------\n" +
-                "* strings.xml - /testRefactor1/res/values/strings.xml\n" +
+                "[x] strings.xml - /testRefactor1/res/values/strings.xml\n" +
                 "  @@ -4 +4\n" +
                 "  -     <string name=\"app_name\">RefactoringTest</string>\n" +
                 "  +     <string name=\"myname\">RefactoringTest</string>\n" +
                 "\n" +
                 "\n" +
-                "* R.java - /testRefactor1/gen/com/example/refactoringtest/R.java\n" +
+                "[ ] R.java - /testRefactor1/gen/com/example/refactoringtest/R.java\n" +
                 "  @@ -29 +29\n" +
                 "  -         public static final int app_name=0x7f040000;\n" +
                 "  +         public static final int myname=0x7f040000;\n" +
                 "\n" +
                 "\n" +
-                "* AndroidManifest.xml - /testRefactor1/AndroidManifest.xml\n" +
+                "[x] AndroidManifest.xml - /testRefactor1/AndroidManifest.xml\n" +
                 "  @@ -13 +13\n" +
                 "  -         android:label=\"@string/app_name\"\n" +
                 "  +         android:label=\"@string/myname\"\n" +
@@ -72,13 +72,13 @@ public class RenameResourceParticipantTest extends RefactoringTestBase {
 
                 "CHANGES:\n" +
                 "-------\n" +
-                "* activity_main.xml - /testRefactor2/res/menu/activity_main.xml\n" +
+                "[x] activity_main.xml - /testRefactor2/res/menu/activity_main.xml\n" +
                 "  @@ -4 +4\n" +
                 "  -         android:id=\"@+id/menu_settings\"\n" +
                 "  +         android:id=\"@+id/new_id_for_the_action_bar\"\n" +
                 "\n" +
                 "\n" +
-                "* R.java - /testRefactor2/gen/com/example/refactoringtest/R.java\n" +
+                "[ ] R.java - /testRefactor2/gen/com/example/refactoringtest/R.java\n" +
                 "  @@ -19 +19\n" +
                 "  -         public static final int menu_settings=0x7f070003;\n" +
                 "  +         public static final int new_id_for_the_action_bar=0x7f070003;");
@@ -93,7 +93,7 @@ public class RenameResourceParticipantTest extends RefactoringTestBase {
 
                 "CHANGES:\n" +
                 "-------\n" +
-                "* activity_main.xml - /testRefactor3/res/layout/activity_main.xml\n" +
+                "[x] activity_main.xml - /testRefactor3/res/layout/activity_main.xml\n" +
                 "  @@ -8 +8\n" +
                 "  -         android:id=\"@+id/textView1\"\n" +
                 "  +         android:id=\"@+id/output\"\n" +
@@ -104,13 +104,13 @@ public class RenameResourceParticipantTest extends RefactoringTestBase {
                 "  +         android:layout_below=\"@+id/output\"\n" +
                 "\n" +
                 "\n" +
-                "* MainActivity.java - /testRefactor3/src/com/example/refactoringtest/MainActivity.java\n" +
+                "[x] MainActivity.java - /testRefactor3/src/com/example/refactoringtest/MainActivity.java\n" +
                 "  @@ -14 +14\n" +
                 "  -         View view1 = findViewById(R.id.textView1);\n" +
                 "  +         View view1 = findViewById(R.id.output);\n" +
                 "\n" +
                 "\n" +
-                "* R.java - /testRefactor3/gen/com/example/refactoringtest/R.java\n" +
+                "[ ] R.java - /testRefactor3/gen/com/example/refactoringtest/R.java\n" +
                 "  @@ -20 +20\n" +
                 "  -         public static final int textView1=0x7f070000;\n" +
                 "  +         public static final int output=0x7f070000;");
@@ -126,7 +126,7 @@ public class RenameResourceParticipantTest extends RefactoringTestBase {
 
                 "CHANGES:\n" +
                 "-------\n" +
-                "* activity_main.xml - /testRefactor4/res/layout/activity_main.xml\n" +
+                "[x] activity_main.xml - /testRefactor4/res/layout/activity_main.xml\n" +
                 "  @@ -8 +8\n" +
                 "  -         android:id=\"@+id/textView1\"\n" +
                 "  +         android:id=\"@+id/output\"\n" +
@@ -137,13 +137,13 @@ public class RenameResourceParticipantTest extends RefactoringTestBase {
                 "  +         android:layout_below=\"@+id/output\"\n" +
                 "\n" +
                 "\n" +
-                "* MainActivity.java - /testRefactor4/src/com/example/refactoringtest/MainActivity.java\n" +
+                "[x] MainActivity.java - /testRefactor4/src/com/example/refactoringtest/MainActivity.java\n" +
                 "  @@ -14 +14\n" +
                 "  -         View view1 = findViewById(R.id.textView1);\n" +
                 "  +         View view1 = findViewById(R.id.output);\n" +
                 "\n" +
                 "\n" +
-                "* R.java - /testRefactor4/gen/com/example/refactoringtest/R.java\n" +
+                "[ ] R.java - /testRefactor4/gen/com/example/refactoringtest/R.java\n" +
                 "  @@ -20 +20\n" +
                 "  -         public static final int textView1=0x7f070000;\n" +
                 "  +         public static final int output=0x7f070000;");
@@ -158,21 +158,21 @@ public class RenameResourceParticipantTest extends RefactoringTestBase {
 
                 "CHANGES:\n" +
                 "-------\n" +
-                "* MainActivity.java - /testRefactor5/src/com/example/refactoringtest/MainActivity.java\n" +
+                "[x] MainActivity.java - /testRefactor5/src/com/example/refactoringtest/MainActivity.java\n" +
                 "  @@ -13 +13\n" +
                 "  -         setContentView(R.layout.activity_main);\n" +
                 "  +         setContentView(R.layout.newlayout);\n" +
                 "\n" +
                 "\n" +
-                "* R.java - /testRefactor5/gen/com/example/refactoringtest/R.java\n" +
+                "[ ] R.java - /testRefactor5/gen/com/example/refactoringtest/R.java\n" +
                 "  @@ -23 +23\n" +
                 "  -         public static final int activity_main=0x7f030000;\n" +
                 "  +         public static final int newlayout=0x7f030000;\n" +
                 "\n" +
                 "\n" +
-                "* Rename 'testRefactor5/res/layout/activity_main.xml' to 'newlayout.xml'\n" +
+                "[x] Rename 'testRefactor5/res/layout/activity_main.xml' to 'newlayout.xml'\n" +
                 "\n" +
-                "* Rename 'testRefactor5/res/layout-land/activity_main.xml' to 'newlayout.xml'");
+                "[x] Rename 'testRefactor5/res/layout-land/activity_main.xml' to 'newlayout.xml'");
     }
 
     public void testRefactor6() throws Exception {
@@ -184,21 +184,21 @@ public class RenameResourceParticipantTest extends RefactoringTestBase {
 
                 "CHANGES:\n" +
                 "-------\n" +
-                "* R.java - /testRefactor6/gen/com/example/refactoringtest/R.java\n" +
+                "[ ] R.java - /testRefactor6/gen/com/example/refactoringtest/R.java\n" +
                 "  @@ -14 +14\n" +
                 "  -         public static final int ic_launcher=0x7f020000;\n" +
                 "  +         public static final int newlauncher=0x7f020000;\n" +
                 "\n" +
                 "\n" +
-                "* Rename 'testRefactor6/res/drawable-xhdpi/ic_launcher.png' to 'newlauncher.png'\n" +
+                "[x] Rename 'testRefactor6/res/drawable-xhdpi/ic_launcher.png' to 'newlauncher.png'\n" +
                 "\n" +
-                "* Rename 'testRefactor6/res/drawable-mdpi/ic_launcher.png' to 'newlauncher.png'\n" +
+                "[x] Rename 'testRefactor6/res/drawable-mdpi/ic_launcher.png' to 'newlauncher.png'\n" +
                 "\n" +
-                "* Rename 'testRefactor6/res/drawable-ldpi/ic_launcher.png' to 'newlauncher.png'\n" +
+                "[x] Rename 'testRefactor6/res/drawable-ldpi/ic_launcher.png' to 'newlauncher.png'\n" +
                 "\n" +
-                "* Rename 'testRefactor6/res/drawable-hdpi/ic_launcher.png' to 'newlauncher.png'\n" +
+                "[x] Rename 'testRefactor6/res/drawable-hdpi/ic_launcher.png' to 'newlauncher.png'\n" +
                 "\n" +
-                "* AndroidManifest.xml - /testRefactor6/AndroidManifest.xml\n" +
+                "[x] AndroidManifest.xml - /testRefactor6/AndroidManifest.xml\n" +
                 "  @@ -12 +12\n" +
                 "  -         android:icon=\"@drawable/ic_launcher\"\n" +
                 "  +         android:icon=\"@drawable/newlauncher\"");
@@ -216,21 +216,21 @@ public class RenameResourceParticipantTest extends RefactoringTestBase {
 
                 "CHANGES:\n" +
                 "-------\n" +
-                "* MainActivity.java - /testRefactor7/src/com/example/refactoringtest/MainActivity.java\n" +
+                "[x] MainActivity.java - /testRefactor7/src/com/example/refactoringtest/MainActivity.java\n" +
                 "  @@ -13 +13\n" +
                 "  -         setContentView(R.layout.activity_main);\n" +
                 "  +         setContentView(R.layout.newlayout);\n" +
                 "\n" +
                 "\n" +
-                "* R.java - /testRefactor7/gen/com/example/refactoringtest/R.java\n" +
+                "[ ] R.java - /testRefactor7/gen/com/example/refactoringtest/R.java\n" +
                 "  @@ -23 +23\n" +
                 "  -         public static final int activity_main=0x7f030000;\n" +
                 "  +         public static final int newlayout=0x7f030000;\n" +
                 "\n" +
                 "\n" +
-                "* Rename 'testRefactor7/res/layout-land/activity_main.xml' to 'newlayout.xml'\n" +
+                "[x] Rename 'testRefactor7/res/layout-land/activity_main.xml' to 'newlayout.xml'\n" +
                 "\n" +
-                "* Rename 'testRefactor7/res/layout/activity_main.xml' to 'newlayout.xml'",
+                "[x] Rename 'testRefactor7/res/layout/activity_main.xml' to 'newlayout.xml'",
                 null);
     }
 
@@ -258,17 +258,17 @@ public class RenameResourceParticipantTest extends RefactoringTestBase {
 
                 "CHANGES:\n" +
                 "-------\n" +
-                "* Rename 'testRefactor8/res/layout/activity_main.xml' to 'newlauncher.xml'\n" +
+                "[x] Rename 'testRefactor8/res/layout/activity_main.xml' to 'newlauncher.xml'\n" +
                 "\n" +
-                "* Rename 'testRefactor8/res/layout-land/activity_main.xml' to 'newlauncher.xml'\n" +
+                "[x] Rename 'testRefactor8/res/layout-land/activity_main.xml' to 'newlauncher.xml'\n" +
                 "\n" +
-                "* MainActivity.java - /testRefactor8/src/com/example/refactoringtest/MainActivity.java\n" +
+                "[x] MainActivity.java - /testRefactor8/src/com/example/refactoringtest/MainActivity.java\n" +
                 "  @@ -13 +13\n" +
                 "  -         setContentView(R.layout.activity_main);\n" +
                 "  +         setContentView(R.layout.newlauncher);\n" +
                 "\n" +
                 "\n" +
-                "* R.java - /testRefactor8/gen/com/example/refactoringtest/R.java\n" +
+                "[ ] R.java - /testRefactor8/gen/com/example/refactoringtest/R.java\n" +
                 "  @@ -23 +23\n" +
                 "  -         public static final int activity_main=0x7f030000;\n" +
                 "  +         public static final int newlauncher=0x7f030000;",
@@ -302,13 +302,13 @@ public class RenameResourceParticipantTest extends RefactoringTestBase {
 
                 "CHANGES:\n" +
                 "-------\n" +
-                "* activity_main.xml - /testRefactor9/res/layout/activity_main.xml\n" +
+                "[x] activity_main.xml - /testRefactor9/res/layout/activity_main.xml\n" +
                 "  @@ -8 +8\n" +
                 "  -         android:id=\"@+id/textView1\"\n" +
                 "  +         android:id=\"@+id/output\"\n" +
                 "\n" +
                 "\n" +
-                "* R.java - /testRefactor9/gen/com/example/refactoringtest/R.java\n" +
+                "[ ] R.java - /testRefactor9/gen/com/example/refactoringtest/R.java\n" +
                 "  @@ -20 +20\n" +
                 "  -         public static final int textView1=0x7f070000;\n" +
                 "  +         public static final int output=0x7f070000;");
@@ -324,7 +324,7 @@ public class RenameResourceParticipantTest extends RefactoringTestBase {
 
                 "CHANGES:\n" +
                 "-------\n" +
-                "* activity_main.xml - /testRefactor10/res/layout-land/activity_main.xml\n" +
+                "[x] activity_main.xml - /testRefactor10/res/layout-land/activity_main.xml\n" +
                 "  @@ -10 +10\n" +
                 "  -         tools:listitem=\"@layout/preview\" >\n" +
                 "  +         tools:listitem=\"@layout/newlayout\" >\n" +
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/refactorings/renamepackage/ApplicationPackageNameRefactoringTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/refactorings/renamepackage/ApplicationPackageNameRefactoringTest.java
index 742aa31..438906d 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/refactorings/renamepackage/ApplicationPackageNameRefactoringTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/refactorings/renamepackage/ApplicationPackageNameRefactoringTest.java
@@ -32,25 +32,23 @@ public class ApplicationPackageNameRefactoringTest extends RefactoringTestBase {
 
                 "CHANGES:\n" +
                 "-------\n" +
-                "* Refactoring Application package name\n" +
+                "[x] MainActivity2.java - /testRefactor1/src/com/example/refactoringtest/MainActivity2.java\n" +
+                "  @@ -7 +7\n" +
+                "  + import my.pkg.name.R;\n" +
                 "\n" +
-                "  * MainActivity2.java - /testRefactor1/src/com/example/refactoringtest/MainActivity2.java\n" +
-                "    @@ -7 +7\n" +
-                "    + import my.pkg.name.R;\n" +
                 "\n" +
+                "[x] MainActivity.java - /testRefactor1/src/com/example/refactoringtest/MainActivity.java\n" +
+                "  @@ -7 +7\n" +
+                "  + import my.pkg.name.R;\n" +
                 "\n" +
-                "  * MainActivity.java - /testRefactor1/src/com/example/refactoringtest/MainActivity.java\n" +
-                "    @@ -7 +7\n" +
-                "    + import my.pkg.name.R;\n" +
                 "\n" +
-                "\n" +
-                "  * Make Manifest edits - /testRefactor1/AndroidManifest.xml\n" +
-                "    @@ -3 +3\n" +
-                "    -     package=\"com.example.refactoringtest\"\n" +
-                "    +     package=\"my.pkg.name\"\n" +
-                "    @@ -25 +25\n" +
-                "    -             android:name=\".MainActivity2\"\n" +
-                "    +             android:name=\"com.example.refactoringtest.MainActivity2\"");
+                "[x] Make Manifest edits - /testRefactor1/AndroidManifest.xml\n" +
+                "  @@ -3 +3\n" +
+                "  -     package=\"com.example.refactoringtest\"\n" +
+                "  +     package=\"my.pkg.name\"\n" +
+                "  @@ -25 +25\n" +
+                "  -             android:name=\".MainActivity2\"\n" +
+                "  +             android:name=\"com.example.refactoringtest.MainActivity2\"");
     }
 
     public void testRefactor2() throws Exception {
@@ -61,30 +59,28 @@ public class ApplicationPackageNameRefactoringTest extends RefactoringTestBase {
 
                 "CHANGES:\n" +
                 "-------\n" +
-                "* Refactoring Application package name\n" +
-                "\n" +
-                "  * MyFragment.java - /testRefactor2/src/com/example/refactoringtest/MyFragment.java\n" +
-                "    @@ -3 +3\n" +
-                "    + import my.pkg.name.R;\n" +
+                "[x] MyFragment.java - /testRefactor2/src/com/example/refactoringtest/MyFragment.java\n" +
+                "  @@ -3 +3\n" +
+                "  + import my.pkg.name.R;\n" +
                 "\n" +
                 "\n" +
-                "  * MainActivity.java - /testRefactor2/src/com/example/refactoringtest/MainActivity.java\n" +
-                "    @@ -7 +7\n" +
-                "    + import my.pkg.name.R;\n" +
+                "[x] MainActivity.java - /testRefactor2/src/com/example/refactoringtest/MainActivity.java\n" +
+                "  @@ -7 +7\n" +
+                "  + import my.pkg.name.R;\n" +
                 "\n" +
                 "\n" +
-                "  * CustomView1.java - /testRefactor2/src/com/example/refactoringtest/CustomView1.java\n" +
-                "    @@ -5 +5\n" +
-                "    + import my.pkg.name.R;\n" +
+                "[x] CustomView1.java - /testRefactor2/src/com/example/refactoringtest/CustomView1.java\n" +
+                "  @@ -5 +5\n" +
+                "  + import my.pkg.name.R;\n" +
                 "\n" +
                 "\n" +
-                "  * Make Manifest edits - /testRefactor2/AndroidManifest.xml\n" +
-                "    @@ -3 +3\n" +
-                "    -     package=\"com.example.refactoringtest\"\n" +
-                "    +     package=\"my.pkg.name\"\n" +
-                "    @@ -25 +25\n" +
-                "    -             android:name=\".MainActivity2\"\n" +
-                "    +             android:name=\"com.example.refactoringtest.MainActivity2\"");
+                "[x] Make Manifest edits - /testRefactor2/AndroidManifest.xml\n" +
+                "  @@ -3 +3\n" +
+                "  -     package=\"com.example.refactoringtest\"\n" +
+                "  +     package=\"my.pkg.name\"\n" +
+                "  @@ -25 +25\n" +
+                "  -             android:name=\".MainActivity2\"\n" +
+                "  +             android:name=\"com.example.refactoringtest.MainActivity2\"");
     }
 
     // ---- Test infrastructure ----