commit f1acd26614a883d045775d3c68e4ffdeaeb3685f
author Debashish Chatterjee <debashishc@google.com> Mon Aug 08 02:16:54 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 08 02:16:54 2011 -0700
tree c8e06c6982be4878d69e4dfc8e18741ce46354ff
parent a657d075e970f7b1227cf42c04a85470b718c237
parent c8c551e0b9ba873ab65f3e214ab73706ade09ad0

Merge "Fix suppressed CallDetailsActivityTest tests."

tests/src/com/android/contacts/CallDetailActivityTest.java

diff --git a/tests/src/com/android/contacts/CallDetailActivityTest.java b/tests/src/com/android/contacts/CallDetailActivityTest.java
index 7e225c4..6848429 100644
--- a/tests/src/com/android/contacts/CallDetailActivityTest.java
+++ b/tests/src/com/android/contacts/CallDetailActivityTest.java
@@ -28,6 +28,7 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.provider.CallLog;
+import android.provider.VoicemailContract.Voicemails;
 import android.test.ActivityInstrumentationTestCase2;
 import android.test.suitebuilder.annotation.LargeTest;
 import android.test.suitebuilder.annotation.Suppress;
@@ -42,7 +43,8 @@
  */
 @LargeTest
 public class CallDetailActivityTest extends ActivityInstrumentationTestCase2<CallDetailActivity> {
-    private static final String FAKE_VOICEMAIL_URI_STRING = "content://fake_uri";
+    private static final String FAKE_VOICEMAIL_URI_STRING = ContentUris.withAppendedId(
+            Voicemails.CONTENT_URI, Integer.MAX_VALUE).toString();
     private Uri mUri;
     private IntegrationTestUtils mTestUtils;
     private LocaleTestUtils mLocaleTestUtils;
@@ -80,7 +82,6 @@
      * then click the play button (which just reported an error), then after that try to adjust the
      * rate.  See http://b/5047879.
      */
-    @Suppress
     public void testClickIncreaseRateButtonWithInvalidVoicemailDoesNotCrash() throws Throwable {
         setActivityIntentForTestVoicemailEntry();
         Activity activity = getActivity();
@@ -89,7 +90,6 @@
     }
 
     /** Test for bug where missing Extras on intent used to start Activity causes NPE. */
-    @Suppress
     public void testCallLogUriWithMissingExtrasShouldNotCauseNPE() throws Exception {
         setActivityIntentForTestCallEntry();
         getActivity();
@@ -100,7 +100,6 @@
      * <p>
      * See http://b/5054103.
      */
-    @Suppress
     public void testVoicemailDoesNotHaveRemoveFromCallLog() throws Throwable {
         setActivityIntentForTestVoicemailEntry();
         CallDetailActivity activity = getActivity();