From 40bddd9a1b3214eadc57bdb0d62d31524ec9c837 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Sun, 15 Mar 2015 12:18:55 +0200
Subject: [PATCH] MAGETWO-34363: Pull request processing
---
.../Test/Unit/Controller/Cart/IndexTest.php | 9 +++++++++
.../Edit/Tab/View/PersonalInfoTest.php | 11 +++++++++--
.../Customer/Test/Unit/Model/LogTest.php | 17 +++++++++++++++--
.../Customer/Test/Unit/Model/LoggerTest.php | 7 +++++--
.../Test/Unit/Model/Observer/LogTest.php | 12 ++++++++++++
.../Model/Js/Config/Source/StrategyTest.php | 11 +++++++++++
.../Test/Unit/Model/Js/DataProviderTest.php | 10 +++++++++-
.../Test/Unit/Translate/Js/ConfigTest.php | 9 +++++++++
8 files changed, 79 insertions(+), 7 deletions(-)
diff --git a/app/code/Magento/Checkout/Test/Unit/Controller/Cart/IndexTest.php b/app/code/Magento/Checkout/Test/Unit/Controller/Cart/IndexTest.php
index 62346244ccd..6dc1c2336f2 100644
--- a/app/code/Magento/Checkout/Test/Unit/Controller/Cart/IndexTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Controller/Cart/IndexTest.php
@@ -7,6 +7,9 @@ namespace Magento\Checkout\Test\Unit\Controller\Cart;
use Magento\Checkout\Controller\Cart\Index;
+/**
+ * Class IndexTest
+ */
class IndexTest extends \PHPUnit_Framework_TestCase
{
/**
@@ -64,6 +67,9 @@ class IndexTest extends \PHPUnit_Framework_TestCase
*/
protected $resultPageFactory;
+ /**
+ * @return void
+ */
public function setUp()
{
$this->request = $this->getMock('Magento\Framework\App\Request\Http', [], [], '', false);
@@ -120,6 +126,9 @@ class IndexTest extends \PHPUnit_Framework_TestCase
);
}
+ /**
+ * @return void
+ */
public function testExecuteWithMessages()
{
$phrase = $this->getMockBuilder('Magento\Framework\Phrase')
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php b/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php
index 8c76457b3ec..7147379c101 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php
@@ -9,8 +9,6 @@ use Magento\Customer\Block\Adminhtml\Edit\Tab\View\PersonalInfo;
/**
* Customer personal information template block test.
- *
- * @package Magento\Customer\Block\Adminhtml\Edit\Tab\View
*/
class PersonalInfoTest extends \PHPUnit_Framework_TestCase
{
@@ -44,6 +42,9 @@ class PersonalInfoTest extends \PHPUnit_Framework_TestCase
*/
protected $scopeConfig;
+ /**
+ * @return void
+ */
protected function setUp()
{
$customer = $this->getMock(
@@ -136,6 +137,9 @@ class PersonalInfoTest extends \PHPUnit_Framework_TestCase
);
}
+ /**
+ * @return void
+ */
public function testGetStoreLastLoginDateTimezone()
{
$this->scopeConfig
@@ -155,6 +159,7 @@ class PersonalInfoTest extends \PHPUnit_Framework_TestCase
* @param string|null $lastLoginAt
* @param string|null $lastVisitAt
* @param string|null $lastLogoutAt
+ * @return void
* @dataProvider getCurrentStatusDataProvider
*/
public function testGetCurrentStatus($status, $lastLoginAt, $lastVisitAt, $lastLogoutAt)
@@ -183,6 +188,7 @@ class PersonalInfoTest extends \PHPUnit_Framework_TestCase
* @param string $result
* @param string|null $lastLoginAt
* @dataProvider getLastLoginDateDataProvider
+ * @return void
*/
public function testGetLastLoginDate($result, $lastLoginAt)
{
@@ -207,6 +213,7 @@ class PersonalInfoTest extends \PHPUnit_Framework_TestCase
* @param string $result
* @param string|null $lastLoginAt
* @dataProvider getStoreLastLoginDateDataProvider
+ * @return void
*/
public function testGetStoreLastLoginDate($result, $lastLoginAt)
{
diff --git a/app/code/Magento/Customer/Test/Unit/Model/LogTest.php b/app/code/Magento/Customer/Test/Unit/Model/LogTest.php
index bfa7afc2ea6..96ce27aef71 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/LogTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/LogTest.php
@@ -7,8 +7,6 @@ namespace Magento\Customer\Test\Unit\Model;
/**
* Customer log model test.
- *
- * @package Magento\Customer\Model
*/
class LogTest extends \PHPUnit_Framework_TestCase
{
@@ -29,6 +27,9 @@ class LogTest extends \PHPUnit_Framework_TestCase
'last_logout_at' => '2015-03-04 12:05:00',
];
+ /**
+ * @return void
+ */
protected function setUp()
{
$objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -44,21 +45,33 @@ class LogTest extends \PHPUnit_Framework_TestCase
);
}
+ /**
+ * @return void
+ */
public function testGetCustomerId()
{
$this->assertEquals($this->logData['customer_id'], $this->log->getCustomerId());
}
+ /**
+ * @return void
+ */
public function testGetLastLoginAt()
{
$this->assertEquals($this->logData['last_login_at'], $this->log->getLastLoginAt());
}
+ /**
+ * @return void
+ */
public function testGetLastVisitAt()
{
$this->assertEquals($this->logData['last_visit_at'], $this->log->getLastVisitAt());
}
+ /**
+ * @return void
+ */
public function testGetLastLogoutAt()
{
$this->assertEquals($this->logData['last_logout_at'], $this->log->getLastLogoutAt());
diff --git a/app/code/Magento/Customer/Test/Unit/Model/LoggerTest.php b/app/code/Magento/Customer/Test/Unit/Model/LoggerTest.php
index eba2af0ec3a..88c7f55c22a 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/LoggerTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/LoggerTest.php
@@ -7,8 +7,6 @@ namespace Magento\Customer\Test\Unit\Model;
/**
* Customer log data logger test.
- *
- * @package Magento\Customer\Model
*/
class LoggerTest extends \PHPUnit_Framework_TestCase
{
@@ -38,6 +36,9 @@ class LoggerTest extends \PHPUnit_Framework_TestCase
*/
protected $adapter;
+ /**
+ * @return void
+ */
protected function setUp()
{
$this->adapter = $this->getMock(
@@ -65,6 +66,7 @@ class LoggerTest extends \PHPUnit_Framework_TestCase
* @param int $customerId
* @param array $data
* @dataProvider testLogDataProvider
+ * @return void
*/
public function testLog($customerId, $data)
{
@@ -107,6 +109,7 @@ class LoggerTest extends \PHPUnit_Framework_TestCase
* @param int $customerId
* @param array $data
* @dataProvider testGetDataProvider
+ * @return void
*/
public function testGet($customerId, $data)
{
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Observer/LogTest.php b/app/code/Magento/Customer/Test/Unit/Model/Observer/LogTest.php
index 6cb3bcbbd71..86db3e21386 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Observer/LogTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Observer/LogTest.php
@@ -10,6 +10,9 @@ use Magento\Framework\Stdlib\DateTime;
use Magento\Framework\Event\Observer;
use Magento\Customer\Model\Observer\Log;
+/**
+ * Class LogTest
+ */
class LogTest extends \PHPUnit_Framework_TestCase
{
/**
@@ -27,6 +30,9 @@ class LogTest extends \PHPUnit_Framework_TestCase
*/
protected $dateTime;
+ /**
+ * @return void
+ */
public function setUp()
{
$this->loggerMock = $this->getMock('Magento\Customer\Model\Logger', [], [], '', false);
@@ -34,6 +40,9 @@ class LogTest extends \PHPUnit_Framework_TestCase
$this->logObserver = new Log($this->loggerMock, $this->dateTime);
}
+ /**
+ * @return void
+ */
public function testLogLastLoginAt()
{
$id = 1;
@@ -64,6 +73,9 @@ class LogTest extends \PHPUnit_Framework_TestCase
$this->logObserver->logLastLoginAt($observerMock);
}
+ /**
+ * @return void
+ */
public function testLogLastLogoutAt()
{
$id = 1;
diff --git a/app/code/Magento/Translation/Test/Unit/Model/Js/Config/Source/StrategyTest.php b/app/code/Magento/Translation/Test/Unit/Model/Js/Config/Source/StrategyTest.php
index 0ad31d9d0e7..819d4166323 100644
--- a/app/code/Magento/Translation/Test/Unit/Model/Js/Config/Source/StrategyTest.php
+++ b/app/code/Magento/Translation/Test/Unit/Model/Js/Config/Source/StrategyTest.php
@@ -8,6 +8,9 @@ namespace Magento\Translation\Test\Unit\Model\Js\Config\Source;
use Magento\Translation\Model\Js\Config;
use Magento\Translation\Model\Js\Config\Source\Strategy;
+/**
+ * Class StrategyTest
+ */
class StrategyTest extends \PHPUnit_Framework_TestCase
{
/**
@@ -15,12 +18,20 @@ class StrategyTest extends \PHPUnit_Framework_TestCase
*/
protected $model;
+ /**
+ * Set up
+ * @return void
+ */
protected function setUp()
{
$objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
$this->model = $objectManager->getObject('Magento\Translation\Model\Js\Config\Source\Strategy');
}
+ /**
+ * Test for toOptionArray method
+ * @return void
+ */
public function testToOptionArray()
{
$expected = [
diff --git a/app/code/Magento/Translation/Test/Unit/Model/Js/DataProviderTest.php b/app/code/Magento/Translation/Test/Unit/Model/Js/DataProviderTest.php
index 58048eac206..6067c28723f 100644
--- a/app/code/Magento/Translation/Test/Unit/Model/Js/DataProviderTest.php
+++ b/app/code/Magento/Translation/Test/Unit/Model/Js/DataProviderTest.php
@@ -13,7 +13,9 @@ use Magento\Framework\App\Filesystem\DirectoryList;
use Magento\Translation\Model\Js\DataProvider;
use Magento\Translation\Model\Js\Config;
-
+/**
+ * Class DataProviderTest
+ */
class DataProviderTest extends \PHPUnit_Framework_TestCase
{
/**
@@ -41,6 +43,9 @@ class DataProviderTest extends \PHPUnit_Framework_TestCase
*/
protected $rootDirectoryMock;
+ /**
+ * @return void
+ */
protected function setUp()
{
$this->appStateMock = $this->getMock('Magento\Framework\App\State', [], [], '', false);
@@ -60,6 +65,9 @@ class DataProviderTest extends \PHPUnit_Framework_TestCase
);
}
+ /**
+ * @return void
+ */
public function testGetData()
{
$themePath = 'blank';
diff --git a/lib/internal/Magento/Framework/Test/Unit/Translate/Js/ConfigTest.php b/lib/internal/Magento/Framework/Test/Unit/Translate/Js/ConfigTest.php
index 3bfe49e7da2..b2dcba665cd 100644
--- a/lib/internal/Magento/Framework/Test/Unit/Translate/Js/ConfigTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/Translate/Js/ConfigTest.php
@@ -8,8 +8,14 @@ namespace Magento\Framework\Test\Unit\Translate\Js;
use Magento\Framework\Translate\Js\Config;
+/**
+ * Class ConfigTest
+ */
class ConfigTest extends \PHPUnit_Framework_TestCase
{
+ /**
+ * @return void
+ */
public function testDefault()
{
$config = new Config();
@@ -17,6 +23,9 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
$this->assertNull($config->getDictionaryFileName());
}
+ /**
+ * @return void
+ */
public function testCustom()
{
$path = 'path';
--
GitLab