Skip to content

Commit

Permalink
Minor naming adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
rogyar committed Aug 15, 2018
1 parent c5ba706 commit 739132a
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions app/code/Magento/Newsletter/Test/Unit/Model/ProblemTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,11 @@

use Magento\Framework\Data\Collection\AbstractDb;
use Magento\Framework\Model\Context;
use Magento\Framework\Model\ResourceModel\AbstractResource;
use Magento\Framework\Registry;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
use Magento\Newsletter\Model\Problem as ProblemModel;
use Magento\Newsletter\Model\Queue;
use Magento\Newsletter\Model\ResourceModel\Problem;
use Magento\Newsletter\Model\ResourceModel\Problem as ProblemResource;
use Magento\Newsletter\Model\Subscriber;
use Magento\Newsletter\Model\SubscriberFactory;

Expand All @@ -41,9 +40,9 @@ class ProblemTest extends \PHPUnit\Framework\TestCase
private $subscriberMock;

/**
* @var AbstractResource|\PHPUnit_Framework_MockObject_MockObject
* @var ProblemResource|\PHPUnit_Framework_MockObject_MockObject
*/
private $abstractResourceMock;
private $resourceModelMock;

/**
* @var AbstractDb|\PHPUnit_Framework_MockObject_MockObject
Expand Down Expand Up @@ -73,14 +72,14 @@ protected function setUp()
$this->subscriberMock = $this->getMockBuilder(Subscriber::class)
->disableOriginalConstructor()
->getMock();
$this->abstractResourceMock = $this->getMockBuilder(Problem::class)
$this->resourceModelMock = $this->getMockBuilder(ProblemResource::class)
->disableOriginalConstructor()
->getMock();
$this->abstractDbMock = $this->getMockBuilder(AbstractDb::class)
->disableOriginalConstructor()
->getMock();

$this->abstractResourceMock->expects($this->any())
$this->resourceModelMock->expects($this->any())
->method('getIdFieldName')
->willReturn('id');

Expand All @@ -92,7 +91,7 @@ protected function setUp()
'context' => $this->contextMock,
'registry' => $this->registryMock,
'subscriberFactory' => $this->subscriberFactoryMock,
'resource' => $this->abstractResourceMock,
'resource' => $this->resourceModelMock,
'resourceCollection' => $this->abstractDbMock,
'data' => [],
]
Expand Down

0 comments on commit 739132a

Please sign in to comment.