Skip to content

Commit 5301d28

Browse files
committed
Drop long time deprecated methods
1 parent 0b5b666 commit 5301d28

File tree

13 files changed

+5
-203
lines changed

13 files changed

+5
-203
lines changed

core/src/main/scala-2.12/org/mockito/matchers/EqMatchers_VersionSpecific.scala

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,4 @@ trait EqMatchers_VersionSpecific {
1414
value
1515
}
1616

17-
/**
18-
* It was intended to be used instead of eqTo when the argument is a value class, but eqTo now supports value classes so it is not needed anymore
19-
*/
20-
@deprecated("Use 'eqTo' instead", since = "1.0.2")
21-
def eqToVal[T: Equality: ValueClassExtractor](value: T)(implicit $pt: Prettifier): T = eqTo(value)
2217
}

core/src/main/scala-2.13/org/mockito/matchers/EqMatchers_VersionSpecific.scala

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,4 @@ trait EqMatchers_VersionSpecific {
1414
value
1515
}
1616

17-
/**
18-
* It was intended to be used instead of eqTo when the argument is a value class, but eqTo now supports value classes so it is not needed anymore
19-
*/
20-
@deprecated("Use 'eqTo' instead", since = "1.0.2")
21-
def eqToVal[T: Equality: ValueClassExtractor](value: T)(implicit $pt: Prettifier): T = eqTo(value)
2217
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package org.mockito.captor
2+
3+
object ArgCaptor {
4+
def apply[T](implicit c: Captor[T]): Captor[T] = c
5+
}

core/src/main/scala/org/mockito/captor/Captors.scala

Lines changed: 0 additions & 10 deletions
This file was deleted.

core/src/main/scala/org/mockito/integrations/scalatest/IdiomaticMockitoFixture.scala

Lines changed: 0 additions & 11 deletions
This file was deleted.

core/src/main/scala/org/mockito/integrations/scalatest/MockitoFixture.scala

Lines changed: 0 additions & 11 deletions
This file was deleted.

core/src/main/scala/org/mockito/integrations/scalatest/MockitoSessionFixture.scala

Lines changed: 0 additions & 17 deletions
This file was deleted.

core/src/main/scala/org/mockito/integrations/scalatest/ResetMocksAfterEachTest.scala

Lines changed: 0 additions & 48 deletions
This file was deleted.

core/src/main/scala/org/mockito/matchers/MacroBasedMatchers.scala

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@ import org.mockito.{ ArgumentMatchers => JavaMatchers }
44

55
trait MacroBasedMatchers {
66

7-
/**
8-
* It was intended to be used instead of any when the argument is a value class, but any now supports value classes so it is not needed anymore
9-
*/
10-
@deprecated("Use 'any[T]' or '*[T]' instead", since = "1.0.2")
11-
def anyVal[T](implicit default: DefaultValueProvider[T]): T = any[T]
12-
137
/**
148
* Delegates to <code>ArgumentMatchers.any()</code>, it's main purpose is to remove the () out of the method call, if you try to do that directly on the test you get this error
159
*

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

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -403,27 +403,6 @@ class PostfixVerificationsTest extends AnyWordSpec with IdiomaticMockitoTestSetu
403403
org.valueClassWithVarArgAndSecondParameterList(Bread("Chipa"), Bread("Tortilla"))(cheese) was called
404404
}
405405

406-
"eqToVal works with new syntax" in {
407-
val org = orgDouble()
408-
409-
org.valueClass(1, eqToVal(new ValueClass("meh"))) returns "mocked!"
410-
org.valueClass(1, new ValueClass("meh")) shouldBe "mocked!"
411-
org.valueClass(1, eqToVal(new ValueClass("meh"))) was called
412-
413-
org.valueCaseClass(2, eqToVal(ValueCaseClassInt(100))) returns "mocked!"
414-
org.valueCaseClass(2, ValueCaseClassInt(100)) shouldBe "mocked!"
415-
org.valueCaseClass(2, eqToVal(ValueCaseClassInt(100))) was called
416-
417-
val caseClassValue = ValueCaseClassInt(100)
418-
org.valueCaseClass(3, eqToVal(caseClassValue)) returns "mocked!"
419-
org.valueCaseClass(3, ValueCaseClassInt(100)) shouldBe "mocked!"
420-
org.valueCaseClass(3, eqToVal(caseClassValue)) was called
421-
422-
org.valueCaseClass(*, ValueCaseClassInt(200)) returns "mocked!"
423-
org.valueCaseClass(4, ValueCaseClassInt(200)) shouldBe "mocked!"
424-
org.valueCaseClass(*, ValueCaseClassInt(200)) was called
425-
}
426-
427406
"eqTo macro works with new syntax" in {
428407
val org = orgDouble()
429408

@@ -457,18 +436,6 @@ class PostfixVerificationsTest extends AnyWordSpec with IdiomaticMockitoTestSetu
457436
}
458437
}
459438

460-
"anyVal works with new syntax" in {
461-
val org = orgDouble()
462-
463-
org.valueClass(1, anyVal[ValueClass]) returns "mocked!"
464-
org.valueClass(1, new ValueClass("meh")) shouldBe "mocked!"
465-
org.valueClass(1, anyVal[ValueClass]) was called
466-
467-
org.valueCaseClass(2, anyVal[ValueCaseClassInt]) returns "mocked!"
468-
org.valueCaseClass(2, ValueCaseClassInt(100)) shouldBe "mocked!"
469-
org.valueCaseClass(2, anyVal[ValueCaseClassInt]) was called
470-
}
471-
472439
"any works with new syntax" in {
473440
val org = orgDouble()
474441

0 commit comments

Comments
 (0)