diff options
| author | Gabriel Caruso <carusogabriel34@gmail.com> | 2018-02-19 05:59:41 -0300 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-02-20 21:53:48 +0100 |
| commit | ded3d984c6133b1f508ed84e96df3316e207c99b (patch) | |
| tree | 175c208197d72966fbeb22c1df9dac0a1a33124f /ext/iconv | |
| parent | a00286921e8963d284a7a5db0c1fecffa6cb6b54 (diff) | |
| download | php-git-ded3d984c6133b1f508ed84e96df3316e207c99b.tar.gz | |
Use EXPECT instead of EXPECTF when possible
EXPECTF logic in run-tests.php is considerable, so let's avoid it.
Diffstat (limited to 'ext/iconv')
| -rw-r--r-- | ext/iconv/tests/iconv_default_charset.phpt | 2 | ||||
| -rw-r--r-- | ext/iconv/tests/iconv_encoding_basic.phpt | 2 | ||||
| -rw-r--r-- | ext/iconv/tests/iconv_stream_filter.phpt | 2 | ||||
| -rw-r--r-- | ext/iconv/tests/iconv_strlen_basic.phpt | 2 | ||||
| -rw-r--r-- | ext/iconv/tests/iconv_strpos_basic.phpt | 2 | ||||
| -rw-r--r-- | ext/iconv/tests/iconv_strrpos_basic.phpt | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/ext/iconv/tests/iconv_default_charset.phpt b/ext/iconv/tests/iconv_default_charset.phpt index ebfc7e6ee1..4b44c1266e 100644 --- a/ext/iconv/tests/iconv_default_charset.phpt +++ b/ext/iconv/tests/iconv_default_charset.phpt @@ -52,7 +52,7 @@ var_dump(ini_set('default_charset', 'ISO-8859-1'), echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing default_charset handling *** --- Get php.ini values --- string(5) "UTF-8" diff --git a/ext/iconv/tests/iconv_encoding_basic.phpt b/ext/iconv/tests/iconv_encoding_basic.phpt index 35314f1e69..094a050e5a 100644 --- a/ext/iconv/tests/iconv_encoding_basic.phpt +++ b/ext/iconv/tests/iconv_encoding_basic.phpt @@ -48,7 +48,7 @@ var_dump(iconv_get_encoding("all")); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing iconv_get_encoding()/iconv_set_encoding() : basic functionality *** --- Default get_encoding --- array(3) { diff --git a/ext/iconv/tests/iconv_stream_filter.phpt b/ext/iconv/tests/iconv_stream_filter.phpt index 79f6ad5179..afa6d67446 100644 --- a/ext/iconv/tests/iconv_stream_filter.phpt +++ b/ext/iconv/tests/iconv_stream_filter.phpt @@ -27,7 +27,7 @@ var_dump(bin2hex(fread($fp, 5)) != "69636f6e76"); var_dump(bin2hex(fread($fp, 1)) != "0a"); fclose($fp); ?> ---EXPECTF-- +--EXPECT-- string(20) "1b244224332473244b24" string(10) "41244f1b28" string(2) "42" diff --git a/ext/iconv/tests/iconv_strlen_basic.phpt b/ext/iconv/tests/iconv_strlen_basic.phpt index e5d6271f69..f4f8d7fb9b 100644 --- a/ext/iconv/tests/iconv_strlen_basic.phpt +++ b/ext/iconv/tests/iconv_strlen_basic.phpt @@ -29,7 +29,7 @@ echo "\n-- Multibyte String --\n"; var_dump(iconv_strlen($string_mb, 'UTF-8')); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing iconv_strlen() : basic functionality*** -- ASCII String -- diff --git a/ext/iconv/tests/iconv_strpos_basic.phpt b/ext/iconv/tests/iconv_strpos_basic.phpt index 1017f8e3b6..88f4903ca3 100644 --- a/ext/iconv/tests/iconv_strpos_basic.phpt +++ b/ext/iconv/tests/iconv_strpos_basic.phpt @@ -42,7 +42,7 @@ var_dump(iconv_strpos($string_mb, $needle2)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing iconv_strpos() : basic functionality*** -- ASCII string 1 -- diff --git a/ext/iconv/tests/iconv_strrpos_basic.phpt b/ext/iconv/tests/iconv_strrpos_basic.phpt index 78dfaa0db1..5a6ee82d9f 100644 --- a/ext/iconv/tests/iconv_strrpos_basic.phpt +++ b/ext/iconv/tests/iconv_strrpos_basic.phpt @@ -42,7 +42,7 @@ var_dump(iconv_strrpos($string_mb, $needle2)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing iconv_strrpos() : basic *** -- ASCII string 1 -- |