diff --git a/cats/src/test/scala/org/mockito/cats/DoSomethingCatsTest.scala b/cats/src/test/scala/org/mockito/cats/DoSomethingCatsTest.scala index e73d234e..2641f63d 100644 --- a/cats/src/test/scala/org/mockito/cats/DoSomethingCatsTest.scala +++ b/cats/src/test/scala/org/mockito/cats/DoSomethingCatsTest.scala @@ -2,7 +2,7 @@ package org.mockito.cats import cats.implicits._ import org.mockito.invocation.InvocationOnMock -import org.mockito.{ ArgumentMatchersSugar, IdiomaticMockito } +import org.mockito._ import org.scalatest.concurrent.ScalaFutures import org.scalatest.{ EitherValues, OptionValues } diff --git a/cats/src/test/scala/org/mockito/cats/IdiomaticMockitoCatsTest.scala b/cats/src/test/scala/org/mockito/cats/IdiomaticMockitoCatsTest.scala index bfe48113..07ff861b 100644 --- a/cats/src/test/scala/org/mockito/cats/IdiomaticMockitoCatsTest.scala +++ b/cats/src/test/scala/org/mockito/cats/IdiomaticMockitoCatsTest.scala @@ -3,7 +3,7 @@ package org.mockito.cats import cats.Eq import cats.implicits._ import org.mockito.invocation.InvocationOnMock -import org.mockito.{ ArgumentMatchersSugar, IdiomaticMockito } +import org.mockito._ import org.scalatest.concurrent.ScalaFutures import org.scalatest.{ EitherValues, OptionValues } diff --git a/cats/src/test/scala/org/mockito/cats/MockitoCatsTest.scala b/cats/src/test/scala/org/mockito/cats/MockitoCatsTest.scala index 737bf5b3..b6b1dc73 100644 --- a/cats/src/test/scala/org/mockito/cats/MockitoCatsTest.scala +++ b/cats/src/test/scala/org/mockito/cats/MockitoCatsTest.scala @@ -4,7 +4,7 @@ import cats.Eq import cats.data.{ EitherT, OptionT } import cats.implicits._ import org.mockito.invocation.InvocationOnMock -import org.mockito.{ ArgumentMatchersSugar, MockitoSugar } +import org.mockito._ import org.scalatest.concurrent.ScalaFutures import org.scalatest.{ EitherValues, OptionValues } @@ -251,7 +251,7 @@ class MockitoCatsTest extends AnyWordSpec with Matchers with MockitoSugar with A doAnswerFG[Future, ErrorOr, ValueClass](ValueClass("mocked!")).when(aMock).returnsFutureEither("hello") doAnswerFG[Future, ErrorOr, String, ValueClass]((s: String) => ValueClass(s + " mocked!")).when(aMock).returnsFutureEither("hi") - doAnswerFG[Future, ErrorOr, InvocationOnMock, ValueClass] { i: InvocationOnMock => ValueClass(i.arg[String](0) + " invocation mocked!") } + doAnswerFG[Future, ErrorOr, InvocationOnMock, ValueClass]((i: InvocationOnMock) => ValueClass(i.arg[String](0) + " invocation mocked!")) .when(aMock) .returnsFutureEither("hola") doAnswerFG[Future, Option, Int, Boolean, String]((i: Int, b: Boolean) => s"$i, $b").when(aMock).returnsFutureOptionFrom(42, true) diff --git a/scalatest/src/test/scala/user/org/mockito/DoSomethingTest.scala b/scalatest/src/test/scala/user/org/mockito/DoSomethingTest.scala index 63f543a2..b9f06989 100644 --- a/scalatest/src/test/scala/user/org/mockito/DoSomethingTest.scala +++ b/scalatest/src/test/scala/user/org/mockito/DoSomethingTest.scala @@ -3,7 +3,7 @@ package user.org.mockito import java.util.concurrent.atomic.AtomicInteger import org.mockito.invocation.InvocationOnMock -import org.mockito.{ ArgumentMatchersSugar, MockitoSugar } +import org.mockito._ import user.org.mockito.matchers.{ ValueCaseClassInt, ValueCaseClassString, ValueClass } import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec diff --git a/scalatest/src/test/scala/user/org/mockito/IdiomaticStubbingTest.scala b/scalatest/src/test/scala/user/org/mockito/IdiomaticStubbingTest.scala index 3cf6cb91..decfb775 100644 --- a/scalatest/src/test/scala/user/org/mockito/IdiomaticStubbingTest.scala +++ b/scalatest/src/test/scala/user/org/mockito/IdiomaticStubbingTest.scala @@ -3,7 +3,7 @@ package user.org.mockito import java.util.concurrent.atomic.AtomicInteger import org.mockito.invocation.InvocationOnMock -import org.mockito.{ ArgumentMatchersSugar, IdiomaticStubbing } +import org.mockito._ import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec import user.org.mockito.matchers.{ ValueCaseClassInt, ValueCaseClassString, ValueClass } diff --git a/scalatest/src/test/scala/user/org/mockito/MalformedClassError.scala b/scalatest/src/test/scala/user/org/mockito/MalformedClassError.scala index ed1a1780..6f326f15 100644 --- a/scalatest/src/test/scala/user/org/mockito/MalformedClassError.scala +++ b/scalatest/src/test/scala/user/org/mockito/MalformedClassError.scala @@ -25,8 +25,8 @@ class MalformedClassError extends AnyWordSpecLike with Matchers with IdiomaticMo object MalformedClassError { sealed trait Permissions object Permissions { - final case object Allowed extends Permissions - final case object Denied extends Permissions + case object Allowed extends Permissions + case object Denied extends Permissions } type Allowed = Permissions.Allowed.type diff --git a/scalatest/src/test/scala/user/org/mockito/MockitoSugarTest.scala b/scalatest/src/test/scala/user/org/mockito/MockitoSugarTest.scala index 23bf5fa3..62a64e8b 100644 --- a/scalatest/src/test/scala/user/org/mockito/MockitoSugarTest.scala +++ b/scalatest/src/test/scala/user/org/mockito/MockitoSugarTest.scala @@ -8,14 +8,13 @@ import org.mockito.exceptions.misusing.WrongTypeOfReturnValue import org.mockito.exceptions.verification.{ ArgumentsAreDifferent, WantedButNotInvoked } import org.mockito.invocation.InvocationOnMock import org.mockito.stubbing.{ CallsRealMethods, DefaultAnswer, ScalaFirstStubbing } -import org.mockito.{ ArgumentMatchersSugar, MockitoSugar } +import org.mockito._ import org.scalactic.Prettifier import org.scalatest.prop.TableDrivenPropertyChecks import org.scalatest.{ EitherValues, OptionValues } import user.org.mockito.matchers.{ ValueCaseClassInt, ValueCaseClassString, ValueClass } import user.org.mockito.model.JavaFoo -import scala.reflect.io.AbstractFile import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec @@ -317,14 +316,6 @@ class MockitoSugarTest extends AnyWordSpec with MockitoSugar with Matchers with org.takesManyValueClasses(new ValueClass("1"), ValueCaseClassInt(2), ValueCaseClassString("3")) shouldBe "ValueClass(1)-ValueCaseClassInt(2)-ValueCaseClassString(3)" } - "not mock final methods" in { - val abstractFile = mock[AbstractFile] - - when(abstractFile.path) thenReturn "sammy.scala" - - abstractFile.path shouldBe "sammy.scala" - } - "be serialisable" in { val list = mock[java.util.List[String]](withSettings.name("list1").serializable()) when(list.get(eqTo(3))) thenAnswer "mocked" @@ -353,7 +344,7 @@ class MockitoSugarTest extends AnyWordSpec with MockitoSugar with Matchers with aMock.bar shouldBe "hola" - val ex = the[WrongTypeOfReturnValue] thrownBy (aMock.returnBar shouldBe "hola") + val ex = the[WrongTypeOfReturnValue] thrownBy aMock.returnBar ex.getMessage should include("Default answer returned a result with the wrong type") } diff --git a/scalatest/src/test/scala/user/org/mockito/scalatest/IdiomaticMockitoFixtureClassTest.scala b/scalatest/src/test/scala/user/org/mockito/scalatest/IdiomaticMockitoFixtureClassTest.scala index 0ade3c4e..1d3711b7 100644 --- a/scalatest/src/test/scala/user/org/mockito/scalatest/IdiomaticMockitoFixtureClassTest.scala +++ b/scalatest/src/test/scala/user/org/mockito/scalatest/IdiomaticMockitoFixtureClassTest.scala @@ -20,7 +20,7 @@ class IdiomaticMockitoFixtureClassTest extends flatspec.FixtureAnyFlatSpec with withFixture(test.toNoArgTest(theFixture)) } - "Mockito" should "verifyNoMoreInteractions fixture objects" in { f: FixtureParam => + "Mockito" should "verifyNoMoreInteractions fixture objects" in { (f: FixtureParam) => "mocked" willBe returned by f.foo.bar("pepe") f.foo wasNever called @@ -32,7 +32,7 @@ class IdiomaticMockitoFixtureClassTest extends flatspec.FixtureAnyFlatSpec with } } - "Mockito" should "verify no calls on fixture objects methods" in { f: FixtureParam => + "Mockito" should "verify no calls on fixture objects methods" in { (f: FixtureParam) => "mocked" willBe returned by f.foo.bar("pepe") "mocked" willBe returned by f.foo.baz diff --git a/scalatest/src/test/scala/user/org/mockito/scalatest/IdiomaticMockitoWithExpectFixtureClassTest.scala b/scalatest/src/test/scala/user/org/mockito/scalatest/IdiomaticMockitoWithExpectFixtureClassTest.scala index 15159caf..359988dc 100644 --- a/scalatest/src/test/scala/user/org/mockito/scalatest/IdiomaticMockitoWithExpectFixtureClassTest.scala +++ b/scalatest/src/test/scala/user/org/mockito/scalatest/IdiomaticMockitoWithExpectFixtureClassTest.scala @@ -22,7 +22,7 @@ class IdiomaticMockitoWithExpectFixtureClassTest extends flatspec.FixtureAnyFlat super.withFixture(test.toNoArgTest(theFixture)) } - "expect no calls TO" should "verify no calls on fixture objects methods" in { f: FixtureParam => + "expect no calls TO" should "verify no calls on fixture objects methods" in { (f: FixtureParam) => "mocked" willBe returned by f.foo.bar("pepe") "mocked" willBe returned by f.foo.baz @@ -37,7 +37,7 @@ class IdiomaticMockitoWithExpectFixtureClassTest extends flatspec.FixtureAnyFlat } } - "expect no calls ON" should "verify no calls on a mock inside a fixture object" in { f: FixtureParam => + "expect no calls ON" should "verify no calls on a mock inside a fixture object" in { (f: FixtureParam) => f.foo.bar("pepe") returns "mocked" expect no calls on f.foo @@ -49,7 +49,7 @@ class IdiomaticMockitoWithExpectFixtureClassTest extends flatspec.FixtureAnyFlat } } - it should "prevent usage of 'no calls to' when 'no calls on' is intended" in { f: FixtureParam => + it should "prevent usage of 'no calls to' when 'no calls on' is intended" in { (f: FixtureParam) => the[MissingMethodInvocationException] thrownBy { expect no calls to f.foo } should have message @@ -62,7 +62,7 @@ class IdiomaticMockitoWithExpectFixtureClassTest extends flatspec.FixtureAnyFlat |""".stripMargin } - "expect noMore calls on" should "verify no more calls on a mock inside a fixture object" in { f: FixtureParam => + "expect noMore calls on" should "verify no more calls on a mock inside a fixture object" in { (f: FixtureParam) => f.foo.bar("pepe") returns "mocked" f.foo.bar("pepe") shouldBe "mocked" diff --git a/scalaz/src/test/scala/org/mockito/scalaz/DoSomethingScalazTest.scala b/scalaz/src/test/scala/org/mockito/scalaz/DoSomethingScalazTest.scala index 59341eb4..0afe54bd 100644 --- a/scalaz/src/test/scala/org/mockito/scalaz/DoSomethingScalazTest.scala +++ b/scalaz/src/test/scala/org/mockito/scalaz/DoSomethingScalazTest.scala @@ -1,6 +1,6 @@ package org.mockito.scalaz -import org.mockito.{ ArgumentMatchersSugar, IdiomaticMockito } +import org.mockito._ import org.scalatest.concurrent.ScalaFutures import org.scalatest.{ EitherValues, OptionValues } import _root_.scalaz._ diff --git a/scalaz/src/test/scala/org/mockito/scalaz/IdiomaticMockitoScalazTest.scala b/scalaz/src/test/scala/org/mockito/scalaz/IdiomaticMockitoScalazTest.scala index 9f1f5029..f7bf094d 100644 --- a/scalaz/src/test/scala/org/mockito/scalaz/IdiomaticMockitoScalazTest.scala +++ b/scalaz/src/test/scala/org/mockito/scalaz/IdiomaticMockitoScalazTest.scala @@ -1,11 +1,11 @@ package org.mockito.scalaz import _root_.scalaz._ +import Scalaz._ import org.mockito.invocation.InvocationOnMock -import org.mockito.{ ArgumentMatchersSugar, IdiomaticMockito } +import org.mockito._ import org.scalatest.concurrent.ScalaFutures import org.scalatest.{ EitherValues, OptionValues } -import scalaz.Scalaz._ import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.{ Future, Promise } diff --git a/scalaz/src/test/scala/org/mockito/scalaz/MockitoScalazTest.scala b/scalaz/src/test/scala/org/mockito/scalaz/MockitoScalazTest.scala index 21f0f849..cc788cc1 100644 --- a/scalaz/src/test/scala/org/mockito/scalaz/MockitoScalazTest.scala +++ b/scalaz/src/test/scala/org/mockito/scalaz/MockitoScalazTest.scala @@ -3,7 +3,7 @@ package org.mockito.scalaz import _root_.scalaz._ import Scalaz._ import org.mockito.invocation.InvocationOnMock -import org.mockito.{ ArgumentMatchersSugar, MockitoSugar } +import org.mockito._ import org.scalatest.concurrent.ScalaFutures import org.scalatest.{ EitherValues, OptionValues } @@ -252,7 +252,7 @@ class MockitoScalazTest extends AnyWordSpec with Matchers with MockitoSugar with doAnswerFG[Future, ErrorOr, ValueClass](ValueClass("mocked!")).when(aMock).returnsFutureEither("hello") doAnswerFG[Future, ErrorOr, String, ValueClass]((s: String) => ValueClass(s + " mocked!")).when(aMock).returnsFutureEither("hi") - doAnswerFG[Future, ErrorOr, InvocationOnMock, ValueClass] { i: InvocationOnMock => ValueClass(i.arg[String](0) + " invocation mocked!") } + doAnswerFG[Future, ErrorOr, InvocationOnMock, ValueClass]((i: InvocationOnMock) => ValueClass(i.arg[String](0) + " invocation mocked!")) .when(aMock) .returnsFutureEither("hola") doAnswerFG[Future, Option, Int, Boolean, String]((i: Int, b: Boolean) => s"$i, $b").when(aMock).returnsFutureOptionFrom(42, true) diff --git a/specs2/src/test/scala/org/mockito/specs2/MockitoScalaNewSyntaxSpec.scala b/specs2/src/test/scala/org/mockito/specs2/MockitoScalaNewSyntaxSpec.scala index 4ae3cdc3..c8cee0e9 100644 --- a/specs2/src/test/scala/org/mockito/specs2/MockitoScalaNewSyntaxSpec.scala +++ b/specs2/src/test/scala/org/mockito/specs2/MockitoScalaNewSyntaxSpec.scala @@ -4,7 +4,7 @@ import java.io.{ File, FileOutputStream, ObjectOutputStream } import java.util import org.hamcrest.core.IsNull import org.mockito.IdiomaticMockitoBase.Times -import org.mockito.VerifyOrder +import org.mockito.{ VerifyInOrder, VerifyOrder } import org.mockito.captor.ArgCaptor import org.mockito.invocation.InvocationOnMock import org.mockito.stubbing.DefaultAnswer @@ -554,7 +554,7 @@ The Mockito trait is reusable in other contexts list1.get(0) list1.get(1) - implicit val order = inOrder(list1) + implicit val order: VerifyInOrder = inOrder(list1) val result = list1.get(1).was(called) andThen list1.get(0).was(called) @@ -567,7 +567,7 @@ The Mockito trait is reusable in other contexts list1.get(0) list1.get(1) - implicit val order = inOrder(list1) + implicit val order: VerifyInOrder = inOrder(list1) var result: Result = success @@ -593,8 +593,8 @@ The Mockito trait is reusable in other contexts list1.get(0); list1.size; list1.get(0); list1.size - implicit val order = inOrder(list1) - val result = got { + implicit val order: VerifyInOrder = inOrder(list1) + val result = got { list1.get(0) was called list1.size() was called list1.get(0) wasNever called @@ -608,13 +608,13 @@ The Mockito trait is reusable in other contexts def callbacks1 = { val list = mock[java.util.List[String]]("list") - list.get(*) answers { i: Int => s"The parameter is ${i.toString}" } + list.get(*) answers { (i: Int) => s"The parameter is ${i.toString}" } list.get(2) must_== "The parameter is 2" } def callbacks2 = { val list = mock[java.util.List[String]]("list") - list.get(*) answers { i: Int => (i + 1).toString } + list.get(*) answers { (i: Int) => (i + 1).toString } list.get(1) must_== "2" list.get(5) must_== "6" } diff --git a/specs2/src/test/scala/org/mockito/specs2/MockitoScalaSpec.scala b/specs2/src/test/scala/org/mockito/specs2/MockitoScalaSpec.scala index 94b64fa2..3b392b6f 100644 --- a/specs2/src/test/scala/org/mockito/specs2/MockitoScalaSpec.scala +++ b/specs2/src/test/scala/org/mockito/specs2/MockitoScalaSpec.scala @@ -3,7 +3,7 @@ package org.mockito.specs2 import java.io.{ File, FileOutputStream, ObjectOutputStream } import java.util import org.hamcrest.core.IsNull -import org.mockito.VerifyOrder +import org.mockito.{ VerifyInOrder, VerifyOrder } import org.mockito.captor.ArgCaptor import org.mockito.invocation.InvocationOnMock import org.mockito.stubbing.DefaultAnswer @@ -525,7 +525,7 @@ The Mockito trait is reusable in other contexts list1.get(0) list2.get(0) - implicit val order = inOrder(list1, list2) + implicit val order: VerifyInOrder = inOrder(list1, list2) (there was one(list1).get(0) andThen one(list2).get(0)).message must_== "The mock was called as expected" } @@ -541,7 +541,7 @@ The Mockito trait is reusable in other contexts list1.get(0) list2.get(0) - implicit val order = inOrder(ignoreStubs(list1, list2)) + implicit val order: VerifyInOrder = inOrder(ignoreStubs(list1, list2)) (there was one(list1).get(0) andThen one(list2).get(0)).message must_== "The mock was called as expected" } @@ -552,7 +552,7 @@ The Mockito trait is reusable in other contexts list1.get(0) list1.get(1) - implicit val order = inOrder(list1) + implicit val order: VerifyInOrder = inOrder(list1) val result = there was one(list1).get(1) andThen one(list1).get(0) @@ -566,7 +566,7 @@ The Mockito trait is reusable in other contexts list1.get(0) list1.get(1) - implicit val order = inOrder(list1) + implicit val order: VerifyInOrder = inOrder(list1) var result: Result = success @@ -584,7 +584,7 @@ The Mockito trait is reusable in other contexts list1.get(0) list2.get(0) - implicit val order = inOrder(list1, list2) + implicit val order: VerifyInOrder = inOrder(list1, list2) (there was one(list2).get(0) andThen one(list1).get(0)).message must startWith("The mock was not called as expected") } @@ -594,8 +594,8 @@ The Mockito trait is reusable in other contexts list1.get(0); list1.size; list1.get(0); list1.size - implicit val order = inOrder(list1) - val result = there was one(list1).get(0) andThen + implicit val order: VerifyInOrder = inOrder(list1) + val result = there was one(list1).get(0) andThen one(list1).size() andThen no(list1).get(0) andThen one(list1).size() @@ -607,13 +607,13 @@ The Mockito trait is reusable in other contexts def callbacks1 = { val list = mock[java.util.List[String]]("list") - list.get(*) answers { i: Int => "The parameter is " + i.toString } + list.get(*) answers { (i: Int) => "The parameter is " + i.toString } list.get(2) must_== "The parameter is 2" } def callbacks2 = { val list = mock[java.util.List[String]]("list") - list.get(*) answers { i: Int => (i + 1).toString } + list.get(*) answers { (i: Int) => (i + 1).toString } list.get(1) must_== "2" list.get(5) must_== "6" }