ReturnsSmartNulls handles defaults for primitives

ultrasecreth · ultrasecreth · commit 2ddc4d5be397 · 2018-08-25T19:49:46.000+01:00
diff --git a/core/src/main/scala/org/mockito/DefaultAnswer.scala b/core/src/main/scala/org/mockito/DefaultAnswer.scala
@@ -26,15 +26,15 @@ trait DefaultAnswer extends Answer[Any] with Function[InvocationOnMock, Option[A
 }
 
 object DefaultAnswer {
-  implicit val defaultAnswer: DefaultAnswer = ReturnsDefaults orElse ReturnsSmartNulls
+  implicit val defaultAnswer: DefaultAnswer = ReturnsSmartNulls
 }
 
 object ReturnsDefaults extends DefaultAnswer {
   override def apply(invocation: InvocationOnMock): Option[Any] = Option(RETURNS_DEFAULTS.answer(invocation))
 }
 
 object ReturnsSmartNulls extends DefaultAnswer {
-  override def apply(invocation: InvocationOnMock): Option[Any] = {
+  override def apply(invocation: InvocationOnMock): Option[Any] = Option(RETURNS_DEFAULTS.answer(invocation)).orElse {
     val returnType = invocation.getMethod.getReturnType
 
     if (!returnType.isPrimitive && !isFinal(returnType.getModifiers))

Original file line number	Diff line number	Diff line change
`@@ -26,15 +26,15 @@ trait DefaultAnswer extends Answer[Any] with Function[InvocationOnMock, Option[A`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`object DefaultAnswer {`
`29`		`- implicit val defaultAnswer: DefaultAnswer = ReturnsDefaults orElse ReturnsSmartNulls`
	`29`	`+ implicit val defaultAnswer: DefaultAnswer = ReturnsSmartNulls`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`object ReturnsDefaults extends DefaultAnswer {`
`33`	`33`	`override def apply(invocation: InvocationOnMock): Option[Any] = Option(RETURNS_DEFAULTS.answer(invocation))`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`object ReturnsSmartNulls extends DefaultAnswer {`
`37`		`- override def apply(invocation: InvocationOnMock): Option[Any] = {`
	`37`	`+ override def apply(invocation: InvocationOnMock): Option[Any] = Option(RETURNS_DEFAULTS.answer(invocation)).orElse {`
`38`	`38`	`val returnType = invocation.getMethod.getReturnType`
`39`	`39`
`40`	`40`	`if (!returnType.isPrimitive && !isFinal(returnType.getModifiers))`