ADT: support synthetic parent chains in attrs_manifest.xml

SDK Bug: 3125910

Change-Id: I00450b13d10cbe4f32cbfbd6e1945985b599920f

3 files changed, 28 insertions, 10 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/resources/AttrsXmlParserManifestTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/resources/AttrsXmlParserManifestTest.java
index f1947a3..6ee9223 100755
--- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/resources/AttrsXmlParserManifestTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/resources/AttrsXmlParserManifestTest.java
@@ -17,7 +17,6 @@
 package com.android.ide.eclipse.adt.internal.resources;
 
 
-import com.android.ide.common.api.IAttributeInfo.Format;
 import com.android.ide.eclipse.tests.AdtTestData;
 
 import java.util.Arrays;
@@ -48,7 +47,7 @@ public class AttrsXmlParserManifestTest extends TestCase {
         assertEquals(mFilePath, mParser.getOsAttrsXmlPath());
     }
 
-    public final void testPreload() throws Exception {
+    private Map<String, DeclareStyleableInfo> preloadAndGetStyleables() {
         assertSame(mParser, mParser.preload());
 
         Map<String, DeclareStyleableInfo> styleableList = mParser.getDeclareStyleableList();
@@ -56,19 +55,40 @@ public class AttrsXmlParserManifestTest extends TestCase {
         if (!(styleableList instanceof TreeMap<?, ?>)) {
             styleableList = new TreeMap<String, DeclareStyleableInfo>(styleableList);
         }
+        return styleableList;
+    }
+
+    public final void testPreload() throws Exception {
+        Map<String, DeclareStyleableInfo> styleableList = preloadAndGetStyleables();
 
         assertEquals(
                 "[AndroidManifest, " +
                 "AndroidManifestActivityAlias, " +
                 "AndroidManifestApplication, " +
                 "AndroidManifestNewElement, " +
+                "AndroidManifestNewParent, " +
                 "AndroidManifestPermission" +
-                // TODO This is for the next CL:
-                //"AndroidManifestImplicitParentElement" +
-                //"AndroidManifestNewElement" +
                 "]",
                 Arrays.toString(styleableList.keySet().toArray()));
+    }
+
+    /**
+     * Tests that AndroidManifestNewParentNewElement got renamed to AndroidManifestNewElement
+     * and a parent named AndroidManifestNewParent was automatically created.
+     */
+    public final void testNewParent() throws Exception {
+        Map<String, DeclareStyleableInfo> styleableList = preloadAndGetStyleables();
+
+        DeclareStyleableInfo newElement = styleableList.get("AndroidManifestNewElement");
+        assertNotNull(newElement);
+        assertEquals("AndroidManifestNewElement", newElement.getStyleName());
+        assertEquals("[AndroidManifestNewParent]",
+                     Arrays.toString(newElement.getParents()));
+
+        DeclareStyleableInfo newParent = styleableList.get("AndroidManifestNewParent");
+        assertNotNull(newParent);
+        assertEquals("[AndroidManifest]",
+                     Arrays.toString(newParent.getParents()));
 
-        // TODO test a bit more the styleable info vlaues.
     }
 }
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/resources/AttrsXmlParserTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/resources/AttrsXmlParserTest.java
index 0413210..cd228ba 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/resources/AttrsXmlParserTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/resources/AttrsXmlParserTest.java
@@ -20,8 +20,6 @@ package com.android.ide.eclipse.adt.internal.resources;
 import com.android.ide.eclipse.adt.editors.layout.gscripts.IAttributeInfo.Format;
 import com.android.ide.eclipse.tests.AdtTestData;
 
-import org.w3c.dom.Document;
-
 import java.util.Map;
 
 import junit.framework.TestCase;
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/testdata/mock_manifest_attrs.xml b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/testdata/mock_manifest_attrs.xml
index 9dcb70b..2335d25 100755
--- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/testdata/mock_manifest_attrs.xml
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/testdata/mock_manifest_attrs.xml
@@ -170,8 +170,8 @@
         <attr name="icon" />
     </declare-styleable>
 
-    <declare-styleable name="AndroidManifestNewElement"
-            parent="AndroidManifest.AndroidManifestImplicitParentElement">
+    <declare-styleable name="AndroidManifestNewParentNewElement"
+            parent="AndroidManifest.AndroidManifestNewParent">
         <attr name="name" />
         <attr name="label" />
         <attr name="icon" />