Skip to content

Commit 85f5ef6

Browse files
committed
Test fix
1 parent bff69a8 commit 85f5ef6

File tree

1 file changed

+14
-7
lines changed
  • testing/integration-neo4j/src/test/java/com/neueda/jetbrains/plugin/graphdb/test/integration/neo4j/tests/cypher/formatting

1 file changed

+14
-7
lines changed

testing/integration-neo4j/src/test/java/com/neueda/jetbrains/plugin/graphdb/test/integration/neo4j/tests/cypher/formatting/CypherFormattingTest.java

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
import com.intellij.openapi.command.WriteCommandAction;
44
import com.intellij.psi.PsiFile;
55
import com.intellij.psi.codeStyle.CodeStyleManager;
6+
import com.intellij.psi.codeStyle.CodeStyleSettings;
67
import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
78
import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
9+
import com.neueda.jetbrains.plugin.graphdb.jetbrains.formatter.CypherCodeStyleSettings;
810
import com.neueda.jetbrains.plugin.graphdb.language.cypher.CypherLanguage;
911
import com.neueda.jetbrains.plugin.graphdb.test.integration.neo4j.util.base.BaseIntegrationTest;
1012

@@ -13,14 +15,17 @@
1315
public class CypherFormattingTest extends BaseIntegrationTest {
1416

1517
public void testFormatter() {
16-
PsiFile file = myFixture.addFileToProject("test.cypher", "match (a:Person)-[]-(b) return a,b;");
18+
PsiFile file = myFixture.addFileToProject("test.cypher",
19+
"match (a:Person{name:'Dmitry'})-[]-(b) where b.title='Neueda' return a,b;");
1720
myFixture.configureFromExistingVirtualFile(file.getVirtualFile());
1821

19-
CommonCodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject())
20-
.getCommonSettings(CypherLanguage.INSTANCE);
21-
settings.SPACE_AFTER_COLON = true;
22-
settings.SPACE_WITHIN_BRACKETS = true;
23-
settings.SPACE_AFTER_COMMA = true;
22+
CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject());
23+
CommonCodeStyleSettings commonSettings = settings.getCommonSettings(CypherLanguage.INSTANCE);
24+
CypherCodeStyleSettings customSettings = settings.getCustomSettings(CypherCodeStyleSettings.class);
25+
26+
customSettings.SPACE_AFTER_COLON = true;
27+
commonSettings.SPACE_WITHIN_BRACKETS = true;
28+
commonSettings.SPACE_AFTER_COMMA = true;
2429

2530
new WriteCommandAction.Simple(getProject()) {
2631
@Override
@@ -31,6 +36,8 @@ protected void run() throws Throwable {
3136
}
3237
}.execute();
3338

34-
myFixture.checkResult("match ( a: Person )-[]-( b ) return a, b;");
39+
myFixture.checkResult("match ( a: Person {name: 'Dmitry'} )-[]-( b )\n" +
40+
"where b.title = 'Neueda'\n" +
41+
"return a, b;");
3542
}
3643
}

0 commit comments

Comments
 (0)