Skip to content

Commit 9b87581

Browse files
okolesnykokolesnyk
committed
Merge branch 'MQE-814' of github.com:magento/magento2-functional-testing-framework into develop
2 parents f03f1e1 + a2dcb96 commit 9b87581

File tree

2 files changed

+86
-0
lines changed

2 files changed

+86
-0
lines changed

‎dev/tests/verification/Resources/AssertTest.txt

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,48 @@ class AssertTestCest
8585
$I->assertStringStartsNotWith("a", "banana", "pass");
8686
$I->assertStringStartsWith("a", "apple", "pass");
8787
$I->assertTrue(true, "pass");
88+
$I->comment("asserts backward compatible");
89+
$I->assertArrayHasKey("apple", ['orange' => 2, 'apple' => 1], "pass");
90+
$I->assertArrayNotHasKey("kiwi", ['orange' => 2, 'apple' => 1], "pass");
91+
$I->assertArraySubset([1, 2], [1, 2, 3, 5], "pass");
92+
$I->assertContains("ab", ['item1' => 'a', 'item2' => 'ab'], "pass");
93+
$I->assertCount(2, ['a', 'b'], "pass");
94+
$I->assertEmpty([], "pass");
95+
$I->assertEquals($text, "Copyright © 2013-2017 Magento, Inc. All rights reserved.", "pass");
96+
$I->assertEquals("Copyright © 2013-2017 Magento, Inc. All rights reserved.", $text, "pass");
97+
$I->assertFalse(false, "pass");
98+
$I->assertFileNotExists("/out.txt", "pass");
99+
$I->assertFileNotExists($text, "pass");
100+
$I->assertGreaterOrEquals(2, 5, "pass");
101+
$I->assertGreaterThan(2, 5, "pass");
102+
$I->assertGreaterThanOrEqual(2, 5, "pass");
103+
$I->assertInternalType("string", "xyz", "pass");
104+
$I->assertInternalType("int", 21, "pass");
105+
$I->assertInternalType("string", $text, "pass");
106+
$I->assertLessOrEquals(5, 2, "pass");
107+
$I->assertLessThan(5, 2, "pass");
108+
$I->assertLessThanOrEqual(5, 2, "pass");
109+
$I->assertNotContains("bc", ['item1' => 'a', 'item2' => 'ab'], "pass");
110+
$I->assertNotContains("bc", $text, "pass");
111+
$I->assertNotEmpty([1, 2], "pass");
112+
$I->assertNotEmpty($text, "pass");
113+
$I->assertNotEquals(2, 5, "pass", 0);
114+
$I->assertNotNull("abc", "pass");
115+
$I->assertNotNull($text, "pass");
116+
$I->assertNotRegExp("/foo/", "bar", "pass");
117+
$I->assertNotSame("log", "tag", "pass");
118+
$I->assertRegExp("/foo/", "foo", "pass");
119+
$I->assertSame("bar", "bar", "pass");
120+
$I->assertStringStartsNotWith("a", "banana", "pass");
121+
$I->assertStringStartsWith("a", "apple", "pass");
122+
$I->assertTrue(true, "pass");
123+
$I->assertElementContainsAttribute("#username", "class", "admin__control-text");
124+
$I->assertInstanceOf(User::class, $text, "pass");
125+
$I->assertNotInstanceOf(User::class, 21, "pass");
126+
$I->assertFileExists($text, "pass");
127+
$I->assertIsEmpty($text, "pass");
128+
$I->assertNull($text, "pass");
129+
$I->expectException(new MyException('exception msg'), function() {$this->doSomethingBad();});
88130
$I->comment("string type that use created data");
89131
$I->assertStringStartsWith("D", $this->createData1->getCreatedDataByName('lastname') . ", " . $this->createData1->getCreatedDataByName('firstname'), "fail");
90132
$I->assertStringStartsNotWith("W", $createData2->getCreatedDataByName('firstname') . ", " . $createData2->getCreatedDataByName('lastname'), "pass");

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

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,50 @@
151151
<actualResult type="bool">1</actualResult>
152152
</assertTrue>
153153

154+
<!-- asserts backward compatible -->
155+
<comment stepKey="commentBackwardCompatible" userInput="asserts backward compatible"/>
156+
<assertArrayHasKey stepKey="assertArrayHasKeyBackwardCompatible" expected="apple" expectedType="string" actual="['orange' => 2, 'apple' => 1]" actualType="const" message="pass"/>
157+
<assertArrayNotHasKey stepKey="assertArrayNotHasKeyBackwardCompatible" expected="kiwi" expectedType="string" actual="['orange' => 2, 'apple' => 1]" message="pass"/>
158+
<assertArraySubset stepKey="assertArraySubsetBackwardCompatible" expected="[1, 2]" actual="[1, 2, 3, 5]" message="pass"/>
159+
<assertContains stepKey="assertContainsBackwardCompatible" expected="ab" expectedType="string" actual="['item1' => 'a', 'item2' => 'ab']" message="pass"/>
160+
<assertCount stepKey="assertCountBackwardCompatible" expected="2" expectedType="int" actual="['a', 'b']" message="pass"/>
161+
<assertEmpty stepKey="assertEmptyBackwardCompatible" actual="[]" message="pass"/>
162+
<assertEquals stepKey="assertEquals1BackwardCompatible" expected="text" expectedType="variable" actual="Copyright © 2013-2017 Magento, Inc. All rights reserved." actualType="string" message="pass"/>
163+
<assertEquals stepKey="assertEquals2BackwardCompatible" expected="Copyright © 2013-2017 Magento, Inc. All rights reserved." expectedType="string" actual="text" actualType="variable" message="pass"/>
164+
<assertFalse stepKey="assertFalse1BackwardCompatible" actual="0" actualType="bool" message="pass"/>
165+
<assertFileNotExists stepKey="assertFileNotExists1BackwardCompatible" actual="/out.txt" actualType="string" message="pass"/>
166+
<assertFileNotExists stepKey="assertFileNotExists2BackwardCompatible" actual="$text" actualType="variable" message="pass"/>
167+
<assertGreaterOrEquals stepKey="assertGreaterOrEqualsBackwardCompatible" expected="2" expectedType="int" actual="5" actualType="int" message="pass"/>
168+
<assertGreaterThan stepKey="assertGreaterThanBackwardCompatible" expected="2" expectedType="int" actual="5" actualType="int" message="pass"/>
169+
<assertGreaterThanOrEqual stepKey="assertGreaterThanOrEqualBackwardCompatible" expected="2" expectedType="int" actual="5" actualType="int" message="pass"/>
170+
<assertInternalType stepKey="assertInternalType1BackwardCompatible" expected="string" expectedType="string" actual="xyz" actualType="string" message="pass"/>
171+
<assertInternalType stepKey="assertInternalType2BackwardCompatible" expected="int" expectedType="string" actual="21" actualType="int" message="pass"/>
172+
<assertInternalType stepKey="assertInternalType3BackwardCompatible" expected="string" expectedType="string" actual="$text" actualType="variable" message="pass"/>
173+
<assertLessOrEquals stepKey="assertLessOrEqualBackwardCompatibles" expected="5" expectedType="int" actual="2" actualType="int" message="pass"/>
174+
<assertLessThan stepKey="assertLessThanBackwardCompatible" expected="5" expectedType="int" actual="2" actualType="int" message="pass"/>
175+
<assertLessThanOrEqual stepKey="assertLessThanOrEqualBackwardCompatible" expected="5" expectedType="int" actual="2" actualType="int" message="pass"/>
176+
<assertNotContains stepKey="assertNotContains1BackwardCompatible" expected="bc" expectedType="string" actual="['item1' => 'a', 'item2' => 'ab']" message="pass"/>
177+
<assertNotContains stepKey="assertNotContains2BackwardCompatible" expected="bc" expectedType="string" actual="text" actualType="variable" message="pass"/>
178+
<assertNotEmpty stepKey="assertNotEmpty1BackwardCompatible" actual="[1, 2]" message="pass"/>
179+
<assertNotEmpty stepKey="assertNotEmpty2BackwardCompatible" actual="text" actualType="variable" message="pass"/>
180+
<assertNotEquals stepKey="assertNotEqualsBackwardCompatible" expected="2" expectedType="int" actual="5" actualType="int" message="pass" delta=""/>
181+
<assertNotNull stepKey="assertNotNull1BackwardCompatible" actual="abc" actualType="string" message="pass"/>
182+
<assertNotNull stepKey="assertNotNull2BackwardCompatible" actual="text" actualType="variable" message="pass"/>
183+
<assertNotRegExp stepKey="assertNotRegExpBackwardCompatible" expected="/foo/" expectedType="string" actual="bar" actualType="string" message="pass"/>
184+
<assertNotSame stepKey="assertNotSameBackwardCompatible" expected="log" expectedType="string" actual="tag" actualType="string" message="pass"/>
185+
<assertRegExp stepKey="assertRegExpBackwardCompatible" expected="/foo/" expectedType="string" actual="foo" actualType="string" message="pass"/>
186+
<assertSame stepKey="assertSameBackwardCompatible" expected="bar" expectedType="string" actual="bar" actualType="string" message="pass"/>
187+
<assertStringStartsNotWith stepKey="assertStringStartsNotWithBackwardCompatible" expected="a" expectedType="string" actual="banana" actualType="string" message="pass"/>
188+
<assertStringStartsWith stepKey="assertStringStartsWithBackwardCompatible" expected="a" expectedType="string" actual="apple" actualType="string" message="pass"/>
189+
<assertTrue stepKey="assertTrueBackwardCompatible" actual="1" actualType="bool" message="pass"/>
190+
<assertElementContainsAttribute selector="#username" attribute="class" expectedValue="admin__control-text" stepKey="assertElementContainsAttributeBackwardCompatible"/>
191+
<assertInstanceOf stepKey="assertInstanceOfBackwardCompatible" expected="User::class" actual="text" actualType="variable" message="pass"/>
192+
<assertNotInstanceOf stepKey="assertNotInstanceOfBackwardCompatible" expected="User::class" actual="21" actualType="int" message="pass"/>
193+
<assertFileExists stepKey="assertFileExistsBackwardCompatible" actual="text" actualType="variable" message="pass"/>
194+
<assertIsEmpty stepKey="assertIsEmptyBackwardCompatible" actual="text" actualType="variable" message="pass"/>
195+
<assertNull stepKey="assertNullBackwardCompatible" actual="text" actualType="variable" message="pass"/>
196+
<expectException stepKey="expectExceptionBackwardCompatible" expected="new MyException('exception msg')" actual="function() {$this->doSomethingBad();}"/>
197+
154198
<!-- string type that use created data -->
155199
<comment stepKey="c2" userInput="string type that use created data"/>
156200
<assertStringStartsWith stepKey="assert1" message="fail">

0 commit comments

Comments
 (0)