aboutsummaryrefslogtreecommitdiffstats
path: root/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/manifest/ManifestInfoTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/manifest/ManifestInfoTest.java')
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/manifest/ManifestInfoTest.java45
1 files changed, 28 insertions, 17 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 e9010c4..43f9d68 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,17 +19,21 @@ 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;
import com.android.sdklib.IAndroidTarget;
import com.android.sdklib.ISystemImage;
+import com.android.sdklib.repository.descriptors.IdDisplay;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.NullProgressMonitor;
import java.io.ByteArrayInputStream;
+import java.io.File;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
@@ -48,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)));
@@ -62,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,
@@ -76,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,
@@ -108,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 {
@@ -143,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 {
@@ -158,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,
@@ -180,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());
@@ -197,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());
@@ -271,7 +275,7 @@ public class ManifestInfoTest extends AdtProjectTest {
}
@Override
- public String getDefaultSkin() {
+ public File getDefaultSkin() {
return null;
}
@@ -286,7 +290,7 @@ public class ManifestInfoTest extends AdtProjectTest {
}
@Override
- public ISystemImage getSystemImage(String abiType) {
+ public ISystemImage getSystemImage(IdDisplay tag, String abiType) {
return null;
}
@@ -321,6 +325,12 @@ public class ManifestInfoTest extends AdtProjectTest {
}
@Override
+ public File getFile(int pathId) {
+ return null;
+ }
+
+
+ @Override
public String[] getPlatformLibraries() {
return null;
}
@@ -351,7 +361,7 @@ public class ManifestInfoTest extends AdtProjectTest {
}
@Override
- public String[] getSkins() {
+ public File[] getSkins() {
return null;
}
@@ -401,6 +411,7 @@ public class ManifestInfoTest extends AdtProjectTest {
}
@Override
+ @NonNull
public List<String> getBootClasspath() {
return new ArrayList<String>();
}
generated by cgit v1.1 at 2024-06-01 16:00:20 +0000