Skip to content

Commit 38957fb

Browse files
author
Serhiy Shkolyarenko
committed
MAGETWO-35558: Bug fixing activity
unit test fix
1 parent d340385 commit 38957fb

File tree

10 files changed

+23
-101
lines changed

10 files changed

+23
-101
lines changed

‎app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
/**
1818
* Class CreditmemoSender
19+
*
20+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1921
*/
2022
class CreditmemoSender extends NotifySender
2123
{

‎app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ abstract class AbstractSenderTest extends \PHPUnit_Framework_TestCase
4545
*/
4646
protected $addressMock;
4747

48+
/**
49+
* @var \PHPUnit_Framework_MockObject_MockObject
50+
*/
51+
protected $loggerMock;
52+
4853
public function stepMockSetup()
4954
{
5055
$this->senderBuilderFactoryMock = $this->getMock(
@@ -86,6 +91,13 @@ public function stepMockSetup()
8691
$this->addressRendererMock = $this->getMock('Magento\Sales\Model\Order\Address\Renderer', [], [], '', false);
8792
$this->addressMock = $this->getMock('Magento\Sales\Model\Order\Address', [], [], '', false);
8893
$this->addressRendererMock->expects($this->any())->method('format')->willReturn(1);
94+
$this->loggerMock = $this->getMock(
95+
'\Psr\Log\LoggerInterface',
96+
[],
97+
[],
98+
'',
99+
false
100+
);
89101
}
90102

91103
public function stepAddressFormat($billingAddress)

‎app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoCommentSenderTest.php

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ class CreditmemoCommentSenderTest extends AbstractSenderTest
1919
*/
2020
protected $creditmemoMock;
2121

22-
/**
23-
* @var \PHPUnit_Framework_MockObject_MockObject
24-
*/
25-
protected $loggerMock;
26-
2722
/**
2823
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
2924
*/
@@ -44,19 +39,12 @@ protected function setUp()
4439
$this->creditmemoMock->expects($this->any())
4540
->method('getOrder')
4641
->will($this->returnValue($this->orderMock));
47-
$this->loggerMock = $this->getMock(
48-
'\Psr\Log\LoggerInterface',
49-
[],
50-
[],
51-
'',
52-
false
53-
);
5442
$this->sender = new CreditmemoCommentSender(
5543
$this->templateContainerMock,
5644
$this->identityContainerMock,
5745
$this->senderBuilderFactoryMock,
58-
$this->addressRendererMock,
59-
$this->loggerMock
46+
$this->loggerMock,
47+
$this->addressRendererMock
6048
);
6149
}
6250

‎app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@ class CreditmemoSenderTest extends AbstractSenderTest
2828
*/
2929
protected $creditmemoResource;
3030

31-
/**
32-
* @var \PHPUnit_Framework_MockObject_MockObject
33-
*/
34-
protected $loggerMock;
35-
3631
/**
3732
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
3833
*/
@@ -76,14 +71,6 @@ protected function setUp()
7671
$this->creditmemoMock->expects($this->any())
7772
->method('getOrder')
7873
->will($this->returnValue($this->orderMock));
79-
80-
$this->loggerMock = $this->getMock(
81-
'\Psr\Log\LoggerInterface',
82-
[],
83-
[],
84-
'',
85-
false
86-
);
8774
$this->sender = new CreditmemoSender(
8875
$this->templateContainerMock,
8976
$this->identityContainerMock,

‎app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceCommentSenderTest.php

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ class InvoiceCommentSenderTest extends AbstractSenderTest
1919
*/
2020
protected $invoiceMock;
2121

22-
/**
23-
* @var \PHPUnit_Framework_MockObject_MockObject
24-
*/
25-
protected $loggerMock;
26-
2722
protected function setUp()
2823
{
2924
$this->stepMockSetup();
@@ -52,13 +47,6 @@ protected function setUp()
5247
'',
5348
false
5449
);
55-
$this->loggerMock = $this->getMock(
56-
'\Psr\Log\LoggerInterface',
57-
[],
58-
[],
59-
'',
60-
false
61-
);
6250
$this->invoiceMock->expects($this->any())
6351
->method('getStore')
6452
->will($this->returnValue($this->storeMock));
@@ -70,8 +58,8 @@ protected function setUp()
7058
$this->templateContainerMock,
7159
$this->identityContainerMock,
7260
$this->senderBuilderFactoryMock,
73-
$this->addressRendererMock,
74-
$this->loggerMock
61+
$this->loggerMock,
62+
$this->addressRendererMock
7563
);
7664
}
7765

‎app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@ class InvoiceSenderTest extends AbstractSenderTest
2828
*/
2929
protected $invoiceResource;
3030

31-
/**
32-
* @var \PHPUnit_Framework_MockObject_MockObject
33-
*/
34-
protected $loggerMock;
35-
3631
/**
3732
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
3833
*/
@@ -79,13 +74,6 @@ protected function setUp()
7974
->method('getOrder')
8075
->will($this->returnValue($this->orderMock));
8176

82-
$this->loggerMock = $this->getMock(
83-
'\Psr\Log\LoggerInterface',
84-
[],
85-
[],
86-
'',
87-
false
88-
);
8977
$this->sender = new InvoiceSender(
9078
$this->templateContainerMock,
9179
$this->identityContainerMock,

‎app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderCommentSenderTest.php

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,16 @@ class OrderCommentSenderTest extends AbstractSenderTest
1414
*/
1515
protected $sender;
1616

17-
/**
18-
* @var \PHPUnit_Framework_MockObject_MockObject
19-
*/
20-
protected $loggerMock;
21-
2217
protected function setUp()
2318
{
2419
$this->stepMockSetup();
2520
$this->stepIdentityContainerInit('\Magento\Sales\Model\Order\Email\Container\OrderCommentIdentity');
26-
$this->loggerMock = $this->getMock(
27-
'\Psr\Log\LoggerInterface',
28-
[],
29-
[],
30-
'',
31-
false
32-
);
3321
$this->sender = new OrderCommentSender(
3422
$this->templateContainerMock,
3523
$this->identityContainerMock,
3624
$this->senderBuilderFactoryMock,
37-
$this->addressRendererMock,
38-
$this->loggerMock
25+
$this->loggerMock,
26+
$this->addressRendererMock
3927
);
4028
}
4129

‎app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderSenderTest.php

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class OrderSenderTest extends AbstractSenderTest
2828
* @var \PHPUnit_Framework_MockObject_MockObject
2929
*/
3030
protected $loggerMock;
31-
31+
3232
protected function setUp()
3333
{
3434
$this->stepMockSetup();
@@ -51,13 +51,6 @@ protected function setUp()
5151
false
5252
);
5353
$this->stepIdentityContainerInit('\Magento\Sales\Model\Order\Email\Container\OrderIdentity');
54-
$this->loggerMock = $this->getMock(
55-
'\Psr\Log\LoggerInterface',
56-
[],
57-
[],
58-
'',
59-
false
60-
);
6154

6255
$this->sender = new OrderSender(
6356
$this->templateContainerMock,

‎app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentCommentSenderTest.php

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ class ShipmentCommentSenderTest extends AbstractSenderTest
1919
*/
2020
protected $shipmentMock;
2121

22-
/**
23-
* @var \PHPUnit_Framework_MockObject_MockObject
24-
*/
25-
protected $loggerMock;
26-
2722
protected function setUp()
2823
{
2924
$this->stepMockSetup();
@@ -35,13 +30,6 @@ protected function setUp()
3530
'',
3631
false
3732
);
38-
$this->loggerMock = $this->getMock(
39-
'\Psr\Log\LoggerInterface',
40-
[],
41-
[],
42-
'',
43-
false
44-
);
4533
$this->shipmentMock->expects($this->any())
4634
->method('getStore')
4735
->will($this->returnValue($this->storeMock));
@@ -53,8 +41,8 @@ protected function setUp()
5341
$this->templateContainerMock,
5442
$this->identityContainerMock,
5543
$this->senderBuilderFactoryMock,
56-
$this->addressRendererMock,
57-
$this->loggerMock
44+
$this->loggerMock,
45+
$this->addressRendererMock
5846
);
5947
}
6048

‎app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@ class ShipmentSenderTest extends AbstractSenderTest
2828
*/
2929
protected $shipmentResource;
3030

31-
/**
32-
* @var \PHPUnit_Framework_MockObject_MockObject
33-
*/
34-
protected $loggerMock;
35-
3631
/**
3732
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
3833
*/
@@ -79,13 +74,6 @@ protected function setUp()
7974
->method('getOrder')
8075
->will($this->returnValue($this->orderMock));
8176

82-
$this->loggerMock = $this->getMock(
83-
'\Psr\Log\LoggerInterface',
84-
[],
85-
[],
86-
'',
87-
false
88-
);
8977
$this->sender = new ShipmentSender(
9078
$this->templateContainerMock,
9179
$this->identityContainerMock,

0 commit comments

Comments
 (0)