Fix Bug #216 (#218)

Author: ultrasecreth

common/src/main/scala/org/mockito/MockitoAPI.scala

@@ -595,8 +595,10 @@ private[mockito] trait MockitoEnhancer extends MockCreator {
       case m: AnyRef if MockUtil.isMock(m) =>
         ignoreDefaultArguments(m)
         Mockito.verifyNoMoreInteractions(m)
-      case t: Iterable[_] => verifyNoMoreInteractions(t)
-      case _              => notAMockPassedToVerifyNoMoreInteractions
+      case t: Array[AnyRef] =>
+        verifyNoMoreInteractions(t: _*)
+      case _ =>
+        throw notAMockPassedToVerifyNoMoreInteractions
     }
   }
 

macro/src/main/scala/org/mockito/VerifyMacro.scala

@@ -90,34 +90,38 @@ private[mockito] trait VerificationMacroTransformer {
     } else throw new Exception(s"Couldn't recognize invocation ${show(invocation)}")
   }
 
-  protected def transformMockWasNeverCalled[T: c.WeakTypeTag, R](c: blackbox.Context)(obj: c.Tree, called: c.Tree): c.Tree = {
-    import c.universe._
-    called match {
-      case q"$_.called"      => q"verification(_root_.org.mockito.MockitoSugar.verifyZeroInteractions($obj))"
-      case q"$_.calledAgain" => q"verification(_root_.org.mockito.MockitoSugar.verifyNoMoreInteractions($obj))"
-      case q"$_.calledAgain.apply($_.ignoringStubs)" =>
-        q"verification(_root_.org.mockito.MockitoSugar.verifyNoMoreInteractions(_root_.org.mockito.MockitoSugar.ignoreStubs($obj): _*))"
-    }
-  }
-
   protected def transformVerification[T: c.WeakTypeTag, R](c: blackbox.Context)(called: c.Tree): c.Tree = {
     import c.universe._
 
+    def transformMockWasNeverCalled(obj: c.Tree, called: c.Tree): c.Tree =
+      called match {
+        case q"$_.called"      => q"verification(_root_.org.mockito.MockitoSugar.verifyZeroInteractions($obj))"
+        case q"$_.calledAgain" => q"verification(_root_.org.mockito.MockitoSugar.verifyNoMoreInteractions($obj))"
+        case q"$_.calledAgain.apply($_.ignoringStubs)" =>
+          q"verification(_root_.org.mockito.MockitoSugar.verifyNoMoreInteractions(_root_.org.mockito.MockitoSugar.ignoreStubs($obj): _*))"
+      }
+
     called match {
       case q"$_.VerifyingOps[$_]($invocation).was($_.called)($order)" =>
         transformInvocation(c)(invocation, order, q"_root_.org.mockito.VerifyMacro.Once")
 
       case q"$_.VerifyingOps[$_]($a.$b).wasNever($called)($order)" =>
         q"""
-           if (_root_.org.mockito.MockitoSugar.mockingDetails($a).isMock) ${transformInvocation(c)(q"$a.$b", order, q"_root_.org.mockito.VerifyMacro.Never")}
-           else ${transformMockWasNeverCalled(c)(q"$a.$b", called)}
+           if (_root_.org.mockito.MockitoSugar.mockingDetails($a).isMock) {
+            ${called match {
+          case q"$_.calledAgain" => q"throw _root_.org.mockito.internal.exceptions.Reporter.notAMockPassedToVerifyNoMoreInteractions"
+          case _                 => transformInvocation(c)(q"$a.$b", order, q"_root_.org.mockito.VerifyMacro.Never")
+        }}
+          } else { 
+            ${transformMockWasNeverCalled(q"$a.$b", called)}
+          }
          """
 
       case q"$_.VerifyingOps[$_]($obj.$method[..$targs](...$args)).wasNever($_.called)($order)" =>
         transformInvocation(c)(q"$obj.$method[..$targs](...$args)", order, q"_root_.org.mockito.VerifyMacro.Never")
 
       case q"$_.VerifyingOps[$_]($obj).wasNever($called)($_)" =>
-        transformMockWasNeverCalled(c)(obj, called)
+        transformMockWasNeverCalled(obj, called)
 
       case q"$_.VerifyingOps[$_]($invocation).wasCalled($times)($order)" =>
         transformInvocation(c)(invocation, order, times)

scalatest/src/test/scala/user/org/mockito/PostfixVerificationsTest.scala

@@ -5,6 +5,7 @@ import java.io.{ File, FileOutputStream, ObjectOutputStream }
 import org.mockito.IdiomaticMockito
 import org.mockito.IdiomaticStubbing
 import org.mockito.captor.ArgCaptor
+import org.mockito.exceptions.misusing.NotAMockException
 import org.mockito.exceptions.verification._
 import org.mockito.{ ArgumentMatchersSugar, MockitoSugar }
 import org.scalactic.Prettifier
@@ -784,4 +785,20 @@ class PostfixVerificationsTest extends AnyWordSpec with IdiomaticMockitoTestSetu
     }
   }
 
+  val foo: Foo = mock[Foo]
+
+  "mock" should {
+    "verify number of interactions with shared mocks appropriately" in {
+      foo wasNever called
+      foo wasNever calledAgain
+    }
+
+    "prevent users using 'calledAgain' on methods" in {
+      foo.bar wasNever called
+      a[NotAMockException] should be thrownBy {
+        foo.bar wasNever calledAgain
+      }
+    }
+  }
+
 }