Skip to content

Commit a55e03a

Browse files
author
Ulf Wendel
committed
Fix tests: don't expect people to use a certain db/schema for testing
1 parent 5ba90ae commit a55e03a

10 files changed

+62
-54
lines changed

‎ext/mysqli/tests/047.phpt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ array(2) {
7272
[%u|b%"def"]=>
7373
%unicode|string%(0) ""
7474
[%u|b%"db"]=>
75-
%unicode|string%(4) "test"
75+
%unicode|string%(%d) "%s"
7676
[%u|b%"catalog"]=>
77-
%unicode|string%(3) "def"
77+
%unicode|string%(%d) "%s"
7878
[%u|b%"max_length"]=>
7979
int(0)
8080
[%u|b%"length"]=>
@@ -101,9 +101,9 @@ array(2) {
101101
[%u|b%"def"]=>
102102
%unicode|string%(0) ""
103103
[%u|b%"db"]=>
104-
%unicode|string%(4) "test"
104+
%unicode|string%(%d) "%s"
105105
[%u|b%"catalog"]=>
106-
%unicode|string%(3) "def"
106+
%unicode|string%(%d) "%s"
107107
[%u|b%"max_length"]=>
108108
int(0)
109109
[%u|b%"length"]=>
@@ -132,9 +132,9 @@ object(stdClass)#6 (13) {
132132
[%u|b%"def"]=>
133133
%unicode|string%(0) ""
134134
[%u|b%"db"]=>
135-
%unicode|string%(4) "test"
135+
%unicode|string%(%d) "%s"
136136
[%u|b%"catalog"]=>
137-
%unicode|string%(3) "def"
137+
%unicode|string%(%d) "%s"
138138
[%u|b%"max_length"]=>
139139
int(0)
140140
[%u|b%"length"]=>
@@ -160,9 +160,9 @@ object(stdClass)#6 (13) {
160160
[%u|b%"def"]=>
161161
%unicode|string%(0) ""
162162
[%u|b%"db"]=>
163-
%unicode|string%(4) "test"
163+
%unicode|string%(%d) "%s"
164164
[%u|b%"catalog"]=>
165-
%unicode|string%(3) "def"
165+
%unicode|string%(%d) "%s"
166166
[%u|b%"max_length"]=>
167167
int(0)
168168
[%u|b%"length"]=>
@@ -190,9 +190,9 @@ object(stdClass)#6 (13) {
190190
[%u|b%"def"]=>
191191
%unicode|string%(0) ""
192192
[%u|b%"db"]=>
193-
%unicode|string%(4) "test"
193+
%unicode|string%(%d) "%s"
194194
[%u|b%"catalog"]=>
195-
%unicode|string%(3) "def"
195+
%unicode|string%(%d) "%s"
196196
[%u|b%"max_length"]=>
197197
int(0)
198198
[%u|b%"length"]=>
@@ -218,9 +218,9 @@ object(stdClass)#5 (13) {
218218
[%u|b%"def"]=>
219219
%unicode|string%(0) ""
220220
[%u|b%"db"]=>
221-
%unicode|string%(4) "test"
221+
%unicode|string%(%d) "%s"
222222
[%u|b%"catalog"]=>
223-
%unicode|string%(3) "def"
223+
%unicode|string%(%d) "%s"
224224
[%u|b%"max_length"]=>
225225
int(0)
226226
[%u|b%"length"]=>

‎ext/mysqli/tests/mysqli_fetch_field.phpt‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ require_once('skipifconnectfailure.inc');
4444
$charsets['results']['maxlen'],
4545
$tmp->max_length);
4646
}
47+
if ($tmp->db != $db) {
48+
printf("011] Expecting database '%s' got '%s'\n",
49+
$db, $tmp->db);
50+
}
4751

4852
var_dump(mysqli_fetch_field($res));
4953

@@ -87,13 +91,13 @@ object(stdClass)#%d (13) {
8791
[%u|b%"table"]=>
8892
%unicode|string%(4) "TEST"
8993
[%u|b%"orgtable"]=>
90-
%unicode|string%(4) "test"
94+
%unicode|string%(%d) "%s"
9195
[%u|b%"def"]=>
9296
%unicode|string%(0) ""
9397
[%u|b%"db"]=>
94-
%unicode|string%(4) "test"
98+
%unicode|string%(%d) "%s"
9599
[%u|b%"catalog"]=>
96-
%unicode|string%(3) "def"
100+
%unicode|string%(%d) "%s"
97101
[%u|b%"max_length"]=>
98102
int(1)
99103
[%u|b%"length"]=>
@@ -115,13 +119,13 @@ object(stdClass)#%d (13) {
115119
[%u|b%"table"]=>
116120
%unicode|string%(4) "TEST"
117121
[%u|b%"orgtable"]=>
118-
%unicode|string%(4) "test"
122+
%unicode|string%(%d) "%s"
119123
[%u|b%"def"]=>
120124
%unicode|string%(0) ""
121125
[%u|b%"db"]=>
122-
%unicode|string%(4) "test"
126+
%unicode|string%(%d) "%s"
123127
[%u|b%"catalog"]=>
124-
%unicode|string%(3) "def"
128+
%unicode|string%(%d) "%s"
125129
[%u|b%"max_length"]=>
126130
int(%d)
127131
[%u|b%"length"]=>
@@ -148,15 +152,15 @@ object(stdClass)#%d (13) {
148152
[%u|b%"orgname"]=>
149153
%unicode|string%(2) "id"
150154
[%u|b%"table"]=>
151-
%unicode|string%(4) "test"
155+
%unicode|string%(%d) "%s"
152156
[%u|b%"orgtable"]=>
153-
%unicode|string%(4) "test"
157+
%unicode|string%(%d) "%s"
154158
[%u|b%"def"]=>
155159
%unicode|string%(0) ""
156160
[%u|b%"db"]=>
157-
%unicode|string%(4) "test"
161+
%unicode|string%(%d) "%s"
158162
[%u|b%"catalog"]=>
159-
%unicode|string%(3) "def"
163+
%unicode|string%(%d) "%s"
160164
[%u|b%"max_length"]=>
161165
int(1)
162166
[%u|b%"length"]=>

‎ext/mysqli/tests/mysqli_fetch_field_direct.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ object(stdClass)#%d (13) {
5959
[%u|b%"def"]=>
6060
%unicode|string%(0) ""
6161
[%u|b%"db"]=>
62-
%unicode|string%(4) "test"
62+
%unicode|string%(%d) "%s"
6363
[%u|b%"catalog"]=>
64-
%unicode|string%(3) "def"
64+
%unicode|string%(%d) "%s"
6565
[%u|b%"max_length"]=>
6666
int(%d)
6767
[%u|b%"length"]=>

‎ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ object(stdClass)#%d (13) {
6464
[%u|b%"table"]=>
6565
%unicode|string%(4) "TEST"
6666
[%u|b%"orgtable"]=>
67-
%unicode|string%(4) "test"
67+
%unicode|string%(%d) "%s"
6868
[%u|b%"def"]=>
6969
%unicode|string%(0) ""
7070
[%u|b%"db"]=>
71-
%unicode|string%(4) "test"
71+
%unicode|string%(%d) "%s"
7272
[%u|b%"catalog"]=>
73-
%unicode|string%(3) "def"
73+
%unicode|string%(%d) "%s"
7474
[%u|b%"max_length"]=>
7575
int(%d)
7676
[%u|b%"length"]=>

‎ext/mysqli/tests/mysqli_fetch_field_oo.phpt‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ require_once('skipifconnectfailure.inc');
4747
$charsets['results']['maxlen'],
4848
$tmp->max_length);
4949
}
50+
if ($tmp->db != $db) {
51+
printf("008] Expecting database '%s' got '%s'\n",
52+
$db, $tmp->db);
53+
}
5054

5155
var_dump($res->fetch_field());
5256

@@ -75,9 +79,9 @@ object(stdClass)#%d (13) {
7579
[%u|b%"def"]=>
7680
%unicode|string%(0) ""
7781
[%u|b%"db"]=>
78-
%unicode|string%(4) "test"
82+
%unicode|string%(%d) "%s"
7983
[%u|b%"catalog"]=>
80-
%unicode|string%(3) "def"
84+
%unicode|string%(%d) "%s"
8185
[%u|b%"max_length"]=>
8286
int(1)
8387
[%u|b%"length"]=>
@@ -103,9 +107,9 @@ object(stdClass)#%d (13) {
103107
[%u|b%"def"]=>
104108
%unicode|string%(0) ""
105109
[%u|b%"db"]=>
106-
%unicode|string%(4) "test"
110+
%unicode|string%(%d) "%s"
107111
[%u|b%"catalog"]=>
108-
%unicode|string%(3) "def"
112+
%unicode|string%(%d) "%s"
109113
[%u|b%"max_length"]=>
110114
int(%d)
111115
[%u|b%"length"]=>

‎ext/mysqli/tests/mysqli_fetch_fields.phpt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@ object(stdClass)#%d (13) {
6868
[%u|b%"table"]=>
6969
%unicode|string%(4) "TEST"
7070
[%u|b%"orgtable"]=>
71-
%unicode|string%(4) "test"
71+
%unicode|string%(%d) "%s"
7272
[%u|b%"def"]=>
7373
%unicode|string%(0) ""
7474
[%u|b%"db"]=>
75-
%unicode|string%(4) "test"
75+
%unicode|string%(%d) "%s"
7676
[%u|b%"catalog"]=>
77-
%unicode|string%(3) "def"
77+
%unicode|string%(%d) "%s"
7878
[%u|b%"max_length"]=>
7979
int(1)
8080
[%u|b%"length"]=>
@@ -96,13 +96,13 @@ object(stdClass)#%d (13) {
9696
[%u|b%"table"]=>
9797
%unicode|string%(4) "TEST"
9898
[%u|b%"orgtable"]=>
99-
%unicode|string%(4) "test"
99+
%unicode|string%(%d) "%s"
100100
[%u|b%"def"]=>
101101
%unicode|string%(0) ""
102102
[%u|b%"db"]=>
103-
%unicode|string%(4) "test"
103+
%unicode|string%(%d) "%s"
104104
[%u|b%"catalog"]=>
105-
%unicode|string%(3) "def"
105+
%unicode|string%(%d) "%s"
106106
[%u|b%"max_length"]=>
107107
int(1)
108108
[%u|b%"length"]=>

‎ext/mysqli/tests/mysqli_field_seek.phpt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,9 @@ object(stdClass)#%d (13) {
134134
[%u|b%"def"]=>
135135
%unicode|string%(0) ""
136136
[%u|b%"db"]=>
137-
%unicode|string%(4) "test"
137+
%unicode|string%(%d) "%s"
138138
[%u|b%"catalog"]=>
139-
%unicode|string%(3) "def"
139+
%unicode|string%(%d) "%s"
140140
[%u|b%"max_length"]=>
141141
int(0)
142142
[%u|b%"length"]=>
@@ -163,9 +163,9 @@ object(stdClass)#%d (13) {
163163
[%u|b%"def"]=>
164164
%unicode|string%(0) ""
165165
[%u|b%"db"]=>
166-
%unicode|string%(4) "test"
166+
%unicode|string%(%d) "%s"
167167
[%u|b%"catalog"]=>
168-
%unicode|string%(3) "def"
168+
%unicode|string%(%d) "%s"
169169
[%u|b%"max_length"]=>
170170
int(0)
171171
[%u|b%"length"]=>
@@ -192,9 +192,9 @@ object(stdClass)#%d (13) {
192192
[%u|b%"def"]=>
193193
%unicode|string%(0) ""
194194
[%u|b%"db"]=>
195-
%unicode|string%(4) "test"
195+
%unicode|string%(%d) "%s"
196196
[%u|b%"catalog"]=>
197-
%unicode|string%(3) "def"
197+
%unicode|string%(%d) "%s"
198198
[%u|b%"max_length"]=>
199199
int(%d)
200200
[%u|b%"length"]=>
@@ -231,7 +231,7 @@ object(stdClass)#3 (13) {
231231
[%u|b%"db"]=>
232232
%unicode|string%(0) ""
233233
[%u|b%"catalog"]=>
234-
%unicode|string%(3) "def"
234+
%unicode|string%(%d) "%s"
235235
[%u|b%"max_length"]=>
236236
int(0)
237237
[%u|b%"length"]=>

‎ext/mysqli/tests/mysqli_field_tell.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ object(stdClass)#%d (13) {
7676
[%u|b%"def"]=>
7777
%unicode|string%(0) ""
7878
[%u|b%"db"]=>
79-
%unicode|string%(4) "test"
79+
%unicode|string%(%d) "%s"
8080
[%u|b%"catalog"]=>
81-
%unicode|string%(3) "def"
81+
%unicode|string%(%d) "%s"
8282
[%u|b%"max_length"]=>
8383
int(0)
8484
[%u|b%"length"]=>

‎ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ object(stdClass)#%d (13) {
7373
[%u|b%"def"]=>
7474
%unicode|string%(0) ""
7575
[%u|b%"db"]=>
76-
%unicode|string%(4) "test"
76+
%unicode|string%(%d) "%s"
7777
[%u|b%"catalog"]=>
78-
%unicode|string%(3) "def"
78+
%unicode|string%(%d) "%s"
7979
[%u|b%"max_length"]=>
8080
int(0)
8181
[%u|b%"length"]=>
@@ -101,9 +101,9 @@ object(stdClass)#%d (13) {
101101
[%u|b%"def"]=>
102102
%unicode|string%(0) ""
103103
[%u|b%"db"]=>
104-
%unicode|string%(4) "test"
104+
%unicode|string%(%d) "%s"
105105
[%u|b%"catalog"]=>
106-
%unicode|string%(3) "def"
106+
%unicode|string%(%d) "%s"
107107
[%u|b%"max_length"]=>
108108
int(%d)
109109
[%u|b%"length"]=>
@@ -131,7 +131,7 @@ object(stdClass)#%d (13) {
131131
[%u|b%"db"]=>
132132
%unicode|string%(0) ""
133133
[%u|b%"catalog"]=>
134-
%unicode|string%(3) "def"
134+
%unicode|string%(%d) "%s"
135135
[%u|b%"max_length"]=>
136136
int(0)
137137
[%u|b%"length"]=>
@@ -159,7 +159,7 @@ object(stdClass)#%d (13) {
159159
[%u|b%"db"]=>
160160
%unicode|string%(0) ""
161161
[%u|b%"catalog"]=>
162-
%unicode|string%(3) "def"
162+
%unicode|string%(%d) "%s"
163163
[%u|b%"max_length"]=>
164164
int(%d)
165165
[%u|b%"length"]=>

‎ext/mysqli/tests/mysqli_stmt_result_metadata.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,9 @@ object(stdClass)#5 (13) {
113113
[%u|b%"def"]=>
114114
%unicode|string%(0) ""
115115
[%u|b%"db"]=>
116-
%unicode|string%(4) "test"
116+
%unicode|string%(%d) "%s"
117117
[%u|b%"catalog"]=>
118-
%unicode|string%(3) "def"
118+
%unicode|string%(%d) "%s"
119119
[%u|b%"max_length"]=>
120120
int(0)
121121
[%u|b%"length"]=>

0 commit comments

Comments
 (0)