1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
|
From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit@debian.org>
Date: Sun, 13 Dec 2020 18:09:08 -0400
Subject: Adapt to recent version of PHPUnit (9)
---
tests/arguments_test.php | 27 ++++++------
tests/option_test.php | 96 +++++++++++++++++++++++++------------------
tests/output_formats_test.php | 8 ++--
tests/statusbar_test.php | 12 +++++-
4 files changed, 86 insertions(+), 57 deletions(-)
diff --git a/tests/arguments_test.php b/tests/arguments_test.php
index 0464adb..86cb90d 100644
--- a/tests/arguments_test.php
+++ b/tests/arguments_test.php
@@ -222,18 +222,21 @@ class ezcConsoleArgumentsTest extends ezcTestCase
unset( $args[0], $args[2], $args[4], $args[5], $args[6] );
- $this->assertAttributeEquals(
- array(),
- "ordered",
- $args,
- "Unset on ordered array failed."
- );
- $this->assertAttributeEquals(
- array(),
- "named",
- $args,
- "Unset on named array failed."
- );
+ $reflector = new ReflectionObject($args);
+ $attribute = $reflector->getProperty("ordered");
+ $attribute->setAccessible(true);
+ $value = $attribute->getValue($args);
+ $attribute->setAccessible(false);
+
+ $this->assertEquals(array(), $value, "Unset on ordered array failed.");
+
+ $reflector = new ReflectionObject($args);
+ $attribute = $reflector->getProperty("named");
+ $attribute->setAccessible(true);
+ $value = $attribute->getValue($args);
+ $attribute->setAccessible(false);
+
+ $this->assertEquals(array(), $value, "Unset on named array failed.");
}
public function testOffsetUnsetFailure()
diff --git a/tests/option_test.php b/tests/option_test.php
index 3e934f1..8c09d18 100644
--- a/tests/option_test.php
+++ b/tests/option_test.php
@@ -121,11 +121,13 @@ class ezcConsoleOptionTest extends ezcTestCase
$option_1->addDependency( $rule );
$option_1->addDependency( $rule );
- $this->assertAttributeEquals(
- array( $rule ),
- "dependencies",
- $option_1
- );
+ $reflector = new ReflectionObject($option_1);
+ $attribute = $reflector->getProperty("dependencies");
+ $attribute->setAccessible(true);
+ $value = $attribute->getValue($option_1);
+ $attribute->setAccessible(false);
+
+ $this->assertEquals(array( $rule ), $value);
}
public function testRemoveDependency()
@@ -146,11 +148,13 @@ class ezcConsoleOptionTest extends ezcTestCase
$option_1->addDependency( $rule );
$option_1->removeDependency( $rule );
- $this->assertAttributeEquals(
- array(),
- "dependencies",
- $option_1
- );
+ $reflector = new ReflectionObject($option_1);
+ $attribute = $reflector->getProperty("dependencies");
+ $attribute->setAccessible(true);
+ $value = $attribute->getValue($option_1);
+ $attribute->setAccessible(false);
+
+ $this->assertEquals(array(), $value);
}
// Bug #9052: Exception because of invalid property in ezcConsoleOption
@@ -177,11 +181,13 @@ class ezcConsoleOptionTest extends ezcTestCase
$option_1->addDependency( $rule_2 );
$option_1->removeAllDependencies( $option_2 );
- $this->assertAttributeEquals(
- array(),
- "dependencies",
- $option_1
- );
+ $reflector = new ReflectionObject($option_1);
+ $attribute = $reflector->getProperty("dependencies");
+ $attribute->setAccessible(true);
+ $value = $attribute->getValue($option_1);
+ $attribute->setAccessible(false);
+
+ $this->assertEquals(array(), $value);
}
// Bug #9052: Exception because of invalid property in ezcConsoleOption
@@ -245,11 +251,13 @@ class ezcConsoleOptionTest extends ezcTestCase
$option_1->addDependency( $rule );
$option_1->resetDependencies();
- $this->assertAttributeEquals(
- array(),
- "dependencies",
- $option_1
- );
+ $reflector = new ReflectionObject($option_1);
+ $attribute = $reflector->getProperty("dependencies");
+ $attribute->setAccessible(true);
+ $value = $attribute->getValue($option_1);
+ $attribute->setAccessible(false);
+
+ $this->assertEquals(array(), $value);
}
public function testAddExclusion()
@@ -270,11 +278,13 @@ class ezcConsoleOptionTest extends ezcTestCase
$option_1->addExclusion( $rule );
$option_1->addExclusion( $rule );
- $this->assertAttributeEquals(
- array( $rule ),
- "exclusions",
- $option_1
- );
+ $reflector = new ReflectionObject($option_1);
+ $attribute = $reflector->getProperty("exclusions");
+ $attribute->setAccessible(true);
+ $value = $attribute->getValue($option_1);
+ $attribute->setAccessible(false);
+
+ $this->assertEquals(array( $rule ), $value);
}
public function testRemoveExclusion()
@@ -295,11 +305,13 @@ class ezcConsoleOptionTest extends ezcTestCase
$option_1->addExclusion( $rule );
$option_1->removeExclusion( $rule );
- $this->assertAttributeEquals(
- array(),
- "exclusions",
- $option_1
- );
+ $reflector = new ReflectionObject($option_1);
+ $attribute = $reflector->getProperty("exclusions");
+ $attribute->setAccessible(true);
+ $value = $attribute->getValue($option_1);
+ $attribute->setAccessible(false);
+
+ $this->assertEquals(array(), $value);
}
// Bug #9052: Exception because of invalid property in ezcConsoleOption
@@ -326,11 +338,13 @@ class ezcConsoleOptionTest extends ezcTestCase
$option_1->addExclusion( $rule_2 );
$option_1->removeAllExclusions( $option_2 );
- $this->assertAttributeEquals(
- array(),
- "exclusions",
- $option_1
- );
+ $reflector = new ReflectionObject($option_1);
+ $attribute = $reflector->getProperty("exclusions");
+ $attribute->setAccessible(true);
+ $value = $attribute->getValue($option_1);
+ $attribute->setAccessible(false);
+
+ $this->assertEquals(array(), $value);
}
// Bug #9052: Exception because of invalid property in ezcConsoleOption
@@ -394,11 +408,13 @@ class ezcConsoleOptionTest extends ezcTestCase
$option_1->addExclusion( $rule );
$option_1->resetExclusions();
- $this->assertAttributeEquals(
- array(),
- "exclusions",
- $option_1
- );
+ $reflector = new ReflectionObject($option_1);
+ $attribute = $reflector->getProperty("exclusions");
+ $attribute->setAccessible(true);
+ $value = $attribute->getValue($option_1);
+ $attribute->setAccessible(false);
+
+ $this->assertEquals(array(), $value);
}
public function testPropertyGetAccessSuccess()
diff --git a/tests/output_formats_test.php b/tests/output_formats_test.php
index fed9527..95bc174 100644
--- a/tests/output_formats_test.php
+++ b/tests/output_formats_test.php
@@ -112,9 +112,11 @@ class ezcConsoleOutputFormatsTest extends ezcTestCase
public function testIterator()
{
$formatsObj = new ezcConsoleOutputFormats();
- $formatsArr = $this->readAttribute(
- $formatsObj, 'formats'
- );
+ $reflector = new ReflectionObject($formatsObj);
+ $attribute = $reflector->getProperty('formats');
+ $attribute->setAccessible(true);
+ $formatsArr = $attribute->getValue($formatsObj);
+ $attribute->setAccessible(false);
reset( $formatsArr );
// First run
diff --git a/tests/statusbar_test.php b/tests/statusbar_test.php
index 5981e0c..a7d1856 100644
--- a/tests/statusbar_test.php
+++ b/tests/statusbar_test.php
@@ -280,12 +280,20 @@ class ezcConsoleStatusbarTest extends ezcTestCase
}
ob_end_clean();
- $counter = $this->readAttribute( $status, "counter" );
+ $reflector = new ReflectionObject( $status);
+ $attribute = $reflector->getProperty( "counter" );
+ $attribute->setAccessible(true);
+ $counter = $attribute->getValue( $status);
+ $attribute->setAccessible(false);
$this->assertEquals( 14, $counter[true], "Success values not counted correctly." );
$this->assertEquals( 11, $counter[false], "Failure values not counted correctly." );
$status->reset();
- $counter = $this->readAttribute( $status, "counter" );
+ $reflector = new ReflectionObject( $status);
+ $attribute = $reflector->getProperty( "counter" );
+ $attribute->setAccessible(true);
+ $counter = $attribute->getValue( $status);
+ $attribute->setAccessible(false);
$this->assertEquals( 0, $counter[true], "Success values not reset correctly." );
$this->assertEquals( 0, $counter[false], "Failure values not reset correctly." );
}
|
