Split exceptions in bson-fromPHP-006.phpt into separate error test

Author: jmikola

tests/bson/bson-fromPHP-006.phpt

@@ -5,58 +5,22 @@ BSON\fromPHP(): PHP documents with null bytes in field name
 
 require_once __DIR__ . '/../utils/tools.php';
 
-echo "\nTesting array with one leading null byte in field name\n";
-echo throws(function() {
-    fromPHP(["\0" => 1]);
-}, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n";
-
-echo "\nTesting array with one trailing null byte in field name\n";
-echo throws(function() {
-    fromPHP(["a\0" => 1]);
-}, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n";
-
-echo "\nTesting array with multiple null bytes in field name\n";
-echo throws(function() {
-    fromPHP(["\0\0\0" => 1]);
-}, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n";
-
 /* Per PHPC-884, field names with a leading null byte are ignored when encoding
  * a document from an object's property hash table, since PHP uses leading bytes
  * to denote protected and private properties. */
 echo "\nTesting object with one leading null byte in field name\n";
 hex_dump(fromPHP((object) ["\0" => 1]));
 
-echo "\nTesting object with one trailing null byte in field name\n";
-echo throws(function() {
-    fromPHP((object) ["a\0" => 1]);
-}, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n";
-
 echo "\nTesting object with multiple null bytes in field name\n";
 hex_dump(fromPHP((object) ["\0\0\0" => 1]));
 
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECT--
-Testing array with one leading null byte in field name
-OK: Got MongoDB\Driver\Exception\UnexpectedValueException
-BSON keys cannot contain null bytes. Unexpected null byte after "".
-
-Testing array with one trailing null byte in field name
-OK: Got MongoDB\Driver\Exception\UnexpectedValueException
-BSON keys cannot contain null bytes. Unexpected null byte after "a".
-
-Testing array with multiple null bytes in field name
-OK: Got MongoDB\Driver\Exception\UnexpectedValueException
-BSON keys cannot contain null bytes. Unexpected null byte after "".
-
 Testing object with one leading null byte in field name
      0 : 05 00 00 00 00                                   [.....]
 
-Testing object with one trailing null byte in field name
-OK: Got MongoDB\Driver\Exception\UnexpectedValueException
-BSON keys cannot contain null bytes. Unexpected null byte after "a".
-
 Testing object with multiple null bytes in field name
      0 : 05 00 00 00 00                                   [.....]
 ===DONE===

tests/bson/bson-fromPHP_error-006.phpt

@@ -0,0 +1,47 @@
+--TEST--
+BSON\fromPHP(): PHP documents with null bytes in field name
+--FILE--
+<?php
+
+require_once __DIR__ . '/../utils/tools.php';
+
+echo "\nTesting array with one leading null byte in field name\n";
+echo throws(function() {
+    fromPHP(["\0" => 1]);
+}, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n";
+
+echo "\nTesting array with one trailing null byte in field name\n";
+echo throws(function() {
+    fromPHP(["a\0" => 1]);
+}, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n";
+
+echo "\nTesting array with multiple null bytes in field name\n";
+echo throws(function() {
+    fromPHP(["\0\0\0" => 1]);
+}, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n";
+
+echo "\nTesting object with one trailing null byte in field name\n";
+echo throws(function() {
+    fromPHP((object) ["a\0" => 1]);
+}, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n";
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECT--
+Testing array with one leading null byte in field name
+OK: Got MongoDB\Driver\Exception\UnexpectedValueException
+BSON keys cannot contain null bytes. Unexpected null byte after "".
+
+Testing array with one trailing null byte in field name
+OK: Got MongoDB\Driver\Exception\UnexpectedValueException
+BSON keys cannot contain null bytes. Unexpected null byte after "a".
+
+Testing array with multiple null bytes in field name
+OK: Got MongoDB\Driver\Exception\UnexpectedValueException
+BSON keys cannot contain null bytes. Unexpected null byte after "".
+
+Testing object with one trailing null byte in field name
+OK: Got MongoDB\Driver\Exception\UnexpectedValueException
+BSON keys cannot contain null bytes. Unexpected null byte after "a".
+===DONE===