Skip to content

Bugfix: add support for multiple param lists and/or implicits #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 10, 2018
Merged

Bugfix: add support for multiple param lists and/or implicits #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions core/src/test/scala/org/mockito/IdiomaticMockitoTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import scala.language.postfixOps

class IdiomaticMockitoTest extends WordSpec with scalatest.Matchers with IdiomaticMockito with ArgumentMatchersSugar {

class Implicit[T]

class Foo {
def bar = "not mocked"
def baz = "not mocked"
Expand All @@ -28,7 +30,7 @@ class IdiomaticMockitoTest extends WordSpec with scalatest.Matchers with Idiomat

def iBlowUp(v: Int, v2: String): String = throw new IllegalArgumentException("I was called!")

def iHaveTypeParams[A, B](a: A, b: B): String = "not mocked"
def iHaveTypeParamsAndImplicits[A, B](a: A, b: B)(implicit v3: Implicit[A]): String = "not mocked"
}

class Bar {
Expand All @@ -54,16 +56,17 @@ class IdiomaticMockitoTest extends WordSpec with scalatest.Matchers with Idiomat
aMock.bar shouldBe "mocked again!"
}

"create a mock where I can mix matchers and normal parameters" in {
"create a mock where I can mix matchers, normal and implicit parameters" in {
val aMock = mock[Foo]
implicit val implicitValue: Implicit[Int] = mock[Implicit[Int]]

aMock.iHaveTypeParams[Int, String](*, "test") shouldReturn "mocked!"
aMock.iHaveTypeParamsAndImplicits[Int, String](*, "test") shouldReturn "mocked!"

aMock.iHaveTypeParams(3, "test") shouldBe "mocked!"
aMock.iHaveTypeParams(5, "test") shouldBe "mocked!"
aMock.iHaveTypeParams(5, "est") shouldBe ""
aMock.iHaveTypeParamsAndImplicits(3, "test") shouldBe "mocked!"
aMock.iHaveTypeParamsAndImplicits(5, "test") shouldBe "mocked!"
aMock.iHaveTypeParamsAndImplicits(5, "est") shouldBe ""

aMock.iHaveTypeParams[Int, String](*, "test") wasCalled twice
aMock.iHaveTypeParamsAndImplicits[Int, String](*, "test") wasCalled twice
}

"stub a real call" in {
Expand Down
40 changes: 20 additions & 20 deletions macro/src/main/scala/org/mockito/DoSomethingMacro.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ object DoSomethingMacro {

c.Expr[T] {
c.macroApplication match {
case q"$_.DoSomethingOps[$r]($v).willBe($_.returned).by[$_]($obj.$method[..$targs](..$args))" =>
if (args.exists(a => isMatcher(c)(a))) {
val newArgs: Seq[Tree] = args.map(a => transformArg(c)(a))
q"org.mockito.InternalMockitoSugar.doReturn[$r]($v).when($obj).$method[..$targs](..$newArgs)"
case q"$_.DoSomethingOps[$r]($v).willBe($_.returned).by[$_]($obj.$method[..$targs](...$args))" =>
if (args.exists(a => hasMatchers(c)(a))) {
val newArgs = args.map(a => transformArgs(c)(a))
q"org.mockito.InternalMockitoSugar.doReturn[$r]($v).when($obj).$method[..$targs](...$newArgs)"
} else
q"org.mockito.InternalMockitoSugar.doReturn[$r]($v).when($obj).$method[..$targs](..$args)"
q"org.mockito.InternalMockitoSugar.doReturn[$r]($v).when($obj).$method[..$targs](...$args)"

case q"$_.DoSomethingOps[$r]($v).willBe($_.returned).by[$_]($obj.$method[..$targs])" =>
q"org.mockito.InternalMockitoSugar.doReturn[$r]($v).when($obj).$method[..$targs]"
Expand All @@ -33,12 +33,12 @@ object DoSomethingMacro {

c.Expr[T] {
c.macroApplication match {
case q"$_.DoSomethingOps[$r]($v).willBe($_.answered).by[$_]($obj.$method[..$targs](..$args))" =>
if (args.exists(a => isMatcher(c)(a))) {
val newArgs: Seq[Tree] = args.map(a => transformArg(c)(a))
q"org.mockito.Mockito.doAnswer(org.mockito.DoSomethingMacro.argumentToAnswer($v)).when($obj).$method[..$targs](..$newArgs)"
case q"$_.DoSomethingOps[$r]($v).willBe($_.answered).by[$_]($obj.$method[..$targs](...$args))" =>
if (args.exists(a => hasMatchers(c)(a))) {
val newArgs = args.map(a => transformArgs(c)(a))
q"org.mockito.Mockito.doAnswer(org.mockito.DoSomethingMacro.argumentToAnswer($v)).when($obj).$method[..$targs](...$newArgs)"
} else
q"org.mockito.Mockito.doAnswer(org.mockito.DoSomethingMacro.argumentToAnswer($v)).when($obj).$method[..$targs](..$args)"
q"org.mockito.Mockito.doAnswer(org.mockito.DoSomethingMacro.argumentToAnswer($v)).when($obj).$method[..$targs](...$args)"

case q"$_.DoSomethingOps[$r]($v).willBe($_.answered).by[$_]($obj.$method[..$targs])" =>
q"org.mockito.Mockito.doAnswer(org.mockito.DoSomethingMacro.argumentToAnswer($v)).when($obj).$method[..$targs]"
Expand All @@ -53,12 +53,12 @@ object DoSomethingMacro {

c.Expr[T] {
c.macroApplication match {
case q"$_.ThrowSomethingOps[$_]($v).willBe($_.thrown).by[$_]($obj.$method[..$targs](..$args))" =>
if (args.exists(a => isMatcher(c)(a))) {
val newArgs: Seq[Tree] = args.map(a => transformArg(c)(a))
q"org.mockito.InternalMockitoSugar.doThrow($v).when($obj).$method[..$targs](..$newArgs)"
case q"$_.ThrowSomethingOps[$_]($v).willBe($_.thrown).by[$_]($obj.$method[..$targs](...$args))" =>
if (args.exists(a => hasMatchers(c)(a))) {
val newArgs = args.map(a => transformArgs(c)(a))
q"org.mockito.InternalMockitoSugar.doThrow($v).when($obj).$method[..$targs](...$newArgs)"
} else
q"org.mockito.InternalMockitoSugar.doThrow($v).when($obj).$method[..$targs](..$args)"
q"org.mockito.InternalMockitoSugar.doThrow($v).when($obj).$method[..$targs](...$args)"

case q"$_.ThrowSomethingOps[$_]($v).willBe($_.thrown).by[$_]($obj.$method[..$targs])" =>
q"org.mockito.InternalMockitoSugar.doThrow($v).when($obj).$method[..$targs]"
Expand All @@ -73,12 +73,12 @@ object DoSomethingMacro {

c.Expr[T] {
c.macroApplication match {
case q"$_.theRealMethod.willBe($_.called).by[$_]($obj.$method[..$targs](..$args))" =>
if (args.exists(a => isMatcher(c)(a))) {
val newArgs: Seq[Tree] = args.map(a => transformArg(c)(a))
q"org.mockito.InternalMockitoSugar.doCallRealMethod.when($obj).$method[..$targs](..$newArgs)"
case q"$_.theRealMethod.willBe($_.called).by[$_]($obj.$method[..$targs](...$args))" =>
if (args.exists(a => hasMatchers(c)(a))) {
val newArgs = args.map(a => transformArgs(c)(a))
q"org.mockito.InternalMockitoSugar.doCallRealMethod.when($obj).$method[..$targs](...$newArgs)"
} else
q"org.mockito.InternalMockitoSugar.doCallRealMethod.when($obj).$method[..$targs](..$args)"
q"org.mockito.InternalMockitoSugar.doCallRealMethod.when($obj).$method[..$targs](...$args)"

case q"$_.theRealMethod.willBe($_.called).by[$_]($obj.$method[..$targs])" =>
q"org.mockito.InternalMockitoSugar.doCallRealMethod.when($obj).$method[..$targs]"
Expand Down
6 changes: 6 additions & 0 deletions macro/src/main/scala/org/mockito/Utils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ package org.mockito
import scala.reflect.macros.blackbox

object Utils {
private[mockito] def hasMatchers(c: blackbox.Context)(args: List[c.Tree]): Boolean =
args.exists(arg => isMatcher(c)(arg))

private[mockito] def isMatcher(c: blackbox.Context)(arg: c.Tree): Boolean = {
import c.universe._
if (arg.toString().contains("org.mockito.matchers.ValueClassMatchers")) true
Expand Down Expand Up @@ -54,6 +57,9 @@ object Utils {
}
}

private[mockito] def transformArgs(c: blackbox.Context)(args: List[c.Tree]): List[c.Tree] =
args.map(arg => transformArg(c)(arg))

private[mockito] def transformArg(c: blackbox.Context)(arg: c.Tree): c.Tree = {
import c.universe._
if (isMatcher(c)(arg)) arg
Expand Down
60 changes: 30 additions & 30 deletions macro/src/main/scala/org/mockito/VerifyMacro.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ object VerifyMacro {

c.Expr[Unit] {
c.macroApplication match {
case q"$_.StubbingOps[$_]($obj.$method[..$targs](..$args)).was($_.called)($order)" =>
if (args.exists(a => isMatcher(c)(a))) {
val newArgs: Seq[Tree] = args.map(a => transformArg(c)(a))
q"$order.verify($obj).$method[..$targs](..$newArgs)"
case q"$_.StubbingOps[$_]($obj.$method[..$targs](...$args)).was($_.called)($order)" =>
if (args.exists(a => hasMatchers(c)(a))) {
val newArgs = args.map(a => transformArgs(c)(a))
q"$order.verify($obj).$method[..$targs](...$newArgs)"
} else
q"$order.verify($obj).$method[..$targs](..$args)"
q"$order.verify($obj).$method[..$targs](...$args)"

case q"$_.StubbingOps[$_]($obj.$method[..$targs]).was($_.called)($order)" =>
q"$order.verify($obj).$method[..$targs]"
Expand All @@ -38,12 +38,12 @@ object VerifyMacro {

c.Expr[Unit] {
c.macroApplication match {
case q"$_.StubbingOps[$_]($obj.$method[..$targs](..$args)).was($_.never).called($order)" =>
if (args.exists(a => isMatcher(c)(a))) {
val newArgs: Seq[Tree] = args.map(a => transformArg(c)(a))
q"$order.verifyWithMode($obj, org.mockito.Mockito.never).$method[..$targs](..$newArgs)"
case q"$_.StubbingOps[$_]($obj.$method[..$targs](...$args)).was($_.never).called($order)" =>
if (args.exists(a => hasMatchers(c)(a))) {
val newArgs = args.map(a => transformArgs(c)(a))
q"$order.verifyWithMode($obj, org.mockito.Mockito.never).$method[..$targs](...$newArgs)"
} else
q"$order.verifyWithMode($obj, org.mockito.Mockito.never).$method[..$targs](..$args)"
q"$order.verifyWithMode($obj, org.mockito.Mockito.never).$method[..$targs](...$args)"

case q"$_.StubbingOps[$_]($obj.$method[..$targs]).was($_.never).called($order)" =>
q"$order.verifyWithMode($obj, org.mockito.Mockito.never).$method[..$targs]"
Expand All @@ -65,12 +65,12 @@ object VerifyMacro {

c.Expr[Unit] {
c.macroApplication match {
case q"$_.StubbingOps[$_]($obj.$method[..$targs](..$args)).wasCalled($times)($order)" =>
if (args.exists(a => isMatcher(c)(a))) {
val newArgs: Seq[Tree] = args.map(a => transformArg(c)(a))
q"$order.verifyWithMode($obj, org.mockito.Mockito.times($times.times)).$method[..$targs](..$newArgs)"
case q"$_.StubbingOps[$_]($obj.$method[..$targs](...$args)).wasCalled($times)($order)" =>
if (args.exists(a => hasMatchers(c)(a))) {
val newArgs = args.map(a => transformArgs(c)(a))
q"$order.verifyWithMode($obj, org.mockito.Mockito.times($times.times)).$method[..$targs](...$newArgs)"
} else
q"$order.verifyWithMode($obj, org.mockito.Mockito.times($times.times)).$method[..$targs](..$args)"
q"$order.verifyWithMode($obj, org.mockito.Mockito.times($times.times)).$method[..$targs](...$args)"

case q"$_.StubbingOps[$_]($obj.$method[..$targs]).wasCalled($times)($order)" =>
q"$order.verifyWithMode($obj, org.mockito.Mockito.times($times.times)).$method[..$targs]"
Expand All @@ -87,12 +87,12 @@ object VerifyMacro {

c.Expr[Unit] {
c.macroApplication match {
case q"$_.StubbingOps[$_]($obj.$method[..$targs](..$args)).wasCalled($times)($order)" =>
if (args.exists(a => isMatcher(c)(a))) {
val newArgs: Seq[Tree] = args.map(a => transformArg(c)(a))
q"$order.verifyWithMode($obj, org.mockito.Mockito.atLeast($times.times)).$method[..$targs](..$newArgs)"
case q"$_.StubbingOps[$_]($obj.$method[..$targs](...$args)).wasCalled($times)($order)" =>
if (args.exists(a => hasMatchers(c)(a))) {
val newArgs = args.map(a => transformArgs(c)(a))
q"$order.verifyWithMode($obj, org.mockito.Mockito.atLeast($times.times)).$method[..$targs](...$newArgs)"
} else
q"$order.verifyWithMode($obj, org.mockito.Mockito.atLeast($times.times)).$method[..$targs](..$args)"
q"$order.verifyWithMode($obj, org.mockito.Mockito.atLeast($times.times)).$method[..$targs](...$args)"

case q"$_.StubbingOps[$_]($obj.$method[..$targs]).wasCalled($times)($order)" =>
q"$order.verifyWithMode($obj, org.mockito.Mockito.atLeast($times.times)).$method[..$targs]"
Expand All @@ -109,12 +109,12 @@ object VerifyMacro {

c.Expr[Unit] {
c.macroApplication match {
case q"$_.StubbingOps[$_]($obj.$method[..$targs](..$args)).wasCalled($times)($order)" =>
if (args.exists(a => isMatcher(c)(a))) {
val newArgs: Seq[Tree] = args.map(a => transformArg(c)(a))
q"$order.verifyWithMode($obj, org.mockito.Mockito.atMost($times.times)).$method[..$targs](..$newArgs)"
case q"$_.StubbingOps[$_]($obj.$method[..$targs](...$args)).wasCalled($times)($order)" =>
if (args.exists(a => hasMatchers(c)(a))) {
val newArgs = args.map(a => transformArgs(c)(a))
q"$order.verifyWithMode($obj, org.mockito.Mockito.atMost($times.times)).$method[..$targs](...$newArgs)"
} else
q"$order.verifyWithMode($obj, org.mockito.Mockito.atMost($times.times)).$method[..$targs](..$args)"
q"$order.verifyWithMode($obj, org.mockito.Mockito.atMost($times.times)).$method[..$targs](...$args)"

case q"$_.StubbingOps[$_]($obj.$method[..$targs]).wasCalled($times)($order)" =>
q"$order.verifyWithMode($obj, org.mockito.Mockito.atMost($times.times)).$method[..$targs]"
Expand All @@ -131,12 +131,12 @@ object VerifyMacro {

c.Expr[Unit] {
c.macroApplication match {
case q"$_.StubbingOps[$_]($obj.$method[..$targs](..$args)).wasCalled($_)($order)" =>
if (args.exists(a => isMatcher(c)(a))) {
val newArgs: Seq[Tree] = args.map(a => transformArg(c)(a))
q"$order.verifyWithMode($obj, org.mockito.Mockito.only).$method[..$targs](..$newArgs)"
case q"$_.StubbingOps[$_]($obj.$method[..$targs](...$args)).wasCalled($_)($order)" =>
if (args.exists(a => hasMatchers(c)(a))) {
val newArgs = args.map(a => transformArgs(c)(a))
q"$order.verifyWithMode($obj, org.mockito.Mockito.only).$method[..$targs](...$newArgs)"
} else
q"$order.verifyWithMode($obj, org.mockito.Mockito.only).$method[..$targs](..$args)"
q"$order.verifyWithMode($obj, org.mockito.Mockito.only).$method[..$targs](...$args)"

case q"$_.StubbingOps[$_]($obj.$method[..$targs]).wasCalled($_)($order)" =>
q"$order.verifyWithMode($obj, org.mockito.Mockito.only).$method[..$targs]"
Expand Down
40 changes: 20 additions & 20 deletions macro/src/main/scala/org/mockito/WhenMacro.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ object WhenMacro {

c.Expr[ReturnActions[T]] {
c.macroApplication match {
case q"$_.StubbingOps[$t]($obj.$method[..$targs](..$args)).shouldReturn" =>
if (args.exists(a => isMatcher(c)(a))) {
val newArgs: Seq[Tree] = args.map(a => transformArg(c)(a))
q"new org.mockito.WhenMacro.ReturnActions(org.mockito.Mockito.when[$t]($obj.$method[..$targs](..$newArgs)))"
case q"$_.StubbingOps[$t]($obj.$method[..$targs](...$args)).shouldReturn" =>
if (args.exists(a => hasMatchers(c)(a))) {
val newArgs = args.map(a => transformArgs(c)(a))
q"new org.mockito.WhenMacro.ReturnActions(org.mockito.Mockito.when[$t]($obj.$method[..$targs](...$newArgs)))"
} else
q"new org.mockito.WhenMacro.ReturnActions(org.mockito.Mockito.when[$t]($obj.$method[..$targs](..$args)))"
q"new org.mockito.WhenMacro.ReturnActions(org.mockito.Mockito.when[$t]($obj.$method[..$targs](...$args)))"

case q"$_.StubbingOps[$t]($obj.$method[..$targs]).shouldReturn" =>
q"new org.mockito.WhenMacro.ReturnActions(org.mockito.Mockito.when[$t]($obj.$method[..$targs]))"
Expand All @@ -39,12 +39,12 @@ object WhenMacro {

c.Expr[ScalaOngoingStubbing[T]] {
c.macroApplication match {
case q"$_.StubbingOps[$t]($obj.$method[..$targs](..$args)).shouldCallRealMethod" =>
if (args.exists(a => isMatcher(c)(a))) {
val newArgs: Seq[Tree] = args.map(a => transformArg(c)(a))
q"new org.mockito.stubbing.ScalaOngoingStubbing(org.mockito.Mockito.when[$t]($obj.$method[..$targs](..$newArgs)).thenCallRealMethod())"
case q"$_.StubbingOps[$t]($obj.$method[..$targs](...$args)).shouldCallRealMethod" =>
if (args.exists(a => hasMatchers(c)(a))) {
val newArgs = args.map(a => transformArgs(c)(a))
q"new org.mockito.stubbing.ScalaOngoingStubbing(org.mockito.Mockito.when[$t]($obj.$method[..$targs](...$newArgs)).thenCallRealMethod())"
} else
q"new org.mockito.stubbing.ScalaOngoingStubbing(org.mockito.Mockito.when[$t]($obj.$method[..$targs](..$args)).thenCallRealMethod())"
q"new org.mockito.stubbing.ScalaOngoingStubbing(org.mockito.Mockito.when[$t]($obj.$method[..$targs](...$args)).thenCallRealMethod())"

case q"$_.StubbingOps[$t]($obj.$method[..$targs]).shouldCallRealMethod" =>
q"new org.mockito.stubbing.ScalaOngoingStubbing(org.mockito.Mockito.when[$t]($obj.$method[..$targs]).thenCallRealMethod())"
Expand All @@ -64,12 +64,12 @@ object WhenMacro {

c.Expr[ThrowActions[T]] {
c.macroApplication match {
case q"$_.StubbingOps[$t]($obj.$method[..$targs](..$args)).shouldThrow" =>
if (args.exists(a => isMatcher(c)(a))) {
val newArgs: Seq[Tree] = args.map(a => transformArg(c)(a))
q"new org.mockito.WhenMacro.ThrowActions(org.mockito.Mockito.when[$t]($obj.$method[..$targs](..$newArgs)))"
case q"$_.StubbingOps[$t]($obj.$method[..$targs](...$args)).shouldThrow" =>
if (args.exists(a => hasMatchers(c)(a))) {
val newArgs = args.map(a => transformArgs(c)(a))
q"new org.mockito.WhenMacro.ThrowActions(org.mockito.Mockito.when[$t]($obj.$method[..$targs](...$newArgs)))"
} else
q"new org.mockito.WhenMacro.ThrowActions(org.mockito.Mockito.when[$t]($obj.$method[..$targs](..$args)))"
q"new org.mockito.WhenMacro.ThrowActions(org.mockito.Mockito.when[$t]($obj.$method[..$targs](...$args)))"

case q"$_.StubbingOps[$t]($obj.$method[..$targs]).shouldThrow" =>
q"new org.mockito.WhenMacro.ThrowActions(org.mockito.Mockito.when[$t]($obj.$method[..$targs]))"
Expand Down Expand Up @@ -111,12 +111,12 @@ object WhenMacro {

c.Expr[AnswerActions[T]] {
c.macroApplication match {
case q"$_.StubbingOps[$t]($obj.$method[..$targs](..$args)).shouldAnswer" =>
if (args.exists(a => isMatcher(c)(a))) {
val newArgs: Seq[Tree] = args.map(a => transformArg(c)(a))
q"new org.mockito.WhenMacro.AnswerActions(org.mockito.Mockito.when[$t]($obj.$method[..$targs](..$newArgs)))"
case q"$_.StubbingOps[$t]($obj.$method[..$targs](...$args)).shouldAnswer" =>
if (args.exists(a => hasMatchers(c)(a))) {
val newArgs = args.map(a => transformArgs(c)(a))
q"new org.mockito.WhenMacro.AnswerActions(org.mockito.Mockito.when[$t]($obj.$method[..$targs](...$newArgs)))"
} else
q"new org.mockito.WhenMacro.AnswerActions(org.mockito.Mockito.when[$t]($obj.$method[..$targs](..$args)))"
q"new org.mockito.WhenMacro.AnswerActions(org.mockito.Mockito.when[$t]($obj.$method[..$targs](...$args)))"

case q"$_.StubbingOps[$t]($obj.$method[..$targs]).shouldAnswer" =>
q"new org.mockito.WhenMacro.AnswerActions(org.mockito.Mockito.when[$t]($obj.$method[..$targs]))"
Expand Down