MQE-2076: [PHPUnit 9] assertEquals and assertNotEquals optional parameters removed

Author: tomreece

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
 	}
 }

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

@@ -129,7 +129,7 @@
         <assertNotEmpty stepKey="assertNotEmpty2" message="pass">
             <actualResult type="variable">text</actualResult>
         </assertNotEmpty>
-        <assertNotEquals stepKey="assertNotEquals" message="pass" delta="">
+        <assertNotEquals stepKey="assertNotEquals" message="pass">
             <expectedResult type="int">2</expectedResult>
             <actualResult type="int">5</actualResult>
         </assertNotEquals>
@@ -259,7 +259,7 @@
         <assertNotEmpty stepKey="assertNotEmpty2BackwardCompatible" message="pass">
             <actualResult type="variable">text</actualResult>
         </assertNotEmpty>
-        <assertNotEquals stepKey="assertNotEqualsBackwardCompatible" message="pass" delta="">
+        <assertNotEquals stepKey="assertNotEqualsBackwardCompatible" message="pass">
             <actualResult type="int">5</actualResult>
             <expectedResult type="int">2</expectedResult>
         </assertNotEquals>
@@ -415,5 +415,30 @@
             <expectedResult type="string">{{simpleData.firstname}}</expectedResult>
             <actualResult type="string">{{simpleData.lastname}}</actualResult>
         </assertEquals>
+
+        <assertEqualsWithDelta stepKey="a1" message="pass" delta="1">
+            <expectedResult type="const">10.0000</expectedResult>
+            <actualResult type="const">10.0000</actualResult>
+        </assertEqualsWithDelta>
+        <assertNotEqualsWithDelta stepKey="a2" message="pass" delta="1">
+            <expectedResult type="const">10.0000</expectedResult>
+            <actualResult type="const">12.0000</actualResult>
+        </assertNotEqualsWithDelta>
+        <assertEqualsCanonicalizing stepKey="a3" message="pass">
+            <expectedResult type="array">[4, 2, 1, 3]</expectedResult>
+            <actualResult type="array">[1, 2, 3, 4]</actualResult>
+        </assertEqualsCanonicalizing>
+        <assertNotEqualsCanonicalizing stepKey="a4" message="pass">
+            <expectedResult type="array">[5, 8, 7, 9]</expectedResult>
+            <actualResult type="array">[1, 2, 3, 4]</actualResult>
+        </assertNotEqualsCanonicalizing>
+        <assertEqualsIgnoringCase stepKey="a5" message="pass">
+            <expectedResult type="string">Cat</expectedResult>
+            <actualResult type="string">cat</actualResult>
+        </assertEqualsIgnoringCase>
+        <assertNotEqualsIgnoringCase stepKey="a6" message="pass">
+            <expectedResult type="string">Cat</expectedResult>
+            <actualResult type="string">Dog</actualResult>
+        </assertNotEqualsIgnoringCase>
     </test>
 </tests>