MAGETWO-59785: Incorrect URLs in sitemap when generated from admin with 'Use Secure URLs in Admin' = Yes

Used API methods. Reformatted the code.

Author: VenkataUppalapati

app/code/Magento/Sitemap/Model/Sitemap.php

@@ -586,8 +586,9 @@ protected function _getBaseDir()
      */
     protected function _getStoreBaseUrl($type = \Magento\Framework\UrlInterface::URL_TYPE_LINK)
     {
-        $isSecure = $this->_storeManager->getStore($this->getStoreId())->isFrontUrlSecure();
-        return rtrim($this->_storeManager->getStore($this->getStoreId())->getBaseUrl($type, $isSecure), '/') . '/';
+        $store = $this->_storeManager->getStore($this->getStoreId());
+        $isSecure = $store->isUrlSecure();
+        return rtrim($store->getBaseUrl($type, $isSecure), '/') . '/';
     }
 
     /**

app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php

@@ -478,32 +478,19 @@ function ($from, $to) {
 
         $model = $this->_getModelMock(true);
 
-        $storeMock = $this->getMockBuilder(
-            \Magento\Store\Model\Store::class
-        )->setMethods(
-            ['isFrontUrlSecure', 'getBaseUrl']
-        )->disableOriginalConstructor()->getMock();
+        $storeMock = $this->getMockBuilder(\Magento\Store\Model\Store::class)
+            ->setMethods(['isFrontUrlSecure', 'getBaseUrl'])
+            ->disableOriginalConstructor()
+            ->getMock();
         $storeMock->expects($this->atLeastOnce())->method('isFrontUrlSecure')->willReturn(false);
-        $storeMock->expects(
-            $this->atLeastOnce()
-        )->method(
-            'getBaseUrl'
-        )->with(
-            $this->isType('string'),
-            false
-        )->willReturn(
-            'http://store.com/'
-        );
-
-        $this->_storeManagerMock->expects(
-            $this->atLeastOnce()
-        )->method(
-            'getStore'
-        )->with(
-            1
-        )->willReturn(
-            $storeMock
-        );
+        $storeMock->expects($this->atLeastOnce())
+            ->method('getBaseUrl')
+            ->with($this->isType('string'), false)
+            ->willReturn('http://store.com/');
+        $this->_storeManagerMock->expects($this->atLeastOnce())
+            ->method('getStore')
+            ->with(1)
+            ->willReturn($storeMock);
 
         return $model;
     }
@@ -641,11 +628,9 @@ protected function _getModelConstructorArgs()
         )->disableOriginalConstructor()->getMock();
         $cmsFactory->expects($this->any())->method('create')->will($this->returnValue($this->_sitemapCmsPageMock));
 
-        $this->_storeManagerMock = $this->getMockBuilder(
-            \Magento\Store\Model\StoreManagerInterface::class
-        )->setMethods(
-            ['getStore']
-        )->getMockForAbstractClass();
+        $this->_storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
+            ->setMethods(['getStore'])
+            ->getMockForAbstractClass();
 
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $constructArguments = $objectManager->getConstructArguments(