@@ -5,16 +5,19 @@ import org.scalatest.{Assertions, AssertionsMacro}
55import org .scalatest .compatible .Assertion
66
77trait VersionSpecificAssertionsForJUnit extends Assertions {
8- inline override def assert (inline condition : Boolean )(implicit prettifier : Prettifier , pos : source.Position ): Assertion =
8+ // https://github.com/lampepfl/dotty/pull/8601#pullrequestreview-380646858
9+ implicit object UseJUnitAssertions
10+
11+ inline def assert (inline condition : Boolean )(implicit prettifier : Prettifier , pos : source.Position , use : UseJUnitAssertions .type ): Assertion =
912 $ { AssertionsForJUnitMacro .assert(' {condition}, ' {prettifier}, ' {pos}, ' {" " }) }
1013
11- inline override def assert (inline condition : Boolean , clue : Any )(implicit prettifier : Prettifier , pos : source.Position ): Assertion =
14+ inline def assert (inline condition : Boolean , clue : Any )(implicit prettifier : Prettifier , pos : source.Position , use : UseJUnitAssertions . type ): Assertion =
1215 $ { AssertionsForJUnitMacro .assert(' {condition}, ' {prettifier}, ' {pos}, ' {clue}) }
1316
14- inline override def assume (inline condition : Boolean )(implicit prettifier : Prettifier , pos : source.Position ): Assertion =
17+ inline def assume (inline condition : Boolean )(implicit prettifier : Prettifier , pos : source.Position , use : UseJUnitAssertions . type ): Assertion =
1518 $ { AssertionsForJUnitMacro .assume(' {condition}, ' {prettifier}, ' {pos}, ' {" " }) }
1619
17- inline override def assume (inline condition : Boolean , clue : Any )(implicit prettifier : Prettifier , pos : source.Position ): Assertion =
20+ inline def assume (inline condition : Boolean , clue : Any )(implicit prettifier : Prettifier , pos : source.Position , use : UseJUnitAssertions . type ): Assertion =
1821 $ { AssertionsForJUnitMacro .assume(' {condition}, ' {prettifier}, ' {pos}, ' {clue}) }
1922
2023}
0 commit comments