From 825a1944292e8d1d29634299dba4d8c963cbe7e0 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 28 Jan 2015 15:10:42 +0300 Subject: [PATCH] Temp workaround for build test failed when parser tests are executed first --- .../parsing/AbstractJetParsingTest.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/compiler/tests/org/jetbrains/kotlin/parsing/AbstractJetParsingTest.java b/compiler/tests/org/jetbrains/kotlin/parsing/AbstractJetParsingTest.java index fed49c37a82..ebcd9ad71b6 100644 --- a/compiler/tests/org/jetbrains/kotlin/parsing/AbstractJetParsingTest.java +++ b/compiler/tests/org/jetbrains/kotlin/parsing/AbstractJetParsingTest.java @@ -16,6 +16,9 @@ package org.jetbrains.kotlin.parsing; +import com.intellij.openapi.fileTypes.FileTypeManager; +import com.intellij.openapi.fileTypes.FileTypeRegistry; +import com.intellij.openapi.util.Getter; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.FileUtilRt; import com.intellij.psi.PsiErrorElement; @@ -128,4 +131,21 @@ public abstract class AbstractJetParsingTest extends ParsingTestCase { return createPsiFile(FileUtil.getNameWithoutExtension(PathUtil.getFileName(filePath)), loadFile(filePath)); } } + + @Override + protected void tearDown() throws Exception { + super.tearDown(); + + // Temp workaround for setting FileTypeRegistry.ourInstanceGetter to CoreFileTypeRegistry forever + // Reproducible with pattern test kind: + // org.jetbrains.kotlin.parsing.JetParsingTestGenerated$Psi||org.jetbrains.kotlin.codegen.TestlibTest||org.jetbrains.kotlin.completion.MultiFileJvmBasicCompletionTestGenerated + + //noinspection AssignmentToStaticFieldFromInstanceMethod + FileTypeRegistry.ourInstanceGetter = new Getter() { + @Override + public FileTypeRegistry get() { + return FileTypeManager.getInstance(); + } + }; + } }