summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2009-10-01 17:06:58 -0700
committerXavier Ducrohet <xav@android.com>2009-10-01 17:23:25 -0700
commitf0737030570be15c1789d00db3593eb78cee9fbc (patch)
treea21e4d8bfb1191adf855c95e616ed42af8b262bd /tools
parent2ace885b2945aba76266bc54ad9fa59fb4e05187 (diff)
downloadandroid_development-f0737030570be15c1789d00db3593eb78cee9fbc.tar.gz
android_development-f0737030570be15c1789d00db3593eb78cee9fbc.tar.bz2
android_development-f0737030570be15c1789d00db3593eb78cee9fbc.zip
Fix Android Manifest parser.
While the test is in the java package as the parser, it's in a different plug-in and this prevents accessing package-protected methods. Change-Id: Ib17765095e4da518d62ee65cb9e1987d0e22be6e
Diffstat (limited to 'tools')
-rw-r--r--tools/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/project/AndroidManifestParserTest.java19
1 files changed, 10 insertions, 9 deletions
diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/project/AndroidManifestParserTest.java b/tools/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/project/AndroidManifestParserTest.java
index a28aacc1d..b76e802d0 100644
--- a/tools/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/project/AndroidManifestParserTest.java
+++ b/tools/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/project/AndroidManifestParserTest.java
@@ -36,6 +36,7 @@ public class AndroidManifestParserTest extends TestCase {
private static final String LIBRARY_NAME = "android.test.runner"; //$NON-NLS-1$
private static final String INSTRUMENTATION_NAME = "android.test.InstrumentationTestRunner"; //$NON-NLS-1$
private static final String INSTRUMENTATION_TARGET = "com.android.AndroidProject"; //$NON-NLS-1$
+
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -65,19 +66,19 @@ public class AndroidManifestParserTest extends TestCase {
public void testGetActivities() {
assertEquals(1, mManifestTestApp.getActivities().length);
- Activity activity = new AndroidManifestParser.Activity(ACTIVITY_NAME, true);
- activity.setHasAction(true);
- activity.setHasLauncherCategory(true);
- activity.setHasMainAction(true);
+ AndroidManifestParser.Activity activity = mManifestTestApp.getActivities()[0];
+ assertEquals(ACTIVITY_NAME, activity.getName());
+ assertTrue(activity.hasAction());
+ assertTrue(activity.isHomeActivity());
+ assertTrue(activity.hasAction());
assertEquals(activity, mManifestTestApp.getActivities()[0]);
}
public void testGetLauncherActivity() {
- Activity activity = new AndroidManifestParser.Activity(ACTIVITY_NAME, true);
- activity.setHasAction(true);
- activity.setHasLauncherCategory(true);
- activity.setHasMainAction(true);
- assertEquals(activity, mManifestTestApp.getLauncherActivity());
+ Activity activity = mManifestTestApp.getLauncherActivity();
+ assertEquals(ACTIVITY_NAME, activity.getName());
+ assertTrue(activity.hasAction());
+ assertTrue(activity.isHomeActivity());
}
private void assertEquals(Activity lhs, Activity rhs) {