Introduce "expect (...) ON x" to be used instead of "expect (...) TO x" on mock objects #220
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…x" on mock objects
ultrasecreth
reviewed
Apr 6, 2020
Comment on lines
+11
to
+13
| if (c.settings.contains("mockito-print-expect")) { | ||
| val pos = s"${c.enclosingPosition.source.file.name}:${c.enclosingPosition.line}" | ||
| println(pos + " " + show(r.tree)) |
There was a problem hiding this comment.
I like this, we should extract a function and use it everywhere
There was a problem hiding this comment.
Done in a separate PR: #221
The two PRs will conflict with each other once merged, I'll resolve whichever comes last
ultrasecreth
reviewed
Apr 6, 2020
Comment on lines
25
to
35
| q"""if (!_root_.org.mockito.MockitoSugar.mockingDetails($obj).isMock) | ||
| throw new _root_.org.mockito.exceptions.misusing.MissingMethodInvocationException(Seq( | ||
| "'expect no calls to <?>' requires an argument which is 'a method call on a mock',", | ||
| " but [" + $calledPattern + "] is a mock object.", | ||
| "", | ||
| "The following would be correct (note the usage of 'calls to' vs 'calls on'):", | ||
| " expect no calls to " + $calledPattern + ".bar(*)", | ||
| " expect no calls on " + $calledPattern, | ||
| "" | ||
| ).mkString("\n")) | ||
| else ${transformInvocation(c)(q"$obj.$methodOrField", order, q"${c.prefix}.mode")} |
There was a problem hiding this comment.
Same here, the postfix verification currently uses the standard mockito exception, but I like this one with more info, should be extracted
ultrasecreth
reviewed
Apr 6, 2020
Comment on lines
76
to
83
| exception.getMessage shouldBe | ||
| """'expect no calls to <?>' requires an argument which is 'a method call on a mock', | ||
| | but [fixture.org] is a mock object. | ||
| | | ||
| |The following would be correct (note the usage of 'calls to' vs 'calls on'): | ||
| | expect no calls to fixture.org.bar(*) | ||
| | expect no calls on fixture.org | ||
| |""".stripMargin |
ultrasecreth
requested changes
Apr 6, 2020
...t/src/test/scala/user/org/mockito/scalatest/IdiomaticMockitoWithExpectFixtureClassTest.scala
Outdated
Show resolved
Hide resolved
ultrasecreth
approved these changes
Apr 6, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #212 for Expect DSL