From 844ea256d72263672ccefcfecdd840a2f21b8764 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Fri, 12 Oct 2012 15:07:44 +0200
Subject: [PATCH] logging all compiler messages in test mode

---
 .../compiler/impl/CompileContextImpl.java     |  4 ++++
 .../server/BuildMessageDispatcher.java        |  3 +++
 .../jetbrains/jps/cmdline/BuildSession.java   |  3 +++
 .../groovy/compiler/GroovyCompilerTest.groovy | 24 +++++++++----------
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompileContextImpl.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompileContextImpl.java
index a06185b67d71..081d06f42e4e 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/CompileContextImpl.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompileContextImpl.java
@@ -263,6 +263,10 @@ public class CompileContextImpl extends UserDataHolderBase implements CompileCon
   }
 
   public void addMessage(CompilerMessage msg) {
+    if (ApplicationManager.getApplication().isUnitTestMode()) {
+      LOG.info("addMessage: " + msg);
+    }
+
     Collection<CompilerMessage> messages = myMessages.get(msg.getCategory());
     if (messages == null) {
       messages = new LinkedHashSet<CompilerMessage>();
diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuildMessageDispatcher.java b/java/compiler/impl/src/com/intellij/compiler/server/BuildMessageDispatcher.java
index 5b089127a738..b17cdbd7692a 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/BuildMessageDispatcher.java
+++ b/java/compiler/impl/src/com/intellij/compiler/server/BuildMessageDispatcher.java
@@ -125,6 +125,9 @@ class BuildMessageDispatcher extends SimpleChannelHandler {
           }
         }
         else {
+          if (ApplicationManager.getApplication().isUnitTestMode()) {
+            LOG.info("messageReceived: " + builderMessage);
+          }
           handler.handleBuildMessage(ctx.getChannel(), sessionId, builderMessage);
         }
         break;
diff --git a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java
index 73995ab4d56b..7b0fc8862085 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java
@@ -109,6 +109,9 @@ final class BuildSession implements Runnable, CanceledStatus {
             if (kind == BuildMessage.Kind.ERROR) {
               hasErrors.set(true);
             }
+            if (Utils.IS_TEST_MODE) {
+              LOG.info("Processing message: " + buildMessage);
+            }
             response = CmdlineProtoUtil.createCompileMessage(
               kind, text, compilerMessage.getSourcePath(),
               compilerMessage.getProblemBeginOffset(), compilerMessage.getProblemEndOffset(),
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy
index 639497debea8..0f800a6a5159 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy
@@ -207,26 +207,26 @@ public abstract class GroovyCompilerTest extends GroovyCompilerTestCase {
   }
 
   @Override
-  void runTest() {
-    def ideaLog = new File(TestLoggerFactory.testLogDir, "idea.log")
-    def makeLog = new File(PathManager.systemPath, "compile-server/server.log")
-    if (ideaLog.exists()) {
-      FileUtil.delete(ideaLog)
-    }
-    if (makeLog.exists()) {
-      FileUtil.delete(makeLog)
-    }
+  void runBare() {
+    new File(TestLoggerFactory.testLogDir, "idea.log").delete()
+    new File(PathManager.systemPath, "compile-server/server.log").delete()
+    super.runBare()
+  }
 
+  @Override
+  void runTest() {
     try {
       super.runTest()
     }
     catch (Throwable e) {
+      def ideaLog = new File(TestLoggerFactory.testLogDir, "idea.log")
       if (ideaLog.exists()) {
-        //println "Idea Log:"
-        //println ideaLog.text
+        println "\n\nIdea Log:"
+        println ideaLog.text
       }
+      def makeLog = new File(PathManager.systemPath, "compile-server/server.log")
       if (makeLog.exists()) {
-        println "Server Log:"
+        println "\n\nServer Log:"
         println makeLog.text
       }
       throw e