fixing port conflicts

neo4j · Sep 26, 2017 · 6361825 · 6361825
1 parent f885fb6
commit 6361825
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 18 deletions.
diff --git a/packaging/neo4j-desktop/pom.xml b/packaging/neo4j-desktop/pom.xml
@@ -70,6 +70,13 @@
       <artifactId>neo4j-kernel</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.neo4j</groupId>
+      <artifactId>neo4j-common</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/.../desktop/runtime/DatabaseActionsTest.java → ...4j/desktop/runtime/DatabaseActionsIT.java b/.../desktop/runtime/DatabaseActionsTest.java → ...4j/desktop/runtime/DatabaseActionsIT.java
@@ -31,22 +31,44 @@
 import org.neo4j.desktop.Parameters;
 import org.neo4j.desktop.config.Installation;
 import org.neo4j.desktop.model.DesktopModel;
+import org.neo4j.kernel.configuration.BoltConnector;
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.configuration.HttpConnector;
+import org.neo4j.ports.allocation.PortAuthority;
 import org.neo4j.test.rule.TestDirectory;
 
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class DatabaseActionsTest
+public class DatabaseActionsIT
 {
     @Rule
     public TestDirectory testDirectory = TestDirectory.testDirectory();
 
     private File storeDir;
     private File configFile;
 
+    @Before
+    public void createFiles() throws IOException
+    {
+        storeDir = new File( testDirectory.directory(), "store_dir" );
+        storeDir.mkdirs();
+
+        configFile = new File( testDirectory.directory(), Config.DEFAULT_CONFIG_FILE_NAME );
+        Properties props = new Properties();
+        props.setProperty( new HttpConnector( "http" ).type.name(), "HTTP" );
+        props.setProperty( new HttpConnector( "http" ).encryption.name(), "NONE" );
+        props.setProperty( new HttpConnector( "http" ).enabled.name(), "true" );
+
+        props.setProperty( new BoltConnector( "bolt" ).listen_address.name(), "localhost:" + PortAuthority.allocatePort() );
+
+        try ( FileWriter writer = new FileWriter( configFile ) )
+        {
+            props.store( writer, "" );
+        }
+    }
+
     @Test
     public void shouldCreateMessagesLogBelowStoreDir() throws Exception
     {
@@ -73,21 +95,4 @@ public void shouldCreateMessagesLogBelowStoreDir() throws Exception
             databaseActions.stop(); // do not need to wait for the server to finish all its start procedure
         }
     }
-
-    @Before
-    public void createFiles() throws IOException
-    {
-        storeDir = new File( testDirectory.directory(), "store_dir" );
-        storeDir.mkdirs();
-
-        configFile = new File( testDirectory.directory(), Config.DEFAULT_CONFIG_FILE_NAME );
-        Properties props = new Properties();
-        props.setProperty( new HttpConnector( "http" ).type.name(), "HTTP" );
-        props.setProperty( new HttpConnector( "http" ).encryption.name(), "NONE" );
-        props.setProperty( new HttpConnector( "http" ).enabled.name(), "true" );
-        try ( FileWriter writer = new FileWriter( configFile ) )
-        {
-            props.store( writer, "" );
-        }
-    }
 }