Skip to content

Commit cf05126

Browse files
authored
Merge pull request #5132 from dubinsky/JUnit-populate-sbt.testing.Event.throwable-on-test-failure
JUnit: populate sbt.testing.Event.throwable on test failure
2 parents 28812dd + dbce9db commit cf05126

File tree

457 files changed

+1006
-987
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

457 files changed

+1006
-987
lines changed

junit-runtime/src/main/scala/org/scalajs/junit/Reporter.scala

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@ private[junit] final class Reporter(eventHandler: EventHandler,
5959

6060
if (errors.nonEmpty) {
6161
emit(errors.head)
62-
emitEvent(method, Status.Failure)
62+
emitEvent(method, Status.Failure, new OptionalThrowable(errors.head))
6363
errors.tail.foreach(emit)
6464
}
6565
}
6666

6767
def reportAssumptionViolation(method: Option[String], timeInSeconds: Double, e: Throwable): Unit = {
6868
logTestException(_.warn, "Test assumption in test ", method, e,
6969
timeInSeconds)
70-
emitEvent(method, Status.Skipped)
70+
emitEvent(method, Status.Skipped, new OptionalThrowable(e))
7171
}
7272

7373
private def logTestInfo(level: Reporter.Level, method: Option[String], msg: String): Unit =
@@ -114,11 +114,15 @@ private[junit] final class Reporter(eventHandler: EventHandler,
114114
prefix + Ansi.c(name, color)
115115
}
116116

117-
private def emitEvent(method: Option[String], status: Status): Unit = {
117+
private def emitEvent(
118+
method: Option[String],
119+
status: Status,
120+
throwable: OptionalThrowable = new OptionalThrowable
121+
): Unit = {
118122
val testName = method.fold(taskDef.fullyQualifiedName())(method =>
119123
taskDef.fullyQualifiedName() + "." + settings.decodeName(method))
120124
val selector = new TestSelector(testName)
121-
eventHandler.handle(new JUnitEvent(taskDef, status, selector))
125+
eventHandler.handle(new JUnitEvent(taskDef, status, selector, throwable))
122126
}
123127

124128
def log(level: Reporter.Level, s: String): Unit = {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ldTest run started
22
ldTest org.scalajs.junit.AssertEquals2Test.test started
33
leTest org.scalajs.junit.AssertEquals2Test.test failed: This is the message expected:<false> but was:<true>, took <TIME>
4-
e2org.scalajs.junit.AssertEquals2Test.test
4+
e2org.scalajs.junit.AssertEquals2Test.test::java.lang.AssertionError: This is the message expected:<false> but was:<true>
55
ldTest org.scalajs.junit.AssertEquals2Test.test finished, took <TIME>
66
ldTest run finished: 1 failed, 0 ignored, 1 total, <TIME>
77
d
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ldTest run started
22
ldTest org.scalajs.junit.AssertEquals2Test.test started
33
leTest org.scalajs.junit.AssertEquals2Test.test failed: java.lang.AssertionError: This is the message expected:<false> but was:<true>, took <TIME>
4-
e2org.scalajs.junit.AssertEquals2Test.test
4+
e2org.scalajs.junit.AssertEquals2Test.test::java.lang.AssertionError: This is the message expected:<false> but was:<true>
55
ldTest org.scalajs.junit.AssertEquals2Test.test finished, took <TIME>
66
ldTest run finished: 1 failed, 0 ignored, 1 total, <TIME>
77
d
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ldTest run started
22
ldTest org.scalajs.junit.AssertEquals2Test.test started
33
leTest org.scalajs.junit.AssertEquals2Test.test failed: This is the message expected:<false> but was:<true>, took <TIME>
4-
e2org.scalajs.junit.AssertEquals2Test.test
4+
e2org.scalajs.junit.AssertEquals2Test.test::java.lang.AssertionError: This is the message expected:<false> but was:<true>
55
ldTest org.scalajs.junit.AssertEquals2Test.test finished, took <TIME>
66
ldTest run finished: 1 failed, 0 ignored, 1 total, <TIME>
77
d
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ldTest run started
22
ldTest org.scalajs.junit.AssertEquals2Test.test started
33
leTest org.scalajs.junit.AssertEquals2Test.test failed: java.lang.AssertionError: This is the message expected:<false> but was:<true>, took <TIME>
4-
e2org.scalajs.junit.AssertEquals2Test.test
4+
e2org.scalajs.junit.AssertEquals2Test.test::java.lang.AssertionError: This is the message expected:<false> but was:<true>
55
ldTest org.scalajs.junit.AssertEquals2Test.test finished, took <TIME>
66
ldTest run finished: 1 failed, 0 ignored, 1 total, <TIME>
77
d
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
liTest run started
22
liTest org.scalajs.junit.AssertEquals2Test.test started
33
leTest org.scalajs.junit.AssertEquals2Test.test failed: This is the message expected:<false> but was:<true>, took <TIME>
4-
e2org.scalajs.junit.AssertEquals2Test.test
4+
e2org.scalajs.junit.AssertEquals2Test.test::java.lang.AssertionError: This is the message expected:<false> but was:<true>
55
ldTest org.scalajs.junit.AssertEquals2Test.test finished, took <TIME>
66
liTest run finished: 1 failed, 0 ignored, 1 total, <TIME>
77
d
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
liTest run started
22
liTest org.scalajs.junit.AssertEquals2Test.test started
33
leTest org.scalajs.junit.AssertEquals2Test.test failed: java.lang.AssertionError: This is the message expected:<false> but was:<true>, took <TIME>
4-
e2org.scalajs.junit.AssertEquals2Test.test
4+
e2org.scalajs.junit.AssertEquals2Test.test::java.lang.AssertionError: This is the message expected:<false> but was:<true>
55
ldTest org.scalajs.junit.AssertEquals2Test.test finished, took <TIME>
66
liTest run finished: 1 failed, 0 ignored, 1 total, <TIME>
77
d
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
liTest run started
22
liTest org.scalajs.junit.AssertEquals2Test.test started
33
leTest org.scalajs.junit.AssertEquals2Test.test failed: This is the message expected:<false> but was:<true>, took <TIME>
4-
e2org.scalajs.junit.AssertEquals2Test.test
4+
e2org.scalajs.junit.AssertEquals2Test.test::java.lang.AssertionError: This is the message expected:<false> but was:<true>
55
ldTest org.scalajs.junit.AssertEquals2Test.test finished, took <TIME>
66
liTest run finished: 1 failed, 0 ignored, 1 total, <TIME>
77
d
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
liTest run started
22
liTest org.scalajs.junit.AssertEquals2Test.test started
33
leTest org.scalajs.junit.AssertEquals2Test.test failed: This is the message expected:<false> but was:<true>, took <TIME>
4-
e2org.scalajs.junit.AssertEquals2Test.test
4+
e2org.scalajs.junit.AssertEquals2Test.test::java.lang.AssertionError: This is the message expected:<false> but was:<true>
55
ldTest org.scalajs.junit.AssertEquals2Test.test finished, took <TIME>
66
liTest run finished: 1 failed, 0 ignored, 1 total, <TIME>
77
d
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
liTest run started
22
liTest org.scalajs.junit.AssertEquals2Test.test started
33
leTest org.scalajs.junit.AssertEquals2Test.test failed: This is the message expected:<false> but was:<true>, took <TIME>
4-
e2org.scalajs.junit.AssertEquals2Test.test
4+
e2org.scalajs.junit.AssertEquals2Test.test::java.lang.AssertionError: This is the message expected:<false> but was:<true>
55
ldTest org.scalajs.junit.AssertEquals2Test.test finished, took <TIME>
66
liTest run finished: 1 failed, 0 ignored, 1 total, <TIME>
77
d
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
liTest run started
22
liTest org.scalajs.junit.AssertEquals2Test.test started
33
leTest org.scalajs.junit.AssertEquals2Test.test failed: java.lang.AssertionError: This is the message expected:<false> but was:<true>, took <TIME>
4-
e2org.scalajs.junit.AssertEquals2Test.test
4+
e2org.scalajs.junit.AssertEquals2Test.test::java.lang.AssertionError: This is the message expected:<false> but was:<true>
55
ldTest org.scalajs.junit.AssertEquals2Test.test finished, took <TIME>
66
liTest run finished: 1 failed, 0 ignored, 1 total, <TIME>
77
d
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
liTest run started
22
liTest org.scalajs.junit.AssertEquals2Test.test started
33
leTest org.scalajs.junit.AssertEquals2Test.test failed: This is the message expected:<false> but was:<true>, took <TIME>
4-
e2org.scalajs.junit.AssertEquals2Test.test
4+
e2org.scalajs.junit.AssertEquals2Test.test::java.lang.AssertionError: This is the message expected:<false> but was:<true>
55
ldTest org.scalajs.junit.AssertEquals2Test.test finished, took <TIME>
66
liTest run finished: 1 failed, 0 ignored, 1 total, <TIME>
77
d
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
liTest run started
22
liTest org.scalajs.junit.AssertEquals2Test.test started
33
leTest org.scalajs.junit.AssertEquals2Test.test failed: This is the message expected:<false> but was:<true>, took <TIME>
4-
e2org.scalajs.junit.AssertEquals2Test.test
4+
e2org.scalajs.junit.AssertEquals2Test.test::java.lang.AssertionError: This is the message expected:<false> but was:<true>
55
ldTest org.scalajs.junit.AssertEquals2Test.test finished, took <TIME>
66
liTest run finished: 1 failed, 0 ignored, 1 total, <TIME>
77
d
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
liTest run started
22
liTest org.scalajs.junit.AssertEquals2Test.test started
33
leTest org.scalajs.junit.AssertEquals2Test.test failed: This is the message expected:<false> but was:<true>, took <TIME>
4-
e2org.scalajs.junit.AssertEquals2Test.test
4+
e2org.scalajs.junit.AssertEquals2Test.test::java.lang.AssertionError: This is the message expected:<false> but was:<true>
55
ldTest org.scalajs.junit.AssertEquals2Test.test finished, took <TIME>
66
liTest run finished: 1 failed, 0 ignored, 1 total, <TIME>
77
d
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
ldTest run started
22
ldTest org.scalajs.junit.AssertEqualsDoubleTest.failsWithDouble started
33
leTest org.scalajs.junit.AssertEqualsDoubleTest.failsWithDouble failed: Use assertEquals(expected, actual, delta) to compare floating-point numbers, took <TIME>
4-
e2org.scalajs.junit.AssertEqualsDoubleTest.failsWithDouble
4+
e2org.scalajs.junit.AssertEqualsDoubleTest.failsWithDouble::java.lang.AssertionError: Use assertEquals(expected, actual, delta) to compare floating-point numbers
55
ldTest org.scalajs.junit.AssertEqualsDoubleTest.failsWithDouble finished, took <TIME>
66
ldTest org.scalajs.junit.AssertEqualsDoubleTest.failsWithDoubleMessage started
77
leTest org.scalajs.junit.AssertEqualsDoubleTest.failsWithDoubleMessage failed: Use assertEquals(expected, actual, delta) to compare floating-point numbers, took <TIME>
8-
e2org.scalajs.junit.AssertEqualsDoubleTest.failsWithDoubleMessage
8+
e2org.scalajs.junit.AssertEqualsDoubleTest.failsWithDoubleMessage::java.lang.AssertionError: Use assertEquals(expected, actual, delta) to compare floating-point numbers
99
ldTest org.scalajs.junit.AssertEqualsDoubleTest.failsWithDoubleMessage finished, took <TIME>
1010
ldTest org.scalajs.junit.AssertEqualsDoubleTest.worksWithByte started
1111
ldTest org.scalajs.junit.AssertEqualsDoubleTest.worksWithByte finished, took <TIME>
12-
e0org.scalajs.junit.AssertEqualsDoubleTest.worksWithByte
12+
e0org.scalajs.junit.AssertEqualsDoubleTest.worksWithByte::
1313
ldTest org.scalajs.junit.AssertEqualsDoubleTest.worksWithEpsilon started
1414
ldTest org.scalajs.junit.AssertEqualsDoubleTest.worksWithEpsilon finished, took <TIME>
15-
e0org.scalajs.junit.AssertEqualsDoubleTest.worksWithEpsilon
15+
e0org.scalajs.junit.AssertEqualsDoubleTest.worksWithEpsilon::
1616
ldTest org.scalajs.junit.AssertEqualsDoubleTest.worksWithInt started
1717
ldTest org.scalajs.junit.AssertEqualsDoubleTest.worksWithInt finished, took <TIME>
18-
e0org.scalajs.junit.AssertEqualsDoubleTest.worksWithInt
18+
e0org.scalajs.junit.AssertEqualsDoubleTest.worksWithInt::
1919
ldTest org.scalajs.junit.AssertEqualsDoubleTest.worksWithShort started
2020
ldTest org.scalajs.junit.AssertEqualsDoubleTest.worksWithShort finished, took <TIME>
21-
e0org.scalajs.junit.AssertEqualsDoubleTest.worksWithShort
21+
e0org.scalajs.junit.AssertEqualsDoubleTest.worksWithShort::
2222
ldTest run finished: 2 failed, 0 ignored, 6 total, <TIME>
2323
d
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
ldTest run started
22
ldTest org.scalajs.junit.AssertEqualsDoubleTest.failsWithDouble started
33
leTest org.scalajs.junit.AssertEqualsDoubleTest.failsWithDouble failed: java.lang.AssertionError: Use assertEquals(expected, actual, delta) to compare floating-point numbers, took <TIME>
4-
e2org.scalajs.junit.AssertEqualsDoubleTest.failsWithDouble
4+
e2org.scalajs.junit.AssertEqualsDoubleTest.failsWithDouble::java.lang.AssertionError: Use assertEquals(expected, actual, delta) to compare floating-point numbers
55
ldTest org.scalajs.junit.AssertEqualsDoubleTest.failsWithDouble finished, took <TIME>
66
ldTest org.scalajs.junit.AssertEqualsDoubleTest.failsWithDoubleMessage started
77
leTest org.scalajs.junit.AssertEqualsDoubleTest.failsWithDoubleMessage failed: java.lang.AssertionError: Use assertEquals(expected, actual, delta) to compare floating-point numbers, took <TIME>
8-
e2org.scalajs.junit.AssertEqualsDoubleTest.failsWithDoubleMessage
8+
e2org.scalajs.junit.AssertEqualsDoubleTest.failsWithDoubleMessage::java.lang.AssertionError: Use assertEquals(expected, actual, delta) to compare floating-point numbers
99
ldTest org.scalajs.junit.AssertEqualsDoubleTest.failsWithDoubleMessage finished, took <TIME>
1010
ldTest org.scalajs.junit.AssertEqualsDoubleTest.worksWithByte started
1111
ldTest org.scalajs.junit.AssertEqualsDoubleTest.worksWithByte finished, took <TIME>
12-
e0org.scalajs.junit.AssertEqualsDoubleTest.worksWithByte
12+
e0org.scalajs.junit.AssertEqualsDoubleTest.worksWithByte::
1313
ldTest org.scalajs.junit.AssertEqualsDoubleTest.worksWithEpsilon started
1414
ldTest org.scalajs.junit.AssertEqualsDoubleTest.worksWithEpsilon finished, took <TIME>
15-
e0org.scalajs.junit.AssertEqualsDoubleTest.worksWithEpsilon
15+
e0org.scalajs.junit.AssertEqualsDoubleTest.worksWithEpsilon::
1616
ldTest org.scalajs.junit.AssertEqualsDoubleTest.worksWithInt started
1717
ldTest org.scalajs.junit.AssertEqualsDoubleTest.worksWithInt finished, took <TIME>
18-
e0org.scalajs.junit.AssertEqualsDoubleTest.worksWithInt
18+
e0org.scalajs.junit.AssertEqualsDoubleTest.worksWithInt::
1919
ldTest org.scalajs.junit.AssertEqualsDoubleTest.worksWithShort started
2020
ldTest org.scalajs.junit.AssertEqualsDoubleTest.worksWithShort finished, took <TIME>
21-
e0org.scalajs.junit.AssertEqualsDoubleTest.worksWithShort
21+
e0org.scalajs.junit.AssertEqualsDoubleTest.worksWithShort::
2222
ldTest run finished: 2 failed, 0 ignored, 6 total, <TIME>
2323
d
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
ldTest run started
22
ldTest org.scalajs.junit.AssertEqualsDoubleTest.failsWithDouble started
33
leTest org.scalajs.junit.AssertEqualsDoubleTest.failsWithDouble failed: Use assertEquals(expected, actual, delta) to compare floating-point numbers, took <TIME>
4-
e2org.scalajs.junit.AssertEqualsDoubleTest.failsWithDouble
4+
e2org.scalajs.junit.AssertEqualsDoubleTest.failsWithDouble::java.lang.AssertionError: Use assertEquals(expected, actual, delta) to compare floating-point numbers
55
ldTest org.scalajs.junit.AssertEqualsDoubleTest.failsWithDouble finished, took <TIME>
66
ldTest org.scalajs.junit.AssertEqualsDoubleTest.failsWithDoubleMessage started
77
leTest org.scalajs.junit.AssertEqualsDoubleTest.failsWithDoubleMessage failed: Use assertEquals(expected, actual, delta) to compare floating-point numbers, took <TIME>
8-
e2org.scalajs.junit.AssertEqualsDoubleTest.failsWithDoubleMessage
8+
e2org.scalajs.junit.AssertEqualsDoubleTest.failsWithDoubleMessage::java.lang.AssertionError: Use assertEquals(expected, actual, delta) to compare floating-point numbers
99
ldTest org.scalajs.junit.AssertEqualsDoubleTest.failsWithDoubleMessage finished, took <TIME>
1010
ldTest org.scalajs.junit.AssertEqualsDoubleTest.worksWithByte started
1111
ldTest org.scalajs.junit.AssertEqualsDoubleTest.worksWithByte finished, took <TIME>
12-
e0org.scalajs.junit.AssertEqualsDoubleTest.worksWithByte
12+
e0org.scalajs.junit.AssertEqualsDoubleTest.worksWithByte::
1313
ldTest org.scalajs.junit.AssertEqualsDoubleTest.worksWithEpsilon started
1414
ldTest org.scalajs.junit.AssertEqualsDoubleTest.worksWithEpsilon finished, took <TIME>
15-
e0org.scalajs.junit.AssertEqualsDoubleTest.worksWithEpsilon
15+
e0org.scalajs.junit.AssertEqualsDoubleTest.worksWithEpsilon::
1616
ldTest org.scalajs.junit.AssertEqualsDoubleTest.worksWithInt started
1717
ldTest org.scalajs.junit.AssertEqualsDoubleTest.worksWithInt finished, took <TIME>
18-
e0org.scalajs.junit.AssertEqualsDoubleTest.worksWithInt
18+
e0org.scalajs.junit.AssertEqualsDoubleTest.worksWithInt::
1919
ldTest org.scalajs.junit.AssertEqualsDoubleTest.worksWithShort started
2020
ldTest org.scalajs.junit.AssertEqualsDoubleTest.worksWithShort finished, took <TIME>
21-
e0org.scalajs.junit.AssertEqualsDoubleTest.worksWithShort
21+
e0org.scalajs.junit.AssertEqualsDoubleTest.worksWithShort::
2222
ldTest run finished: 2 failed, 0 ignored, 6 total, <TIME>
2323
d
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
ldTest run started
22
ldTest org.scalajs.junit.AssertEqualsDoubleTest.failsWithDouble started
33
leTest org.scalajs.junit.AssertEqualsDoubleTest.failsWithDouble failed: java.lang.AssertionError: Use assertEquals(expected, actual, delta) to compare floating-point numbers, took <TIME>
4-
e2org.scalajs.junit.AssertEqualsDoubleTest.failsWithDouble
4+
e2org.scalajs.junit.AssertEqualsDoubleTest.failsWithDouble::java.lang.AssertionError: Use assertEquals(expected, actual, delta) to compare floating-point numbers
55
ldTest org.scalajs.junit.AssertEqualsDoubleTest.failsWithDouble finished, took <TIME>
66
ldTest org.scalajs.junit.AssertEqualsDoubleTest.failsWithDoubleMessage started
77
leTest org.scalajs.junit.AssertEqualsDoubleTest.failsWithDoubleMessage failed: java.lang.AssertionError: Use assertEquals(expected, actual, delta) to compare floating-point numbers, took <TIME>
8-
e2org.scalajs.junit.AssertEqualsDoubleTest.failsWithDoubleMessage
8+
e2org.scalajs.junit.AssertEqualsDoubleTest.failsWithDoubleMessage::java.lang.AssertionError: Use assertEquals(expected, actual, delta) to compare floating-point numbers
99
ldTest org.scalajs.junit.AssertEqualsDoubleTest.failsWithDoubleMessage finished, took <TIME>
1010
ldTest org.scalajs.junit.AssertEqualsDoubleTest.worksWithByte started
1111
ldTest org.scalajs.junit.AssertEqualsDoubleTest.worksWithByte finished, took <TIME>
12-
e0org.scalajs.junit.AssertEqualsDoubleTest.worksWithByte
12+
e0org.scalajs.junit.AssertEqualsDoubleTest.worksWithByte::
1313
ldTest org.scalajs.junit.AssertEqualsDoubleTest.worksWithEpsilon started
1414
ldTest org.scalajs.junit.AssertEqualsDoubleTest.worksWithEpsilon finished, took <TIME>
15-
e0org.scalajs.junit.AssertEqualsDoubleTest.worksWithEpsilon
15+
e0org.scalajs.junit.AssertEqualsDoubleTest.worksWithEpsilon::
1616
ldTest org.scalajs.junit.AssertEqualsDoubleTest.worksWithInt started
1717
ldTest org.scalajs.junit.AssertEqualsDoubleTest.worksWithInt finished, took <TIME>
18-
e0org.scalajs.junit.AssertEqualsDoubleTest.worksWithInt
18+
e0org.scalajs.junit.AssertEqualsDoubleTest.worksWithInt::
1919
ldTest org.scalajs.junit.AssertEqualsDoubleTest.worksWithShort started
2020
ldTest org.scalajs.junit.AssertEqualsDoubleTest.worksWithShort finished, took <TIME>
21-
e0org.scalajs.junit.AssertEqualsDoubleTest.worksWithShort
21+
e0org.scalajs.junit.AssertEqualsDoubleTest.worksWithShort::
2222
ldTest run finished: 2 failed, 0 ignored, 6 total, <TIME>
2323
d

0 commit comments

Comments
 (0)