am f0737030: Fix Android Manifest parser.

Merge commit 'f0737030570be15c1789d00db3593eb78cee9fbc' into eclair-plus-aosp

* commit 'f0737030570be15c1789d00db3593eb78cee9fbc':
  Fix Android Manifest parser.
This commit is contained in:
Xavier Ducrohet
2009-10-07 11:34:21 -07:00
committed by Android Git Automerger

View File

@@ -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 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_NAME = "android.test.InstrumentationTestRunner"; //$NON-NLS-1$
private static final String INSTRUMENTATION_TARGET = "com.android.AndroidProject"; //$NON-NLS-1$ private static final String INSTRUMENTATION_TARGET = "com.android.AndroidProject"; //$NON-NLS-1$
@Override @Override
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp(); super.setUp();
@@ -65,19 +66,19 @@ public class AndroidManifestParserTest extends TestCase {
public void testGetActivities() { public void testGetActivities() {
assertEquals(1, mManifestTestApp.getActivities().length); assertEquals(1, mManifestTestApp.getActivities().length);
Activity activity = new AndroidManifestParser.Activity(ACTIVITY_NAME, true); AndroidManifestParser.Activity activity = mManifestTestApp.getActivities()[0];
activity.setHasAction(true); assertEquals(ACTIVITY_NAME, activity.getName());
activity.setHasLauncherCategory(true); assertTrue(activity.hasAction());
activity.setHasMainAction(true); assertTrue(activity.isHomeActivity());
assertTrue(activity.hasAction());
assertEquals(activity, mManifestTestApp.getActivities()[0]); assertEquals(activity, mManifestTestApp.getActivities()[0]);
} }
public void testGetLauncherActivity() { public void testGetLauncherActivity() {
Activity activity = new AndroidManifestParser.Activity(ACTIVITY_NAME, true); Activity activity = mManifestTestApp.getLauncherActivity();
activity.setHasAction(true); assertEquals(ACTIVITY_NAME, activity.getName());
activity.setHasLauncherCategory(true); assertTrue(activity.hasAction());
activity.setHasMainAction(true); assertTrue(activity.isHomeActivity());
assertEquals(activity, mManifestTestApp.getLauncherActivity());
} }
private void assertEquals(Activity lhs, Activity rhs) { private void assertEquals(Activity lhs, Activity rhs) {