Fixed and improved tests

7 files changed, 41 insertions, 8 deletions

diff --git a/ext/pdo_mysql/tests/PDO_getAvaliableDrivers.phpt b/ext/pdo_mysql/tests/PDO_getAvaliableDrivers.phpt
index e90ab5f9e4..07ddca183a 100644
--- a/ext/pdo_mysql/tests/PDO_getAvaliableDrivers.phpt
+++ b/ext/pdo_mysql/tests/PDO_getAvaliableDrivers.phpt
@@ -5,7 +5,7 @@ array pdo_drivers ( void );
 marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br
 --FILE--
 <?php
-print((is_array(PDO::getAvailableDrivers())) ? ("yes") : ("Test 'array stream_get_wrappers ( void );' has failed"));
+print((is_array(PDO::getAvailableDrivers())) ? ("yes") : ("Test failed"));
 ?>
 --EXPECT--
 yes
diff --git a/ext/sockets/tests/socket_clear_error.phpt b/ext/sockets/tests/socket_clear_error.phpt
new file mode 100644
index 0000000000..af9acaa9bf
--- /dev/null
+++ b/ext/sockets/tests/socket_clear_error.phpt
@@ -0,0 +1,28 @@
+--TEST--
+void socket_clear_error ([ resource $socket ] ) ;
+--CREDITS--
+marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br
+--SKIPIF--
+<?php
+if (!extension_loaded('sockets')) {
+  die('SKIP sockets extension not available.');
+}
+?>
+--FILE--
+<?php
+$socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
+$socketConn = socket_connect($socket, "127.0.0.1", 21248);
+var_dump(socket_last_error($socket));
+socket_clear_error($socket);
+var_dump(socket_last_error($socket));
+?>
+--CLEAN--
+<?php
+socket_close($socket);
+unset($socket);
+unset($socketConn);
+?>
+--EXPECTF--
+Warning: socket_connect(): unable to connect [%d]: Connection refused in %s on line %d
+int(%d)
+int(%d)
diff --git a/ext/sockets/tests/socket_getopt.phpt b/ext/sockets/tests/socket_getopt.phpt
index 639328cc62..12c0aeb888 100644
--- a/ext/sockets/tests/socket_getopt.phpt
+++ b/ext/sockets/tests/socket_getopt.phpt
@@ -3,12 +3,11 @@ mixed socket_getopt( resource $socket , int $level , int $optname ) ;
 --CREDITS--
 marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br
 --SKIPIF--
+<?php
 if (!extension_loaded('sockets')) {
   die('skip sockets extension not available.');
 }
-if (socket_set_option($s, $level, IP_MULTICAST_IF, 1) === false) {
-  die("skip interface 1 either doesn't exist or has no ipv4 address");
-}
+?>
 --FILE--
 <?php
 $domain = AF_INET;
diff --git a/ext/standard/tests/general_functions/connection_aborted.phpt b/ext/standard/tests/general_functions/connection_aborted.phpt
index edb7828c31..79618c2aa1 100644
--- a/ext/standard/tests/general_functions/connection_aborted.phpt
+++ b/ext/standard/tests/general_functions/connection_aborted.phpt
@@ -7,4 +7,4 @@ marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao p
 var_dump(connection_aborted());
 ?>
 --EXPECTF--
-int(%i)
+int(0)
diff --git a/ext/standard/tests/general_functions/connection_status.phpt b/ext/standard/tests/general_functions/connection_status.phpt
index fe0f28f5d4..5e0677fe27 100644
--- a/ext/standard/tests/general_functions/connection_status.phpt
+++ b/ext/standard/tests/general_functions/connection_status.phpt
@@ -4,7 +4,7 @@ int connection_status ( void );
 marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br
 --FILE--
 <?php
-var_dump(connection_status());
+var_dump(connection_status() == CONNECTION_NORMAL);
 ?>
 --EXPECTF--
-int(%i)
+bool(true)
diff --git a/ext/standard/tests/streams/stream_get_wrappers.phpt b/ext/standard/tests/streams/stream_get_wrappers.phpt
index e02b539fc1..58dfdc930d 100644
--- a/ext/standard/tests/streams/stream_get_wrappers.phpt
+++ b/ext/standard/tests/streams/stream_get_wrappers.phpt
@@ -11,6 +11,11 @@ if (phpversion() < "5.3.0") {
 --FILE--
 <?php
 print((is_array(stream_get_wrappers())) ? ("yes") : ("Test 'array stream_get_wrappers ( void );' has failed"));
+echo "\n";
+class Foo { }
+stream_wrapper_register("foo", "Foo");
+var_dump(in_array("foo", stream_get_wrappers()));
 ?>
 --EXPECT--
 yes
+bool(true)
diff --git a/ext/standard/tests/streams/stream_socket_enable_crypto.phpt b/ext/standard/tests/streams/stream_socket_enable_crypto.phpt
index fa5ab5454d..47d6c62893 100644
--- a/ext/standard/tests/streams/stream_socket_enable_crypto.phpt
+++ b/ext/standard/tests/streams/stream_socket_enable_crypto.phpt
@@ -5,6 +5,7 @@ marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao p
 --SKIPIF--
 <?php
 if (phpversion() < "5.3.0") { die('SKIP php version so lower.'); }
+if (!extension_loaded('openssl')) { die('ext/openssl required'); }
 ?>
 --FILE--
 <?php
@@ -39,7 +40,7 @@ bool(false)
 Warning: stream_socket_enable_crypto(): When enabling encryption you must specify the crypto type in %s on line %d
 bool(false)
 
-Warning: stream_socket_enable_crypto(): SSLv2 unavailable in the OpenSSL library against which PHP is linked in %s on line %d
+Warning: stream_socket_enable_crypto(): SSLv2 %s in %s on line %d
 bool(false)
 
 Warning: stream_socket_enable_crypto(): SSL: Broken pipe in %s on line %d