Skip to content

Commit 687f119

Browse files
committed
Removed deprecated API usages from formatter tests
1 parent 52836f1 commit 687f119

File tree

4 files changed

+13
-18
lines changed

4 files changed

+13
-18
lines changed

src/test/com/intellij/lang/jsgraphql/endpoint/JSGraphQLEndpointCodeInsightTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ protected String getTestDataPath() {
6767

6868
public void testFormatter() {
6969
myFixture.configureByFiles("FormatterTestData.graphqle");
70-
CodeStyle.getSettings(getProject()).KEEP_BLANK_LINES_IN_CODE = 2;
7170
WriteCommandAction.runWriteCommandAction(getProject(), () -> {
7271
CodeStyleManager.getInstance(getProject()).reformat(myFixture.getFile());
7372
});

src/test/com/intellij/lang/jsgraphql/formatter/GraphQLFormatterTest.java

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,27 @@
77
*/
88
package com.intellij.lang.jsgraphql.formatter;
99

10+
import com.intellij.lang.jsgraphql.GraphQLTestCaseBase;
1011
import com.intellij.openapi.command.WriteCommandAction;
1112
import com.intellij.psi.codeStyle.CodeStyleManager;
12-
import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
13-
import com.intellij.testFramework.fixtures.BasePlatformTestCase;
14-
import org.junit.internal.runners.JUnit38ClassRunner;
15-
import org.junit.runner.RunWith;
1613

17-
@RunWith(JUnit38ClassRunner.class) // TODO: drop the annotation when issue with Gradle test scanning go away
18-
public class GraphQLFormatterTest extends BasePlatformTestCase {
14+
public class GraphQLFormatterTest extends GraphQLTestCaseBase {
1915

2016
@Override
21-
protected String getTestDataPath() {
22-
return "test-resources/testData/graphql";
17+
protected String getBasePath() {
18+
return "/formatter";
2319
}
2420

2521
public void testFormatter() {
26-
myFixture.configureByFiles("FormatterTestData.graphql");
27-
CodeStyleSettingsManager.getSettings(getProject()).KEEP_BLANK_LINES_IN_CODE = 2;
28-
new WriteCommandAction.Simple(getProject()) {
29-
@Override
30-
protected void run() throws Throwable {
31-
CodeStyleManager.getInstance(getProject()).reformat(myFixture.getFile());
32-
}
33-
}.execute();
34-
myFixture.checkResultByFile("FormatterExpectedResult.graphql");
22+
doTest();
23+
}
24+
25+
private void doTest() {
26+
myFixture.configureByFiles(getTestName(false) + ".graphql");
27+
WriteCommandAction.runWriteCommandAction(getProject(), () -> {
28+
CodeStyleManager.getInstance(getProject()).reformat(myFixture.getFile());
29+
});
30+
myFixture.checkResultByFile(getTestName(false) + "_after.graphql");
3531
}
3632

3733
}

0 commit comments

Comments
 (0)