Fix parsing tests

This commit is contained in:
Ilya Chernikov
2019-02-12 16:26:22 +01:00
parent 37e74e0949
commit 4d0261fc45
2 changed files with 8 additions and 9 deletions
@@ -31,6 +31,8 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.KtNodeTypes;
import org.jetbrains.kotlin.TestsCompilerError;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.script.ScriptDefinitionProvider;
import org.jetbrains.kotlin.scripting.legacy.CliScriptDefinitionProvider;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.testFramework.KtParsingTestCase;
@@ -137,6 +139,12 @@ public abstract class AbstractParsingTest extends KtParsingTestCase {
}
}
@Override
protected void setUp() throws Exception {
super.setUp();
getProject().registerService(ScriptDefinitionProvider.class, CliScriptDefinitionProvider.class);
}
@Override
protected void tearDown() throws Exception {
super.tearDown();
@@ -6,8 +6,6 @@
package org.jetbrains.kotlin.parsing;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.script.ScriptDefinitionProvider;
import org.jetbrains.kotlin.scripting.legacy.CliScriptDefinitionProvider;
import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.TargetBackend;
@@ -2475,13 +2473,6 @@ public class ParsingTestGenerated extends AbstractParsingTest {
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class Script extends AbstractParsingTest {
@Override
protected void setUp() throws Exception {
super.setUp();
getProject().registerService(ScriptDefinitionProvider.class, CliScriptDefinitionProvider.class);
}
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doParsingTest, TargetBackend.ANY, testDataFilePath);
}