Merge "Add activity details to the ManifestInfo" into idea133

1 files changed, 17 insertions, 14 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/manifest/ManifestInfoTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/manifest/ManifestInfoTest.java
index 57027e9ac..43f9d681f 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/manifest/ManifestInfoTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/manifest/ManifestInfoTest.java
@@ -19,7 +19,9 @@ import static com.android.resources.ScreenSize.LARGE;
 import static com.android.resources.ScreenSize.NORMAL;
 import static com.android.resources.ScreenSize.XLARGE;
 
+import com.android.annotations.NonNull;
 import com.android.ide.eclipse.adt.internal.editors.layout.refactoring.AdtProjectTest;
+import com.android.ide.eclipse.adt.internal.editors.manifest.ManifestInfo.ActivityAttributes;
 import com.android.ide.eclipse.adt.internal.resources.ResourceHelper;
 import com.android.sdklib.AndroidVersion;
 import com.android.sdklib.BuildToolInfo;
@@ -50,7 +52,7 @@ public class ManifestInfoTest extends AdtProjectTest {
                 "    package='com.android.unittest'>\n" +
                 "    <uses-sdk android:minSdkVersion='3' android:targetSdkVersion='4'/>\n" +
                 "</manifest>\n");
-        Map<String, String> map = info.getActivityThemes();
+        Map<String, ActivityAttributes> map = info.getActivityAttributesMap();
         assertEquals(map.toString(), 0, map.size());
         assertEquals("com.android.unittest", info.getPackage());
         assertEquals("Theme", ResourceHelper.styleToTheme(info.getDefaultTheme(null, NORMAL)));
@@ -64,7 +66,7 @@ public class ManifestInfoTest extends AdtProjectTest {
                 "    package='com.android.unittest'>\n" +
                 "    <uses-sdk android:minSdkVersion='3' android:targetSdkVersion='11'/>\n" +
                 "</manifest>\n");
-        Map<String, String> map = info.getActivityThemes();
+        Map<String, ActivityAttributes> map = info.getActivityAttributesMap();
         assertEquals(map.toString(), 0, map.size());
         assertEquals("com.android.unittest", info.getPackage());
         assertEquals("Theme.Holo", ResourceHelper.styleToTheme(info.getDefaultTheme(null,
@@ -78,7 +80,7 @@ public class ManifestInfoTest extends AdtProjectTest {
                 "    package='com.android.unittest'>\n" +
                 "    <uses-sdk android:minSdkVersion='11'/>\n" +
                 "</manifest>\n");
-        Map<String, String> map = info.getActivityThemes();
+        Map<String, ActivityAttributes> map = info.getActivityAttributesMap();
         assertEquals(map.toString(), 0, map.size());
         assertEquals("com.android.unittest", info.getPackage());
         assertEquals("Theme.Holo", ResourceHelper.styleToTheme(info.getDefaultTheme(null,
@@ -110,11 +112,11 @@ public class ManifestInfoTest extends AdtProjectTest {
         assertEquals("com.android.unittest", info.getPackage());
         assertEquals("Theme", ResourceHelper.styleToTheme(info.getDefaultTheme(null, XLARGE)));
 
-        Map<String, String> map = info.getActivityThemes();
-        assertEquals(map.toString(), 1, map.size());
-        assertNull(map.get("com.android.unittest.prefs.PrefsActivity"));
+        Map<String, ActivityAttributes> map = info.getActivityAttributesMap();
+        assertEquals(map.toString(), 2, map.size());
+        assertNull(map.get("com.android.unittest.prefs.PrefsActivity").getTheme());
         assertEquals("@android:style/Theme.Dialog",
-                map.get("com.android.unittest.app.IntroActivity"));
+                map.get("com.android.unittest.app.IntroActivity").getTheme());
     }
 
     public void testGetActivityThemes5() throws Exception {
@@ -145,11 +147,11 @@ public class ManifestInfoTest extends AdtProjectTest {
         assertEquals("NoBackground", ResourceHelper.styleToTheme(info.getDefaultTheme(null,
                 NORMAL)));
 
-        Map<String, String> map = info.getActivityThemes();
-        assertEquals(map.toString(), 1, map.size());
-        assertNull(map.get("com.android.unittest.prefs.PrefsActivity"));
+        Map<String, ActivityAttributes> map = info.getActivityAttributesMap();
+        assertEquals(map.toString(), 2, map.size());
+        assertNull(map.get("com.android.unittest.prefs.PrefsActivity").getTheme());
         assertEquals("@android:style/Theme.Dialog",
-                map.get("com.android.unittest.app.IntroActivity"));
+                map.get("com.android.unittest.app.IntroActivity").getTheme());
     }
 
     public void testGetActivityThemes6() throws Exception {
@@ -160,7 +162,7 @@ public class ManifestInfoTest extends AdtProjectTest {
                 "    package='com.android.unittest'>\n" +
                 "    <uses-sdk android:minSdkVersion='3' android:targetSdkVersion='11'/>\n" +
                 "</manifest>\n");
-        Map<String, String> map = info.getActivityThemes();
+        Map<String, ActivityAttributes> map = info.getActivityAttributesMap();
         assertEquals(map.toString(), 0, map.size());
         assertEquals("com.android.unittest", info.getPackage());
         assertEquals("Theme.Holo", ResourceHelper.styleToTheme(info.getDefaultTheme(null,
@@ -182,7 +184,7 @@ public class ManifestInfoTest extends AdtProjectTest {
                 "    </application>\n" +
                 "" +
                 "</manifest>\n");
-        Map<String, String> map = info.getActivityThemes();
+        Map<String, ActivityAttributes> map = info.getActivityAttributesMap();
         assertEquals(map.toString(), 0, map.size());
         assertEquals("com.android.unittest", info.getPackage());
 
@@ -199,7 +201,7 @@ public class ManifestInfoTest extends AdtProjectTest {
                 "    </application>\n" +
                 "" +
                 "</manifest>\n");
-        Map<String, String> map = info.getActivityThemes();
+        Map<String, ActivityAttributes> map = info.getActivityAttributesMap();
         assertEquals(map.toString(), 0, map.size());
         assertEquals("com.android.unittest", info.getPackage());
 
@@ -409,6 +411,7 @@ public class ManifestInfoTest extends AdtProjectTest {
         }
 
         @Override
+        @NonNull
         public List<String> getBootClasspath() {
             return new ArrayList<String>();
         }