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/standard/tests/math | |
| 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/standard/tests/math')
32 files changed, 32 insertions, 32 deletions
diff --git a/ext/standard/tests/math/abs_basic.phpt b/ext/standard/tests/math/abs_basic.phpt index 0f6ecbc09b..bc62b38752 100644 --- a/ext/standard/tests/math/abs_basic.phpt +++ b/ext/standard/tests/math/abs_basic.phpt @@ -32,7 +32,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing abs() : basic functionality *** int(23) int(23) diff --git a/ext/standard/tests/math/atan2_basic.phpt b/ext/standard/tests/math/atan2_basic.phpt index 65a0622c6a..8312bb2890 100644 --- a/ext/standard/tests/math/atan2_basic.phpt +++ b/ext/standard/tests/math/atan2_basic.phpt @@ -38,7 +38,7 @@ for ($i = 0; $i < count($valuesy); $i++) { } } ?> ---EXPECTF-- +--EXPECT-- Y:23 X:23 float(0.78539816339745) Y:23 X:-23 float(2.3561944901923) Y:23 X:23.45 float(0.77571063007847) diff --git a/ext/standard/tests/math/base_convert_basic.phpt b/ext/standard/tests/math/base_convert_basic.phpt index 69a2667a24..0da1d1f77c 100644 --- a/ext/standard/tests/math/base_convert_basic.phpt +++ b/ext/standard/tests/math/base_convert_basic.phpt @@ -29,7 +29,7 @@ for ($f= 0; $f < count($frombase); $f++) { } ?> ---EXPECTF-- +--EXPECT-- ...from base is 2 ......to base is 2 .........value= 10 res = 10 diff --git a/ext/standard/tests/math/bindec_basic.phpt b/ext/standard/tests/math/bindec_basic.phpt index 9fcca4a7ee..d746b8a1ca 100644 --- a/ext/standard/tests/math/bindec_basic.phpt +++ b/ext/standard/tests/math/bindec_basic.phpt @@ -33,7 +33,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- int(455) int(0) int(32766) diff --git a/ext/standard/tests/math/bindec_basic_64bit.phpt b/ext/standard/tests/math/bindec_basic_64bit.phpt index 949c19eea3..3641f0bc41 100644 --- a/ext/standard/tests/math/bindec_basic_64bit.phpt +++ b/ext/standard/tests/math/bindec_basic_64bit.phpt @@ -33,7 +33,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- int(455) int(0) int(32766) diff --git a/ext/standard/tests/math/ceil_basic.phpt b/ext/standard/tests/math/ceil_basic.phpt index e90afd3388..922d0b14f0 100644 --- a/ext/standard/tests/math/ceil_basic.phpt +++ b/ext/standard/tests/math/ceil_basic.phpt @@ -43,7 +43,7 @@ for ($i = 0; $i < count($values); $i++) { ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing ceil() : basic functionality *** float(0) float(0) diff --git a/ext/standard/tests/math/decbin_basic.phpt b/ext/standard/tests/math/decbin_basic.phpt index 572a04245e..00ed582559 100644 --- a/ext/standard/tests/math/decbin_basic.phpt +++ b/ext/standard/tests/math/decbin_basic.phpt @@ -23,7 +23,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ---EXPECTF-- +--EXPECT-- string(4) "1010" string(12) "111101101110" string(12) "111101101110" diff --git a/ext/standard/tests/math/dechex_basic.phpt b/ext/standard/tests/math/dechex_basic.phpt index ac53a97b34..c842bf7984 100644 --- a/ext/standard/tests/math/dechex_basic.phpt +++ b/ext/standard/tests/math/dechex_basic.phpt @@ -22,7 +22,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- string(1) "a" string(3) "f6e" string(3) "f6e" diff --git a/ext/standard/tests/math/decoct_basic.phpt b/ext/standard/tests/math/decoct_basic.phpt index 3a5011b973..a3dd741b41 100644 --- a/ext/standard/tests/math/decoct_basic.phpt +++ b/ext/standard/tests/math/decoct_basic.phpt @@ -22,7 +22,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- string(2) "12" string(4) "7556" string(4) "7556" diff --git a/ext/standard/tests/math/exp_basic.phpt b/ext/standard/tests/math/exp_basic.phpt index 135705507c..21f7413d82 100644 --- a/ext/standard/tests/math/exp_basic.phpt +++ b/ext/standard/tests/math/exp_basic.phpt @@ -27,7 +27,7 @@ foreach($values as $value) { ?> ===Done=== ---EXPECTF-- +--EXPECT-- -- Iteration 1 -- float(22026.465794807) diff --git a/ext/standard/tests/math/expm1_basic.phpt b/ext/standard/tests/math/expm1_basic.phpt index 320b01a27d..7853aeb20c 100644 --- a/ext/standard/tests/math/expm1_basic.phpt +++ b/ext/standard/tests/math/expm1_basic.phpt @@ -34,7 +34,7 @@ foreach($values as $value) { }; ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing expm1() : basic functionality *** -- Iteration 1 -- diff --git a/ext/standard/tests/math/floor_basic.phpt b/ext/standard/tests/math/floor_basic.phpt index 2b6d2f75c8..034f55f00e 100644 --- a/ext/standard/tests/math/floor_basic.phpt +++ b/ext/standard/tests/math/floor_basic.phpt @@ -39,7 +39,7 @@ foreach($values as $value) { ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing floor() : basic functionality *** -- floor 0 -- diff --git a/ext/standard/tests/math/fmod_basic.phpt b/ext/standard/tests/math/fmod_basic.phpt index c29abca9d2..003a49498e 100644 --- a/ext/standard/tests/math/fmod_basic.phpt +++ b/ext/standard/tests/math/fmod_basic.phpt @@ -38,7 +38,7 @@ for ($i = 0; $i < count($values1); $i++) { } } ?> ---EXPECTF-- +--EXPECT-- iteration 0 float(0) diff --git a/ext/standard/tests/math/hexdec_basic.phpt b/ext/standard/tests/math/hexdec_basic.phpt index 1c42ae7e40..796c4e9bae 100644 --- a/ext/standard/tests/math/hexdec_basic.phpt +++ b/ext/standard/tests/math/hexdec_basic.phpt @@ -29,7 +29,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- int(18433668) int(126895953) float(142929835591) diff --git a/ext/standard/tests/math/hexdec_basic_64bit.phpt b/ext/standard/tests/math/hexdec_basic_64bit.phpt index f1a2028b5c..8c2942fb71 100644 --- a/ext/standard/tests/math/hexdec_basic_64bit.phpt +++ b/ext/standard/tests/math/hexdec_basic_64bit.phpt @@ -34,7 +34,7 @@ foreach($values as $value) { ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing hexdec() : basic functionality *** -- hexdec 1194684 -- diff --git a/ext/standard/tests/math/intdiv_64bit.phpt b/ext/standard/tests/math/intdiv_64bit.phpt index c674dd3b85..acc7f4ef98 100644 --- a/ext/standard/tests/math/intdiv_64bit.phpt +++ b/ext/standard/tests/math/intdiv_64bit.phpt @@ -11,5 +11,5 @@ if (PHP_INT_SIZE !== 8) { // (int)(PHP_INT_MAX / 3) gives a different result var_dump(intdiv(PHP_INT_MAX, 3)); ?> ---EXPECTF-- +--EXPECT-- int(3074457345618258602)
\ No newline at end of file diff --git a/ext/standard/tests/math/is_finite_basic.phpt b/ext/standard/tests/math/is_finite_basic.phpt index 85d2685273..3b80c969d9 100644 --- a/ext/standard/tests/math/is_finite_basic.phpt +++ b/ext/standard/tests/math/is_finite_basic.phpt @@ -22,7 +22,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/math/is_infinite_basic.phpt b/ext/standard/tests/math/is_infinite_basic.phpt index ca79922287..2ae5679285 100644 --- a/ext/standard/tests/math/is_infinite_basic.phpt +++ b/ext/standard/tests/math/is_infinite_basic.phpt @@ -22,7 +22,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- bool(false) bool(false) bool(false) diff --git a/ext/standard/tests/math/is_nan_basic.phpt b/ext/standard/tests/math/is_nan_basic.phpt index fb10737cea..a7998e1314 100644 --- a/ext/standard/tests/math/is_nan_basic.phpt +++ b/ext/standard/tests/math/is_nan_basic.phpt @@ -25,7 +25,7 @@ for ($i = 0; $i < count($values); $i++) { ?> ---EXPECTF-- +--EXPECT-- bool(false) bool(false) bool(false) diff --git a/ext/standard/tests/math/log1p_basic.phpt b/ext/standard/tests/math/log1p_basic.phpt index b28941860f..b6d14a26e7 100644 --- a/ext/standard/tests/math/log1p_basic.phpt +++ b/ext/standard/tests/math/log1p_basic.phpt @@ -35,7 +35,7 @@ foreach($values as $value) { ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing log1p() : basic functionality *** LOG1p tests diff --git a/ext/standard/tests/math/log_basic.phpt b/ext/standard/tests/math/log_basic.phpt index e2f9c9fe7d..1b0b628d51 100644 --- a/ext/standard/tests/math/log_basic.phpt +++ b/ext/standard/tests/math/log_basic.phpt @@ -30,7 +30,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ---EXPECTF-- +--EXPECT-- LOG tests...no base float(3.1354942159291) float(NAN) diff --git a/ext/standard/tests/math/mt_rand_basic.phpt b/ext/standard/tests/math/mt_rand_basic.phpt index 0f7b8a8b6e..5ffa059c3f 100644 --- a/ext/standard/tests/math/mt_rand_basic.phpt +++ b/ext/standard/tests/math/mt_rand_basic.phpt @@ -79,7 +79,7 @@ for ($x = 0; $x < count($min); $x++) { } } ?> ---EXPECTF-- +--EXPECT-- mt_rand() tests with default min and max value (i.e 0 thru 2147483647) PASSED: range min = 0 max = 2147483647 diff --git a/ext/standard/tests/math/mt_rand_value.phpt b/ext/standard/tests/math/mt_rand_value.phpt index cf7b9f00b6..ab6d732709 100644 --- a/ext/standard/tests/math/mt_rand_value.phpt +++ b/ext/standard/tests/math/mt_rand_value.phpt @@ -37,7 +37,7 @@ echo $x.PHP_EOL; */ ?> ---EXPECTF-- +--EXPECT-- 1614640687 1711027313 857485497 diff --git a/ext/standard/tests/math/mt_srand_basic.phpt b/ext/standard/tests/math/mt_srand_basic.phpt index e28b1b9eae..a3a34ab73b 100644 --- a/ext/standard/tests/math/mt_srand_basic.phpt +++ b/ext/standard/tests/math/mt_srand_basic.phpt @@ -13,7 +13,7 @@ var_dump(mt_srand(true)); var_dump(mt_srand(false)); var_dump(mt_srand(NULL)); ?> ---EXPECTF-- +--EXPECT-- NULL NULL NULL diff --git a/ext/standard/tests/math/number_format_basic.phpt b/ext/standard/tests/math/number_format_basic.phpt index 7f5f4beb25..330a71b4a7 100644 --- a/ext/standard/tests/math/number_format_basic.phpt +++ b/ext/standard/tests/math/number_format_basic.phpt @@ -39,7 +39,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- number_format tests.....default string(5) "1,235" string(6) "-1,235" diff --git a/ext/standard/tests/math/number_format_multichar.phpt b/ext/standard/tests/math/number_format_multichar.phpt index ae36d12c73..2141cc20a4 100644 --- a/ext/standard/tests/math/number_format_multichar.phpt +++ b/ext/standard/tests/math/number_format_multichar.phpt @@ -33,7 +33,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- number_format tests.....multiple character decimal point string(13) "1 234·57" string(14) "-1 234·57" diff --git a/ext/standard/tests/math/octdec_basic.phpt b/ext/standard/tests/math/octdec_basic.phpt index 8fd57ecfef..ff584f2514 100644 --- a/ext/standard/tests/math/octdec_basic.phpt +++ b/ext/standard/tests/math/octdec_basic.phpt @@ -29,7 +29,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- int(14489) int(253) int(36947879) diff --git a/ext/standard/tests/math/octdec_basic_64bit.phpt b/ext/standard/tests/math/octdec_basic_64bit.phpt index 98996dc182..c77ca722bb 100644 --- a/ext/standard/tests/math/octdec_basic_64bit.phpt +++ b/ext/standard/tests/math/octdec_basic_64bit.phpt @@ -33,7 +33,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing octdec() : basic functionality *** int(14489) int(253) diff --git a/ext/standard/tests/math/pi_basic.phpt b/ext/standard/tests/math/pi_basic.phpt index fec5691371..b4d6c8ebe9 100644 --- a/ext/standard/tests/math/pi_basic.phpt +++ b/ext/standard/tests/math/pi_basic.phpt @@ -9,6 +9,6 @@ echo M_PI, "\n"; // N.B pi() ignores all specified arguments no error // messages are produced if arguments are spcified. ?> ---EXPECTF-- +--EXPECT-- 3.1415926535898 3.1415926535898 diff --git a/ext/standard/tests/math/pow_basic_64bit.phpt b/ext/standard/tests/math/pow_basic_64bit.phpt index 898f6efa33..fd583a0243 100644 --- a/ext/standard/tests/math/pow_basic_64bit.phpt +++ b/ext/standard/tests/math/pow_basic_64bit.phpt @@ -47,7 +47,7 @@ foreach($bases as $base) { } ?> ===Done=== ---EXPECTF-- +--EXPECT-- Base = 23 ..... Exponent = 0 Result = 1 ..... Exponent = 1 Result = 23 diff --git a/ext/standard/tests/math/round_basic.phpt b/ext/standard/tests/math/round_basic.phpt index d4b94ec056..72ab13fc3e 100644 --- a/ext/standard/tests/math/round_basic.phpt +++ b/ext/standard/tests/math/round_basic.phpt @@ -45,7 +45,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing round() : basic functionality *** round: 123456789 ...with precision 2-> float(123456789) diff --git a/ext/standard/tests/math/srand_basic.phpt b/ext/standard/tests/math/srand_basic.phpt index b56ad10ac0..a3788cdf45 100644 --- a/ext/standard/tests/math/srand_basic.phpt +++ b/ext/standard/tests/math/srand_basic.phpt @@ -21,7 +21,7 @@ var_dump(srand(false)); var_dump(srand(NULL)); ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing srand() : basic functionality *** NULL NULL |