From d7ca03e23948c3b2d5f97ec5598d8b50e3fc0b25 Mon Sep 17 00:00:00 2001 From: Chiao Cheng Date: Wed, 24 Oct 2012 15:14:08 -0700 Subject: Move dependencies in prep for PhoneNumberInteraction move. Committing this change first which is a pre-factor to moving PhoneNumberInteraction into Dialer completely. Bug: 6993891 Change-Id: I8a8f2d2d54b1aa8268e8ac9bd7d97d165a3e55c2 --- tests/src/com/android/contacts/ContactsUtilsTests.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/src/com/android/contacts/ContactsUtilsTests.java b/tests/src/com/android/contacts/ContactsUtilsTests.java index d2d5bbb73..49e9ddd45 100644 --- a/tests/src/com/android/contacts/ContactsUtilsTests.java +++ b/tests/src/com/android/contacts/ContactsUtilsTests.java @@ -21,6 +21,8 @@ import android.provider.ContactsContract.CommonDataKinds.Phone; import android.test.AndroidTestCase; import android.test.suitebuilder.annotation.SmallTest; +import com.android.contacts.common.MoreContactUtils; + /** * Tests for {@link ContactsUtils}. */ @@ -183,9 +185,9 @@ public class ContactsUtilsTests extends AndroidTestCase { private void assertCollapses(String message, boolean expected, CharSequence mimetype1, CharSequence data1, CharSequence mimetype2, CharSequence data2) { assertEquals(message, expected, - ContactsUtils.shouldCollapse(mimetype1, data1, mimetype2, data2)); + MoreContactUtils.shouldCollapse(mimetype1, data1, mimetype2, data2)); assertEquals(message, expected, - ContactsUtils.shouldCollapse(mimetype2, data2, mimetype1, data1)); + MoreContactUtils.shouldCollapse(mimetype2, data2, mimetype1, data1)); // If data1 and data2 are the same instance, make sure the same test passes with different // instances. @@ -201,11 +203,11 @@ public class ContactsUtilsTests extends AndroidTestCase { // we have two different instances, now make sure we get the same result as before assertEquals(message, expected, - ContactsUtils.shouldCollapse(mimetype1, data1, mimetype2, - data2_newref)); + MoreContactUtils.shouldCollapse(mimetype1, data1, mimetype2, + data2_newref)); assertEquals(message, expected, - ContactsUtils.shouldCollapse(mimetype2, data2_newref, mimetype1, - data1)); + MoreContactUtils.shouldCollapse(mimetype2, data2_newref, mimetype1, + data1)); } } -- cgit v1.2.3