Skip to content

Commit 5f6b272

Browse files
cristiano-pachecocristiano-pacheco
committed
#27500 - Replace deprecated constructs from OfflinePayments PHPUnit.
1 parent 87b7cba commit 5f6b272

File tree

7 files changed

+156
-101
lines changed

7 files changed

+156
-101
lines changed

‎app/code/Magento/OfflinePayments/Test/Unit/Block/Info/CheckmoTest.php

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,24 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
67
namespace Magento\OfflinePayments\Test\Unit\Block\Info;
78

89
use Magento\Framework\View\Element\Template\Context;
910
use Magento\OfflinePayments\Block\Info\Checkmo;
1011
use Magento\Payment\Model\Info;
11-
use PHPUnit_Framework_MockObject_MockObject as MockObject;
12+
use PHPUnit\Framework\MockObject\MockObject;
13+
use PHPUnit\Framework\TestCase;
1214

1315
/**
1416
* CheckmoTest contains list of test for block methods testing
1517
*/
16-
class CheckmoTest extends \PHPUnit\Framework\TestCase
18+
class CheckmoTest extends TestCase
1719
{
1820
/**
1921
* @var Info|MockObject
2022
*/
21-
private $info;
23+
private $infoMock;
2224

2325
/**
2426
* @var Checkmo
@@ -35,7 +37,7 @@ protected function setUp()
3537
->setMethods([])
3638
->getMock();
3739

38-
$this->info = $this->getMockBuilder(Info::class)
40+
$this->infoMock = $this->getMockBuilder(Info::class)
3941
->disableOriginalConstructor()
4042
->setMethods(['getAdditionalInformation'])
4143
->getMock();
@@ -44,18 +46,18 @@ protected function setUp()
4446
}
4547

4648
/**
47-
* @covers \Magento\OfflinePayments\Block\Info\Checkmo::getPayableTo
49+
* @covers \Magento\OfflinePayments\Block\Info\Checkmo::getPayableTo
4850
* @param array $details
4951
* @param string|null $expected
5052
* @dataProvider getPayableToDataProvider
5153
*/
5254
public function testGetPayableTo($details, $expected)
5355
{
54-
$this->info->expects(static::at(0))
56+
$this->infoMock->expects(static::at(0))
5557
->method('getAdditionalInformation')
5658
->with('payable_to')
5759
->willReturn($details);
58-
$this->block->setData('info', $this->info);
60+
$this->block->setData('info', $this->infoMock);
5961

6062
static::assertEquals($expected, $this->block->getPayableTo());
6163
}
@@ -73,18 +75,18 @@ public function getPayableToDataProvider()
7375
}
7476

7577
/**
76-
* @covers \Magento\OfflinePayments\Block\Info\Checkmo::getMailingAddress
78+
* @covers \Magento\OfflinePayments\Block\Info\Checkmo::getMailingAddress
7779
* @param array $details
7880
* @param string|null $expected
7981
* @dataProvider getMailingAddressDataProvider
8082
*/
8183
public function testGetMailingAddress($details, $expected)
8284
{
83-
$this->info->expects(static::at(1))
85+
$this->infoMock->expects(static::at(1))
8486
->method('getAdditionalInformation')
8587
->with('mailing_address')
8688
->willReturn($details);
87-
$this->block->setData('info', $this->info);
89+
$this->block->setData('info', $this->infoMock);
8890

8991
static::assertEquals($expected, $this->block->getMailingAddress());
9092
}
@@ -107,11 +109,11 @@ public function getMailingAddressDataProvider()
107109
public function testConvertAdditionalDataIsNeverCalled()
108110
{
109111
$mailingAddress = '[email protected]';
110-
$this->info->expects(static::at(1))
112+
$this->infoMock->expects(static::at(1))
111113
->method('getAdditionalInformation')
112114
->with('mailing_address')
113115
->willReturn($mailingAddress);
114-
$this->block->setData('info', $this->info);
116+
$this->block->setData('info', $this->infoMock);
115117

116118
// First we set the property $this->_mailingAddress
117119
$this->block->getMailingAddress();

‎app/code/Magento/OfflinePayments/Test/Unit/Model/BanktransferTest.php

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,38 +3,48 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
67
namespace Magento\OfflinePayments\Test\Unit\Model;
78

8-
class BanktransferTest extends \PHPUnit\Framework\TestCase
9+
use Magento\Framework\App\Config\ScopeConfigInterface;
10+
use Magento\Framework\Event\ManagerInterface;
11+
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
12+
use Magento\OfflinePayments\Model\Banktransfer;
13+
use Magento\Payment\Block\Info\Instructions;
14+
use Magento\Payment\Helper\Data;
15+
use PHPUnit\Framework\MockObject\MockObject;
16+
use PHPUnit\Framework\TestCase;
17+
18+
class BanktransferTest extends TestCase
919
{
1020
/**
11-
* @var \Magento\OfflinePayments\Model\Banktransfer
21+
* @var Banktransfer
1222
*/
13-
protected $_object;
23+
private $object;
1424

1525
/**
16-
* @var \PHPUnit_Framework_MockObject_MockObject
26+
* @var ScopeConfigInterface|MockObject
1727
*/
18-
protected $_scopeConfig;
28+
private $scopeConfigMock;
1929

2030
protected function setUp()
2131
{
22-
$objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
23-
$eventManager = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
24-
$paymentDataMock = $this->createMock(\Magento\Payment\Helper\Data::class);
25-
$this->_scopeConfig = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
26-
$this->_object = $objectManagerHelper->getObject(
27-
\Magento\OfflinePayments\Model\Banktransfer::class,
32+
$objectManagerHelper = new ObjectManager($this);
33+
$eventManager = $this->createMock(ManagerInterface::class);
34+
$paymentDataMock = $this->createMock(Data::class);
35+
$this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
36+
$this->object = $objectManagerHelper->getObject(
37+
Banktransfer::class,
2838
[
2939
'eventManager' => $eventManager,
3040
'paymentData' => $paymentDataMock,
31-
'scopeConfig' => $this->_scopeConfig,
41+
'scopeConfig' => $this->scopeConfigMock,
3242
]
3343
);
3444
}
3545

3646
public function testGetInfoBlockType()
3747
{
38-
$this->assertEquals(\Magento\Payment\Block\Info\Instructions::class, $this->_object->getInfoBlockType());
48+
$this->assertEquals(Instructions::class, $this->object->getInfoBlockType());
3949
}
4050
}

‎app/code/Magento/OfflinePayments/Test/Unit/Model/CashondeliveryTest.php

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,40 +3,50 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
67
namespace Magento\OfflinePayments\Test\Unit\Model;
78

8-
class CashondeliveryTest extends \PHPUnit\Framework\TestCase
9+
use Magento\Framework\App\Config\ScopeConfigInterface;
10+
use Magento\Framework\Event\ManagerInterface;
11+
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
12+
use Magento\OfflinePayments\Model\Cashondelivery;
13+
use Magento\Payment\Block\Info\Instructions;
14+
use Magento\Payment\Helper\Data;
15+
use PHPUnit\Framework\MockObject\MockObject;
16+
use PHPUnit\Framework\TestCase;
17+
18+
class CashondeliveryTest extends TestCase
919
{
1020
/**
11-
* @var \Magento\OfflinePayments\Model\Cashondelivery
21+
* @var Cashondelivery
1222
*/
13-
protected $_object;
23+
private $object;
1424

1525
/**
16-
* @var \PHPUnit_Framework_MockObject_MockObject
26+
* @var ScopeConfigInterface|MockObject
1727
*/
18-
protected $_scopeConfig;
28+
private $scopeConfigMock;
1929

2030
protected function setUp()
2131
{
22-
$helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
32+
$helper = new ObjectManager($this);
2333

24-
$eventManager = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
25-
$paymentDataMock = $this->createMock(\Magento\Payment\Helper\Data::class);
34+
$eventManager = $this->createMock(ManagerInterface::class);
35+
$paymentDataMock = $this->createMock(Data::class);
2636

27-
$this->_scopeConfig = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
28-
$this->_object = $helper->getObject(
29-
\Magento\OfflinePayments\Model\Cashondelivery::class,
37+
$this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
38+
$this->object = $helper->getObject(
39+
Cashondelivery::class,
3040
[
3141
'eventManager' => $eventManager,
3242
'paymentData' => $paymentDataMock,
33-
'scopeConfig' => $this->_scopeConfig,
43+
'scopeConfig' => $this->scopeConfigMock,
3444
]
3545
);
3646
}
3747

3848
public function testGetInfoBlockType()
3949
{
40-
$this->assertEquals(\Magento\Payment\Block\Info\Instructions::class, $this->_object->getInfoBlockType());
50+
$this->assertEquals(Instructions::class, $this->object->getInfoBlockType());
4151
}
4252
}

‎app/code/Magento/OfflinePayments/Test/Unit/Model/CheckmoConfigProviderTest.php

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,45 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
67
namespace Magento\OfflinePayments\Test\Unit\Model;
78

8-
use Magento\OfflinePayments\Model\CheckmoConfigProvider;
9-
use Magento\OfflinePayments\Model\Checkmo;
109
use Magento\Framework\Escaper;
10+
use Magento\OfflinePayments\Model\Checkmo;
11+
use Magento\OfflinePayments\Model\CheckmoConfigProvider;
12+
use Magento\Payment\Helper\Data as PaymentHelper;
13+
use PHPUnit\Framework\MockObject\MockObject;
14+
use PHPUnit\Framework\TestCase;
1115

12-
class CheckmoConfigProviderTest extends \PHPUnit\Framework\TestCase
16+
class CheckmoConfigProviderTest extends TestCase
1317
{
14-
/** @var CheckmoConfigProvider */
15-
protected $model;
18+
/**
19+
* @var CheckmoConfigProvider
20+
*/
21+
private $model;
1622

17-
/** @var Checkmo|\PHPUnit_Framework_MockObject_MockObject */
18-
protected $methodMock;
23+
/**
24+
* @var Checkmo|MockObject
25+
*/
26+
private $methodMock;
1927

20-
/** @var Escaper|\PHPUnit_Framework_MockObject_MockObject */
21-
protected $escaperMock;
28+
/**
29+
* @var Escaper|MockObject
30+
*/
31+
private $escaperMock;
2232

2333
protected function setUp()
2434
{
25-
$this->methodMock = $this->createMock(\Magento\OfflinePayments\Model\Checkmo::class);
35+
$this->methodMock = $this->createMock(Checkmo::class);
2636

27-
$paymentHelperMock = $this->createMock(\Magento\Payment\Helper\Data::class);
37+
/** @var PaymentHelper|MockObject $paymentHelperMock */
38+
$paymentHelperMock = $this->createMock(PaymentHelper::class);
2839
$paymentHelperMock->expects($this->once())
2940
->method('getMethodInstance')
3041
->with(Checkmo::PAYMENT_METHOD_CHECKMO_CODE)
3142
->willReturn($this->methodMock);
3243

33-
$this->escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
44+
$this->escaperMock = $this->createMock(Escaper::class);
3445
$this->escaperMock->expects($this->any())
3546
->method('escapeHtml')
3647
->willReturnArgument(0);

‎app/code/Magento/OfflinePayments/Test/Unit/Model/CheckmoTest.php

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,56 +3,62 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
67
namespace Magento\OfflinePayments\Test\Unit\Model;
78

8-
class CheckmoTest extends \PHPUnit\Framework\TestCase
9+
use Magento\Framework\App\Config\ScopeConfigInterface;
10+
use Magento\Framework\Event\ManagerInterface;
11+
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
12+
use Magento\OfflinePayments\Model\Checkmo;
13+
use Magento\Payment\Helper\Data;
14+
use PHPUnit\Framework\MockObject\MockObject;
15+
use PHPUnit\Framework\TestCase;
16+
17+
class CheckmoTest extends TestCase
918
{
1019
/**
11-
* @var \Magento\OfflinePayments\Model\Checkmo
20+
* @var Checkmo
1221
*/
13-
protected $_object;
22+
private $object;
1423

1524
/**
16-
* @var \PHPUnit_Framework_MockObject_MockObject
25+
* @var ScopeConfigInterface|MockObject
1726
*/
18-
protected $_scopeConfig;
27+
private $scopeConfigMock;
1928

2029
protected function setUp()
2130
{
22-
$objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
23-
$eventManager = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
24-
$paymentDataMock = $this->createMock(\Magento\Payment\Helper\Data::class);
25-
$this->_scopeConfig = $this->createPartialMock(
26-
\Magento\Framework\App\Config\ScopeConfigInterface::class,
27-
['getValue', 'isSetFlag']
28-
);
29-
$this->_object = $objectManagerHelper->getObject(
30-
\Magento\OfflinePayments\Model\Checkmo::class,
31+
$objectManagerHelper = new ObjectManager($this);
32+
$eventManager = $this->createMock(ManagerInterface::class);
33+
$paymentDataMock = $this->createMock(Data::class);
34+
$this->scopeConfigMock = $this->createPartialMock(ScopeConfigInterface::class, ['getValue', 'isSetFlag']);
35+
$this->object = $objectManagerHelper->getObject(
36+
Checkmo::class,
3137
[
3238
'eventManager' => $eventManager,
3339
'paymentData' => $paymentDataMock,
34-
'scopeConfig' => $this->_scopeConfig,
40+
'scopeConfig' => $this->scopeConfigMock,
3541
]
3642
);
3743
}
3844

3945
public function testGetPayableTo()
4046
{
41-
$this->_object->setStore(1);
42-
$this->_scopeConfig->expects($this->once())
47+
$this->object->setStore(1);
48+
$this->scopeConfigMock->expects($this->once())
4349
->method('getValue')
4450
->with('payment/checkmo/payable_to', 'store', 1)
4551
->willReturn('payable');
46-
$this->assertEquals('payable', $this->_object->getPayableTo());
52+
$this->assertEquals('payable', $this->object->getPayableTo());
4753
}
4854

4955
public function testGetMailingAddress()
5056
{
51-
$this->_object->setStore(1);
52-
$this->_scopeConfig->expects($this->once())
57+
$this->object->setStore(1);
58+
$this->scopeConfigMock->expects($this->once())
5359
->method('getValue')
5460
->with('payment/checkmo/mailing_address', 'store', 1)
5561
->willReturn('[email protected]');
56-
$this->assertEquals('[email protected]', $this->_object->getMailingAddress());
62+
$this->assertEquals('[email protected]', $this->object->getMailingAddress());
5763
}
5864
}

0 commit comments

Comments
 (0)