PHPC-129: Fix tests for HIPPO can't throw InvalidArgumentException on argument errors

Author: bjori

tests/bson/bson-binary-001.phpt

@@ -23,11 +23,6 @@ foreach($types as $type) {
     $tests[] = array("binary" => $binary);
 }
 
-throws(function() {
-    $b = new BSON\Binary("random binary data without type", BSON\Binary::TYPE_USER_DEFINED);
-    $b->getSubType($b);
-}, "InvalidArgumentException", "getSubType");
-
 throws(function() {
     $b = new BSON\Binary("random binary data without type");
     echo "FAIL: Constructed BSON\Binary without type!\n";
@@ -55,7 +50,6 @@ bool(true)
 bool(true)
 bool(true)
 bool(true)
-OK: Got InvalidArgumentException thrown from getSubType
 OK: Got InvalidArgumentException
 Test#0 { "binary" : { "$type" : "00", "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh" } }
 string(73) "{ "binary" : { "$type" : "00", "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh" } }"

tests/bson/bson-objectid-001.phpt

@@ -55,10 +55,6 @@ $id = new BSON\ObjectID(" 3e28b650640fd3162152da1");
 throws(function() {
 $id = new BSON\ObjectID(new stdclass);
 }, "InvalidArgumentException");
-throws(function() {
-$id = new BSON\ObjectID();
-echo $id->__toString("or somethign");
-}, "InvalidArgumentException");
 
 ?>
 ===DONE===
@@ -89,5 +85,4 @@ OK: Got InvalidArgumentException
 OK: Got InvalidArgumentException
 OK: Got InvalidArgumentException
 OK: Got InvalidArgumentException
-OK: Got InvalidArgumentException
 ===DONE===

tests/bson/bson-regex-001.phpt

@@ -18,19 +18,6 @@ $tests = array(
 throws(function() {
     $regexp = new BSON\Regex;
 }, "InvalidArgumentException");
-throws(function() {
-    $regexp = new BSON\Regex("regexp", "i");
-    $regexp->getPattern(1);
-}, "InvalidArgumentException", "getPattern");
-throws(function() {
-    $regexp = new BSON\Regex("regexp", "i");
-    $regexp->getFlags(1);
-}, "InvalidArgumentException", "getFlags");
-
-throws(function() {
-    $regexp = new BSON\Regex("regexp", "i");
-    $regexp->__toString(1);
-}, "InvalidArgumentException", "__toString");
 
 
 foreach($tests as $n => $test) {
@@ -49,9 +36,6 @@ Pattern: regexp
 Flags: i
 String representation: /regexp/i
 OK: Got InvalidArgumentException
-OK: Got InvalidArgumentException thrown from getPattern
-OK: Got InvalidArgumentException thrown from getFlags
-OK: Got InvalidArgumentException thrown from __toString
 Test#0 { "regex" : { "$regex" : "regexp", "$options" : "i" } }
 string(55) "{ "regex" : { "$regex" : "regexp", "$options" : "i" } }"
 string(55) "{ "regex" : { "$regex" : "regexp", "$options" : "i" } }"

tests/bson/bson-timestamp-001.phpt

@@ -15,11 +15,8 @@ throws(function() {
     $s = new BSON\Timestamp;
 }, "InvalidArgumentException");
 
-throws(function() {
-    $s = new BSON\Timestamp(1234, 5678);
-    echo $s, "\n";
-    $s->__toString(1);
-}, "InvalidArgumentException", "__toString");
+$s = new BSON\Timestamp(1234, 5678);
+echo $s, "\n";
 
 foreach($tests as $n => $test) {
     $s = BSON\fromArray($test);
@@ -35,7 +32,6 @@ foreach($tests as $n => $test) {
 --EXPECTF--
 OK: Got InvalidArgumentException
 [1234:5678]
-OK: Got InvalidArgumentException thrown from __toString
 Test#0 { "timestamp" : { "$timestamp" : { "t" : 5678, "i" : 1234 } } }
 string(63) "{ "timestamp" : { "$timestamp" : { "t" : 5678, "i" : 1234 } } }"
 string(63) "{ "timestamp" : { "$timestamp" : { "t" : 5678, "i" : 1234 } } }"

tests/bson/bson-utcdatetime-001.phpt

@@ -18,14 +18,7 @@ $array = iterator_to_array($cursor);
 $date = $utcdatetime->toDateTime();
 var_dump($date->format(DATE_RSS));
 
-throws(function() use ($utcdatetime) {
-    echo $utcdatetime, "\n";
-    $utcdatetime->__toString(1);
-}, "InvalidArgumentException");
-
-throws(function() use ($utcdatetime) {
-    $utcdatetime->toDateTime(DATE_RSS);
-}, "InvalidArgumentException");
+echo $utcdatetime, "\n";
 
 throws(function() {
     $d = new BSON\UTCDatetime;
@@ -52,8 +45,6 @@ foreach($tests as $n => $test) {
 string(31) "Thu, 20 Nov 2014 01:03:31 +0000"
 1416445411987
 OK: Got InvalidArgumentException
-OK: Got InvalidArgumentException
-OK: Got InvalidArgumentException
 Test#0 { "0" : { "$date" : 1416445411987 } }
 string(37) "{ "0" : { "$date" : 1416445411987 } }"
 string(37) "{ "0" : { "$date" : 1416445411987 } }"