Update unit test to properly test corrected implementation of getUris

Author: David Alger

app/code/Magento/PageCache/Test/Unit/Model/Cache/ServerTest.php

@@ -5,11 +5,13 @@
  */
 namespace Magento\PageCache\Test\Unit\Model\Cache;
 
+use \Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use \Magento\PageCache\Model\Cache\Server;
 use \Zend\Uri\UriFactory;
 
 class ServerTest extends \PHPUnit_Framework_TestCase
 {
-    /** @var \Magento\PageCache\Model\Cache\Server */
+    /** @var Server */
     protected $model;
 
     /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\App\DeploymentConfig */
@@ -30,7 +32,7 @@ public function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $objectManager = new ObjectManager($this);
         $this->model = $objectManager->getObject(
             'Magento\PageCache\Model\Cache\Server',
             [
@@ -56,12 +58,9 @@ public function testGetUris(
         $url,
         $hostConfig = null
     ) {
-        $this->configMock->expects($this->once())
-            ->method('get')
-            ->willReturn($hostConfig);
-        $this->requestMock->expects($this->exactly($getHttpHostCallCtr))
-            ->method('getHttpHost')
-            ->willReturn($httpHost);
+        $this->configMock->expects($this->once())->method('get')->willReturn($hostConfig);
+        $this->requestMock->expects($this->exactly($getHttpHostCallCtr))->method('getHttpHost')->willReturn($httpHost);
+
         $this->urlBuilderMock->expects($this->exactly($getUrlCallCtr))
             ->method('getUrl')
             ->with('*', ['_nosid' => true])
@@ -70,30 +69,32 @@ public function testGetUris(
         $uris = [];
         if (null === $hostConfig) {
             if (!empty($httpHost)) {
-                $uris[] = UriFactory::factory('')->setHost($httpHost)
-                    ->setPort(\Magento\PageCache\Model\Cache\Server::DEFAULT_PORT)
-                    ->setScheme('http');
+                $uris[] = UriFactory::factory('')->setHost($httpHost)->setPort(Server::DEFAULT_PORT);
             }
             if (!empty($url)) {
                 $uris[] = UriFactory::factory($url);
             }
         } else {
             foreach ($hostConfig as $host) {
-                $port = isset($host['port']) ? $host['port'] : \Magento\PageCache\Model\Cache\Server::DEFAULT_PORT;
-                $uris[] = UriFactory::factory('')->setHost($host['host'])
-                    ->setPort($port)
-                    ->setScheme('http');
+                $port = isset($host['port']) ? $host['port'] : Server::DEFAULT_PORT;
+                $uris[] = UriFactory::factory('')->setHost($host['host'])->setPort($port);
             }
         }
 
+        foreach ($uris as $key => $value) {
+            $uris[$key]->setScheme('http')
+                ->setPath('/')
+                ->setQuery(null);
+        }
+
         $this->assertEquals($uris, $this->model->getUris());
     }
 
     public function getUrisDataProvider()
     {
         return [
-            'http host' => [1, '127.0.0.1', 0, '',],
-            'url' => [1, '', 1, 'http://host',],
+            'http host' => [2, '127.0.0.1', 0, ''],
+            'url' => [1, '', 1, 'http://host'],
             'config' => [
                 0,
                 '',