Skip to content

Commit 2632316

Browse files
felipenspfelipensp
committed
- Removed UEXPECT(F)
- Unicodified some tests
1 parent 5a3b599 commit 2632316

File tree

94 files changed

+140
-2988
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+140
-2988
lines changed

‎ext/mysqli/tests/002.phpt‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -47,32 +47,6 @@ require_once('skipifconnectfailure.inc');
4747
print "done!";
4848
?>
4949
--EXPECTF--
50-
array(11) {
51-
[0]=>
52-
int(1)
53-
[1]=>
54-
NULL
55-
[2]=>
56-
NULL
57-
[3]=>
58-
NULL
59-
[4]=>
60-
NULL
61-
[5]=>
62-
NULL
63-
[6]=>
64-
NULL
65-
[7]=>
66-
NULL
67-
[8]=>
68-
NULL
69-
[9]=>
70-
string(4) "foo1"
71-
[10]=>
72-
string(4) "1000"
73-
}
74-
done!
75-
--UEXPECTF--
7650
array(11) {
7751
[0]=>
7852
int(1)

‎ext/mysqli/tests/003.phpt‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -73,24 +73,6 @@ require_once('skipifconnectfailure.inc');
7373
print "done!";
7474
?>
7575
--EXPECTF--
76-
array(7) {
77-
[0]=>
78-
string(10) "2002-01-02"
79-
[1]=>
80-
string(8) "12:49:00"
81-
[2]=>
82-
string(19) "2002-01-02 17:46:59"
83-
[3]=>
84-
int(2010)
85-
[4]=>
86-
string(19) "2010-07-10 00:00:00"
87-
[5]=>
88-
string(19) "0000-00-00 00:00:00"
89-
[6]=>
90-
string(19) "1999-12-29 00:00:00"
91-
}
92-
done!
93-
--UEXPECTF--
9476
array(7) {
9577
[0]=>
9678
unicode(10) "2002-01-02"

‎ext/mysqli/tests/004.phpt‎

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -48,32 +48,6 @@ require_once('skipifconnectfailure.inc');
4848
print "done!";
4949
?>
5050
--EXPECTF--
51-
array(2) {
52-
[0]=>
53-
string(10) "1234567890"
54-
[1]=>
55-
string(15) "this is a test0"
56-
}
57-
array(2) {
58-
[0]=>
59-
string(10) "1234567891"
60-
[1]=>
61-
string(15) "this is a test1"
62-
}
63-
array(2) {
64-
[0]=>
65-
string(10) "1234567892"
66-
[1]=>
67-
string(15) "this is a test2"
68-
}
69-
array(2) {
70-
[0]=>
71-
string(10) "1234567893"
72-
[1]=>
73-
string(15) "this is a test3"
74-
}
75-
done!
76-
--UEXPECTF--
7751
array(2) {
7852
[0]=>
7953
unicode(10) "1234567890"
@@ -98,4 +72,4 @@ array(2) {
9872
[1]=>
9973
unicode(15) "this is a test3"
10074
}
101-
done!
75+
done!

‎ext/mysqli/tests/005.phpt‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,10 @@ require_once('skipifconnectfailure.inc');
3838
print "done!";
3939
?>
4040
--EXPECTF--
41-
array(2) {
42-
[0]=>
43-
string(10) "1234567890"
44-
[1]=>
45-
string(13) "32K String ok"
46-
}
47-
done!
48-
--UEXPECTF--
4941
array(2) {
5042
[0]=>
5143
unicode(10) "1234567890"
5244
[1]=>
5345
unicode(13) "32K String ok"
5446
}
55-
done!
47+
done!

‎ext/mysqli/tests/009.phpt‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -78,30 +78,7 @@ mysqli fetch bigint values (ok to fail with 4.1.x)
7878
mysqli_close($link);
7979
print "done!";
8080
?>
81-
8281
--EXPECTF--
83-
array(8) {
84-
[0]=>
85-
int(5)
86-
[1]=>
87-
int(-23)
88-
[2]=>
89-
int(4)
90-
[3]=>
91-
string(14) "33333333333333"
92-
[4]=>
93-
int(0)
94-
[5]=>
95-
int(0)
96-
[6]=>
97-
int(100)
98-
[7]=>
99-
int(4567)
100-
}
101-
20123456
102-
3123456789
103-
done!
104-
--UEXPECTF--
10582
array(8) {
10683
[0]=>
10784
int(5)

‎ext/mysqli/tests/011.phpt‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -46,26 +46,6 @@ require_once('skipifconnectfailure.inc');
4646
print "done!";
4747
?>
4848
--EXPECTF--
49-
array(8) {
50-
[0]=>
51-
int(19)
52-
[1]=>
53-
int(2999)
54-
[2]=>
55-
int(3999)
56-
[3]=>
57-
int(4999999)
58-
[4]=>
59-
float(2345.60009766)
60-
[5]=>
61-
float(5678.89563)
62-
[6]=>
63-
string(6) "foobar"
64-
[7]=>
65-
string(11) "mysql rulez"
66-
}
67-
done!
68-
--UEXPECTF--
6949
array(8) {
7050
[0]=>
7151
int(19)
@@ -84,4 +64,4 @@ array(8) {
8464
[7]=>
8565
unicode(11) "mysql rulez"
8666
}
87-
done!
67+
done!

‎ext/mysqli/tests/012.phpt‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -45,26 +45,6 @@ require_once('skipifconnectfailure.inc');
4545
print "done!";
4646
?>
4747
--EXPECTF--
48-
array(8) {
49-
[0]=>
50-
int(120)
51-
[1]=>
52-
int(2999)
53-
[2]=>
54-
int(3999)
55-
[3]=>
56-
int(54)
57-
[4]=>
58-
float(2.59999990463)
59-
[5]=>
60-
float(58.89)
61-
[6]=>
62-
string(3) "206"
63-
[7]=>
64-
string(3) "6.7"
65-
}
66-
done!
67-
--UEXPECTF--
6848
array(8) {
6949
[0]=>
7050
int(120)
@@ -83,4 +63,4 @@ array(8) {
8363
[7]=>
8464
unicode(3) "6.7"
8565
}
86-
done!
66+
done!

‎ext/mysqli/tests/014.phpt‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -84,21 +84,6 @@ mysqli autocommit/commit/rollback
8484
?>
8585
--EXPECTF--
8686
Num_of_rows=1
87-
array(2) {
88-
[0]=>
89-
string(1) "1"
90-
[1]=>
91-
string(6) "foobar"
92-
}
93-
array(2) {
94-
[0]=>
95-
string(1) "2"
96-
[1]=>
97-
string(4) "egon"
98-
}
99-
done!
100-
--UEXPECTF--
101-
Num_of_rows=1
10287
array(2) {
10388
[0]=>
10489
unicode(1) "1"
@@ -111,4 +96,4 @@ array(2) {
11196
[1]=>
11297
unicode(4) "egon"
11398
}
114-
done!
99+
done!

‎ext/mysqli/tests/015.phpt‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -78,20 +78,6 @@ mysqli autocommit/commit/rollback with innodb
7878
print "done!";
7979
?>
8080
--EXPECTF--
81-
array(2) {
82-
[0]=>
83-
string(1) "1"
84-
[1]=>
85-
string(6) "foobar"
86-
}
87-
array(2) {
88-
[0]=>
89-
string(1) "2"
90-
[1]=>
91-
string(4) "egon"
92-
}
93-
done!
94-
--UEXPECTF--
9581
array(2) {
9682
[0]=>
9783
unicode(1) "1"
@@ -104,4 +90,4 @@ array(2) {
10490
[1]=>
10591
unicode(4) "egon"
10692
}
107-
done!
93+
done!

‎ext/mysqli/tests/016.phpt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,5 @@ require_once('skipifconnectfailure.inc');
2929
print "done!";
3030
?>
3131
--EXPECTF--
32-
string(6) "foobar"
33-
done!
34-
--UEXPECTF--
3532
unicode(6) "foobar"
3633
done!

0 commit comments

Comments
 (0)