Skip to content

Commit 4a6c0f2

Browse files
committed
MAGETWO-34361: Pull request processing
1 parent 76475f2 commit 4a6c0f2

File tree

5 files changed

+15
-10
lines changed

5 files changed

+15
-10
lines changed

dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/IndexTest.php renamed to app/code/Magento/Checkout/Test/Unit/Controller/Cart/IndexTest.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
* Copyright © 2015 Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Checkout\Controller\Cart;
6+
namespace Magento\Checkout\Test\Unit\Controller\Cart;
7+
8+
use Magento\Checkout\Controller\Cart\Index;
79

810
class IndexTest extends \PHPUnit_Framework_TestCase
911
{
@@ -104,7 +106,7 @@ public function setUp()
104106
->setMethods(['create'])
105107
->getMock();
106108

107-
$objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
109+
$objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
108110

109111
$this->controller = $objectManagerHelper->getObject(
110112
'Magento\Checkout\Controller\Cart\Index',

dev/tests/unit/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php renamed to app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
* Copyright © 2015 Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Customer\Block\Adminhtml\Edit\Tab\View;
6+
namespace Magento\Customer\Test\Unit\Block\Adminhtml\Edit\Tab\View;
7+
8+
use Magento\Customer\Block\Adminhtml\Edit\Tab\View\PersonalInfo;
79

810
/**
911
* Customer personal information template block test.
@@ -23,7 +25,7 @@ class PersonalInfoTest extends \PHPUnit_Framework_TestCase
2325
protected $pathToDefaultTimezone = 'path/to/default/timezone';
2426

2527
/**
26-
* @var \Magento\Customer\Block\Adminhtml\Edit\Tab\View\PersonalInfo
28+
* @var PersonalInfo
2729
*/
2830
protected $block;
2931

@@ -119,7 +121,7 @@ protected function setUp()
119121
false
120122
);
121123

122-
$objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
124+
$objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
123125

124126
$this->block = $objectManagerHelper->getObject(
125127
'Magento\Customer\Block\Adminhtml\Edit\Tab\View\PersonalInfo',

dev/tests/unit/testsuite/Magento/Customer/Model/LogTest.php renamed to app/code/Magento/Customer/Test/Unit/Model/LogTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © 2015 Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Customer\Model;
6+
namespace Magento\Customer\Test\Unit\Model;
77

88
/**
99
* Customer log model test.
@@ -31,7 +31,7 @@ class LogTest extends \PHPUnit_Framework_TestCase
3131

3232
protected function setUp()
3333
{
34-
$objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
34+
$objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
3535

3636
$this->log = $objectManagerHelper->getObject(
3737
'Magento\Customer\Model\Log',

dev/tests/unit/testsuite/Magento/Customer/Model/LoggerTest.php renamed to app/code/Magento/Customer/Test/Unit/Model/LoggerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © 2015 Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Customer\Model;
6+
namespace Magento\Customer\Test\Unit\Model;
77

88
/**
99
* Customer log data logger test.
@@ -50,7 +50,7 @@ protected function setUp()
5050
$this->resource = $this->getMock('Magento\Framework\App\Resource', [], [], '', false);
5151
$this->logFactory = $this->getMock('\Magento\Customer\Model\LogFactory', ['create'], [], '', false);
5252

53-
$objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
53+
$objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
5454

5555
$this->logger = $objectManagerHelper->getObject(
5656
'\Magento\Customer\Model\Logger',

dev/tests/unit/testsuite/Magento/Customer/Model/Observer/LogTest.php renamed to app/code/Magento/Customer/Test/Unit/Model/Observer/LogTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
* Copyright © 2015 Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Customer\Model\Observer;
6+
namespace Magento\Customer\Test\Unit\Model\Observer;
77

88
use Magento\Customer\Model\Logger;
99
use Magento\Framework\Stdlib\DateTime;
1010
use Magento\Framework\Event\Observer;
11+
use Magento\Customer\Model\Observer\Log;
1112

1213
class LogTest extends \PHPUnit_Framework_TestCase
1314
{

0 commit comments

Comments
 (0)