Issue #3126695 by mondrake: [D8 only] Add forwards-compatibility shim…

… for assertEqualsCanonicalizing() in phpunit 6&7
drupal · Apr 16, 2020 · a1118f6 · a1118f6
1 parent b6f8c48
commit a1118f6
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 0 deletions.
diff --git a/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit6/TestCompatibilityTrait.php b/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit6/TestCompatibilityTrait.php
@@ -39,4 +39,18 @@ public static function assertFalse($actual, $message = '') {
     }
   }
 
+  /**
+   * Forward compatibility for assertEqualsCanonicalizing.
+   */
+  public static function assertEqualsCanonicalizing($expected, $actual, $message = '') {
+    static::assertEquals($expected, $actual, $message, 0.0, 10, TRUE);
+  }
+
+  /**
+   * Forward compatibility for assertNotEqualsCanonicalizing.
+   */
+  public static function assertNotEqualsCanonicalizing($expected, $actual, $message = '') {
+    static::assertNotEquals($expected, $actual, $message, 0.0, 10, TRUE);
+  }
+
 }
diff --git a/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit7/TestCompatibilityTrait.php b/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit7/TestCompatibilityTrait.php
@@ -39,4 +39,18 @@ public static function assertFalse($actual, string $message = ''): void {
     }
   }
 
+  /**
+   * Forward compatibility for assertEqualsCanonicalizing.
+   */
+  public static function assertEqualsCanonicalizing($expected, $actual, string $message = ''): void {
+    static::assertEquals($expected, $actual, $message, 0.0, 10, TRUE);
+  }
+
+  /**
+   * Forward compatibility for assertNotEqualsCanonicalizing.
+   */
+  public static function assertNotEqualsCanonicalizing($expected, $actual, string $message = ''): void {
+    static::assertNotEquals($expected, $actual, $message, 0.0, 10, TRUE);
+  }
+
 }
diff --git a/tests/Drupal/Tests/PhpunitCompatibilityTraitTest.php b/tests/Drupal/Tests/PhpunitCompatibilityTraitTest.php
@@ -35,6 +35,17 @@ public function testSetExpectedException() {
     throw new \Exception($expectedMessage, $expectedCode);
   }
 
+  /**
+   * Tests that assert(Not)EqualsCanonicalizing methods are available.
+   *
+   * @covers ::assertEqualsCanonicalizing
+   * @covers ::assertNotEqualsCanonicalizing
+   */
+  public function testAssertEqualsCanonicalizing() {
+    $this->assertEqualsCanonicalizing([3, 2, 1], [2, 3, 1]);
+    $this->assertNotEqualsCanonicalizing([3, 2, 1], [2, 3, 0, 1]);
+  }
+
 }
 
 interface MockTestClassInterface {