Mockito cats fixes

cats/src/main/scala/org/mockito/cats/CatsStubbing.scala

@@ -1,7 +1,7 @@
 package org.mockito.cats
 
 import cats.implicits._
-import cats.{Applicative, ApplicativeError}
+import cats.{ Applicative, ApplicativeError }
 import org.mockito.stubbing.OngoingStubbing
 
 case class CatsStubbing[F[_], T](delegate: OngoingStubbing[F[T]]) {

cats/src/main/scala/org/mockito/cats/EqToEquality.scala

@@ -2,11 +2,14 @@ package org.mockito.cats
 
 import cats.Eq
 import cats.implicits._
-import org.mockito._
 import org.scalactic.Equality
 
-import scala.reflect.ClassTag
-
-class EqToEquality[T: ClassTag: Eq] extends Equality[T] {
-  override def areEqual(a: T, b: Any): Boolean = clazz[T].isInstance(b) && a === b.asInstanceOf[T]
+class EqToEquality[T: Eq] extends Equality[T] {
+  override def areEqual(a: T, b: Any): Boolean =
+    (a == null && b == null) || (
+      a != null &&
+      b != null &&
+      b.getClass == a.getClass &&
+      a === b.asInstanceOf[T]
+    )
 }

cats/src/main/scala/org/mockito/cats/IdiomaticMockitoCats.scala

@@ -5,9 +5,7 @@ import org.mockito._
 import org.mockito.cats.IdiomaticMockitoCats.{ ReturnActions, ThrowActions }
 import org.scalactic.Equality
 
-import scala.reflect.ClassTag
-
-trait IdiomaticMockitoCats extends IdiomaticMockito {
+trait IdiomaticMockitoCats extends ScalacticSerialisableHack {
 
   implicit class StubbingOps[F[_], T](stubbing: F[T]) {
 
@@ -20,7 +18,7 @@ trait IdiomaticMockitoCats extends IdiomaticMockito {
     def failsWith: ThrowActions[F, T] = macro WhenMacro.shouldThrow[T]
   }
 
-  implicit def catsEquality[T: ClassTag: Eq]: Equality[T] = new EqToEquality[T]
+  implicit def catsEquality[T: Eq]: Equality[T] = new EqToEquality[T]
 }
 
 object IdiomaticMockitoCats extends IdiomaticMockitoCats {

cats/src/main/scala/org/mockito/cats/MockitoCats.scala

@@ -4,13 +4,11 @@ import cats.Eq
 import org.mockito._
 import org.scalactic.Equality
 
-import scala.reflect.ClassTag
-
-trait MockitoCats extends MockitoSugar {
+trait MockitoCats extends ScalacticSerialisableHack {
 
   def whenF[F[_], T](methodCall: F[T]): CatsStubbing[F, T] = Mockito.when(methodCall)
 
-  implicit def catsEquality[T: ClassTag: Eq]: Equality[T] = new EqToEquality[T]
+  implicit def catsEquality[T: Eq]: Equality[T] = new EqToEquality[T]
 }
 
 object MockitoCats extends MockitoCats

cats/src/test/scala/org/mockito/cats/IdiomaticMockitoCatsTest.scala

@@ -69,8 +69,12 @@ class IdiomaticMockitoCatsTest
       val aMock                             = mock[Foo]
 
       aMock.returnsOptionT(ValueClass("HoLa")) shouldReturnF ValueClass("Mocked!")
+      aMock.shouldI(false) shouldReturn "Mocked!"
+      aMock.shouldI(true) shouldReturn "Mocked again!"
 
       aMock.returnsOptionT(ValueClass("HOLA")).value should ===(ValueClass("mocked!"))
+      aMock.shouldI(false) shouldBe "Mocked!"
+      aMock.shouldI(true) shouldBe "Mocked again!"
     }
   }
 }

cats/src/test/scala/org/mockito/cats/MockitoCatsTest.scala

@@ -69,8 +69,12 @@ class MockitoCatsTest
       val aMock                             = mock[Foo]
 
       whenF(aMock.returnsOptionT(eqTo(ValueClass("HoLa")))) thenReturn ValueClass("Mocked!")
+      when(aMock.shouldI(eqTo(false))) thenReturn "Mocked!"
+      when(aMock.shouldI(eqTo(true))) thenReturn "Mocked again!"
 
       aMock.returnsOptionT(ValueClass("HOLA")).value should ===(ValueClass("mocked!"))
+      aMock.shouldI(false) shouldBe "Mocked!"
+      aMock.shouldI(true) shouldBe "Mocked again!"
     }
   }
 }

cats/src/test/scala/org/mockito/cats/package.scala

@@ -12,6 +12,8 @@ package object cats {
     def returnsOptionT[T](v: T): Option[T]
 
     def returnsMT[M[_], T](v: T): M[T]
+
+    def shouldI(should: Boolean): String
   }
 
 }

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

@@ -30,6 +30,11 @@ import scala.collection.JavaConverters._
 import scala.reflect.ClassTag
 import scala.reflect.runtime.universe.WeakTypeTag
 
+private[mockito] trait ScalacticSerialisableHack {
+  //Hack until Equality can be made serialisable
+  implicit def mockitoSerialisableEquality[T]: Equality[T] = serialisableEquality[T]
+}
+
 private[mockito] trait MockCreator {
   def mock[T <: AnyRef: ClassTag: WeakTypeTag](implicit defaultAnswer: DefaultAnswer, $pt: Prettifier): T
   def mock[T <: AnyRef: ClassTag: WeakTypeTag](defaultAnswer: Answer[_])(implicit $pt: Prettifier): T =
@@ -46,9 +51,6 @@ private[mockito] trait MockCreator {
    */
   def withSettings(implicit defaultAnswer: DefaultAnswer): MockSettings =
     Mockito.withSettings().defaultAnswer(defaultAnswer)
-
-  //Hack until Equality can be made serialisable
-  implicit def mockitoSerialisableEquality[T]: Equality[T] = serialisableEquality[T]
 }
 
 //noinspection MutatorLikeMethodIsParameterless

core/src/main/scala/org/mockito/IdiomaticMockitoBase.scala

@@ -74,7 +74,7 @@ object IdiomaticMockitoBase {
   }
 }
 
-trait IdiomaticMockitoBase extends MockitoEnhancer {
+trait IdiomaticMockitoBase extends MockitoEnhancer with ScalacticSerialisableHack {
 
   import org.mockito.IdiomaticMockitoBase._
 

core/src/main/scala/org/mockito/MockitoSugar.scala

@@ -1,6 +1,6 @@
 package org.mockito
 
-trait MockitoSugar extends MockitoEnhancer with DoSomething with Verifications with Rest
+trait MockitoSugar extends MockitoEnhancer with DoSomething with Verifications with Rest with ScalacticSerialisableHack
 
 /**
  * Simple object to allow the usage of the trait without mixing it in

specs2/src/test/scala/org/mockito/specs2/MockitoScalaNewSyntaxSpec.scala

@@ -24,11 +24,6 @@ import scala.concurrent.duration._
 class MockitoScalaNewSyntaxSpec extends Spec with Mockito {
   def is       = s2"""
 
- Mockito is a Java library for mocking.
-
- The following samples are taken from the main documentation which can be found here:
- https://static.javadoc.io/org.mockito/mockito-core/2.25.1/org/mockito/Mockito.html
-
 CREATION
 ========
 
@@ -358,7 +353,7 @@ The Mockito trait is reusable in other contexts
     object list extends list; import list._
 
     scala.concurrent.Future { Thread.sleep(2000); takesSometime.call(10) }
-    ((takesSometime.call(10) wasCalled (once within 10.millis)).message must contain("Wanted but not invoked")) and
+    ((takesSometime.call(10) was called).message must contain("Wanted but not invoked")) and
     (takesSometime.call(10) wasCalled (once within 10.seconds))
   }
 

specs2/src/test/scala/org/mockito/specs2/MockitoScalaSpec.scala

@@ -23,11 +23,6 @@ import scala.concurrent.duration._
 class MockitoScalaSpec extends Spec with Mockito {
   def is       = s2"""
 
- Mockito is a Java library for mocking.
-
- The following samples are taken from the main documentation which can be found here:
- https://static.javadoc.io/org.mockito/mockito-core/2.25.1/org/mockito/Mockito.html
-
 CREATION
 ========
 
@@ -357,7 +352,7 @@ The Mockito trait is reusable in other contexts
     object list extends list; import list._
 
     scala.concurrent.Future { Thread.sleep(2000); takesSometime.call(10) }
-    ((takesSometime.call(10) wasCalled (once within 10.millis)).message must contain("Wanted but not invoked")) and
+    ((takesSometime.call(10) was called).message must contain("Wanted but not invoked")) and
     (takesSometime.call(10) wasCalled (once within 10.seconds))
   }