commit 6c692308361058bed4a49823efad201892d7e258
author Marcus Hagerott <mhagerott@google.com> Tue Dec 13 23:21:00 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 13 23:21:00 2016 +0000
tree f679e051681dd3da2e368f953f11ff28f631616f
parent c281ad0188b653544dbaae07becb663671d64786
parent f0d26c5ffe04f7114cce73a7ffff2ee7b92eb15a

Merge "Fix DynamicShortcutsTests" into ub-contactsdialer-h-dev

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

diff --git a/tests/src/com/android/contacts/DynamicShortcutsTests.java b/tests/src/com/android/contacts/DynamicShortcutsTests.java
index 34cd8c4..2945663 100644
--- a/tests/src/com/android/contacts/DynamicShortcutsTests.java
+++ b/tests/src/com/android/contacts/DynamicShortcutsTests.java
@@ -32,7 +32,6 @@
 import android.test.AndroidTestCase;
 import android.test.mock.MockContentResolver;
 import android.test.suitebuilder.annotation.SmallTest;
-import android.test.suitebuilder.annotation.Suppress;
 
 import com.android.contacts.common.test.mocks.MockContentProvider;
 
@@ -42,6 +41,7 @@
 import org.hamcrest.Matchers;
 import org.mockito.ArgumentCaptor;
 
+import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -52,7 +52,6 @@
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
 @TargetApi(Build.VERSION_CODES.N_MR1)
@@ -120,10 +119,10 @@
         assertEquals("123456789…", shortcut.getLongLabel());
     }
 
-    public void test_updatePinned_disablesShortcutsForRemovedContacts() {
+    public void test_updatePinned_disablesShortcutsForRemovedContacts() throws Exception {
         final ShortcutManager mockShortcutManager = mock(ShortcutManager.class);
         when(mockShortcutManager.getPinnedShortcuts()).thenReturn(
-                Collections.singletonList(shortcutFor(1l, "key1", "name1")));
+                Collections.singletonList(makeDynamic(shortcutFor(1l, "key1", "name1"))));
 
         final DynamicShortcuts sut = createDynamicShortcuts(emptyResolver(), mockShortcutManager);
 
@@ -133,13 +132,13 @@
                 eq(Collections.singletonList("key1")), anyString());
     }
 
-    public void test_updatePinned_updatesExistingShortcutsWithMatchingKeys() {
+    public void test_updatePinned_updatesExistingShortcutsWithMatchingKeys() throws Exception {
         final ShortcutManager mockShortcutManager = mock(ShortcutManager.class);
         when(mockShortcutManager.getPinnedShortcuts()).thenReturn(
                 Arrays.asList(
-                        shortcutFor(1l, "key1", "name1"),
-                        shortcutFor(2l, "key2", "name2"),
-                        shortcutFor(3l, "key3", "name3")
+                        makeDynamic(shortcutFor(1l, "key1", "name1")),
+                        makeDynamic(shortcutFor(2l, "key2", "name2")),
+                        makeDynamic(shortcutFor(3l, "key3", "name3"))
                 ));
 
         final DynamicShortcuts sut = createDynamicShortcuts(resolverWithExpectedQueries(
@@ -350,6 +349,15 @@
         return queryResult(DynamicShortcuts.PROJECTION, values);
     }
 
+    // Ugly hack because the API is hidden. Alternative is to actually set the shortcut on the real
+    // ShortcutManager but this seems simpler for now.
+    private ShortcutInfo makeDynamic(ShortcutInfo shortcutInfo) throws Exception {
+        final Method addFlagsMethod = ShortcutInfo.class.getMethod("addFlags", int.class);
+        // 1 = FLAG_DYNAMIC
+        addFlagsMethod.invoke(shortcutInfo, 1);
+        return shortcutInfo;
+    }
+
     private Cursor queryResult(String[] columns, Object... values) {
         MatrixCursor result = new MatrixCursor(new String[] {
                 Contacts._ID, Contacts.LOOKUP_KEY,