azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rewrite JetPsiChecker test to fixture

Browse Source
This commit is contained in:
Alexander Udalov
2014-02-11 20:07:22 +04:00
parent 6acce0f930
commit 18a50fd8e7
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/jet/checkers/AbstractJetPsiCheckerTest.java
+15 -15
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2013 JetBrains s.r.o. * Copyright 2010-2014 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -16,23 +16,28 @@
package org.jetbrains.jet.checkers; package org.jetbrains.jet.checkers;
import com.intellij.codeInsight.daemon.LightDaemonAnalyzerTestCase;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.spellchecker.inspections.SpellCheckingInspection; import com.intellij.spellchecker.inspections.SpellCheckingInspection;
import com.intellij.testFramework.LightProjectDescriptor;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase;
import org.jetbrains.jet.plugin.JetLightProjectDescriptor;
import org.jetbrains.jet.plugin.highlighter.JetPsiChecker; import org.jetbrains.jet.plugin.highlighter.JetPsiChecker;
public abstract class AbstractJetPsiCheckerTest extends LightDaemonAnalyzerTestCase { public abstract class AbstractJetPsiCheckerTest extends JetLightCodeInsightFixtureTestCase {
public void doTest(@NotNull String filePath) throws Exception { public void doTest(@NotNull String filePath) throws Exception {
doTest(filePath, true, false); myFixture.configureByFile(filePath);
myFixture.checkHighlighting(true, false, false);
} }
public void doTestWithInfos(@NotNull String filePath) throws Exception { public void doTestWithInfos(@NotNull String filePath) throws Exception {
try { try {
enableInspectionTool(new SpellCheckingInspection()); myFixture.configureByFile(filePath);
//noinspection unchecked
myFixture.enableInspections(SpellCheckingInspection.class);
JetPsiChecker.setNamesHighlightingEnabled(false); JetPsiChecker.setNamesHighlightingEnabled(false);
doTest(filePath, true, true); myFixture.checkHighlighting(true, true, false);
} }
finally { finally {
JetPsiChecker.setNamesHighlightingEnabled(true); JetPsiChecker.setNamesHighlightingEnabled(true);
@@ -41,12 +46,7 @@ public abstract class AbstractJetPsiCheckerTest extends LightDaemonAnalyzerTestC
@NotNull @NotNull
@Override @Override
protected String getTestDataPath() { protected LightProjectDescriptor getProjectDescriptor() {
return ""; return JetLightProjectDescriptor.INSTANCE;
}
@Override
protected Sdk getProjectJDK() {
return PluginTestCaseBase.jdkFromIdeaHome();
} }
} }