From 462093b14c24203d4ad84a58da1261a65df73566 Mon Sep 17 00:00:00 2001 From: Allan MacGregor Date: Fri, 9 Jan 2015 16:35:12 -0500 Subject: [PATCH 1/3] magento2-925 Failed Test due to Class not following the naming convention - Update The Test Mocks - Fix the Failing test due incorrect class name - Refactor class filenames and names to follow StudlyCase --- .../Backend/{Groupprice.php => GroupPrice.php} | 16 ++++++++-------- .../AbstractGroupPrice.php} | 6 +++--- .../Product/Attribute/Backend/Tierprice.php | 2 +- .../Product/Attribute/Backend/Groupprice.php | 4 ++-- .../Backend/Groupprice/AbstractGroupprice.php | 4 ++-- .../Product/Attribute/Backend/Tierprice.php | 4 ++-- .../Magento/Catalog/Model/Resource/Setup.php | 2 +- .../Bundle/Pricing/Price/GroupPriceTest.php | 4 ++-- .../Backend/Groupprice/AbstractTest.php | 6 +++--- .../Catalog/Pricing/Price/GroupPriceTest.php | 4 ++-- 10 files changed, 26 insertions(+), 26 deletions(-) rename app/code/Magento/Catalog/Model/Product/Attribute/Backend/{Groupprice.php => GroupPrice.php} (83%) rename app/code/Magento/Catalog/Model/Product/Attribute/Backend/{Groupprice/AbstractGroupprice.php => GroupPrice/AbstractGroupPrice.php} (99%) diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Groupprice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice.php similarity index 83% rename from app/code/Magento/Catalog/Model/Product/Attribute/Backend/Groupprice.php rename to app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice.php index d9b89347902b3..23cd7417057e0 100644 --- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Groupprice.php +++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice.php @@ -9,14 +9,14 @@ * * @SuppressWarnings(PHPMD.LongVariable) */ -class Groupprice extends \Magento\Catalog\Model\Product\Attribute\Backend\Groupprice\AbstractGroupprice +class GroupPrice extends \Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice\AbstractGroupPrice { /** * Catalog product attribute backend groupprice * - * @var \Magento\Catalog\Model\Resource\Product\Attribute\Backend\Groupprice + * @var \Magento\Catalog\Model\Resource\Product\Attribute\Backend\GroupPrice */ - protected $_productAttributeBackendGroupprice; + protected $_productAttributeBackendGroupPrice; /** * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory @@ -25,7 +25,7 @@ class Groupprice extends \Magento\Catalog\Model\Product\Attribute\Backend\Groupp * @param \Magento\Framework\App\Config\ScopeConfigInterface $config * @param \Magento\Catalog\Model\Product\Type $catalogProductType * @param \Magento\Customer\Api\GroupManagementInterface $groupManagement - * @param \Magento\Catalog\Model\Resource\Product\Attribute\Backend\Groupprice $productAttributeBackendGroupprice + * @param \Magento\Catalog\Model\Resource\Product\Attribute\Backend\GroupPrice $productAttributeBackendGroupPrice */ public function __construct( \Magento\Directory\Model\CurrencyFactory $currencyFactory, @@ -34,9 +34,9 @@ public function __construct( \Magento\Framework\App\Config\ScopeConfigInterface $config, \Magento\Catalog\Model\Product\Type $catalogProductType, \Magento\Customer\Api\GroupManagementInterface $groupManagement, - \Magento\Catalog\Model\Resource\Product\Attribute\Backend\Groupprice $productAttributeBackendGroupprice + \Magento\Catalog\Model\Resource\Product\Attribute\Backend\GroupPrice $productAttributeBackendGroupPrice ) { - $this->_productAttributeBackendGroupprice = $productAttributeBackendGroupprice; + $this->_productAttributeBackendGroupPrice = $productAttributeBackendGroupPrice; parent::__construct( $currencyFactory, $storeManager, @@ -50,11 +50,11 @@ public function __construct( /** * Retrieve resource instance * - * @return \Magento\Catalog\Model\Resource\Product\Attribute\Backend\Groupprice + * @return \Magento\Catalog\Model\Resource\Product\Attribute\Backend\GroupPrice */ protected function _getResource() { - return $this->_productAttributeBackendGroupprice; + return $this->_productAttributeBackendGroupPrice; } /** diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Groupprice/AbstractGroupprice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php similarity index 99% rename from app/code/Magento/Catalog/Model/Product/Attribute/Backend/Groupprice/AbstractGroupprice.php rename to app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php index 157545a285e0f..070ddb5d3f9d6 100644 --- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Groupprice/AbstractGroupprice.php +++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ -namespace Magento\Catalog\Model\Product\Attribute\Backend\Groupprice; +namespace Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice; use Magento\Catalog\Model\Product\Attribute\Backend\Price; use Magento\Customer\Api\GroupManagementInterface; @@ -10,7 +10,7 @@ /** * Catalog product abstract group price backend attribute model */ -abstract class AbstractGroupprice extends Price +abstract class AbstractGroupPrice extends Price { /** * Website currency codes and rates @@ -99,7 +99,7 @@ protected function _getWebsiteCurrencyRates() /** * Retrieve resource instance * - * @return \Magento\Catalog\Model\Resource\Product\Attribute\Backend\Groupprice + * @return \Magento\Catalog\Model\Resource\Product\Attribute\Backend\GroupPrice */ abstract protected function _getResource(); diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php index ea6b7c5b5313e..01360931c0e6c 100644 --- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php +++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php @@ -10,7 +10,7 @@ */ namespace Magento\Catalog\Model\Product\Attribute\Backend; -class Tierprice extends \Magento\Catalog\Model\Product\Attribute\Backend\Groupprice\AbstractGroupprice +class Tierprice extends \Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice\AbstractGroupPrice { /** * Catalog product attribute backend tierprice diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice.php b/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice.php index 89a08a71e11ff..8ccde0ccbb569 100644 --- a/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice.php +++ b/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice.php @@ -4,14 +4,14 @@ */ namespace Magento\Catalog\Model\Resource\Product\Attribute\Backend; -use Magento\Catalog\Model\Resource\Product\Attribute\Backend\Groupprice\AbstractGroupprice; +use Magento\Catalog\Model\Resource\Product\Attribute\Backend\GroupPrice\AbstractGroupPrice; /** * Catalog product group price backend attribute model * * @author Magento Core Team */ -class Groupprice extends AbstractGroupprice +class GroupPrice extends AbstractGroupPrice { /** * Initialize connection and define main table diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice/AbstractGroupprice.php b/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice/AbstractGroupprice.php index ae06edb8b9d8c..42e91abcd37a9 100644 --- a/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice/AbstractGroupprice.php +++ b/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice/AbstractGroupprice.php @@ -8,9 +8,9 @@ * * @author Magento Core Team */ -namespace Magento\Catalog\Model\Resource\Product\Attribute\Backend\Groupprice; +namespace Magento\Catalog\Model\Resource\Product\Attribute\Backend\GroupPrice; -abstract class AbstractGroupprice extends \Magento\Framework\Model\Resource\Db\AbstractDb +abstract class AbstractGroupPrice extends \Magento\Framework\Model\Resource\Db\AbstractDb { /** * Load Tier Prices for product diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Tierprice.php b/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Tierprice.php index 236cc0c4d1161..787c3e0152e7c 100644 --- a/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Tierprice.php +++ b/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Tierprice.php @@ -4,14 +4,14 @@ */ namespace Magento\Catalog\Model\Resource\Product\Attribute\Backend; -use Magento\Catalog\Model\Resource\Product\Attribute\Backend\Groupprice\AbstractGroupprice; +use Magento\Catalog\Model\Resource\Product\Attribute\Backend\GroupPrice\AbstractGroupPrice; /** * Catalog product tier price backend attribute model * * @author Magento Core Team */ -class Tierprice extends AbstractGroupprice +class Tierprice extends AbstractGroupPrice { /** * Initialize connection and define main table diff --git a/app/code/Magento/Catalog/Model/Resource/Setup.php b/app/code/Magento/Catalog/Model/Resource/Setup.php index bb2713d989c66..fd1229a10267a 100644 --- a/app/code/Magento/Catalog/Model/Resource/Setup.php +++ b/app/code/Magento/Catalog/Model/Resource/Setup.php @@ -570,7 +570,7 @@ public function getDefaultEntities() 'type' => 'decimal', 'label' => 'Group Price', 'input' => 'text', - 'backend' => 'Magento\Catalog\Model\Product\Attribute\Backend\Groupprice', + 'backend' => 'Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice', 'required' => false, 'sort_order' => 2, 'global' => \Magento\Catalog\Model\Resource\Eav\Attribute::SCOPE_WEBSITE, diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Pricing/Price/GroupPriceTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Pricing/Price/GroupPriceTest.php index 4dff0a77fcee6..af6621cef9b81 100644 --- a/dev/tests/unit/testsuite/Magento/Bundle/Pricing/Price/GroupPriceTest.php +++ b/dev/tests/unit/testsuite/Magento/Bundle/Pricing/Price/GroupPriceTest.php @@ -42,7 +42,7 @@ class GroupPriceTest extends \PHPUnit_Framework_TestCase protected $attributeMock; /** - * @var \Magento\Catalog\Model\Product\Attribute\Backend\Groupprice|\PHPUnit_Framework_MockObject_MockObject + * @var \Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice|\PHPUnit_Framework_MockObject_MockObject */ protected $backendMock; @@ -109,7 +109,7 @@ public function setUp() false ); $this->backendMock = $this->getMock( - 'Magento\Catalog\Model\Product\Attribute\Backend\Groupprice', + 'Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice', [], [], '', diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/Groupprice/AbstractTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/Groupprice/AbstractTest.php index 11652a279ff65..c4082b9aa12c2 100644 --- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/Groupprice/AbstractTest.php +++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/Groupprice/AbstractTest.php @@ -2,12 +2,12 @@ /** * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) */ -namespace Magento\Catalog\Model\Product\Attribute\Backend\Groupprice; +namespace Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice; class AbstractTest extends \PHPUnit_Framework_TestCase { /** - * @var \Magento\Catalog\Model\Resource\Product\Attribute\Backend\Groupprice\AbstractGroupprice + * @var \Magento\Catalog\Model\Resource\Product\Attribute\Backend\GroupPrice\AbstractGroupPrice */ protected $_model; @@ -30,7 +30,7 @@ protected function setUp() $groupManagement = $this->getMock('Magento\Customer\Api\GroupManagementInterface', [], [], '', false); $this->_model = $this->getMockForAbstractClass( - 'Magento\Catalog\Model\Product\Attribute\Backend\Groupprice\AbstractGroupprice', + 'Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice\AbstractGroupPrice', [ 'currencyFactory' => $currencyFactoryMock, 'storeManager' => $storeManagerMock, diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Pricing/Price/GroupPriceTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Pricing/Price/GroupPriceTest.php index e3f452cc9c242..02289ed627e1a 100644 --- a/dev/tests/unit/testsuite/Magento/Catalog/Pricing/Price/GroupPriceTest.php +++ b/dev/tests/unit/testsuite/Magento/Catalog/Pricing/Price/GroupPriceTest.php @@ -46,7 +46,7 @@ class GroupPriceTest extends \PHPUnit_Framework_TestCase protected $attributeMock; /** - * @var \Magento\Catalog\Model\Product\Attribute\Backend\Groupprice|\PHPUnit_Framework_MockObject_MockObject + * @var \Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice|\PHPUnit_Framework_MockObject_MockObject */ protected $backendMock; @@ -103,7 +103,7 @@ public function setUp() false ); $this->backendMock = $this->getMock( - 'Magento\Catalog\Model\Product\Attribute\Backend\Groupprice', + 'Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice', [], [], '', From 45b8e88d13a98d6e0be959d4a83f4b502eb40a84 Mon Sep 17 00:00:00 2001 From: Allan MacGregor Date: Fri, 9 Jan 2015 16:51:56 -0500 Subject: [PATCH 2/3] magento2-925 Failed Test due to Class not following the naming convention - Refactor the Resource GroupPrice class, Directory and abstract class to use StudlyCase naming --- .../Product/Attribute/Backend/{Groupprice.php => GroupPrice.php} | 0 .../AbstractGroupprice.php => GroupPrice/AbstractGroupPrice.php} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/{Groupprice.php => GroupPrice.php} (100%) rename app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/{Groupprice/AbstractGroupprice.php => GroupPrice/AbstractGroupPrice.php} (100%) diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice.php b/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/GroupPrice.php similarity index 100% rename from app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice.php rename to app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/GroupPrice.php diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice/AbstractGroupprice.php b/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php similarity index 100% rename from app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice/AbstractGroupprice.php rename to app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php From 08cb2a771b4d2c4d0a9c12c8094494fb3abae80d Mon Sep 17 00:00:00 2001 From: Allan MacGregor Date: Fri, 9 Jan 2015 18:52:52 -0500 Subject: [PATCH 3/3] magento2-925 Failed Test due to Class not following the naming convention - Fix namespace for the unit GroupPrice Abstract Test --- .../Attribute/Backend/{Groupprice => GroupPrice}/AbstractTest.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/{Groupprice => GroupPrice}/AbstractTest.php (100%) diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/Groupprice/AbstractTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractTest.php similarity index 100% rename from dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/Groupprice/AbstractTest.php rename to dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractTest.php