Parallel, lazy, without bugs Neo4j server bootstrap

FylmTM · FylmTM · commit 2c70b8a32f33 · 2016-11-28T19:05:19.000+02:00
diff --git a/testing/integration-neo4j/src/test/java/com/neueda/jetbrains/plugin/graphdb/test/integration/neo4j/tests/cypher/completion/StoredProcedureCompletionTest.java b/testing/integration-neo4j/src/test/java/com/neueda/jetbrains/plugin/graphdb/test/integration/neo4j/tests/cypher/completion/StoredProcedureCompletionTest.java
@@ -9,6 +9,12 @@
 
 public class StoredProcedureCompletionTest extends BaseCompletionTest {
 
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        dataSource().neo4j30();
+    }
+
     public void testContainsProceduresProcedure() throws Exception {
         myFixture.configureByText("test.cyp", "CALL <caret>");
         myFixture.completeBasic();
diff --git a/testing/integration-neo4j/src/test/java/com/neueda/jetbrains/plugin/graphdb/test/integration/neo4j/tests/cypher/completion/UserFunctionCompletionTest.java b/testing/integration-neo4j/src/test/java/com/neueda/jetbrains/plugin/graphdb/test/integration/neo4j/tests/cypher/completion/UserFunctionCompletionTest.java
@@ -9,6 +9,12 @@
 
 public class UserFunctionCompletionTest extends BaseCompletionTest {
 
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        dataSource().neo4j31();
+    }
+
     public void testContainsTestUserFunction() throws Exception {
         myFixture.configureByText("test.cyp", "RETURN testFunc<caret>");
         myFixture.completeBasic();
diff --git a/testing/integration-neo4j/src/test/java/com/neueda/jetbrains/plugin/graphdb/test/integration/neo4j/tests/cypher/util/BaseCompletionTest.java b/testing/integration-neo4j/src/test/java/com/neueda/jetbrains/plugin/graphdb/test/integration/neo4j/tests/cypher/util/BaseCompletionTest.java
@@ -5,7 +5,5 @@ public abstract class BaseCompletionTest extends BaseGenericTest {
     @Override
     public void setUp() throws Exception {
         super.setUp();
-
-        component().dataSources().refreshAllMetadata();
     }
 }
diff --git a/testing/integration-neo4j/src/test/java/com/neueda/jetbrains/plugin/graphdb/test/integration/neo4j/util/base/BaseIntegrationTest.java b/testing/integration-neo4j/src/test/java/com/neueda/jetbrains/plugin/graphdb/test/integration/neo4j/util/base/BaseIntegrationTest.java
@@ -1,14 +1,15 @@
 package com.neueda.jetbrains.plugin.graphdb.test.integration.neo4j.util.base;
 
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
+import com.intellij.openapi.components.ServiceManager;
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
 import com.neueda.jetbrains.plugin.graphdb.database.neo4j.bolt.Neo4jBoltConfiguration;
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.component.datasource.DataSourceType;
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.component.datasource.DataSourcesComponent;
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.component.datasource.metadata.DataSourcesComponentMetadata;
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.component.datasource.state.DataSourceApi;
+import com.neueda.jetbrains.plugin.graphdb.language.cypher.completion.metadata.CypherMetadataProviderService;
 import com.neueda.jetbrains.plugin.graphdb.test.database.neo4j.common.Neo4jServer;
 import com.neueda.jetbrains.plugin.graphdb.test.integration.neo4j.util.server.Neo4j30ServerLoader;
 import com.neueda.jetbrains.plugin.graphdb.test.integration.neo4j.util.server.Neo4j31ServerLoader;
@@ -20,31 +21,23 @@ public abstract class BaseIntegrationTest extends LightCodeInsightFixtureTestCas
 
     private Components components;
     private DataSources dataSources;
-    private DataSourceApi neo4j30DataSource;
-    private DataSourceApi neo4j31DataSource;
+    private Services services;
 
     @Override
     public void setUp() throws Exception {
         super.setUp();
         components = new Components();
         dataSources = new DataSources();
+        services = new Services();
 
-        neo4j30DataSource = component().dataSources()
-                   .getDataSourceContainer()
-                   .getDataSource(NEO4J30)
-                   .orElseGet(() -> {
-                       DataSourceApi dataSource = createDataSource(NEO4J30, Neo4j30ServerLoader.getInstance());
-                       component().dataSources().getDataSourceContainer().addDataSource(dataSource);
-                       return dataSource;
-                   });
-        neo4j31DataSource = component().dataSources()
-                   .getDataSourceContainer()
-                   .getDataSource(NEO4J31)
-                   .orElseGet(() -> {
-                       DataSourceApi dataSource = createDataSource(NEO4J31, Neo4j31ServerLoader.getInstance());
-                       component().dataSources().getDataSourceContainer().addDataSource(dataSource);
-                       return dataSource;
-                   });
+        // Clean up any data sources & their information
+        List<DataSourceApi> dataSources = new ArrayList<>(component().dataSources().getDataSourceContainer().getDataSources());
+        component().dataSources().getDataSourceContainer().removeDataSources(dataSources);
+        dataSources.forEach(dataSource -> services().cypherMetadataProvider().wipeContainer(dataSource.getName()));
+    }
+
+    public Services services() {
+        return services;
     }
 
     public Components component() {
@@ -70,6 +63,12 @@ private DataSourceApi createDataSource(String name, Neo4jServer neo4jServer) {
         );
     }
 
+    public final class Services {
+        public CypherMetadataProviderService cypherMetadataProvider() {
+            return ServiceManager.getService(getProject(), CypherMetadataProviderService.class);
+        }
+    }
+
     public final class Components {
         public DataSourcesComponent dataSources() {
             return getProject().getComponent(DataSourcesComponent.class);
@@ -80,12 +79,41 @@ public DataSourcesComponentMetadata dataSourcesMetadata() {
         }
     }
 
+    /**
+     * Lazily bootstrap Neo4j server and create data sources.
+     * Some tests might even don't need running Neo4j server!
+     */
     public final class DataSources {
+        private DataSourceApi neo4j30DataSource;
+        private DataSourceApi neo4j31DataSource;
+
         public DataSourceApi neo4j30() {
+            if (neo4j30DataSource == null) {
+                neo4j30DataSource = component().dataSources()
+                           .getDataSourceContainer()
+                           .getDataSource(NEO4J30)
+                           .orElseGet(() -> {
+                               DataSourceApi dataSource = createDataSource(NEO4J30, Neo4j30ServerLoader.getInstance());
+                               component().dataSources().getDataSourceContainer().addDataSource(dataSource);
+                               component().dataSources().refreshAllMetadata();
+                               return dataSource;
+                           });
+            }
             return neo4j30DataSource;
         }
 
         public DataSourceApi neo4j31() {
+            if (neo4j31DataSource == null) {
+                neo4j31DataSource = component().dataSources()
+                           .getDataSourceContainer()
+                           .getDataSource(NEO4J31)
+                           .orElseGet(() -> {
+                               DataSourceApi dataSource = createDataSource(NEO4J31, Neo4j31ServerLoader.getInstance());
+                               component().dataSources().getDataSourceContainer().addDataSource(dataSource);
+                               component().dataSources().refreshAllMetadata();
+                               return dataSource;
+                           });
+            }
             return neo4j31DataSource;
         }
     }
diff --git a/testing/integration-neo4j/src/test/java/com/neueda/jetbrains/plugin/graphdb/test/integration/neo4j/util/server/Neo4jServerLoader.java b/testing/integration-neo4j/src/test/java/com/neueda/jetbrains/plugin/graphdb/test/integration/neo4j/util/server/Neo4jServerLoader.java
@@ -18,6 +18,7 @@
 public abstract class Neo4jServerLoader implements Neo4jServer {
 
     private final ExecutorService executor;
+    private Future<Neo4jServer> neo4jServerFuture;
     private Neo4jServer neo4jServer;
 
     public Neo4jServerLoader() {
@@ -30,7 +31,7 @@ public Neo4jServerLoader() {
 
     @Override
     public void start() {
-        Future<Neo4jServer> future = executor.submit(() -> {
+        neo4jServerFuture = executor.submit(() -> {
             try {
                 // Initialize class loader
                 JarClassLoader jarClassLoader = new JarClassLoader();
@@ -46,43 +47,53 @@ public void start() {
                 // Start Neo4j server in separate thread
                 Neo4jServer neo4jServer = (Neo4jServer) factory.create(jarClassLoader, getNeo4jServerClass());
                 neo4jServer.start();
+
                 return neo4jServer;
             } catch (Exception e) {
                 e.printStackTrace();
                 return null;
             }
         });
-        try {
-            neo4jServer = future.get();
-        } catch (Exception e) {
-            Throwables.propagate(e);
-        }
-        if (neo4jServer == null) {
-            throw new IllegalStateException("Neo4j server should not be null");
-        }
-
-        cleanupNeo4jKnownHosts();
     }
 
     @Override
     public String getBoltHost() {
-        return neo4jServer.getBoltHost();
+        return getNeo4jServer().getBoltHost();
     }
 
     @Override
     public String getBoltPort() {
-        return neo4jServer.getBoltPort();
+        return getNeo4jServer().getBoltPort();
+    }
+
+    private synchronized Neo4jServer getNeo4jServer() {
+        if (neo4jServer == null) {
+            try {
+                neo4jServer = neo4jServerFuture.get();
+            } catch (Exception e) {
+                Throwables.propagate(e);
+            }
+            if (neo4jServer == null) {
+                throw new IllegalStateException("Neo4j server should not be null");
+            }
+
+            cleanupNeo4jKnownHosts(this);
+            return neo4jServer;
+        }
+
+        return neo4jServer;
     }
 
-    private void cleanupNeo4jKnownHosts() {
+    private static synchronized void cleanupNeo4jKnownHosts(Neo4jServerLoader neo4jServerLoader) {
         File hostsFile = Config.defaultConfig().trustStrategy().certFile();
         try {
             if (hostsFile.isFile()) {
                 List<String> lines = FileUtil.loadLines(hostsFile);
                 List<String> updatedLines = lines.stream()
-                           .filter((line) -> !line.startsWith(getBoltHost() + ":" + getBoltPort()))
+                           .filter((line) -> !line.startsWith(neo4jServerLoader.getBoltHost() + ":" + neo4jServerLoader.getBoltPort()))
+                           .filter((line) -> !line.isEmpty())
                            .collect(Collectors.toList());
-                FileUtil.writeToFile(hostsFile, String.join(System.lineSeparator(), updatedLines));
+                FileUtil.writeToFile(hostsFile, String.join(System.lineSeparator(), updatedLines) + System.lineSeparator());
             }
         } catch (Exception e) {
             Throwables.propagate(e);

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,5 @@ public abstract class BaseCompletionTest extends BaseGenericTest {`
`5`	`5`	`@Override`
`6`	`6`	`public void setUp() throws Exception {`
`7`	`7`	`super.setUp();`
`8`		`-`
`9`		`- component().dataSources().refreshAllMetadata();`
`10`	`8`	`}`
`11`	`9`	`}`