diff options
Diffstat (limited to 'platform/smRunner/src/com/intellij')
2 files changed, 14 insertions, 3 deletions
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/GeneralTestEventsProcessor.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/GeneralTestEventsProcessor.java index 23145d52702f..a2f594d04cb2 100644 --- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/GeneralTestEventsProcessor.java +++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/GeneralTestEventsProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,7 @@ import com.intellij.openapi.Disposable; import com.intellij.openapi.application.Application; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.util.Condition; +import com.intellij.openapi.util.Conditions; import com.intellij.openapi.util.Key; import com.intellij.testIntegration.TestLocationProvider; import com.intellij.util.Processor; @@ -110,7 +111,7 @@ public abstract class GeneralTestEventsProcessor implements Disposable { } public Condition getDisposedCondition() { - return Condition.FALSE; + return Conditions.alwaysFalse(); } /** diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/states/TestComparisionFailedState.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/states/TestComparisionFailedState.java index 2d500115c038..461001d3b111 100644 --- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/states/TestComparisionFailedState.java +++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/states/TestComparisionFailedState.java @@ -30,7 +30,7 @@ import org.jetbrains.annotations.Nullable; /** * @author Roman.Chernyatchik */ -public class TestComparisionFailedState extends TestFailedState implements AbstractTestProxy.AssertEqualsDiffViewerProvider { +public class TestComparisionFailedState extends TestFailedState implements AbstractTestProxy.AssertEqualsMultiDiffViewProvider { private final String myErrorMsgPresentation; private final String myStacktracePresentation; private DiffHyperlink myHyperlink; @@ -77,4 +77,14 @@ public class TestComparisionFailedState extends TestFailedState implements Abstr public String getActual() { return myHyperlink.getRight(); } + + @Override + public void openMultiDiff(Project project, AbstractTestProxy.AssertEqualsDiffChain chain) { + myHyperlink.openMultiDiff(project, chain); + } + + @Override + public String getFilePath() { + return myHyperlink.getFilePath(); + } } |