diff --git a/dev/tests/verification/Resources/AssertTest.txt b/dev/tests/verification/Resources/AssertTest.txt
index 7697b7baf..dfbee497b 100644
--- a/dev/tests/verification/Resources/AssertTest.txt
+++ b/dev/tests/verification/Resources/AssertTest.txt
@@ -69,7 +69,7 @@ class AssertTestCest
$I->assertStringNotContainsStringIgnoringCase("apple", "banana", "pass"); // stepKey: assertStringNotContainsStringIgnoringCase
$I->assertNotEmpty([1, 2], "pass"); // stepKey: assertNotEmpty1
$I->assertNotEmpty($text, "pass"); // stepKey: assertNotEmpty2
- $I->assertNotEquals(2, 5, "pass", 0); // stepKey: assertNotEquals
+ $I->assertNotEquals(2, 5, "pass"); // stepKey: assertNotEquals
$I->assertNotNull("abc", "pass"); // stepKey: assertNotNull1
$I->assertNotNull($text, "pass"); // stepKey: assertNotNull2
$I->assertNotRegExp("/foo/", "bar", "pass"); // stepKey: assertNotRegExp
@@ -105,7 +105,7 @@ class AssertTestCest
$I->assertNotContains("bc", $text, "pass"); // stepKey: assertNotContains2BackwardCompatible
$I->assertNotEmpty([1, 2], "pass"); // stepKey: assertNotEmpty1BackwardCompatible
$I->assertNotEmpty($text, "pass"); // stepKey: assertNotEmpty2BackwardCompatible
- $I->assertNotEquals(2, 5, "pass", 0); // stepKey: assertNotEqualsBackwardCompatible
+ $I->assertNotEquals(2, 5, "pass"); // stepKey: assertNotEqualsBackwardCompatible
$I->assertNotNull("abc", "pass"); // stepKey: assertNotNull1BackwardCompatible
$I->assertNotNull($text, "pass"); // stepKey: assertNotNull2BackwardCompatible
$I->assertNotRegExp("/foo/", "bar", "pass"); // stepKey: assertNotRegExpBackwardCompatible
@@ -155,5 +155,11 @@ class AssertTestCest
$I->assertElementContainsAttribute("#username", "value", $I->retrieveEntityField('createData1', 'firstname', 'test')); // stepKey: assertElementContainsAttribute8
$I->comment("assert entity resolution");
$I->assertEquals("John", "Doe", "pass"); // stepKey: assertEqualsEntity
+ $I->assertEqualsWithDelta(10.0000, 10.0000, 1, "pass"); // stepKey: a1
+ $I->assertNotEqualsWithDelta(10.0000, 12.0000, 1, "pass"); // stepKey: a2
+ $I->assertEqualsCanonicalizing(["4", "2", "1", "3"], ["1", "2", "3", "4"], "pass"); // stepKey: a3
+ $I->assertNotEqualsCanonicalizing(["5", "8", "7", "9"], ["1", "2", "3", "4"], "pass"); // stepKey: a4
+ $I->assertEqualsIgnoringCase("Cat", "cat", "pass"); // stepKey: a5
+ $I->assertNotEqualsIgnoringCase("Cat", "Dog", "pass"); // stepKey: a6
}
}
diff --git a/dev/tests/verification/TestModule/Test/AssertTest.xml b/dev/tests/verification/TestModule/Test/AssertTest.xml
index fd81c9bea..91d02c7ce 100644
--- a/dev/tests/verification/TestModule/Test/AssertTest.xml
+++ b/dev/tests/verification/TestModule/Test/AssertTest.xml
@@ -129,7 +129,7 @@
text
-
+
2
5
@@ -259,7 +259,7 @@
text
-
+
5
2
@@ -415,5 +415,30 @@
{{simpleData.firstname}}
{{simpleData.lastname}}
+
+
+ 10.0000
+ 10.0000
+
+
+ 10.0000
+ 12.0000
+
+
+ [4, 2, 1, 3]
+ [1, 2, 3, 4]
+
+
+ [5, 8, 7, 9]
+ [1, 2, 3, 4]
+
+
+ Cat
+ cat
+
+
+ Cat
+ Dog
+
diff --git a/docs/test/assertions.md b/docs/test/assertions.md
index 8577c85c3..8c7d31be5 100644
--- a/docs/test/assertions.md
+++ b/docs/test/assertions.md
@@ -179,6 +179,17 @@ Attribute|Type|Use|Description
See [assertEquals docs on codeception.com](http://codeception.com/docs/modules/Asserts#assertEquals).
+Attribute|Type|Use|Description
+---|---|---|---
+`message`|string|optional|Text of informational message about a cause of failure.
+`stepKey`|string|required| A unique identifier of the text step.
+`before`|string|optional| `stepKey` of action that must be executed next.
+`after`|string|optional| `stepKey` of the preceding action.
+
+### assertEqualsWithDelta
+
+See [assertEqualsWithDelta docs on codeception.com](http://codeception.com/docs/modules/Asserts#assertEqualsWithDelta).
+
Attribute|Type|Use|Description
---|---|---|---
`delta`|string|optional|
@@ -187,6 +198,28 @@ Attribute|Type|Use|Description
`before`|string|optional| `stepKey` of action that must be executed next.
`after`|string|optional| `stepKey` of the preceding action.
+### assertEqualsCanonicalizing
+
+See [assertEqualsCanonicalizing docs on codeception.com](http://codeception.com/docs/modules/Asserts#assertEqualsCanonicalizing).
+
+Attribute|Type|Use|Description
+---|---|---|---
+`message`|string|optional|Text of informational message about a cause of failure.
+`stepKey`|string|required| A unique identifier of the text step.
+`before`|string|optional| `stepKey` of action that must be executed next.
+`after`|string|optional| `stepKey` of the preceding action.
+
+### assertEqualsIgnoringCase
+
+See [assertEqualsIgnoringCase docs on codeception.com](http://codeception.com/docs/modules/Asserts#assertEqualsIgnoringCase).
+
+Attribute|Type|Use|Description
+---|---|---|---
+`message`|string|optional|Text of informational message about a cause of failure.
+`stepKey`|string|required| A unique identifier of the text step.
+`before`|string|optional| `stepKey` of action that must be executed next.
+`after`|string|optional| `stepKey` of the preceding action.
+
### assertFalse
See [assertFalse docs on codeception.com](http://codeception.com/docs/modules/Asserts#assertFalse).
@@ -367,6 +400,17 @@ Attribute|Type|Use|Description
See [assertNotEquals docs on codeception.com](http://codeception.com/docs/modules/Asserts#assertNotEquals).
+Attribute|Type|Use|Description
+---|---|---|---
+`message`|string|optional|Text of informational message about a cause of failure.
+`stepKey`|string|required| A unique identifier of the text step.
+`before`|string|optional| `stepKey` of action that must be executed next.
+`after`|string|optional| `stepKey` of the preceding action.
+
+### assertNotEqualsWithDelta
+
+See [assertNotEqualsWithDelta docs on codeception.com](http://codeception.com/docs/modules/Asserts#assertNotEqualsWithDelta).
+
Attribute|Type|Use|Description
---|---|---|---
`delta`|string|optional|
@@ -375,6 +419,28 @@ Attribute|Type|Use|Description
`before`|string|optional| `stepKey` of action that must be executed next.
`after`|string|optional| `stepKey` of the preceding action.
+### assertNotEqualsCanonicalizing
+
+See [assertNotEqualsCanonicalizing docs on codeception.com](http://codeception.com/docs/modules/Asserts#assertNotEqualsCanonicalizing).
+
+Attribute|Type|Use|Description
+---|---|---|---
+`message`|string|optional|Text of informational message about a cause of failure.
+`stepKey`|string|required| A unique identifier of the text step.
+`before`|string|optional| `stepKey` of action that must be executed next.
+`after`|string|optional| `stepKey` of the preceding action.
+
+### assertNotEqualsIgnoringCase
+
+See [assertNotEqualsIgnoringCase docs on codeception.com](http://codeception.com/docs/modules/Asserts#assertNotEqualsIgnoringCase).
+
+Attribute|Type|Use|Description
+---|---|---|---
+`message`|string|optional|Text of informational message about a cause of failure.
+`stepKey`|string|required| A unique identifier of the text step.
+`before`|string|optional| `stepKey` of action that must be executed next.
+`after`|string|optional| `stepKey` of the preceding action.
+
### assertNotInstanceOf
See [assertNotInstanceOf docs on codeception.com](http://codeception.com/docs/modules/Asserts#assertNotInstanceOf).
diff --git a/etc/di.xml b/etc/di.xml
index 9b0c53af1..0a9da0422 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -8,7 +8,7 @@
+
]>
diff --git a/src/Magento/FunctionalTestingFramework/Test/etc/Actions/assertActions.xsd b/src/Magento/FunctionalTestingFramework/Test/etc/Actions/assertActions.xsd
index 694429a30..402c3bd18 100644
--- a/src/Magento/FunctionalTestingFramework/Test/etc/Actions/assertActions.xsd
+++ b/src/Magento/FunctionalTestingFramework/Test/etc/Actions/assertActions.xsd
@@ -21,6 +21,9 @@
+
+
+
@@ -38,6 +41,9 @@
+
+
+
@@ -218,7 +224,21 @@
- Asserts that two given variables are equal. Can be given a "delta" to allow precision tolerance in floating point comparison.
+ Asserts that two given variables are equal.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Asserts that two given variables are equal. Accepts a delta.
@@ -230,6 +250,36 @@
+
+
+
+ Asserts that two given variables are equal.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Asserts that two given variables are equal. The contents are canonicalized before they are compared.
+ For instance, when the two variables $expected and $actual are arrays, then these arrays are
+ sorted before they are compared.
+
+
+
+
+
+
+
+
+
+
@@ -452,7 +502,7 @@
- Asserts that actual and expected are not equal. Can be given a "delta" to allow precision tolerance in floating point comparison.
+ Asserts that actual and expected are not equal.
@@ -460,7 +510,51 @@
+
+
+
+
+
+
+ Asserts that two given variables are not equal. Accepts a delta.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Asserts that actual and expected are not equal.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Asserts that two given variables are equal. The contents are canonicalized before they are compared.
+ For instance, when the two variables $expected and $actual are arrays, then these arrays are
+ sorted before they are compared.
+
+
+
+
+
+
+
@@ -669,4 +763,4 @@
-
\ No newline at end of file
+
diff --git a/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php b/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
index be4c38e02..c919f6188 100644
--- a/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
+++ b/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
@@ -1272,7 +1272,6 @@ public function generateStepsPhp($actionObjects, $generationScope = TestGenerato
$visible
);
break;
- case "assertEquals":
case "assertGreaterOrEquals":
case "assertGreaterThan":
case "assertGreaterThanOrEqual":
@@ -1280,7 +1279,6 @@ public function generateStepsPhp($actionObjects, $generationScope = TestGenerato
case "assertLessOrEquals":
case "assertLessThan":
case "assertLessThanOrEqual":
- case "assertNotEquals":
case "assertInstanceOf":
case "assertNotInstanceOf":
case "assertNotRegExp":
@@ -1308,6 +1306,31 @@ public function generateStepsPhp($actionObjects, $generationScope = TestGenerato
$assertDelta
);
break;
+ case "assertEquals":
+ case "assertNotEquals":
+ case "assertEqualsIgnoringCase":
+ case "assertNotEqualsIgnoringCase":
+ case "assertEqualsCanonicalizing":
+ case "assertNotEqualsCanonicalizing":
+ $testSteps .= $this->wrapFunctionCall(
+ $actor,
+ $actionObject,
+ $assertExpected,
+ $assertActual,
+ $assertMessage
+ );
+ break;
+ case "assertEqualsWithDelta":
+ case "assertNotEqualsWithDelta":
+ $testSteps .= $this->wrapFunctionCall(
+ $actor,
+ $actionObject,
+ $assertExpected,
+ $assertActual,
+ $assertDelta,
+ $assertMessage
+ );
+ break;
case "assertElementContainsAttribute":
// If a blank string or null is passed in we need to pass a blank string to the function.
if (empty($assertExpected)) {