Skip to content

MQE-683: Assert action deprecation + upgrade #614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Mar 12, 2020
Merged

MQE-683: Assert action deprecation + upgrade #614

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
61027d9
MQE-683: [Deprecation] Only use more nested assertion syntax
KevinBKozan Feb 27, 2020
35818bb
MQE-683: [Deprecation] Only use more nested assertion syntax
KevinBKozan Feb 27, 2020
173f9b3
MQE-683: [Deprecation] Only use more nested assertion syntax
KevinBKozan Mar 2, 2020
fecb9f6
MQE-683: [Deprecation] Only use more nested assertion syntax
KevinBKozan Mar 2, 2020
e5666c1
MQE-683: [Deprecation] Only use more nested assertion syntax
KevinBKozan Mar 2, 2020
ac8d76e
MQE-683: [Deprecation] Only use more nested assertion syntax
KevinBKozan Mar 2, 2020
3a901e3
MQE-683: [Deprecation] Only use more nested assertion syntax
KevinBKozan Mar 3, 2020
af17d02
MQE-683: [Deprecation] Only use more nested assertion syntax
KevinBKozan Mar 3, 2020
79cae33
Merge branch 'develop' into MQE-683
KevinBKozan Mar 3, 2020
f578c08
MQE-683: [Deprecation] Only use more nested assertion syntax
KevinBKozan Mar 4, 2020
21e7f2d
MQE-683: [Deprecation] Only use more nested assertion syntax
KevinBKozan Mar 11, 2020
faa5397
Merge branch 'develop' into MQE-683
KevinBKozan Mar 12, 2020
0a21795
MQE-683: [Deprecation] Only use more nested assertion syntax
KevinBKozan Mar 12, 2020
9357cf7
MQE-683: [Deprecation] Only use more nested assertion syntax
KevinBKozan Mar 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
224 changes: 167 additions & 57 deletions dev/tests/verification/TestModule/Test/AssertTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,47 +157,157 @@

<!-- asserts backward compatible -->
<comment stepKey="commentBackwardCompatible" userInput="asserts backward compatible"/>
<assertArrayHasKey stepKey="assertArrayHasKeyBackwardCompatible" expected="apple" expectedType="string" actual="['orange' => 2, 'apple' => 1]" actualType="const" message="pass"/>
<assertArrayNotHasKey stepKey="assertArrayNotHasKeyBackwardCompatible" expected="kiwi" expectedType="string" actual="['orange' => 2, 'apple' => 1]" message="pass"/>
<assertArraySubset stepKey="assertArraySubsetBackwardCompatible" expected="[1, 2]" actual="[1, 2, 3, 5]" message="pass"/>
<assertContains stepKey="assertContainsBackwardCompatible" expected="ab" expectedType="string" actual="['item1' => 'a', 'item2' => 'ab']" message="pass"/>
<assertCount stepKey="assertCountBackwardCompatible" expected="2" expectedType="int" actual="['a', 'b']" message="pass"/>
<assertEmpty stepKey="assertEmptyBackwardCompatible" actual="[]" message="pass"/>
<assertEquals stepKey="assertEquals1BackwardCompatible" expected="text" expectedType="variable" actual="Copyright © 2013-2017 Magento, Inc. All rights reserved." actualType="string" message="pass"/>
<assertEquals stepKey="assertEquals2BackwardCompatible" expected="Copyright © 2013-2017 Magento, Inc. All rights reserved." expectedType="string" actual="text" actualType="variable" message="pass"/>
<assertFalse stepKey="assertFalse1BackwardCompatible" actual="0" actualType="bool" message="pass"/>
<assertFileNotExists stepKey="assertFileNotExists1BackwardCompatible" actual="/out.txt" actualType="string" message="pass"/>
<assertFileNotExists stepKey="assertFileNotExists2BackwardCompatible" actual="$text" actualType="variable" message="pass"/>
<assertGreaterOrEquals stepKey="assertGreaterOrEqualsBackwardCompatible" expected="2" expectedType="int" actual="5" actualType="int" message="pass"/>
<assertGreaterThan stepKey="assertGreaterThanBackwardCompatible" expected="2" expectedType="int" actual="5" actualType="int" message="pass"/>
<assertGreaterThanOrEqual stepKey="assertGreaterThanOrEqualBackwardCompatible" expected="2" expectedType="int" actual="5" actualType="int" message="pass"/>
<assertInternalType stepKey="assertInternalType1BackwardCompatible" expected="string" expectedType="string" actual="xyz" actualType="string" message="pass"/>
<assertInternalType stepKey="assertInternalType2BackwardCompatible" expected="int" expectedType="string" actual="21" actualType="int" message="pass"/>
<assertInternalType stepKey="assertInternalType3BackwardCompatible" expected="string" expectedType="string" actual="$text" actualType="variable" message="pass"/>
<assertLessOrEquals stepKey="assertLessOrEqualBackwardCompatibles" expected="5" expectedType="int" actual="2" actualType="int" message="pass"/>
<assertLessThan stepKey="assertLessThanBackwardCompatible" expected="5" expectedType="int" actual="2" actualType="int" message="pass"/>
<assertLessThanOrEqual stepKey="assertLessThanOrEqualBackwardCompatible" expected="5" expectedType="int" actual="2" actualType="int" message="pass"/>
<assertNotContains stepKey="assertNotContains1BackwardCompatible" expected="bc" expectedType="string" actual="['item1' => 'a', 'item2' => 'ab']" message="pass"/>
<assertNotContains stepKey="assertNotContains2BackwardCompatible" expected="bc" expectedType="string" actual="text" actualType="variable" message="pass"/>
<assertNotEmpty stepKey="assertNotEmpty1BackwardCompatible" actual="[1, 2]" message="pass"/>
<assertNotEmpty stepKey="assertNotEmpty2BackwardCompatible" actual="text" actualType="variable" message="pass"/>
<assertNotEquals stepKey="assertNotEqualsBackwardCompatible" expected="2" expectedType="int" actual="5" actualType="int" message="pass" delta=""/>
<assertNotNull stepKey="assertNotNull1BackwardCompatible" actual="abc" actualType="string" message="pass"/>
<assertNotNull stepKey="assertNotNull2BackwardCompatible" actual="text" actualType="variable" message="pass"/>
<assertNotRegExp stepKey="assertNotRegExpBackwardCompatible" expected="/foo/" expectedType="string" actual="bar" actualType="string" message="pass"/>
<assertNotSame stepKey="assertNotSameBackwardCompatible" expected="log" expectedType="string" actual="tag" actualType="string" message="pass"/>
<assertRegExp stepKey="assertRegExpBackwardCompatible" expected="/foo/" expectedType="string" actual="foo" actualType="string" message="pass"/>
<assertSame stepKey="assertSameBackwardCompatible" expected="bar" expectedType="string" actual="bar" actualType="string" message="pass"/>
<assertStringStartsNotWith stepKey="assertStringStartsNotWithBackwardCompatible" expected="a" expectedType="string" actual="banana" actualType="string" message="pass"/>
<assertStringStartsWith stepKey="assertStringStartsWithBackwardCompatible" expected="a" expectedType="string" actual="apple" actualType="string" message="pass"/>
<assertTrue stepKey="assertTrueBackwardCompatible" actual="1" actualType="bool" message="pass"/>
<assertElementContainsAttribute selector="#username" attribute="class" expectedValue="admin__control-text" stepKey="assertElementContainsAttributeBackwardCompatible"/>
<assertInstanceOf stepKey="assertInstanceOfBackwardCompatible" expected="User::class" actual="text" actualType="variable" message="pass"/>
<assertNotInstanceOf stepKey="assertNotInstanceOfBackwardCompatible" expected="User::class" actual="21" actualType="int" message="pass"/>
<assertFileExists stepKey="assertFileExistsBackwardCompatible" actual="text" actualType="variable" message="pass"/>
<assertIsEmpty stepKey="assertIsEmptyBackwardCompatible" actual="text" actualType="variable" message="pass"/>
<assertNull stepKey="assertNullBackwardCompatible" actual="text" actualType="variable" message="pass"/>
<expectException stepKey="expectExceptionBackwardCompatible" expected="new MyException('exception msg')" actual="function() {$this->doSomethingBad();}"/>
<assertArrayHasKey stepKey="assertArrayHasKeyBackwardCompatible" message="pass">
<expectedResult type="string">apple</expectedResult>
<actualResult type="const">['orange' => 2, 'apple' => 1]</actualResult>
</assertArrayHasKey>
<assertArrayNotHasKey stepKey="assertArrayNotHasKeyBackwardCompatible" message="pass">
<expectedResult type="string">kiwi</expectedResult>
<actualResult type="const">['orange' => 2, 'apple' => 1]</actualResult>
</assertArrayNotHasKey>
<assertArraySubset stepKey="assertArraySubsetBackwardCompatible" message="pass">
<actualResult type="const">[1, 2, 3, 5]</actualResult>
<expectedResult type="const">[1, 2]</expectedResult>
</assertArraySubset>
<assertContains stepKey="assertContainsBackwardCompatible" message="pass">
<expectedResult type="string">ab</expectedResult>
<actualResult type="const">['item1' => 'a', 'item2' => 'ab']</actualResult>
</assertContains>
<assertCount stepKey="assertCountBackwardCompatible" message="pass">
<actualResult type="const">['a', 'b']</actualResult>
<expectedResult type="int">2</expectedResult>
</assertCount>
<assertEmpty stepKey="assertEmptyBackwardCompatible" message="pass">
<actualResult type="const">[]</actualResult>
</assertEmpty>
<assertEquals stepKey="assertEquals1BackwardCompatible" message="pass">
<actualResult type="string">Copyright © 2013-2017 Magento, Inc. All rights reserved.</actualResult>
<expectedResult type="variable">text</expectedResult>
</assertEquals>
<assertEquals stepKey="assertEquals2BackwardCompatible" message="pass">
<actualResult type="variable">text</actualResult>
<expectedResult type="string">Copyright © 2013-2017 Magento, Inc. All rights reserved.</expectedResult>
</assertEquals>
<assertFalse stepKey="assertFalse1BackwardCompatible" message="pass">
<actualResult type="bool">0</actualResult>
</assertFalse>
<assertFileNotExists stepKey="assertFileNotExists1BackwardCompatible" message="pass">
<actualResult type="string">/out.txt</actualResult>
</assertFileNotExists>
<assertFileNotExists stepKey="assertFileNotExists2BackwardCompatible" message="pass">
<actualResult type="variable">$text</actualResult>
</assertFileNotExists>
<assertGreaterOrEquals stepKey="assertGreaterOrEqualsBackwardCompatible" message="pass">
<actualResult type="int">5</actualResult>
<expectedResult type="int">2</expectedResult>
</assertGreaterOrEquals>
<assertGreaterThan stepKey="assertGreaterThanBackwardCompatible" message="pass">
<actualResult type="int">5</actualResult>
<expectedResult type="int">2</expectedResult>
</assertGreaterThan>
<assertGreaterThanOrEqual stepKey="assertGreaterThanOrEqualBackwardCompatible" message="pass">
<actualResult type="int">5</actualResult>
<expectedResult type="int">2</expectedResult>
</assertGreaterThanOrEqual>
<assertInternalType stepKey="assertInternalType1BackwardCompatible" message="pass">
<actualResult type="string">xyz</actualResult>
<expectedResult type="string">string</expectedResult>
</assertInternalType>
<assertInternalType stepKey="assertInternalType2BackwardCompatible" message="pass">
<actualResult type="int">21</actualResult>
<expectedResult type="string">int</expectedResult>
</assertInternalType>
<assertInternalType stepKey="assertInternalType3BackwardCompatible" message="pass">
<actualResult type="variable">$text</actualResult>
<expectedResult type="string">string</expectedResult>
</assertInternalType>
<assertLessOrEquals stepKey="assertLessOrEqualBackwardCompatibles" message="pass">
<actualResult type="int">2</actualResult>
<expectedResult type="int">5</expectedResult>
</assertLessOrEquals>
<assertLessThan stepKey="assertLessThanBackwardCompatible" message="pass">
<actualResult type="int">2</actualResult>
<expectedResult type="int">5</expectedResult>
</assertLessThan>
<assertLessThanOrEqual stepKey="assertLessThanOrEqualBackwardCompatible" message="pass">
<actualResult type="int">2</actualResult>
<expectedResult type="int">5</expectedResult>
</assertLessThanOrEqual>
<assertNotContains stepKey="assertNotContains1BackwardCompatible" message="pass">
<expectedResult type="string">bc</expectedResult>
<actualResult type="const">['item1' => 'a', 'item2' => 'ab']</actualResult>
</assertNotContains>
<assertNotContains stepKey="assertNotContains2BackwardCompatible" message="pass">
<actualResult type="variable">text</actualResult>
<expectedResult type="string">bc</expectedResult>
</assertNotContains>
<assertNotEmpty stepKey="assertNotEmpty1BackwardCompatible" message="pass">
<actualResult type="const">[1, 2]</actualResult>
</assertNotEmpty>
<assertNotEmpty stepKey="assertNotEmpty2BackwardCompatible" message="pass">
<actualResult type="variable">text</actualResult>
</assertNotEmpty>
<assertNotEquals stepKey="assertNotEqualsBackwardCompatible" message="pass" delta="">
<actualResult type="int">5</actualResult>
<expectedResult type="int">2</expectedResult>
</assertNotEquals>
<assertNotNull stepKey="assertNotNull1BackwardCompatible" message="pass">
<actualResult type="string">abc</actualResult>
</assertNotNull>
<assertNotNull stepKey="assertNotNull2BackwardCompatible" message="pass">
<actualResult type="variable">text</actualResult>
</assertNotNull>
<assertNotRegExp stepKey="assertNotRegExpBackwardCompatible" message="pass">
<actualResult type="string">bar</actualResult>
<expectedResult type="string">/foo/</expectedResult>
</assertNotRegExp>
<assertNotSame stepKey="assertNotSameBackwardCompatible" message="pass">
<actualResult type="string">tag</actualResult>
<expectedResult type="string">log</expectedResult>
</assertNotSame>
<assertRegExp stepKey="assertRegExpBackwardCompatible" message="pass">
<actualResult type="string">foo</actualResult>
<expectedResult type="string">/foo/</expectedResult>
</assertRegExp>
<assertSame stepKey="assertSameBackwardCompatible" message="pass">
<actualResult type="string">bar</actualResult>
<expectedResult type="string">bar</expectedResult>
</assertSame>
<assertStringStartsNotWith stepKey="assertStringStartsNotWithBackwardCompatible" message="pass">
<actualResult type="string">banana</actualResult>
<expectedResult type="string">a</expectedResult>
</assertStringStartsNotWith>
<assertStringStartsWith stepKey="assertStringStartsWithBackwardCompatible" message="pass">
<actualResult type="string">apple</actualResult>
<expectedResult type="string">a</expectedResult>
</assertStringStartsWith>
<assertTrue stepKey="assertTrueBackwardCompatible" message="pass">
<actualResult type="bool">1</actualResult>
</assertTrue>
<assertElementContainsAttribute stepKey="assertElementContainsAttributeBackwardCompatible">
<expectedResult selector="#username" attribute="class" type="string">admin__control-text</expectedResult>
</assertElementContainsAttribute>
<assertInstanceOf stepKey="assertInstanceOfBackwardCompatible" message="pass">
<actualResult type="variable">text</actualResult>
<expectedResult type="const">User::class</expectedResult>
</assertInstanceOf>
<assertNotInstanceOf stepKey="assertNotInstanceOfBackwardCompatible" message="pass">
<actualResult type="int">21</actualResult>
<expectedResult type="const">User::class</expectedResult>
</assertNotInstanceOf>
<assertFileExists stepKey="assertFileExistsBackwardCompatible" message="pass">
<actualResult type="variable">text</actualResult>
</assertFileExists>
<assertIsEmpty stepKey="assertIsEmptyBackwardCompatible" message="pass">
<actualResult type="variable">text</actualResult>
</assertIsEmpty>
<assertNull stepKey="assertNullBackwardCompatible" message="pass">
<actualResult type="variable">text</actualResult>
</assertNull>
<expectException stepKey="expectExceptionBackwardCompatible">
<expectedResult type="const">new MyException('exception msg')</expectedResult>
<actualResult type="const">function() {$this->doSomethingBad();}</actualResult>
</expectException>

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

<!-- assertElementContainsAttribute examples -->
<assertElementContainsAttribute stepKey="assertElementContainsAttribute1" selector="#username" attribute="class">
<expectedResult type="string">admin__control-text</expectedResult>
<assertElementContainsAttribute stepKey="assertElementContainsAttribute1">
<expectedResult selector="#username" attribute="class" type="string">admin__control-text</expectedResult>
</assertElementContainsAttribute>
<assertElementContainsAttribute stepKey="assertElementContainsAttribute2" selector="#username" attribute="name">
<expectedResult type="string">login[username]</expectedResult>
<assertElementContainsAttribute stepKey="assertElementContainsAttribute2">
<expectedResult selector="#username" attribute="name" type="string">login[username]</expectedResult>
</assertElementContainsAttribute>
<assertElementContainsAttribute stepKey="assertElementContainsAttribute3" selector="#username" attribute="autofocus">
<expectedResult type="string">true</expectedResult>
<assertElementContainsAttribute stepKey="assertElementContainsAttribute3">
<expectedResult selector="#username" attribute="autofocus" type="string">true</expectedResult>
</assertElementContainsAttribute>
<assertElementContainsAttribute stepKey="assertElementContainsAttribute4" selector="#username" attribute="data-validate">
<expectedResult type="string">{required:true}</expectedResult>
<assertElementContainsAttribute stepKey="assertElementContainsAttribute4">
<expectedResult selector="#username" attribute="data-validate" type="string">{required:true}</expectedResult>
</assertElementContainsAttribute>
<assertElementContainsAttribute stepKey="assertElementContainsAttribute5" selector=".admin__menu-overlay" attribute="style">
<expectedResult type="string">display: none;</expectedResult>
<assertElementContainsAttribute stepKey="assertElementContainsAttribute5">
<expectedResult selector=".admin__menu-overlay" attribute="style" type="string">display: none;</expectedResult>
</assertElementContainsAttribute>
<assertElementContainsAttribute stepKey="assertElementContainsAttribute6" selector=".admin__menu-overlay" attribute="border">
<expectedResult type="string">0</expectedResult>
<assertElementContainsAttribute stepKey="assertElementContainsAttribute6">
<expectedResult selector=".admin__menu-overlay" attribute="border" type="string">0</expectedResult>
</assertElementContainsAttribute>
<assertElementContainsAttribute stepKey="assertElementContainsAttribute7" selector="#username" attribute="value">
<expectedResult type="const">$createData2.firstname$</expectedResult>
<assertElementContainsAttribute stepKey="assertElementContainsAttribute7">
<expectedResult selector="#username" attribute="value" type="const">$createData2.firstname$</expectedResult>
</assertElementContainsAttribute>
<assertElementContainsAttribute stepKey="assertElementContainsAttribute8" selector="#username" attribute="value">
<expectedResult type="const">$$createData1.firstname$$</expectedResult>
<assertElementContainsAttribute stepKey="assertElementContainsAttribute8">
<expectedResult selector="#username" attribute="value" type="const">$$createData1.firstname$$</expectedResult>
</assertElementContainsAttribute>

<!-- assert entity resolution -->
Expand Down
Loading