Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

StepwiseNestedSuiteExecution Async Support #2211

Merged
merged 3 commits into from Dec 17, 2022
Merged

StepwiseNestedSuiteExecution Async Support #2211

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d36e102
Adjusted code in StepwiseNestedSuiteExecution to work with async test.
cheeseng Dec 6, 2022
89610ea
Updated scaladoc in StepwiseNestedSuiteExecution.scala about passing …
cheeseng Dec 6, 2022
9b42d40
Added the missing 'sure' word in new scaladoc text in StepwiseNestedS…
cheeseng Dec 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 13 additions & 4 deletions jvm/core/src/main/scala/org/scalatest/StepwiseNestedSuiteExecution.scala
View file
Open in desktop
Expand Up @@ -28,7 +28,7 @@ import collection.mutable.ListBuffer
* Trait that causes the nested suites of any suite it is mixed into to be run sequentially even if
* a <a href="Distributor.html"><code>Distributor</code></a> is passed to <code>runNestedSuites</code>. This trait overrides the
* <code>runNestedSuites</code> method and fowards every parameter passed to it to a superclass invocation
* of <code>runNestedSuites</code>, except it always passes <code>None</code> for the <code>Distributor</code>.
* of <code>runNestedSuites</code>, and make the nested suites are run and completed one after one in order.
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that something is missing in this sentence, perhaps:

Suggested change
* of <code>runNestedSuites</code>, and make the nested suites are run and completed one after one in order.
* of <code>runNestedSuites</code>, and make sure the nested suites are run and completed one after one in order.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jespermbyskov You're right, I'll make correction, thanks for catching it! :)

* Mix in this trait into any suite whose nested suites need to be run sequentially even with the rest of the
* run is being executed concurrently.
*/
Expand Down Expand Up @@ -69,9 +69,18 @@ trait StepwiseNestedSuiteExecution extends SuiteMixin { thisSuite: Suite =>
val rawString = Resources.suiteCompletedNormally
val formatter = formatterForSuiteCompleted(nestedSuite)

val duration = System.currentTimeMillis - suiteStartTime
report(SuiteCompleted(tracker.nextOrdinal(), nestedSuite.suiteName, nestedSuite.suiteId, Some(suiteClassName), Some(duration), formatter, Some(TopOfClass(nestedSuite.getClass.getName)), nestedSuite.rerunner))
SucceededStatus
distributor match {
case Some(_) =>
status.withAfterEffect {
val duration = System.currentTimeMillis - suiteStartTime
report(SuiteCompleted(tracker.nextOrdinal(), nestedSuite.suiteName, nestedSuite.suiteId, Some(suiteClassName), Some(duration), formatter, Some(TopOfClass(nestedSuite.getClass.getName)), nestedSuite.rerunner))
}

case None =>
val duration = System.currentTimeMillis - suiteStartTime
report(SuiteCompleted(tracker.nextOrdinal(), nestedSuite.suiteName, nestedSuite.suiteId, Some(suiteClassName), Some(duration), formatter, Some(TopOfClass(nestedSuite.getClass.getName)), nestedSuite.rerunner))
}
status
}
catch {
case e: RuntimeException => {
Expand Down