Skip to content

Commit 860be31

Browse files
author
Jeroen van Wolffelaar
committed
More tests
1 parent ba211ee commit 860be31

File tree

4 files changed

+123
-64
lines changed

4 files changed

+123
-64
lines changed

ext/standard/tests/math/001.phpt

+38-24
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,42 @@ Simple math tests
44
--GET--
55
--FILE--
66
<?php
7-
echo abs(-1) . "\n";
8-
echo abs(-1.5) . "\n";
9-
echo abs("-1") . "\n";
10-
echo abs("-1.5") . "\n";
11-
echo abs(-2147483647) . "\n";
12-
echo abs(-2147483648) . "\n";
13-
echo abs(-2147483649) . "\n";
14-
echo ceil(-1.5) . "\n";
15-
echo ceil(1.5) . "\n";
16-
echo floor(-1.5) . "\n";
17-
echo floor(1.5) . "\n";
18-
?>
19-
--EXPECT--
207

21-
1
22-
1.5
23-
1
24-
1.5
25-
2147483647
26-
2147483648
27-
2147483649
28-
-1
29-
2
30-
-2
31-
1
8+
define('LONG_MAX', is_int(5000000000)? 9223372036854775807 : 0x7FFFFFFF);
9+
define('LONG_MIN', -LONG_MAX - 1);
10+
printf("%d,%d,%d,%d\n",is_int(LONG_MIN ),is_int(LONG_MAX ),
11+
is_int(LONG_MIN-1),is_int(LONG_MAX+1));
12+
13+
$tests = <<<TESTS
14+
1 === abs(-1)
15+
1.5 === abs(-1.5)
16+
1 === abs("-1")
17+
1.5 === abs("-1.5")
18+
-LONG_MIN+1 === abs(LONG_MIN-1)
19+
-LONG_MIN === abs(LONG_MIN)
20+
-LONG_MIN-1 === abs(LONG_MIN+1)
21+
-1 === ceil(-1.5)
22+
2 === ceil( 1.5)
23+
-2 === floor(-1.5)
24+
1 === floor(1.5)
25+
LONG_MIN === ceil(LONG_MIN - 0.5)
26+
LONG_MIN+1 === ceil(LONG_MIN + 0.5)
27+
LONG_MIN-1 === round(LONG_MIN - 0.6)
28+
LONG_MIN === round(LONG_MIN - 0.4)
29+
LONG_MIN === round(LONG_MIN + 0.4)
30+
LONG_MIN+1 === round(LONG_MIN + 0.6)
31+
LONG_MIN-1 === floor(LONG_MIN - 0.5)
32+
LONG_MIN === floor(LONG_MIN + 0.5)
33+
LONG_MAX === ceil(LONG_MAX - 0.5)
34+
LONG_MAX+1 === ceil(LONG_MAX + 0.5)
35+
LONG_MAX-1 === round(LONG_MAX - 0.6)
36+
LONG_MAX === round(LONG_MAX - 0.4)
37+
LONG_MAX === round(LONG_MAX + 0.4)
38+
LONG_MAX+1 === round(LONG_MAX + 0.6)
39+
LONG_MAX-1 === floor(LONG_MAX - 0.5)
40+
LONG_MAX === floor(LONG_MAX + 0.5)
41+
TESTS;
42+
43+
include('../../../../tests/quicktester.inc');
44+
--EXPECT--
45+
OK

ext/standard/tests/math/pow.phpt

+39-39
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ $tests = <<<TESTS
2020
1 === pow(-1, 0)
2121
-1 === pow(-1, 1)
2222
1 === pow(-1, 2)
23-
FALSE === pow( 0,-2)
24-
FALSE === pow( 0,-1)
23+
FALSE ===@pow( 0,-2)
24+
FALSE ===@pow( 0,-1)
2525
1 === pow( 0, 0)
2626
0 === pow( 0, 1)
2727
0 === pow( 0, 2)
@@ -35,21 +35,21 @@ FALSE === pow( 0,-1)
3535
1 === pow( 2, 0)
3636
2 === pow( 2, 1)
3737
4 === pow( 2, 2)
38-
FALSE === pow(-2,-2.0)
39-
FALSE === pow(-2,-1.0)
40-
FALSE === pow(-2, 0.0)
41-
FALSE === pow(-2, 1.0)
42-
FALSE === pow(-2, 2.0)
43-
FALSE === pow(-1,-2.0)
44-
FALSE === pow(-1,-1.0)
45-
FALSE === pow(-1, 0.0)
46-
FALSE === pow(-1, 1.0)
47-
FALSE === pow(-1, 2.0)
48-
FALSE === pow( 0,-2.0)
49-
FALSE === pow( 0,-1.0)
50-
FALSE === pow( 0, 0.0)
51-
FALSE === pow( 0, 1.0)
52-
FALSE === pow( 0, 2.0)
38+
FALSE ===@pow(-2,-2.0)
39+
FALSE ===@pow(-2,-1.0)
40+
FALSE ===@pow(-2, 0.0)
41+
FALSE ===@pow(-2, 1.0)
42+
FALSE ===@pow(-2, 2.0)
43+
FALSE ===@pow(-1,-2.0)
44+
FALSE ===@pow(-1,-1.0)
45+
FALSE ===@pow(-1, 0.0)
46+
FALSE ===@pow(-1, 1.0)
47+
FALSE ===@pow(-1, 2.0)
48+
FALSE ===@pow( 0,-2.0)
49+
FALSE ===@pow( 0,-1.0)
50+
FALSE ===@pow( 0, 0.0)
51+
FALSE ===@pow( 0, 1.0)
52+
FALSE ===@pow( 0, 2.0)
5353
1.0 === pow( 1,-2.0)
5454
1.0 === pow( 1,-1.0)
5555
1.0 === pow( 1, 0.0)
@@ -67,21 +67,21 @@ FALSE === pow( 0, 2.0)
6767
1 === pow(-1,1443279822)
6868
-1 === pow(-1,1443279821)
6969
sqrt(2) === pow(2,1/2)
70-
FALSE === pow(-2.0,-2.0)
71-
FALSE === pow(-2.0,-1.0)
72-
FALSE === pow(-2.0, 0.0)
73-
FALSE === pow(-2.0, 1.0)
74-
FALSE === pow(-2.0, 2.0)
75-
FALSE === pow(-1.0,-2.0)
76-
FALSE === pow(-1.0,-1.0)
77-
FALSE === pow(-1.0, 0.0)
78-
FALSE === pow(-1.0, 1.0)
79-
FALSE === pow(-1.0, 2.0)
80-
FALSE === pow( 0.0,-2.0)
81-
FALSE === pow( 0.0,-1.0)
82-
FALSE === pow( 0.0, 0.0)
83-
FALSE === pow( 0.0, 1.0)
84-
FALSE === pow( 0.0, 2.0)
70+
FALSE ===@pow(-2.0,-2.0)
71+
FALSE ===@pow(-2.0,-1.0)
72+
FALSE ===@pow(-2.0, 0.0)
73+
FALSE ===@pow(-2.0, 1.0)
74+
FALSE ===@pow(-2.0, 2.0)
75+
FALSE ===@pow(-1.0,-2.0)
76+
FALSE ===@pow(-1.0,-1.0)
77+
FALSE ===@pow(-1.0, 0.0)
78+
FALSE ===@pow(-1.0, 1.0)
79+
FALSE ===@pow(-1.0, 2.0)
80+
FALSE ===@pow( 0.0,-2.0)
81+
FALSE ===@pow( 0.0,-1.0)
82+
FALSE ===@pow( 0.0, 0.0)
83+
FALSE ===@pow( 0.0, 1.0)
84+
FALSE ===@pow( 0.0, 2.0)
8585
1.0 === pow( 1.0,-2.0)
8686
1.0 === pow( 1.0,-1.0)
8787
1.0 === pow( 1.0, 0.0)
@@ -102,8 +102,8 @@ FALSE === pow( 0.0, 2.0)
102102
1.0 === pow(-1.0, 0)
103103
-1.0 === pow(-1.0, 1)
104104
1.0 === pow(-1.0, 2)
105-
FALSE === pow( 0.0,-2)
106-
FALSE === pow( 0.0,-1)
105+
FALSE ===@pow( 0.0,-2)
106+
FALSE ===@pow( 0.0,-1)
107107
1.0 === pow( 0.0, 0)
108108
0.0 === pow( 0.0, 1)
109109
0.0 === pow( 0.0, 2)
@@ -122,21 +122,21 @@ LONG_MIN+1 === pow(LONG_MIN+1,1)
122122
(LONG_MAX-1)*(LONG_MAX-1) === pow(LONG_MAX-1,2)
123123
(LONG_MIN+1)*(LONG_MIN+1) === pow(LONG_MIN+1,2)
124124
(float)(LONG_MAX-1) === pow(LONG_MAX-1,1.0)
125-
FALSE === pow(LONG_MIN+1,1.0)
125+
FALSE ===@pow(LONG_MIN+1,1.0)
126126
(LONG_MAX-1)*(LONG_MAX-1) === pow(LONG_MAX-1,2.0)
127-
FALSE === pow(LONG_MIN+1,2.0)
127+
FALSE ===@pow(LONG_MIN+1,2.0)
128128
LONG_MAX === pow(LONG_MAX,1)
129129
LONG_MIN === pow(LONG_MIN,1)
130130
LONG_MAX*LONG_MAX === pow(LONG_MAX,2)
131131
LONG_MIN*LONG_MIN === pow(LONG_MIN,2)
132132
(float)LONG_MAX === pow(LONG_MAX,1.0)
133-
FALSE === pow(LONG_MIN,1.0)
133+
FALSE ===@pow(LONG_MIN,1.0)
134134
LONG_MAX*LONG_MAX === pow(LONG_MAX,2.0)
135-
FALSE === pow(LONG_MIN,2.0)
135+
FALSE ===@pow(LONG_MIN,2.0)
136136
TESTS;
137137

138138
echo "On failure, please mail result to jeroen@php.net\n";
139-
include('test_eval.inc');
139+
include('../../../../tests/quicktester.inc');
140140

141141
--EXPECT--
142142
1,1,0,0

ext/standard/tests/strings/trim.phpt

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
--TEST--
2+
trim() function
3+
--POST--
4+
--GET--
5+
--FILE--
6+
<?php
7+
8+
$tests = <<<TESTS
9+
'abc' === trim('abc')
10+
'abc' === ltrim('abc')
11+
'abc' === rtrim('abc')
12+
'abc' === trim(" \0\t\nabc \0\t\n")
13+
"abc \0\t\n" === ltrim(" \0\t\nabc \0\t\n")
14+
" \0\t\nabc" === rtrim(" \0\t\nabc \0\t\n")
15+
" \0\t\nabc \0\t\n" === trim(" \0\t\nabc \0\t\n",'')
16+
" \0\t\nabc \0\t\n" === ltrim(" \0\t\nabc \0\t\n",'')
17+
" \0\t\nabc \0\t\n" === rtrim(" \0\t\nabc \0\t\n",'')
18+
"abc\x50\xC1" === trim("abc\x50\xC1\x60\x90","\x51..\xC0")
19+
"abc\x50" === trim("abc\x50\xC1\x60\x90","\x51..\xC1")
20+
"abc" === trim("abc\x50\xC1\x60\x90","\x50..\xC1")
21+
"abc\x50\xC1" === trim("abc\x50\xC1\x60\x90","\x51..\xC0")
22+
"abc\x50" === trim("abc\x50\xC1\x60\x90","\x51..\xC1")
23+
"abc" === trim("abc\x50\xC1\x60\x90","\x50..\xC1")
24+
TESTS;
25+
26+
include('../../../../tests/quicktester.inc');
27+
28+
--EXPECT--
29+
OK

ext/standard/tests/math/test_eval.inc renamed to tests/quicktester.inc

+17-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
<?php
2-
error_reporting(0);
2+
/*
3+
Helper for simple tests to check return-value. Usage:
4+
5+
$tests = <<<TESTS
6+
expected_return_value === expression
7+
2 === 1+1
8+
4 === 2*2
9+
FALSE === @ fopen('non_existent_file')
10+
TESTS;
11+
include( '../../../(../)tests/quicktester.inc' );
12+
13+
Expect: OK
14+
15+
Remember to NOT put a trailing ; after a line!
16+
17+
*/
18+
error_reporting(E_ALL);
319
$tests = explode("\n",$tests);
420
$success = TRUE;
521
foreach ($tests as $test)

0 commit comments

Comments
 (0)