From 5e1d63696ffdbba53631805f65e130217609d06c Mon Sep 17 00:00:00 2001 From: Mateo Hernandez Date: Thu, 29 Jun 2017 23:21:09 -0500 Subject: [PATCH] Fix ConversationAdapterTest#testGetItemIdEquals() Regression introduced at cb670d67 Fixes #6652 Closes #6779 // FREEBIE --- .../org/thoughtcrime/securesms/ConversationAdapterTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/unitTest/java/org/thoughtcrime/securesms/ConversationAdapterTest.java b/test/unitTest/java/org/thoughtcrime/securesms/ConversationAdapterTest.java index 7bfe595443..62ad3497a5 100644 --- a/test/unitTest/java/org/thoughtcrime/securesms/ConversationAdapterTest.java +++ b/test/unitTest/java/org/thoughtcrime/securesms/ConversationAdapterTest.java @@ -25,12 +25,12 @@ public class ConversationAdapterTest extends BaseUnitTest { @Test public void testGetItemIdEquals() throws Exception { - when(cursor.getString(anyInt())).thenReturn("SMS::1::1"); + when(cursor.getString(anyInt())).thenReturn(null).thenReturn("SMS::1::1"); long firstId = adapter.getItemId(cursor); - when(cursor.getString(anyInt())).thenReturn("MMS::1::1"); + when(cursor.getString(anyInt())).thenReturn(null).thenReturn("MMS::1::1"); long secondId = adapter.getItemId(cursor); assertNotEquals(firstId, secondId); - when(cursor.getString(anyInt())).thenReturn("MMS::2::1"); + when(cursor.getString(anyInt())).thenReturn(null).thenReturn("MMS::2::1"); long thirdId = adapter.getItemId(cursor); assertNotEquals(secondId, thirdId); }