From 13bfcb52473afe9bae4a4aaff6860731bd49a90c Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 27 Feb 2014 10:55:40 +0100 Subject: [PATCH] why does GroovyCompilerTest blink on TC? --- .../impl/TranslatingCompilerFilesMonitor.java | 2 +- .../groovy/compiler/GroovyCompilerTest.groovy | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/TranslatingCompilerFilesMonitor.java b/java/compiler/impl/src/com/intellij/compiler/impl/TranslatingCompilerFilesMonitor.java index a20c6975baa8..1bcff3f8bae6 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/TranslatingCompilerFilesMonitor.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/TranslatingCompilerFilesMonitor.java @@ -80,7 +80,7 @@ import java.util.concurrent.atomic.AtomicInteger; */ public class TranslatingCompilerFilesMonitor implements ApplicationComponent { private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.impl.TranslatingCompilerFilesMonitor"); - private static final boolean ourDebugMode = false; + public static boolean ourDebugMode = false; private static final FileAttribute ourSourceFileAttribute = new FileAttribute("_make_source_file_info_", 3); private static final FileAttribute ourOutputFileAttribute = new FileAttribute("_make_output_file_info_", 3); 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 da3963e9b7e1..25f1d2dc20fc 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy @@ -17,6 +17,7 @@ package org.jetbrains.plugins.groovy.compiler import com.intellij.compiler.CompilerConfiguration import com.intellij.compiler.CompilerConfigurationImpl +import com.intellij.compiler.impl.TranslatingCompilerFilesMonitor import com.intellij.compiler.server.BuildManager import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.PathManager @@ -41,6 +42,12 @@ public abstract class GroovyCompilerTest extends GroovyCompilerTestCase { addGroovyLibrary(myModule); } + @Override + protected void tearDown() throws Exception { + TranslatingCompilerFilesMonitor.ourDebugMode = false + super.tearDown() + } + public void testPlainGroovy() throws Throwable { myFixture.addFileToProject("A.groovy", "println '239'"); assertEmpty(make()); @@ -128,6 +135,8 @@ public abstract class GroovyCompilerTest extends GroovyCompilerTestCase { } public void testTransitiveJavaDependencyThroughGroovy() throws Throwable { + TranslatingCompilerFilesMonitor.ourDebugMode = true + myFixture.addClass("public class IFoo { void foo() {} }").getContainingFile().getVirtualFile(); myFixture.addFileToProject("Foo.groovy", "class Foo {\n" + " static IFoo f\n" + @@ -725,11 +734,11 @@ public class Main { ApplicationManager.application.runWriteAction { msg.virtualFile.delete(this) } def messages = make() - assert messages + assert messages def error = messages.find { it.message.contains('InvalidType') } assert error?.virtualFile assert groovyFile.classes[0] == GroovycStubGenerator.findClassByStub(project, error.virtualFile) - + } public void "test ignore groovy internal non-existent interface helper inner class"() {