Skip to content

Commit 5990abb

Browse files
KevinBKozanKevinBKozan
authored
Merge pull request #614 from magento/MQE-683
MQE-683: Assert action deprecation + upgrade
2 parents c37ba96 + 9357cf7 commit 5990abb

File tree

6 files changed

+351
-278
lines changed

6 files changed

+351
-278
lines changed

‎dev/tests/verification/TestModule/Test/AssertTest.xml

Lines changed: 167 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -157,47 +157,157 @@
157157

158158
<!-- asserts backward compatible -->
159159
<comment stepKey="commentBackwardCompatible" userInput="asserts backward compatible"/>
160-
<assertArrayHasKey stepKey="assertArrayHasKeyBackwardCompatible" expected="apple" expectedType="string" actual="['orange' => 2, 'apple' => 1]" actualType="const" message="pass"/>
161-
<assertArrayNotHasKey stepKey="assertArrayNotHasKeyBackwardCompatible" expected="kiwi" expectedType="string" actual="['orange' => 2, 'apple' => 1]" message="pass"/>
162-
<assertArraySubset stepKey="assertArraySubsetBackwardCompatible" expected="[1, 2]" actual="[1, 2, 3, 5]" message="pass"/>
163-
<assertContains stepKey="assertContainsBackwardCompatible" expected="ab" expectedType="string" actual="['item1' => 'a', 'item2' => 'ab']" message="pass"/>
164-
<assertCount stepKey="assertCountBackwardCompatible" expected="2" expectedType="int" actual="['a', 'b']" message="pass"/>
165-
<assertEmpty stepKey="assertEmptyBackwardCompatible" actual="[]" message="pass"/>
166-
<assertEquals stepKey="assertEquals1BackwardCompatible" expected="text" expectedType="variable" actual="Copyright © 2013-2017 Magento, Inc. All rights reserved." actualType="string" message="pass"/>
167-
<assertEquals stepKey="assertEquals2BackwardCompatible" expected="Copyright © 2013-2017 Magento, Inc. All rights reserved." expectedType="string" actual="text" actualType="variable" message="pass"/>
168-
<assertFalse stepKey="assertFalse1BackwardCompatible" actual="0" actualType="bool" message="pass"/>
169-
<assertFileNotExists stepKey="assertFileNotExists1BackwardCompatible" actual="/out.txt" actualType="string" message="pass"/>
170-
<assertFileNotExists stepKey="assertFileNotExists2BackwardCompatible" actual="$text" actualType="variable" message="pass"/>
171-
<assertGreaterOrEquals stepKey="assertGreaterOrEqualsBackwardCompatible" expected="2" expectedType="int" actual="5" actualType="int" message="pass"/>
172-
<assertGreaterThan stepKey="assertGreaterThanBackwardCompatible" expected="2" expectedType="int" actual="5" actualType="int" message="pass"/>
173-
<assertGreaterThanOrEqual stepKey="assertGreaterThanOrEqualBackwardCompatible" expected="2" expectedType="int" actual="5" actualType="int" message="pass"/>
174-
<assertInternalType stepKey="assertInternalType1BackwardCompatible" expected="string" expectedType="string" actual="xyz" actualType="string" message="pass"/>
175-
<assertInternalType stepKey="assertInternalType2BackwardCompatible" expected="int" expectedType="string" actual="21" actualType="int" message="pass"/>
176-
<assertInternalType stepKey="assertInternalType3BackwardCompatible" expected="string" expectedType="string" actual="$text" actualType="variable" message="pass"/>
177-
<assertLessOrEquals stepKey="assertLessOrEqualBackwardCompatibles" expected="5" expectedType="int" actual="2" actualType="int" message="pass"/>
178-
<assertLessThan stepKey="assertLessThanBackwardCompatible" expected="5" expectedType="int" actual="2" actualType="int" message="pass"/>
179-
<assertLessThanOrEqual stepKey="assertLessThanOrEqualBackwardCompatible" expected="5" expectedType="int" actual="2" actualType="int" message="pass"/>
180-
<assertNotContains stepKey="assertNotContains1BackwardCompatible" expected="bc" expectedType="string" actual="['item1' => 'a', 'item2' => 'ab']" message="pass"/>
181-
<assertNotContains stepKey="assertNotContains2BackwardCompatible" expected="bc" expectedType="string" actual="text" actualType="variable" message="pass"/>
182-
<assertNotEmpty stepKey="assertNotEmpty1BackwardCompatible" actual="[1, 2]" message="pass"/>
183-
<assertNotEmpty stepKey="assertNotEmpty2BackwardCompatible" actual="text" actualType="variable" message="pass"/>
184-
<assertNotEquals stepKey="assertNotEqualsBackwardCompatible" expected="2" expectedType="int" actual="5" actualType="int" message="pass" delta=""/>
185-
<assertNotNull stepKey="assertNotNull1BackwardCompatible" actual="abc" actualType="string" message="pass"/>
186-
<assertNotNull stepKey="assertNotNull2BackwardCompatible" actual="text" actualType="variable" message="pass"/>
187-
<assertNotRegExp stepKey="assertNotRegExpBackwardCompatible" expected="/foo/" expectedType="string" actual="bar" actualType="string" message="pass"/>
188-
<assertNotSame stepKey="assertNotSameBackwardCompatible" expected="log" expectedType="string" actual="tag" actualType="string" message="pass"/>
189-
<assertRegExp stepKey="assertRegExpBackwardCompatible" expected="/foo/" expectedType="string" actual="foo" actualType="string" message="pass"/>
190-
<assertSame stepKey="assertSameBackwardCompatible" expected="bar" expectedType="string" actual="bar" actualType="string" message="pass"/>
191-
<assertStringStartsNotWith stepKey="assertStringStartsNotWithBackwardCompatible" expected="a" expectedType="string" actual="banana" actualType="string" message="pass"/>
192-
<assertStringStartsWith stepKey="assertStringStartsWithBackwardCompatible" expected="a" expectedType="string" actual="apple" actualType="string" message="pass"/>
193-
<assertTrue stepKey="assertTrueBackwardCompatible" actual="1" actualType="bool" message="pass"/>
194-
<assertElementContainsAttribute selector="#username" attribute="class" expectedValue="admin__control-text" stepKey="assertElementContainsAttributeBackwardCompatible"/>
195-
<assertInstanceOf stepKey="assertInstanceOfBackwardCompatible" expected="User::class" actual="text" actualType="variable" message="pass"/>
196-
<assertNotInstanceOf stepKey="assertNotInstanceOfBackwardCompatible" expected="User::class" actual="21" actualType="int" message="pass"/>
197-
<assertFileExists stepKey="assertFileExistsBackwardCompatible" actual="text" actualType="variable" message="pass"/>
198-
<assertIsEmpty stepKey="assertIsEmptyBackwardCompatible" actual="text" actualType="variable" message="pass"/>
199-
<assertNull stepKey="assertNullBackwardCompatible" actual="text" actualType="variable" message="pass"/>
200-
<expectException stepKey="expectExceptionBackwardCompatible" expected="new MyException('exception msg')" actual="function() {$this->doSomethingBad();}"/>
160+
<assertArrayHasKey stepKey="assertArrayHasKeyBackwardCompatible" message="pass">
161+
<expectedResult type="string">apple</expectedResult>
162+
<actualResult type="const">['orange' => 2, 'apple' => 1]</actualResult>
163+
</assertArrayHasKey>
164+
<assertArrayNotHasKey stepKey="assertArrayNotHasKeyBackwardCompatible" message="pass">
165+
<expectedResult type="string">kiwi</expectedResult>
166+
<actualResult type="const">['orange' => 2, 'apple' => 1]</actualResult>
167+
</assertArrayNotHasKey>
168+
<assertArraySubset stepKey="assertArraySubsetBackwardCompatible" message="pass">
169+
<actualResult type="const">[1, 2, 3, 5]</actualResult>
170+
<expectedResult type="const">[1, 2]</expectedResult>
171+
</assertArraySubset>
172+
<assertContains stepKey="assertContainsBackwardCompatible" message="pass">
173+
<expectedResult type="string">ab</expectedResult>
174+
<actualResult type="const">['item1' => 'a', 'item2' => 'ab']</actualResult>
175+
</assertContains>
176+
<assertCount stepKey="assertCountBackwardCompatible" message="pass">
177+
<actualResult type="const">['a', 'b']</actualResult>
178+
<expectedResult type="int">2</expectedResult>
179+
</assertCount>
180+
<assertEmpty stepKey="assertEmptyBackwardCompatible" message="pass">
181+
<actualResult type="const">[]</actualResult>
182+
</assertEmpty>
183+
<assertEquals stepKey="assertEquals1BackwardCompatible" message="pass">
184+
<actualResult type="string">Copyright © 2013-2017 Magento, Inc. All rights reserved.</actualResult>
185+
<expectedResult type="variable">text</expectedResult>
186+
</assertEquals>
187+
<assertEquals stepKey="assertEquals2BackwardCompatible" message="pass">
188+
<actualResult type="variable">text</actualResult>
189+
<expectedResult type="string">Copyright © 2013-2017 Magento, Inc. All rights reserved.</expectedResult>
190+
</assertEquals>
191+
<assertFalse stepKey="assertFalse1BackwardCompatible" message="pass">
192+
<actualResult type="bool">0</actualResult>
193+
</assertFalse>
194+
<assertFileNotExists stepKey="assertFileNotExists1BackwardCompatible" message="pass">
195+
<actualResult type="string">/out.txt</actualResult>
196+
</assertFileNotExists>
197+
<assertFileNotExists stepKey="assertFileNotExists2BackwardCompatible" message="pass">
198+
<actualResult type="variable">$text</actualResult>
199+
</assertFileNotExists>
200+
<assertGreaterOrEquals stepKey="assertGreaterOrEqualsBackwardCompatible" message="pass">
201+
<actualResult type="int">5</actualResult>
202+
<expectedResult type="int">2</expectedResult>
203+
</assertGreaterOrEquals>
204+
<assertGreaterThan stepKey="assertGreaterThanBackwardCompatible" message="pass">
205+
<actualResult type="int">5</actualResult>
206+
<expectedResult type="int">2</expectedResult>
207+
</assertGreaterThan>
208+
<assertGreaterThanOrEqual stepKey="assertGreaterThanOrEqualBackwardCompatible" message="pass">
209+
<actualResult type="int">5</actualResult>
210+
<expectedResult type="int">2</expectedResult>
211+
</assertGreaterThanOrEqual>
212+
<assertInternalType stepKey="assertInternalType1BackwardCompatible" message="pass">
213+
<actualResult type="string">xyz</actualResult>
214+
<expectedResult type="string">string</expectedResult>
215+
</assertInternalType>
216+
<assertInternalType stepKey="assertInternalType2BackwardCompatible" message="pass">
217+
<actualResult type="int">21</actualResult>
218+
<expectedResult type="string">int</expectedResult>
219+
</assertInternalType>
220+
<assertInternalType stepKey="assertInternalType3BackwardCompatible" message="pass">
221+
<actualResult type="variable">$text</actualResult>
222+
<expectedResult type="string">string</expectedResult>
223+
</assertInternalType>
224+
<assertLessOrEquals stepKey="assertLessOrEqualBackwardCompatibles" message="pass">
225+
<actualResult type="int">2</actualResult>
226+
<expectedResult type="int">5</expectedResult>
227+
</assertLessOrEquals>
228+
<assertLessThan stepKey="assertLessThanBackwardCompatible" message="pass">
229+
<actualResult type="int">2</actualResult>
230+
<expectedResult type="int">5</expectedResult>
231+
</assertLessThan>
232+
<assertLessThanOrEqual stepKey="assertLessThanOrEqualBackwardCompatible" message="pass">
233+
<actualResult type="int">2</actualResult>
234+
<expectedResult type="int">5</expectedResult>
235+
</assertLessThanOrEqual>
236+
<assertNotContains stepKey="assertNotContains1BackwardCompatible" message="pass">
237+
<expectedResult type="string">bc</expectedResult>
238+
<actualResult type="const">['item1' => 'a', 'item2' => 'ab']</actualResult>
239+
</assertNotContains>
240+
<assertNotContains stepKey="assertNotContains2BackwardCompatible" message="pass">
241+
<actualResult type="variable">text</actualResult>
242+
<expectedResult type="string">bc</expectedResult>
243+
</assertNotContains>
244+
<assertNotEmpty stepKey="assertNotEmpty1BackwardCompatible" message="pass">
245+
<actualResult type="const">[1, 2]</actualResult>
246+
</assertNotEmpty>
247+
<assertNotEmpty stepKey="assertNotEmpty2BackwardCompatible" message="pass">
248+
<actualResult type="variable">text</actualResult>
249+
</assertNotEmpty>
250+
<assertNotEquals stepKey="assertNotEqualsBackwardCompatible" message="pass" delta="">
251+
<actualResult type="int">5</actualResult>
252+
<expectedResult type="int">2</expectedResult>
253+
</assertNotEquals>
254+
<assertNotNull stepKey="assertNotNull1BackwardCompatible" message="pass">
255+
<actualResult type="string">abc</actualResult>
256+
</assertNotNull>
257+
<assertNotNull stepKey="assertNotNull2BackwardCompatible" message="pass">
258+
<actualResult type="variable">text</actualResult>
259+
</assertNotNull>
260+
<assertNotRegExp stepKey="assertNotRegExpBackwardCompatible" message="pass">
261+
<actualResult type="string">bar</actualResult>
262+
<expectedResult type="string">/foo/</expectedResult>
263+
</assertNotRegExp>
264+
<assertNotSame stepKey="assertNotSameBackwardCompatible" message="pass">
265+
<actualResult type="string">tag</actualResult>
266+
<expectedResult type="string">log</expectedResult>
267+
</assertNotSame>
268+
<assertRegExp stepKey="assertRegExpBackwardCompatible" message="pass">
269+
<actualResult type="string">foo</actualResult>
270+
<expectedResult type="string">/foo/</expectedResult>
271+
</assertRegExp>
272+
<assertSame stepKey="assertSameBackwardCompatible" message="pass">
273+
<actualResult type="string">bar</actualResult>
274+
<expectedResult type="string">bar</expectedResult>
275+
</assertSame>
276+
<assertStringStartsNotWith stepKey="assertStringStartsNotWithBackwardCompatible" message="pass">
277+
<actualResult type="string">banana</actualResult>
278+
<expectedResult type="string">a</expectedResult>
279+
</assertStringStartsNotWith>
280+
<assertStringStartsWith stepKey="assertStringStartsWithBackwardCompatible" message="pass">
281+
<actualResult type="string">apple</actualResult>
282+
<expectedResult type="string">a</expectedResult>
283+
</assertStringStartsWith>
284+
<assertTrue stepKey="assertTrueBackwardCompatible" message="pass">
285+
<actualResult type="bool">1</actualResult>
286+
</assertTrue>
287+
<assertElementContainsAttribute stepKey="assertElementContainsAttributeBackwardCompatible">
288+
<expectedResult selector="#username" attribute="class" type="string">admin__control-text</expectedResult>
289+
</assertElementContainsAttribute>
290+
<assertInstanceOf stepKey="assertInstanceOfBackwardCompatible" message="pass">
291+
<actualResult type="variable">text</actualResult>
292+
<expectedResult type="const">User::class</expectedResult>
293+
</assertInstanceOf>
294+
<assertNotInstanceOf stepKey="assertNotInstanceOfBackwardCompatible" message="pass">
295+
<actualResult type="int">21</actualResult>
296+
<expectedResult type="const">User::class</expectedResult>
297+
</assertNotInstanceOf>
298+
<assertFileExists stepKey="assertFileExistsBackwardCompatible" message="pass">
299+
<actualResult type="variable">text</actualResult>
300+
</assertFileExists>
301+
<assertIsEmpty stepKey="assertIsEmptyBackwardCompatible" message="pass">
302+
<actualResult type="variable">text</actualResult>
303+
</assertIsEmpty>
304+
<assertNull stepKey="assertNullBackwardCompatible" message="pass">
305+
<actualResult type="variable">text</actualResult>
306+
</assertNull>
307+
<expectException stepKey="expectExceptionBackwardCompatible">
308+
<expectedResult type="const">new MyException('exception msg')</expectedResult>
309+
<actualResult type="const">function() {$this->doSomethingBad();}</actualResult>
310+
</expectException>
201311

202312
<!-- string type that use created data -->
203313
<comment stepKey="c2" userInput="string type that use created data"/>
@@ -263,29 +373,29 @@
263373
<fail stepKey="assert8" message="$$createData1.firstname$$ $$createData1.lastname$$"/>
264374

265375
<!-- assertElementContainsAttribute examples -->
266-
<assertElementContainsAttribute stepKey="assertElementContainsAttribute1" selector="#username" attribute="class">
267-
<expectedResult type="string">admin__control-text</expectedResult>
376+
<assertElementContainsAttribute stepKey="assertElementContainsAttribute1">
377+
<expectedResult selector="#username" attribute="class" type="string">admin__control-text</expectedResult>
268378
</assertElementContainsAttribute>
269-
<assertElementContainsAttribute stepKey="assertElementContainsAttribute2" selector="#username" attribute="name">
270-
<expectedResult type="string">login[username]</expectedResult>
379+
<assertElementContainsAttribute stepKey="assertElementContainsAttribute2">
380+
<expectedResult selector="#username" attribute="name" type="string">login[username]</expectedResult>
271381
</assertElementContainsAttribute>
272-
<assertElementContainsAttribute stepKey="assertElementContainsAttribute3" selector="#username" attribute="autofocus">
273-
<expectedResult type="string">true</expectedResult>
382+
<assertElementContainsAttribute stepKey="assertElementContainsAttribute3">
383+
<expectedResult selector="#username" attribute="autofocus" type="string">true</expectedResult>
274384
</assertElementContainsAttribute>
275-
<assertElementContainsAttribute stepKey="assertElementContainsAttribute4" selector="#username" attribute="data-validate">
276-
<expectedResult type="string">{required:true}</expectedResult>
385+
<assertElementContainsAttribute stepKey="assertElementContainsAttribute4">
386+
<expectedResult selector="#username" attribute="data-validate" type="string">{required:true}</expectedResult>
277387
</assertElementContainsAttribute>
278-
<assertElementContainsAttribute stepKey="assertElementContainsAttribute5" selector=".admin__menu-overlay" attribute="style">
279-
<expectedResult type="string">display: none;</expectedResult>
388+
<assertElementContainsAttribute stepKey="assertElementContainsAttribute5">
389+
<expectedResult selector=".admin__menu-overlay" attribute="style" type="string">display: none;</expectedResult>
280390
</assertElementContainsAttribute>
281-
<assertElementContainsAttribute stepKey="assertElementContainsAttribute6" selector=".admin__menu-overlay" attribute="border">
282-
<expectedResult type="string">0</expectedResult>
391+
<assertElementContainsAttribute stepKey="assertElementContainsAttribute6">
392+
<expectedResult selector=".admin__menu-overlay" attribute="border" type="string">0</expectedResult>
283393
</assertElementContainsAttribute>
284-
<assertElementContainsAttribute stepKey="assertElementContainsAttribute7" selector="#username" attribute="value">
285-
<expectedResult type="const">$createData2.firstname$</expectedResult>
394+
<assertElementContainsAttribute stepKey="assertElementContainsAttribute7">
395+
<expectedResult selector="#username" attribute="value" type="const">$createData2.firstname$</expectedResult>
286396
</assertElementContainsAttribute>
287-
<assertElementContainsAttribute stepKey="assertElementContainsAttribute8" selector="#username" attribute="value">
288-
<expectedResult type="const">$$createData1.firstname$$</expectedResult>
397+
<assertElementContainsAttribute stepKey="assertElementContainsAttribute8">
398+
<expectedResult selector="#username" attribute="value" type="const">$$createData1.firstname$$</expectedResult>
289399
</assertElementContainsAttribute>
290400

291401
<!-- assert entity resolution -->

0 commit comments

Comments
 (0)