commit 9ad2ed9773c9a1855c664f072b3306e3eae7df5d
author Raphael <raphael@google.com> Tue May 05 13:59:21 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Tue May 05 13:59:21 2009 -0700
tree d5d014e2af2d92e9e231f3ba279af6c1bfc4231b
parent 955d82083fab1bfc4453de4cd5603d8219fccee3
parent 1bb52f25870a0f183b9c5a24362c2468fb316435

am 1bb52f2: Fix ADT junit test for AndroidManifestParser following API c

Merge commit '1bb52f25870a0f183b9c5a24362c2468fb316435'

* commit '1bb52f25870a0f183b9c5a24362c2468fb316435':
  Fix ADT junit test for AndroidManifestParser following API change.

tools/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/common/project/AndroidManifestParserTest.java

diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/common/project/AndroidManifestParserTest.java b/tools/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/common/project/AndroidManifestParserTest.java
index 2f93e51..884efe8 100644
--- a/tools/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/common/project/AndroidManifestParserTest.java
+++ b/tools/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/common/project/AndroidManifestParserTest.java
@@ -16,6 +16,7 @@
 
 package com.android.ide.eclipse.common.project;
 
+import com.android.ide.eclipse.common.project.AndroidManifestParser.Activity;
 import com.android.ide.eclipse.tests.AdtTestData;
 
 import junit.framework.TestCase;
@@ -63,11 +64,29 @@
 
     public void testGetActivities() {
         assertEquals(1, mManifestTestApp.getActivities().length);
-        assertEquals(ACTIVITY_NAME, mManifestTestApp.getActivities()[0]); 
+        Activity activity = new AndroidManifestParser.Activity(ACTIVITY_NAME, true);
+        activity.setHasAction(true);
+        activity.setHasLauncherCategory(true);
+        activity.setHasMainAction(true);
+        assertEquals(activity, mManifestTestApp.getActivities()[0]);
     }
 
     public void testGetLauncherActivity() {
-        assertEquals(ACTIVITY_NAME, mManifestTestApp.getLauncherActivity()); 
+        Activity activity = new AndroidManifestParser.Activity(ACTIVITY_NAME, true);
+        activity.setHasAction(true);
+        activity.setHasLauncherCategory(true);
+        activity.setHasMainAction(true);
+        assertEquals(activity, mManifestTestApp.getLauncherActivity()); 
+    }
+    
+    private void assertEquals(Activity lhs, Activity rhs) {
+        assertTrue(lhs == rhs || (lhs != null && rhs != null));
+        if (lhs != null && rhs != null) {
+            assertEquals(lhs.getName(),        rhs.getName());
+            assertEquals(lhs.isExported(),     rhs.isExported());
+            assertEquals(lhs.hasAction(),      rhs.hasAction());
+            assertEquals(lhs.isHomeActivity(), rhs.isHomeActivity());
+        }
     }
 
     public void testGetUsesLibraries() {