Added convenience implicits and documentation explaining the intended use

Author: DarrenBishop

common/src/main/scala/org/mockito/MockitoAPI.scala

@@ -631,6 +631,10 @@ private[mockito] trait MockitoEnhancer extends MockCreator {
 
   /**
    * Spies the specified object only for the context of the block
+   *
+   * Automatically pulls in [[org.mockito.LeniencySettings#strictStubs strict stubbing]] behaviour via implicits.
+   * To override this default (strict) behaviour, bring lenient settings into implicit scope;
+   * see [[org.mockito.leniency]] for details
    */
   def withObjectSpied[O <: AnyRef: ClassTag](block: => Any)(implicit leniency: LeniencySettings, $pt: Prettifier): Unit = {
     val settings = leniency(Mockito.withSettings().defaultAnswer(CALLS_REAL_METHODS))

common/src/main/scala/org/mockito/mockito.scala

@@ -613,4 +613,27 @@ package object mockito {
     new Equality[T] with Serializable {
       override def areEqual(a: T, b: Any): Boolean = Equality.default[T].areEqual(a, b)
     }
+
+  /**
+   * Implicit [[org.mockito.LeniencySettings LeniencySettings]] provided here for convenience
+   *
+   *  Neither are in implicit scope as is; pull one or the other in to activate the respective semantics, for
+   *  example:
+   *
+   *  {{{
+   *  import org.mockito.leniency.lenient
+   *
+   *  withObjectSpied[SomeObject.type] {
+   *     SomeObject.getExternalThing returns "external-thing"
+   *     SomeObject.getOtherThing returns "other-thing"
+   *     SomeObject.getExternalThing should be("external-thing")
+   *  }
+   *  }}}
+   *
+   *  Note: strict stubbing is active by default via [[org.mockito.LeniencySettings#strictStubs strictStubs]]
+   */
+  object leniency {
+    implicit val strict: LeniencySettings  = LeniencySettings.strictStubs
+    implicit val lenient: LeniencySettings = LeniencySettings.lenientStubs
+  }
 }

scalatest/src/test/scala/user/org/mockito/MockitoScalaSessionTest.scala

@@ -362,8 +362,7 @@ class MockitoScalaSessionTest extends AnyWordSpec with IdiomaticMockito with Mat
         }
       }
 
-      println(thrown.getMessage)
-//      thrown.getMessage should startWith("Unnecessary stubbings detected")
+      thrown.getMessage should startWith("Unnecessary stubbings detected")
     }
 
     "check incorrect stubs after the expected one was called on a final class" in {
@@ -394,7 +393,7 @@ class MockitoScalaSessionTest extends AnyWordSpec with IdiomaticMockito with Mat
 
       "successfully for uncalled lenient stubs" in {
         MockitoScalaSession().run {
-          implicit val strict = LeniencySettings.lenientStubs
+          import org.mockito.leniency.lenient
 
           withObjectSpied[FooObject.type] {
             FooObject.stateDependantMethod returns 1234L
@@ -407,7 +406,7 @@ class MockitoScalaSessionTest extends AnyWordSpec with IdiomaticMockito with Mat
       "unsuccessfully for uncalled strict stubs" in {
         val thrown = the[UnnecessaryStubbingException] thrownBy {
           MockitoScalaSession().run {
-            implicit val strict = LeniencySettings.strictStubs
+            import org.mockito.leniency.strict
 
             withObjectSpied[FooObject.type] {
               FooObject.stateDependantMethod returns 1234L