Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61046ef0 authored by cketti's avatar cketti
Browse files

Update Mockito (Kotlin) to version 4.0.0

parent 70a2a3bd

app/core/src/test/java/com/fsck/k9/controller/MessagingControllerTest.java

+3 −3
Original line number Diff line number Diff line
@@ -53,14 +53,14 @@ import org.robolectric.shadows.ShadowLog; 


import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.ArgumentMatchers.nullable;

import static org.mockito.Matchers.eq;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.doThrow;

import static org.mockito.Mockito.inOrder;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verifyZeroInteractions;

import static org.mockito.Mockito.verifyNoMoreInteractions;

import static org.mockito.Mockito.when;
@@ -330,7 +330,7 @@ public class MessagingControllerTest extends K9RobolectricTest { 


        controller.sendPendingMessagesSynchronous(account);



        verifyZeroInteractions(listener);

        verifyNoMoreInteractions(listener);

    }



    @Test

app/core/src/test/java/com/fsck/k9/helper/ReplyToParserTest.java

+2 −2
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ import org.junit.Test; 
import static org.junit.Assert.assertArrayEquals;

import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertTrue;

import static org.mockito.Matchers.any;

import static org.mockito.Matchers.eq;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;

app/core/src/test/java/com/fsck/k9/mailstore/MessageViewInfoExtractorTest.java

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ import static junit.framework.Assert.assertEquals; 
import static junit.framework.Assert.assertNull;

import static junit.framework.Assert.assertSame;

import static junit.framework.Assert.assertTrue;

import static org.mockito.Matchers.anyString;

import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.spy;

app/core/src/test/java/com/fsck/k9/message/MessageBuilderTest.java

+2 −2
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ import org.robolectric.annotation.LooperMode; 


import static org.junit.Assert.assertArrayEquals;

import static org.junit.Assert.assertEquals;

import static org.mockito.Matchers.any;

import static org.mockito.Matchers.eq;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verifyNoMoreInteractions;

app/storage/src/test/java/com/fsck/k9/storage/StoreSchemaDefinitionTest.java

+2 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ import static org.junit.Assert.assertEquals; 
import static org.junit.Assert.assertNotEquals;

import static org.junit.Assert.assertTrue;

import static org.junit.Assert.fail;

import static org.mockito.Matchers.any;

import static org.mockito.Matchers.anyBoolean;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.when;