1 files changed, 14 insertions, 7 deletions
diff --git a/tests/src/com/android/dialer/database/SmartDialPrefixTest.java b/tests/src/com/android/dialer/database/SmartDialPrefixTest.java
index 23bda7cb2..9cb842e56 100644
--- a/tests/src/com/android/dialer/database/SmartDialPrefixTest.java
+++ b/tests/src/com/android/dialer/database/SmartDialPrefixTest.java
@@ -21,6 +21,8 @@ import android.database.sqlite.SQLiteDatabase;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.test.suitebuilder.annotation.Suppress;
 import android.test.AndroidTestCase;
+import android.text.TextUtils;
+import android.util.Log;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.Data;
@@ -31,16 +33,13 @@ import com.android.dialer.dialpad.SmartDialNameMatcher;
 import com.android.dialer.dialpad.SmartDialPrefix;
 
 import java.lang.Exception;
-import java.lang.FindBugsSuppressWarnings;
 import java.lang.Override;
 import java.lang.String;
 import java.util.ArrayList;
 
-import junit.framework.TestCase;
-
 /**
  * To run this test, use the command:
- * adb shell am instrument -w -e class com.android.dialer.dialpad.SmartDialPrefixTest /
+ * adb shell am instrument -w -e class com.android.dialer.database.SmartDialPrefixTest /
  * com.android.dialer.tests/android.test.InstrumentationTestRunner
  */
 @SmallTest
@@ -80,6 +79,7 @@ public class SmartDialPrefixTest extends AndroidTestCase {
         assertTrue(SmartDialPrefix.isCountryNanp("vi"));
     }
 
+    @Override
     protected void setUp() {
         mTestHelper = DialerDatabaseHelper.getNewInstanceForTest(getContext());
     }
@@ -136,8 +136,8 @@ public class SmartDialPrefixTest extends AndroidTestCase {
 
     private ContactNumber constructNewContactWithDummyIds(MatrixCursor contactCursor,
             MatrixCursor nameCursor, String number, int id, String displayName) {
-        return constructNewContact(contactCursor, nameCursor, id, number, 0, "", displayName, 0, 0,
-                0, 0, 0, 0, 0);
+        return constructNewContact(contactCursor, nameCursor, id, number, id, String.valueOf(id),
+                displayName, 0, 0, 0, 0, 0, 0, 0);
     }
 
     private ContactNumber constructNewContact(MatrixCursor contactCursor, MatrixCursor nameCursor,
@@ -147,6 +147,12 @@ public class SmartDialPrefixTest extends AndroidTestCase {
         assertNotNull(contactCursor);
         assertNotNull(nameCursor);
 
+        if (TextUtils.isEmpty(number)) {
+            // Add a dummy number, otherwise DialerDatabaseHelper simply ignores the entire
+            // row if the number is empty
+            number = "0";
+        }
+
         contactCursor.addRow(new Object[]{id, "", "", number, contactId, lookupKey, displayName,
                 photoId, lastTimeUsed, timesUsed, starred, isSuperPrimary, inVisibleGroup,
                 isPrimary});
@@ -294,7 +300,8 @@ public class SmartDialPrefixTest extends AndroidTestCase {
         // 6543 doesn't match
         assertFalse(getLooseMatchesFromDb("6543").contains(martinjuniorharry));
 
-        assertEquals(7, mTestHelper.countPrefixTableRows(db));
+        // 7 actual rows, + 1 for the dummy number we added
+        assertEquals(8, mTestHelper.countPrefixTableRows(db));
     }
 
     public void testPutForInitialMatchesForLongTokenNames() {