10000 Merge pull request #5134 from dubinsky/JUnit-populate-sbt.testing.Eve… · scala-js/scala-js@e67a1a2 · GitHub
[go: up one dir, main page]

Skip to content

Commit e67a1a2

Browse files
authored
Merge pull request #5134 from dubinsky/JUnit-populate-sbt.testing.Event.duration
JUnit: populate sbt.testing.Event.duration
2 parents 9104f7d + 8220951 commit e67a1a2

File tree

457 files changed

+1000
-988
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

+1000
-988
lines changed

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ private[junit] final class Reporter(eventHandler: EventHandler,
3737

3838
def reportIgnored(method: Option[String]): Unit = {
3939
logTestInfo(_.info, method, "ignored")
40-
emitEvent(method, Status.Skipped)
40+
emitEvent(method, Status.Skipped, 0, None)
4141
}
4242

4343
def reportTestStarted(method: String): Unit =
@@ -47,7 +47,7 @@ private[junit] final class Reporter(eventHandler: EventHandler,
4747
logTestInfo(_.debug, Some(method), s"finished, took $timeInSeconds sec")
4848

4949
if (succeeded)
50-
emitEvent(Some(method), Status.Success)
50+
emitEvent(Some(method), Status.Success, timeInSeconds, None)
5151
}
5252

5353
def reportErrors(prefix: String, method: Option[String],
@@ -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, new OptionalThrowable(errors.head))
62+
emitEvent(method, Status.Failure, timeInSeconds, Some(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, new OptionalThrowable(e))
70+
emitEvent(method, Status.Skipped, timeInSeconds, Some(e))
7171
}
7272

7373
private def logTestInfo(level: Reporter.Level, method: Option[String], msg: String): Unit =
@@ -117,12 +117,15 @@ private[junit] final class Reporter(eventHandler: EventHandler,
117117
private def emitEvent(
118118
method: Option[String],
119119
status: Status,
120-
throwable: OptionalThrowable = new OptionalThrowable
120+
timeInSeconds: Double,
121+
throwable: Option[Throwable]
121122
): Unit = {
122123
val testName = method.fold(taskDef.fullyQualifiedName())(method =>
123124
taskDef.fullyQualifiedName() + "." + settings.decodeName(method))
124125
val selector = new TestSelector(testName)
125-
eventHandler.handle(new JUnitEvent(taskDef, status, selector, throwable))
126+
val optionalThrowable: OptionalThrowable = new OptionalThrowable(throwable.orNull)
127+
val duration: Long = (timeInSeconds*1000).toLong
128+
eventHandler.handle(new JUnitEvent(taskDef, status, selector, optionalThrowable, duration))
126129
}
127130

128131
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::java.lang.AssertionError: This is the message expected:<false> but was:<true>
4+
e2org.scalajs.junit.AssertEquals2Test.test::java.lang.AssertionError: This is the message expected:<false> but was:<true>::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::java.lang.AssertionError: This is the message expected:<false> but was:<true>
4+
e2org.scalajs.junit.AssertEquals2Test.test::java.lang.AssertionError: This is the message expected:<false> but was:<true>::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::java.lang.AssertionError: This is the message expected:<false> but was:<true>
4+
e2org.scalajs.junit.AssertEquals2Test.test::java.lang.AssertionError: This is the message expected:<false> but was:<true>::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::java.lang.AssertionError: This is the message expected:<false> but was:<true>
4+
e2org.scalajs.junit.AssertEquals2Test.test::java.lang.AssertionError: This is the message expected:<false> but was:<true>::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::java.lang.AssertionError: This is the message expected:<false> but was:<true>
4+
e2org.scalajs.junit.AssertEquals2Test.test::java.lang.AssertionError: This is the message expected:<false> but was:<true>::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::java.lang.AssertionError: This is the message expected:<false> but was:<true>
4+
e2org.scalajs.junit.AssertEquals2Test.test::java.lang.AssertionError: This is the message expected:<false> but was:<true>::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::java.lang.AssertionError: This is the message expected:<false> but was:<true>
4+
e2org.scalajs.junit.AssertEquals2Test.test::java.lang.AssertionError: This is the message expected:<false> but was:<true>::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::java.lang.AssertionError: This is the message expected:<false> but was:<true>
4+
e2org.scalajs.junit.AssertEquals2Test.test::java.lang.AssertionError: This is the message expected:<false> but was:<true>::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::java.lang.AssertionError: This is the message expected:<false> but was:<true>
4+
e2org.scalajs.junit.AssertEquals2Test.test::java.lang.AssertionError: This is the message expected:<false> but was:<true>::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::java.lang.AssertionError: This is the message expected:<false> but was:<true>
4+
e2org.scalajs.junit.AssertEquals2Test.test::java.lang.AssertionError: This is the message expected:<false> but was:<true>::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::java.lang.AssertionError: This is the message expected:<false> but was:<true>
4+
e2org.scalajs.junit.AssertEquals2Test.test::java.lang.AssertionError: This is the message expected:<false> but was:<true>::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::java.lang.AssertionError: This is the message expected:<false> but was:<true>
4+
e2org.scalajs.junit.AssertEquals2Test.test::java.lang.AssertionError: This is the message expected:<false> but was:<true>::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::java.lang.AssertionError: This is the message expected:<false> but was:<true>
4+
e2org.scalajs.junit.AssertEquals2Test.test::java.lang.AssertionError: This is the message expected:<false> but was:<true>::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::java.lang.AssertionError: Use assertEquals(expected, actual, delta) to compare floating-point numbers
4+
e2org.scalajs.junit.AssertEqualsDoubleTest.failsWithDouble::java.lang.AssertionError: Use assertEquals(expected, actual, delta) to compare floating-point numbers::true
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::java.lang.AssertionError: Use assertEquals(expected, actual, delta) to compare floating-point numbers
8+
e2org.scalajs.junit.AssertEqualsDoubleTest.failsWithDoubleMessage::java.lang.AssertionError: Use assertEquals(expected, actual, delta) to compare floating-point numbers::true
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::::true
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::::true
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::::true
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::::true
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::java.lang.AssertionError: Use assertEquals(expected, actual, delta) to compare floating-point numbers
4+
e2org.scalajs.junit.AssertEqualsDoubleTest.failsWithDouble::java.lang.AssertionError: Use assertEquals(expected, actual, delta) to compare floating-point numbers::true
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::java.lang.AssertionError: Use assertEquals(expected, actual, delta) to compare floating-point numbers
8+
e2org.scalajs.junit.AssertEqualsDoubleTest.failsWithDoubleMessage::java.lang.AssertionError: Use assertEquals(expected, actual, delta) to compare floating-point numbers::true
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::::true
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::::true
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::::true
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::::true
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::java.lang.AssertionError: Use assertEquals(expected, actual, delta) to compare floating-point numbers
4+
e2org.scalajs.junit.AssertEqualsDoubleTest.failsWithDouble::java.lang.AssertionError: Use assertEquals(expected, actual, delta) to compare floating-point numbers::true
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::java.lang.AssertionError: Use assertEquals(expected, actual, delta) to compare floating-point numbers
8+
e2org.scalajs.junit.AssertEqualsDoubleTest.failsWithDoubleMessage::java.lang.AssertionError: Use assertEquals(expected, actual, delta) to compare floating-point numbers::true
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::::true
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::::true
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::::true
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::::true
2222
ldTest run finished: 2 failed, 0 ignored, 6 total, <TIME>
2323
d

0 commit comments

Comments
 (0)
0