MFTF-33782: Made NULL value equal to the default argument value

Author: bohdan-harniuk

dev/tests/unit/Magento/FunctionalTestFramework/Util/Path/FilePathFormatterTest.php

@@ -16,39 +16,52 @@ class FilePathFormatterTest extends MagentoTestCase
  /**
  * Test file format.
  *
- * @param string $path
- * @param bool $withTrailingSeparator
+ * @param string  $path
+ * @param bool|null  $withTrailingSeparator
  * @param string|null $expectedPath
  *
  * @return void
  * @throws TestFrameworkException
  * @dataProvider formatDataProvider
  */
- public function testFormat(string $path, bool $withTrailingSeparator, ?string $expectedPath): void
+ public function testFormat(string $path, ?bool $withTrailingSeparator, ?string $expectedPath): void
  {
  if (null !== $expectedPath) {
+ if ($withTrailingSeparator === null) {
+ $this->assertEquals($expectedPath, FilePathFormatter::format($path));
+ return;
+ }
  $this->assertEquals($expectedPath, FilePathFormatter::format($path, $withTrailingSeparator));
  } else {
  // Assert no exception
- FilePathFormatter::format($path, $withTrailingSeparator);
+ if ($withTrailingSeparator === null) {
+ FilePathFormatter::format($path);
+ } else {
+ FilePathFormatter::format($path, $withTrailingSeparator);
+ }
  $this->assertTrue(true);
  }
  }
 
  /**
  * Test file format with exception.
  *
- * @param string $path
- * @param bool $withTrailingSeparator
+ * @param string  $path
+ * @param bool|null $withTrailingSeparator
  *
  * @return void
  * @throws TestFrameworkException
  * @dataProvider formatExceptionDataProvider
  */
- public function testFormatWithException(string $path, bool $withTrailingSeparator): void
+ public function testFormatWithException(string $path, ?bool $withTrailingSeparator): void
  {
  $this->expectException(TestFrameworkException::class);
  $this->expectExceptionMessage("Invalid or non-existing file: $path\n");
+
+ if ($withTrailingSeparator === null) {
+ FilePathFormatter::format($path);
+ return;
+ }
  FilePathFormatter::format($path, $withTrailingSeparator);
  }
 
@@ -63,14 +76,14 @@ public function formatDataProvider(): array
  $path2 = $path1 . DIRECTORY_SEPARATOR;
 
  return [
- [$path1, false, $path1],
+ [$path1, null, $path2],
  [$path1, false, $path1],
  [$path1, true, $path2],
- [$path2, false, $path1],
+ [$path2, null, $path2],
  [$path2, false, $path1],
  [$path2, true, $path2],
- [__DIR__. DIRECTORY_SEPARATOR . basename(__FILE__), false, __FILE__],
- ['', false, null] // Empty string is valid
+ [__DIR__ . DIRECTORY_SEPARATOR . basename(__FILE__), null, __FILE__ . DIRECTORY_SEPARATOR],
+ ['', null, null] // Empty string is valid
  ];
  }
 
@@ -82,8 +95,8 @@ public function formatDataProvider(): array
  public function formatExceptionDataProvider(): array
  {
  return [
- ['abc', false],
- ['X://some\dir/@', false]
+ ['abc', null],
+ ['X://some\dir/@', null]
  ];
  }
 }

dev/tests/unit/Magento/FunctionalTestFramework/Util/Path/UrlFormatterTest.php

@@ -17,30 +17,39 @@ class UrlFormatterTest extends MagentoTestCase
  * Test url format.
  *
  * @param string $path
- * @param bool $withTrailingSeparator
+ * @param bool|null $withTrailingSeparator
  * @param string $expectedPath
  *
  * @return void
  * @dataProvider formatDataProvider
  */
- public function testFormat(string $path, bool $withTrailingSeparator, string $expectedPath): void
+ public function testFormat(string $path, ?bool $withTrailingSeparator, string $expectedPath): void
  {
+ if ($withTrailingSeparator === null) {
+ $this->assertEquals($expectedPath, UrlFormatter::format($path));
+ return;
+ }
  $this->assertEquals($expectedPath, UrlFormatter::format($path, $withTrailingSeparator));
  }
 
  /**
  * Test url format with exception.
  *
  * @param string $path
- * @param bool $withTrailingSeparator
+ * @param bool|null $withTrailingSeparator
  *
  * @return void
  * @dataProvider formatExceptionDataProvider
  */
- public function testFormatWithException(string $path, bool $withTrailingSeparator): void
+ public function testFormatWithException(string $path, ?bool $withTrailingSeparator): void
  {
  $this->expectException(TestFrameworkException::class);
  $this->expectExceptionMessage("Invalid url: $path\n");
+
+ if ($withTrailingSeparator === null) {
+ UrlFormatter::format($path);
+ return;
+ }
  UrlFormatter::format($path, $withTrailingSeparator);
  }
 
@@ -62,16 +71,16 @@ public function formatDataProvider(): array
  $url9 = 'http://www.google.com';
 
  return [
- [$url1, false, $url1],
+ [$url1, null, $url2],
  [$url1, false, $url1],
  [$url1, true, $url2],
- [$url2, false, $url1],
+ [$url2, null, $url2],
  [$url2, false, $url1],
  [$url2, true, $url2],
- [$url3, false, $url3],
+ [$url3, null, $url4],
  [$url3, false, $url3],
  [$url3, true, $url4],
- [$url4, false, $url3],
+ [$url4, null, $url4],
  [$url4, false, $url3],
  [$url4, true, $url4],
  [$url5, true, $url6],
@@ -91,7 +100,7 @@ public function formatDataProvider(): array
  public function formatExceptionDataProvider(): array
  {
  return [
- ['', false]
+ ['', null]
  ];
  }
 }