Commit ebf37ddb authored Apr 17, 2020 by catch

Issue #3126695 by mondrake, jonathan1055, catch, longwave: [D8 only] Add...

Issue #3126695 by mondrake, jonathan1055, catch, longwave: [D8 only] Add forwards-compatibility shim for assertEqualsCanonicalizing() in phpunit 6&7

parent fd7c2890

core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit6/TestCompatibilityTrait.php

+14 −0

Original line number	Diff line number	Diff line
		@@ -53,4 +53,18 @@ public static function assertEquals($expected, $actual, $message = '', $delta =
		parent::assertEquals($expected, $actual, $message, $delta, $maxDepth, $canonicalize, $ignoreCase);
		}

		/**
		* 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);
		}

		}

core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit7/TestCompatibilityTrait.php

+14 −0

Original line number	Diff line number	Diff line
		@@ -53,4 +53,18 @@ public static function assertEquals($expected, $actual, string $message = '', fl
		parent::assertEquals($expected, $actual, $message, $delta, $maxDepth, $canonicalize, $ignoreCase);
		}

		/**
		* 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);
		}

		}

core/tests/Drupal/Tests/PhpunitCompatibilityTraitTest.php

+11 −0

Original line number	Diff line number	Diff line
		@@ -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 {