Some procedure completion test refactoring

Author: FylmTM

language/cypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/language/cypher/completion/providers/ProceduresCompletionProvider.java

@@ -1,5 +1,7 @@
 package com.neueda.jetbrains.plugin.graphdb.language.cypher.completion.providers;
 
+import org.jetbrains.annotations.NotNull;
+
 import com.intellij.codeInsight.completion.CompletionParameters;
 import com.intellij.codeInsight.completion.CompletionResultSet;
 import com.intellij.patterns.ElementPattern;
@@ -8,21 +10,20 @@
 import com.intellij.util.ProcessingContext;
 import com.neueda.jetbrains.plugin.graphdb.language.cypher.CypherLanguage;
 import com.neueda.jetbrains.plugin.graphdb.language.cypher.completion.metadata.elements.CypherElement;
-import org.jetbrains.annotations.NotNull;
 
 public final class ProceduresCompletionProvider extends BaseCompletionProvider {
     public static final ElementPattern<PsiElement> PATTERN = PlatformPatterns
-                   .psiElement()
-                   .withLanguage(CypherLanguage.INSTANCE);
+               .psiElement()
+               .withLanguage(CypherLanguage.INSTANCE);
 
     @Override
     protected void addCompletions(@NotNull CompletionParameters parameters,
                                   ProcessingContext context,
                                   @NotNull CompletionResultSet result) {
         withCypherMetadataProvider(parameters, (metadataProvider -> {
             metadataProvider.getProcedures().stream()
-                    .map(CypherElement::getLookupElement)
-                    .forEach(result::addElement);
+                       .map(CypherElement::getLookupElement)
+                       .forEach(result::addElement);
         }));
     }
 }

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

@@ -12,21 +12,23 @@ public class StoredProcedureCompletionTest extends BaseCompletionTest {
     @Override
     public void setUp() throws Exception {
         super.setUp();
-        dataSource().neo4j30();
+        addStoredProcedure("test.myProcedure", "()", null);
+        addStoredProcedure("some.anotherProcedure", "(signatureAnother)", null);
     }
 
     public void testContainsProceduresProcedure() throws Exception {
         myFixture.configureByText("test.cyp", "CALL <caret>");
         myFixture.completeBasic();
         List<String> strings = myFixture.getLookupElementStrings();
         assertThat(strings)
-                .contains("dbms.procedures");
+                   .contains("test.myProcedure")
+                   .contains("some.anotherProcedure");
     }
 
     public void testCompletionCaretAfterParentheses() throws Exception {
-        myFixture.configureByText("test.cyp", "CALL procedu<caret>");
+        myFixture.configureByText("test.cyp", "CALL myProce<caret>");
         myFixture.completeBasic();
-        myFixture.finishLookup(Lookup.REPLACE_SELECT_CHAR);
-        myFixture.checkResult("CALL dbms.procedures()<caret>");
+        myFixture.finishLookup(Lookup.NORMAL_SELECT_CHAR);
+        myFixture.checkResult("CALL test.myProcedure()<caret>");
     }
 }

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

@@ -1,9 +1,18 @@
 package com.neueda.jetbrains.plugin.graphdb.test.integration.neo4j.tests.cypher.util;
 
+import com.neueda.jetbrains.plugin.graphdb.language.cypher.completion.metadata.CypherMetadataContainer;
+
 public abstract class BaseCompletionTest extends BaseGenericTest {
 
+    protected CypherMetadataContainer metadata;
+
     @Override
     public void setUp() throws Exception {
         super.setUp();
+        metadata = services().cypherMetadataProvider().getContainer("documentationTest");
+    }
+
+    public void addStoredProcedure(String name, String signature, String description) {
+        metadata.addProcedure(name, signature, description);
     }
 }