magento#10045 tests clean up

piotrkwiecinski · Jul 24, 2017 · 878e361 · 878e361
1 parent 4bc880b
commit 878e361
Show file tree

Hide file tree

Showing 5 changed files with 224 additions and 218 deletions.
diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/CategorySitemapItemResolverTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/CategorySitemapItemResolverTest.php
@@ -28,7 +28,7 @@ public function testGetItemsEmpty()
         $itemFactoryMock = $this->getItemFactoryMock();
 
         $resolver = new CategorySitemapItemResolver($storeConfigMock, $cmsPageFactoryMock, $itemFactoryMock);
-        self::assertSame([], $resolver->getItems(1));
+        $this->assertSame([], $resolver->getItems(1));
     }
 
     /**
@@ -49,13 +49,13 @@ public function testGetItems(array $categories)
 
         $resolver = new CategorySitemapItemResolver($storeConfigMock, $cmsPageFactoryMock, $itemFactoryMock);
         $items = $resolver->getItems(1);
-        self::assertTrue(count($items) == count($categories));
+        $this->assertTrue(count($items) == count($categories));
         foreach ($categories as $index => $category) {
-            self::assertSame($category->getUpdatedAt(), $items[$index]->getUpdatedAt());
-            self::assertSame('daily', $items[$index]->getChangeFrequency());
-            self::assertSame('1.0', $items[$index]->getPriority());
-            self::assertSame($category->getImages(), $items[$index]->getImages());
-            self::assertSame($category->getUrl(), $items[$index]->getUrl());
+            $this->assertSame($category->getUpdatedAt(), $items[$index]->getUpdatedAt());
+            $this->assertSame('daily', $items[$index]->getChangeFrequency());
+            $this->assertSame('1.0', $items[$index]->getPriority());
+            $this->assertSame($category->getImages(), $items[$index]->getImages());
+            $this->assertSame($category->getUrl(), $items[$index]->getUrl());
         }
     }
 

diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/CmsPageSitemapItemResolverTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/CmsPageSitemapItemResolverTest.php
@@ -29,7 +29,7 @@ public function testGetItemsEmpty()
         $itemFactoryMock = $this->getItemFactoryMock();
 
         $resolver = new CmsPageSitemapItemResolver($storeConfigMock, $cmsPageFactoryMock, $itemFactoryMock);
-        self::assertSame([], $resolver->getItems(1));
+        $this->assertSame([], $resolver->getItems(1));
     }
 
     /**
@@ -50,13 +50,13 @@ public function testGetItems(array $pages = [])
 
         $resolver = new CmsPageSitemapItemResolver($storeConfigMock, $cmsPageFactoryMock, $itemFactoryMock);
         $items = $resolver->getItems(1);
-        self::assertTrue(count($items) == count($pages));
+        $this->assertTrue(count($items) == count($pages));
         foreach ($pages as $index => $page) {
-            self::assertSame($page->getUpdatedAt(), $items[$index]->getUpdatedAt());
-            self::assertSame('daily', $items[$index]->getChangeFrequency());
-            self::assertSame('1.0', $items[$index]->getPriority());
-            self::assertSame($page->getImages(), $items[$index]->getImages());
-            self::assertSame($page->getUrl(), $items[$index]->getUrl());
+            $this->assertSame($page->getUpdatedAt(), $items[$index]->getUpdatedAt());
+            $this->assertSame('daily', $items[$index]->getChangeFrequency());
+            $this->assertSame('1.0', $items[$index]->getPriority());
+            $this->assertSame($page->getImages(), $items[$index]->getImages());
+            $this->assertSame($page->getUrl(), $items[$index]->getUrl());
         }
     }
 

diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/CompositeSitemapItemResolverTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/CompositeSitemapItemResolverTest.php
@@ -15,7 +15,7 @@ class CompositeSitemapItemResolverTest extends \PHPUnit_Framework_TestCase
     public function testNoResolvers()
     {
         $resolver = new CompositeSitemapItemResolver();
-        self::assertSame([], $resolver->getItems(1));
+        $this->assertSame([], $resolver->getItems(1));
     }
 
     /**
@@ -39,7 +39,7 @@ public function testGetItems($itemResolverData, $expectedItems)
         $resolver = new CompositeSitemapItemResolver($mockResolvers);
         $items = $resolver->getItems(1);
 
-        self::assertSame($expectedItems, $items);
+        $this->assertSame($expectedItems, $items);
     }
 
     /**

diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/ProductSitemapItemResolverTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/ProductSitemapItemResolverTest.php
@@ -24,8 +24,8 @@ public function testGetItemsEmpty()
             ProductSitemapItemResolver::XML_PATH_PRODUCT_PRIORITY => '1.0',
         ]);
 
-        $ProductMock = $this->getProductCollectionMock([]);
-        $cmsPageFactoryMock = $this->getProductFactoryMock($ProductMock);
+        $productMock = $this->getProductCollectionMock([]);
+        $cmsPageFactoryMock = $this->getProductFactoryMock($productMock);
         $itemFactoryMock = $this->getItemFactoryMock();
 
         $resolver = new ProductSitemapItemResolver($storeConfigMock, $cmsPageFactoryMock, $itemFactoryMock);
@@ -43,9 +43,9 @@ public function testGetItems(array $products)
             ProductSitemapItemResolver::XML_PATH_PRODUCT_PRIORITY => '1.0',
         ]);
 
-        $ProductMock = $this->getProductCollectionMock($products);
+        $productMock = $this->getProductCollectionMock($products);
 
-        $cmsPageFactoryMock = $this->getProductFactoryMock($ProductMock);
+        $cmsPageFactoryMock = $this->getProductFactoryMock($productMock);
         $itemFactoryMock = $this->getItemFactoryMock();
 
         $resolver = new ProductSitemapItemResolver($storeConfigMock, $cmsPageFactoryMock, $itemFactoryMock);