Make testsuite run once for 'Connection: Close' and once for 'Connection: Keep-Alive'

Author: frankmayer

.travis.yml

@@ -12,7 +12,8 @@ before_script:
   - ./tests/travis/setup_arangodb.sh
 
 script: 
-  - phpunit --configuration ./tests/phpunit.xml
+  - phpunit --configuration ./tests/phpunit-connection-close.xml
+  - phpunit --configuration ./tests/phpunit-connection-keep-alive.xml
 
 after_script:
   - ./tests/travis/teardown_arangodb.sh

tests/ConnectionTest.php

@@ -67,7 +67,7 @@ public function testGetOptions()
         static::assertEquals(12, $value);
 
         $value = $connection->getOption(ConnectionOptions::OPTION_CONNECTION);
-        static::assertEquals('Close', $value);
+        static::assertEquals(getenv('ArangoDB-PHP-Connection'), $value);
 
         $value = $connection->getOption(ConnectionOptions::OPTION_RECONNECT);
         static::assertFalse($value);

tests/bootstrap.php renamed to tests/bootstrap-connection-close.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * ArangoDB PHP client testsuite
- * File: bootstrap.php
+ * File: bootstrap-connection-close.php
  *
  * @package ArangoDBClient
  * @author  Frank Mayer

tests/bootstrap_connection_keep_alive.php

@@ -0,0 +1,71 @@
+<?php
+/**
+ * ArangoDB PHP client
+ * File: bootstrap_connection_keep_alive.php
+ *
+ * @package ArangoDBClient
+ * @author  Frank Mayer
+ */
+
+namespace ArangoDBClient;
+
+require __DIR__ . '/../autoload.php';
+
+if (class_exists('\PHPUnit\Framework\TestCase')) {
+    class_alias(\PHPUnit\Framework\TestCase::class, 'PHPUnit_Framework_TestCase');
+}
+
+/* set up a trace function that will be called for each communication with the server */
+
+function isCluster(Connection $connection)
+{
+    static $isCluster = null;
+
+    if ($isCluster === null) {
+        $adminHandler = new AdminHandler($connection);
+        try {
+            $role      = $adminHandler->getServerRole();
+            $isCluster = ($role === 'COORDINATOR' || $role === 'DBSERVER');
+        } catch (\Exception $e) {
+            // maybe server version is too "old"
+            $isCluster = false;
+        }
+    }
+
+    return $isCluster;
+}
+
+function getConnectionOptions()
+{
+    $traceFunc = function ($type, $data) {
+        print 'TRACE FOR ' . $type . PHP_EOL;
+    };
+
+    return [
+        ConnectionOptions::OPTION_ENDPOINT           => 'tcp://localhost:8529',
+        // endpoint to connect to
+        ConnectionOptions::OPTION_CONNECTION         => 'Keep-Alive',
+        // can use either 'Close' (one-time connections) or 'Keep-Alive' (re-used connections)
+        ConnectionOptions::OPTION_AUTH_TYPE          => 'Basic',
+        // use basic authorization
+        ConnectionOptions::OPTION_AUTH_USER          => 'root',
+        // user for basic authorization
+        ConnectionOptions::OPTION_AUTH_PASSWD        => '',
+        // password for basic authorization
+        ConnectionOptions::OPTION_TIMEOUT            => 12,
+        // timeout in seconds
+        //ConnectionOptions::OPTION_TRACE       => $traceFunc,              // tracer function, can be used for debugging
+        ConnectionOptions::OPTION_CREATE             => false,
+        // do not create unknown collections automatically
+        ConnectionOptions::OPTION_UPDATE_POLICY      => UpdatePolicy::LAST,
+        // last update wins
+        ConnectionOptions::OPTION_CHECK_UTF8_CONFORM => true
+        // force UTF-8 checks for data
+    ];
+}
+
+
+function getConnection()
+{
+    return new Connection(getConnectionOptions());
+}

tests/phpunit.xml renamed to tests/phpunit-connection-close.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<phpunit bootstrap="bootstrap.php" colors="true" verbose="true" backupGlobals="false">
+<phpunit bootstrap="bootstrap-connection-close.php" colors="true" verbose="true" backupGlobals="false">
     <testsuites>
-        <testsuite name="ArangoDB-PHP">
+        <testsuite name="ArangoDB-PHP-Connection-Close">
             <directory>.</directory>
         </testsuite>
     </testsuites>
@@ -10,4 +10,7 @@
             <directory suffix=".php">../lib</directory>
         </whitelist>
     </filter>
+    <php>
+        <env name="ArangoDB-PHP-Connection" value="Close"/>
+    </php>
 </phpunit>

tests/phpunit-connection-keep-alive.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<phpunit bootstrap="bootstrap_connection_keep_alive.php" colors="true" verbose="true" backupGlobals="false">
+    <testsuites>
+        <testsuite name="ArangoDB-PHP-Connection-Keep-Alive">
+            <directory>.</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">../lib</directory>
+        </whitelist>
+    </filter>
+    <php>
+        <env name="ArangoDB-PHP-Connection" value="Keep-Alive"/>
+    </php>
+</phpunit>