From d71afa85cb21bcfa379249990ba0d430bbba9545 Mon Sep 17 00:00:00 2001 From: Paul Soulos Date: Mon, 30 Jun 2014 13:41:12 -0400 Subject: Adds back commented out test in Dialer Change-Id: I032ca1c60cc7c5dbf9a6a832434fef5174ce90e8 --- .../dialer/interactions/PhoneNumberInteractionTest.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/tests/src/com/android/dialer/interactions/PhoneNumberInteractionTest.java b/tests/src/com/android/dialer/interactions/PhoneNumberInteractionTest.java index 9217e8509..8d4b01f67 100644 --- a/tests/src/com/android/dialer/interactions/PhoneNumberInteractionTest.java +++ b/tests/src/com/android/dialer/interactions/PhoneNumberInteractionTest.java @@ -42,12 +42,8 @@ import java.util.List; /** * Tests for {@link com.android.contacts.common.interactions.PhoneNumberInteraction}. * - * Running all tests: - * - * runtest contacts - * or * adb shell am instrument \ - * -w com.android.contacts.tests/android.test.InstrumentationTestRunner + * -w com.android.dialer.tests/android.test.InstrumentationTestRunner */ @SmallTest public class PhoneNumberInteractionTest extends InstrumentationTestCase { @@ -146,25 +142,25 @@ public class PhoneNumberInteractionTest extends InstrumentationTestCase { assertEquals("sms:456", intent.getDataString()); } - /*public void testShouldCollapseWith() { + public void testShouldCollapseWith() { PhoneNumberInteraction.PhoneItem phoneItem1 = new PhoneNumberInteraction.PhoneItem(); PhoneNumberInteraction.PhoneItem phoneItem2 = new PhoneNumberInteraction.PhoneItem(); phoneItem1.phoneNumber = "123"; phoneItem2.phoneNumber = "123"; - assertTrue(phoneItem1.shouldCollapseWith(phoneItem2, this.)); + assertTrue(phoneItem1.shouldCollapseWith(phoneItem2, mContext)); phoneItem1.phoneNumber = "123"; phoneItem2.phoneNumber = "456"; - assertFalse(phoneItem1.shouldCollapseWith(phoneItem2)); + assertFalse(phoneItem1.shouldCollapseWith(phoneItem2, mContext)); phoneItem1.phoneNumber = "123#,123"; phoneItem2.phoneNumber = "123#,456"; - assertFalse(phoneItem1.shouldCollapseWith(phoneItem2)); - }*/ + assertFalse(phoneItem1.shouldCollapseWith(phoneItem2, mContext)); + } public void testCallNumberWhenThereAreDuplicates() { Uri contactUri = ContentUris.withAppendedId(Contacts.CONTENT_URI, 13); -- cgit v1.2.3