Skip to content

Commit 08d1380

Browse files
cparticacpartica
committed
Merge remote-tracking branch 'jackalopes/MAGETWO-67626-auto-generated-in-unit-tests' into 2.2-develop-pr
2 parents df2934e + 382c96d commit 08d1380

File tree

26 files changed

+565
-388
lines changed

26 files changed

+565
-388
lines changed

‎app/autoload.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,3 @@
3535
}
3636

3737
AutoloaderRegistry::registerAutoloader(new ClassLoaderWrapper($composerAutoloader));
38-
39-
// Sets default autoload mappings, may be overridden in Bootstrap::create
40-
\Magento\Framework\App\Bootstrap::populateAutoloader(BP, []);

‎app/bootstrap.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
}
2929

3030
require_once __DIR__ . '/autoload.php';
31+
// Sets default autoload mappings, may be overridden in Bootstrap::create
32+
\Magento\Framework\App\Bootstrap::populateAutoloader(BP, []);
33+
3134
require_once BP . '/app/functions.php';
3235

3336
/* Custom umask value may be provided in optional mage_umask file in root */

‎app/code/Magento/Customer/Test/Unit/Model/Renderer/RegionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public function testRender($regionCollection)
1515
{
1616
$countryFactoryMock = $this->getMock(
1717
\Magento\Directory\Model\CountryFactory::class,
18-
['create'],
18+
[],
1919
[],
2020
'',
2121
false

‎app/code/Magento/Directory/Model/CountryFactory.php

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎app/code/Magento/Downloadable/Test/Unit/Model/Sales/Order/Pdf/Items/CreditmemoTest.php

Lines changed: 24 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -13,70 +13,29 @@ class CreditmemoTest extends \PHPUnit_Framework_TestCase
1313
/**
1414
* @var \Magento\Downloadable\Model\Sales\Order\Pdf\Items\Creditmemo
1515
*/
16-
protected $_model;
16+
private $model;
1717

1818
/**
1919
* @var \Magento\Sales\Model\Order|\PHPUnit_Framework_MockObject_MockObject
2020
*/
21-
protected $_order;
21+
private $order;
2222

2323
/**
2424
* @var \Magento\Sales\Model\Order\Pdf\AbstractPdf|\PHPUnit_Framework_MockObject_MockObject
2525
*/
26-
protected $_pdf;
26+
private $pdf;
2727

2828
protected function setUp()
2929
{
3030
$objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
31-
$arguments = [
32-
'productFactory' => $this->getMock(\Magento\Catalog\Model\ProductFactory::class, [], [], '', false),
33-
'orderItemCollectionFactory' => $this->getMock(
34-
\Magento\Sales\Model\ResourceModel\Order\Item\CollectionFactory::class,
35-
[],
36-
[],
37-
'',
38-
false
39-
),
40-
'serviceOrderFactory' => $this->getMock(
41-
\Magento\Sales\Model\Service\OrderFactory::class,
42-
[],
43-
[],
44-
'',
45-
false
46-
),
47-
'currencyFactory' => $this->getMock(
48-
\Magento\Directory\Model\CurrencyFactory::class,
49-
[],
50-
[],
51-
'',
52-
false
53-
),
54-
'orderHistoryFactory' => $this->getMock(
55-
\Magento\Sales\Model\Order\Status\HistoryFactory::class,
56-
[],
57-
[],
58-
'',
59-
false
60-
),
61-
'orderTaxCollectionFactory' => $this->getMock(
62-
\Magento\Tax\Model\ResourceModel\Sales\Order\Tax\CollectionFactory::class,
63-
[],
64-
[],
65-
'',
66-
false
67-
),
68-
];
69-
$orderConstructorArgs = $objectManager->getConstructArguments(\Magento\Sales\Model\Order::class, $arguments);
70-
$this->_order = $this->getMock(\Magento\Sales\Model\Order::class, ['formatPriceTxt'], $orderConstructorArgs);
71-
$this->_order->expects(
72-
$this->any()
73-
)->method(
74-
'formatPriceTxt'
75-
)->will(
76-
$this->returnCallback([$this, 'formatPrice'])
77-
);
31+
$this->order = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
32+
->disableOriginalConstructor()
33+
->getMock();
34+
$this->order->expects($this->any())
35+
->method('formatPriceTxt')
36+
->will($this->returnCallback([$this, 'formatPrice']));
7837

79-
$this->_pdf = $this->getMock(
38+
$this->pdf = $this->getMock(
8039
\Magento\Sales\Model\Order\Pdf\AbstractPdf::class,
8140
['drawLineBlocks', 'getPdf'],
8241
[],
@@ -99,22 +58,22 @@ protected function setUp()
9958
['string' => new \Magento\Framework\Stdlib\StringUtils(), 'filterManager' => $filterManager]
10059
);
10160

102-
$this->_model = $this->getMock(
61+
$this->model = $this->getMock(
10362
\Magento\Downloadable\Model\Sales\Order\Pdf\Items\Creditmemo::class,
10463
['getLinks', 'getLinksTitle'],
10564
$modelConstructorArgs
10665
);
10766

108-
$this->_model->setOrder($this->_order);
109-
$this->_model->setPdf($this->_pdf);
110-
$this->_model->setPage(new \Zend_Pdf_Page('a4'));
67+
$this->model->setOrder($this->order);
68+
$this->model->setPdf($this->pdf);
69+
$this->model->setPage(new \Zend_Pdf_Page('a4'));
11170
}
11271

11372
protected function tearDown()
11473
{
115-
$this->_model = null;
116-
$this->_order = null;
117-
$this->_pdf = null;
74+
$this->model = null;
75+
$this->order = null;
76+
$this->pdf = null;
11877
}
11978

12079
/**
@@ -153,7 +112,7 @@ public function testDraw()
153112
],
154113
];
155114

156-
$this->_model->setItem(
115+
$this->model->setItem(
157116
new \Magento\Framework\DataObject(
158117
[
159118
'name' => 'Downloadable Documentation',
@@ -173,8 +132,8 @@ public function testDraw()
173132
]
174133
)
175134
);
176-
$this->_model->expects($this->any())->method('getLinksTitle')->will($this->returnValue('Download Links'));
177-
$this->_model->expects(
135+
$this->model->expects($this->any())->method('getLinksTitle')->will($this->returnValue('Download Links'));
136+
$this->model->expects(
178137
$this->any()
179138
)->method(
180139
'getLinks'
@@ -187,7 +146,7 @@ public function testDraw()
187146
)
188147
)
189148
);
190-
$this->_pdf->expects(
149+
$this->pdf->expects(
191150
$this->once()
192151
)->method(
193152
'drawLineBlocks'
@@ -199,8 +158,8 @@ public function testDraw()
199158
$this->returnValue($expectedPdfPage)
200159
);
201160

202-
$this->assertNotSame($expectedPdfPage, $this->_model->getPage());
203-
$this->assertNull($this->_model->draw());
204-
$this->assertSame($expectedPdfPage, $this->_model->getPage());
161+
$this->assertNotSame($expectedPdfPage, $this->model->getPage());
162+
$this->assertNull($this->model->draw());
163+
$this->assertSame($expectedPdfPage, $this->model->getPage());
205164
}
206165
}

‎app/code/Magento/Paypal/Test/Unit/Model/PayflowproTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ protected function setUp()
8787
->getMock();
8888

8989
$clientFactory = $this->getMockBuilder(ZendClientFactory::class)
90+
->disableOriginalConstructor()
9091
->getMock();
9192
$clientFactory->method('create')->will($this->returnValue($client));
9293

‎app/code/Magento/Review/Test/Unit/Model/ResourceModel/Review/Product/CollectionTest.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,19 +87,10 @@ protected function setUp()
8787
\Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitation::class
8888
);
8989
$productLimitationFactoryMock = $this->getMockBuilder(ProductLimitationFactory::class)
90-
->setMethods(['create'])
9190
->disableOriginalConstructor()
9291
->getMock();
93-
9492
$productLimitationFactoryMock->method('create')
9593
->willReturn($productLimitationMock);
96-
97-
$objectManager = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
98-
->disableOriginalConstructor()
99-
->getMock();
100-
101-
\Magento\Framework\App\ObjectManager::setInstance($objectManager);
102-
10394
$this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
10495
$this->model = $this->objectManager->getObject(
10596
\Magento\Review\Model\ResourceModel\Review\Product\Collection::class,

‎app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/CreditmemoLoaderTest.php

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,62 +15,57 @@ class CreditmemoLoaderTest extends \PHPUnit_Framework_TestCase
1515
/**
1616
* @var \Magento\Sales\Controller\Adminhtml\Order\CreditmemoLoader
1717
*/
18-
protected $loader;
18+
private $loader;
1919

2020
/**
2121
* @var \Magento\Sales\Api\CreditmemoRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
2222
*/
23-
protected $creditmemoRepositoryMock;
23+
private $creditmemoRepositoryMock;
2424

2525
/**
2626
* @var \Magento\Sales\Model\Order\CreditmemoFactory|\PHPUnit_Framework_MockObject_MockObject
2727
*/
28-
protected $creditmemoFactoryMock;
28+
private $creditmemoFactoryMock;
2929

3030
/**
3131
* @var \PHPUnit_Framework_MockObject_MockObject
3232
*/
33-
protected $orderFactoryMock;
33+
private $orderFactoryMock;
3434

3535
/**
3636
* @var \PHPUnit_Framework_MockObject_MockObject
3737
*/
38-
protected $invoiceRepositoryMock;
38+
private $invoiceRepositoryMock;
3939

4040
/**
4141
* @var \PHPUnit_Framework_MockObject_MockObject
4242
*/
43-
protected $serviceOrderFactoryMock;
43+
private $eventManagerMock;
4444

4545
/**
4646
* @var \PHPUnit_Framework_MockObject_MockObject
4747
*/
48-
protected $eventManagerMock;
48+
private $sessionMock;
4949

5050
/**
5151
* @var \PHPUnit_Framework_MockObject_MockObject
5252
*/
53-
protected $sessionMock;
53+
private $messageManagerMock;
5454

5555
/**
5656
* @var \PHPUnit_Framework_MockObject_MockObject
5757
*/
58-
protected $messageManagerMock;
58+
private $registryMock;
5959

6060
/**
6161
* @var \PHPUnit_Framework_MockObject_MockObject
6262
*/
63-
protected $registryMock;
63+
private $helperMock;
6464

6565
/**
6666
* @var \PHPUnit_Framework_MockObject_MockObject
6767
*/
68-
protected $helperMock;
69-
70-
/**
71-
* @var \PHPUnit_Framework_MockObject_MockObject
72-
*/
73-
protected $stockConfiguration;
68+
private $stockConfiguration;
7469

7570
protected function setUp()
7671
{
@@ -93,10 +88,6 @@ protected function setUp()
9388
->disableOriginalConstructor()
9489
->setMethods(['create'])
9590
->getMockForAbstractClass();
96-
$this->serviceOrderFactoryMock = $this->getMockBuilder(\Magento\Sales\Model\Service\OrderFactory::class)
97-
->disableOriginalConstructor()
98-
->setMethods(['create'])
99-
->getMock();
10091
$this->eventManagerMock = $this->getMockBuilder(\Magento\Framework\Event\Manager::class)
10192
->disableOriginalConstructor()
10293
->setMethods([])

‎app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoDocumentFactoryTest.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
namespace Magento\Sales\Test\Unit\Model\Order;
77

88
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
9+
use Magento\Sales\Api\Data\CreditmemoCommentInterfaceFactory;
910
use Magento\Sales\Api\OrderRepositoryInterface;
1011
use Magento\Sales\Model\Order\CreditmemoDocumentFactory;
1112
use Magento\Sales\Api\Data\CreditmemoCommentInterface;
@@ -41,7 +42,7 @@ class CreditmemoDocumentFactoryTest extends \PHPUnit_Framework_TestCase
4142
private $creditmemoFactoryMock;
4243

4344
/**
44-
* @var \Magento\Sales\Api\Data\CreditmemoCommentInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
45+
* @var CreditmemoCommentInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
4546
*/
4647
private $commentFactoryMock;
4748

@@ -102,8 +103,8 @@ public function setUp()
102103
->disableOriginalConstructor()
103104
->getMock();
104105
$this->commentFactoryMock =
105-
$this->getMockBuilder('Magento\Sales\Api\Data\CreditmemoCommentInterfaceFactory')
106-
->setMethods(['create'])
106+
$this->getMockBuilder(CreditmemoCommentInterfaceFactory::class)
107+
->disableOriginalConstructor()
107108
->getMock();
108109
$this->hydratorPoolMock = $this->getMockBuilder(HydratorPool::class)
109110
->disableOriginalConstructor()

0 commit comments

Comments
 (0)