Skip to content

Sanitise macros #63

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
Nov 23, 2018
Merged

Sanitise macros #63

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
365 changes: 182 additions & 183 deletions core/src/test/scala/user/org/mockito/IdiomaticMockitoTest.scala
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions macro-common/src/main/scala/org/mockito/internal/ValueClassExtractor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,19 @@ object ValueClassExtractor {
val r = if (isValueClass) {

if (ScalaVersion.startsWith("2.12"))
c.Expr[ValueClassExtractor[VC]](q"new org.mockito.internal.ReflectionExtractor[$tpe]")
c.Expr[ValueClassExtractor[VC]](q"new _root_.org.mockito.internal.ReflectionExtractor[$tpe]")
else if (ScalaVersion.startsWith("2.11"))
c.Expr[ValueClassExtractor[VC]] {
val companion = tpe.typeSymbol.companion
q"""
new org.mockito.internal.ValueClassExtractor[$tpe] {
new _root_.org.mockito.internal.ValueClassExtractor[$tpe] {
override def extract(vc: $tpe): Any = $companion.unapply(vc).get
}
"""
} else throw new Exception(s"Unsupported scala version $ScalaVersion")

} else
c.Expr[ValueClassExtractor[VC]](q"new org.mockito.internal.NormalClassExtractor[$tpe]")
c.Expr[ValueClassExtractor[VC]](q"new _root_.org.mockito.internal.NormalClassExtractor[$tpe]")

if (c.settings.contains("mockito-print-extractor")) println(show(r.tree))

Expand Down
14 changes: 7 additions & 7 deletions macro/src/main/scala-2.11/org.mockito.matchers/MacroMatchers_211.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ object MacroMatchers_211 {
val r = c.Expr[T] {
c.macroApplication match {
case q"$_.eqTo[$tpe]($clazz($arg))($_)" if isValueClass(tpe) =>
q"$clazz(org.mockito.matchers.MacroMatchers_211.eqTo($arg))"
q"$clazz(_root_.org.mockito.matchers.MacroMatchers_211.eqTo($arg))"

case q"$_.eqTo[$tpe](new $clazz($arg))($_)" if isValueClass(tpe) =>
q"new $clazz(org.mockito.matchers.MacroMatchers_211.eqTo($arg))"
q"new $clazz(_root_.org.mockito.matchers.MacroMatchers_211.eqTo($arg))"

case q"$_.eqTo[$tpe]($arg)($_)" if isValueClass(tpe) && tpe.symbol.asClass.isCaseClass =>
val companion = tpe.symbol.companion
q"$companion.apply( org.mockito.matchers.MacroMatchers_211.eqTo( $companion.unapply($arg).get ))"
q"$companion.apply(_root_.org.mockito.matchers.MacroMatchers_211.eqTo( $companion.unapply($arg).get ))"

case q"$_.eqTo[$tpe]($arg)($eq)" =>
q"org.mockito.matchers.MacroMatchers_211.eqTo[$tpe]($arg)($eq)"
q"_root_.org.mockito.matchers.MacroMatchers_211.eqTo[$tpe]($arg)($eq)"

case o => throw new Exception(s"Couldn't recognize ${show(o)}")
}
Expand All @@ -48,11 +48,11 @@ object MacroMatchers_211 {

val r = c.Expr[T] {
c.macroApplication match {
case q"$_.eqToVal[$_]($clazz($arg))" => q"$clazz(org.mockito.matchers.MacroMatchers_211.eqTo($arg))"
case q"$_.eqToVal[$_](new $clazz($arg))" => q"new $clazz(org.mockito.matchers.MacroMatchers_211.eqTo($arg))"
case q"$_.eqToVal[$_]($clazz($arg))" => q"$clazz(_root_.org.mockito.matchers.MacroMatchers_211.eqTo($arg))"
case q"$_.eqToVal[$_](new $clazz($arg))" => q"new $clazz(_root_.org.mockito.matchers.MacroMatchers_211.eqTo($arg))"
case q"$_.eqToVal[$tpe]($arg)" =>
val companion = q"$tpe".symbol.companion
q"$companion.apply(org.mockito.matchers.MacroMatchers_211.eqTo( $companion.unapply($arg).get ))"
q"$companion.apply(_root_.org.mockito.matchers.MacroMatchers_211.eqTo( $companion.unapply($arg).get ))"
case o => throw new Exception(s"Couldn't recognize ${show(o)}")
}
}
Expand Down
24 changes: 12 additions & 12 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 @@ -16,12 +16,12 @@ object DoSomethingMacro {
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.MockitoSugar.doReturn[$r]($v).when($obj).$method[..$targs](...$newArgs)"
q"_root_.org.mockito.MockitoSugar.doReturn[$r]($v).when($obj).$method[..$targs](...$newArgs)"
} else
q"org.mockito.MockitoSugar.doReturn[$r]($v).when($obj).$method[..$targs](...$args)"
q"_root_.org.mockito.MockitoSugar.doReturn[$r]($v).when($obj).$method[..$targs](...$args)"

case q"$_.DoSomethingOps[$r]($v).willBe($_.returned).by[$_]($obj.$method[..$targs])" =>
q"org.mockito.MockitoSugar.doReturn[$r]($v).when($obj).$method[..$targs]"
q"_root_.org.mockito.MockitoSugar.doReturn[$r]($v).when($obj).$method[..$targs]"

case o => throw new Exception(s"Couldn't recognize ${show(o)}")
}
Expand All @@ -38,12 +38,12 @@ object DoSomethingMacro {
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.MockitoSugar.doAnswer($v).when($obj).$method[..$targs](...$newArgs)"
q"_root_.org.mockito.MockitoSugar.doAnswer($v).when($obj).$method[..$targs](...$newArgs)"
} else
q"org.mockito.MockitoSugar.doAnswer($v).when($obj).$method[..$targs](...$args)"
q"_root_.org.mockito.MockitoSugar.doAnswer($v).when($obj).$method[..$targs](...$args)"

case q"$_.DoSomethingOps[$r]($v).willBe($_.answered).by[$_]($obj.$method[..$targs])" =>
q"org.mockito.MockitoSugar.doAnswer($v).when($obj).$method[..$targs]"
q"_root_.org.mockito.MockitoSugar.doAnswer($v).when($obj).$method[..$targs]"

case o => throw new Exception(s"Couldn't recognize ${show(o)}")
}
Expand All @@ -60,12 +60,12 @@ object DoSomethingMacro {
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.MockitoSugar.doThrow($v).when($obj).$method[..$targs](...$newArgs)"
q"_root_.org.mockito.MockitoSugar.doThrow($v).when($obj).$method[..$targs](...$newArgs)"
} else
q"org.mockito.MockitoSugar.doThrow($v).when($obj).$method[..$targs](...$args)"
q"_root_.org.mockito.MockitoSugar.doThrow($v).when($obj).$method[..$targs](...$args)"

case q"$_.ThrowSomethingOps[$_]($v).willBe($_.thrown).by[$_]($obj.$method[..$targs])" =>
q"org.mockito.MockitoSugar.doThrow($v).when($obj).$method[..$targs]"
q"_root_.org.mockito.MockitoSugar.doThrow($v).when($obj).$method[..$targs]"

case o => throw new Exception(s"Couldn't recognize ${show(o)}")
}
Expand All @@ -82,12 +82,12 @@ object DoSomethingMacro {
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.MockitoSugar.doCallRealMethod.when($obj).$method[..$targs](...$newArgs)"
q"_root_.org.mockito.MockitoSugar.doCallRealMethod.when($obj).$method[..$targs](...$newArgs)"
} else
q"org.mockito.MockitoSugar.doCallRealMethod.when($obj).$method[..$targs](...$args)"
q"_root_.org.mockito.MockitoSugar.doCallRealMethod.when($obj).$method[..$targs](...$args)"

case q"$_.theRealMethod.willBe($_.called).by[$_]($obj.$method[..$targs])" =>
q"org.mockito.MockitoSugar.doCallRealMethod.when($obj).$method[..$targs]"
q"_root_.org.mockito.MockitoSugar.doCallRealMethod.when($obj).$method[..$targs]"

case o => throw new Exception(s"Couldn't recognize ${show(o)}")
}
Expand Down
8 changes: 4 additions & 4 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 @@ -61,9 +61,9 @@ object Utils {

case q"$_.Captor.asCapture[$_]($_)" => true

case q"(org.mockito.matchers.MacroMatchers_211.eqTo[$_](...$_): $_)" => true
case q"($_(org.mockito.matchers.MacroMatchers_211.eqTo[$_](...$_)): $_)" => true
case q"(new $_(org.mockito.matchers.MacroMatchers_211.eqTo[$_](...$_)): $_)" => true
case q"($_.MacroMatchers_211.eqTo[$_](...$_): $_)" => true
case q"($_($_.MacroMatchers_211.eqTo[$_](...$_)): $_)" => true
case q"(new $_($_.MacroMatchers_211.eqTo[$_](...$_)): $_)" => true

case _ => false
}
Expand All @@ -77,7 +77,7 @@ object Utils {
if (isMatcher(c)(arg)) arg
else
arg match {
case q"$a" => q"org.mockito.ArgumentMatchersSugar.eqTo($a)"
case q"$a" => q"_root_.org.mockito.ArgumentMatchersSugar.eqTo($a)"
}
}
}
46 changes: 23 additions & 23 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 @@ -13,7 +13,7 @@ object Called {

object VerifyMacro {

def wasMacro[T: c.WeakTypeTag](c: blackbox.Context)(called: c.Expr[Called.type])(order: c.Expr[org.mockito.VerifyOrder]): c.Expr[Unit] = {
def wasMacro[T: c.WeakTypeTag](c: blackbox.Context)(called: c.Expr[Called.type])(order: c.Expr[VerifyOrder]): c.Expr[Unit] = {
import c.universe._

val r = c.Expr[Unit] {
Expand All @@ -35,26 +35,26 @@ object VerifyMacro {
r
}

def wasNotMacro[T: c.WeakTypeTag](c: blackbox.Context)(called: c.Expr[Called.type])(order: c.Expr[org.mockito.VerifyOrder]): c.Expr[Unit] = {
def wasNotMacro[T: c.WeakTypeTag](c: blackbox.Context)(called: c.Expr[Called.type])(order: c.Expr[VerifyOrder]): c.Expr[Unit] = {
import c.universe._

val r = c.Expr[Unit] {
c.macroApplication match {
case q"$_.StubbingOps[$_]($_.this.$obj).wasNever($_.called)($_)" =>
q"org.mockito.MockitoSugar.verifyZeroInteractions($obj)"
q"_root_.org.mockito.MockitoSugar.verifyZeroInteractions($obj)"

case q"$_.StubbingOps[$_]($obj.$method[..$targs](...$args)).wasNever($_.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)"
q"$order.verifyWithMode($obj, _root_.org.mockito.Mockito.never).$method[..$targs](...$newArgs)"
} else
q"$order.verifyWithMode($obj, org.mockito.Mockito.never).$method[..$targs](...$args)"
q"$order.verifyWithMode($obj, _root_.org.mockito.Mockito.never).$method[..$targs](...$args)"

case q"$_.StubbingOps[$_]($obj.$method[..$targs]).wasNever($_.called)($order)" =>
q"$order.verifyWithMode($obj, org.mockito.Mockito.never).$method[..$targs]"
q"$order.verifyWithMode($obj, _root_.org.mockito.Mockito.never).$method[..$targs]"

case q"$_.StubbingOps[$_]($obj).wasNever($_.called)($_)" =>
q"org.mockito.MockitoSugar.verifyZeroInteractions($obj)"
q"_root_.org.mockito.MockitoSugar.verifyZeroInteractions($obj)"

case o => throw new Exception(s"Couldn't recognize ${show(o)}")
}
Expand All @@ -65,20 +65,20 @@ object VerifyMacro {

case class Times(times: Int)

def wasMacroTimes[T: c.WeakTypeTag](c: blackbox.Context)(t: c.Expr[Times])(order: c.Expr[org.mockito.VerifyOrder]): c.Expr[Unit] = {
def wasMacroTimes[T: c.WeakTypeTag](c: blackbox.Context)(t: c.Expr[Times])(order: c.Expr[VerifyOrder]): c.Expr[Unit] = {
import c.universe._

val r = c.Expr[Unit] {
c.macroApplication match {
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)"
q"$order.verifyWithMode($obj, _root_.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, _root_.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]"
q"$order.verifyWithMode($obj, _root_.org.mockito.Mockito.times($times.times)).$method[..$targs]"

case o => throw new Exception(s"Couldn't recognize ${show(o)}")
}
Expand All @@ -89,20 +89,20 @@ object VerifyMacro {

case class AtLeast(times: Int)

def wasMacroAtLeast[T: c.WeakTypeTag](c: blackbox.Context)(t: c.Expr[AtLeast])(order: c.Expr[org.mockito.VerifyOrder]): c.Expr[Unit] = {
def wasMacroAtLeast[T: c.WeakTypeTag](c: blackbox.Context)(t: c.Expr[AtLeast])(order: c.Expr[VerifyOrder]): c.Expr[Unit] = {
import c.universe._

val r = c.Expr[Unit] {
c.macroApplication match {
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)"
q"$order.verifyWithMode($obj, _root_.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, _root_.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]"
q"$order.verifyWithMode($obj, _root_.org.mockito.Mockito.atLeast($times.times)).$method[..$targs]"

case o => throw new Exception(s"Couldn't recognize ${show(o)}")
}
Expand All @@ -113,20 +113,20 @@ object VerifyMacro {

case class AtMost(times: Int)

def wasMacroAtMost[T: c.WeakTypeTag](c: blackbox.Context)(t: c.Expr[AtMost])(order: c.Expr[org.mockito.VerifyOrder]): c.Expr[Unit] = {
def wasMacroAtMost[T: c.WeakTypeTag](c: blackbox.Context)(t: c.Expr[AtMost])(order: c.Expr[VerifyOrder]): c.Expr[Unit] = {
import c.universe._

val r = c.Expr[Unit] {
c.macroApplication match {
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)"
q"$order.verifyWithMode($obj, _root_.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, _root_.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]"
q"$order.verifyWithMode($obj, _root_.org.mockito.Mockito.atMost($times.times)).$method[..$targs]"

case o => throw new Exception(s"Couldn't recognize ${show(o)}")
}
Expand All @@ -137,20 +137,20 @@ object VerifyMacro {

class OnlyOn

def wasMacroOnlyOn[T: c.WeakTypeTag](c: blackbox.Context)(t: c.Expr[OnlyOn])(order: c.Expr[org.mockito.VerifyOrder]): c.Expr[Unit] = {
def wasMacroOnlyOn[T: c.WeakTypeTag](c: blackbox.Context)(t: c.Expr[OnlyOn])(order: c.Expr[VerifyOrder]): c.Expr[Unit] = {
import c.universe._

val r = c.Expr[Unit] {
c.macroApplication match {
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)"
q"$order.verifyWithMode($obj, _root_.org.mockito.Mockito.only).$method[..$targs](...$newArgs)"
} else
q"$order.verifyWithMode($obj, org.mockito.Mockito.only).$method[..$targs](...$args)"
q"$order.verifyWithMode($obj, _root_.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]"
q"$order.verifyWithMode($obj, _root_.org.mockito.Mockito.only).$method[..$targs]"

case o => throw new Exception(s"Couldn't recognize ${show(o)}")
}
Expand Down
Loading