MFTF-33782: Added empty query and fragment testing to the UrlFormatterTest

Author: bohdan-harniuk

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

@@ -3,51 +3,53 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace tests\unit\Magento\FunctionalTestFramework\Util\Path;
 
-use tests\unit\Util\MagentoTestCase;
-use Magento\FunctionalTestingFramework\Util\Path\UrlFormatter;
 use Magento\FunctionalTestingFramework\Exceptions\TestFrameworkException;
+use Magento\FunctionalTestingFramework\Util\Path\UrlFormatter;
+use tests\unit\Util\MagentoTestCase;
 
 class UrlFormatterTest extends MagentoTestCase
 {
     /**
-     * Test url format
+     * Test url format.
      *
-     * @dataProvider formatDataProvider
      * @param string $path
-     * @param boolean $withTrailingSeparator
-     * @param mixed string|boolean $expectedPath
+     * @param bool $withTrailingSeparator
+     * @param string $expectedPath
+     *
      * @return void
-     * @throws TestFrameworkException
+     * @dataProvider formatDataProvider
      */
-    public function testFormat($path, $withTrailingSeparator, $expectedPath)
+    public function testFormat(string $path, bool $withTrailingSeparator, string $expectedPath): void
     {
         $this->assertEquals($expectedPath, UrlFormatter::format($path, $withTrailingSeparator));
     }
 
     /**
-     * Test url format with exception
+     * Test url format with exception.
      *
-     * @dataProvider formatExceptionDataProvider
      * @param string $path
-     * @param boolean $withTrailingSeparator
+     * @param bool $withTrailingSeparator
+     *
      * @return void
-     * @throws TestFrameworkException
+     * @dataProvider formatExceptionDataProvider
      */
-    public function testFormatWithException($path, $withTrailingSeparator)
+    public function testFormatWithException(string $path, bool $withTrailingSeparator): void
     {
         $this->expectException(TestFrameworkException::class);
         $this->expectExceptionMessage("Invalid url: $path\n");
         UrlFormatter::format($path, $withTrailingSeparator);
     }
 
     /**
-     * Data input
+     * Data input.
      *
      * @return array
      */
-    public function formatDataProvider()
+    public function formatDataProvider(): array
     {
         $url1 = 'http://magento.local/index.php';
         $url2 = $url1 . '/';
@@ -58,34 +60,38 @@ public function formatDataProvider()
         $url7 = 'http://127.0.0.1:8200';
         $url8 = 'wwøw.goåoøgle.coøm';
         $url9 = 'http://www.google.com';
+
         return [
-            [$url1, null, $url1],
+            [$url1, false, $url1],
             [$url1, false, $url1],
             [$url1, true, $url2],
-            [$url2, null, $url1],
+            [$url2, false, $url1],
             [$url2, false, $url1],
             [$url2, true, $url2],
-            [$url3, null, $url3],
+            [$url3, false, $url3],
             [$url3, false, $url3],
             [$url3, true, $url4],
-            [$url4, null, $url3],
+            [$url4, false, $url3],
             [$url4, false, $url3],
             [$url4, true, $url4],
             [$url5, true, $url6],
             [$url7, false, $url7],
             [$url8, false, $url9],
+            ['https://magento.local/path?', false, 'https://magento.local/path?'],
+            ['https://magento.local/path#', false, 'https://magento.local/path#'],
+            ['https://magento.local/path?#', false, 'https://magento.local/path?#']
         ];
     }
 
     /**
-     * Invalid data input
+     * Invalid data input.
      *
      * @return array
      */
-    public function formatExceptionDataProvider()
+    public function formatExceptionDataProvider(): array
     {
         return [
-            ['', null],
+            ['', false]
         ];
     }
 }