Skip to content

Commit d3ddec4

Browse files
OlivierBlanvillainOlivierBlanvillain
committed
Temporary workaround for scalatest#1687
scala/scala3#1687
1 parent 35c274d commit d3ddec4

File tree

3 files changed

+40
-36
lines changed

3 files changed

+40
-36
lines changed

‎project/GenTable.scala

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1366,18 +1366,20 @@ $columnsOfIndexes$
13661366
| //SCALATESTJS-ONLY val stackDepth = 1
13671367
|
13681368
| indicateFailure(
1369-
| (sde: StackDepthException) => FailureMessages.propertyException(prettifier, UnquotedString(ex.getClass.getSimpleName)) +
1370-
| ( sde.failedCodeFileNameAndLineNumberString match { case Some(s) => " (" + s + ")"; case None => "" }) + "\n" +
1371-
| " " + FailureMessages.thrownExceptionsMessage(prettifier, if (ex.getMessage == null) "None" else UnquotedString(ex.getMessage)) + "\n" +
1372-
| (
1373-
| ex match {
1374-
| case sd: StackDepth if sd.failedCodeFileNameAndLineNumberString.isDefined =>
1375-
| " " + FailureMessages.thrownExceptionsLocation(prettifier, UnquotedString(sd.failedCodeFileNameAndLineNumberString.get)) + "\n"
1376-
| case _ => ""
1377-
| }
1378-
| ) +
1379-
| " " + FailureMessages.occurredAtRow(prettifier, idx) + "\n" +
1380-
| $namesAndValues$
1369+
| (sde: StackDepthException) => """.stripMargin +
1370+
// FailureMessages.propertyException(prettifier, UnquotedString(ex.getClass.getSimpleName)) +
1371+
// | ( sde.failedCodeFileNameAndLineNumberString match { case Some(s) => " (" + s + ")"; case None => "" }) + "\n" +
1372+
// | " " + FailureMessages.thrownExceptionsMessage(prettifier, if (ex.getMessage == null) "None" else UnquotedString(ex.getMessage)) + "\n" +
1373+
// | (
1374+
// | ex match {
1375+
// | case sd: StackDepth if sd.failedCodeFileNameAndLineNumberString.isDefined =>
1376+
// | " " + FailureMessages.thrownExceptionsLocation(prettifier, UnquotedString(sd.failedCodeFileNameAndLineNumberString.get)) + "\n"
1377+
// | case _ => ""
1378+
// | }
1379+
// | ) +
1380+
// | " " + FailureMessages.occurredAtRow(prettifier, idx) + "\n" +
1381+
// | $namesAndValues$
1382+
"""
13811383
| " )",
13821384
| FailureMessages.undecoratedPropertyCheckFailureMessage,
13831385
| List($alphaLower$),
@@ -1714,24 +1716,26 @@ $columnsOfIndexes$
17141716
| result.failedElements :+ ((index,
17151717
| head,
17161718
| new org.scalatest.exceptions.TableDrivenPropertyCheckFailedException(
1717-
| ((sde: StackDepthException) => FailureMessages.propertyException(prettifier, UnquotedString(ex.getClass.getSimpleName)) +
1718-
| (sde.failedCodeFileNameAndLineNumberString match {
1719-
| case Some(s) => " (" + s + ")";
1720-
| case None => ""
1721-
| }) + "\n" +
1722-
| " " + FailureMessages.thrownExceptionsMessage(prettifier, if (ex.getMessage == null) "None" else UnquotedString(ex.getMessage)) + "\n" +
1723-
| (
1724-
| ex match {
1725-
| case sd: StackDepth if sd.failedCodeFileNameAndLineNumberString.isDefined =>
1726-
| " " + FailureMessages.thrownExceptionsLocation(prettifier, UnquotedString(sd.failedCodeFileNameAndLineNumberString.get)) + "\n"
1727-
| case _ => ""
1728-
| }
1729-
| ) +
1730-
| " " + FailureMessages.occurredAtRow(prettifier, index) + "\n" +
1731-
| indentErrorMessages(namesOfArgs.zip(head.productIterator.toSeq).map { case (name, value) =>
1732-
| name + " = " + value
1733-
| }.toIndexedSeq).mkString("\n") +
1734-
| " )"),
1719+
| (sde: StackDepthException) => "", """.stripMargin +
1720+
// FailureMessages.propertyException(prettifier, UnquotedString(ex.getClass.getSimpleName)) +
1721+
// | (sde.failedCodeFileNameAndLineNumberString match {
1722+
// | case Some(s) => " (" + s + ")";
1723+
// | case None => ""
1724+
// | }) + "\n" +
1725+
// | " " + FailureMessages.thrownExceptionsMessage(prettifier, if (ex.getMessage == null) "None" else UnquotedString(ex.getMessage)) + "\n" +
1726+
// | (
1727+
// | ex match {
1728+
// | case sd: StackDepth if sd.failedCodeFileNameAndLineNumberString.isDefined =>
1729+
// | " " + FailureMessages.thrownExceptionsLocation(prettifier, UnquotedString(sd.failedCodeFileNameAndLineNumberString.get)) + "\n"
1730+
// | case _ => ""
1731+
// | }
1732+
// | ) +
1733+
// | " " + FailureMessages.occurredAtRow(prettifier, index) + "\n" +
1734+
// | indentErrorMessages(namesOfArgs.zip(head.productIterator.toSeq).map { case (name, value) =>
1735+
// | name + " = " + value
1736+
// | }.toIndexedSeq).mkString("\n") +
1737+
// | " )"),
1738+
"""
17351739
| Some(ex),
17361740
| pos,
17371741
| None,

‎scalatest/src/main/scala/org/scalatest/enablers/CheckerAsserting.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ abstract class UnitCheckerAsserting {
114114
val stackDepth = 1
115115

116116
indicateFailure(
117-
sde => FailureMessages.propertyException(prettifier, UnquotedString(sde.getClass.getSimpleName)) + "\n" +
117+
sde => """FailureMessages.propertyException(prettifier, UnquotedString(sde.getClass.getSimpleName)) + "\n" +
118118
( sde.failedCodeFileNameAndLineNumberString match { case Some(s) => " (" + s + ")"; case None => "" }) + "\n" +
119119
" " + FailureMessages.propertyFailed(prettifier, result.succeeded) + "\n" +
120120
(
@@ -127,7 +127,7 @@ abstract class UnitCheckerAsserting {
127127
" " + FailureMessages.occurredOnValues + "\n" +
128128
prettyArgs(getArgsWithSpecifiedNames(argNames, scalaCheckArgs), prettifier) + "\n" +
129129
" )" +
130-
getLabelDisplay(scalaCheckLabels),
130+
getLabelDisplay(scalaCheckLabels)""",
131131
FailureMessages.propertyFailed(prettifier, result.succeeded),
132132
scalaCheckArgs,
133133
scalaCheckLabels.toList,
@@ -138,7 +138,7 @@ abstract class UnitCheckerAsserting {
138138
case Test.PropException(scalaCheckArgs, e, scalaCheckLabels) =>
139139

140140
indicateFailure(
141-
sde => FailureMessages.propertyException(prettifier, UnquotedString(e.getClass.getSimpleName)) + "\n" +
141+
sde => """FailureMessages.propertyException(prettifier, UnquotedString(e.getClass.getSimpleName)) + "\n" +
142142
" " + FailureMessages.thrownExceptionsMessage(prettifier, if (e.getMessage == null) "None" else UnquotedString(e.getMessage)) + "\n" +
143143
(
144144
e match {
@@ -150,7 +150,7 @@ abstract class UnitCheckerAsserting {
150150
" " + FailureMessages.occurredOnValues + "\n" +
151151
prettyArgs(getArgsWithSpecifiedNames(argNames, scalaCheckArgs), prettifier) + "\n" +
152152
" )" +
153-
getLabelDisplay(scalaCheckLabels),
153+
getLabelDisplay(scalaCheckLabels)""",
154154
FailureMessages.propertyException(prettifier, UnquotedString(e.getClass.getName)),
155155
scalaCheckArgs,
156156
scalaCheckLabels.toList,

‎scalatest/src/main/scala/org/scalatest/prop/GeneratorChecks.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ import GeneratorChecks.stackDepthMethodName
6565
else throw new TestFailedException((sde: StackDepthException) => Some("too many discarded evaluations"), None, pos, None)
6666
case Failure(ex) =>
6767
throw new GeneratorDrivenPropertyCheckFailedException(
68-
(sde: StackDepthException) => FailureMessages.propertyException(prettifier, UnquotedString(sde.getClass.getSimpleName)) + "\n" +
68+
(sde: StackDepthException) => """FailureMessages.propertyException(prettifier, UnquotedString(sde.getClass.getSimpleName)) + "\n" +
6969
( sde.failedCodeFileNameAndLineNumberString match { case Some(s) => " (" + s + ")"; case None => "" }) + "\n" +
7070
" " + FailureMessages.propertyFailed(prettifier, succeededCount) + "\n" +
7171
(
@@ -78,7 +78,7 @@ import GeneratorChecks.stackDepthMethodName
7878
" " + FailureMessages.occurredOnValues + "\n" +
7979
prettyArgs(argsPassed, prettifier) + "\n" +
8080
" )" +
81-
"", // getLabelDisplay(scalaCheckLabels),
81+
"" """, // getLabelDisplay(scalaCheckLabels),
8282
Some(ex),
8383
pos,
8484
None,

0 commit comments

Comments
 (0)