Skip to content

Commit c8855c0

Browse files
jilu1jilu1
authored
Merge pull request #677 from magento/MQE-2077
MQE-2077: [PHPUnit 9] Remove assertArraySubset, assertInternalType, a…
2 parents e9b96a3 + d2e6c55 commit c8855c0

File tree

6 files changed

+1
-87
lines changed

6 files changed

+1
-87
lines changed

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ class AssertTestCest
4343
$I->comment("asserts without variable replacement");
4444
$I->assertArrayHasKey("apple", ['orange' => 2, 'apple' => 1], "pass"); // stepKey: assertArrayHasKey
4545
$I->assertArrayNotHasKey("kiwi", ['orange' => 2, 'apple' => 1], "pass"); // stepKey: assertArrayNotHasKey
46-
$I->assertArraySubset([1, 2], [1, 2, 3, 5], "pass"); // stepKey: assertArraySubset
4746
$I->assertContains("ab", ['item1' => 'a', 'item2' => 'ab'], "pass"); // stepKey: assertContains
4847
$I->assertStringContainsString("apple", "apple", "pass"); // stepKey: assertStringContainsString
4948
$I->assertStringContainsStringIgnoringCase("Banana", "banana", "pass"); // stepKey: assertStringContainsStringIgnoringCase
@@ -58,9 +57,6 @@ class AssertTestCest
5857
$I->assertGreaterOrEquals(2, 5, "pass"); // stepKey: assertGreaterOrEquals
5958
$I->assertGreaterThan(2, 5, "pass"); // stepKey: assertGreaterthan
6059
$I->assertGreaterThanOrEqual(2, 5, "pass"); // stepKey: assertGreaterThanOrEqual
61-
$I->assertInternalType("string", "xyz", "pass"); // stepKey: assertInternalType1
62-
$I->assertInternalType("int", 21, "pass"); // stepKey: assertInternalType2
63-
$I->assertInternalType("string", $text, "pass"); // stepKey: assertInternalType3
6460
$I->assertLessOrEquals(5, 2, "pass"); // stepKey: assertLessOrEquals
6561
$I->assertLessThan(5, 2, "pass"); // stepKey: assertLessThan
6662
$I->assertLessThanOrEqual(5, 2, "pass"); // stepKey: assertLessThanOrEquals
@@ -83,7 +79,6 @@ class AssertTestCest
8379
$I->comment("asserts backward compatible");
8480
$I->assertArrayHasKey("apple", ['orange' => 2, 'apple' => 1], "pass"); // stepKey: assertArrayHasKeyBackwardCompatible
8581
$I->assertArrayNotHasKey("kiwi", ['orange' => 2, 'apple' => 1], "pass"); // stepKey: assertArrayNotHasKeyBackwardCompatible
86-
$I->assertArraySubset([1, 2], [1, 2, 3, 5], "pass"); // stepKey: assertArraySubsetBackwardCompatible
8782
$I->assertContains("ab", ['item1' => 'a', 'item2' => 'ab'], "pass"); // stepKey: assertContainsBackwardCompatible
8883
$I->assertCount(2, ['a', 'b'], "pass"); // stepKey: assertCountBackwardCompatible
8984
$I->assertEmpty([], "pass"); // stepKey: assertEmptyBackwardCompatible
@@ -95,9 +90,6 @@ class AssertTestCest
9590
$I->assertGreaterOrEquals(2, 5, "pass"); // stepKey: assertGreaterOrEqualsBackwardCompatible
9691
$I->assertGreaterThan(2, 5, "pass"); // stepKey: assertGreaterThanBackwardCompatible
9792
$I->assertGreaterThanOrEqual(2, 5, "pass"); // stepKey: assertGreaterThanOrEqualBackwardCompatible
98-
$I->assertInternalType("string", "xyz", "pass"); // stepKey: assertInternalType1BackwardCompatible
99-
$I->assertInternalType("int", 21, "pass"); // stepKey: assertInternalType2BackwardCompatible
100-
$I->assertInternalType("string", $text, "pass"); // stepKey: assertInternalType3BackwardCompatible
10193
$I->assertLessOrEquals(5, 2, "pass"); // stepKey: assertLessOrEqualBackwardCompatibles
10294
$I->assertLessThan(5, 2, "pass"); // stepKey: assertLessThanBackwardCompatible
10395
$I->assertLessThanOrEqual(5, 2, "pass"); // stepKey: assertLessThanOrEqualBackwardCompatible
@@ -129,8 +121,6 @@ class AssertTestCest
129121
$I->assertEquals($I->retrieveEntityField('createData1', 'lastname', 'test'), $I->retrieveEntityField('createData1', 'lastname', 'test'), "pass"); // stepKey: assert5
130122
$I->comment("array type that use created data");
131123
$I->comment("array type that use created data");
132-
$I->assertArraySubset([$I->retrieveEntityField('createData1', 'lastname', 'test'), $I->retrieveEntityField('createData1', 'firstname', 'test')], [$I->retrieveEntityField('createData1', 'lastname', 'test'), $I->retrieveEntityField('createData1', 'firstname', 'test'), "1"], "pass"); // stepKey: assert9
133-
$I->assertArraySubset([$I->retrieveEntityField('createData2', 'firstname', 'test'), $I->retrieveEntityField('createData2', 'lastname', 'test')], [$I->retrieveEntityField('createData2', 'firstname', 'test'), $I->retrieveEntityField('createData2', 'lastname', 'test'), "1"], "pass"); // stepKey: assert10
134124
$I->assertArrayHasKey("lastname", ['lastname' => $I->retrieveEntityField('createData1', 'lastname', 'test'), 'firstname' => $I->retrieveEntityField('createData1', 'firstname', 'test')], "pass"); // stepKey: assert3
135125
$I->assertArrayHasKey("lastname", ['lastname' => $I->retrieveEntityField('createData2', 'lastname', 'test'), 'firstname' => $I->retrieveEntityField('createData2', 'firstname', 'test')], "pass"); // stepKey: assert4
136126
$I->comment("this section can only be generated and cannot run");

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

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@
3131
<expectedResult type="string">kiwi</expectedResult>
3232
<actualResult type="const">['orange' => 2, 'apple' => 1]</actualResult>
3333
</assertArrayNotHasKey>
34-
<assertArraySubset stepKey="assertArraySubset" message="pass">
35-
<expectedResult type="const">[1, 2]</expectedResult>
36-
<actualResult type="const">[1, 2, 3, 5]</actualResult>
37-
</assertArraySubset>
3834
<assertContains stepKey="assertContains" message="pass">
3935
<expectedResult type="string">ab</expectedResult>
4036
<actualResult type="const">['item1' => 'a', 'item2' => 'ab']</actualResult>
@@ -87,18 +83,6 @@
8783
<expectedResult type="int">2</expectedResult>
8884
<actualResult type="int">5</actualResult>
8985
</assertGreaterThanOrEqual>
90-
<assertInternalType stepKey="assertInternalType1" message="pass">
91-
<expectedResult type="string">string</expectedResult>
92-
<actualResult type="string">xyz</actualResult>
93-
</assertInternalType>
94-
<assertInternalType stepKey="assertInternalType2" message="pass">
95-
<expectedResult type="string">int</expectedResult>
96-
<actualResult type="int">21</actualResult>
97-
</assertInternalType>
98-
<assertInternalType stepKey="assertInternalType3" message="pass">
99-
<expectedResult type="string">string</expectedResult>
100-
<actualResult type="variable">text</actualResult>
101-
</assertInternalType>
10286
<assertLessOrEquals stepKey="assertLessOrEquals" message="pass">
10387
<expectedResult type="int">5</expectedResult>
10488
<actualResult type="int">2</actualResult>
@@ -177,10 +161,6 @@
177161
<expectedResult type="string">kiwi</expectedResult>
178162
<actualResult type="const">['orange' => 2, 'apple' => 1]</actualResult>
179163
</assertArrayNotHasKey>
180-
<assertArraySubset stepKey="assertArraySubsetBackwardCompatible" message="pass">
181-
<actualResult type="const">[1, 2, 3, 5]</actualResult>
182-
<expectedResult type="const">[1, 2]</expectedResult>
183-
</assertArraySubset>
184164
<assertContains stepKey="assertContainsBackwardCompatible" message="pass">
185165
<expectedResult type="string">ab</expectedResult>
186166
<actualResult type="const">['item1' => 'a', 'item2' => 'ab']</actualResult>
@@ -221,18 +201,6 @@
221201
<actualResult type="int">5</actualResult>
222202
<expectedResult type="int">2</expectedResult>
223203
</assertGreaterThanOrEqual>
224-
<assertInternalType stepKey="assertInternalType1BackwardCompatible" message="pass">
225-
<actualResult type="string">xyz</actualResult>
226-
<expectedResult type="string">string</expectedResult>
227-
</assertInternalType>
228-
<assertInternalType stepKey="assertInternalType2BackwardCompatible" message="pass">
229-
<actualResult type="int">21</actualResult>
230-
<expectedResult type="string">int</expectedResult>
231-
</assertInternalType>
232-
<assertInternalType stepKey="assertInternalType3BackwardCompatible" message="pass">
233-
<actualResult type="variable">$text</actualResult>
234-
<expectedResult type="string">string</expectedResult>
235-
</assertInternalType>
236204
<assertLessOrEquals stepKey="assertLessOrEqualBackwardCompatibles" message="pass">
237205
<actualResult type="int">2</actualResult>
238206
<expectedResult type="int">5</expectedResult>
@@ -338,14 +306,6 @@
338306

339307
<!-- array type that use created data -->
340308
<comment stepKey="c3" userInput="array type that use created data"/>
341-
<assertArraySubset stepKey="assert9" message="pass">
342-
<expectedResult type="array">[$$createData1.lastname$$, $$createData1.firstname$$]</expectedResult>
343-
<actualResult type="array">[$$createData1.lastname$$, $$createData1.firstname$$, 1]</actualResult>
344-
</assertArraySubset>
345-
<assertArraySubset stepKey="assert10" message="pass">
346-
<expectedResult type="array">[$createData2.firstname$, $createData2.lastname$]</expectedResult>
347-
<actualResult type="array">[$createData2.firstname$, $createData2.lastname$, 1]</actualResult>
348-
</assertArraySubset>
349309
<assertArrayHasKey stepKey="assert3" message="pass">
350310
<expectedResult type="string">lastname</expectedResult>
351311
<actualResult type="array">['lastname' => $$createData1.lastname$$, 'firstname' => $$createData1.firstname$$]</actualResult>

‎docs/test/assertions.md

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -108,18 +108,6 @@ Attribute|Type|Use|Description
108108
`before`|string|optional| `stepKey` of action that must be executed next.
109109
`after`|string|optional| `stepKey` of the preceding action.
110110

111-
### assertArraySubset
112-
113-
See [assertArraySubset docs on codeception.com](http://codeception.com/docs/modules/Asserts#assertArraySubset).
114-
115-
Attribute|Type|Use|Description
116-
---|---|---|---
117-
`strict`|boolean|optional|
118-
`message`|string|optional|Text of informational message about a cause of failure.
119-
`stepKey`|string|required| A unique identifier of the text step.
120-
`before`|string|optional| `stepKey` of action that must be executed next.
121-
`after`|string|optional| `stepKey` of the preceding action.
122-
123111
### assertContains
124112

125113
See [assertContains docs on codeception.com](http://codeception.com/docs/modules/Asserts#assertContains).
@@ -297,17 +285,6 @@ Attribute|Type|Use|Description
297285
`before`|string|optional| `stepKey` of action that must be executed next.
298286
`after`|string|optional| `stepKey` of the preceding action.
299287

300-
### assertInternalType
301-
302-
See [assertInternalType docs on codeception.com](http://codeception.com/docs/modules/Asserts#assertInternalType).
303-
304-
Attribute|Type|Use|Description
305-
---|---|---|---
306-
`message`|string|optional|Text of informational message about a cause of failure.
307-
`stepKey`|string|required| A unique identifier of the text step.
308-
`before`|string|optional| `stepKey` of action that must be executed next.
309-
`after`|string|optional| `stepKey` of the preceding action.
310-
311288
### assertIsEmpty
312289

313290
See [assertIsEmpty docs on codeception.com](http://codeception.com/docs/modules/Asserts#assertIsEmpty).

‎etc/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<!-- Entity value gets replaced in Dom.php before reading $xml -->
1010
<!DOCTYPE config [
11-
<!ENTITY commonTestActions "acceptPopup|actionGroup|amOnPage|amOnUrl|amOnSubdomain|appendField|assertArrayIsSortasserted|assertArraySubset|assertElementContainsAttribute|attachFile|cancelPopup|checkOption|clearField|click|clickWithLeftButton|clickWithRightButton|closeAdminNotification|closeTab|comment|conditionalClick|createData|deleteData|updateData|getData|dontSee|dontSeeJsError|dontSeeCheckboxIsChecked|dontSeeCookie|dontSeeCurrentUrlEquals|dontSeeCurrentUrlMatches|dontSeeElement|dontSeeElementInDOM|dontSeeInCurrentUrl|dontSeeInField|dontSeeInFormFields|dontSeeInPageSource|dontSeeInSource|dontSeeInTitle|dontSeeLink|dontSeeOptionIsSelected|doubleClick|dragAndDrop|entity|executeJS|fillField|formatMoney|generateDate|grabAttributeFrom|grabCookie|grabFromCurrentUrl|grabMultiple|grabPageSource|grabTextFrom|grabValueFrom|loadSessionSnapshot|loginAsAdmin|magentoCLI|magentoCron|makeScreenshot|maximizeWindow|moveBack|moveForward|moveMouseOver|mSetLocale|mResetLocale|openNewTab|pause|parseFloat|pressKey|reloadPage|resetCookie|submitForm|resizeWindow|saveSessionSnapshot|scrollTo|scrollToTopOfPage|searchAndMultiSelectOption|see|seeCheckboxIsChecked|seeCookie|seeCurrentUrlEquals|seeCurrentUrlMatches|seeElement|seeElementInDOM|seeInCurrentUrl|seeInField|seeInFormFields|seeInPageSource|seeInPopup|seeInSource|seeInTitle|seeLink|seeNumberOfElements|seeOptionIsSelected|selectOption|setCookie|submitForm|switchToIFrame|switchToNextTab|switchToPreviousTab|switchToWindow|typeInPopup|uncheckOption|unselectOption|wait|waitForAjaxLoad|waitForElement|waitForElementChange|waitForElementNotVisible|waitForElementVisible|waitForPwaElementNotVisible|waitForPwaElementVisible|waitForJS|waitForLoadingMaskToDisappear|waitForPageLoad|waitForText|assertArrayHasKey|assertArrayNotHasKey|assertArraySubset|assertContains|assertStringContainsString|assertStringContainsStringIgnoringCase|assertCount|assertEmpty|assertEquals|assertFalse|assertFileExists|assertFileNotExists|assertGreaterOrEquals|assertGreaterThan|assertGreaterThanOrEqual|assertInstanceOf|assertInternalType|assertIsEmpty|assertLessOrEquals|assertLessThan|assertLessThanOrEqual|assertNotContains|assertStringNotContainsString|assertStringNotContainsStringIgnoringCase|assertNotEmpty|assertNotEquals|assertNotInstanceOf|assertNotNull|assertNotRegExp|assertNotSame|assertNull|assertRegExp|assertSame|assertStringStartsNotWith|assertStringStartsWith|assertTrue|expectException|fail|dontSeeFullUrlEquals|dontSee|dontSeeFullUrlMatches|dontSeeInFullUrl|seeFullUrlEquals|seeFullUrlMatches|seeInFullUrl|grabFromFullUrl|helper|assertEqualsWithDelta|assertEqualsCanonicalizing|assertEqualsIgnoringCase|assertNotEqualsWithDelta|assertNotEqualsCanonicalizing|assertNotEqualsIgnoringCase">
11+
<!ENTITY commonTestActions "acceptPopup|actionGroup|amOnPage|amOnUrl|amOnSubdomain|appendField|assertArrayIsSortasserted|assertElementContainsAttribute|attachFile|cancelPopup|checkOption|clearField|click|clickWithLeftButton|clickWithRightButton|closeAdminNotification|closeTab|comment|conditionalClick|createData|deleteData|updateData|getData|dontSee|dontSeeJsError|dontSeeCheckboxIsChecked|dontSeeCookie|dontSeeCurrentUrlEquals|dontSeeCurrentUrlMatches|dontSeeElement|dontSeeElementInDOM|dontSeeInCurrentUrl|dontSeeInField|dontSeeInFormFields|dontSeeInPageSource|dontSeeInSource|dontSeeInTitle|dontSeeLink|dontSeeOptionIsSelected|doubleClick|dragAndDrop|entity|executeJS|fillField|formatMoney|generateDate|grabAttributeFrom|grabCookie|grabFromCurrentUrl|grabMultiple|grabPageSource|grabTextFrom|grabValueFrom|loadSessionSnapshot|loginAsAdmin|magentoCLI|magentoCron|makeScreenshot|maximizeWindow|moveBack|moveForward|moveMouseOver|mSetLocale|mResetLocale|openNewTab|pause|parseFloat|pressKey|reloadPage|resetCookie|submitForm|resizeWindow|saveSessionSnapshot|scrollTo|scrollToTopOfPage|searchAndMultiSelectOption|see|seeCheckboxIsChecked|seeCookie|seeCurrentUrlEquals|seeCurrentUrlMatches|seeElement|seeElementInDOM|seeInCurrentUrl|seeInField|seeInFormFields|seeInPageSource|seeInPopup|seeInSource|seeInTitle|seeLink|seeNumberOfElements|seeOptionIsSelected|selectOption|setCookie|submitForm|switchToIFrame|switchToNextTab|switchToPreviousTab|switchToWindow|typeInPopup|uncheckOption|unselectOption|wait|waitForAjaxLoad|waitForElement|waitForElementChange|waitForElementNotVisible|waitForElementVisible|waitForPwaElementNotVisible|waitForPwaElementVisible|waitForJS|waitForLoadingMaskToDisappear|waitForPageLoad|waitForText|assertArrayHasKey|assertArrayNotHasKey|assertContains|assertStringContainsString|assertStringContainsStringIgnoringCase|assertCount|assertEmpty|assertEquals|assertFalse|assertFileExists|assertFileNotExists|assertGreaterOrEquals|assertGreaterThan|assertGreaterThanOrEqual|assertInstanceOf|assertIsEmpty|assertLessOrEquals|assertLessThan|assertLessThanOrEqual|assertNotContains|assertStringNotContainsString|assertStringNotContainsStringIgnoringCase|assertNotEmpty|assertNotEquals|assertNotInstanceOf|assertNotNull|assertNotRegExp|assertNotSame|assertNull|assertRegExp|assertSame|assertStringStartsNotWith|assertStringStartsWith|assertTrue|expectException|fail|dontSeeFullUrlEquals|dontSee|dontSeeFullUrlMatches|dontSeeInFullUrl|seeFullUrlEquals|seeFullUrlMatches|seeInFullUrl|grabFromFullUrl|helper|assertEqualsWithDelta|assertEqualsCanonicalizing|assertEqualsIgnoringCase|assertNotEqualsWithDelta|assertNotEqualsCanonicalizing|assertNotEqualsIgnoringCase">
1212
]>
1313

1414
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../src/Magento/FunctionalTestingFramework/ObjectManager/etc/config.xsd">

‎src/Magento/FunctionalTestingFramework/Test/etc/Actions/assertActions.xsd

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<xs:element type="assertElementContainsAttributeType" name="assertElementContainsAttribute" minOccurs="0" maxOccurs="unbounded"/>
1515
<xs:element type="assertArrayHasKeyType" name="assertArrayHasKey" minOccurs="0" maxOccurs="unbounded"/>
1616
<xs:element type="assertArrayNotHasKeyType" name="assertArrayNotHasKey" minOccurs="0" maxOccurs="unbounded"/>
17-
<xs:element type="assertArraySubsetType" name="assertArraySubset" minOccurs="0" maxOccurs="unbounded"/>
1817
<xs:element type="assertContainsType" name="assertContains" minOccurs="0" maxOccurs="unbounded"/>
1918
<xs:element type="assertStringContainsStringType" name="assertStringContainsString" minOccurs="0" maxOccurs="unbounded"/>
2019
<xs:element type="assertStringContainsStringIgnoringCaseType" name="assertStringContainsStringIgnoringCase" minOccurs="0" maxOccurs="unbounded"/>
@@ -31,7 +30,6 @@
3130
<xs:element type="assertGreaterThanType" name="assertGreaterThan" minOccurs="0" maxOccurs="unbounded"/>
3231
<xs:element type="assertGreaterThanOrEqualType" name="assertGreaterThanOrEqual" minOccurs="0" maxOccurs="unbounded"/>
3332
<xs:element type="assertInstanceOfType" name="assertInstanceOf" minOccurs="0" maxOccurs="unbounded"/>
34-
<xs:element type="assertInternalTypeType" name="assertInternalType" minOccurs="0" maxOccurs="unbounded"/>
3533
<xs:element type="assertIsEmptyType" name="assertIsEmpty" minOccurs="0" maxOccurs="unbounded"/>
3634
<xs:element type="assertLessOrEqualsType" name="assertLessOrEquals" minOccurs="0" maxOccurs="unbounded"/>
3735
<xs:element type="assertLessThanType" name="assertLessThan" minOccurs="0" maxOccurs="unbounded"/>

‎src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1275,7 +1275,6 @@ public function generateStepsPhp($actionObjects, $generationScope = TestGenerato
12751275
case "assertGreaterOrEquals":
12761276
case "assertGreaterThan":
12771277
case "assertGreaterThanOrEqual":
1278-
case "assertInternalType":
12791278
case "assertLessOrEquals":
12801279
case "assertLessThan":
12811280
case "assertLessThanOrEqual":
@@ -1361,16 +1360,6 @@ public function generateStepsPhp($actionObjects, $generationScope = TestGenerato
13611360
$assertMessage
13621361
);
13631362
break;
1364-
case "assertArraySubset":
1365-
$testSteps .= $this->wrapFunctionCall(
1366-
$actor,
1367-
$actionObject,
1368-
$assertExpected,
1369-
$assertActual,
1370-
$assertIsStrict,
1371-
$assertMessage
1372-
);
1373-
break;
13741363
case "fail":
13751364
$testSteps .= $this->wrapFunctionCall(
13761365
$actor,

0 commit comments

Comments
 (0)