Merge pull request #123 from teqneers/stefan-fix-test-setup

Fix for test setup when neo4j does not run with default settings

Author: ikwattro

tests/Example/ExampleTestCase.php

@@ -22,8 +22,18 @@ abstract class ExampleTestCase extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
+        $boltUrl = 'bolt://localhost';
+        if (isset($_ENV['NEO4J_USER'])) {
+            $boltUrl = sprintf(
+                'bolt://%s:%s@%s',
+                getenv('NEO4J_USER'),
+                getenv('NEO4J_PASSWORD'),
+                getenv('NEO4J_HOST')
+            );
+        }
+
         $this->client = ClientBuilder::create()
-            ->addConnection('default', 'bolt://localhost')
+            ->addConnection('default', $boltUrl)
             ->build();
     }
 

tests/Integration/BuildWithEventListenersIntegrationTest.php

@@ -22,11 +22,28 @@
  */
 class BuildWithEventListenersIntegrationTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * @return string
+     */
+    private function createBoltUrl()
+    {
+        $boltUrl = 'bolt://localhost';
+        if (isset($_ENV['NEO4J_USER'])) {
+            $boltUrl = sprintf(
+                'bolt://%s:%s@%s',
+                getenv('NEO4J_USER'),
+                getenv('NEO4J_PASSWORD'),
+                getenv('NEO4J_HOST')
+            );
+        }
+        return $boltUrl;
+    }
+
     public function testListenersAreRegistered()
     {
         $listener = new EventListener();
         $client = ClientBuilder::create()
-            ->addConnection('default', 'bolt://localhost')
+            ->addConnection('default', $this->createBoltUrl())
             ->registerEventListener(Neo4jClientEvents::NEO4J_PRE_RUN, [$listener, 'onPreRun'])
             ->registerEventListener(Neo4jClientEvents::NEO4J_POST_RUN, [$listener, 'onPostRun'])
             ->registerEventListener(Neo4jClientEvents::NEO4J_ON_FAILURE, [$listener, 'onFailure'])
@@ -41,7 +58,7 @@ public function testFailureCanBeDisabled()
     {
         $listener = new EventListener();
         $client = ClientBuilder::create()
-            ->addConnection('default', 'bolt://localhost')
+            ->addConnection('default', $this->createBoltUrl())
             ->registerEventListener(Neo4jClientEvents::NEO4J_ON_FAILURE, [$listener, 'onFailure'])
             ->build();
 

tests/Integration/ClientGetExceptionIntegrationTest.php

@@ -18,8 +18,18 @@ class ClientGetExceptionIntegrationTest extends \PHPUnit_Framework_TestCase
 {
     public function testExceptionHandling()
     {
+        $boltUrl = 'bolt://localhost';
+        if (isset($_ENV['NEO4J_USER'])) {
+            $boltUrl = sprintf(
+                'bolt://%s:%s@%s',
+                getenv('NEO4J_USER'),
+                getenv('NEO4J_PASSWORD'),
+                getenv('NEO4J_HOST')
+            );
+        }
+
         $client = ClientBuilder::create()
-            ->addConnection('default', 'bolt://localhost')
+            ->addConnection('default', $boltUrl)
             ->build();
 
         $this->setExpectedException(Neo4jException::class);

tests/Integration/ClientSetupIntegrationTest.php

@@ -115,8 +115,20 @@ public function testExceptionIsThrownWhenMasterAliasDoesntExist()
 
     public function testSendWriteUseMasterIfAvailable()
     {
+        $httpUri = 'http://localhost:7474';
+        if (isset($_ENV['NEO4J_USER'])) {
+            $httpUri = sprintf(
+                '%s://%s:%s@%s:%s',
+                getenv('NEO4J_SCHEMA'),
+                getenv('NEO4J_USER'),
+                getenv('NEO4J_PASSWORD'),
+                getenv('NEO4J_HOST'),
+                getenv('NEO4J_PORT')
+            );
+        }
+
         $connectionManager = $this->prophesize(ConnectionManager::class);
-        $conn = new Connection('default', 'http://localhost:7474', null, 5);
+        $conn = new Connection('default', $httpUri, null, 5);
         $connectionManager->getMasterConnection()->willReturn($conn);
         $connectionManager->getMasterConnection()->shouldBeCalled();
 

tests/Integration/IntegrationTestCase.php

@@ -37,7 +37,7 @@ public function setUp()
         $boltUrl = 'bolt://localhost';
         if (isset($_ENV['NEO4J_USER'])) {
             $boltUrl = sprintf(
-                'bolt://%s:%s@%',
+                'bolt://%s:%s@%s',
                 getenv('NEO4J_USER'),
                 getenv('NEO4J_PASSWORD'),
                 getenv('NEO4J_HOST')