Skip to content

Commit 7b10cfa

Browse files
KevinBKozanKevinBKozan
authored
MQE-559: Use more descriptive assertion syntax
- AssertsTest update to conform to new Assertion Syntax.
1 parent 63fe2ce commit 7b10cfa

File tree

1 file changed

+49
-67
lines changed
  • dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test

1 file changed

+49
-67
lines changed

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/AssertsTest.xml

Lines changed: 49 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -13,83 +13,65 @@
1313
<features value="Test Asserts"/>
1414
<group value="skip"/>
1515
</annotations>
16-
<before>
17-
<createData entity="Simple_US_Customer" stepKey="createData1"/>
18-
</before>
19-
<after>
20-
<deleteData createDataKey="createData1" stepKey="deleteData1"/>
21-
</after>
2216

2317
<createData entity="Simple_US_Customer" stepKey="createData2"/>
2418
<amOnUrl url="https://www.yahoo.com" stepKey="amOnPage"/>
2519
<waitForElementVisible stepKey="wait1" selector="#uh-logo" time="10"/>
2620
<grabTextFrom selector="#uh-logo" stepKey="grabTextFrom1"/>
2721

2822
<!-- asserts without variable replacement -->
29-
<comment stepKey="c1" userInput="asserts without variable replacement"/>
30-
<assertArrayHasKey stepKey="assertArrayHasKey" expected="apple" expectedType="string" actual="['orange' => 2, 'apple' => 1]" actualType="const" message="pass"/>
31-
<assertArrayNotHasKey stepKey="assertArrayNotHasKey" expected="kiwi" expectedType="string" actual="['orange' => 2, 'apple' => 1]" message="pass"/>
32-
<assertArraySubset stepKey="assertArraySubset" expected="[1, 2]" actual="[1, 2, 3, 5]" message="pass"/>
33-
<assertContains stepKey="assertContains" expected="ab" expectedType="string" actual="['item1' => 'a', 'item2' => 'ab']" message="pass"/>
34-
<assertCount stepKey="assertCount" expected="2" expectedType="int" actual="['a', 'b']" message="pass"/>
35-
<assertEmpty stepKey="assertEmpty" actual="[]" message="pass"/>
36-
<assertEquals stepKey="assertEquals1" expected="text" expectedType="variable" actual="Yahoo" actualType="string" message="pass"/>
37-
<assertEquals stepKey="assertEquals2" expected="Yahoo" expectedType="string" actual="text" actualType="variable" message="pass"/>
38-
<assertFalse stepKey="assertFalse1" actual="0" actualType="bool" message="pass"/>
39-
<assertFileNotExists stepKey="assertFileNotExists1" actual="/out.txt" actualType="string" message="pass"/>
40-
<assertFileNotExists stepKey="assertFileNotExists2" actual="text" actualType="variable" message="pass"/>
41-
<assertGreaterOrEquals stepKey="assertGreaterOrEquals" expected="2" expectedType="int" actual="5" actualType="int" message="pass"/>
42-
<assertGreaterThan stepKey="assertGreaterThan" expected="2" expectedType="int" actual="5" actualType="int" message="pass"/>
43-
<assertGreaterThanOrEqual stepKey="assertGreaterThanOrEqual" expected="2" expectedType="int" actual="5" actualType="int" message="pass"/>
44-
<assertInternalType stepKey="assertInternalType1" expected="string" expectedType="string" actual="xyz" actualType="string" message="pass"/>
45-
<assertInternalType stepKey="assertInternalType2" expected="int" expectedType="string" actual="21" actualType="int" message="pass"/>
46-
<assertInternalType stepKey="assertInternalType3" expected="string" expectedType="string" actual="text" actualType="variable" message="pass"/>
47-
<assertLessOrEquals stepKey="assertLessOrEquals" expected="5" expectedType="int" actual="2" actualType="int" message="pass"/>
48-
<assertLessThan stepKey="assertLessThan" expected="5" expectedType="int" actual="2" actualType="int" message="pass"/>
49-
<assertLessThanOrEqual stepKey="assertLessThanOrEqual" expected="5" expectedType="int" actual="2" actualType="int" message="pass"/>
50-
<assertNotContains stepKey="assertNotContains1" expected="bc" expectedType="string" actual="['item1' => 'a', 'item2' => 'ab']" message="pass"/>
51-
<assertNotContains stepKey="assertNotContains2" expected="bc" expectedType="string" actual="text" actualType="variable" message="pass"/>
52-
<assertNotEmpty stepKey="assertNotEmpty1" actual="[1, 2]" message="pass"/>
53-
<assertNotEmpty stepKey="assertNotEmpty2" actual="text" actualType="variable" message="pass"/>
54-
<assertNotEquals stepKey="assertNotEquals" expected="2" expectedType="int" actual="5" actualType="int" message="pass" delta=""/>
55-
<assertNotNull stepKey="assertNotNull1" actual="abc" actualType="string" message="pass"/>
56-
<assertNotNull stepKey="assertNotNull2" actual="text" actualType="variable" message="pass"/>
57-
<assertNotRegExp stepKey="assertNotRegExp" expected="/foo/" expectedType="string" actual="bar" actualType="string" message="pass"/>
58-
<assertNotSame stepKey="assertNotSame" expected="log" expectedType="string" actual="tag" actualType="string" message="pass"/>
59-
<assertRegExp stepKey="assertRegExp" expected="/foo/" expectedType="string" actual="foo" actualType="string" message="pass"/>
60-
<assertSame stepKey="assertSame" expected="bar" expectedType="string" actual="bar" actualType="string" message="pass"/>
61-
<assertStringStartsNotWith stepKey="assertStringStartsNotWith" expected="a" expectedType="string" actual="banana" actualType="string" message="pass"/>
62-
<assertStringStartsWith stepKey="assertStringStartsWith" expected="a" expectedType="string" actual="apple" actualType="string" message="pass"/>
63-
<assertTrue stepKey="assertTrue" actual="1" actualType="bool" message="pass"/>
23+
<assertArrayHasKey stepKey="assertArrayHasKey" message="pass">
24+
<expectedResult type="string">apple</expectedResult>
25+
<actualResult type="const">['orange' => 2, 'apple' => 1]</actualResult>
26+
</assertArrayHasKey>
27+
<assertEquals stepKey="assertEquals1" message="pass">
28+
<expectedResult type="variable">grabTextFrom1</expectedResult>
29+
<actualResult type="string">Copyright © 2013-2017 Magento, Inc. All rights reserved.</actualResult>
30+
</assertEquals>
31+
<assertFalse stepKey="assertFalse1" message="pass">
32+
<actualResult type="bool">0</actualResult>
33+
</assertFalse>
34+
<assertGreaterOrEquals stepKey="assertGreaterOrEquals" message="pass">
35+
<expectedResult type="int">2</expectedResult>
36+
<actualResult type="int">5</actualResult>
37+
</assertGreaterOrEquals>
38+
<assertElementContainsAttribute stepKey="assertElementContainsAttribute1" selector="#username" attribute="class">
39+
<expectedResult type="string">admin__control-text</expectedResult>
40+
</assertElementContainsAttribute>
6441

6542
<!-- string type that use created data -->
66-
<comment stepKey="c2" userInput="string type that use created data"/>
67-
<assertStringStartsWith stepKey="assert1" expected="D" expectedType="string" actual="$$createData1.lastname$$, $$createData1.firstname$$" actualType="string" message="fail"/>
68-
<assertStringStartsNotWith stepKey="assert2" expected="W" expectedType="string" actual="$createData2.firstname$ $createData2.lastname$" actualType="string" message="pass"/>
69-
<assertEquals stepKey="assert5" expected="$$createData1.lastname$$" expectedType="string" actual="$$createData1.lastname$$" actualType="string" message="pass"/>
43+
<assertStringStartsWith stepKey="assert1" message="fail">
44+
<expectedResult type="string">D</expectedResult>
45+
<actualResult type="string">$$createData1.lastname$$, $$createData1.firstname$$</actualResult>
46+
</assertStringStartsWith>
47+
<assertStringStartsNotWith stepKey="assert2" message="pass">
48+
<expectedResult type="string">W</expectedResult>
49+
<actualResult type="string">$createData2.firstname$, $createData2.lastname$</actualResult>
50+
</assertStringStartsNotWith>
51+
<assertEquals stepKey="assert5" message="pass">
52+
<expectedResult type="string">$$createData1.lastname$$</expectedResult>
53+
<actualResult type="string">$$createData1.lastname$$</actualResult>
54+
</assertEquals>
55+
<assertElementContainsAttribute stepKey="assertElementContainsAttribute7" selector="#username" attribute="value">
56+
<expectedResult type="const">$createData2.firstname$</expectedResult>
57+
</assertElementContainsAttribute>
7058

7159
<!-- array type that use created data -->
72-
<comment stepKey="c3" userInput="array type that use created data"/>
73-
<assertArraySubset stepKey="assert9" expected="[$$createData1.lastname$$, $$createData1.firstname$$]" expectedType="array" actual="[$$createData1.lastname$$, $$createData1.firstname$$, 1]" actualType="array" message="pass"/>
74-
<assertArraySubset stepKey="assert10" expected="[$createData2.firstname$, $createData2.lastname$]" expectedType="array" actual="[$createData2.firstname$, $createData2.lastname$, 1]" actualType="array" message="pass"/>
75-
<assertArrayHasKey stepKey="assert3" expected="lastname" expectedType="string" actual="['lastname' => $$createData1.lastname$$, 'firstname' => $$createData1.firstname$$]" actualType="array" message="pass"/>
76-
<assertArrayHasKey stepKey="assert4" expected="lastname" expectedType="string" actual="['lastname' => $createData2.lastname$, 'firstname' => $createData2.firstname$]" actualType="array" message="pass"/>
77-
78-
<!-- comment this section before running this test -->
79-
<comment stepKey="c4" userInput="comment this section before running this test"/>
80-
<assertInstanceOf stepKey="assertInstanceOf" expected="User::class" actual="text" actualType="variable" message="pass"/>
81-
<assertNotInstanceOf stepKey="assertNotInstanceOf" expected="User::class" actual="21" actualType="int" message="pass"/>
82-
<assertFileExists stepKey="assertFileExists2" actual="text" actualType="variable" message="pass"/>
83-
<assertFileExists stepKey="assert6" actual="AssertCest.php" actualType="string" message="pass"/>
84-
<assertIsEmpty stepKey="assertIsEmpty" actual="text" actualType="variable" message="pass"/>
85-
<assertNull stepKey="assertNull" actual="text" actualType="variable" message="pass"/>
86-
<expectException stepKey="expectException" expected="new MyException('exception msg')" actual="function() {$this->doSomethingBad();}"/>
87-
<fail stepKey="fail" message="fail"/>
88-
<fail stepKey="assert7" message="$createData2.firstname$ $createData2.lastname$"/>
89-
<fail stepKey="assert8" message="$$createData1.firstname$$ $$createData1.lastname$$"/>
90-
<!-- comment end -->
91-
<comment stepKey="c5" userInput="comment end"/>
92-
93-
<deleteData createDataKey="createData2" stepKey="deleteData2"/>
60+
<assertArraySubset stepKey="assert9" message="pass">
61+
<expectedResult type="array">[$$createData1.lastname$$, $$createData1.firstname$$]</expectedResult>
62+
<actualResult type="array">[$$createData1.lastname$$, $$createData1.firstname$$, 1]</actualResult>
63+
</assertArraySubset>
64+
<assertArraySubset stepKey="assert10" message="pass">
65+
<expectedResult type="array">[$createData2.firstname$, $createData2.lastname$]</expectedResult>
66+
<actualResult type="array">[$createData2.firstname$, $createData2.lastname$, 1]</actualResult>
67+
</assertArraySubset>
68+
<assertArrayHasKey stepKey="assert3" message="pass">
69+
<expectedResult type="string">lastname</expectedResult>
70+
<actualResult type="array">['lastname' => $$createData1.lastname$$, 'firstname' => $$createData1.firstname$$]</actualResult>
71+
</assertArrayHasKey>
72+
<assertArrayHasKey stepKey="assert4" message="pass">
73+
<expectedResult type="string">lastname</expectedResult>
74+
<actualResult type="array">['lastname' => $createData2.lastname$, 'firstname' => $createData2.firstname$]</actualResult>
75+
</assertArrayHasKey>
9476
</test>
9577
</tests>

0 commit comments

Comments
 (0)