Skip to content

Commit 7eed557

Browse files
author
Oleksii Korshenko
authored
Merge pull request #27824 from lbajsarowicz/phpunit8/module-CatalogUrlRewrite
#27500 Prepare CatalogUrlRewrite module Tests for PHPUnit 8
2 parents ea7af78 + 4e0f00e commit 7eed557

File tree

41 files changed

+818
-645
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+818
-645
lines changed

‎app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/CanonicalUrlRewriteGeneratorTest.php

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,52 @@
1-
<?php
1+
<?php declare(strict_types=1);
22
/**
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
66

77
namespace Magento\CatalogUrlRewrite\Test\Unit\Model\Category;
88

9+
use Magento\Catalog\Model\Category;
10+
use Magento\CatalogUrlRewrite\Model\Category\CanonicalUrlRewriteGenerator;
11+
use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator;
912
use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
1013
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
14+
use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
15+
use Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory;
16+
use PHPUnit\Framework\MockObject\MockObject;
17+
use PHPUnit\Framework\TestCase;
1118

12-
class CanonicalUrlRewriteGeneratorTest extends \PHPUnit\Framework\TestCase
19+
class CanonicalUrlRewriteGeneratorTest extends TestCase
1320
{
14-
/** @var \Magento\CatalogUrlRewrite\Model\Category\CanonicalUrlRewriteGenerator */
21+
/** @var CanonicalUrlRewriteGenerator */
1522
protected $canonicalUrlRewriteGenerator;
1623

17-
/** @var \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator|\PHPUnit_Framework_MockObject_MockObject */
24+
/** @var CategoryUrlPathGenerator|MockObject */
1825
protected $categoryUrlPathGenerator;
1926

20-
/** @var \Magento\Catalog\Model\Category|\PHPUnit_Framework_MockObject_MockObject */
27+
/** @var Category|MockObject */
2128
protected $category;
2229

23-
/** @var \Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory|\PHPUnit_Framework_MockObject_MockObject */
30+
/** @var UrlRewriteFactory|MockObject */
2431
protected $urlRewriteFactory;
2532

26-
/** @var \Magento\UrlRewrite\Service\V1\Data\UrlRewrite|\PHPUnit_Framework_MockObject_MockObject */
33+
/** @var UrlRewrite|MockObject */
2734
protected $urlRewrite;
2835

29-
protected function setUp()
36+
protected function setUp(): void
3037
{
31-
$this->urlRewriteFactory = $this->getMockBuilder(\Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory::class)
38+
$this->urlRewriteFactory = $this->getMockBuilder(UrlRewriteFactory::class)
3239
->setMethods(['create'])
3340
->disableOriginalConstructor()->getMock();
34-
$this->urlRewrite = $this->getMockBuilder(\Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class)
41+
$this->urlRewrite = $this->getMockBuilder(UrlRewrite::class)
3542
->disableOriginalConstructor()->getMock();
36-
$this->category = $this->getMockBuilder(\Magento\Catalog\Model\Category::class)
43+
$this->category = $this->getMockBuilder(Category::class)
3744
->disableOriginalConstructor()->getMock();
3845
$this->categoryUrlPathGenerator = $this->getMockBuilder(
39-
\Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator::class
46+
CategoryUrlPathGenerator::class
4047
)->disableOriginalConstructor()->getMock();
4148
$this->canonicalUrlRewriteGenerator = (new ObjectManager($this))->getObject(
42-
\Magento\CatalogUrlRewrite\Model\Category\CanonicalUrlRewriteGenerator::class,
49+
CanonicalUrlRewriteGenerator::class,
4350
[
4451
'categoryUrlPathGenerator' => $this->categoryUrlPathGenerator,
4552
'urlRewriteFactory' => $this->urlRewriteFactory

‎app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/ChildrenCategoriesProviderTest.php

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,50 @@
1-
<?php
1+
<?php declare(strict_types=1);
22
/**
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
66

77
namespace Magento\CatalogUrlRewrite\Test\Unit\Model\Category;
88

9+
use Magento\Catalog\Model\Category;
10+
use Magento\Catalog\Model\ResourceModel\Collection\AbstractCollection;
11+
use Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider;
12+
use Magento\Framework\DB\Adapter\AdapterInterface;
13+
use Magento\Framework\DB\Select;
914
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
15+
use PHPUnit\Framework\MockObject\MockObject;
16+
use PHPUnit\Framework\TestCase;
1017

11-
class ChildrenCategoriesProviderTest extends \PHPUnit\Framework\TestCase
18+
class ChildrenCategoriesProviderTest extends TestCase
1219
{
13-
/** @var \PHPUnit_Framework_MockObject_MockObject */
20+
/** @var MockObject */
1421
protected $category;
1522

16-
/** @var \PHPUnit_Framework_MockObject_MockObject */
23+
/** @var MockObject */
1724
protected $select;
1825

19-
/** @var \PHPUnit_Framework_MockObject_MockObject */
26+
/** @var MockObject */
2027
protected $connection;
2128

22-
/** @var \Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider */
29+
/** @var ChildrenCategoriesProvider */
2330
protected $childrenCategoriesProvider;
2431

25-
protected function setUp()
32+
protected function setUp(): void
2633
{
27-
$this->category = $this->getMockBuilder(\Magento\Catalog\Model\Category::class)
34+
$this->category = $this->getMockBuilder(Category::class)
2835
->disableOriginalConstructor()
2936
->setMethods(['getPath', 'getResourceCollection', 'getResource', 'getLevel', '__wakeup', 'isObjectNew'])
3037
->getMock();
3138
$categoryCollection = $this->getMockBuilder(
32-
\Magento\Catalog\Model\ResourceModel\Collection\AbstractCollection::class
39+
AbstractCollection::class
3340
)->disableOriginalConstructor()->setMethods(['addAttributeToSelect', 'addIdFilter'])->getMock();
3441
$this->category->expects($this->any())->method('getPath')->willReturn('category-path');
3542
$this->category->expects($this->any())->method('getResourceCollection')->willReturn($categoryCollection);
3643
$categoryCollection->expects($this->any())->method('addAttributeToSelect')->willReturnSelf();
3744
$categoryCollection->expects($this->any())->method('addIdFilter')->with(['id'])->willReturnSelf();
38-
$this->select = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
45+
$this->select = $this->getMockBuilder(Select::class)
3946
->disableOriginalConstructor()->setMethods(['from', 'where', 'deleteFromSelect'])->getMock();
40-
$this->connection = $this->createMock(\Magento\Framework\DB\Adapter\AdapterInterface::class);
47+
$this->connection = $this->createMock(AdapterInterface::class);
4148
$categoryResource = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Category::class)
4249
->disableOriginalConstructor()->getMock();
4350
$this->category->expects($this->any())->method('getResource')->willReturn($categoryResource);
@@ -47,7 +54,7 @@ protected function setUp()
4754
$this->select->expects($this->any())->method('from')->willReturnSelf();
4855

4956
$this->childrenCategoriesProvider = (new ObjectManager($this))->getObject(
50-
\Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider::class
57+
ChildrenCategoriesProvider::class
5158
);
5259
}
5360

‎app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/ChildrenUrlRewriteGeneratorTest.php

Lines changed: 37 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,81 @@
1-
<?php
1+
<?php declare(strict_types=1);
22
/**
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
66
namespace Magento\CatalogUrlRewrite\Test\Unit\Model\Category;
77

8+
use Magento\Catalog\Model\Category;
9+
use Magento\Catalog\Model\CategoryRepository;
10+
use Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider;
11+
use Magento\CatalogUrlRewrite\Model\Category\ChildrenUrlRewriteGenerator;
12+
use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
13+
use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGeneratorFactory;
814
use Magento\Framework\Serialize\Serializer\Json;
915
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
16+
use Magento\UrlRewrite\Model\MergeDataProvider;
17+
use Magento\UrlRewrite\Model\MergeDataProviderFactory;
18+
use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
19+
use PHPUnit\Framework\MockObject\MockObject;
20+
use PHPUnit\Framework\TestCase;
1021

11-
class ChildrenUrlRewriteGeneratorTest extends \PHPUnit\Framework\TestCase
22+
/**
23+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
24+
*/
25+
class ChildrenUrlRewriteGeneratorTest extends TestCase
1226
{
13-
/** @var \Magento\CatalogUrlRewrite\Model\Category\ChildrenUrlRewriteGenerator */
27+
/** @var ChildrenUrlRewriteGenerator */
1428
private $childrenUrlRewriteGenerator;
1529

16-
/** @var \PHPUnit_Framework_MockObject_MockObject */
30+
/** @var MockObject */
1731
private $category;
1832

19-
/** @var \PHPUnit_Framework_MockObject_MockObject */
33+
/** @var MockObject */
2034
private $childrenCategoriesProvider;
2135

22-
/** @var \PHPUnit_Framework_MockObject_MockObject */
36+
/** @var MockObject */
2337
private $categoryUrlRewriteGeneratorFactory;
2438

25-
/** @var \PHPUnit_Framework_MockObject_MockObject */
39+
/** @var MockObject */
2640
private $categoryUrlRewriteGenerator;
2741

28-
/** @var \PHPUnit_Framework_MockObject_MockObject */
42+
/** @var MockObject */
2943
private $mergeDataProvider;
3044

31-
/** @var \PHPUnit_Framework_MockObject_MockObject */
45+
/** @var MockObject */
3246
private $serializerMock;
3347

34-
/** @var \PHPUnit_Framework_MockObject_MockObject */
48+
/** @var MockObject */
3549
private $categoryRepository;
3650

37-
protected function setUp()
51+
protected function setUp(): void
3852
{
3953
$this->serializerMock = $this->getMockBuilder(Json::class)
4054
->disableOriginalConstructor()
4155
->getMock();
4256
$this->childrenCategoriesProvider = $this->getMockBuilder(
43-
\Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider::class
57+
ChildrenCategoriesProvider::class
4458
)->disableOriginalConstructor()->getMock();
45-
$this->category = $this->getMockBuilder(\Magento\Catalog\Model\Category::class)
59+
$this->category = $this->getMockBuilder(Category::class)
4660
->disableOriginalConstructor()->getMock();
4761
$this->categoryUrlRewriteGeneratorFactory = $this->getMockBuilder(
48-
\Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGeneratorFactory::class
62+
CategoryUrlRewriteGeneratorFactory::class
4963
)->disableOriginalConstructor()->setMethods(['create'])->getMock();
5064
$this->categoryUrlRewriteGenerator = $this->getMockBuilder(
51-
\Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator::class
65+
CategoryUrlRewriteGenerator::class
5266
)->disableOriginalConstructor()->getMock();
5367
$this->categoryRepository = $this->getMockBuilder(
54-
\Magento\Catalog\Model\CategoryRepository::class
68+
CategoryRepository::class
5569
)->disableOriginalConstructor()->getMock();
5670
$mergeDataProviderFactory = $this->createPartialMock(
57-
\Magento\UrlRewrite\Model\MergeDataProviderFactory::class,
71+
MergeDataProviderFactory::class,
5872
['create']
5973
);
60-
$this->mergeDataProvider = new \Magento\UrlRewrite\Model\MergeDataProvider();
74+
$this->mergeDataProvider = new MergeDataProvider();
6175
$mergeDataProviderFactory->expects($this->once())->method('create')->willReturn($this->mergeDataProvider);
6276

6377
$this->childrenUrlRewriteGenerator = (new ObjectManager($this))->getObject(
64-
\Magento\CatalogUrlRewrite\Model\Category\ChildrenUrlRewriteGenerator::class,
78+
ChildrenUrlRewriteGenerator::class,
6579
[
6680
'childrenCategoriesProvider' => $this->childrenCategoriesProvider,
6781
'categoryUrlRewriteGeneratorFactory' => $this->categoryUrlRewriteGeneratorFactory,
@@ -85,7 +99,7 @@ public function testGenerate()
8599
$saveRewritesHistory = 'flag';
86100
$childId = 2;
87101

88-
$childCategory = $this->getMockBuilder(\Magento\Catalog\Model\Category::class)
102+
$childCategory = $this->getMockBuilder(Category::class)
89103
->disableOriginalConstructor()->getMock();
90104
$childCategory->expects($this->once())->method('setData')
91105
->with('save_rewrites_history', $saveRewritesHistory);
@@ -97,13 +111,13 @@ public function testGenerate()
97111
->will($this->returnValue($saveRewritesHistory));
98112
$this->categoryUrlRewriteGeneratorFactory->expects($this->once())->method('create')
99113
->will($this->returnValue($this->categoryUrlRewriteGenerator));
100-
$url1 = new \Magento\UrlRewrite\Service\V1\Data\UrlRewrite([], $this->serializerMock);
114+
$url1 = new UrlRewrite([], $this->serializerMock);
101115
$url1->setRequestPath('category-1')
102116
->setStoreId(1);
103-
$url2 = new \Magento\UrlRewrite\Service\V1\Data\UrlRewrite([], $this->serializerMock);
117+
$url2 = new UrlRewrite([], $this->serializerMock);
104118
$url2->setRequestPath('category-2')
105119
->setStoreId(2);
106-
$url3 = new \Magento\UrlRewrite\Service\V1\Data\UrlRewrite([], $this->serializerMock);
120+
$url3 = new UrlRewrite([], $this->serializerMock);
107121
$url3->setRequestPath('category-1')
108122
->setStoreId(1);
109123
$this->categoryUrlRewriteGenerator->expects($this->once())->method('generate')

‎app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/CurrentUrlRewritesRegeneratorTest.php

Lines changed: 32 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,76 @@
1-
<?php
1+
<?php declare(strict_types=1);
22
/**
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
66

77
namespace Magento\CatalogUrlRewrite\Test\Unit\Model\Category;
88

9+
use Magento\Catalog\Model\Category;
10+
use Magento\CatalogUrlRewrite\Model\Category\CurrentUrlRewritesRegenerator;
11+
use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator;
912
use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
13+
use Magento\CatalogUrlRewrite\Model\Map\UrlRewriteFinder;
1014
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
15+
use Magento\UrlRewrite\Model\MergeDataProvider;
16+
use Magento\UrlRewrite\Model\MergeDataProviderFactory;
1117
use Magento\UrlRewrite\Model\OptionProvider;
1218
use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
19+
use Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory;
20+
use PHPUnit\Framework\MockObject\MockObject;
21+
use PHPUnit\Framework\TestCase;
1322

14-
class CurrentUrlRewritesRegeneratorTest extends \PHPUnit\Framework\TestCase
23+
/**
24+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
25+
*/
26+
class CurrentUrlRewritesRegeneratorTest extends TestCase
1527
{
16-
/** @var \Magento\CatalogUrlRewrite\Model\Category\CurrentUrlRewritesRegenerator */
28+
/** @var CurrentUrlRewritesRegenerator */
1729
private $currentUrlRewritesRegenerator;
1830

19-
/** @var \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator|\PHPUnit_Framework_MockObject_MockObject */
31+
/** @var CategoryUrlPathGenerator|MockObject */
2032
private $categoryUrlPathGenerator;
2133

22-
/** @var \Magento\Catalog\Model\Category|\PHPUnit_Framework_MockObject_MockObject */
34+
/** @var Category|MockObject */
2335
private $category;
2436

25-
/** @var \Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory|\PHPUnit_Framework_MockObject_MockObject */
37+
/** @var UrlRewriteFactory|MockObject */
2638
private $urlRewriteFactory;
2739

28-
/** @var \Magento\UrlRewrite\Service\V1\Data\UrlRewrite|\PHPUnit_Framework_MockObject_MockObject */
40+
/** @var UrlRewrite|MockObject */
2941
private $urlRewrite;
3042

31-
/** @var \PHPUnit_Framework_MockObject_MockObject */
43+
/** @var MockObject */
3244
private $mergeDataProvider;
3345

34-
/** @var \PHPUnit_Framework_MockObject_MockObject */
46+
/** @var MockObject */
3547
private $urlRewriteFinder;
3648

37-
protected function setUp()
49+
protected function setUp(): void
3850
{
39-
$this->urlRewriteFactory = $this->getMockBuilder(\Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory::class)
51+
$this->urlRewriteFactory = $this->getMockBuilder(UrlRewriteFactory::class)
4052
->setMethods(['create'])
4153
->disableOriginalConstructor()->getMock();
42-
$this->urlRewrite = $this->getMockBuilder(\Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class)
54+
$this->urlRewrite = $this->getMockBuilder(UrlRewrite::class)
4355
->disableOriginalConstructor()->getMock();
44-
$this->category = $this->getMockBuilder(\Magento\Catalog\Model\Category::class)
56+
$this->category = $this->getMockBuilder(Category::class)
4557
->disableOriginalConstructor()->getMock();
4658
$this->categoryUrlPathGenerator = $this->getMockBuilder(
47-
\Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator::class
59+
CategoryUrlPathGenerator::class
4860
)->disableOriginalConstructor()->getMock();
49-
$this->urlRewriteFinder = $this->getMockBuilder(\Magento\CatalogUrlRewrite\Model\Map\UrlRewriteFinder::class)
61+
$this->urlRewriteFinder = $this->getMockBuilder(UrlRewriteFinder::class)
5062
->disableOriginalConstructor()->getMock();
5163
$this->urlRewriteFactory->expects($this->once())->method('create')
5264
->willReturn($this->urlRewrite);
5365
$mergeDataProviderFactory = $this->createPartialMock(
54-
\Magento\UrlRewrite\Model\MergeDataProviderFactory::class,
66+
MergeDataProviderFactory::class,
5567
['create']
5668
);
57-
$this->mergeDataProvider = new \Magento\UrlRewrite\Model\MergeDataProvider;
69+
$this->mergeDataProvider = new MergeDataProvider();
5870
$mergeDataProviderFactory->expects($this->once())->method('create')->willReturn($this->mergeDataProvider);
5971

6072
$this->currentUrlRewritesRegenerator = (new ObjectManager($this))->getObject(
61-
\Magento\CatalogUrlRewrite\Model\Category\CurrentUrlRewritesRegenerator::class,
73+
CurrentUrlRewritesRegenerator::class,
6274
[
6375
'categoryUrlPathGenerator' => $this->categoryUrlPathGenerator,
6476
'urlRewriteFactory' => $this->urlRewriteFactory,
@@ -247,8 +259,8 @@ protected function getCurrentRewritesMocks($currentRewrites)
247259
{
248260
$rewrites = [];
249261
foreach ($currentRewrites as $urlRewrite) {
250-
/** @var \PHPUnit_Framework_MockObject_MockObject */
251-
$url = $this->getMockBuilder(\Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class)
262+
/** @var MockObject */
263+
$url = $this->getMockBuilder(UrlRewrite::class)
252264
->disableOriginalConstructor()->getMock();
253265
foreach ($urlRewrite as $key => $value) {
254266
$url->expects($this->any())

0 commit comments

Comments
 (0)