From 3e372995d2ed8b112e026565dd1df3a95b8fdc23 Mon Sep 17 00:00:00 2001
From: Stefan Bohn <stefan@bohni.net>
Date: Sat, 16 Jan 2021 10:39:02 +0100
Subject: [PATCH] Fix reversed order of verify parameters

For consistency the parameters of the method
MockedStatic.verify(VerificationMode, Verification)
have been swapped to
MockedStatic.verify(Verification, VerificationMode)
as this order is already used in
Mockito.verify(T, VerificationMode)

Fixes: #2173
---
 src/main/java/org/mockito/MockedStatic.java              | 9 ++++++++-
 src/main/java/org/mockito/internal/MockedStaticImpl.java | 5 +++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/mockito/MockedStatic.java b/src/main/java/org/mockito/MockedStatic.java
index ac291ba33c..b1089cdbf0 100644
--- a/src/main/java/org/mockito/MockedStatic.java
+++ b/src/main/java/org/mockito/MockedStatic.java
@@ -35,14 +35,21 @@ public interface MockedStatic<T> extends ScopedMock {
      * See {@link Mockito#verify(Object)}.
      */
     default void verify(Verification verification) {
-        verify(times(1), verification);
+        verify(verification, times(1));
     }
 
     /**
      * See {@link Mockito#verify(Object, VerificationMode)}.
+     *
+     * @deprecated Please use {@link MockedStatic#verify(Verification, VerificationMode) instead
      */
     void verify(VerificationMode mode, Verification verification);
 
+    /**
+     * See {@link Mockito#verify(Object, VerificationMode)}.
+     */
+    void verify(Verification verification, VerificationMode mode);
+
     /**
      * See {@link Mockito#reset(Object[])}.
      */
diff --git a/src/main/java/org/mockito/internal/MockedStaticImpl.java b/src/main/java/org/mockito/internal/MockedStaticImpl.java
index 7c3af584eb..0c9456e030 100644
--- a/src/main/java/org/mockito/internal/MockedStaticImpl.java
+++ b/src/main/java/org/mockito/internal/MockedStaticImpl.java
@@ -61,6 +61,11 @@ public <S> OngoingStubbing<S> when(Verification verification) {
 
     @Override
     public void verify(VerificationMode mode, Verification verification) {
+        verify(verification, mode);
+    }
+
+    @Override
+    public void verify(Verification verification, VerificationMode mode) {
         assertNotClosed();
 
         MockingDetails mockingDetails = Mockito.mockingDetails(control.getType());