From a16dc7a8e77e9a4296009975dc4fddcd6b08277e Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Fri, 22 Jun 2012 16:56:02 +0400 Subject: [PATCH] do print perforce logs when test fails --- .../testFramework/vcs/AbstractJunitVcsTestCase.java | 6 ++---- .../intellij/openapi/vcs/changes/ChangeListManagerImpl.java | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/platform/testFramework/testSrc/com/intellij/testFramework/vcs/AbstractJunitVcsTestCase.java b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/AbstractJunitVcsTestCase.java index 30a32b2a16c8..43e4666bf569 100644 --- a/platform/testFramework/testSrc/com/intellij/testFramework/vcs/AbstractJunitVcsTestCase.java +++ b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/AbstractJunitVcsTestCase.java @@ -20,12 +20,11 @@ import org.junit.rules.TestName; import org.junit.runner.Description; public abstract class AbstractJunitVcsTestCase extends AbstractVcsTestCase { - private boolean succeeded = true; @Rule public TestName name= new TestName(){ @Override protected void failed(Throwable e, Description description) { - succeeded = false; + AbstractJunitVcsTestCase.this.failed(e, description); } }; @@ -33,7 +32,6 @@ public abstract class AbstractJunitVcsTestCase extends AbstractVcsTestCase { return name.getMethodName(); } - public boolean isSucceeded() { - return succeeded; + protected void failed(Throwable e, Description description) { } } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java index da54363c1d5f..7cc08d423f3b 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java @@ -1442,9 +1442,10 @@ public class ChangeListManagerImpl extends ChangeListManagerEx implements Projec @TestOnly public static void printLog() { System.out.println(log); + System.out.flush(); } @TestOnly public static void log(Object o) { - log.append(o+"\n"); + log.append(o).append("\n"); } }