Merge pull request #106

Author: jmikola

tests/connect/standalone-ssl-0002.phpt

@@ -1,6 +1,7 @@
 --TEST--
 Connect to MongoDB with using SSL and verify the stream
 --SKIPIF--
+<?php if (defined("HHVM_VERSION_ID")) exit("skip HHVM does not support peer verification"); ?>
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_SSL"); ?>
 --FILE--
 <?php

tests/connect/standalone-ssl-0004.phpt

@@ -1,6 +1,7 @@
 --TEST--
 Connect to MongoDB with using SSL and verify the stream
 --SKIPIF--
+<?php if (defined("HHVM_VERSION_ID")) exit("skip HHVM does not support peer verification"); ?>
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_SSL"); ?>
 --FILE--
 <?php

tests/connect/standalone-ssl-0005.phpt

@@ -1,6 +1,7 @@
 --TEST--
 Connect to MongoDB with using SSL and verify the stream
 --SKIPIF--
+<?php if (defined("HHVM_VERSION_ID")) exit("skip HHVM does not support peer verification"); ?>
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_SSL"); ?>
 --FILE--
 <?php

tests/connect/standalone-ssl-0006.phpt

@@ -1,6 +1,7 @@
 --TEST--
 Connect to MongoDB with using SSL and default options
 --SKIPIF--
+<?php if (defined("HHVM_VERSION_ID")) exit("skip HHVM does not support interception of SSL connection creation"); ?>
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_SSL"); ?>
 --FILE--
 <?php

tests/manager/manager-debug-001.phpt

@@ -1,6 +1,7 @@
 --TEST--
 MongoDB\Driver\Manager: Writing debug log files
 --SKIPIF--
+<?php if (defined("HHVM_VERSION_ID")) exit("skip HHVM uses HHVM's logging functionality"); ?>
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE) ?>
 --FILE--
 <?php

tests/manager/manager-debug-002.phpt

@@ -1,6 +1,7 @@
 --TEST--
 MongoDB\Driver\Manager: mongodb.debug=stderr
 --SKIPIF--
+<?php if (defined("HHVM_VERSION_ID")) exit("skip HHVM uses HHVM's logging functionality"); ?>
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE) ?>
 --INI--
 mongodb.debug=stderr

tests/manager/manager-debug-003.phpt

@@ -1,6 +1,7 @@
 --TEST--
 MongoDB\Driver\Manager: mongodb.debug=stdout
 --SKIPIF--
+<?php if (defined("HHVM_VERSION_ID")) exit("skip HHVM uses HHVM's logging functionality"); ?>
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE) ?>
 --INI--
 mongodb.debug=stdout

tests/manager/manager-executequery-without-assignment.phpt

@@ -1,6 +1,7 @@
 --TEST--
 MongoDB\Driver\Manager: Executing Query without assignment still executes
 --SKIPIF--
+<?php if (defined("HHVM_VERSION_ID")) exit("skip HHVM uses HHVM's logging functionality"); ?>
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE) ?>
 --FILE--
 <?php

tests/utils/tools.php

@@ -236,26 +236,25 @@ function throws($function, $exceptionname, $infunction = null) {
     try {
         $function();
     } catch(Exception $e) {
+        $message = str_replace(array("\n", "\r"), ' ', $e->getMessage());
         if ($e instanceof $exceptionname) {
             if ($infunction) {
                 $trace = $e->getTrace();
                 $function = $trace[0]["function"];
                 if (strcasecmp($function, $infunction) == 0) {
                     printf("OK: Got %s thrown from %s\n", $exceptionname, $infunction);
                 } else {
-                    $message = str_replace(array("\n", "\r"), ' ', $e->getMessage());
                     printf("ALMOST: Got %s - but was thrown in %s, not %s (%s)\n", $exceptionname, $function, $infunction, $message);
                 }
                 return $e->getMessage();
             }
             printf("OK: Got %s\n", $exceptionname);
         } else {
-            $message = str_replace(array("\n", "\r"), ' ', $e->getMessage());
-            printf("ALMOST: Got %s - expected %s: %s\n", get_class($e), $exceptionname, $message);
+            printf("ALMOST: Got %s (%s) - expected %s\n", get_class($e), $message, $exceptionname);
         }
         return $e->getMessage();
     }
-    echo "FAILED: Expected $exceptionname thrown!\n";
+    echo "FAILED: Expected $exceptionname thrown, but no exception thrown!\n";
 }
 function printServer(MongoDB\Driver\Server $server)
 {