filab/message_q
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

packages/apps/Messaging: remove deprecated Mockito usages

Browse Source 
Test: m checkbuild
Flag: TEST_ONLY
Change-Id: I9e62dd82bfbf00b13dce8210574bf146eea191f0
This commit is contained in:
Adrian Roos
2025-02-25 16:51:18 +01:00
parent b0f8c82e37
commit 29980d714f
10 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/src/com/android/messaging/ui/attachmentchooser/AttachmentChooserFragmentTest.java
+7 -7
View File
@@ -34,7 +34,7 @@ import com.android.messaging.ui.attachmentchooser.AttachmentChooserFragment.Atta
import com.android.messaging.ui.conversationlist.ConversationListFragment;
import org.mockito.ArgumentMatcher;
import org.mockito.Matchers;
import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -85,7 +85,7 @@ public class AttachmentChooserFragmentTest extends FragmentTestCase<AttachmentCh
}
private void loadWith(final List<MessagePartData> attachments) {
Mockito.when(mockDraftMessageData.isBound(Matchers.anyString()))
Mockito.when(mockDraftMessageData.isBound(ArgumentMatchers.anyString()))
.thenReturn(true);
Mockito.doReturn(mockDraftMessageData)
.when(mockDataModel)
@@ -94,7 +94,7 @@ public class AttachmentChooserFragmentTest extends FragmentTestCase<AttachmentCh
.when(mockDraftMessageData)
.getReadOnlyAttachments();
Mockito.when(mockDataModel.createDraftMessageData(
Matchers.anyString()))
ArgumentMatchers.anyString()))
.thenReturn(mockDraftMessageData);
// Create fragment synchronously to avoid need for volatile, synchronization etc.
@@ -118,8 +118,8 @@ public class AttachmentChooserFragmentTest extends FragmentTestCase<AttachmentCh
Mockito.verify(mockDataModel).createDraftMessageData(
Mockito.matches(CONVERSATION_ID));
Mockito.verify(mockDraftMessageData).loadFromStorage(
Matchers.eq(fragment.mBinding), Matchers.eq((MessageData) null),
Matchers.eq(false));
ArgumentMatchers.eq(fragment.mBinding), ArgumentMatchers.eq((MessageData) null),
ArgumentMatchers.eq(false));
}
});
// Now load the cursor
@@ -158,9 +158,9 @@ public class AttachmentChooserFragmentTest extends FragmentTestCase<AttachmentCh
getFragment().confirmSelection();
final MessagePartData[] attachmentsToRemove = new MessagePartData[] {
itemView.mAttachmentData, itemView2.mAttachmentData };
Mockito.verify(mockDraftMessageData).removeExistingAttachments(Matchers.argThat(
Mockito.verify(mockDraftMessageData).removeExistingAttachments(ArgumentMatchers.argThat(
new IsSetOfGivenAttachments(new HashSet<>(Arrays.asList(attachmentsToRemove)))));
Mockito.verify(mockDraftMessageData).saveToStorage(Matchers.eq(getFragment().mBinding));
Mockito.verify(mockDraftMessageData).saveToStorage(ArgumentMatchers.eq(getFragment().mBinding));
Mockito.verify(mockHost).onConfirmSelection();
}
}