diff options
author | Tor Norbye <tnorbye@google.com> | 2014-08-19 12:53:10 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2014-08-19 12:53:10 -0700 |
commit | 02cf98d65c798d368fcec43ed64a001d513bdd4f (patch) | |
tree | e39e210ab20917b7e5ffdce14a42f5747506eed0 /platform/smRunner/src/com/intellij/execution/testframework | |
parent | 2e5965e996aad62ab1338b09d54caaf99ff3dd6a (diff) | |
download | idea-02cf98d65c798d368fcec43ed64a001d513bdd4f.tar.gz |
Snapshot idea/138.1503 from git://git.jetbrains.org/idea/community.git
Change-Id: Ie01af1d8710ec0ff51d90301bda1a18b0b5c0faf
Diffstat (limited to 'platform/smRunner/src/com/intellij/execution/testframework')
2 files changed, 7 insertions, 2 deletions
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertor.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertor.java index 8532b9aa4084..b77acd9c03ee 100644 --- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertor.java +++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertor.java @@ -273,7 +273,11 @@ public class GeneralToSMTRunnerEventsConvertor extends GeneralTestEventsProcesso public void onTestFailure(@NotNull final TestFailedEvent testFailedEvent) { addToInvokeLater(new Runnable() { public void run() { - final String testName = ObjectUtils.assertNotNull(testFailedEvent.getName()); + final String testName = testFailedEvent.getName(); + if (testName == null) { + logProblem("No test name specified in " + testFailedEvent); + return; + } final String localizedMessage = testFailedEvent.getLocalizedFailureMessage(); final String stackTrace = testFailedEvent.getStacktrace(); final boolean isTestError = testFailedEvent.isTestError(); diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/states/SuiteInProgressState.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/states/SuiteInProgressState.java index d454ae03bf4c..5d4cf5472204 100644 --- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/states/SuiteInProgressState.java +++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/states/SuiteInProgressState.java @@ -18,6 +18,7 @@ package com.intellij.execution.testframework.sm.runner.states; import org.jetbrains.annotations.NotNull; import com.intellij.execution.testframework.sm.runner.SMTestProxy; +import java.util.ArrayList; import java.util.List; /** @@ -42,7 +43,7 @@ public class SuiteInProgressState extends TestInProgressState { } //Test suit fails if any of its tests fails - final List<? extends SMTestProxy> children = mySuiteProxy.getChildren(); + final List<? extends SMTestProxy> children = new ArrayList<SMTestProxy>(mySuiteProxy.getChildren()); for (SMTestProxy child : children) { if (child.isDefect()) { myDefectFound = true; |