Misc refactor #30
Merged
Misc refactor #30
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
…ent synthetic methods and smart-nulls mocks
Removes dependency on eager, reflection-based stubbing for default arguments
…e exceptions are always properly handled It also detects un-stubbed invocations
ultrasecreth
commented
Aug 22, 2018
| @@ -179,7 +187,8 @@ private[mockito] trait MockitoEnhancer extends MockCreator { | |||
| /** | |||
| * Delegates to <code>Mockito.withSettings()</code>, it's only here to expose the full Mockito API | |||
| */ | |||
| def withSettings: MockSettings = Mockito.withSettings() | |||
| def withSettings(implicit defaultAnswer: Answer[_]): MockSettings = | |||
There was a problem hiding this comment.
Maybe default this so it can be used without the implicit in scope? also update the doc
ultrasecreth
commented
Aug 22, 2018
| @@ -11,45 +12,93 @@ import org.mockito.session.MockitoSessionLogger | |||
| import scala.collection.mutable | |||
| import scala.collection.JavaConverters._ | |||
|
|
|||
| class MockitoScalaSession(name: String, strictness: Strictness, logger: MockitoSessionLogger) { | |||
| private val listener = new IgnoreDefaultArgumentsMockListener | |||
| class MockitoScalaSession private (name: String, strictness: Strictness, logger: MockitoSessionLogger) { | |||
There was a problem hiding this comment.
remove this so people can integrate this using before/after hooks
This was referenced Aug 22, 2018
Krever
approved these changes
Aug 22, 2018
README.md
Outdated
| ``` | ||
| That's it! that block of code will execute within a session and will handle |
| @@ -39,34 +41,42 @@ trait IdiomaticMockito extends MockCreator { | |||
| when(stubbing) thenAnswer functionToAnswer(f) | |||
|
|
|||
| def shouldAnswer[P0, P1, P2](f: (P0, P1, P2) => T): OngoingStubbing[T] = | |||
| when(stubbing) thenAnswer functionToAnswer(f) | |||
| when(stubbing) thenAnswer functionToAnswer( | |||
| f) | |||
There was a problem hiding this comment.
Funny formatting I have to say. Is it scalafmt or sth else causing this?
| else | ||
| throw new SmartNullPointerException( | ||
| s"""You have a NullPointerException because this method call was *not* stubbed correctly: | ||
| |[$unStubbedInvocation] on the Mock [${unStubbedInvocation.getMock}]""".stripMargin) |
| classOf[Iterator[_]] -> Iterator.empty, | ||
| classOf[Stream[_]] -> Stream.empty, | ||
| classOf[Vector[_]] -> Vector.empty, | ||
| classOf[Try[_]] -> Failure(new MockitoException("Auto stub provided by mockito-scala")), |
There was a problem hiding this comment.
So maybe Future as well?
I would also think about making it a bit more extensible, so one could add monix or cats-io or other types here as well. OTOH I don't expect people to actually do that as this is something you find very useful when its already there but you don't hit it often enough to put the effort into extending this functionality.
…(if any had happen)
Any default answer handles default parameters
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.
No description provided.