From daf174c344e920b2d05dd2b79a82c064a2c05ef8 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Tue, 15 Apr 2025 11:32:57 +0200 Subject: [PATCH 01/36] tests --- .php-cs-fixer.dist.php | 2 +- .../Model/Resource/Report/Collection.php | 4 +- composer.json | 1 + tests/bootstrap.php | 2 + tests/unit/Base/ClassLoadingTest.php | 2 +- tests/unit/Base/DefaultConfigTest.php | 5 +- tests/unit/Base/XmlFileLoadingTest.php | 4 +- tests/unit/Error/ProcessorTest.php | 2 +- tests/unit/Mage/Admin/Helper/BlockTest.php | 16 +- tests/unit/Mage/Admin/Helper/DataTest.php | 16 +- tests/unit/Mage/Admin/Helper/VariableTest.php | 14 +- tests/unit/Mage/Admin/Model/BlockTest.php | 53 ++-- tests/unit/Mage/Admin/Model/ConfigTest.php | 20 +- tests/unit/Mage/Admin/Model/UserTest.php | 232 ++++++------------ tests/unit/Mage/Admin/Model/VariableTest.php | 59 ++--- .../AdminNotification/Helper/DataTest.php | 18 +- .../Mage/AdminNotification/Model/FeedTest.php | 17 +- .../AdminNotification/Model/InboxTest.php | 59 ++--- tests/unit/Mage/Adminhtml/Block/CacheTest.php | 14 +- .../Block/Customer/Edit/Tab/AddressesTest.php | 37 ++- .../Customer/Edit/Tab/NewsletterTest.php | 28 +-- .../Block/System/Cache/Form/FormTest.php | 15 +- .../Block/System/Config/Form/FormTest.php | 14 +- .../System/Convert/Gui/Edit/Tab/ViewTest.php | 28 +-- .../Convert/Profile/Edit/Tab/EditTest.php | 28 +-- .../Mage/Adminhtml/Block/TemplateTest.php | 21 +- .../Block/Widget/Grid/ColumnTest.php | 16 +- .../Mage/Adminhtml/Block/Widget/GridTest.php | 148 +---------- .../Mage/Adminhtml/Helper/AddressesTest.php | 32 +-- .../Mage/Adminhtml/Helper/CatalogTest.php | 18 +- .../unit/Mage/Adminhtml/Helper/ConfigTest.php | 54 +--- .../Adminhtml/Helper/Dashboard/DataTest.php | 30 +-- tests/unit/Mage/Adminhtml/Helper/DataTest.php | 24 +- tests/unit/Mage/Adminhtml/Helper/JsTest.php | 38 +-- .../Mage/Adminhtml/Helper/Media/JsTest.php | 14 +- .../unit/Mage/Adminhtml/Helper/SalesTest.php | 28 +-- tests/unit/Mage/Api/Model/UserTest.php | 51 ++++ .../unit/Mage/Catalog/Helper/CategoryTest.php | 14 +- tests/unit/Mage/Catalog/Helper/DataTest.php | 48 ++-- tests/unit/Mage/Catalog/Helper/MapTest.php | 18 +- .../Mage/Catalog/Helper/Product/UrlTest.php | 50 ++-- .../unit/Mage/Catalog/Helper/ProductTest.php | 64 ++--- .../unit/Mage/Catalog/Model/CategoryTest.php | 40 +-- .../Model/Product/Option/Type/TextTest.php | 24 +- tests/unit/Mage/Catalog/Model/ProductTest.php | 48 ++-- .../Model/Resource/Eav/AttributeTest.php | 15 +- tests/unit/Mage/Catalog/Model/UrlTest.php | 118 ++------- tests/unit/Mage/Cms/Block/BlockTest.php | 15 +- tests/unit/Mage/Cms/Block/PageTest.php | 15 +- .../unit/Mage/Cms/Block/Widget/BlockTest.php | 26 +- .../Mage/Cms/Block/Widget/Page/LinkTest.php | 18 +- tests/unit/Mage/Cms/Helper/DataTest.php | 20 +- tests/unit/Mage/Cms/Helper/PageTest.php | 15 +- .../Mage/Cms/Helper/Wysiwyg/ImagesTest.php | 24 +- tests/unit/Mage/Cms/Model/PageTest.php | 31 ++- .../Mage/Cms/Model/Wysiwyg/ConfigTest.php | 22 +- .../Cms/Model/Wysiwyg/Images/StorageTest.php | 24 +- .../Controllers/IndexControllerTest.php | 132 ++++++++++ tests/unit/Mage/Core/Block/Text/ListTest.php | 19 +- tests/unit/Mage/Core/Helper/CookieTest.php | 20 +- tests/unit/Mage/Core/Helper/DataTest.php | 133 +++------- .../Helper/EnvironmentConfigLoaderTest.php | 24 +- tests/unit/Mage/Core/Helper/HintTest.php | 16 +- tests/unit/Mage/Core/Helper/JsTest.php | 40 +-- tests/unit/Mage/Core/Helper/PurifierTest.php | 32 +-- tests/unit/Mage/Core/Helper/SecurityTest.php | 16 +- tests/unit/Mage/Core/Helper/StringTest.php | 62 ++--- .../Mage/Core/Helper/UnserializeArrayTest.php | 44 +--- tests/unit/Mage/Core/Helper/UrlTest.php | 139 ++--------- tests/unit/Mage/Core/Model/AppTest.php | 66 ++--- tests/unit/Mage/Core/Model/ConfigTest.php | 22 +- .../Model/Email/Template/AbstractTest.php | 53 ++++ tests/unit/Mage/Core/Model/LayoutTest.php | 61 ++--- tests/unit/Mage/Core/Model/LocaleTest.php | 14 +- .../Model/Security/HtmlEscapedStringTest.php | 46 +--- tests/unit/Mage/Core/Model/StoreTest.php | 13 +- tests/unit/Mage/Core/Model/UrlTest.php | 16 +- tests/unit/Mage/Core/Model/VariableTest.php | 14 +- tests/unit/Mage/Core/Model/WebsiteTest.php | 54 ++-- .../Model/Convert/Adapter/CustomerTest.php | 24 +- .../unit/Mage/Customer/Model/CustomerTest.php | 31 ++- tests/unit/Mage/Directory/Block/DataTest.php | 16 +- tests/unit/Mage/Directory/Helper/DataTest.php | 84 ++----- .../Mage/Downloadable/Helper/FileTest.php | 16 +- .../Mage/GiftMessage/Helper/MessageTest.php | 52 +--- tests/unit/Mage/Index/Model/ProcessTest.php | 34 +-- tests/unit/Mage/Log/Helper/DataTest.php | 36 +-- tests/unit/Mage/Log/Model/AggregationTest.php | 14 +- tests/unit/Mage/Log/Model/CronTest.php | 14 +- tests/unit/Mage/Log/Model/CustomerTest.php | 17 +- tests/unit/Mage/Log/Model/LogTest.php | 14 +- tests/unit/Mage/Log/Model/VisitorTest.php | 19 +- .../Mage/Newsletter/Model/TemplateTest.php | 151 ++++++++++++ tests/unit/Mage/Page/Block/Html/HeadTest.php | 22 +- .../unit/Mage/Page/Block/Html/HeaderTest.php | 19 +- tests/unit/Mage/Page/Block/HtmlTest.php | 20 +- tests/unit/Mage/Page/Block/RedirectTest.php | 28 +-- tests/unit/Mage/Page/Block/SwitchTest.php | 30 +-- tests/unit/Mage/Page/Helper/LayoutTest.php | 14 +- tests/unit/Mage/Page/Model/ConfigTest.php | 14 +- .../Mage/Page/Model/Source/LayoutTest.php | 14 +- tests/unit/Mage/Reports/Helper/DataTest.php | 30 +-- .../Model/Resource/Report/CollectionTest.php | 51 ++-- tests/unit/Mage/Review/Model/ReviewTest.php | 50 ++++ tests/unit/Mage/Rule/Model/AbstractTest.php | 59 +++-- .../unit/Mage/Rule/Model/EnvironmentTest.php | 14 +- tests/unit/Mage/Rule/Model/RuleTest.php | 16 +- .../Block/Order/Item/Renderer/DefaultTest.php | 14 +- tests/unit/Mage/Sitemap/Model/SitemapTest.php | 53 ++-- tests/unit/Mage/Tax/Helper/DataTest.php | 122 ++++----- .../unit/Mage/Uploader/Block/AbstractTest.php | 21 +- tests/unit/Mage/Uploader/Helper/DataTest.php | 14 +- tests/unit/Mage/Uploader/Helper/FileTest.php | 40 ++- tests/unit/Mage/Wishlist/Model/ItemTest.php | 102 ++++++++ tests/unit/OpenMageTest.php | 66 +++++ .../Mage/Admin/Model/BlockTrait.php | 99 ++++++++ .../Mage/Admin/Model/UserTrait.php | 122 +++++++++ .../Mage/Admin/Model/VariableTrait.php | 55 +++++ .../AdminNotification/Model/InboxTrait.php | 45 ++++ .../Mage/Adminhtml/Block/Widget/GridTrait.php | 152 ++++++++++++ .../Mage/Adminhtml/Helper/AddressTrait.php | 36 +++ .../Mage/Adminhtml/Helper/ConfigTrait.php | 57 +++++ .../Mage/Adminhtml/Helper/JsTrait.php | 43 ++++ .../Mage/Adminhtml/Helper/SalesTrait.php | 31 +++ .../DataProvider/Mage/Api/Model/UserTrait.php | 123 ++++++++++ .../Mage/Catalog/Helper/DataTrait.php | 41 ++++ .../Mage/Catalog/Helper/Product/UrlTrait.php | 43 ++++ .../Mage/Catalog/Helper/ProductTrait.php | 59 +++++ .../Mage/Catalog/Model/UrlTrait.php | 95 +++++++ .../Mage/Core/Helper/DataTrait.php | 89 +++++++ .../Mage/Core/Helper/PurifierTrait.php | 35 +++ .../Mage/Core/Helper/UnserializeArray.php | 45 ++++ .../Mage/Core/Helper/UrlTrait.php | 124 ++++++++++ .../DataProvider/Mage/Core/Model/AppTrait.php | 47 ++++ .../Model/Email/Template/AbstractTrait.php | 48 ++++ .../Mage/Core/Model/LayoutTrait.php | 42 ++++ .../Mage/Core/Model/SecurityTrait.php | 54 ++++ .../Mage/Customer/CustomerTrait.php | 130 ++++++++++ .../Mage/Directory/DirectoryTrait.php | 66 +++++ .../Mage/GiftMessage/GiftMessageTrait.php | 56 +++++ .../Traits/DataProvider/Mage/Log/LogTrait.php | 35 +++ .../DataProvider/Mage/Review/ReviewTrait.php | 61 +++++ .../DataProvider/Mage/Rule/RuleTrait.php | 6 +- .../Mage/Sitemap/SitemapTrait.php | 42 ++++ .../Traits/DataProvider/Mage/Tax/TaxTrait.php | 47 ++++ .../Mage/Uploader/UploaderTrait.php | 34 ++- .../unit/Varien/Data/Form/Filter/DateTest.php | 4 +- .../Varien/Data/Form/Filter/DatetimeTest.php | 4 +- .../unit/Varien/Db/Adapter/Pdo/MysqlTest.php | 72 +++--- tests/unit/Varien/ObjectTest.php | 52 ++-- tests/unit/fixtures/files/test-empty.css | 0 tests/unit/fixtures/files/test.css | 1 + 152 files changed, 3994 insertions(+), 2285 deletions(-) create mode 100644 tests/unit/Mage/Api/Model/UserTest.php create mode 100644 tests/unit/Mage/Contacts/Controllers/IndexControllerTest.php create mode 100644 tests/unit/Mage/Core/Model/Email/Template/AbstractTest.php create mode 100644 tests/unit/Mage/Newsletter/Model/TemplateTest.php create mode 100644 tests/unit/Mage/Review/Model/ReviewTest.php create mode 100644 tests/unit/Mage/Wishlist/Model/ItemTest.php create mode 100644 tests/unit/OpenMageTest.php create mode 100644 tests/unit/Traits/DataProvider/Mage/Admin/Model/BlockTrait.php create mode 100644 tests/unit/Traits/DataProvider/Mage/Admin/Model/UserTrait.php create mode 100644 tests/unit/Traits/DataProvider/Mage/Admin/Model/VariableTrait.php create mode 100644 tests/unit/Traits/DataProvider/Mage/AdminNotification/Model/InboxTrait.php create mode 100644 tests/unit/Traits/DataProvider/Mage/Adminhtml/Block/Widget/GridTrait.php create mode 100644 tests/unit/Traits/DataProvider/Mage/Adminhtml/Helper/AddressTrait.php create mode 100644 tests/unit/Traits/DataProvider/Mage/Adminhtml/Helper/ConfigTrait.php create mode 100644 tests/unit/Traits/DataProvider/Mage/Adminhtml/Helper/JsTrait.php create mode 100644 tests/unit/Traits/DataProvider/Mage/Adminhtml/Helper/SalesTrait.php create mode 100644 tests/unit/Traits/DataProvider/Mage/Api/Model/UserTrait.php create mode 100644 tests/unit/Traits/DataProvider/Mage/Catalog/Helper/DataTrait.php create mode 100644 tests/unit/Traits/DataProvider/Mage/Catalog/Helper/Product/UrlTrait.php create mode 100644 tests/unit/Traits/DataProvider/Mage/Catalog/Helper/ProductTrait.php create mode 100644 tests/unit/Traits/DataProvider/Mage/Catalog/Model/UrlTrait.php create mode 100644 tests/unit/Traits/DataProvider/Mage/Core/Helper/DataTrait.php create mode 100644 tests/unit/Traits/DataProvider/Mage/Core/Helper/PurifierTrait.php create mode 100644 tests/unit/Traits/DataProvider/Mage/Core/Helper/UnserializeArray.php create mode 100644 tests/unit/Traits/DataProvider/Mage/Core/Helper/UrlTrait.php create mode 100644 tests/unit/Traits/DataProvider/Mage/Core/Model/AppTrait.php create mode 100644 tests/unit/Traits/DataProvider/Mage/Core/Model/Email/Template/AbstractTrait.php create mode 100644 tests/unit/Traits/DataProvider/Mage/Core/Model/LayoutTrait.php create mode 100644 tests/unit/Traits/DataProvider/Mage/Core/Model/SecurityTrait.php create mode 100644 tests/unit/Traits/DataProvider/Mage/Customer/CustomerTrait.php create mode 100644 tests/unit/Traits/DataProvider/Mage/Directory/DirectoryTrait.php create mode 100644 tests/unit/Traits/DataProvider/Mage/GiftMessage/GiftMessageTrait.php create mode 100644 tests/unit/Traits/DataProvider/Mage/Log/LogTrait.php create mode 100644 tests/unit/Traits/DataProvider/Mage/Review/ReviewTrait.php create mode 100644 tests/unit/Traits/DataProvider/Mage/Sitemap/SitemapTrait.php create mode 100644 tests/unit/Traits/DataProvider/Mage/Tax/TaxTrait.php create mode 100644 tests/unit/fixtures/files/test-empty.css create mode 100644 tests/unit/fixtures/files/test.css diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index 401e228cf22..a0c2c46c8cc 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -15,7 +15,7 @@ // PHP84: Adds or removes ? before single type declarations or |null at the end of union types when parameters have a default null value. 'nullable_type_declaration_for_default_null_value' => true, // Calls to PHPUnit\Framework\TestCase static methods must all be of the same type, either $this->, self:: or static:: - 'php_unit_test_case_static_method_calls' => ['call_type' => 'this'], + 'php_unit_test_case_static_method_calls' => ['call_type' => 'static'], // Convert double quotes to single quotes for simple strings. 'single_quote' => true, // Arguments lists, array destructuring lists, arrays that are multi-line, match-lines and parameters lists must have a trailing comma. diff --git a/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php index 1bcce912c74..c6c8b479679 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php @@ -39,7 +39,7 @@ class Mage_Reports_Model_Resource_Report_Collection /** * Report period * - * @var int + * @var string */ protected $_period; @@ -76,7 +76,7 @@ protected function _construct() {} /** * Set period * - * @param int $period + * @param string $period * @return $this */ public function setPeriod($period) diff --git a/composer.json b/composer.json index a23521f8b81..1ffaac9791b 100644 --- a/composer.json +++ b/composer.json @@ -103,6 +103,7 @@ } ], "autoload-dev": { + "classmap": ["app/code"], "psr-4": { "OpenMage\\Tests\\Unit\\": "tests/unit" } diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 10122badea4..686c08cb758 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -7,3 +7,5 @@ require_once __DIR__ . '/../errors/processor.php'; ini_set('error_reporting', -1); + +$_SERVER['TEST_ROOT'] = __DIR__; diff --git a/tests/unit/Base/ClassLoadingTest.php b/tests/unit/Base/ClassLoadingTest.php index 1a843f4cb53..15bc6fb8bfd 100644 --- a/tests/unit/Base/ClassLoadingTest.php +++ b/tests/unit/Base/ClassLoadingTest.php @@ -28,7 +28,7 @@ class ClassLoadingTest extends TestCase */ public function testClassExists(bool $expectedResult, string $class): void { - $this->assertSame($expectedResult, class_exists($class)); + static::assertSame($expectedResult, class_exists($class)); } public function provideClassExistsData(): Generator diff --git a/tests/unit/Base/DefaultConfigTest.php b/tests/unit/Base/DefaultConfigTest.php index 36735a2ed74..ad12d65c5c3 100644 --- a/tests/unit/Base/DefaultConfigTest.php +++ b/tests/unit/Base/DefaultConfigTest.php @@ -20,6 +20,7 @@ use Generator; use Mage; use Mage_Adminhtml_Helper_Dashboard_Data; +use Mage_Core_Model_Store; use PHPUnit\Framework\TestCase; class DefaultConfigTest extends TestCase @@ -29,9 +30,9 @@ class DefaultConfigTest extends TestCase * @group Base * @group Default_Config */ - public function testGetStoreConfig(string $expectedResult, string $path, $store = null): void + public function testGetStoreConfig(string $expectedResult, string $path, bool|int|Mage_Core_Model_Store|null|string $store = null): void { - $this->assertSame($expectedResult, Mage::getStoreConfig($path, $store)); + static::assertSame($expectedResult, Mage::getStoreConfig($path, $store)); } diff --git a/tests/unit/Base/XmlFileLoadingTest.php b/tests/unit/Base/XmlFileLoadingTest.php index 903a34d7b87..b2fea26ceae 100644 --- a/tests/unit/Base/XmlFileLoadingTest.php +++ b/tests/unit/Base/XmlFileLoadingTest.php @@ -36,7 +36,7 @@ public function testFileLoading(string $filepath): void SimpleXMLElement::class, LIBXML_PEDANTIC, //not needed by OpenMage, but good to test more strictly ); - $this->assertNotEmpty($simplexml->asXML()); + static::assertNotEmpty($simplexml->asXML()); } /** @@ -48,7 +48,7 @@ public function testXmlReaderIsValid(string $filepath): void /** @var XMLReader $xml */ $xml = XMLReader::open($filepath); $xml->setParserProperty(XMLReader::VALIDATE, true); - $this->assertTrue($xml->isValid()); + static::assertTrue($xml->isValid()); } public function provideXmlFiles(): Generator diff --git a/tests/unit/Error/ProcessorTest.php b/tests/unit/Error/ProcessorTest.php index 3a7ce922fb4..1be6cef4ed3 100644 --- a/tests/unit/Error/ProcessorTest.php +++ b/tests/unit/Error/ProcessorTest.php @@ -46,7 +46,7 @@ public function testGetHostUrl(string $expectedResult, array $serverVars): void foreach ($serverVars as $serverVar => $value) { $_SERVER[$serverVar] = $value; } - $this->assertSame($expectedResult, $this->subject->getHostUrl()); + static::assertSame($expectedResult, $this->subject->getHostUrl()); } public function provideGetHostUrl(): Generator diff --git a/tests/unit/Mage/Admin/Helper/BlockTest.php b/tests/unit/Mage/Admin/Helper/BlockTest.php index a600f34197f..e4eb009f87f 100644 --- a/tests/unit/Mage/Admin/Helper/BlockTest.php +++ b/tests/unit/Mage/Admin/Helper/BlockTest.php @@ -19,16 +19,16 @@ use Mage; use Mage_Admin_Helper_Block as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class BlockTest extends TestCase +class BlockTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('admin/block'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('admin/block'); } /** @@ -38,7 +38,7 @@ public function setUp(): void */ public function testIsTypeAllowed(): void { - $this->assertFalse($this->subject->isTypeAllowed('some-type')); + static::assertFalse(self::$subject->isTypeAllowed('some-type')); } /** @@ -48,6 +48,6 @@ public function testIsTypeAllowed(): void */ public function testGetDisallowedBlockNames(): void { - $this->assertSame(['install/end'], $this->subject->getDisallowedBlockNames()); + static::assertSame(['install/end'], self::$subject->getDisallowedBlockNames()); } } diff --git a/tests/unit/Mage/Admin/Helper/DataTest.php b/tests/unit/Mage/Admin/Helper/DataTest.php index 392bc72acdc..87583f73bf2 100644 --- a/tests/unit/Mage/Admin/Helper/DataTest.php +++ b/tests/unit/Mage/Admin/Helper/DataTest.php @@ -19,16 +19,16 @@ use Mage; use Mage_Admin_Helper_Data as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class DataTest extends TestCase +class DataTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('admin/data'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('admin/data'); } /** @@ -38,7 +38,7 @@ public function setUp(): void */ public function testGenerateResetPasswordLinkToken(): void { - $this->assertIsString($this->subject->generateResetPasswordLinkToken()); + static::assertIsString(self::$subject->generateResetPasswordLinkToken()); } /** @@ -48,6 +48,6 @@ public function testGenerateResetPasswordLinkToken(): void */ public function testGetResetPasswordLinkExpirationPeriod(): void { - $this->assertIsInt($this->subject->getResetPasswordLinkExpirationPeriod()); + static::assertIsInt(self::$subject->getResetPasswordLinkExpirationPeriod()); } } diff --git a/tests/unit/Mage/Admin/Helper/VariableTest.php b/tests/unit/Mage/Admin/Helper/VariableTest.php index dc9dc1c0e6f..741e9fb8156 100644 --- a/tests/unit/Mage/Admin/Helper/VariableTest.php +++ b/tests/unit/Mage/Admin/Helper/VariableTest.php @@ -19,16 +19,16 @@ use Mage; use Mage_Admin_Helper_Variable as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class VariableTest extends TestCase +class VariableTest extends OpenMageTest { - public Subject $subject; + public static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('admin/variable'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('admin/variable'); } /** @@ -38,6 +38,6 @@ public function setUp(): void */ public function testIsPathAllowed(): void { - $this->assertIsBool($this->subject->isPathAllowed('')); + static::assertIsBool(self::$subject->isPathAllowed('')); } } diff --git a/tests/unit/Mage/Admin/Model/BlockTest.php b/tests/unit/Mage/Admin/Model/BlockTest.php index 6bcffea0a5e..079f9bbc524 100644 --- a/tests/unit/Mage/Admin/Model/BlockTest.php +++ b/tests/unit/Mage/Admin/Model/BlockTest.php @@ -17,55 +17,38 @@ namespace OpenMage\Tests\Unit\Mage\Admin\Model; -use Generator; +use Exception; use Mage; use Mage_Admin_Model_Block as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; +use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Admin\Model\BlockTrait; -class BlockTest extends TestCase +class BlockTest extends OpenMageTest { - public Subject $subject; + use BlockTrait; - public function setUp(): void + private static Subject $subject; + + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::getModel('admin/block'); + parent::setUpBeforeClass(); + self::$subject = Mage::getModel('admin/block'); } /** - * @dataProvider provideValidateData - * @param array $expectedResult + * @dataProvider provideValidateAdminBlockData + * @param true|array $expectedResult * * @group Mage_Admin * @group Mage_Admin_Model + * @throws Exception */ - public function testValidate(array $expectedResult, array $methods): void + public function testValidate(bool|array $expectedResult, array $methods): void { - $mock = $this->getMockBuilder(Subject::class) - ->setMethods([ - 'getBlockName', - 'getIsAllowed', - ]) - ->getMock(); - - $mock->method('getBlockName')->willReturn($methods['getBlockName']); - $mock->method('getIsAllowed')->willReturn($methods['getIsAllowed']); - $this->assertEquals($expectedResult, $mock->validate()); - } + $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - public function provideValidateData(): Generator - { - yield 'errors' => [ - [ - 0 => 'Block Name is required field.', - 1 => 'Block Name is incorrect.', - 2 => 'Is Allowed is required field.', - ], - [ - 'getBlockName' => '', - 'getIsAllowed' => '', - ], - ]; + static::assertInstanceOf(Subject::class, $mock); + static::assertEquals($expectedResult, $mock->validate()); } /** @@ -74,6 +57,6 @@ public function provideValidateData(): Generator */ public function testIsTypeAllowed(): void { - $this->assertIsBool($this->subject->isTypeAllowed('invalid-type')); + static::assertIsBool(self::$subject->isTypeAllowed('invalid-type')); } } diff --git a/tests/unit/Mage/Admin/Model/ConfigTest.php b/tests/unit/Mage/Admin/Model/ConfigTest.php index ccacf778e3b..a13eb781cb2 100644 --- a/tests/unit/Mage/Admin/Model/ConfigTest.php +++ b/tests/unit/Mage/Admin/Model/ConfigTest.php @@ -20,17 +20,17 @@ use Mage; use Mage_Admin_Model_Acl; use Mage_Admin_Model_Config as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; use Varien_Simplexml_Config; -class ConfigTest extends TestCase +class ConfigTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::getModel('admin/config'); + parent::setUpBeforeClass(); + self::$subject = Mage::getModel('admin/config'); } /** @@ -39,7 +39,7 @@ public function setUp(): void */ public function testGetAclAssert(): void { - $this->assertFalse($this->subject->getAclAssert('')); + static::assertFalse(self::$subject->getAclAssert('')); } /** @@ -48,7 +48,7 @@ public function testGetAclAssert(): void */ public function testGetAclPrivilegeSet(): void { - $this->assertFalse($this->subject->getAclPrivilegeSet()); + static::assertFalse(self::$subject->getAclPrivilegeSet()); } /** @@ -57,7 +57,7 @@ public function testGetAclPrivilegeSet(): void */ public function testLoadAclResources(): void { - $this->assertInstanceOf(Subject::class, $this->subject->loadAclResources(new Mage_Admin_Model_Acl())); + static::assertInstanceOf(Subject::class, self::$subject->loadAclResources(new Mage_Admin_Model_Acl())); } /** @@ -66,6 +66,6 @@ public function testLoadAclResources(): void */ public function testGetAdminhtmlConfig(): void { - $this->assertInstanceOf(Varien_Simplexml_Config::class, $this->subject->getAdminhtmlConfig()); + static::assertInstanceOf(Varien_Simplexml_Config::class, self::$subject->getAdminhtmlConfig()); } } diff --git a/tests/unit/Mage/Admin/Model/UserTest.php b/tests/unit/Mage/Admin/Model/UserTest.php index 98f341fc1f2..4fc7ac4ca9f 100644 --- a/tests/unit/Mage/Admin/Model/UserTest.php +++ b/tests/unit/Mage/Admin/Model/UserTest.php @@ -17,167 +17,61 @@ namespace OpenMage\Tests\Unit\Mage\Admin\Model; -use Generator; use Mage; use Mage_Admin_Model_User as Subject; use Mage_Core_Exception; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; +use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Admin\Model\UserTrait; -class UserTest extends TestCase +class UserTest extends OpenMageTest { - public Subject $subject; + use UserTrait; - public function setUp(): void + private static Subject $subject; + + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::getModel('admin/user'); + parent::setUpBeforeClass(); + self::$subject = Mage::getModel('admin/user'); } /** * @dataProvider provideAuthenticateData - * @param array|true $expectedResult - * @group Model * @group Mage_Admin * @group Mage_Admin_Model * @group runInSeparateProcess * @runInSeparateProcess */ - public function testAuthenticate($expectedResult, array $methods): void + public function testAuthenticate(bool|string $expectedResult, array $methods): void { - $mock = $this->getMockBuilder(Subject::class) - ->setMethods([ - 'loadByUsername', - 'getId', - 'getUsername', - 'getPassword', - 'getIsActive', - 'validatePasswordHash', - 'hasAssigned2Role', - ]) - ->getMock(); + $defaultMethods = ['loadByUsername' => self::WILL_RETURN_SELF]; + $methods = array_merge($defaultMethods, $methods); + $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - $mock->method('loadByUsername')->willReturnSelf(); - $mock->method('getId')->willReturn($methods['getId']); - // $mock->expects($this->any())->method('getUsername')->willReturn($methods['getUsername']); - $mock->method('getPassword')->willReturn($methods['getPassword']); - $mock->method('validatePasswordHash')->willReturn($methods['validatePasswordHash']); - $mock->method('getIsActive')->willReturn($methods['getIsActive']); - $mock->method('hasAssigned2Role')->willReturn($methods['hasAssigned2Role']); + static::assertInstanceOf(Subject::class, $mock); try { - $this->assertSame($expectedResult, $mock->authenticate($methods['getUsername'], $methods['getPassword'])); + static::assertSame($expectedResult, $mock->authenticate($methods['getUsername'], $methods['getPassword'])); } catch (Mage_Core_Exception $exception) { - $this->assertSame($expectedResult, $exception->getMessage()); + static::assertSame($expectedResult, $exception->getMessage()); } } - public function provideAuthenticateData(): Generator - { - yield 'pass' => [ - true, - [ - 'getId' => '1', - 'getUsername' => 'admin', - 'getPassword' => 'veryl0ngpassw0rd', - 'getIsActive' => '1', - 'validatePasswordHash' => true, - 'hasAssigned2Role' => true, - ], - ]; - yield 'fail #1 inactive' => [ - 'This account is inactive.', - [ - 'getId' => '1', - 'getUsername' => 'admin', - 'getPassword' => 'veryl0ngpassw0rd', - 'getIsActive' => '0', - 'validatePasswordHash' => true, - 'hasAssigned2Role' => true, - ], - ]; - yield 'fail #2 invalid hash' => [ - false, - [ - 'getId' => '1', - 'getUsername' => 'admin', - 'getPassword' => 'veryl0ngpassw0rd', - 'getIsActive' => '1', - 'validatePasswordHash' => false, - 'hasAssigned2Role' => true, - ], - ]; - yield 'fail #3 no role assigned' => [ - 'Access denied.', - [ - 'getId' => '1', - 'getUsername' => 'admin', - 'getPassword' => 'veryl0ngpassw0rd', - 'getIsActive' => '1', - 'validatePasswordHash' => true, - 'hasAssigned2Role' => false, - ], - ]; - } - /** - * @dataProvider provideValidateData + * @dataProvider provideValidateAdminUserData * @param array|true $expectedResult * @group Mage_Admin * @group Mage_Admin_Model */ public function testValidate($expectedResult, array $methods): void { - $mock = $this->getMockBuilder(Subject::class) - ->setMethods([ - 'hasNewPassword', - 'getNewPassword', - 'hasPassword', - 'getPassword', - ]) - ->getMock(); + $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - $mock->method('hasNewPassword')->willReturn($methods['hasNewPassword']); - $mock->method('getNewPassword')->willReturn($methods['getNewPassword']); - $mock->method('hasPassword')->willReturn($methods['hasPassword']); - $mock->method('getPassword')->willReturn($methods['getPassword']); - $this->assertSame($expectedResult, $mock->validate()); + static::assertInstanceOf(Subject::class, $mock); + static::assertSame($expectedResult, $mock->validate()); } - public function provideValidateData(): Generator - { - yield 'fail #1' => [ - [ - 0 => 'User Name is required field.', - 1 => 'First Name is required field.', - 2 => 'Last Name is required field.', - 3 => 'Please enter a valid email.', - 4 => 'Password must be at least of 14 characters.', - 5 => 'Password must include both numeric and alphabetic characters.', - ], - [ - 'hasNewPassword' => true, - 'getNewPassword' => '123', - 'hasPassword' => false, - 'getPassword' => '456', - ], - ]; - yield 'fails #2' => [ - [ - 0 => 'User Name is required field.', - 1 => 'First Name is required field.', - 2 => 'Last Name is required field.', - 3 => 'Please enter a valid email.', - 4 => 'Password must be at least of 14 characters.', - 5 => 'Password must include both numeric and alphabetic characters.', - ], - [ - 'hasNewPassword' => false, - 'getNewPassword' => '123', - 'hasPassword' => true, - 'getPassword' => '456', - ], - ]; - } + /** * @group Mage_Admin @@ -185,8 +79,8 @@ public function provideValidateData(): Generator */ public function testValidateCurrentPassword(): void { - $this->assertIsArray($this->subject->validateCurrentPassword('')); - $this->assertIsArray($this->subject->validateCurrentPassword('123')); + static::assertIsArray(self::$subject->validateCurrentPassword('')); + static::assertIsArray(self::$subject->validateCurrentPassword('123')); } /** @@ -195,7 +89,7 @@ public function testValidateCurrentPassword(): void */ public function testLoadByUsername(): void { - $this->assertInstanceOf(Subject::class, $this->subject->loadByUsername('invalid-user')); + static::assertInstanceOf(Subject::class, self::$subject->loadByUsername('invalid-user')); } /** @@ -204,17 +98,16 @@ public function testLoadByUsername(): void */ public function testHasAssigned2Role(): void { - $this->assertIsArray($this->subject->hasAssigned2Role(1)); + static::assertIsArray(self::$subject->hasAssigned2Role(1)); } /** - * @group Model * @group Mage_Admin * @group Mage_Admin_Model */ public function testChangeResetPasswordLinkToken(): void { - $this->assertInstanceOf(Subject::class, $this->subject->changeResetPasswordLinkToken('123')); + static::assertInstanceOf(Subject::class, self::$subject->changeResetPasswordLinkToken('123')); } /** @@ -224,42 +117,63 @@ public function testChangeResetPasswordLinkToken(): void */ public function testIsResetPasswordLinkTokenExpired(bool $expectedResult, array $methods): void { - $mock = $this->getMockBuilder(Subject::class) - ->setMethods([ - 'getRpToken', - 'getRpTokenCreatedAt', - ]) - ->getMock(); + $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - $mock->method('getRpToken')->willReturn($methods['getRpToken']); - $mock->method('getRpTokenCreatedAt')->willReturn($methods['getRpTokenCreatedAt']); - $this->assertSame($expectedResult, $mock->isResetPasswordLinkTokenExpired()); + static::assertInstanceOf(Subject::class, $mock); + static::assertSame($expectedResult, $mock->isResetPasswordLinkTokenExpired()); } - public function provideIsResetPasswordLinkTokenExpiredData(): Generator + /** + * @group Mage_Admin + * @group Mage_Admin_Model + */ + public function testSendPasswordResetConfirmationEmail(): void { - yield '#1' => [ - true, - [ - 'getRpToken' => '', - 'getRpTokenCreatedAt' => '', - ], - ]; - yield '#2' => [ - true, - [ - 'getRpToken' => '1', - 'getRpTokenCreatedAt' => '0', - ], - ]; + static::assertInstanceOf(Subject::class, self::$subject->sendPasswordResetConfirmationEmail()); } /** * @group Mage_Admin * @group Mage_Admin_Model */ - public function testSendPasswordResetConfirmationEmail(): void + public function testCleanPasswordsValidationData(): void + { + self::$subject->setData('password', 'test123'); + self::$subject->setData('current_password', 'current123'); + self::$subject->setData('new_password', 'new123'); + self::$subject->setData('password_confirmation', 'confirm123'); + + self::$subject->cleanPasswordsValidationData(); + + static::assertNull(self::$subject->getData('password')); + static::assertNull(self::$subject->getData('current_password')); + static::assertNull(self::$subject->getData('new_password')); + static::assertNull(self::$subject->getData('password_confirmation')); + } + + /** + * @group Mage_Admin + * @group Mage_Admin_Model + */ + public function testGetMinAdminPasswordLength(): void + { + $methods = ['getStoreConfigAsInt' => 10]; + $mock = $this->getMockWithCalledMethods(Subject::class, $methods); + + static::assertInstanceOf(Subject::class, $mock); + static::assertSame(14, $mock->getMinAdminPasswordLength()); + } + + /** + * @group Mage_Admin + * @group Mage_Admin_Model + */ + public function testSendAdminNotification(): void { - $this->assertInstanceOf(Subject::class, $this->subject->sendPasswordResetConfirmationEmail()); + $methods = ['getUserCreateAdditionalEmail' => ['test@example.com']]; + $mock = $this->getMockWithCalledMethods(Subject::class, $methods); + + static::assertInstanceOf(Subject::class, $mock); + static::assertInstanceOf(Subject::class, $mock->sendAdminNotification(self::$subject)); } } diff --git a/tests/unit/Mage/Admin/Model/VariableTest.php b/tests/unit/Mage/Admin/Model/VariableTest.php index f5f1b380bf6..0191e2eda4a 100644 --- a/tests/unit/Mage/Admin/Model/VariableTest.php +++ b/tests/unit/Mage/Admin/Model/VariableTest.php @@ -17,65 +17,40 @@ namespace OpenMage\Tests\Unit\Mage\Admin\Model; -use Generator; +use Exception; use Mage; use Mage_Admin_Model_Variable as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; +use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Admin\Model\VariableTrait; -class VariableTest extends TestCase +class VariableTest extends OpenMageTest { - public Subject $subject; + use VariableTrait; - public function setUp(): void + private static Subject $subject; + + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::getModel('admin/variable'); + parent::setUpBeforeClass(); + self::$subject = Mage::getModel('admin/variable'); } /** - * @dataProvider provideValidateData + * @dataProvider provideValidateAdminVariableData * @group Mage_Admin * @group Mage_Admin_Model - * - * @param array|true $expectedResult + * @throws Exception */ - public function testValidate($expectedResult, string $variableName, string $isAllowed): void + public function testValidate(bool|array $expectedResult, array $methods): void { - $mock = $this->getMockBuilder(Subject::class) - ->setMethods(['getVariableName', 'getIsAllowed']) - ->getMock(); - - $mock->method('getVariableName')->willReturn($variableName); - $mock->method('getIsAllowed')->willReturn($isAllowed); - $this->assertSame($expectedResult, $mock->validate()); - } + $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - public function provideValidateData(): Generator - { - yield 'test passes' => [ - true, - 'test', - '1', - ]; - yield 'test error empty' => [ - [0 => 'Variable Name is required field.'], - '', - '1', - ]; - yield 'test error regex' => [ - [0 => 'Variable Name is incorrect.'], - '#invalid-name#', - '1', - ]; - yield 'test error allowed' => [ - [0 => 'Is Allowed is required field.'], - 'test', - 'invalid', - ]; + static::assertInstanceOf(Subject::class, $mock); + static::assertSame($expectedResult, $mock->validate()); } public function testIsPathAllowed(): void { - $this->assertIsBool($this->subject->isPathAllowed('invalid-path')); + static::assertIsBool(self::$subject->isPathAllowed('invalid-path')); } } diff --git a/tests/unit/Mage/AdminNotification/Helper/DataTest.php b/tests/unit/Mage/AdminNotification/Helper/DataTest.php index e026a3c2330..87a80cbeef9 100644 --- a/tests/unit/Mage/AdminNotification/Helper/DataTest.php +++ b/tests/unit/Mage/AdminNotification/Helper/DataTest.php @@ -20,16 +20,16 @@ use Mage; use Mage_AdminNotification_Helper_Data as Subject; use Mage_AdminNotification_Model_Inbox; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class DataTest extends TestCase +class DataTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('adminnotification/data'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('adminnotification/data'); } /** @@ -38,7 +38,7 @@ public function setUp(): void */ public function testGetLatestNotice(): void { - $this->assertInstanceOf(Mage_AdminNotification_Model_Inbox::class, $this->subject->getLatestNotice()); + static::assertInstanceOf(Mage_AdminNotification_Model_Inbox::class, self::$subject->getLatestNotice()); } /** @@ -47,7 +47,7 @@ public function testGetLatestNotice(): void */ public function testGetUnreadNoticeCount(): void { - $this->assertIsInt($this->subject->getUnreadNoticeCount(99)); + static::assertIsInt(self::$subject->getUnreadNoticeCount(99)); } /** @@ -57,6 +57,6 @@ public function testGetUnreadNoticeCount(): void */ public function testGetPopupObjectUrl(): void { - $this->assertSame('', $this->subject->getPopupObjectUrl()); + static::assertSame('', self::$subject->getPopupObjectUrl()); } } diff --git a/tests/unit/Mage/AdminNotification/Model/FeedTest.php b/tests/unit/Mage/AdminNotification/Model/FeedTest.php index 50a35f91b53..6a1ba48caf8 100644 --- a/tests/unit/Mage/AdminNotification/Model/FeedTest.php +++ b/tests/unit/Mage/AdminNotification/Model/FeedTest.php @@ -19,17 +19,16 @@ use Mage; use Mage_AdminNotification_Model_Feed as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; use SimpleXMLElement; -class FeedTest extends TestCase +class FeedTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; public function setUp(): void { - Mage::app(); - $this->subject = Mage::getModel('adminnotification/feed'); + self::$subject = Mage::getModel('adminnotification/feed'); } /** @@ -38,7 +37,7 @@ public function setUp(): void */ public function testGetFeedUrl(): void { - $this->assertIsString($this->subject->getFeedUrl()); + static::assertIsString(self::$subject->getFeedUrl()); } /** @@ -47,7 +46,7 @@ public function testGetFeedUrl(): void */ public function testCheckUpdate(): void { - $this->assertInstanceOf(Subject::class, $this->subject->checkUpdate()); + static::assertInstanceOf(Subject::class, self::$subject->checkUpdate()); } /** @@ -56,7 +55,7 @@ public function testCheckUpdate(): void */ public function testGetFeedData(): void { - $this->assertInstanceOf(SimpleXMLElement::class, $this->subject->getFeedData()); + static::assertInstanceOf(SimpleXMLElement::class, self::$subject->getFeedData()); } /** @@ -65,6 +64,6 @@ public function testGetFeedData(): void */ public function testGetFeedXml(): void { - $this->assertInstanceOf(SimpleXMLElement::class, $this->subject->getFeedXml()); + static::assertInstanceOf(SimpleXMLElement::class, self::$subject->getFeedXml()); } } diff --git a/tests/unit/Mage/AdminNotification/Model/InboxTest.php b/tests/unit/Mage/AdminNotification/Model/InboxTest.php index e10687a1374..f6f84747c7d 100644 --- a/tests/unit/Mage/AdminNotification/Model/InboxTest.php +++ b/tests/unit/Mage/AdminNotification/Model/InboxTest.php @@ -17,24 +17,26 @@ namespace OpenMage\Tests\Unit\Mage\AdminNotification\Model; -use Generator; use Mage; use Mage_AdminNotification_Model_Inbox as Subject; use Mage_Core_Exception; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; +use OpenMage\Tests\Unit\Traits\DataProvider\Mage\AdminNotification\Model\InboxTrait; -class InboxTest extends TestCase +class InboxTest extends OpenMageTest { + use InboxTrait; + public const TITLE = 'PhpUnit test'; public const URL = 'https://openmage.org'; - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::getModel('adminnotification/inbox'); + parent::setUpBeforeClass(); + self::$subject = Mage::getModel('adminnotification/inbox'); } /** @@ -42,30 +44,9 @@ public function setUp(): void * @group Mage_AdminNotification * @group Mage_AdminNotification_Model */ - public function testGetSeverities($expectedResult, ?int $severity): void + public function testGetSeverities(array|string|null $expectedResult, ?int $severity): void { - $this->assertSame($expectedResult, $this->subject->getSeverities($severity)); - } - - public function provideGetSeverities(): Generator - { - yield 'null' => [ - [ - Subject::SEVERITY_CRITICAL => 'critical', - Subject::SEVERITY_MAJOR => 'major', - Subject::SEVERITY_MINOR => 'minor', - Subject::SEVERITY_NOTICE => 'notice', - ], - null, - ]; - yield 'valid' => [ - 'critical', - Subject::SEVERITY_CRITICAL, - ]; - yield 'invalid' => [ - null, - 0, - ]; + static::assertSame($expectedResult, self::$subject->getSeverities($severity)); } /** @@ -74,8 +55,8 @@ public function provideGetSeverities(): Generator */ public function testLoadLatestNotice(bool $delete = false): void { - $result = $this->subject->loadLatestNotice(); - $this->assertInstanceOf(Subject::class, $result); + $result = self::$subject->loadLatestNotice(); + static::assertInstanceOf(Subject::class, $result); if ($delete) { $result->delete(); } @@ -87,7 +68,7 @@ public function testLoadLatestNotice(bool $delete = false): void */ public function testAdd(): void { - $this->assertInstanceOf(Subject::class, $this->subject->add( + static::assertInstanceOf(Subject::class, self::$subject->add( Subject::SEVERITY_CRITICAL, self::TITLE, [__METHOD__], @@ -104,9 +85,9 @@ public function testAdd(): void public function testAddException(): void { try { - $this->subject->add(0, self::TITLE, __METHOD__); + self::$subject->add(0, self::TITLE, __METHOD__); } catch (Mage_Core_Exception $e) { - $this->assertSame('Wrong message type', $e->getMessage()); + static::assertSame('Wrong message type', $e->getMessage()); } } @@ -117,7 +98,7 @@ public function testAddException(): void */ public function testAddCritical(): void { - $this->assertInstanceOf(Subject::class, $this->subject->addCritical(self::TITLE, __METHOD__)); + static::assertInstanceOf(Subject::class, self::$subject->addCritical(self::TITLE, __METHOD__)); $this->testLoadLatestNotice(true); } @@ -128,7 +109,7 @@ public function testAddCritical(): void */ public function testAddMajor(): void { - $this->assertInstanceOf(Subject::class, $this->subject->addMajor(self::TITLE, __METHOD__)); + static::assertInstanceOf(Subject::class, self::$subject->addMajor(self::TITLE, __METHOD__)); $this->testLoadLatestNotice(true); } @@ -139,7 +120,7 @@ public function testAddMajor(): void */ public function testAddMinor(): void { - $this->assertInstanceOf(Subject::class, $this->subject->addMinor(self::TITLE, __METHOD__)); + static::assertInstanceOf(Subject::class, self::$subject->addMinor(self::TITLE, __METHOD__)); $this->testLoadLatestNotice(true); } @@ -150,7 +131,7 @@ public function testAddMinor(): void */ public function testAddNotice(): void { - $this->assertInstanceOf(Subject::class, $this->subject->addNotice(self::TITLE, __METHOD__)); + static::assertInstanceOf(Subject::class, self::$subject->addNotice(self::TITLE, __METHOD__)); $this->testLoadLatestNotice(true); } } diff --git a/tests/unit/Mage/Adminhtml/Block/CacheTest.php b/tests/unit/Mage/Adminhtml/Block/CacheTest.php index 7bc9be7b6a0..150ac5175b3 100644 --- a/tests/unit/Mage/Adminhtml/Block/CacheTest.php +++ b/tests/unit/Mage/Adminhtml/Block/CacheTest.php @@ -17,18 +17,16 @@ namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block; -use Mage; use Mage_Adminhtml_Block_Cache as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class CacheTest extends TestCase +class CacheTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; public function setUp(): void { - Mage::app(); - $this->subject = new Subject(); + self::$subject = new Subject(); } /** @@ -39,7 +37,7 @@ public function setUp(): void */ public function testGetFlushStorageUrl(): void { - $this->assertStringStartsWith('http', $this->subject->getFlushStorageUrl()); + static::assertStringStartsWith('http', self::$subject->getFlushStorageUrl()); } /** @@ -50,6 +48,6 @@ public function testGetFlushStorageUrl(): void */ public function testGetFlushSystemUrl(): void { - $this->assertStringStartsWith('http', $this->subject->getFlushSystemUrl()); + static::assertStringStartsWith('http', self::$subject->getFlushSystemUrl()); } } diff --git a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php index e952f787e7e..853072de898 100644 --- a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php +++ b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php @@ -17,39 +17,36 @@ namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Customer\Edit\Tab; -use Mage; use Mage_Adminhtml_Block_Customer_Edit_Tab_Addresses as Subject; +use Mage_Core_Exception; use Mage_Customer_Model_Customer; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class AddressesTest extends TestCase +class AddressesTest extends OpenMageTest { - public Subject $subject; + /** @phpstan-ignore property.onlyWritten */ + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = new Subject(); + parent::setUpBeforeClass(); + self::$subject = new Subject(); } /** * @group Mage_Adminhtml * @group Mage_Adminhtml_Block + * @throws Mage_Core_Exception */ public function testInitForm(): void { - $mock = $this->getMockBuilder(Subject::class) - ->setMethods(['getRegistryCurrentCustomer', 'isReadonly']) - ->getMock(); - - $mock - ->method('getRegistryCurrentCustomer') - ->willReturn(new Mage_Customer_Model_Customer()); - - $mock - ->method('isReadonly') - ->willReturn(true); - - $this->assertInstanceOf(Subject::class, $mock->initForm()); + $methods = [ + 'getRegistryCurrentCustomer' => new Mage_Customer_Model_Customer(), + 'isReadonly' => true, + ]; + $mock = $this->getMockWithCalledMethods(Subject::class, $methods); + + static::assertInstanceOf(Subject::class, $mock); + static::assertInstanceOf(Subject::class, $mock->initForm()); } } diff --git a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php index 7fa0868a854..2f43beb2c73 100644 --- a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php +++ b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php @@ -20,16 +20,17 @@ use Mage; use Mage_Adminhtml_Block_Customer_Edit_Tab_Newsletter as Subject; use Mage_Customer_Model_Customer; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class NewsletterTest extends TestCase +class NewsletterTest extends OpenMageTest { - public Subject $subject; + /** @phpstan-ignore property.onlyWritten */ + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = new Subject(); + parent::setUpBeforeClass(); + self::$subject = new Subject(); } /** @@ -39,15 +40,12 @@ public function setUp(): void */ public function testInitForm(): void { - $mock = $this->getMockBuilder(Subject::class) - ->setMethods(['getRegistryCurrentCustomer']) - ->getMock(); + $methods = [ + 'getRegistryCurrentCustomer' => new Mage_Customer_Model_Customer(), + ]; + $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - $mock - ->method('getRegistryCurrentCustomer') - // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation - ->willReturn(new Mage_Customer_Model_Customer()); - - $this->assertInstanceOf(Subject::class, $mock->initForm()); + static::assertInstanceOf(Subject::class, $mock); + static::assertInstanceOf(Subject::class, $mock->initForm()); } } diff --git a/tests/unit/Mage/Adminhtml/Block/System/Cache/Form/FormTest.php b/tests/unit/Mage/Adminhtml/Block/System/Cache/Form/FormTest.php index 8e94fc326a1..b76ca1d493f 100644 --- a/tests/unit/Mage/Adminhtml/Block/System/Cache/Form/FormTest.php +++ b/tests/unit/Mage/Adminhtml/Block/System/Cache/Form/FormTest.php @@ -19,23 +19,24 @@ use Mage; use Mage_Adminhtml_Block_System_Cache_Form as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class FormTest extends TestCase +class FormTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = new Subject(); + parent::setUpBeforeClass(); + self::$subject = new Subject(); } /** * @group Mage_Adminhtml + * @group Mage_Adminhtml_Block */ public function testInitForm(): void { - $this->assertInstanceOf(Subject::class, $this->subject->initForm()); + static::assertInstanceOf(Subject::class, self::$subject->initForm()); } } diff --git a/tests/unit/Mage/Adminhtml/Block/System/Config/Form/FormTest.php b/tests/unit/Mage/Adminhtml/Block/System/Config/Form/FormTest.php index aea02165241..6f6dede07da 100644 --- a/tests/unit/Mage/Adminhtml/Block/System/Config/Form/FormTest.php +++ b/tests/unit/Mage/Adminhtml/Block/System/Config/Form/FormTest.php @@ -19,16 +19,16 @@ use Mage; use Mage_Adminhtml_Block_System_Config_Form as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class FormTest extends TestCase +class FormTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = new Subject(); + parent::setUpBeforeClass(); + self::$subject = new Subject(); } /** @@ -36,6 +36,6 @@ public function setUp(): void */ public function testInitForm(): void { - $this->assertInstanceOf(Subject::class, $this->subject->initForm()); + static::assertInstanceOf(Subject::class, self::$subject->initForm()); } } diff --git a/tests/unit/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/ViewTest.php b/tests/unit/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/ViewTest.php index 040cb925445..1622460db02 100644 --- a/tests/unit/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/ViewTest.php +++ b/tests/unit/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/ViewTest.php @@ -17,19 +17,19 @@ namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\System\Convert\Gui\Edit\Tab; -use Mage; use Mage_Adminhtml_Block_System_Convert_Gui_Edit_Tab_View as Subject; use Mage_Dataflow_Model_Profile; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class ViewTest extends TestCase +class ViewTest extends OpenMageTest { - public Subject $subject; + /** @phpstan-ignore property.onlyWritten */ + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = new Subject(); + parent::setUpBeforeClass(); + self::$subject = new Subject(); } /** @@ -38,14 +38,12 @@ public function setUp(): void */ public function testInitForm(): void { - $mock = $this->getMockBuilder(Subject::class) - ->setMethods(['getRegistryCurrentConvertProfile']) - ->getMock(); + $methods = [ + 'getRegistryCurrentConvertProfile' => new Mage_Dataflow_Model_Profile(), + ]; + $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - $mock - ->method('getRegistryCurrentConvertProfile') - ->willReturn(new Mage_Dataflow_Model_Profile()); - - $this->assertInstanceOf(Subject::class, $mock->initForm()); + static::assertInstanceOf(Subject::class, $mock); + static::assertInstanceOf(Subject::class, $mock->initForm()); } } diff --git a/tests/unit/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/EditTest.php b/tests/unit/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/EditTest.php index c3c6ea0471c..7714aa2f4d8 100644 --- a/tests/unit/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/EditTest.php +++ b/tests/unit/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/EditTest.php @@ -17,19 +17,19 @@ namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\System\Convert\Profile\Edit\Tab; -use Mage; use Mage_Adminhtml_Block_System_Convert_Profile_Edit_Tab_Edit as Subject; use Mage_Dataflow_Model_Profile; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class EditTest extends TestCase +class EditTest extends OpenMageTest { - public Subject $subject; + /** @phpstan-ignore property.onlyWritten */ + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = new Subject(); + parent::setUpBeforeClass(); + self::$subject = new Subject(); } /** @@ -38,14 +38,12 @@ public function setUp(): void */ public function testInitForm(): void { - $mock = $this->getMockBuilder(Subject::class) - ->setMethods(['getRegistryCurrentConvertProfile']) - ->getMock(); + $methods = [ + 'getRegistryCurrentConvertProfile' => new Mage_Dataflow_Model_Profile(), + ]; + $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - $mock - ->method('getRegistryCurrentConvertProfile') - ->willReturn(new Mage_Dataflow_Model_Profile()); - - $this->assertInstanceOf(Subject::class, $mock->initForm()); + static::assertInstanceOf(Subject::class, $mock); + static::assertInstanceOf(Subject::class, $mock->initForm()); } } diff --git a/tests/unit/Mage/Adminhtml/Block/TemplateTest.php b/tests/unit/Mage/Adminhtml/Block/TemplateTest.php index fc8de04ecfc..e639f413cac 100644 --- a/tests/unit/Mage/Adminhtml/Block/TemplateTest.php +++ b/tests/unit/Mage/Adminhtml/Block/TemplateTest.php @@ -17,21 +17,20 @@ namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block; -use Mage; use Mage_Adminhtml_Block_Template as Subject; +use OpenMage\Tests\Unit\OpenMageTest; use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Core\CoreTrait; -use PHPUnit\Framework\TestCase; -class TemplateTest extends TestCase +class TemplateTest extends OpenMageTest { use CoreTrait; - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = new Subject(); + parent::setUpBeforeClass(); + self::$subject = new Subject(); } /** @@ -43,7 +42,7 @@ public function setUp(): void */ public function testGetFormKey(): void { - $this->assertIsString($this->subject->getFormKey()); + static::assertIsString(self::$subject->getFormKey()); } /** @@ -54,7 +53,7 @@ public function testGetFormKey(): void */ public function testIsOutputEnabled(bool $expectedResult, ?string $moduleName): void { - $this->assertSame($expectedResult, $this->subject->isOutputEnabled($moduleName)); + static::assertSame($expectedResult, self::$subject->isOutputEnabled($moduleName)); } /** @@ -63,7 +62,7 @@ public function testIsOutputEnabled(bool $expectedResult, ?string $moduleName): */ public function testGetModuleName(): void { - $this->assertSame('Mage_Adminhtml', $this->subject->getModuleName()); + static::assertSame('Mage_Adminhtml', self::$subject->getModuleName()); } /** @@ -73,6 +72,6 @@ public function testGetModuleName(): void */ public function testMaliciousCodeFilter(): void { - $this->assertIsString($this->subject->maliciousCodeFilter('')); + static::assertIsString(self::$subject->maliciousCodeFilter('')); } } diff --git a/tests/unit/Mage/Adminhtml/Block/Widget/Grid/ColumnTest.php b/tests/unit/Mage/Adminhtml/Block/Widget/Grid/ColumnTest.php index 02dd8e3ae1f..aff78555bb0 100644 --- a/tests/unit/Mage/Adminhtml/Block/Widget/Grid/ColumnTest.php +++ b/tests/unit/Mage/Adminhtml/Block/Widget/Grid/ColumnTest.php @@ -18,15 +18,15 @@ namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Widget\Grid; use Mage_Adminhtml_Block_Widget_Grid_Column as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class ColumnTest extends TestCase +class ColumnTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - $this->subject = new Subject(); + self::$subject = new Subject(); } /** @@ -35,9 +35,9 @@ public function setUp(): void */ public function testGetType(): void { - $this->assertSame('', $this->subject->getType()); + static::assertSame('', self::$subject->getType()); - $this->subject->setType('text'); - $this->assertSame('text', $this->subject->getType()); + self::$subject->setType('text'); + static::assertSame('text', self::$subject->getType()); } } diff --git a/tests/unit/Mage/Adminhtml/Block/Widget/GridTest.php b/tests/unit/Mage/Adminhtml/Block/Widget/GridTest.php index 48e003655f4..8a8da85e645 100644 --- a/tests/unit/Mage/Adminhtml/Block/Widget/GridTest.php +++ b/tests/unit/Mage/Adminhtml/Block/Widget/GridTest.php @@ -17,19 +17,20 @@ namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Widget; -use Generator; -use Mage; use Mage_Adminhtml_Block_Widget_Grid as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; +use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Adminhtml\Block\Widget\GridTrait; -class GridTest extends TestCase +class GridTest extends OpenMageTest { - public Subject $subject; + use GridTrait; - public function setUp(): void + private static Subject $subject; + + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = new Subject(); + parent::setUpBeforeClass(); + self::$subject = new Subject(); } /** @@ -39,135 +40,6 @@ public function setUp(): void */ public function testAddColumnDefaultData(array $expectedResult, array $column): void { - $this->assertSame($expectedResult, $this->subject->addColumnDefaultData($column)); - } - - public function provideAddColumnDefaultData(): Generator - { - yield 'empty' => [ - [], - [], - ]; - yield 'index entity_id' => [ - [ - 'index' => 'entity_id', - 'align' => 'right', - 'type' => 'number', - 'width' => '1', - ], - [ - 'index' => 'entity_id', - ], - ]; - yield 'index entity_id w/ override' => [ - [ - 'index' => 'entity_id', - 'align' => 'center', - 'type' => 'text', - ], - [ - 'index' => 'entity_id', - 'align' => 'center', - 'type' => 'text', - ], - ]; - yield 'index array - ref #4475' => [ - [ - 'index' => ['firstname', 'lastname'], - 'type' => 'concat', - 'separator' => ' ', - ], - [ - 'index' => ['firstname', 'lastname'], - 'type' => 'concat', - ], - ]; - yield 'type action' => [ - [ - 'type' => 'action', - 'filter' => false, - 'sortable' => false, - 'width' => '40', - 'header' => 'Action', - ], - [ - 'type' => 'action', - ], - ]; - yield 'type action w/ override' => [ - [ - 'type' => 'action', - 'header' => 'test', - 'filter' => false, - 'sortable' => false, - 'width' => '40', - ], - [ - 'type' => 'action', - 'header' => 'test', - ], - ]; - yield 'type currency' => [ - [ - 'type' => 'currency', - 'align' => 'right', - 'index' => 'price', - 'header' => 'Price', - ], - [ - 'type' => 'currency', - ], - ]; - yield 'type date' => [ - [ - 'type' => 'date', - 'width' => '140', - ], - [ - 'type' => 'date', - ], - ]; - yield 'type datetime' => [ - [ - 'type' => 'datetime', - 'width' => '170', - ], - [ - 'type' => 'datetime', - ], - ]; - yield 'type number' => [ - [ - 'type' => 'number', - 'align' => 'right', - 'width' => '1', - ], - [ - 'type' => 'number', - ], - ]; - yield 'type price' => [ - [ - 'type' => 'price', - 'align' => 'right', - 'index' => 'price', - 'header' => 'Price', - ], - [ - 'type' => 'price', - ], - ]; - yield 'type store' => [ - [ - 'type' => 'store', - 'index' => 'store_id', - 'store_view' => true, - 'width' => '160', - 'header' => 'Store View', - ], - [ - 'type' => 'store', - ], - ]; + static::assertSame($expectedResult, self::$subject->addColumnDefaultData($column)); } } diff --git a/tests/unit/Mage/Adminhtml/Helper/AddressesTest.php b/tests/unit/Mage/Adminhtml/Helper/AddressesTest.php index c00118baada..48f246bb80b 100644 --- a/tests/unit/Mage/Adminhtml/Helper/AddressesTest.php +++ b/tests/unit/Mage/Adminhtml/Helper/AddressesTest.php @@ -17,20 +17,22 @@ namespace OpenMage\Tests\Unit\Mage\Adminhtml\Helper; -use Generator; use Mage; use Mage_Adminhtml_Helper_Addresses as Subject; use Mage_Customer_Model_Attribute; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; +use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Adminhtml\Helper\AddressTrait; -class AddressesTest extends TestCase +class AddressesTest extends OpenMageTest { - public Subject $subject; + use AddressTrait; - public function setUp(): void + private static Subject $subject; + + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('adminhtml/addresses'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('adminhtml/addresses'); } /** @@ -44,19 +46,7 @@ public function testProcessStreetAttribute(int $expectedResult, int $lines): voi $attribute = new Mage_Customer_Model_Attribute(); $attribute->setScopeMultilineCount($lines); - $result = $this->subject->processStreetAttribute($attribute); - $this->assertSame($expectedResult, $result->getScopeMultilineCount()); - } - - public function provideProcessStreetAttribute(): Generator - { - yield 'default' => [ - Subject::DEFAULT_STREET_LINES_COUNT, - 0, - ]; - yield 'custom' => [ - 4, - 4, - ]; + $result = self::$subject->processStreetAttribute($attribute); + static::assertSame($expectedResult, $result->getScopeMultilineCount()); } } diff --git a/tests/unit/Mage/Adminhtml/Helper/CatalogTest.php b/tests/unit/Mage/Adminhtml/Helper/CatalogTest.php index 1cb1c363a8c..c80a304c7ea 100644 --- a/tests/unit/Mage/Adminhtml/Helper/CatalogTest.php +++ b/tests/unit/Mage/Adminhtml/Helper/CatalogTest.php @@ -19,16 +19,16 @@ use Mage; use Mage_Adminhtml_Helper_Catalog as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class CatalogTest extends TestCase +class CatalogTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('adminhtml/catalog'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('adminhtml/catalog'); } /** @@ -38,7 +38,7 @@ public function setUp(): void */ public function testSetAttributeTabBlock(): void { - $this->assertInstanceOf(Subject::class, $this->subject->setAttributeTabBlock('')); + static::assertInstanceOf(Subject::class, self::$subject->setAttributeTabBlock('')); } /** @@ -48,7 +48,7 @@ public function testSetAttributeTabBlock(): void */ public function testSetCategoryAttributeTabBlock(): void { - $this->assertInstanceOf(Subject::class, $this->subject->setCategoryAttributeTabBlock('')); + static::assertInstanceOf(Subject::class, self::$subject->setCategoryAttributeTabBlock('')); } /** @@ -72,6 +72,6 @@ public function testGetSitemapValidPaths(): void 'skin' => '/skin/*/*', ], ]; - $this->assertSame($assert, $this->subject->getSitemapValidPaths()); + static::assertSame($assert, self::$subject->getSitemapValidPaths()); } } diff --git a/tests/unit/Mage/Adminhtml/Helper/ConfigTest.php b/tests/unit/Mage/Adminhtml/Helper/ConfigTest.php index 78c04518855..1c2e6a9fb6d 100644 --- a/tests/unit/Mage/Adminhtml/Helper/ConfigTest.php +++ b/tests/unit/Mage/Adminhtml/Helper/ConfigTest.php @@ -17,19 +17,21 @@ namespace OpenMage\Tests\Unit\Mage\Adminhtml\Helper; -use Generator; use Mage; use Mage_Adminhtml_Helper_Config as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; +use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Adminhtml\Helper\ConfigTrait; -class ConfigTest extends TestCase +class ConfigTest extends OpenMageTest { - public Subject $subject; + use ConfigTrait; - public function setUp(): void + private static Subject $subject; + + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('adminhtml/config'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('adminhtml/config'); } /** @@ -40,29 +42,7 @@ public function setUp(): void */ public function testGetInputTypes(array $expectedResult, ?string $inputType): void { - $this->assertSame($expectedResult, $this->subject->getInputTypes($inputType)); - } - - public function provideGetInputTypes(): Generator - { - yield 'null' => [ - [ - 'color' => [ - 'backend_model' => 'adminhtml/system_config_backend_color', - ], - ], - null, - ]; - yield 'color' => [ - [ - 'backend_model' => 'adminhtml/system_config_backend_color', - ], - 'color', - ]; - yield 'invalid' => [ - [], - 'invalid', - ]; + static::assertSame($expectedResult, self::$subject->getInputTypes($inputType)); } /** @@ -73,18 +53,6 @@ public function provideGetInputTypes(): Generator */ public function testGetBackendModelByInputType(?string $expectedResult, string $inputType): void { - $this->assertSame($expectedResult, $this->subject->getBackendModelByInputType($inputType)); - } - - public function provideGetBackendModelByInputType(): Generator - { - yield 'color' => [ - 'adminhtml/system_config_backend_color', - 'color', - ]; - yield 'invalid' => [ - null, - 'invalid', - ]; + static::assertSame($expectedResult, self::$subject->getBackendModelByInputType($inputType)); } } diff --git a/tests/unit/Mage/Adminhtml/Helper/Dashboard/DataTest.php b/tests/unit/Mage/Adminhtml/Helper/Dashboard/DataTest.php index 8e6d9f24190..f944632d1a8 100644 --- a/tests/unit/Mage/Adminhtml/Helper/Dashboard/DataTest.php +++ b/tests/unit/Mage/Adminhtml/Helper/Dashboard/DataTest.php @@ -20,16 +20,16 @@ use Mage; use Mage_Adminhtml_Helper_Dashboard_Data as Subject; use Mage_Core_Model_Resource_Store_Collection; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class DataTest extends TestCase +class DataTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('adminhtml/dashboard_data'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('adminhtml/dashboard_data'); } /** @@ -39,7 +39,7 @@ public function setUp(): void */ public function testGetStores(): void { - $this->assertInstanceOf(Mage_Core_Model_Resource_Store_Collection::class, $this->subject->getStores()); + static::assertInstanceOf(Mage_Core_Model_Resource_Store_Collection::class, self::$subject->getStores()); } /** @@ -49,7 +49,7 @@ public function testGetStores(): void */ public function testCountStores(): void { - $this->assertIsInt($this->subject->countStores()); + static::assertIsInt(self::$subject->countStores()); } /** @@ -60,13 +60,13 @@ public function testCountStores(): void public function testGetDatePeriods(): void { $expectedResult = [ - '24h' => $this->subject->__('Last 24 Hours'), - '7d' => $this->subject->__('Last 7 Days'), - '1m' => $this->subject->__('Current Month'), - '1y' => $this->subject->__('YTD'), - '2y' => $this->subject->__('2YTD'), + '24h' => self::$subject->__('Last 24 Hours'), + '7d' => self::$subject->__('Last 7 Days'), + '1m' => self::$subject->__('Current Month'), + '1y' => self::$subject->__('YTD'), + '2y' => self::$subject->__('2YTD'), ]; - $this->assertSame($expectedResult, $this->subject->getDatePeriods()); + static::assertSame($expectedResult, self::$subject->getDatePeriods()); } /** @@ -76,6 +76,6 @@ public function testGetDatePeriods(): void */ public function testGetChartDataHash(): void { - $this->assertIsString($this->subject->getChartDataHash('')); + static::assertIsString(self::$subject->getChartDataHash('')); } } diff --git a/tests/unit/Mage/Adminhtml/Helper/DataTest.php b/tests/unit/Mage/Adminhtml/Helper/DataTest.php index bb2d62877f1..04925eab47e 100644 --- a/tests/unit/Mage/Adminhtml/Helper/DataTest.php +++ b/tests/unit/Mage/Adminhtml/Helper/DataTest.php @@ -19,16 +19,16 @@ use Mage; use Mage_Adminhtml_Helper_Data as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class DataTest extends TestCase +class DataTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('adminhtml/data'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('adminhtml/data'); } /** @@ -40,7 +40,7 @@ public function setUp(): void */ public function testGetUrl(): void { - $this->assertIsString($this->subject->getUrl()); + static::assertIsString(self::$subject->getUrl()); } /** @@ -52,7 +52,7 @@ public function testGetUrl(): void */ public function testGetCurrentUserId(): void { - $this->assertFalse($this->subject->getCurrentUserId()); + static::assertFalse(self::$subject->getCurrentUserId()); } /** @@ -62,7 +62,7 @@ public function testGetCurrentUserId(): void */ public function testPrepareFilterString(): void { - $this->assertIsArray($this->subject->prepareFilterString('')); + static::assertIsArray(self::$subject->prepareFilterString('')); } /** @@ -73,8 +73,8 @@ public function testPrepareFilterString(): void public function testDecodeFilter(): void { $string = ''; - $this->subject->decodeFilter($string); - $this->assertSame('', $string); + self::$subject->decodeFilter($string); + static::assertSame('', $string); } /** @@ -84,6 +84,6 @@ public function testDecodeFilter(): void */ public function testIsEnabledSecurityKeyUrl(): void { - $this->assertTrue($this->subject->isEnabledSecurityKeyUrl()); + static::assertTrue(self::$subject->isEnabledSecurityKeyUrl()); } } diff --git a/tests/unit/Mage/Adminhtml/Helper/JsTest.php b/tests/unit/Mage/Adminhtml/Helper/JsTest.php index 973f3a98930..7afc0421b0b 100644 --- a/tests/unit/Mage/Adminhtml/Helper/JsTest.php +++ b/tests/unit/Mage/Adminhtml/Helper/JsTest.php @@ -17,19 +17,21 @@ namespace OpenMage\Tests\Unit\Mage\Adminhtml\Helper; -use Generator; use Mage; use Mage_Adminhtml_Helper_Js as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; +use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Adminhtml\Helper\JsTrait; -class JsTest extends TestCase +class JsTest extends OpenMageTest { - public Subject $subject; + use JsTrait; - public function setUp(): void + private static Subject $subject; + + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('adminhtml/js'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('adminhtml/js'); } /** @@ -40,26 +42,6 @@ public function setUp(): void */ public function testDecodeGridSerializedInput(array $expectedResult, string $encoded): void { - $this->assertSame($expectedResult, $this->subject->decodeGridSerializedInput($encoded)); - } - - public function provideDecodeGridSerializedInput(): Generator - { - yield 'w/o keys' => [ - [ - 0 => 1, - 1 => 2, - 2 => 3, - 3 => 4, - ], - '1&2&3&4', - ]; - yield 'w/ keys' => [ - [ - 1 => [], - 2 => [], - ], - '1=1&2=2', - ]; + static::assertSame($expectedResult, self::$subject->decodeGridSerializedInput($encoded)); } } diff --git a/tests/unit/Mage/Adminhtml/Helper/Media/JsTest.php b/tests/unit/Mage/Adminhtml/Helper/Media/JsTest.php index ff17b3b317e..f28900cdc27 100644 --- a/tests/unit/Mage/Adminhtml/Helper/Media/JsTest.php +++ b/tests/unit/Mage/Adminhtml/Helper/Media/JsTest.php @@ -19,16 +19,16 @@ use Mage; use Mage_Adminhtml_Helper_Media_Js as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class JsTest extends TestCase +class JsTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('adminhtml/media_js'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('adminhtml/media_js'); } /** @@ -37,6 +37,6 @@ public function setUp(): void */ public function testDecodeGridSerializedInput(): void { - $this->assertIsString($this->subject->getTranslatorScript()); + static::assertIsString(self::$subject->getTranslatorScript()); } } diff --git a/tests/unit/Mage/Adminhtml/Helper/SalesTest.php b/tests/unit/Mage/Adminhtml/Helper/SalesTest.php index 1e8da01ba12..b4c6bd217be 100644 --- a/tests/unit/Mage/Adminhtml/Helper/SalesTest.php +++ b/tests/unit/Mage/Adminhtml/Helper/SalesTest.php @@ -17,19 +17,21 @@ namespace OpenMage\Tests\Unit\Mage\Adminhtml\Helper; -use Generator; use Mage; use Mage_Adminhtml_Helper_Sales as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; +use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Adminhtml\Helper\SalesTrait; -class SalesTest extends TestCase +class SalesTest extends OpenMageTest { - public Subject $subject; + use SalesTrait; - public function setUp(): void + private static Subject $subject; + + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('adminhtml/sales'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('adminhtml/sales'); } /** @@ -38,16 +40,8 @@ public function setUp(): void * @group Mage_Adminhtml * @group Mage_Adminhtml_Helper */ - public function testEscapeHtmlWithLinks($expectedResult, $data): void - { - $this->assertSame($expectedResult, $this->subject->escapeHtmlWithLinks($data, ['a'])); - } - - public function provideDecodeGridSerializedInput(): Generator + public function testEscapeHtmlWithLinks(string $expectedResult, string $data): void { - yield 'test #1' => [ - '<a href="https://localhost">', - '', - ]; + static::assertSame($expectedResult, self::$subject->escapeHtmlWithLinks($data, ['a'])); } } diff --git a/tests/unit/Mage/Api/Model/UserTest.php b/tests/unit/Mage/Api/Model/UserTest.php new file mode 100644 index 00000000000..53bec4d836c --- /dev/null +++ b/tests/unit/Mage/Api/Model/UserTest.php @@ -0,0 +1,51 @@ +getMockWithCalledMethods(Subject::class, $methods); + + static::assertInstanceOf(Subject::class, $mock); + static::assertSame($expectedResult, $mock->validate()); + } +} diff --git a/tests/unit/Mage/Catalog/Helper/CategoryTest.php b/tests/unit/Mage/Catalog/Helper/CategoryTest.php index 14fa24fc2d6..9f6646d2ada 100644 --- a/tests/unit/Mage/Catalog/Helper/CategoryTest.php +++ b/tests/unit/Mage/Catalog/Helper/CategoryTest.php @@ -19,16 +19,16 @@ use Mage; use Mage_Catalog_Helper_Category as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class CategoryTest extends TestCase +class CategoryTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('catalog/category'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('catalog/category'); } /** @@ -37,6 +37,6 @@ public function setUp(): void */ public function testCanUseCanonicalTag(): void { - $this->assertIsBool($this->subject->canUseCanonicalTag()); + static::assertIsBool(self::$subject->canUseCanonicalTag()); } } diff --git a/tests/unit/Mage/Catalog/Helper/DataTest.php b/tests/unit/Mage/Catalog/Helper/DataTest.php index 2cd5e2fdba7..646e7d20f8a 100644 --- a/tests/unit/Mage/Catalog/Helper/DataTest.php +++ b/tests/unit/Mage/Catalog/Helper/DataTest.php @@ -17,20 +17,22 @@ namespace OpenMage\Tests\Unit\Mage\Catalog\Helper; -use Generator; use Mage; use Mage_Catalog_Helper_Data as Subject; use Mage_Catalog_Model_Template_Filter; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; +use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Catalog\Helper\DataTrait; -class DataTest extends TestCase +class DataTest extends OpenMageTest { - public Subject $subject; + use DataTrait; - public function setUp(): void + private static Subject $subject; + + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('catalog'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('catalog'); } /** @@ -38,27 +40,9 @@ public function setUp(): void * @group Mage_Catalog * @group Mage_Catalog_Helper */ - public function testSplitSku($expectedResult, string $sku, int $length = 30): void - { - $this->assertSame($expectedResult, $this->subject->splitSku($sku, $length)); - } - - public function provideSplitSku(): Generator + public function testSplitSku(array $expectedResult, string $sku, int $length = 30): void { - yield 'test #1' => [ - [ - '100', - ], - '100', - ]; - yield 'test #2 w/ length' => [ - [ - '10', - '0', - ], - '100', - 2, - ]; + static::assertSame($expectedResult, self::$subject->splitSku($sku, $length)); } /** @@ -67,7 +51,7 @@ public function provideSplitSku(): Generator */ public function testShouldSaveUrlRewritesHistory(): void { - $this->assertIsBool($this->subject->shouldSaveUrlRewritesHistory()); + static::assertIsBool(self::$subject->shouldSaveUrlRewritesHistory()); } /** @@ -76,7 +60,7 @@ public function testShouldSaveUrlRewritesHistory(): void */ public function testIsUsingStaticUrlsAllowed(): void { - $this->assertIsBool($this->subject->isUsingStaticUrlsAllowed()); + static::assertIsBool(self::$subject->isUsingStaticUrlsAllowed()); } /** @@ -85,7 +69,7 @@ public function testIsUsingStaticUrlsAllowed(): void */ public function testIsUrlDirectivesParsingAllowed(): void { - $this->assertIsBool($this->subject->isUrlDirectivesParsingAllowed()); + static::assertIsBool(self::$subject->isUrlDirectivesParsingAllowed()); } /** @@ -94,7 +78,7 @@ public function testIsUrlDirectivesParsingAllowed(): void */ public function testGetPageTemplateProcessor(): void { - $this->assertInstanceOf(Mage_Catalog_Model_Template_Filter::class, $this->subject->getPageTemplateProcessor()); + static::assertInstanceOf(Mage_Catalog_Model_Template_Filter::class, self::$subject->getPageTemplateProcessor()); } /** @@ -103,6 +87,6 @@ public function testGetPageTemplateProcessor(): void */ public function testGetOldFieldMap(): void { - $this->assertSame([], $this->subject->getOldFieldMap()); + static::assertSame([], self::$subject->getOldFieldMap()); } } diff --git a/tests/unit/Mage/Catalog/Helper/MapTest.php b/tests/unit/Mage/Catalog/Helper/MapTest.php index c2ec84f5c3b..6e52ca623eb 100644 --- a/tests/unit/Mage/Catalog/Helper/MapTest.php +++ b/tests/unit/Mage/Catalog/Helper/MapTest.php @@ -19,16 +19,16 @@ use Mage; use Mage_Catalog_Helper_Map as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class MapTest extends TestCase +class MapTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('catalog/map'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('catalog/map'); } /** @@ -39,7 +39,7 @@ public function setUp(): void */ public function testGetCategoryUrl(): void { - $this->assertStringEndsWith('/catalog/seo_sitemap/category/', $this->subject->getCategoryUrl()); + static::assertStringEndsWith('/catalog/seo_sitemap/category/', self::$subject->getCategoryUrl()); } /** @@ -50,7 +50,7 @@ public function testGetCategoryUrl(): void */ public function testGetProductUrl(): void { - $this->assertStringEndsWith('/catalog/seo_sitemap/product/', $this->subject->getProductUrl()); + static::assertStringEndsWith('/catalog/seo_sitemap/product/', self::$subject->getProductUrl()); } /** @@ -59,6 +59,6 @@ public function testGetProductUrl(): void */ public function testGetIsUseCategoryTreeMode(): void { - $this->assertIsBool($this->subject->getIsUseCategoryTreeMode()); + static::assertIsBool(self::$subject->getIsUseCategoryTreeMode()); } } diff --git a/tests/unit/Mage/Catalog/Helper/Product/UrlTest.php b/tests/unit/Mage/Catalog/Helper/Product/UrlTest.php index 6ea1ee24d9b..0abae125db9 100644 --- a/tests/unit/Mage/Catalog/Helper/Product/UrlTest.php +++ b/tests/unit/Mage/Catalog/Helper/Product/UrlTest.php @@ -17,19 +17,21 @@ namespace OpenMage\Tests\Unit\Mage\Catalog\Helper\Product; -use Generator; use Mage; use Mage_Catalog_Helper_Product_Url as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; +use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Catalog\Helper\Product\UrlTrait; -class UrlTest extends TestCase +class UrlTest extends OpenMageTest { - public Subject $subject; + use UrlTrait; - public function setUp(): void + private static Subject $subject; + + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('catalog/product_url'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('catalog/product_url'); } /** @@ -39,8 +41,8 @@ public function setUp(): void */ public function testGetConvertTable(): void { - $result = $this->subject->getConvertTable(); - $this->assertCount(317, $result); + $result = self::$subject->getConvertTable(); + static::assertCount(317, $result); } /** @@ -50,8 +52,8 @@ public function testGetConvertTable(): void */ public function testGetConvertTableCustom(): void { - $result = $this->subject->getConvertTableCustom(); - $this->assertEmpty($result); + $result = self::$subject->getConvertTableCustom(); + static::assertEmpty($result); } /** @@ -61,8 +63,8 @@ public function testGetConvertTableCustom(): void */ public function testGetConvertTableShort(): void { - $result = $this->subject->getConvertTableShort(); - $this->assertCount(4, $result); + $result = self::$subject->getConvertTableShort(); + static::assertCount(4, $result); } /** @@ -73,26 +75,6 @@ public function testGetConvertTableShort(): void */ public function testFormat(string $expectedResult, ?string $string): void { - $this->assertSame($expectedResult, $this->subject->format($string)); - } - - public function provideFormat(): Generator - { - yield 'null' => [ - '', - null, - ]; - yield 'string' => [ - 'string', - 'string', - ]; - yield 'umlauts' => [ - 'string with aou', - 'string with ÄÖÜ', - ]; - yield 'at' => [ - 'at', - '@', - ]; + static::assertSame($expectedResult, self::$subject->format($string)); } } diff --git a/tests/unit/Mage/Catalog/Helper/ProductTest.php b/tests/unit/Mage/Catalog/Helper/ProductTest.php index 7910f8eba9a..a0714c213ef 100644 --- a/tests/unit/Mage/Catalog/Helper/ProductTest.php +++ b/tests/unit/Mage/Catalog/Helper/ProductTest.php @@ -17,19 +17,21 @@ namespace OpenMage\Tests\Unit\Mage\Catalog\Helper; -use Generator; use Mage; use Mage_Catalog_Helper_Product as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; +use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Catalog\Helper\ProductTrait; -class ProductTest extends TestCase +class ProductTest extends OpenMageTest { - public Subject $subject; + use ProductTrait; - public function setUp(): void + private static Subject $subject; + + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('catalog/product'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('catalog/product'); } /** @@ -38,7 +40,7 @@ public function setUp(): void */ public function testCanUseCanonicalTag(): void { - $this->assertIsBool($this->subject->canUseCanonicalTag()); + static::assertIsBool(self::$subject->canUseCanonicalTag()); } /** @@ -48,27 +50,7 @@ public function testCanUseCanonicalTag(): void */ public function testGetAttributeInputTypes(int $expectedResult, ?string $inputType = null): void { - $this->assertCount($expectedResult, $this->subject->getAttributeInputTypes($inputType)); - } - - public function provideGetAttributeInputTypes(): Generator - { - yield 'null' => [ - 2, - null, - ]; - yield 'invalid' => [ - 0, - 'invalid', - ]; - yield 'multiselect' => [ - 1, - 'multiselect', - ]; - yield 'boolean' => [ - 1, - 'boolean', - ]; + static::assertCount($expectedResult, self::$subject->getAttributeInputTypes($inputType)); } /** @@ -76,17 +58,9 @@ public function provideGetAttributeInputTypes(): Generator * @group Mage_Catalog * @group Mage_Catalog_Helper */ - public function testGetAttributeBackendModelByInputType($expectedResult, string $inputType): void - { - $this->assertSame($expectedResult, $this->subject->getAttributeBackendModelByInputType($inputType)); - } - - public function provideGetAttributeBackendModelByInputType(): Generator + public function testGetAttributeBackendModelByInputType(string $expectedResult, string $inputType): void { - yield 'multiselect' => [ - 'eav/entity_attribute_backend_array', - 'multiselect', - ]; + static::assertSame($expectedResult, self::$subject->getAttributeBackendModelByInputType($inputType)); } /** @@ -94,16 +68,8 @@ public function provideGetAttributeBackendModelByInputType(): Generator * @group Mage_Catalog * @group Mage_Catalog_Helper */ - public function testGetAttributeSourceModelByInputType($expectedResult, string $inputType): void - { - $this->assertSame($expectedResult, $this->subject->getAttributeSourceModelByInputType($inputType)); - } - - public function provideGetAttributeSourceModelByInputType(): Generator + public function testGetAttributeSourceModelByInputType(string $expectedResult, string $inputType): void { - yield 'boolean' => [ - 'eav/entity_attribute_source_boolean', - 'boolean', - ]; + static::assertSame($expectedResult, self::$subject->getAttributeSourceModelByInputType($inputType)); } } diff --git a/tests/unit/Mage/Catalog/Model/CategoryTest.php b/tests/unit/Mage/Catalog/Model/CategoryTest.php index 28ecb29f624..bc696343991 100644 --- a/tests/unit/Mage/Catalog/Model/CategoryTest.php +++ b/tests/unit/Mage/Catalog/Model/CategoryTest.php @@ -23,18 +23,18 @@ use Mage_Catalog_Model_Resource_Product_Collection; use Mage_Catalog_Model_Url; use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Catalog\CatalogTrait; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class CategoryTest extends TestCase +class CategoryTest extends OpenMageTest { use CatalogTrait; - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::getModel('catalog/category'); + parent::setUpBeforeClass(); + self::$subject = Mage::getModel('catalog/category'); } /** @@ -43,7 +43,7 @@ public function setUp(): void */ public function testGetDefaultAttributeSetId(): void { - $this->assertIsInt($this->subject->getDefaultAttributeSetId()); + static::assertIsInt(self::$subject->getDefaultAttributeSetId()); } /** @@ -52,7 +52,7 @@ public function testGetDefaultAttributeSetId(): void */ public function testGetProductCollection(): void { - $this->assertInstanceOf(Mage_Catalog_Model_Resource_Product_Collection::class, $this->subject->getProductCollection()); + static::assertInstanceOf(Mage_Catalog_Model_Resource_Product_Collection::class, self::$subject->getProductCollection()); } /** @@ -61,7 +61,7 @@ public function testGetProductCollection(): void */ public function testGetAvailableSortByOptions(): void { - $this->assertIsArray($this->subject->getAvailableSortByOptions()); + static::assertIsArray(self::$subject->getAvailableSortByOptions()); } /** @@ -70,7 +70,7 @@ public function testGetAvailableSortByOptions(): void */ public function testGetDefaultSortBy(): void { - $this->assertSame('position', $this->subject->getDefaultSortBy()); + static::assertSame('position', self::$subject->getDefaultSortBy()); } /** @@ -79,7 +79,7 @@ public function testGetDefaultSortBy(): void */ public function testValidate(): void { - $this->assertIsArray($this->subject->validate()); + static::assertIsArray(self::$subject->validate()); } /** @@ -88,7 +88,7 @@ public function testValidate(): void */ public function testAfterCommitCallback(): void { - $this->assertInstanceOf(Subject::class, $this->subject->afterCommitCallback()); + static::assertInstanceOf(Subject::class, self::$subject->afterCommitCallback()); } /** @@ -97,8 +97,8 @@ public function testAfterCommitCallback(): void */ public function testGetUrlModel(): void { - $this->assertInstanceOf(Mage_Catalog_Model_Url::class, $this->subject->getUrlModel()); - $this->assertInstanceOf(Mage_Catalog_Model_Category_Url::class, $this->subject->getUrlModel()); + static::assertInstanceOf(Mage_Catalog_Model_Url::class, self::$subject->getUrlModel()); + static::assertInstanceOf(Mage_Catalog_Model_Category_Url::class, self::$subject->getUrlModel()); } /** @@ -109,9 +109,9 @@ public function testGetUrlModel(): void */ // public function testGetCategoryIdUrl($expectedResult, ?string $locale): void // { - // $this->subject->setName(self::TEST_STRING); - // $this->subject->setLocale($locale); - // $this->assertSame($expectedResult, $this->subject->getCategoryIdUrl()); + // self::$subject->setName(self::TEST_STRING); + // self::$subject->setLocale($locale); + // $this->assertSame($expectedResult, self::$subject->getCategoryIdUrl()); // } /** @@ -119,9 +119,9 @@ public function testGetUrlModel(): void * @group Mage_Catalog * @group Mage_Catalog_Model */ - public function testFormatUrlKey($expectedResult, string $locale): void + public function testFormatUrlKey(string $expectedResult, string $locale): void { - $this->subject->setLocale($locale); - $this->assertSame($expectedResult, $this->subject->formatUrlKey($this->getTestString())); + self::$subject->setLocale($locale); + static::assertSame($expectedResult, self::$subject->formatUrlKey($this->getTestString())); } } diff --git a/tests/unit/Mage/Catalog/Model/Product/Option/Type/TextTest.php b/tests/unit/Mage/Catalog/Model/Product/Option/Type/TextTest.php index 313cf47fafe..4d3fc8a2b2e 100644 --- a/tests/unit/Mage/Catalog/Model/Product/Option/Type/TextTest.php +++ b/tests/unit/Mage/Catalog/Model/Product/Option/Type/TextTest.php @@ -21,16 +21,16 @@ use Mage; use Mage_Catalog_Model_Product_Option; use Mage_Catalog_Model_Product_Option_Type_Text as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class TextTest extends TestCase +class TextTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::getModel('catalog/product_option_type_text'); + parent::setUpBeforeClass(); + self::$subject = Mage::getModel('catalog/product_option_type_text'); } /** @@ -41,8 +41,8 @@ public function setUp(): void */ public function testValidateUserValue(): void { - $this->subject->setOption(new Mage_Catalog_Model_Product_Option()); - $this->assertInstanceOf(Subject::class, $this->subject->validateUserValue([])); + self::$subject->setOption(new Mage_Catalog_Model_Product_Option()); + static::assertInstanceOf(Subject::class, self::$subject->validateUserValue([])); } @@ -51,10 +51,10 @@ public function testValidateUserValue(): void * @group Mage_Catalog * @group Mage_Catalog_Model */ - public function testPrepareForCart($expectedResult, bool $setIsValid = true, $setUserValue = null): void + public function testPrepareForCart(?string $expectedResult, bool $setIsValid = true, ?string $setUserValue = null): void { - $this->subject->setIsValid($setIsValid)->setUserValue($setUserValue); - $this->assertSame($expectedResult, $this->subject->prepareForCart()); + self::$subject->setIsValid($setIsValid)->setUserValue($setUserValue); + static::assertSame($expectedResult, self::$subject->prepareForCart()); } public function providePrepareForCart(): Generator @@ -76,6 +76,6 @@ public function providePrepareForCart(): Generator */ public function testGetDefaultAttributeSetId(): void { - $this->assertIsString($this->subject->getFormattedOptionValue('')); + static::assertIsString(self::$subject->getFormattedOptionValue('')); } } diff --git a/tests/unit/Mage/Catalog/Model/ProductTest.php b/tests/unit/Mage/Catalog/Model/ProductTest.php index e0f088acc6d..0225dab7f9f 100644 --- a/tests/unit/Mage/Catalog/Model/ProductTest.php +++ b/tests/unit/Mage/Catalog/Model/ProductTest.php @@ -26,19 +26,19 @@ use Mage_Catalog_Model_Url; use OpenMage\Tests\Unit\Traits\DataProvider\Base\BoolTrait; use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Catalog\CatalogTrait; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class ProductTest extends TestCase +class ProductTest extends OpenMageTest { use BoolTrait; use CatalogTrait; - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::getModel('catalog/product'); + parent::setUpBeforeClass(); + self::$subject = Mage::getModel('catalog/product'); } /** @@ -47,7 +47,7 @@ public function setUp(): void */ public function testGetStoreId(): void { - $this->assertIsInt($this->subject->getStoreId()); + static::assertIsInt(self::$subject->getStoreId()); } /** @@ -56,7 +56,7 @@ public function testGetStoreId(): void */ public function testGetResourceCollection(): void { - $this->assertInstanceOf(Mage_Catalog_Model_Resource_Product_Collection::class, $this->subject->getResourceCollection()); + static::assertInstanceOf(Mage_Catalog_Model_Resource_Product_Collection::class, self::$subject->getResourceCollection()); } /** @@ -65,8 +65,8 @@ public function testGetResourceCollection(): void */ public function testGetUrlModel(): void { - $this->assertInstanceOf(Mage_Catalog_Model_Url::class, $this->subject->getUrlModel()); - $this->assertInstanceOf(Mage_Catalog_Model_Product_Url::class, $this->subject->getUrlModel()); + static::assertInstanceOf(Mage_Catalog_Model_Url::class, self::$subject->getUrlModel()); + static::assertInstanceOf(Mage_Catalog_Model_Product_Url::class, self::$subject->getUrlModel()); } /** @@ -75,7 +75,7 @@ public function testGetUrlModel(): void */ public function testValidate(): void { - $this->assertInstanceOf(Subject::class, $this->subject->validate()); + static::assertInstanceOf(Subject::class, self::$subject->validate()); } /** @@ -84,8 +84,8 @@ public function testValidate(): void */ // public function testGetName(): void // { - // $this->assertNull($this->subject->getName()); - // $this->assertIsString($this->subject->getName()); + // $this->assertNull(self::$subject->getName()); + // $this->assertIsString(self::$subject->getName()); // } /** @@ -94,7 +94,7 @@ public function testValidate(): void */ // public function testGetPrice(): void // { - // $this->assertIsFloat($this->subject->getPrice()); + // $this->assertIsFloat(self::$subject->getPrice()); // } /** @@ -103,7 +103,7 @@ public function testValidate(): void */ public function testSetPriceCalculation(): void { - $this->assertInstanceOf(Subject::class, $this->subject->setPriceCalculation()); + static::assertInstanceOf(Subject::class, self::$subject->setPriceCalculation()); } /** @@ -112,7 +112,7 @@ public function testSetPriceCalculation(): void */ // public function testGetTypeId(): void // { - // $this->assertIsString($this->subject->getTypeId()); + // $this->assertIsString(self::$subject->getTypeId()); // } /** @@ -121,7 +121,7 @@ public function testSetPriceCalculation(): void */ public function testGetStatus(): void { - $this->assertSame(1, $this->subject->getStatus()); + static::assertSame(1, self::$subject->getStatus()); } /** @@ -131,7 +131,7 @@ public function testGetStatus(): void */ public function testGetTypeInstance(bool $singleton): void { - $this->assertInstanceOf(Mage_Catalog_Model_Product_Type_Abstract::class, $this->subject->getTypeInstance($singleton)); + static::assertInstanceOf(Mage_Catalog_Model_Product_Type_Abstract::class, self::$subject->getTypeInstance($singleton)); } /** @@ -140,7 +140,7 @@ public function testGetTypeInstance(bool $singleton): void */ public function testGetLinkInstance(): void { - $this->assertInstanceOf(Mage_Catalog_Model_Product_Link::class, $this->subject->getLinkInstance()); + static::assertInstanceOf(Mage_Catalog_Model_Product_Link::class, self::$subject->getLinkInstance()); } /** @@ -149,7 +149,7 @@ public function testGetLinkInstance(): void */ public function testGetDefaultAttributeSetId(): void { - $this->assertIsInt($this->subject->getDefaultAttributeSetId()); + static::assertIsInt(self::$subject->getDefaultAttributeSetId()); } /** @@ -158,7 +158,7 @@ public function testGetDefaultAttributeSetId(): void */ public function testAfterCommitCallback(): void { - $this->assertInstanceOf(Subject::class, $this->subject->afterCommitCallback()); + static::assertInstanceOf(Subject::class, self::$subject->afterCommitCallback()); } /** @@ -166,9 +166,9 @@ public function testAfterCommitCallback(): void * @group Mage_Catalog * @group Mage_Catalog_Model */ - public function testFormatUrlKey($expectedResult, string $locale): void + public function testFormatUrlKey(string $expectedResult, string $locale): void { - $this->subject->setLocale($locale); - $this->assertSame($expectedResult, $this->subject->formatUrlKey($this->getTestString())); + self::$subject->setLocale($locale); + static::assertSame($expectedResult, self::$subject->formatUrlKey($this->getTestString())); } } diff --git a/tests/unit/Mage/Catalog/Model/Resource/Eav/AttributeTest.php b/tests/unit/Mage/Catalog/Model/Resource/Eav/AttributeTest.php index 2d57ed1762d..e2aefa2fe05 100644 --- a/tests/unit/Mage/Catalog/Model/Resource/Eav/AttributeTest.php +++ b/tests/unit/Mage/Catalog/Model/Resource/Eav/AttributeTest.php @@ -20,18 +20,17 @@ use Mage; use Mage_Catalog_Model_Resource_Eav_Attribute as Subject; use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Core\CoreTrait; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class AttributeTest extends TestCase +class AttributeTest extends OpenMageTest { use CoreTrait; - public Subject $subject; + private static Subject $subject; public function setUp(): void { - Mage::app(); - $this->subject = Mage::getModel('catalog/resource_eav_attribute'); + self::$subject = Mage::getModel('catalog/resource_eav_attribute'); } /** @@ -40,11 +39,11 @@ public function setUp(): void * @group Mage_Catalog_Model * @group Mage_Catalog_Model_Resource */ - public function testGetStoreId($expectedResult, $withStoreId): void + public function testGetStoreId(?int $expectedResult, int|string|null $withStoreId): void { if ($withStoreId) { - $this->subject->setStoreId($withStoreId); + self::$subject->setStoreId($withStoreId); } - $this->assertSame($expectedResult, $this->subject->getStoreId()); + static::assertSame($expectedResult, self::$subject->getStoreId()); } } diff --git a/tests/unit/Mage/Catalog/Model/UrlTest.php b/tests/unit/Mage/Catalog/Model/UrlTest.php index 305b6a2dabc..e1a416a959c 100644 --- a/tests/unit/Mage/Catalog/Model/UrlTest.php +++ b/tests/unit/Mage/Catalog/Model/UrlTest.php @@ -17,27 +17,27 @@ namespace OpenMage\Tests\Unit\Mage\Catalog\Model; -use Generator; use Mage; use Mage_Catalog_Model_Url as Subject; use Mage_Core_Exception; +use OpenMage\Tests\Unit\OpenMageTest; use OpenMage\Tests\Unit\Traits\DataProvider\Base\IntOrNullTrait; use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Catalog\CatalogTrait; -use PHPUnit\Framework\TestCase; -use Symfony\Component\String\Slugger\AsciiSlugger; +use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Catalog\Model\UrlTrait; use Varien_Object; -class UrlTest extends TestCase +class UrlTest extends OpenMageTest { use CatalogTrait; use IntOrNullTrait; + use UrlTrait; - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::getModel('catalog/url'); + parent::setUpBeforeClass(); + self::$subject = Mage::getModel('catalog/url'); } /** @@ -46,7 +46,7 @@ public function setUp(): void */ public function testGetStoreRootCategory(): void { - $this->assertInstanceOf(Varien_Object::class, $this->subject->getStoreRootCategory(1)); + static::assertInstanceOf(Varien_Object::class, self::$subject->getStoreRootCategory(1)); } /** @@ -56,7 +56,7 @@ public function testGetStoreRootCategory(): void */ public function testRefreshRewrites(?int $storeId): void { - $this->assertInstanceOf(Subject::class, $this->subject->refreshRewrites($storeId)); + static::assertInstanceOf(Subject::class, self::$subject->refreshRewrites($storeId)); } /** @@ -73,66 +73,21 @@ public function testGeneratePath( ?string $parentPath = null ): void { try { - $this->assertSame($expectedResult, $this->subject->generatePath($type, $product, $category, $parentPath)); + static::assertSame($expectedResult, self::$subject->generatePath($type, $product, $category, $parentPath)); } catch (Mage_Core_Exception $e) { - $this->assertSame($expectedResult, $e->getMessage()); + static::assertSame($expectedResult, $e->getMessage()); } } - public function provideGeneratePathData(): Generator - { - $category = new Varien_Object([ - 'id' => '999', - 'store_id' => '1', - 'url_key' => '', - 'name' => 'category', - - ]); - $product = new Varien_Object([ - 'id' => '999', - 'name' => 'product', - ]); - - yield 'test exception' => [ - 'Please specify either a category or a product, or both.', - 'request', - null, - null, - ]; - yield 'request' => [ - 'product.html', - 'request', - $product, - $category, - ]; - // yield 'request w/o product' => [ - // '-.html', - // 'request', - // null, - // $category, - // ]; - yield 'target category' => [ - 'catalog/category/view/id/999', - 'target', - null, - $category, - ]; - yield 'target product' => [ - 'catalog/product/view/id/999', - 'target', - $product, - $category, - ]; - } /** * @dataProvider provideFormatUrlKey * @group Mage_Catalog * @group Mage_Catalog_Model */ - public function testFormatUrlKey($expectedResult, string $locale): void + public function testFormatUrlKey(string $expectedResult, string $locale): void { - $this->subject->setLocale($locale); - $this->assertSame($expectedResult, $this->subject->formatUrlKey($this->getTestString())); + self::$subject->setLocale($locale); + static::assertSame($expectedResult, self::$subject->formatUrlKey($this->getTestString())); } /** @@ -142,7 +97,7 @@ public function testFormatUrlKey($expectedResult, string $locale): void */ // public function testGetSlugger(): void // { - // $this->subject->getSlugger(); + // self::$subject->getSlugger(); // } /** @@ -150,43 +105,18 @@ public function testFormatUrlKey($expectedResult, string $locale): void * @group Mage_Catalog * @group Mage_Catalog_Model */ - public function testGetSluggerConfig($expectedResult, string $locale): void + public function testGetSluggerConfig(array $expectedResult, string $locale): void { - $result = $this->subject->getSluggerConfig($locale); + $result = self::$subject->getSluggerConfig($locale); - $this->assertArrayHasKey($locale, $result); + static::assertArrayHasKey($locale, $result); - $this->assertArrayHasKey('%', $result[$locale]); - $this->assertArrayHasKey('&', $result[$locale]); + static::assertArrayHasKey('%', $result[$locale]); + static::assertArrayHasKey('&', $result[$locale]); - $this->assertSame($expectedResult[$locale]['%'], $result[$locale]['%']); - $this->assertSame($expectedResult[$locale]['&'], $result[$locale]['&']); + static::assertSame($expectedResult[$locale]['%'], $result[$locale]['%']); + static::assertSame($expectedResult[$locale]['&'], $result[$locale]['&']); - $this->assertSame('at', $result[$locale]['@']); - } - - public function provideGetSluggerConfig(): Generator - { - yield 'de_DE' => [ - ['de_DE' => [ - '%' => 'prozent', - '&' => 'und', - ]], - 'de_DE', - ]; - yield 'en_US' => [ - ['en_US' => [ - '%' => 'percent', - '&' => 'and', - ]], - 'en_US', - ]; - yield 'fr_FR' => [ - ['fr_FR' => [ - '%' => 'pour cent', - '&' => 'et', - ]], - 'fr_FR', - ]; + static::assertSame('at', $result[$locale]['@']); } } diff --git a/tests/unit/Mage/Cms/Block/BlockTest.php b/tests/unit/Mage/Cms/Block/BlockTest.php index 5fac0f46736..d5fd9b237c0 100644 --- a/tests/unit/Mage/Cms/Block/BlockTest.php +++ b/tests/unit/Mage/Cms/Block/BlockTest.php @@ -18,10 +18,10 @@ namespace OpenMage\Tests\Unit\Mage\Cms\Block; use Mage_Cms_Block_Block as Subject; +use OpenMage\Tests\Unit\OpenMageTest; use OpenMage\Tests\Unit\Traits\DataProvider\Base\NumericStringTrait; -use PHPUnit\Framework\TestCase; -class BlockTest extends TestCase +class BlockTest extends OpenMageTest { use NumericStringTrait; @@ -32,11 +32,12 @@ class BlockTest extends TestCase */ public function testGetCacheKeyInfo(string $blockId): void { - $mock = $this->getMockBuilder(Subject::class) - ->setMethods(['getBlockId']) - ->getMock(); + $methods = [ + 'getBlockId' => $blockId, + ]; + $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - $mock->method('getBlockId')->willReturn($blockId); - $this->assertIsArray($mock->getCacheKeyInfo()); + static::assertInstanceOf(Subject::class, $mock); + static::assertIsArray($mock->getCacheKeyInfo()); } } diff --git a/tests/unit/Mage/Cms/Block/PageTest.php b/tests/unit/Mage/Cms/Block/PageTest.php index aa637f47c2d..8206e236972 100644 --- a/tests/unit/Mage/Cms/Block/PageTest.php +++ b/tests/unit/Mage/Cms/Block/PageTest.php @@ -19,10 +19,10 @@ use Mage_Cms_Block_Page as Subject; use Mage_Cms_Model_Page; +use OpenMage\Tests\Unit\OpenMageTest; use OpenMage\Tests\Unit\Traits\DataProvider\Base\NumericStringTrait; -use PHPUnit\Framework\TestCase; -class PageTest extends TestCase +class PageTest extends OpenMageTest { use NumericStringTrait; @@ -33,11 +33,12 @@ class PageTest extends TestCase */ public function testGetPage(string $pageId): void { - $mock = $this->getMockBuilder(Subject::class) - ->setMethods(['getPageId']) - ->getMock(); + $methods = [ + 'getPageId' => $pageId, + ]; + $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - $mock->method('getPageId')->willReturn($pageId); - $this->assertInstanceOf(Mage_Cms_Model_Page::class, $mock->getPage()); + static::assertInstanceOf(Subject::class, $mock); + static::assertInstanceOf(Mage_Cms_Model_Page::class, $mock->getPage()); } } diff --git a/tests/unit/Mage/Cms/Block/Widget/BlockTest.php b/tests/unit/Mage/Cms/Block/Widget/BlockTest.php index 3893735d9d5..8c085fa479c 100644 --- a/tests/unit/Mage/Cms/Block/Widget/BlockTest.php +++ b/tests/unit/Mage/Cms/Block/Widget/BlockTest.php @@ -17,21 +17,20 @@ namespace OpenMage\Tests\Unit\Mage\Cms\Block\Widget; -use Mage; use Mage_Cms_Block_Widget_Block as Subject; +use OpenMage\Tests\Unit\OpenMageTest; use OpenMage\Tests\Unit\Traits\DataProvider\Base\NumericStringTrait; -use PHPUnit\Framework\TestCase; -class BlockTest extends TestCase +class BlockTest extends OpenMageTest { use NumericStringTrait; - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = new Subject(); + parent::setUpBeforeClass(); + self::$subject = new Subject(); } /** @@ -41,12 +40,13 @@ public function setUp(): void */ public function testGetCacheKeyInfo(string $blockId): void { - $mock = $this->getMockBuilder(Subject::class) - ->setMethods(['getBlockId']) - ->getMock(); + $methods = [ + 'getBlockId' => $blockId, + ]; + $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - $mock->method('getBlockId')->willReturn($blockId); - $this->assertIsArray($mock->getCacheKeyInfo()); + static::assertInstanceOf(Subject::class, $mock); + static::assertIsArray($mock->getCacheKeyInfo()); } /** @@ -55,6 +55,6 @@ public function testGetCacheKeyInfo(string $blockId): void */ public function testIsRequestFromAdminArea(): void { - $this->assertIsBool($this->subject->isRequestFromAdminArea()); + static::assertIsBool(self::$subject->isRequestFromAdminArea()); } } diff --git a/tests/unit/Mage/Cms/Block/Widget/Page/LinkTest.php b/tests/unit/Mage/Cms/Block/Widget/Page/LinkTest.php index fbd6c7f841d..6c8c202b367 100644 --- a/tests/unit/Mage/Cms/Block/Widget/Page/LinkTest.php +++ b/tests/unit/Mage/Cms/Block/Widget/Page/LinkTest.php @@ -19,16 +19,16 @@ use Mage; use Mage_Cms_Block_Widget_Page_Link as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class LinkTest extends TestCase +class LinkTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = new Subject(); + parent::setUpBeforeClass(); + self::$subject = new Subject(); } /** @@ -37,7 +37,7 @@ public function setUp(): void */ public function testGetHref(): void { - $this->assertIsString($this->subject->getHref()); + static::assertIsString(self::$subject->getHref()); } /** @@ -46,7 +46,7 @@ public function testGetHref(): void */ public function testGetTitle(): void { - $this->assertIsString($this->subject->getTitle()); + static::assertIsString(self::$subject->getTitle()); } /** @@ -55,6 +55,6 @@ public function testGetTitle(): void */ // public function testGetAnchorText(): void // { - // $this->assertIsString($this->subject->getAnchorText()); + // $this->assertIsString(self::$subject->getAnchorText()); // } } diff --git a/tests/unit/Mage/Cms/Helper/DataTest.php b/tests/unit/Mage/Cms/Helper/DataTest.php index ae858e4e951..d74810ec23c 100644 --- a/tests/unit/Mage/Cms/Helper/DataTest.php +++ b/tests/unit/Mage/Cms/Helper/DataTest.php @@ -19,19 +19,19 @@ use Mage; use Mage_Cms_Helper_Data as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; use Varien_Filter_Template; -class DataTest extends TestCase +class DataTest extends OpenMageTest { public const TEST_STRING = '1234567890'; - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('cms/data'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('cms/data'); } /** @@ -40,7 +40,7 @@ public function setUp(): void */ public function testGetAllowedStreamWrappers(): void { - $this->assertIsArray($this->subject->getAllowedStreamWrappers()); + static::assertIsArray(self::$subject->getAllowedStreamWrappers()); } /** @@ -49,7 +49,7 @@ public function testGetAllowedStreamWrappers(): void */ public function testGetBlockTemplateProcessor(): void { - $this->assertInstanceOf(Varien_Filter_Template::class, $this->subject->getBlockTemplateProcessor()); + static::assertInstanceOf(Varien_Filter_Template::class, self::$subject->getBlockTemplateProcessor()); } /** @@ -58,7 +58,7 @@ public function testGetBlockTemplateProcessor(): void */ public function testGetPageTemplateProcessor(): void { - $this->assertInstanceOf(Varien_Filter_Template::class, $this->subject->getPageTemplateProcessor()); + static::assertInstanceOf(Varien_Filter_Template::class, self::$subject->getPageTemplateProcessor()); } /** @@ -67,6 +67,6 @@ public function testGetPageTemplateProcessor(): void */ public function testIsSwfDisabled(): void { - $this->assertTrue($this->subject->isSwfDisabled()); + static::assertTrue(self::$subject->isSwfDisabled()); } } diff --git a/tests/unit/Mage/Cms/Helper/PageTest.php b/tests/unit/Mage/Cms/Helper/PageTest.php index 472fb1f6c24..e15e79c32d4 100644 --- a/tests/unit/Mage/Cms/Helper/PageTest.php +++ b/tests/unit/Mage/Cms/Helper/PageTest.php @@ -20,18 +20,19 @@ use Mage; use Mage_Cms_Helper_Page as Subject; use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Cms\CmsTrait; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class PageTest extends TestCase +class PageTest extends OpenMageTest { use CmsTrait; - public Subject $subject; + /** @phpstan-ignore property.onlyWritten */ + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('cms/page'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('cms/page'); } /** @@ -41,6 +42,6 @@ public function setUp(): void */ public function testGetUsedInStoreConfigPaths(array $expectedResult, ?array $path): void { - $this->assertSame($expectedResult, Subject::getUsedInStoreConfigPaths($path)); + static::assertSame($expectedResult, Subject::getUsedInStoreConfigPaths($path)); } } diff --git a/tests/unit/Mage/Cms/Helper/Wysiwyg/ImagesTest.php b/tests/unit/Mage/Cms/Helper/Wysiwyg/ImagesTest.php index c52b75ed32c..b6bfb5b999d 100644 --- a/tests/unit/Mage/Cms/Helper/Wysiwyg/ImagesTest.php +++ b/tests/unit/Mage/Cms/Helper/Wysiwyg/ImagesTest.php @@ -21,18 +21,18 @@ use Mage_Cms_Helper_Wysiwyg_Images as Subject; use Mage_Cms_Model_Wysiwyg_Images_Storage; use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Cms\CmsTrait; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class ImagesTest extends TestCase +class ImagesTest extends OpenMageTest { use CmsTrait; - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('cms/wysiwyg_images'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('cms/wysiwyg_images'); } /** @@ -41,7 +41,7 @@ public function setUp(): void */ public function testGetCurrentPath(): void { - $this->assertIsString($this->subject->getCurrentPath()); + static::assertIsString(self::$subject->getCurrentPath()); } /** @@ -50,7 +50,7 @@ public function testGetCurrentPath(): void */ public function testGetCurrentUrl(): void { - $this->assertIsString($this->subject->getCurrentUrl()); + static::assertIsString(self::$subject->getCurrentUrl()); } /** @@ -59,7 +59,7 @@ public function testGetCurrentUrl(): void */ public function testGetStorage(): void { - $this->assertInstanceOf(Mage_Cms_Model_Wysiwyg_Images_Storage::class, $this->subject->getStorage()); + static::assertInstanceOf(Mage_Cms_Model_Wysiwyg_Images_Storage::class, self::$subject->getStorage()); } /** @@ -68,7 +68,7 @@ public function testGetStorage(): void */ public function testIdEncode(): void { - $this->assertIsString($this->subject->idEncode($this->getTestString())); + static::assertIsString(self::$subject->idEncode($this->getTestString())); } /** @@ -77,7 +77,7 @@ public function testIdEncode(): void */ public function testIdDecode(): void { - $this->assertIsString($this->subject->idDecode($this->getTestString())); + static::assertIsString(self::$subject->idDecode($this->getTestString())); } /** @@ -87,6 +87,6 @@ public function testIdDecode(): void */ public function testGetShortFilename(string $expectedResult, string $filename, int $maxLength): void { - $this->assertSame($expectedResult, $this->subject->getShortFilename($filename, $maxLength)); + static::assertSame($expectedResult, self::$subject->getShortFilename($filename, $maxLength)); } } diff --git a/tests/unit/Mage/Cms/Model/PageTest.php b/tests/unit/Mage/Cms/Model/PageTest.php index edfab105585..276459f25df 100644 --- a/tests/unit/Mage/Cms/Model/PageTest.php +++ b/tests/unit/Mage/Cms/Model/PageTest.php @@ -20,18 +20,17 @@ use Mage; use Mage_Cms_Model_Page as Subject; use Mage_Core_Model_Resource_Db_Collection_Abstract; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class PageTest extends TestCase +class PageTest extends OpenMageTest { public const SKIP_WITH_LOCAL_DATA = 'Constant DATA_MAY_CHANGED is defined.'; - public Subject $subject; + private static Subject $subject; public function setUp(): void { - Mage::app(); - $this->subject = Mage::getModel('cms/page'); + self::$subject = Mage::getModel('cms/page'); } /** @@ -40,8 +39,8 @@ public function setUp(): void */ public function testLoad(): void { - $this->assertInstanceOf(Subject::class, $this->subject->load(null)); - $this->assertInstanceOf(Subject::class, $this->subject->load(2)); + static::assertInstanceOf(Subject::class, self::$subject->load(null)); + static::assertInstanceOf(Subject::class, self::$subject->load(2)); } /** @@ -50,7 +49,7 @@ public function testLoad(): void */ public function testCheckIdentifier(): void { - $this->assertIsString($this->subject->checkIdentifier('home', 1)); + static::assertIsString(self::$subject->checkIdentifier('home', 1)); } /** @@ -60,9 +59,9 @@ public function testCheckIdentifier(): void public function testGetCmsPageTitleByIdentifier(): void { if (defined('DATA_MAY_CHANGED')) { - $this->markTestSkipped(self::SKIP_WITH_LOCAL_DATA); + static::markTestSkipped(self::SKIP_WITH_LOCAL_DATA); } - $this->assertSame('Home page', $this->subject->getCmsPageTitleByIdentifier('home')); + static::assertSame('Home page', self::$subject->getCmsPageTitleByIdentifier('home')); } /** @@ -72,9 +71,9 @@ public function testGetCmsPageTitleByIdentifier(): void public function testGetCmsPageTitleById(): void { if (defined('DATA_MAY_CHANGED')) { - $this->markTestSkipped(self::SKIP_WITH_LOCAL_DATA); + static::markTestSkipped(self::SKIP_WITH_LOCAL_DATA); } - $this->assertSame('Home page', $this->subject->getCmsPageTitleById(2)); + static::assertSame('Home page', self::$subject->getCmsPageTitleById(2)); } /** @@ -83,7 +82,7 @@ public function testGetCmsPageTitleById(): void */ public function testGetCmsPageIdentifierById(): void { - $this->assertSame('home', $this->subject->getCmsPageIdentifierById(2)); + static::assertSame('home', self::$subject->getCmsPageIdentifierById(2)); } /** @@ -92,7 +91,7 @@ public function testGetCmsPageIdentifierById(): void */ public function testGetAvailableStatuses(): void { - $this->assertIsArray($this->subject->getAvailableStatuses()); + static::assertIsArray(self::$subject->getAvailableStatuses()); } /** @@ -102,7 +101,7 @@ public function testGetAvailableStatuses(): void */ public function testGetUsedInStoreConfigCollection(): void { - $this->subject->getUsedInStoreConfigCollection(); + self::$subject->getUsedInStoreConfigCollection(); } /** @@ -111,6 +110,6 @@ public function testGetUsedInStoreConfigCollection(): void */ public function testIsUsedInStoreConfig(): void { - $this->assertFalse($this->subject->isUsedInStoreConfig()); + static::assertFalse(self::$subject->isUsedInStoreConfig()); } } diff --git a/tests/unit/Mage/Cms/Model/Wysiwyg/ConfigTest.php b/tests/unit/Mage/Cms/Model/Wysiwyg/ConfigTest.php index a9dd5c2f8ae..12aa71ba61e 100644 --- a/tests/unit/Mage/Cms/Model/Wysiwyg/ConfigTest.php +++ b/tests/unit/Mage/Cms/Model/Wysiwyg/ConfigTest.php @@ -19,19 +19,19 @@ use Mage; use Mage_Cms_Model_Wysiwyg_Config as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; use Varien_Object; -class ConfigTest extends TestCase +class ConfigTest extends OpenMageTest { public const TEST_STRING = '0123456789'; - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::getModel('cms/wysiwyg_config'); + parent::setUpBeforeClass(); + self::$subject = Mage::getModel('cms/wysiwyg_config'); } /** @@ -42,7 +42,7 @@ public function setUp(): void */ public function testGetConfig(): void { - $this->assertInstanceOf(Varien_Object::class, $this->subject->getConfig()); + static::assertInstanceOf(Varien_Object::class, self::$subject->getConfig()); } /** @@ -51,7 +51,7 @@ public function testGetConfig(): void */ public function testGetSkinImagePlaceholderUrl(): void { - $this->assertIsString($this->subject->getSkinImagePlaceholderUrl()); + static::assertIsString(self::$subject->getSkinImagePlaceholderUrl()); } /** @@ -60,7 +60,7 @@ public function testGetSkinImagePlaceholderUrl(): void */ public function testGetSkinImagePlaceholderPath(): void { - $this->assertIsString($this->subject->getSkinImagePlaceholderPath()); + static::assertIsString(self::$subject->getSkinImagePlaceholderPath()); } /** @@ -69,7 +69,7 @@ public function testGetSkinImagePlaceholderPath(): void */ public function testIsEnabled(): void { - $this->assertIsBool($this->subject->isEnabled()); + static::assertIsBool(self::$subject->isEnabled()); } /** @@ -78,6 +78,6 @@ public function testIsEnabled(): void */ public function testIsHidden(): void { - $this->assertIsBool($this->subject->isHidden()); + static::assertIsBool(self::$subject->isHidden()); } } diff --git a/tests/unit/Mage/Cms/Model/Wysiwyg/Images/StorageTest.php b/tests/unit/Mage/Cms/Model/Wysiwyg/Images/StorageTest.php index d665a4404ed..8641958544a 100644 --- a/tests/unit/Mage/Cms/Model/Wysiwyg/Images/StorageTest.php +++ b/tests/unit/Mage/Cms/Model/Wysiwyg/Images/StorageTest.php @@ -21,16 +21,16 @@ use Mage_Adminhtml_Model_Session; use Mage_Cms_Helper_Wysiwyg_Images; use Mage_Cms_Model_Wysiwyg_Images_Storage as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class StorageTest extends TestCase +class StorageTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::getModel('cms/wysiwyg_images_storage'); + parent::setUpBeforeClass(); + self::$subject = Mage::getModel('cms/wysiwyg_images_storage'); } /** @@ -39,7 +39,7 @@ public function setUp(): void */ public function testGetThumbsPath(): void { - $this->assertIsString($this->subject->getThumbsPath()); + static::assertIsString(self::$subject->getThumbsPath()); } /** @@ -50,7 +50,7 @@ public function testGetThumbsPath(): void */ public function testResizeOnTheFly(): void { - $this->assertFalse($this->subject->resizeOnTheFly('not-existing.jpeg')); + static::assertFalse(self::$subject->resizeOnTheFly('not-existing.jpeg')); } /** @@ -59,7 +59,7 @@ public function testResizeOnTheFly(): void */ public function testGetHelper(): void { - $this->assertInstanceOf(Mage_Cms_Helper_Wysiwyg_Images::class, $this->subject->getHelper()); + static::assertInstanceOf(Mage_Cms_Helper_Wysiwyg_Images::class, self::$subject->getHelper()); } /** @@ -70,7 +70,7 @@ public function testGetHelper(): void */ public function testGetSession(): void { - $this->assertInstanceOf(Mage_Adminhtml_Model_Session::class, $this->subject->getSession()); + static::assertInstanceOf(Mage_Adminhtml_Model_Session::class, self::$subject->getSession()); } /** @@ -79,7 +79,7 @@ public function testGetSession(): void */ public function testGetThumbnailRoot(): void { - $this->assertIsString($this->subject->getThumbnailRoot()); + static::assertIsString(self::$subject->getThumbnailRoot()); } /** @@ -88,6 +88,6 @@ public function testGetThumbnailRoot(): void */ public function testIsImage(): void { - $this->assertIsBool($this->subject->isImage('test.jpeg')); + static::assertIsBool(self::$subject->isImage('test.jpeg')); } } diff --git a/tests/unit/Mage/Contacts/Controllers/IndexControllerTest.php b/tests/unit/Mage/Contacts/Controllers/IndexControllerTest.php new file mode 100644 index 00000000000..95be345694e --- /dev/null +++ b/tests/unit/Mage/Contacts/Controllers/IndexControllerTest.php @@ -0,0 +1,132 @@ +getMockBuilder(\Mage_Core_Controller_Request_Http::class) + ->disableOriginalConstructor() + ->onlyMethods(['getPost']) + ->getMock(); + $requestMock->method('getPost')->willReturn($postData); + + $subject = $this->getMockBuilder(Subject::class) + ->disableOriginalConstructor() + ->onlyMethods(['_validateFormKey', 'getRequest', '_redirect']) + ->getMock(); + $subject->method('getRequest')->willReturn($requestMock); + $subject->method('_validateFormKey')->willReturn($isFormKeyValid); + + $sessionMock = $this->getMockBuilder(Mage_Customer_Model_Session::class) + ->disableOriginalConstructor() + ->onlyMethods(['addError', 'addSuccess']) + ->getMock(); + + Mage::register('_singleton/customer/session', $sessionMock); + + if ($expectedErrorMessage) { + $sessionMock->expects(static::once()) + ->method('addError') + ->with($expectedErrorMessage); + } else { + $sessionMock->expects(static::once()) + ->method('addSuccess') + ->with('Your inquiry was submitted and will be responded to as soon as possible. Thank you for contacting us.'); + } + + $subject->expects(static::once())->method('_redirect')->with('*/*/'); + $subject->postAction(); + + Mage::unregister('_singleton/customer/session'); + } + + public function postActionDataProvider(): Generator + { + $validData = [ + 'name' => 'John Doe', + 'email' => 'john.doe@example.com', + 'comment' => 'Test comment', + ]; + + $error = 'Unable to submit your request. Please, try again later'; + + #yield 'valid data' => [ + # $validData, + # true, + # null, + #]; + + yield 'invalid form key' => [ + $validData, + false, + 'Invalid Form Key. Please submit your request again.', + ]; + + $data = $validData; + $data['name'] = ''; + yield 'missing name' => [ + $data, + true, + $error, + ]; + + $data = $validData; + $data['email'] = ''; + yield 'missing email' => [ + $data, + true, + $error, + ]; + + $data = $validData; + $data['email'] = 'invalid-email'; + yield 'invalid email' => [ + $data, + true, + $error, + ]; + + $data = $validData; + $data['comment'] = ''; + yield 'missing comment' => [ + $data, + true, + $error, + ]; + } +} diff --git a/tests/unit/Mage/Core/Block/Text/ListTest.php b/tests/unit/Mage/Core/Block/Text/ListTest.php index 34bdefb707a..ee7fd775ad2 100644 --- a/tests/unit/Mage/Core/Block/Text/ListTest.php +++ b/tests/unit/Mage/Core/Block/Text/ListTest.php @@ -18,15 +18,10 @@ namespace OpenMage\Tests\Unit\Mage\Core\Block\Text; use Mage; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class ListTest extends TestCase +class ListTest extends OpenMageTest { - public function setUp(): void - { - Mage::app(); - } - /** * @group Mage_Core * @group Mage_Core_Block @@ -43,7 +38,7 @@ public function testDuplicateBlockName(): void $childBlockA = $layout->createBlock('core/text', 'child_a')->setText('A2'); $parentBlock->append($childBlockA); - $this->assertSame('A2', $parentBlock->toHtml()); + static::assertSame('A2', $parentBlock->toHtml()); } /** @@ -70,7 +65,7 @@ public function testDuplicateBlockNameOrdering(): void $childBlockB = $layout->createBlock('core/text', 'child_b')->setText('B'); $parentBlock->insert($childBlockB, 'child_c', false); - $this->assertSame('ABC', $parentBlock->toHtml()); + static::assertSame('ABC', $parentBlock->toHtml()); } /** @@ -98,10 +93,10 @@ public function testUniqueBlockNameOrdering(): void $parentBlock->unsetChild('child_a'); $parentBlock->unsetChild('child_b'); - $this->assertSame('CD', $parentBlock->toHtml()); + static::assertSame('CD', $parentBlock->toHtml()); } - public function testSortInstructionsAfterReplaceChild() + public function testSortInstructionsAfterReplaceChild(): void { $layout = Mage::getModel('core/layout'); @@ -117,6 +112,6 @@ public function testSortInstructionsAfterReplaceChild() $layout->setBlock('target_block', $childBlockB); $parentBlock->setChild('child', $childBlockB); - $this->assertSame('B', $parentBlock->toHtml()); + static::assertSame('B', $parentBlock->toHtml()); } } diff --git a/tests/unit/Mage/Core/Helper/CookieTest.php b/tests/unit/Mage/Core/Helper/CookieTest.php index 76612ec3c3a..f3c481da883 100644 --- a/tests/unit/Mage/Core/Helper/CookieTest.php +++ b/tests/unit/Mage/Core/Helper/CookieTest.php @@ -19,16 +19,16 @@ use Mage; use Mage_Core_Helper_Cookie as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class CookieTest extends TestCase +class CookieTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('core/cookie'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('core/cookie'); } /** @@ -37,7 +37,7 @@ public function setUp(): void */ public function testIsUserNotAllowSaveCookie(): void { - $this->assertIsBool($this->subject->isUserNotAllowSaveCookie()); + static::assertIsBool(self::$subject->isUserNotAllowSaveCookie()); } /** @@ -46,7 +46,7 @@ public function testIsUserNotAllowSaveCookie(): void */ public function testGetAcceptedSaveCookiesWebsiteIds(): void { - $this->assertSame('{"1":1}', $this->subject->getAcceptedSaveCookiesWebsiteIds()); + static::assertSame('{"1":1}', self::$subject->getAcceptedSaveCookiesWebsiteIds()); } /** @@ -56,7 +56,7 @@ public function testGetAcceptedSaveCookiesWebsiteIds(): void */ public function testGetCookieRestrictionLifetime(): void { - $this->assertSame(31536000, $this->subject->getCookieRestrictionLifetime()); + static::assertSame(31536000, self::$subject->getCookieRestrictionLifetime()); } /** @@ -66,6 +66,6 @@ public function testGetCookieRestrictionLifetime(): void */ public function testGetCookieRestrictionNoticeCmsBlockIdentifier(): void { - $this->assertSame('cookie_restriction_notice_block', $this->subject->getCookieRestrictionNoticeCmsBlockIdentifier()); + static::assertSame('cookie_restriction_notice_block', self::$subject->getCookieRestrictionNoticeCmsBlockIdentifier()); } } diff --git a/tests/unit/Mage/Core/Helper/DataTest.php b/tests/unit/Mage/Core/Helper/DataTest.php index c316cb22f56..2f23c1623aa 100644 --- a/tests/unit/Mage/Core/Helper/DataTest.php +++ b/tests/unit/Mage/Core/Helper/DataTest.php @@ -17,24 +17,26 @@ namespace OpenMage\Tests\Unit\Mage\Core\Helper; -use Generator; use Mage; use Mage_Core_Helper_Data as Subject; use Mage_Core_Model_Encryption; use Mage_Core_Model_Locale; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; +use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Core\Helper\DataTrait; use Varien_Crypt_Mcrypt; -class DataTest extends TestCase +class DataTest extends OpenMageTest { + use DataTrait; + public const TEST_STRING = '1234567890'; - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('core/data'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('core/data'); } /** @@ -43,7 +45,7 @@ public function setUp(): void */ public function testGetEncryptor(): void { - $this->assertInstanceOf(Mage_Core_Model_Encryption::class, $this->subject->getEncryptor()); + static::assertInstanceOf(Mage_Core_Model_Encryption::class, self::$subject->getEncryptor()); } /** @@ -52,7 +54,7 @@ public function testGetEncryptor(): void */ public function testEncrypt(): void { - $this->assertIsString($this->subject->encrypt('test')); + static::assertIsString(self::$subject->encrypt('test')); } /** @@ -61,7 +63,7 @@ public function testEncrypt(): void */ public function testDecrypt(): void { - $this->assertIsString($this->subject->decrypt('test')); + static::assertIsString(self::$subject->decrypt('test')); } /** @@ -70,7 +72,7 @@ public function testDecrypt(): void */ public function testValidateKey(): void { - $this->assertInstanceOf(Varien_Crypt_Mcrypt::class, $this->subject->validateKey('test')); + static::assertInstanceOf(Varien_Crypt_Mcrypt::class, self::$subject->validateKey('test')); } /** @@ -81,61 +83,12 @@ public function testValidateKey(): void */ public function testFormatTimezoneDate( string $expectedResult, - $data, + string|int|null $data, string $format = Mage_Core_Model_Locale::FORMAT_TYPE_SHORT, bool $showTime = false, bool $useTimezone = false # disable timezone by default for tests ): void { - $this->assertSame($expectedResult, $this->subject->formatTimezoneDate($data, $format, $showTime, $useTimezone)); - } - - public function provideFormatTimezoneDate(): Generator - { - $date = date_create()->getTimestamp(); - $dateShort = date('n/j/Y', $date); - $dateLong = date('F j, Y', $date); - $dateShortTime = date('n/j/Y g:i A', $date); - - yield 'null' => [ - $dateShort, - null, - ]; - yield 'empty date' => [ - $dateShort, - '', - ]; - yield 'string date' => [ - $dateShort, - 'now', - ]; - yield 'numeric date' => [ - $dateShort, - '0', - ]; - yield 'invalid date' => [ - '', - 'invalid', - ]; - yield 'invalid format' => [ - (string) $date, - $date, - 'invalid', - ]; - yield 'date short' => [ - $dateShort, - $date, - ]; - yield 'date long' => [ - $dateLong, - $date, - 'long', - ]; - // yield 'date short w/ time' => [ - // $dateShortTime, - // $date, - // 'short', - // true, - // ]; + static::assertSame($expectedResult, self::$subject->formatTimezoneDate($data, $format, $showTime, $useTimezone)); } /** @@ -144,7 +97,7 @@ public function provideFormatTimezoneDate(): Generator */ public function testGetRandomString(): void { - $this->assertIsString($this->subject->getRandomString(5)); + static::assertIsString(self::$subject->getRandomString(5)); } /** @@ -153,7 +106,7 @@ public function testGetRandomString(): void */ public function testGetHash(): void { - $this->assertIsString($this->subject->getHash('test')); + static::assertIsString(self::$subject->getHash('test')); } /** @@ -162,7 +115,7 @@ public function testGetHash(): void */ public function testGetHashPassword(): void { - $this->assertIsString($this->subject->getHashPassword('test', 1)); + static::assertIsString(self::$subject->getHashPassword('test', 1)); } /** @@ -171,7 +124,7 @@ public function testGetHashPassword(): void */ public function testValidateHash(): void { - $this->assertIsBool($this->subject->validateHash('test', '1')); + static::assertIsBool(self::$subject->validateHash('test', '1')); } /** @@ -180,7 +133,7 @@ public function testValidateHash(): void */ public function testGetStoreId(): void { - $this->assertIsInt($this->subject->getStoreId()); + static::assertIsInt(self::$subject->getStoreId()); } /** @@ -191,23 +144,7 @@ public function testGetStoreId(): void */ public function testRemoveAccents(string $expectedResult, string $string, bool $german): void { - $this->assertSame($expectedResult, $this->subject->removeAccents($string, $german)); - } - - public function provideRemoveAccents(): Generator - { - $string = 'Ae-Ä Oe-Ö Ue-Ü ae-ä oe-ö ue-ü'; - - yield 'german false' => [ - 'Ae-A Oe-O Ue-U ae-a oe-o ue-u', - $string, - false, - ]; - yield 'german true' => [ - 'Ae-Ae Oe-Oe Ue-Ue ae-ae oe-oe ue-ue', - $string, - true, - ]; + static::assertSame($expectedResult, self::$subject->removeAccents($string, $german)); } /** @@ -217,8 +154,8 @@ public function provideRemoveAccents(): Generator */ public function testIsDevAllowed(): void { - $this->assertIsBool($this->subject->isDevAllowed()); - $this->markTestIncomplete('add tests for IPS'); + static::assertIsBool(self::$subject->isDevAllowed()); + static::markTestIncomplete('add tests for IPS'); } /** @@ -239,7 +176,7 @@ public function testGetCacheTypes(): void 'config_api2' => 'Web Services Configuration', ]; - $this->assertSame($expectedResult, $this->subject->getCacheTypes()); + static::assertSame($expectedResult, self::$subject->getCacheTypes()); } /** * @covers Mage_Core_Helper_Data::getCacheBetaTypes() @@ -250,7 +187,7 @@ public function testGetCacheTypes(): void public function testGetCacheBetaTypes(): void { $expectedResult = []; - $this->assertSame($expectedResult, $this->subject->getCacheBetaTypes()); + static::assertSame($expectedResult, self::$subject->getCacheBetaTypes()); } /** @@ -261,7 +198,7 @@ public function testGetCacheBetaTypes(): void public function testUniqHash(): void { $prefix = 'string'; - $this->assertStringStartsWith($prefix, $this->subject->uniqHash($prefix)); + static::assertStringStartsWith($prefix, self::$subject->uniqHash($prefix)); } /** @@ -271,7 +208,7 @@ public function testUniqHash(): void */ public function testGetDefaultCountry(): void { - $this->assertSame('US', $this->subject->getDefaultCountry()); + static::assertSame('US', self::$subject->getDefaultCountry()); } /** @@ -300,7 +237,7 @@ public function testGetProtectedFileExtensions(): void 'phtml' => 'phtml', 'shtml' => 'shtml', ]; - $this->assertSame($expectedResult, $this->subject->getProtectedFileExtensions()); + static::assertSame($expectedResult, self::$subject->getProtectedFileExtensions()); } /** @@ -321,7 +258,7 @@ public function testGetPublicFilesValidPath(): void 'skin' => '/skin/*/*', ], ]; - $this->assertSame($expectedResult, $this->subject->getPublicFilesValidPath()); + static::assertSame($expectedResult, self::$subject->getPublicFilesValidPath()); } /** @@ -331,7 +268,7 @@ public function testGetPublicFilesValidPath(): void */ public function testUseDbCompatibleMode(): void { - $this->assertTrue($this->subject->useDbCompatibleMode()); + static::assertTrue(self::$subject->useDbCompatibleMode()); } /** @@ -341,7 +278,7 @@ public function testUseDbCompatibleMode(): void */ public function testGetMerchantCountryCode(): void { - $this->assertIsString($this->subject->getMerchantCountryCode()); + static::assertIsString(self::$subject->getMerchantCountryCode()); } /** @@ -351,7 +288,7 @@ public function testGetMerchantCountryCode(): void */ public function testGetMerchantVatNumber(): void { - $this->assertIsString($this->subject->getMerchantVatNumber()); + static::assertIsString(self::$subject->getMerchantVatNumber()); } /** @@ -361,8 +298,8 @@ public function testGetMerchantVatNumber(): void */ public function testIsCountryInEU(): void { - $this->assertTrue($this->subject->isCountryInEU('DE')); - $this->assertFalse($this->subject->isCountryInEU('XX')); - $this->markTestIncomplete('add better tests'); + static::assertTrue(self::$subject->isCountryInEU('DE')); + static::assertFalse(self::$subject->isCountryInEU('XX')); + static::markTestIncomplete('add better tests'); } } diff --git a/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php b/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php index cfb4c1b4ac3..ed6af0c0e49 100644 --- a/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php +++ b/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php @@ -21,10 +21,10 @@ use Mage; use Mage_Core_Exception; use Mage_Core_Helper_EnvironmentConfigLoader; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; use Varien_Simplexml_Config; -class EnvironmentConfigLoaderTest extends TestCase +class EnvironmentConfigLoaderTest extends OpenMageTest { public const XML_PATH_GENERAL = 'general/store_information/name'; @@ -50,7 +50,7 @@ public function testBuildPath(): void { $environmentConfigLoaderHelper = new EnvironmentConfigLoaderTestHelper(); $path = $environmentConfigLoaderHelper->exposedBuildPath('GENERAL', 'STORE_INFORMATION', 'NAME'); - $this->assertSame(self::XML_PATH_GENERAL, $path); + static::assertSame(self::XML_PATH_GENERAL, $path); } /** @@ -61,7 +61,7 @@ public function testBuildNodePath(): void { $environmentConfigLoaderHelper = new EnvironmentConfigLoaderTestHelper(); $nodePath = $environmentConfigLoaderHelper->exposedBuildNodePath('DEFAULT', self::XML_PATH_GENERAL); - $this->assertSame(self::XML_PATH_DEFAULT, $nodePath); + static::assertSame(self::XML_PATH_DEFAULT, $nodePath); } /** @@ -73,9 +73,9 @@ public function testXmlHasTestStrings(): void $xmlStruct = $this->getTestXml(); $xml = new Varien_Simplexml_Config(); $xml->loadString($xmlStruct); - $this->assertSame('test_default', (string) $xml->getNode(self::XML_PATH_DEFAULT)); - $this->assertSame('test_website', (string) $xml->getNode(self::XML_PATH_WEBSITE)); - $this->assertSame('test_store', (string) $xml->getNode(self::XML_PATH_STORE)); + static::assertSame('test_default', (string) $xml->getNode(self::XML_PATH_DEFAULT)); + static::assertSame('test_website', (string) $xml->getNode(self::XML_PATH_WEBSITE)); + static::assertSame('test_store', (string) $xml->getNode(self::XML_PATH_STORE)); } /** @@ -106,7 +106,7 @@ public function testEnvOverridesForValidConfigKeys(array $config): void $valueAfterOverride = $xml->getNode($configPath); // assert - $this->assertNotSame((string) $defaultValue, (string) $valueAfterOverride, 'Default value was not overridden.'); + static::assertNotSame((string) $defaultValue, (string) $valueAfterOverride, 'Default value was not overridden.'); } public function envOverridesCorrectConfigKeysDataProvider(): Generator @@ -195,11 +195,11 @@ public function testEnvDoesNotOverrideForInvalidConfigKeys(array $config): void $xml->loadString($xmlStruct); $defaultValue = 'test_default'; - $this->assertSame($defaultValue, (string) $xml->getNode(self::XML_PATH_DEFAULT)); + static::assertSame($defaultValue, (string) $xml->getNode(self::XML_PATH_DEFAULT)); $defaultWebsiteValue = 'test_website'; - $this->assertSame($defaultWebsiteValue, (string) $xml->getNode(self::XML_PATH_WEBSITE)); + static::assertSame($defaultWebsiteValue, (string) $xml->getNode(self::XML_PATH_WEBSITE)); $defaultStoreValue = 'test_store'; - $this->assertSame($defaultStoreValue, (string) $xml->getNode(self::XML_PATH_STORE)); + static::assertSame($defaultStoreValue, (string) $xml->getNode(self::XML_PATH_STORE)); // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation $loader = new Mage_Core_Helper_EnvironmentConfigLoader(); @@ -222,7 +222,7 @@ public function testEnvDoesNotOverrideForInvalidConfigKeys(array $config): void } // assert - $this->assertStringNotContainsString((string) $valueAfterCheck, 'value_will_not_be_changed', 'Default value was wrongfully overridden.'); + static::assertStringNotContainsString((string) $valueAfterCheck, 'value_will_not_be_changed', 'Default value was wrongfully overridden.'); } public function envDoesNotOverrideOnWrongConfigKeysDataProvider(): Generator diff --git a/tests/unit/Mage/Core/Helper/HintTest.php b/tests/unit/Mage/Core/Helper/HintTest.php index 0113107aac4..d53b0804cca 100644 --- a/tests/unit/Mage/Core/Helper/HintTest.php +++ b/tests/unit/Mage/Core/Helper/HintTest.php @@ -19,16 +19,16 @@ use Mage; use Mage_Core_Helper_Hint as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class HintTest extends TestCase +class HintTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('core/hint'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('core/hint'); } /** @@ -38,7 +38,7 @@ public function setUp(): void */ public function testGetAvailableHints(): void { - $this->assertSame([], $this->subject->getAvailableHints()); + static::assertSame([], self::$subject->getAvailableHints()); } /** @@ -48,6 +48,6 @@ public function testGetAvailableHints(): void */ public function testGetHintByCode(): void { - $this->assertNull($this->subject->getHintByCode('test')); + static::assertNull(self::$subject->getHintByCode('test')); } } diff --git a/tests/unit/Mage/Core/Helper/JsTest.php b/tests/unit/Mage/Core/Helper/JsTest.php index 843eb1cbbcd..354f379a1a2 100644 --- a/tests/unit/Mage/Core/Helper/JsTest.php +++ b/tests/unit/Mage/Core/Helper/JsTest.php @@ -19,18 +19,18 @@ use Mage; use Mage_Core_Helper_Js as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class JsTest extends TestCase +class JsTest extends OpenMageTest { public const TEST_URL = 'foo'; - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('core/js'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('core/js'); } /** @@ -40,7 +40,7 @@ public function setUp(): void */ public function testGetTranslateJson(): void { - $this->assertIsString($this->subject->getTranslateJson()); + static::assertIsString(self::$subject->getTranslateJson()); } /** @@ -50,7 +50,7 @@ public function testGetTranslateJson(): void */ public function testGetTranslatorScript(): void { - $this->assertIsString($this->subject->getTranslatorScript()); + static::assertIsString(self::$subject->getTranslatorScript()); } /** @@ -59,7 +59,7 @@ public function testGetTranslatorScript(): void */ public function testIncludeScript(): void { - $this->assertStringContainsString(self::TEST_URL, $this->subject->includeScript(self::TEST_URL)); + static::assertStringContainsString(self::TEST_URL, self::$subject->includeScript(self::TEST_URL)); } /** @@ -68,7 +68,7 @@ public function testIncludeScript(): void */ public function testIncludeSkinScript(): void { - $this->assertStringContainsString(self::TEST_URL, $this->subject->includeSkinScript(self::TEST_URL)); + static::assertStringContainsString(self::TEST_URL, self::$subject->includeSkinScript(self::TEST_URL)); } /** @@ -77,8 +77,8 @@ public function testIncludeSkinScript(): void */ public function testGetDeleteConfirmJs(): void { - $this->assertStringStartsWith('deleteConfirm', $this->subject->getDeleteConfirmJs('foo')); - $this->assertStringStartsWith('deleteConfirm', $this->subject->getDeleteConfirmJs('foo', 'bar')); + static::assertStringStartsWith('deleteConfirm', self::$subject->getDeleteConfirmJs('foo')); + static::assertStringStartsWith('deleteConfirm', self::$subject->getDeleteConfirmJs('foo', 'bar')); } /** @@ -87,8 +87,8 @@ public function testGetDeleteConfirmJs(): void */ public function testGetConfirmSetLocationJs(): void { - $this->assertStringStartsWith('confirmSetLocation', $this->subject->getConfirmSetLocationJs('foo')); - $this->assertStringStartsWith('confirmSetLocation', $this->subject->getConfirmSetLocationJs('foo', 'bar')); + static::assertStringStartsWith('confirmSetLocation', self::$subject->getConfirmSetLocationJs('foo')); + static::assertStringStartsWith('confirmSetLocation', self::$subject->getConfirmSetLocationJs('foo', 'bar')); } /** @@ -97,9 +97,9 @@ public function testGetConfirmSetLocationJs(): void */ public function testGetSetLocationJs(): void { - $result = $this->subject->getSetLocationJs(self::TEST_URL); - $this->assertStringStartsWith('setLocation', $result); - $this->assertStringContainsString(self::TEST_URL, $result); + $result = self::$subject->getSetLocationJs(self::TEST_URL); + static::assertStringStartsWith('setLocation', $result); + static::assertStringContainsString(self::TEST_URL, $result); } /** @@ -109,8 +109,8 @@ public function testGetSetLocationJs(): void */ public function testGetSaveAndContinueEditJs(): void { - $result = $this->subject->getSaveAndContinueEditJs(self::TEST_URL); - $this->assertStringStartsWith('saveAndContinueEdit', $result); - $this->assertStringContainsString(self::TEST_URL, $result); + $result = self::$subject->getSaveAndContinueEditJs(self::TEST_URL); + static::assertStringStartsWith('saveAndContinueEdit', $result); + static::assertStringContainsString(self::TEST_URL, $result); } } diff --git a/tests/unit/Mage/Core/Helper/PurifierTest.php b/tests/unit/Mage/Core/Helper/PurifierTest.php index 83e7127d529..ede404d3877 100644 --- a/tests/unit/Mage/Core/Helper/PurifierTest.php +++ b/tests/unit/Mage/Core/Helper/PurifierTest.php @@ -17,19 +17,21 @@ namespace OpenMage\Tests\Unit\Mage\Core\Helper; -use Generator; use Mage; use Mage_Core_Helper_Purifier as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; +use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Core\Helper\PurifierTrait; -class PurifierTest extends TestCase +class PurifierTest extends OpenMageTest { - public Subject $subject; + use PurifierTrait; - public function setUp(): void + private static Subject $subject; + + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('core/purifier'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('core/purifier'); } /** @@ -37,20 +39,8 @@ public function setUp(): void * @group Mage_Core * @group Mage_Core_Helper */ - public function testPurify($expectedResult, $content): void - { - $this->assertSame($expectedResult, $this->subject->purify($content)); - } - - public function providePurify(): Generator + public function testPurify(array|string $expectedResult, array|string $content): void { - yield 'array' => [ - [], - [], - ]; - yield 'string' => [ - '', - '', - ]; + static::assertSame($expectedResult, self::$subject->purify($content)); } } diff --git a/tests/unit/Mage/Core/Helper/SecurityTest.php b/tests/unit/Mage/Core/Helper/SecurityTest.php index 8e0771de454..adf0bc98640 100644 --- a/tests/unit/Mage/Core/Helper/SecurityTest.php +++ b/tests/unit/Mage/Core/Helper/SecurityTest.php @@ -24,18 +24,18 @@ use Mage_Core_Exception; use Mage_Core_Helper_Security as Subject; use Mage_Page_Block_Html_Topmenu_Renderer; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; use function sprintf; -class SecurityTest extends TestCase +class SecurityTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('core/security'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('core/security'); } /** @@ -72,7 +72,7 @@ public function testValidateAgainstBlockMethodBlacklist( string $method, array $args ): void { - $this->subject->validateAgainstBlockMethodBlacklist($block, $method, $args); + self::$subject->validateAgainstBlockMethodBlacklist($block, $method, $args); } public function forbiddenBlockMethodsDataProvider(): Generator @@ -130,6 +130,6 @@ public function testValidateAgainstBlockMethodBlacklistThrowsException( array $args ): void { $this->expectExceptionMessage(sprintf('Action with combination block %s and method %s is forbidden.', get_class($block), $method)); - $this->subject->validateAgainstBlockMethodBlacklist($block, $method, $args); + self::$subject->validateAgainstBlockMethodBlacklist($block, $method, $args); } } diff --git a/tests/unit/Mage/Core/Helper/StringTest.php b/tests/unit/Mage/Core/Helper/StringTest.php index 5d32349c83b..6facbdc865a 100644 --- a/tests/unit/Mage/Core/Helper/StringTest.php +++ b/tests/unit/Mage/Core/Helper/StringTest.php @@ -20,20 +20,20 @@ use Mage; use Mage_Core_Helper_Array; use Mage_Core_Helper_String as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class StringTest extends TestCase +class StringTest extends OpenMageTest { public const TEST_STRING = '1234567890'; public const TEST_STRING_JSON = '{"name":"John", "age":30, "car":null}'; - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('core/string'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('core/string'); } /** @@ -42,16 +42,16 @@ public function setUp(): void */ public function testTruncate(): void { - $this->assertSame('', $this->subject->truncate(null)); - $this->assertSame('', $this->subject->truncate(self::TEST_STRING, 0)); + static::assertSame('', self::$subject->truncate(null)); + static::assertSame('', self::$subject->truncate(self::TEST_STRING, 0)); - $this->assertSame('', $this->subject->truncate(self::TEST_STRING, 3)); + static::assertSame('', self::$subject->truncate(self::TEST_STRING, 3)); $remainder = ''; - $this->assertSame('12...', $this->subject->truncate(self::TEST_STRING, 5, '...', $remainder, false)); + static::assertSame('12...', self::$subject->truncate(self::TEST_STRING, 5, '...', $remainder, false)); - $resultString = $this->subject->truncate(self::TEST_STRING, 5, '...'); - $this->assertSame('12...', $resultString); + $resultString = self::$subject->truncate(self::TEST_STRING, 5, '...'); + static::assertSame('12...', $resultString); } /** @@ -60,8 +60,8 @@ public function testTruncate(): void */ public function testSubstr(): void { - $resultString = $this->subject->substr(self::TEST_STRING, 2, 2); - $this->assertSame('34', $resultString); + $resultString = self::$subject->substr(self::TEST_STRING, 2, 2); + static::assertSame('34', $resultString); } /** @@ -70,9 +70,9 @@ public function testSubstr(): void */ public function testSplitInjection(): void { - $resultString = $this->subject->splitInjection(self::TEST_STRING, 1, '-', ' '); + $resultString = self::$subject->splitInjection(self::TEST_STRING, 1, '-', ' '); #$this->assertSame('1-2-3-4-5-6-7-8-9-0-', $resultString); - $this->assertIsString($resultString); + static::assertIsString($resultString); } /** @@ -81,7 +81,7 @@ public function testSplitInjection(): void */ public function testStrlen(): void { - $this->assertSame(10, $this->subject->strlen(self::TEST_STRING)); + static::assertSame(10, self::$subject->strlen(self::TEST_STRING)); } /** @@ -90,10 +90,10 @@ public function testStrlen(): void */ public function testStrSplit(): void { - $this->assertIsArray($this->subject->str_split('')); - $this->assertIsArray($this->subject->str_split(self::TEST_STRING)); - $this->assertIsArray($this->subject->str_split(self::TEST_STRING, 3)); - $this->assertIsArray($this->subject->str_split(self::TEST_STRING, 3, true, true)); + static::assertIsArray(self::$subject->str_split('')); + static::assertIsArray(self::$subject->str_split(self::TEST_STRING)); + static::assertIsArray(self::$subject->str_split(self::TEST_STRING, 3)); + static::assertIsArray(self::$subject->str_split(self::TEST_STRING, 3, true, true)); } /** @@ -102,11 +102,11 @@ public function testStrSplit(): void */ public function testSplitWords(): void { - $this->assertIsArray($this->subject->splitWords(null)); - $this->assertIsArray($this->subject->splitWords('')); - $this->assertIsArray($this->subject->splitWords(self::TEST_STRING)); - $this->assertIsArray($this->subject->splitWords(self::TEST_STRING, true)); - $this->assertIsArray($this->subject->splitWords(self::TEST_STRING, true, 1)); + static::assertIsArray(self::$subject->splitWords(null)); + static::assertIsArray(self::$subject->splitWords('')); + static::assertIsArray(self::$subject->splitWords(self::TEST_STRING)); + static::assertIsArray(self::$subject->splitWords(self::TEST_STRING, true)); + static::assertIsArray(self::$subject->splitWords(self::TEST_STRING, true, 1)); } /** @@ -115,7 +115,7 @@ public function testSplitWords(): void */ public function testParseQueryStr(): void { - $this->assertIsArray($this->subject->parseQueryStr(self::TEST_STRING)); + static::assertIsArray(self::$subject->parseQueryStr(self::TEST_STRING)); } /** @@ -124,7 +124,7 @@ public function testParseQueryStr(): void */ public function testGetArrayHelper(): void { - $this->assertInstanceOf(Mage_Core_Helper_Array::class, $this->subject->getArrayHelper()); + static::assertInstanceOf(Mage_Core_Helper_Array::class, self::$subject->getArrayHelper()); } /** @@ -133,7 +133,7 @@ public function testGetArrayHelper(): void */ public function testUnserialize(): void { - $this->assertNull($this->subject->unserialize(null)); + static::assertNull(self::$subject->unserialize(null)); } /** @@ -142,7 +142,7 @@ public function testUnserialize(): void */ public function testValidateSerializedObject(): void { - $this->assertIsBool($this->subject->validateSerializedObject(self::TEST_STRING)); - $this->assertIsBool($this->subject->validateSerializedObject(self::TEST_STRING_JSON)); + static::assertIsBool(self::$subject->validateSerializedObject(self::TEST_STRING)); + static::assertIsBool(self::$subject->validateSerializedObject(self::TEST_STRING_JSON)); } } diff --git a/tests/unit/Mage/Core/Helper/UnserializeArrayTest.php b/tests/unit/Mage/Core/Helper/UnserializeArrayTest.php index 41ea36f2a56..cbcb615531a 100644 --- a/tests/unit/Mage/Core/Helper/UnserializeArrayTest.php +++ b/tests/unit/Mage/Core/Helper/UnserializeArrayTest.php @@ -18,19 +18,21 @@ namespace OpenMage\Tests\Unit\Mage\Core\Helper; use Exception; -use Generator; use Mage; use Mage_Core_Helper_UnserializeArray as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; +use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Core\Helper\UnserializeArray as UnserializeArrayDataProvider; -class UnserializeArrayTest extends TestCase +class UnserializeArrayTest extends OpenMageTest { - public Subject $subject; + use UnserializeArrayDataProvider; - public function setUp(): void + private static Subject $subject; + + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('core/unserializeArray'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('core/unserializeArray'); } /** @@ -38,34 +40,12 @@ public function setUp(): void * @group Mage_Core * @group Mage_Core_Helper */ - public function testUnserialize($expectedTesult, $string): void + public function testUnserialize(array|string $expectedTesult, ?string $string): void { try { - $this->assertSame($expectedTesult, $this->subject->unserialize($string)); + static::assertSame($expectedTesult, self::$subject->unserialize($string)); } catch (Exception $exception) { - $this->assertSame($expectedTesult, $exception->getMessage()); + static::assertSame($expectedTesult, $exception->getMessage()); } } - - public function provideUnserialize(): Generator - { - $errorMessage = 'Error unserializing data.'; - - yield 'null' => [ - $errorMessage, - null, - ]; - yield 'empty string' => [ - $errorMessage, - '', - ]; - yield 'random string' => [ - $errorMessage, - 'abc', - ]; - yield 'valid' => [ - ['key' => 'value'], - 'a:1:{s:3:"key";s:5:"value";}', - ]; - } } diff --git a/tests/unit/Mage/Core/Helper/UrlTest.php b/tests/unit/Mage/Core/Helper/UrlTest.php index 311e852e381..bb5c5c8dc99 100644 --- a/tests/unit/Mage/Core/Helper/UrlTest.php +++ b/tests/unit/Mage/Core/Helper/UrlTest.php @@ -17,33 +17,22 @@ namespace OpenMage\Tests\Unit\Mage\Core\Helper; -use Generator; +use Exception; use Mage; use Mage_Core_Helper_Url as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; +use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Core\Helper\UrlTrait; -class UrlTest extends TestCase +class UrlTest extends OpenMageTest { - public const TEST_URL_BASE = 'https://example.com'; + use UrlTrait; - public const TEST_URL_PARAM = 'https://example.com?foo=bar'; + private static Subject $subject; - public const TEST_URL_PARAMS = 'https://example.com?foo=bar&BOO=baz'; - - public const TEST_URL_SID1 = 'https://example.com?SID=S&foo=bar&BOO=baz'; - - public const TEST_URL_SID2 = 'https://example.com?___SID=S&foo=bar&BOO=baz'; - - public const TEST_URL_SID_BOTH = 'https://example.com?___SID=S&SID=S&foo=bar&BOO=baz'; - - public const TEST_URL_PUNY = 'https://XN--example.com?foo=bar&BOO=baz'; - - public Subject $subject; - - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('core/url'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('core/url'); } /** @@ -53,7 +42,7 @@ public function setUp(): void */ public function testGetCurrentBase64Url(): void { - $this->assertIsString($this->subject->getCurrentBase64Url()); + static::assertIsString(self::$subject->getCurrentBase64Url()); } /** @@ -64,19 +53,7 @@ public function testGetCurrentBase64Url(): void */ public function testGetEncodedUrl(string $expectedResult, ?string $url): void { - $this->assertSame($expectedResult, $this->subject->getEncodedUrl($url)); - } - - public function provideGetEncodedUrl(): Generator - { - yield 'null' => [ - 'aHR0cDovLw,,', - null, - ]; - yield 'base url' => [ - 'aHR0cHM6Ly9leGFtcGxlLmNvbQ,,', - self::TEST_URL_BASE, - ]; + static::assertSame($expectedResult, self::$subject->getEncodedUrl($url)); } /** @@ -86,7 +63,7 @@ public function provideGetEncodedUrl(): Generator */ public function testGetHomeUrl(): void { - $this->assertIsString($this->subject->getHomeUrl()); + static::assertIsString(self::$subject->getHomeUrl()); } /** @@ -97,41 +74,7 @@ public function testGetHomeUrl(): void */ public function testAddRequestParam(string $expectedResult, string $url, array $param): void { - $this->assertSame($expectedResult, $this->subject->addRequestParam($url, $param)); - } - - public function provideAddRequestParam(): Generator - { - yield 'int key' => [ - self::TEST_URL_BASE . '?', - self::TEST_URL_BASE, - [0 => 'int'], - ]; - yield 'int value' => [ - self::TEST_URL_BASE . '?int=0', - self::TEST_URL_BASE, - ['int' => 0], - ]; - yield 'null' => [ - self::TEST_URL_BASE . '?null', - self::TEST_URL_BASE, - ['null' => null], - ]; - yield 'string' => [ - self::TEST_URL_PARAM, - self::TEST_URL_BASE, - ['foo' => 'bar'], - ]; - yield 'string extend' => [ - self::TEST_URL_PARAMS, - self::TEST_URL_PARAM, - ['BOO' => 'baz'], - ]; - yield 'array' => [ - self::TEST_URL_BASE . '?key[]=subValue', - self::TEST_URL_BASE, - ['key' => ['subKey' => 'subValue']], - ]; + static::assertSame($expectedResult, self::$subject->addRequestParam($url, $param)); } /** @@ -142,48 +85,7 @@ public function provideAddRequestParam(): Generator */ public function testRemoveRequestParam(string $expectedResult, string $url, string $paramKey, bool $caseSensitive = false): void { - $this->assertSame($expectedResult, $this->subject->removeRequestParam($url, $paramKey, $caseSensitive)); - } - - public function provideRemoveRequestParam(): Generator - { - yield 'remove #1' => [ - self::TEST_URL_BASE, - self::TEST_URL_PARAM, - 'foo', - ]; - yield 'remove #2' => [ - self::TEST_URL_PARAMS, - self::TEST_URL_PARAMS, - 'boo', - ]; - yield 'remove #1 case sensitive' => [ - self::TEST_URL_PARAM, - self::TEST_URL_PARAM, - 'FOO', - true, - ]; - yield 'remove #2 case sensitive' => [ - self::TEST_URL_PARAM, - self::TEST_URL_PARAMS, - 'BOO', - true, - ]; - yield 'not-exists' => [ - self::TEST_URL_PARAMS, - self::TEST_URL_PARAMS, - 'not-exists', - ]; - yield '___SID' => [ - self::TEST_URL_SID1, - self::TEST_URL_SID_BOTH, - '___SID', - ]; - yield 'SID' => [ - self::TEST_URL_SID2, - self::TEST_URL_SID_BOTH, - 'SID', - ]; + static::assertSame($expectedResult, self::$subject->removeRequestParam($url, $paramKey, $caseSensitive)); } /** @@ -193,20 +95,21 @@ public function provideRemoveRequestParam(): Generator */ public function testEncodePunycode(): void { - $this->assertSame(self::TEST_URL_BASE, $this->subject->encodePunycode(self::TEST_URL_BASE)); - $this->assertSame(self::TEST_URL_PUNY, $this->subject->encodePunycode(self::TEST_URL_PUNY)); - $this->markTestIncomplete('This test has to be checked.'); + static::assertSame(self::$testUrlBase, self::$subject->encodePunycode(self::$testUrlBase)); + static::assertSame(self::$testUrlPuny, self::$subject->encodePunycode(self::$testUrlPuny)); + static::markTestIncomplete('This test has to be checked.'); } /** * @covers Mage_Core_Helper_Url::decodePunycode() * @group Mage_Core * @group Mage_Core_Helper + * @throws Exception */ public function testDecodePunycode(): void { - $this->assertSame(self::TEST_URL_BASE, $this->subject->decodePunycode(self::TEST_URL_BASE)); - $this->assertSame('https://?foo=bar&BOO=baz', $this->subject->decodePunycode(self::TEST_URL_PUNY)); - $this->markTestIncomplete('This test has to be checked.'); + static::assertSame(self::$testUrlBase, self::$subject->decodePunycode(self::$testUrlBase)); + static::assertSame('https://?foo=bar&BOO=baz', self::$subject->decodePunycode(self::$testUrlPuny)); + static::markTestIncomplete('This test has to be checked.'); } } diff --git a/tests/unit/Mage/Core/Model/AppTest.php b/tests/unit/Mage/Core/Model/AppTest.php index c88ef46bbee..cc63f344a23 100644 --- a/tests/unit/Mage/Core/Model/AppTest.php +++ b/tests/unit/Mage/Core/Model/AppTest.php @@ -4,7 +4,6 @@ namespace OpenMage\Tests\Unit\Mage\Core\Model; -use Generator; use Mage; use Mage_Core_Exception; use Mage_Core_Model_App as Subject; @@ -13,17 +12,19 @@ use Mage_Core_Model_Store_Group; use Mage_Core_Model_Website; use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Core\CoreTrait; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Core\Model\AppTrait; +use OpenMage\Tests\Unit\OpenMageTest; -class AppTest extends TestCase +class AppTest extends OpenMageTest { + use AppTrait; use CoreTrait; - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - $this->subject = Mage::app(); + self::$subject = Mage::app(); } /** @@ -31,73 +32,46 @@ public function setUp(): void * @dataProvider provideGetStore * @group Mage_Core * @group Mage_Core_Model - * - * @param bool|int|Mage_Core_Model_Store|null|string $id */ - public function testGetStore($id): void + public function testGetStore(Mage_Core_Model_Store|int|string|bool|null $id): void { try { - $this->assertInstanceOf(Mage_Core_Model_Store::class, $this->subject->getStore($id)); + static::assertInstanceOf(Mage_Core_Model_Store::class, self::$subject->getStore($id)); } catch (Mage_Core_Model_Store_Exception $e) { - $this->assertNotEmpty($e->getMessage()); - $this->assertSame('Invalid store code requested.', $e->getMessage()); + static::assertNotEmpty($e->getMessage()); + static::assertSame('Invalid store code requested.', $e->getMessage()); } } - public function provideGetStore(): Generator - { - yield 'Mage_Core_Model_Store' => [ - new Mage_Core_Model_Store(), - ]; - } - /** * @dataProvider provideGetStoreConfig * @dataProvider provideGetWebsite * @group Mage_Core * @group Mage_Core_Model - * - * @param int|Mage_Core_Model_Website|null|string|true $id */ - public function testGetWebsite($id): void + public function testGetWebsite(Mage_Core_Model_Website|int|string|bool|null $id): void { try { - $this->assertInstanceOf(Mage_Core_Model_Website::class, $this->subject->getWebsite($id)); - } catch (Mage_Core_Exception $e) { - $this->assertNotEmpty($e->getMessage()); - $this->assertSame('Invalid website id requested.', $e->getMessage()); + static::assertInstanceOf(Mage_Core_Model_Website::class, self::$subject->getWebsite($id)); + } catch (Mage_Core_Exception $exception) { + static::assertNotEmpty($exception->getMessage()); + static::assertSame('Invalid website id requested.', $exception->getMessage()); } } - public function provideGetWebsite(): Generator - { - yield 'Mage_Core_Model_Website' => [ - new Mage_Core_Model_Website(), - ]; - } - /** * @dataProvider provideGetStoreConfig * @dataProvider provideGetGroup * @group Mage_Core * @group Mage_Core_Model - * - * @param int|Mage_Core_Model_Store_Group|null|string $id */ - public function testGetGroup($id): void + public function testGetGroup(Mage_Core_Model_Store_Group|int|string|bool|null $id): void { try { - $this->assertInstanceOf(Mage_Core_Model_Store_Group::class, $this->subject->getGroup($id)); + static::assertInstanceOf(Mage_Core_Model_Store_Group::class, self::$subject->getGroup($id)); } catch (Mage_Core_Exception $e) { - $this->assertNotEmpty($e->getMessage()); - $this->assertSame('Invalid store group id requested.', $e->getMessage()); + static::assertNotEmpty($e->getMessage()); + static::assertSame('Invalid store group id requested.', $e->getMessage()); } } - - public function provideGetGroup(): Generator - { - yield 'Mage_Core_Model_Store_Group' => [ - new Mage_Core_Model_Store_Group(), - ]; - } } diff --git a/tests/unit/Mage/Core/Model/ConfigTest.php b/tests/unit/Mage/Core/Model/ConfigTest.php index 28e24abdeb5..44033ca6866 100644 --- a/tests/unit/Mage/Core/Model/ConfigTest.php +++ b/tests/unit/Mage/Core/Model/ConfigTest.php @@ -19,16 +19,16 @@ use Mage; use Mage_Core_Model_Config as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class ConfigTest extends TestCase +class ConfigTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::getModel('core/config'); + parent::setUpBeforeClass(); + self::$subject = Mage::getModel('core/config'); } /** @@ -40,12 +40,12 @@ public function testSaveDeleteGetConfig(): void $path = 'test/config'; $value = 'foo'; - $this->assertFalse($this->subject->getConfig($path)); + static::assertFalse(self::$subject->getConfig($path)); - $this->subject->saveConfig($path, $value); - $this->assertSame($value, $this->subject->getConfig($path)); + self::$subject->saveConfig($path, $value); + static::assertSame($value, self::$subject->getConfig($path)); - $this->subject->deleteConfig($path); - $this->assertFalse($this->subject->getConfig($path)); + self::$subject->deleteConfig($path); + static::assertFalse(self::$subject->getConfig($path)); } } diff --git a/tests/unit/Mage/Core/Model/Email/Template/AbstractTest.php b/tests/unit/Mage/Core/Model/Email/Template/AbstractTest.php new file mode 100644 index 00000000000..6d9a94044cb --- /dev/null +++ b/tests/unit/Mage/Core/Model/Email/Template/AbstractTest.php @@ -0,0 +1,53 @@ +getMockForAbstractClass(Subject::class); + } + + /** + * @dataProvider provideValidateFileExension + * @group Mage_Core + * @group Mage_Core_Model + */ + public function testValidateFileExension(bool $expectedResult, string $filePath, string $extension, bool $fileExists): void + { + if ($fileExists) { + static::assertFileExists($filePath); + } else { + static::assertFileDoesNotExist($filePath); + } + + static::markTestSkipped('wait...'); + /** @phpstan-ignore deadCode.unreachable */ + static::assertSame($expectedResult, self::$subject->validateFileExension($filePath, $extension)); + } +} diff --git a/tests/unit/Mage/Core/Model/LayoutTest.php b/tests/unit/Mage/Core/Model/LayoutTest.php index 0384ca5f2ac..3ab1a40056e 100644 --- a/tests/unit/Mage/Core/Model/LayoutTest.php +++ b/tests/unit/Mage/Core/Model/LayoutTest.php @@ -20,73 +20,62 @@ use Error; use Generator; use Mage; -use Mage_Core_Model_Layout; +use Mage_Core_Block_Abstract; +use Mage_Core_Model_Layout as Subject; +use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Core\Model\LayoutTrait; use OpenMage\Tests\Unit\Traits\PhpStormMetaData\BlocksTrait; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class LayoutTest extends TestCase +class LayoutTest extends OpenMageTest { use BlocksTrait; + use LayoutTrait; - public Mage_Core_Model_Layout $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::getModel('core/layout'); + parent::setUpBeforeClass(); + self::$subject = Mage::getModel('core/layout'); } /** * @dataProvider provideCreateBlock * @group Mage_Core * @group Mage_Core_Model + * + * @param bool|class-string $expectedResult */ - public function testCreateBlock($expectedResult, bool $willReturnBlock, string $type, ?string $name, array $attributes): void + public function testCreateBlock(bool|string $expectedResult, bool $willReturnBlock, string $type, ?string $name, array $attributes): void { - $result = $this->subject->createBlock($type, $name, $attributes); + $result = self::$subject->createBlock($type, $name, $attributes); - if ($willReturnBlock) { - $this->assertInstanceOf($expectedResult, $result); + if ($willReturnBlock && is_string($expectedResult)) { + static::assertInstanceOf($expectedResult, $result); } else { - $this->assertFalse($result); + static::assertFalse($result); } } - public function provideCreateBlock(): Generator - { - yield 'instance of Mage_Core_Block_Abstract' => [ - \Mage_Cms_Block_Block::class, - true, - 'cms/block', - null, - [], - ]; - yield 'not instance of Mage_Core_Block_Abstract' => [ - false, - false, - 'rule/conditions', - null, - [], - ]; - } - /** * @covers Mage_Core_Model_Layout::getBlockSingleton() * @dataProvider provideGetBlockSingleton * @group Mage_Core * @group Mage_Core_Model * @group pr4411 + * + * @param class-string $expectedResult */ - public function testGetBlockSingleton($expectedResult, bool $isAbstractBlock, string $type): void + public function testGetBlockSingleton(string $expectedResult, bool $isAbstractBlock, string $type): void { - $result = $this->subject->getBlockSingleton($type); + $result = self::$subject->getBlockSingleton($type); - $this->assertInstanceOf($expectedResult, $result); + static::assertInstanceOf($expectedResult, $result); if ($isAbstractBlock) { - $this->assertInstanceOf(\Mage_Core_Block_Abstract::class, $result); + static::assertInstanceOf(Mage_Core_Block_Abstract::class, $result); } else { - $this->assertNotInstanceOf(\Mage_Core_Block_Abstract::class, $result); + static::assertNotInstanceOf(Mage_Core_Block_Abstract::class, $result); } } @@ -132,6 +121,6 @@ public function testGetBlockSingletonError(): void $this->expectExceptionMessage("Class 'Mage_Invalid_Block_Type' not found"); } - $this->subject->getBlockSingleton('invalid/type'); + self::$subject->getBlockSingleton('invalid/type'); } } diff --git a/tests/unit/Mage/Core/Model/LocaleTest.php b/tests/unit/Mage/Core/Model/LocaleTest.php index 32f41b52a46..c219017d566 100644 --- a/tests/unit/Mage/Core/Model/LocaleTest.php +++ b/tests/unit/Mage/Core/Model/LocaleTest.php @@ -20,18 +20,18 @@ use Mage; use Mage_Core_Model_Locale as Subject; use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Catalog\Model\LocaleTrait; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class LocaleTest extends TestCase +class LocaleTest extends OpenMageTest { use LocaleTrait; - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::getModel('core/locale'); + parent::setUpBeforeClass(); + self::$subject = Mage::getModel('core/locale'); } /** @@ -42,6 +42,6 @@ public function setUp(): void */ public function testGetNumber(?float $expectedResult, $value): void { - $this->assertSame($expectedResult, $this->subject->getNumber($value)); + static::assertSame($expectedResult, self::$subject->getNumber($value)); } } diff --git a/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php b/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php index f3c4d7162ef..659f80d760c 100644 --- a/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php +++ b/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php @@ -17,15 +17,15 @@ namespace OpenMage\Tests\Unit\Mage\Core\Model\Security; -use Generator; use Mage_Core_Model_Security_HtmlEscapedString as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; +use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Core\Model\SecurityTrait; -class HtmlEscapedStringTest extends TestCase +class HtmlEscapedStringTest extends OpenMageTest { - public const TEST_STRING = 'This is a bold string'; + use SecurityTrait; - public Subject $subject; + private static Subject $subject; /** * @dataProvider provideHtmlEscapedStringAsStringData @@ -35,8 +35,8 @@ class HtmlEscapedStringTest extends TestCase */ public function testToSting(string $expectedResult, string $string, ?array $allowedTags): void { - $this->subject = new Subject($string, $allowedTags); - $this->assertSame($expectedResult, $this->subject->__toString()); + self::$subject = new Subject($string, $allowedTags); + static::assertSame($expectedResult, self::$subject->__toString()); } /** @@ -47,35 +47,7 @@ public function testToSting(string $expectedResult, string $string, ?array $allo */ public function testGetUnescapedValue(string $expectedResult, string $string, ?array $allowedTags): void { - $this->subject = new Subject($string, $allowedTags); - $this->assertSame($expectedResult, $this->subject->getUnescapedValue()); - } - - public function provideHtmlEscapedStringAsStringData(): Generator - { - yield 'tags null' => [ - 'This is a bold <b>string</b>', - self::TEST_STRING, - null, - ]; - yield 'tags array' => [ - self::TEST_STRING, - self::TEST_STRING, - ['b'], - ]; - } - - public function provideHtmlEscapedStringGetUnescapedValueData(): Generator - { - yield 'tags null' => [ - self::TEST_STRING, - self::TEST_STRING, - null, - ]; - yield 'tags array' => [ - self::TEST_STRING, - self::TEST_STRING, - ['some-invalid-value'], - ]; + self::$subject = new Subject($string, $allowedTags); + static::assertSame($expectedResult, self::$subject->getUnescapedValue()); } } diff --git a/tests/unit/Mage/Core/Model/StoreTest.php b/tests/unit/Mage/Core/Model/StoreTest.php index fdbbc00f77a..2fee6f714d4 100644 --- a/tests/unit/Mage/Core/Model/StoreTest.php +++ b/tests/unit/Mage/Core/Model/StoreTest.php @@ -20,18 +20,17 @@ use Mage; use Mage_Core_Model_Store as Subject; use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Core\CoreTrait; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class StoreTest extends TestCase +class StoreTest extends OpenMageTest { use CoreTrait; - public Subject $subject; + private static Subject $subject; public function setUp(): void { - Mage::app(); - $this->subject = Mage::getModel('core/store'); + self::$subject = Mage::getModel('core/store'); } /** @@ -44,8 +43,8 @@ public function setUp(): void public function testGetId(?int $expectedResult, $withStore): void { if ($withStore) { - $this->subject->setData('store_id', $withStore); + self::$subject->setData('store_id', $withStore); } - $this->assertSame($expectedResult, $this->subject->getId()); + static::assertSame($expectedResult, self::$subject->getId()); } } diff --git a/tests/unit/Mage/Core/Model/UrlTest.php b/tests/unit/Mage/Core/Model/UrlTest.php index e7ef38908fe..8756502a2ac 100644 --- a/tests/unit/Mage/Core/Model/UrlTest.php +++ b/tests/unit/Mage/Core/Model/UrlTest.php @@ -19,16 +19,16 @@ use Mage; use Mage_Core_Model_Url as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class UrlTest extends TestCase +class UrlTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::getModel('core/url'); + parent::setUpBeforeClass(); + self::$subject = Mage::getModel('core/url'); } /** @@ -37,7 +37,7 @@ public function setUp(): void */ public function testEscape(): void { - $this->assertSame('%22%27%3E%3C', $this->subject->escape('"\'><')); + static::assertSame('%22%27%3E%3C', self::$subject->escape('"\'><')); } /** @@ -46,6 +46,6 @@ public function testEscape(): void */ public function testGetSecure(): void { - $this->assertIsBool($this->subject->getSecure()); + static::assertIsBool(self::$subject->getSecure()); } } diff --git a/tests/unit/Mage/Core/Model/VariableTest.php b/tests/unit/Mage/Core/Model/VariableTest.php index 9199a9adca0..5c5d4f52c0c 100644 --- a/tests/unit/Mage/Core/Model/VariableTest.php +++ b/tests/unit/Mage/Core/Model/VariableTest.php @@ -19,16 +19,16 @@ use Mage; use Mage_Core_Model_Variable as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class VariableTest extends TestCase +class VariableTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::getModel('core/variable'); + parent::setUpBeforeClass(); + self::$subject = Mage::getModel('core/variable'); } /** @@ -37,6 +37,6 @@ public function setUp(): void */ public function testGetVariablesOptionArray(): void { - $this->assertIsArray($this->subject->getVariablesOptionArray()); + static::assertIsArray(self::$subject->getVariablesOptionArray()); } } diff --git a/tests/unit/Mage/Core/Model/WebsiteTest.php b/tests/unit/Mage/Core/Model/WebsiteTest.php index 569a7ee67a2..a5029b13e4b 100644 --- a/tests/unit/Mage/Core/Model/WebsiteTest.php +++ b/tests/unit/Mage/Core/Model/WebsiteTest.php @@ -22,17 +22,17 @@ use Mage_Core_Model_Resource_Store_Group_Collection; use Mage_Core_Model_Website as Subject; use Mage_Directory_Model_Currency; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; use Varien_Db_Select; -class WebsiteTest extends TestCase +class WebsiteTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::getModel('core/website'); + parent::setUpBeforeClass(); + self::$subject = Mage::getModel('core/website'); } /** @@ -41,8 +41,8 @@ public function setUp(): void */ public function testLoad(): void { - $this->assertInstanceOf(Subject::class, $this->subject->load(1)); - $this->assertInstanceOf(Subject::class, $this->subject->load('default')); + static::assertInstanceOf(Subject::class, self::$subject->load(1)); + static::assertInstanceOf(Subject::class, self::$subject->load('default')); } /** @@ -51,8 +51,8 @@ public function testLoad(): void */ public function testLoadConfig(): void { - $this->assertInstanceOf(Subject::class, $this->subject->loadConfig('1')); - $this->assertInstanceOf(Subject::class, $this->subject->loadConfig('default')); + static::assertInstanceOf(Subject::class, self::$subject->loadConfig('1')); + static::assertInstanceOf(Subject::class, self::$subject->loadConfig('default')); } /** @@ -61,7 +61,7 @@ public function testLoadConfig(): void */ public function testGetStoreCollection(): void { - $this->assertInstanceOf(Mage_Core_Model_Resource_Store_Collection::class, $this->subject->getStoreCollection()); + static::assertInstanceOf(Mage_Core_Model_Resource_Store_Collection::class, self::$subject->getStoreCollection()); } /** @@ -70,7 +70,7 @@ public function testGetStoreCollection(): void */ public function testGetGroupCollection(): void { - $this->assertInstanceOf(Mage_Core_Model_Resource_Store_Group_Collection::class, $this->subject->getGroupCollection()); + static::assertInstanceOf(Mage_Core_Model_Resource_Store_Group_Collection::class, self::$subject->getGroupCollection()); } /** @@ -79,7 +79,7 @@ public function testGetGroupCollection(): void */ public function testGetStores(): void { - $this->assertIsArray($this->subject->getStores()); + static::assertIsArray(self::$subject->getStores()); } /** @@ -88,7 +88,7 @@ public function testGetStores(): void */ public function testGetStoreIds(): void { - $this->assertIsArray($this->subject->getStoreIds()); + static::assertIsArray(self::$subject->getStoreIds()); } /** @@ -97,7 +97,7 @@ public function testGetStoreIds(): void */ public function testGetStoreCodes(): void { - $this->assertIsArray($this->subject->getStoreCodes()); + static::assertIsArray(self::$subject->getStoreCodes()); } /** @@ -106,7 +106,7 @@ public function testGetStoreCodes(): void */ public function testGetStoresCount(): void { - $this->assertIsInt($this->subject->getStoresCount()); + static::assertIsInt(self::$subject->getStoresCount()); } /** @@ -115,7 +115,7 @@ public function testGetStoresCount(): void */ public function testGetGroups(): void { - $this->assertIsArray($this->subject->getGroups()); + static::assertIsArray(self::$subject->getGroups()); } /** @@ -124,7 +124,7 @@ public function testGetGroups(): void */ public function testGetGroupIds(): void { - $this->assertIsArray($this->subject->getGroupIds()); + static::assertIsArray(self::$subject->getGroupIds()); } /** @@ -133,7 +133,7 @@ public function testGetGroupIds(): void */ public function testGetGroupsCount(): void { - $this->assertIsInt($this->subject->getGroupsCount()); + static::assertIsInt(self::$subject->getGroupsCount()); } /** @@ -142,8 +142,8 @@ public function testGetGroupsCount(): void */ public function testGetBaseCurrency(): void { - $this->assertIsObject($this->subject->getBaseCurrency()); - $this->assertInstanceOf(Mage_Directory_Model_Currency::class, $this->subject->getBaseCurrency()); + static::assertIsObject(self::$subject->getBaseCurrency()); + static::assertInstanceOf(Mage_Directory_Model_Currency::class, self::$subject->getBaseCurrency()); } // /** @@ -152,8 +152,8 @@ public function testGetBaseCurrency(): void // */ // public function testGetDefaultStore(): void // { - // $this->assertIsObject($this->subject->getDefaultStore()); - // $this->assertInstanceOf(Mage_Core_Model_Store::class, $this->subject->getDefaultStore()); + // $this->assertIsObject(self::$subject->getDefaultStore()); + // $this->assertInstanceOf(Mage_Core_Model_Store::class, self::$subject->getDefaultStore()); // } /** @@ -161,8 +161,8 @@ public function testGetBaseCurrency(): void */ public function testGetDefaultStoresSelect(): void { - $this->assertIsObject($this->subject->getDefaultStoresSelect()); - $this->assertInstanceOf(Varien_Db_Select::class, $this->subject->getDefaultStoresSelect(true)); + static::assertIsObject(self::$subject->getDefaultStoresSelect()); + static::assertInstanceOf(Varien_Db_Select::class, self::$subject->getDefaultStoresSelect(true)); } /** @@ -171,7 +171,7 @@ public function testGetDefaultStoresSelect(): void */ public function testIsReadOnly(): void { - $this->assertFalse($this->subject->isReadOnly()); - $this->assertTrue($this->subject->isReadOnly(true)); + static::assertFalse(self::$subject->isReadOnly()); + static::assertTrue(self::$subject->isReadOnly(true)); } } diff --git a/tests/unit/Mage/Customer/Model/Convert/Adapter/CustomerTest.php b/tests/unit/Mage/Customer/Model/Convert/Adapter/CustomerTest.php index 4f37d1ffd55..6cf7dda57f4 100644 --- a/tests/unit/Mage/Customer/Model/Convert/Adapter/CustomerTest.php +++ b/tests/unit/Mage/Customer/Model/Convert/Adapter/CustomerTest.php @@ -19,17 +19,17 @@ use Mage; use Mage_Customer_Model_Convert_Adapter_Customer as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; use Throwable; -class CustomerTest extends TestCase +class CustomerTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::getModel('customer/convert_adapter_customer'); + parent::setUpBeforeClass(); + self::$subject = Mage::getModel('customer/convert_adapter_customer'); } // /** @@ -42,7 +42,7 @@ public function setUp(): void // { // $data = []; // try { - // $this->subject->saveRow($data); + // self::$subject->saveRow($data); // $this->fail(); // } catch (Mage_Core_Exception $e) { // $this->assertSame('Skipping import row, required field "website" is not defined.', $e->getMessage()); @@ -61,7 +61,7 @@ public function setUp(): void // 'website' => 'base', // ]; // try { - // $this->subject->saveRow($data); + // self::$subject->saveRow($data); // $this->fail(); // } catch (Mage_Core_Exception $e) { // $this->assertSame('Skipping import row, required field "email" is not defined.', $e->getMessage()); @@ -81,7 +81,7 @@ public function setUp(): void // 'email' => 'test@example.com', // ]; // try { - // $this->subject->saveRow($data); + // self::$subject->saveRow($data); // $this->fail(); // } catch (Mage_Core_Exception $e) { // $this->assertSame('Skipping import row, the value "" is not valid for the "group" field.', $e->getMessage()); @@ -102,7 +102,7 @@ public function setUp(): void // 'group' => 'General', // ]; // try { - // $this->subject->saveRow($data); + // self::$subject->saveRow($data); // $this->fail(); // } catch (Mage_Core_Exception $e) { // $this->expectExceptionMessage('Skip import row, required field "firstname" for the new customer is not defined.'); @@ -124,7 +124,7 @@ public function setUp(): void // 'firstname' => 'John', // ]; // try { - // $this->subject->saveRow($data); + // self::$subject->saveRow($data); // $this->fail(); // } catch (Mage_Core_Exception $e) { // $this->assertSame('Skip import row, required field "lastname" for the new customer is not defined.', $e->getMessage()); @@ -143,6 +143,6 @@ public function testSaveRow(): void 'firstname' => 'John', 'lastname' => 'Doe', ]; - $this->assertInstanceOf(Subject::class, $this->subject->saveRow($data)); + static::assertInstanceOf(Subject::class, self::$subject->saveRow($data)); } } diff --git a/tests/unit/Mage/Customer/Model/CustomerTest.php b/tests/unit/Mage/Customer/Model/CustomerTest.php index 28d25c2a7a1..d1c5a72c314 100644 --- a/tests/unit/Mage/Customer/Model/CustomerTest.php +++ b/tests/unit/Mage/Customer/Model/CustomerTest.php @@ -9,7 +9,7 @@ * * @category OpenMage * @package OpenMage_Tests - * @copyright Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2024-2025 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -18,26 +18,35 @@ namespace OpenMage\Tests\Unit\Mage\Customer\Model; use Mage; +use Mage_Core_Exception; use Mage_Customer_Model_Customer as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; +use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Customer\CustomerTrait; -class CustomerTest extends TestCase +class CustomerTest extends OpenMageTest { - public Subject $subject; + use CustomerTrait; - public function setUp(): void + /** @phpstan-ignore property.onlyWritten */ + private static Subject $subject; + + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::getModel('customer/customer'); + parent::setUpBeforeClass(); + self::$subject = Mage::getModel('customer/customer'); } /** - * @group Mage_Customer + * @dataProvider provideValidateCustomerData + * @param array|true $expectedResult * @group Mage_Customer_Model + * @throws Mage_Core_Exception */ - public function testValidateAddress(): void + public function testValidate($expectedResult, array $methods): void { - $data = []; - $this->assertIsBool($this->subject->validateAddress($data)); + $mock = $this->getMockWithCalledMethods(Subject::class, $methods); + + static::assertInstanceOf(Subject::class, $mock); + static::assertSame($expectedResult, $mock->validate()); } } diff --git a/tests/unit/Mage/Directory/Block/DataTest.php b/tests/unit/Mage/Directory/Block/DataTest.php index efa0f9999b5..4445e3f7ce0 100644 --- a/tests/unit/Mage/Directory/Block/DataTest.php +++ b/tests/unit/Mage/Directory/Block/DataTest.php @@ -21,16 +21,16 @@ use Mage_Directory_Block_Data as Subject; use Mage_Directory_Model_Resource_Country_Collection; use Mage_Directory_Model_Resource_Region_Collection; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class DataTest extends TestCase +class DataTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = new Subject(); + parent::setUpBeforeClass(); + self::$subject = new Subject(); } /** @@ -39,7 +39,7 @@ public function setUp(): void */ public function testGetCountryCollection(): void { - $this->assertInstanceOf(Mage_Directory_Model_Resource_Country_Collection::class, $this->subject->getCountryCollection()); + static::assertInstanceOf(Mage_Directory_Model_Resource_Country_Collection::class, self::$subject->getCountryCollection()); } /** @@ -48,6 +48,6 @@ public function testGetCountryCollection(): void */ public function testGetRegionCollection(): void { - $this->assertInstanceOf(Mage_Directory_Model_Resource_Region_Collection::class, $this->subject->getRegionCollection()); + static::assertInstanceOf(Mage_Directory_Model_Resource_Region_Collection::class, self::$subject->getRegionCollection()); } } diff --git a/tests/unit/Mage/Directory/Helper/DataTest.php b/tests/unit/Mage/Directory/Helper/DataTest.php index e638168617e..386af0547d5 100644 --- a/tests/unit/Mage/Directory/Helper/DataTest.php +++ b/tests/unit/Mage/Directory/Helper/DataTest.php @@ -17,21 +17,23 @@ namespace OpenMage\Tests\Unit\Mage\Directory\Helper; -use Generator; use Mage; use Mage_Directory_Helper_Data as Subject; use Mage_Directory_Model_Resource_Country_Collection; use Mage_Directory_Model_Resource_Region_Collection; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; +use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Directory\DirectoryTrait; -class DataTest extends TestCase +class DataTest extends OpenMageTest { - public Subject $subject; + use DirectoryTrait; - public function setUp(): void + private static Subject $subject; + + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('directory/data'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('directory/data'); } /** @@ -40,7 +42,7 @@ public function setUp(): void */ public function testGetRegionCollection(): void { - $this->assertInstanceOf(Mage_Directory_Model_Resource_Region_Collection::class, $this->subject->getRegionCollection()); + static::assertInstanceOf(Mage_Directory_Model_Resource_Region_Collection::class, self::$subject->getRegionCollection()); } /** @@ -49,7 +51,7 @@ public function testGetRegionCollection(): void */ public function testGetCountryCollection(): void { - $this->assertInstanceOf(Mage_Directory_Model_Resource_Country_Collection::class, $this->subject->getCountryCollection()); + static::assertInstanceOf(Mage_Directory_Model_Resource_Country_Collection::class, self::$subject->getCountryCollection()); } /** @@ -58,7 +60,7 @@ public function testGetCountryCollection(): void */ public function testGetRegionJsonByStore(): void { - $this->assertIsString($this->subject->getRegionJson()); + static::assertIsString(self::$subject->getRegionJson()); } /** @@ -69,7 +71,7 @@ public function testGetRegionJsonByStore(): void */ public function testCurrencyConvert(): void { - $this->assertSame(10, $this->subject->currencyConvert(10, 'USD')); + static::assertSame(10, self::$subject->currencyConvert(10, 'USD')); } /** @@ -78,26 +80,9 @@ public function testCurrencyConvert(): void * @group Mage_Directory * @group Mage_Directory_Helper */ - public function testGetCountriesWithOptionalZip($expectedResult, bool $asJson): void - { - $this->assertSame($expectedResult, $this->subject->getCountriesWithOptionalZip($asJson)); - } - - public function provideGetCountriesWithOptionalZip(): Generator + public function testGetCountriesWithOptionalZip(array|string $expectedResult, bool $asJson): void { - yield 'as json' => [ - '["HK","IE","MO","PA"]', - true, - ]; - yield 'as array' => [ - [ - 0 => 'HK', - 1 => 'IE', - 2 => 'MO', - 3 => 'PA', - ], - false, - ]; + static::assertSame($expectedResult, self::$subject->getCountriesWithOptionalZip($asJson)); } /** @@ -107,7 +92,7 @@ public function provideGetCountriesWithOptionalZip(): Generator */ public function testIsZipCodeOptional(): void { - $this->assertIsBool($this->subject->isZipCodeOptional('')); + static::assertIsBool(self::$subject->isZipCodeOptional('')); } /** @@ -116,41 +101,16 @@ public function testIsZipCodeOptional(): void * @group Mage_Directory * @group Mage_Directory_Helper */ - public function testGetCountriesWithStatesRequired($expectedResult, bool $asJson): void + public function testGetCountriesWithStatesRequired(array|string $expectedResult, bool $asJson): void { - $result = $this->subject->getCountriesWithStatesRequired($asJson); + $result = self::$subject->getCountriesWithStatesRequired($asJson); if (defined('DATA_MAY_CHANGED')) { - $asJson ? $this->assertIsString($result) : $this->assertIsArray($result); + $asJson ? static::assertIsString($result) : static::assertIsArray($result); } else { - $this->assertSame($expectedResult, $result); + static::assertSame($expectedResult, $result); } } - public function provideGetCountriesWithStatesRequired(): Generator - { - yield 'as json' => [ - '["AT","CA","CH","DE","EE","ES","FI","FR","LT","LV","RO","US"]', - true, - ]; - yield 'as array' => [ - [ - 0 => 'AT', - 1 => 'CA', - 2 => 'CH', - 3 => 'DE', - 4 => 'EE', - 5 => 'ES', - 6 => 'FI', - 7 => 'FR', - 8 => 'LT', - 9 => 'LV', - 10 => 'RO', - 11 => 'US', - ], - false, - ]; - } - /** * @covers Mage_Directory_Helper_Data::getShowNonRequiredState() * @group Mage_Directory @@ -158,7 +118,7 @@ public function provideGetCountriesWithStatesRequired(): Generator */ public function testGetShowNonRequiredState(): void { - $this->assertTrue($this->subject->getShowNonRequiredState()); + static::assertTrue(self::$subject->getShowNonRequiredState()); } /** @@ -168,6 +128,6 @@ public function testGetShowNonRequiredState(): void */ public function testGetConfigCurrencyBase(): void { - $this->assertSame('USD', $this->subject->getConfigCurrencyBase()); + static::assertSame('USD', self::$subject->getConfigCurrencyBase()); } } diff --git a/tests/unit/Mage/Downloadable/Helper/FileTest.php b/tests/unit/Mage/Downloadable/Helper/FileTest.php index 1ae59909153..cd38a698687 100644 --- a/tests/unit/Mage/Downloadable/Helper/FileTest.php +++ b/tests/unit/Mage/Downloadable/Helper/FileTest.php @@ -20,18 +20,18 @@ use Mage; use Mage_Downloadable_Helper_File as Subject; use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Downloadable\DownloadableTrait; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class FileTest extends TestCase +class FileTest extends OpenMageTest { use DownloadableTrait; - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('downloadable/file'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('downloadable/file'); } /** @@ -42,7 +42,7 @@ public function setUp(): void */ public function testGetFilePath(string $expectedResult, string $path, ?string $file): void { - $result = $this->subject->getFilePath($path, $file); - $this->assertSame($expectedResult, $result); + $result = self::$subject->getFilePath($path, $file); + static::assertSame($expectedResult, $result); } } diff --git a/tests/unit/Mage/GiftMessage/Helper/MessageTest.php b/tests/unit/Mage/GiftMessage/Helper/MessageTest.php index 67d5c3eee90..de96467e981 100644 --- a/tests/unit/Mage/GiftMessage/Helper/MessageTest.php +++ b/tests/unit/Mage/GiftMessage/Helper/MessageTest.php @@ -17,21 +17,23 @@ namespace OpenMage\Tests\Unit\Mage\GiftMessage\Helper; -use Generator; use Mage; -use Mage_Catalog_Model_Product; +use Mage_Core_Model_Store; use Mage_GiftMessage_Helper_Message as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; +use OpenMage\Tests\Unit\Traits\DataProvider\Mage\GiftMessage\GiftMessageTrait; use Varien_Object; -class MessageTest extends TestCase +class MessageTest extends OpenMageTest { - public Subject $subject; + use GiftMessageTrait; - public function setUp(): void + private static Subject $subject; + + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('giftmessage/message'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('giftmessage/message'); } /** @@ -40,38 +42,8 @@ public function setUp(): void * @group Mage_GiftMessage * @group Mage_GiftMessage_Helper */ - public function testIsMessagesAvailable(string $type, Varien_Object $entity, $store = null): void + public function testIsMessagesAvailable(string $type, Varien_Object $entity, bool|int|Mage_Core_Model_Store|null|string $store = null): void { - $this->assertIsBool($this->subject->isMessagesAvailable($type, $entity, $store)); - } - - public function provideIsMessagesAvailable(): Generator - { - $entity = new Varien_Object(); - - yield Subject::TYPE_ADDRESS_ITEM => [ - Subject::TYPE_ADDRESS_ITEM, - $entity, - ]; - yield Subject::TYPE_ITEM => [ - Subject::TYPE_ITEM, - $entity->setProduct(new Mage_Catalog_Model_Product()), - ]; - yield Subject::TYPE_ITEMS => [ - Subject::TYPE_ITEMS, - $entity, - ]; - yield Subject::TYPE_ORDER => [ - Subject::TYPE_ORDER, - $entity, - ]; - yield Subject::TYPE_ORDER_ITEM => [ - Subject::TYPE_ORDER_ITEM, - $entity, - ]; - yield 'invalid type' => [ - 'quote', - $entity, - ]; + static::assertIsBool(self::$subject->isMessagesAvailable($type, $entity, $store)); } } diff --git a/tests/unit/Mage/Index/Model/ProcessTest.php b/tests/unit/Mage/Index/Model/ProcessTest.php index 874eeb06b25..de05fc9b488 100644 --- a/tests/unit/Mage/Index/Model/ProcessTest.php +++ b/tests/unit/Mage/Index/Model/ProcessTest.php @@ -21,18 +21,18 @@ use Mage_Core_Exception; use Mage_Index_Model_Process as Subject; use Mage_Index_Model_Resource_Event_Collection; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class ProcessTest extends TestCase +class ProcessTest extends OpenMageTest { public const INDEXER_MODEL_IS_NOT_DEFINED = 'Indexer model is not defined.'; - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::getModel('index/process'); + parent::setUpBeforeClass(); + self::$subject = Mage::getModel('index/process'); } /** @@ -41,12 +41,12 @@ public function setUp(): void */ public function testReindexEverything(): void { - $this->subject->setIndexerCode('html'); + self::$subject->setIndexerCode('html'); try { - $this->assertInstanceOf(Subject::class, $this->subject->reindexEverything()); + static::assertInstanceOf(Subject::class, self::$subject->reindexEverything()); } catch (Mage_Core_Exception $exception) { - $this->assertSame(self::INDEXER_MODEL_IS_NOT_DEFINED, $exception->getMessage()); + static::assertSame(self::INDEXER_MODEL_IS_NOT_DEFINED, $exception->getMessage()); } } @@ -56,12 +56,12 @@ public function testReindexEverything(): void */ public function testDisableIndexerKeys(): void { - $this->subject->setIndexerCode('html'); + self::$subject->setIndexerCode('html'); try { - $this->assertInstanceOf(Subject::class, $this->subject->disableIndexerKeys()); + static::assertInstanceOf(Subject::class, self::$subject->disableIndexerKeys()); } catch (Mage_Core_Exception $exception) { - $this->assertSame(self::INDEXER_MODEL_IS_NOT_DEFINED, $exception->getMessage()); + static::assertSame(self::INDEXER_MODEL_IS_NOT_DEFINED, $exception->getMessage()); } } @@ -72,12 +72,12 @@ public function testDisableIndexerKeys(): void */ public function testEnableIndexerKeys(): void { - $this->subject->setIndexerCode('html'); + self::$subject->setIndexerCode('html'); try { - $this->assertInstanceOf(Subject::class, $this->subject->enableIndexerKeys()); + static::assertInstanceOf(Subject::class, self::$subject->enableIndexerKeys()); } catch (Mage_Core_Exception $exception) { - $this->assertSame(self::INDEXER_MODEL_IS_NOT_DEFINED, $exception->getMessage()); + static::assertSame(self::INDEXER_MODEL_IS_NOT_DEFINED, $exception->getMessage()); } } @@ -87,7 +87,7 @@ public function testEnableIndexerKeys(): void */ public function testGetUnprocessedEventsCollection(): void { - $this->subject->setIndexerCode('html'); - $this->assertInstanceOf(Mage_Index_Model_Resource_Event_Collection::class, $this->subject->getUnprocessedEventsCollection()); + self::$subject->setIndexerCode('html'); + static::assertInstanceOf(Mage_Index_Model_Resource_Event_Collection::class, self::$subject->getUnprocessedEventsCollection()); } } diff --git a/tests/unit/Mage/Log/Helper/DataTest.php b/tests/unit/Mage/Log/Helper/DataTest.php index 0787cd757c1..e9e990daf4a 100644 --- a/tests/unit/Mage/Log/Helper/DataTest.php +++ b/tests/unit/Mage/Log/Helper/DataTest.php @@ -17,19 +17,21 @@ namespace OpenMage\Tests\Unit\Mage\Log\Helper; -use Generator; use Mage; use Mage_Log_Helper_Data as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; +use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Log\LogTrait; -class DataTest extends TestCase +class DataTest extends OpenMageTest { - public Subject $subject; + use LogTrait; - public function setUp(): void + private static Subject $subject; + + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('log/data'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('log/data'); } /** @@ -39,7 +41,7 @@ public function setUp(): void */ public function testIsVisitorLogEnabled(): void { - $this->assertTrue($this->subject->isVisitorLogEnabled()); + static::assertTrue(self::$subject->isVisitorLogEnabled()); } /** @@ -49,7 +51,7 @@ public function testIsVisitorLogEnabled(): void */ public function testIsLogEnabled(): void { - $this->assertFalse($this->subject->isLogEnabled()); + static::assertFalse(self::$subject->isLogEnabled()); } /** @@ -59,7 +61,7 @@ public function testIsLogEnabled(): void */ public function testIsLogDisabled(): void { - $this->assertFalse($this->subject->isLogDisabled()); + static::assertFalse(self::$subject->isLogDisabled()); } /** @@ -70,18 +72,6 @@ public function testIsLogDisabled(): void */ public function testIsLogFileExtensionValid(bool $expectedResult, string $file): void { - $this->assertSame($expectedResult, $this->subject->isLogFileExtensionValid($file)); - } - - public function provideIsLogFileExtensionValid(): Generator - { - yield 'valid' => [ - true, - 'valid.log', - ]; - yield 'invalid' => [ - false, - 'invalid.file', - ]; + static::assertSame($expectedResult, self::$subject->isLogFileExtensionValid($file)); } } diff --git a/tests/unit/Mage/Log/Model/AggregationTest.php b/tests/unit/Mage/Log/Model/AggregationTest.php index 238233acff6..15ba1369644 100644 --- a/tests/unit/Mage/Log/Model/AggregationTest.php +++ b/tests/unit/Mage/Log/Model/AggregationTest.php @@ -19,16 +19,16 @@ use Mage; use Mage_Log_Model_Aggregation as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class AggregationTest extends TestCase +class AggregationTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::getModel('log/aggregation'); + parent::setUpBeforeClass(); + self::$subject = Mage::getModel('log/aggregation'); } /** @@ -38,6 +38,6 @@ public function setUp(): void */ public function testRun(): void { - $this->subject->run(); + self::$subject->run(); } } diff --git a/tests/unit/Mage/Log/Model/CronTest.php b/tests/unit/Mage/Log/Model/CronTest.php index fa8433f37fd..0af68addacd 100644 --- a/tests/unit/Mage/Log/Model/CronTest.php +++ b/tests/unit/Mage/Log/Model/CronTest.php @@ -19,16 +19,16 @@ use Mage; use Mage_Log_Model_Cron as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class CronTest extends TestCase +class CronTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::getModel('log/cron'); + parent::setUpBeforeClass(); + self::$subject = Mage::getModel('log/cron'); } /** @@ -37,6 +37,6 @@ public function setUp(): void */ public function testLogClean(): void { - $this->assertInstanceOf(Subject::class, $this->subject->logClean()); + static::assertInstanceOf(Subject::class, self::$subject->logClean()); } } diff --git a/tests/unit/Mage/Log/Model/CustomerTest.php b/tests/unit/Mage/Log/Model/CustomerTest.php index ffd035ef148..02b1f1aec64 100644 --- a/tests/unit/Mage/Log/Model/CustomerTest.php +++ b/tests/unit/Mage/Log/Model/CustomerTest.php @@ -19,16 +19,17 @@ use Mage; use Mage_Log_Model_Customer as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class CustomerTest extends TestCase +class CustomerTest extends OpenMageTest { - public Subject $subject; + /** @phpstan-ignore property.onlyWritten */ + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::getModel('log/customer'); + parent::setUpBeforeClass(); + self::$subject = Mage::getModel('log/customer'); } /** @@ -41,9 +42,9 @@ public function testGetLoginAtTimestamp(): void ->setMethods(['getLoginAt']) ->getMock(); - $this->assertNull($mock->getLoginAtTimestamp()); + static::assertNull($mock->getLoginAtTimestamp()); $mock->method('getLoginAt')->willReturn(true); - $this->assertIsInt($mock->getLoginAtTimestamp()); + static::assertIsInt($mock->getLoginAtTimestamp()); } } diff --git a/tests/unit/Mage/Log/Model/LogTest.php b/tests/unit/Mage/Log/Model/LogTest.php index 0cb17c2820a..14288babf1a 100644 --- a/tests/unit/Mage/Log/Model/LogTest.php +++ b/tests/unit/Mage/Log/Model/LogTest.php @@ -19,16 +19,16 @@ use Mage; use Mage_Log_Model_Log as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class LogTest extends TestCase +class LogTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::getModel('log/log'); + parent::setUpBeforeClass(); + self::$subject = Mage::getModel('log/log'); } /** @@ -37,6 +37,6 @@ public function setUp(): void */ public function testClean(): void { - $this->assertInstanceOf(Subject::class, $this->subject->clean()); + static::assertInstanceOf(Subject::class, self::$subject->clean()); } } diff --git a/tests/unit/Mage/Log/Model/VisitorTest.php b/tests/unit/Mage/Log/Model/VisitorTest.php index 528d1f2d543..9d3c8d7a842 100644 --- a/tests/unit/Mage/Log/Model/VisitorTest.php +++ b/tests/unit/Mage/Log/Model/VisitorTest.php @@ -19,16 +19,15 @@ use Mage; use Mage_Log_Model_Visitor as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class VisitorTest extends TestCase +class VisitorTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; public function setUp(): void { - Mage::app(); - $this->subject = Mage::getModel('log/visitor'); + self::$subject = Mage::getModel('log/visitor'); } /** @@ -39,7 +38,7 @@ public function setUp(): void */ public function testInitServerData(): void { - $this->assertInstanceOf(Subject::class, $this->subject->initServerData()); + static::assertInstanceOf(Subject::class, self::$subject->initServerData()); } /** @@ -50,7 +49,7 @@ public function testInitServerData(): void */ public function testGetOnlineMinutesInterval(): void { - $this->assertIsInt($this->subject->getOnlineMinutesInterval()); + static::assertIsInt(self::$subject->getOnlineMinutesInterval()); } /** @@ -61,7 +60,7 @@ public function testGetOnlineMinutesInterval(): void */ public function testGetUrl(): void { - $this->assertIsString($this->subject->getUrl()); + static::assertIsString(self::$subject->getUrl()); } /** @@ -72,7 +71,7 @@ public function testGetUrl(): void */ public function testGetFirstVisitAt(): void { - $this->assertIsString($this->subject->getFirstVisitAt()); + static::assertIsString(self::$subject->getFirstVisitAt()); } /** @@ -83,6 +82,6 @@ public function testGetFirstVisitAt(): void */ public function testGetLastVisitAt(): void { - $this->assertIsString($this->subject->getLastVisitAt()); + static::assertIsString(self::$subject->getLastVisitAt()); } } diff --git a/tests/unit/Mage/Newsletter/Model/TemplateTest.php b/tests/unit/Mage/Newsletter/Model/TemplateTest.php new file mode 100644 index 00000000000..eddd8edbcdf --- /dev/null +++ b/tests/unit/Mage/Newsletter/Model/TemplateTest.php @@ -0,0 +1,151 @@ +setTemplateCode($methods['setTemplateCode']); + self::$subject->setTemplateSenderEmail($methods['setTemplateSenderEmail']); + self::$subject->setTemplateSenderName($methods['setTemplateSenderName']); + self::$subject->setTemplateSubject($methods['setTemplateSubject']); + self::$subject->setTemplateText($methods['setTemplateText']); + self::$subject->setTemplateType($methods['setTemplateType']); + + if ($expected) { + $this->expectException(Mage_Core_Exception::class); + $this->expectExceptionMessage($expected); + } else { + $this->expectNotToPerformAssertions(); + } + + self::$subject->validate(); + } + + public function validateTemplateDataProvider(): Generator + { + $validData = [ + 'setTemplateCode' => 'Valid Code', + 'setTemplateSenderEmail' => 'test@example.com', + 'setTemplateSenderName' => 'Sender Name', + 'setTemplateSubject' => 'Valid Subject', + 'setTemplateText' => 'Valid Template Text', + 'setTemplateType' => 1, + ]; + + yield 'valid data' => [ + null, + $validData, + ]; + + $data = $validData; + $data['setTemplateCode'] = null; + yield 'missing template code' => [ + 'You must give a non-empty value for field \'template_code\'', + $data, + ]; + + $data = $validData; + $data['setTemplateSenderEmail'] = null; + yield 'missing sender email' => [ + 'You must give a non-empty value for field \'template_sender_email\'', + $data, + ]; + + $data = $validData; + $data['setTemplateSenderEmail'] = 'invalid-email'; + yield 'invalid sender email' => [ + '\'invalid-email\' is not a valid email address in the basic format local-part@hostname', + $data, + ]; + + $data = $validData; + $data['setTemplateSenderName'] = null; + yield 'missing sender name' => [ + 'You must give a non-empty value for field \'template_sender_name\'', + $data, + ]; + + $data = $validData; + $data['setTemplateSubject'] = null; + yield 'missing template subject' => [ + null, + $data, + ]; + + $data = $validData; + $data['setTemplateText'] = null; + yield 'missing template text' => [ + null, + $data, + ]; + + $data = $validData; + $data['setTemplateType'] = null; + yield 'missing template type' => [ + 'You must give a non-empty value for field \'template_type\'', + $data, + ]; + } + + /** + * @group Mage_Newsletter + * @group Mage_Newsletter_Model + */ + public function testLoadByCode(): void + { + static::assertInstanceOf(Subject::class, self::$subject->loadByCode('test_code')); + } + + /** + * @group Mage_Newsletter + * @group Mage_Newsletter_Model + */ + public function testIsValidForSend(): void + { + static::assertIsBool(self::$subject->isValidForSend()); + } + + /** + * @group Mage_Newsletter + * @group Mage_Newsletter_Model + */ + public function testGetProcessedTemplate(): void + { + static::assertIsString(self::$subject->getProcessedTemplate(['key' => 'value'])); + } +} diff --git a/tests/unit/Mage/Page/Block/Html/HeadTest.php b/tests/unit/Mage/Page/Block/Html/HeadTest.php index 96d1cfedba5..f8a8f92497c 100644 --- a/tests/unit/Mage/Page/Block/Html/HeadTest.php +++ b/tests/unit/Mage/Page/Block/Html/HeadTest.php @@ -19,16 +19,16 @@ use Mage; use Mage_Page_Block_Html_Head as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class HeadTest extends TestCase +class HeadTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = new Subject(); + parent::setUpBeforeClass(); + self::$subject = new Subject(); } /** @@ -37,7 +37,7 @@ public function setUp(): void */ public function testAddCss(): void { - $this->assertInstanceOf(Subject::class, $this->subject->addCss('test')); + static::assertInstanceOf(Subject::class, self::$subject->addCss('test')); } /** @@ -46,7 +46,7 @@ public function testAddCss(): void */ public function testAddJs(): void { - $this->assertInstanceOf(Subject::class, $this->subject->addJs('test')); + static::assertInstanceOf(Subject::class, self::$subject->addJs('test')); } /** @@ -55,7 +55,7 @@ public function testAddJs(): void */ public function testAddCssIe(): void { - $this->assertInstanceOf(Subject::class, $this->subject->addCssIe('test')); + static::assertInstanceOf(Subject::class, self::$subject->addCssIe('test')); } /** @@ -64,7 +64,7 @@ public function testAddCssIe(): void */ public function testAddJsIe(): void { - $this->assertInstanceOf(Subject::class, $this->subject->addJsIe('test')); + static::assertInstanceOf(Subject::class, self::$subject->addJsIe('test')); } /** @@ -73,6 +73,6 @@ public function testAddJsIe(): void */ public function testAddLinkRel(): void { - $this->assertInstanceOf(Subject::class, $this->subject->addLinkRel('test', 'ref')); + static::assertInstanceOf(Subject::class, self::$subject->addLinkRel('test', 'ref')); } } diff --git a/tests/unit/Mage/Page/Block/Html/HeaderTest.php b/tests/unit/Mage/Page/Block/Html/HeaderTest.php index 06c0fcae93a..3bd654b8f86 100644 --- a/tests/unit/Mage/Page/Block/Html/HeaderTest.php +++ b/tests/unit/Mage/Page/Block/Html/HeaderTest.php @@ -20,16 +20,15 @@ use Mage; use Mage_Core_Model_Security_HtmlEscapedString; use Mage_Page_Block_Html_Header as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class HeaderTest extends TestCase +class HeaderTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; public function setUp(): void { - Mage::app(); - $this->subject = new Subject(); + self::$subject = new Subject(); } /** @@ -38,7 +37,7 @@ public function setUp(): void */ // public function testGetIsHomePage(): void // { - // $this->assertIsBool($this->subject->getIsHomePage()); + // $this->assertIsBool(self::$subject->getIsHomePage()); // } /** @@ -47,7 +46,7 @@ public function setUp(): void */ public function testSetLogo(): void { - $this->assertInstanceOf(Subject::class, $this->subject->setLogo('src', 'alt')); + static::assertInstanceOf(Subject::class, self::$subject->setLogo('src', 'alt')); } /** @@ -56,7 +55,7 @@ public function testSetLogo(): void */ public function testGetLogoSrc(): void { - $this->assertIsString($this->subject->getLogoSrc()); + static::assertIsString(self::$subject->getLogoSrc()); } /** @@ -65,7 +64,7 @@ public function testGetLogoSrc(): void */ public function testGetLogoSrcSmall(): void { - $this->assertIsString($this->subject->getLogoSrcSmall()); + static::assertIsString(self::$subject->getLogoSrcSmall()); } /** @@ -74,6 +73,6 @@ public function testGetLogoSrcSmall(): void */ public function testGetLogoAlt(): void { - $this->assertInstanceOf(Mage_Core_Model_Security_HtmlEscapedString::class, $this->subject->getLogoAlt()); + static::assertInstanceOf(Mage_Core_Model_Security_HtmlEscapedString::class, self::$subject->getLogoAlt()); } } diff --git a/tests/unit/Mage/Page/Block/HtmlTest.php b/tests/unit/Mage/Page/Block/HtmlTest.php index e3ea305fd4e..2eb01fbaca6 100644 --- a/tests/unit/Mage/Page/Block/HtmlTest.php +++ b/tests/unit/Mage/Page/Block/HtmlTest.php @@ -19,16 +19,16 @@ use Mage; use Mage_Page_Block_Html as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class HtmlTest extends TestCase +class HtmlTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = new Subject(); + parent::setUpBeforeClass(); + self::$subject = new Subject(); } /** @@ -37,7 +37,7 @@ public function setUp(): void */ public function testGetBaseUrl(): void { - $this->assertIsString($this->subject->getBaseUrl()); + static::assertIsString(self::$subject->getBaseUrl()); } /** @@ -46,7 +46,7 @@ public function testGetBaseUrl(): void */ public function testGetBaseSecureUrl(): void { - $this->assertIsString($this->subject->getBaseSecureUrl()); + static::assertIsString(self::$subject->getBaseSecureUrl()); } /** @@ -55,7 +55,7 @@ public function testGetBaseSecureUrl(): void */ // public function testGetCurrentUrl(): void // { - // $this->assertIsString($this->subject->getCurrentUrl()); + // $this->assertIsString(self::$subject->getCurrentUrl()); // } /** @@ -64,6 +64,6 @@ public function testGetBaseSecureUrl(): void */ public function testGetPrintLogoUrl(): void { - $this->assertIsString($this->subject->getPrintLogoUrl()); + static::assertIsString(self::$subject->getPrintLogoUrl()); } } diff --git a/tests/unit/Mage/Page/Block/RedirectTest.php b/tests/unit/Mage/Page/Block/RedirectTest.php index 474121bbda1..73bca12da49 100644 --- a/tests/unit/Mage/Page/Block/RedirectTest.php +++ b/tests/unit/Mage/Page/Block/RedirectTest.php @@ -19,16 +19,16 @@ use Mage; use Mage_Page_Block_Redirect as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class RedirectTest extends TestCase +class RedirectTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = new Subject(); + parent::setUpBeforeClass(); + self::$subject = new Subject(); } /** @@ -37,7 +37,7 @@ public function setUp(): void */ public function testGetTargetUrl(): void { - $this->assertSame('', $this->subject->getTargetURL()); + static::assertSame('', self::$subject->getTargetURL()); } /** @@ -46,7 +46,7 @@ public function testGetTargetUrl(): void */ public function testGetMessage(): void { - $this->assertSame('', $this->subject->getMessage()); + static::assertSame('', self::$subject->getMessage()); } /** @@ -55,7 +55,7 @@ public function testGetMessage(): void */ public function testGetRedirectOutput(): void { - $this->assertIsString($this->subject->getRedirectOutput()); + static::assertIsString(self::$subject->getRedirectOutput()); } /** @@ -64,7 +64,7 @@ public function testGetRedirectOutput(): void */ public function testGetJsRedirect(): void { - $this->assertIsString($this->subject->getJsRedirect()); + static::assertIsString(self::$subject->getJsRedirect()); } /** @@ -73,7 +73,7 @@ public function testGetJsRedirect(): void */ public function testGetHtmlFormRedirect(): void { - $this->assertIsString($this->subject->getHtmlFormRedirect()); + static::assertIsString(self::$subject->getHtmlFormRedirect()); } /** @@ -82,7 +82,7 @@ public function testGetHtmlFormRedirect(): void */ public function testIsHtmlFormRedirect(): void { - $this->assertIsBool($this->subject->isHtmlFormRedirect()); + static::assertIsBool(self::$subject->isHtmlFormRedirect()); } /** @@ -91,7 +91,7 @@ public function testIsHtmlFormRedirect(): void */ public function testGetFormId(): void { - $this->assertSame('', $this->subject->getFormId()); + static::assertSame('', self::$subject->getFormId()); } /** @@ -100,6 +100,6 @@ public function testGetFormId(): void */ public function testGetFormMethod(): void { - $this->assertSame('POST', $this->subject->getFormMethod()); + static::assertSame('POST', self::$subject->getFormMethod()); } } diff --git a/tests/unit/Mage/Page/Block/SwitchTest.php b/tests/unit/Mage/Page/Block/SwitchTest.php index 37c271d5acb..5214bd8bd14 100644 --- a/tests/unit/Mage/Page/Block/SwitchTest.php +++ b/tests/unit/Mage/Page/Block/SwitchTest.php @@ -19,16 +19,16 @@ use Mage; use Mage_Page_Block_Switch as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class SwitchTest extends TestCase +class SwitchTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = new Subject(); + parent::setUpBeforeClass(); + self::$subject = new Subject(); } /** @@ -37,7 +37,7 @@ public function setUp(): void */ public function testGetCurrentWebsiteId(): void { - $this->assertIsInt($this->subject->getCurrentWebsiteId()); + static::assertIsInt(self::$subject->getCurrentWebsiteId()); } /** @@ -46,7 +46,7 @@ public function testGetCurrentWebsiteId(): void */ public function testGetCurrentGroupId(): void { - $this->assertIsInt($this->subject->getCurrentGroupId()); + static::assertIsInt(self::$subject->getCurrentGroupId()); } /** @@ -55,7 +55,7 @@ public function testGetCurrentGroupId(): void */ public function testGetCurrentStoreId(): void { - $this->assertIsInt($this->subject->getCurrentStoreId()); + static::assertIsInt(self::$subject->getCurrentStoreId()); } /** @@ -64,7 +64,7 @@ public function testGetCurrentStoreId(): void */ public function testGetCurrentStoreCode(): void { - $this->assertIsString($this->subject->getCurrentStoreCode()); + static::assertIsString(self::$subject->getCurrentStoreCode()); } /** @@ -73,7 +73,7 @@ public function testGetCurrentStoreCode(): void */ public function testGetRawGroups(): void { - $this->assertIsArray($this->subject->getRawGroups()); + static::assertIsArray(self::$subject->getRawGroups()); } /** @@ -82,7 +82,7 @@ public function testGetRawGroups(): void */ // public function testGetRawStores(): void // { - // $this->assertIsArray($this->subject->getRawStores()); + // $this->assertIsArray(self::$subject->getRawStores()); // } /** @@ -91,7 +91,7 @@ public function testGetRawGroups(): void */ // public function testGetGroups(): void // { - // $this->assertIsArray($this->subject->getGroups()); + // $this->assertIsArray(self::$subject->getGroups()); // } /** @@ -100,7 +100,7 @@ public function testGetRawGroups(): void */ // public function testGetStores(): void // { - // $this->assertIsArray($this->subject->getStores()); + // $this->assertIsArray(self::$subject->getStores()); // } /** @@ -109,6 +109,6 @@ public function testGetRawGroups(): void */ public function testIsStoreInUrl(): void { - $this->assertIsBool($this->subject->isStoreInUrl()); + static::assertIsBool(self::$subject->isStoreInUrl()); } } diff --git a/tests/unit/Mage/Page/Helper/LayoutTest.php b/tests/unit/Mage/Page/Helper/LayoutTest.php index 454d39b2b10..8ebdebd2579 100644 --- a/tests/unit/Mage/Page/Helper/LayoutTest.php +++ b/tests/unit/Mage/Page/Helper/LayoutTest.php @@ -19,16 +19,16 @@ use Mage; use Mage_Page_Helper_Layout as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class LayoutTest extends TestCase +class LayoutTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('page/layout'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('page/layout'); } /** @@ -38,6 +38,6 @@ public function setUp(): void */ public function testApplyTemplate(): void { - $this->assertTrue($this->subject->isModuleEnabled()); + static::assertTrue(self::$subject->isModuleEnabled()); } } diff --git a/tests/unit/Mage/Page/Model/ConfigTest.php b/tests/unit/Mage/Page/Model/ConfigTest.php index 3405e1fd507..0084ca537eb 100644 --- a/tests/unit/Mage/Page/Model/ConfigTest.php +++ b/tests/unit/Mage/Page/Model/ConfigTest.php @@ -19,16 +19,16 @@ use Mage; use Mage_Page_Model_Config as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class ConfigTest extends TestCase +class ConfigTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::getModel('page/config'); + parent::setUpBeforeClass(); + self::$subject = Mage::getModel('page/config'); } /** @@ -37,6 +37,6 @@ public function setUp(): void */ public function testGetPageLayoutHandles(): void { - $this->assertIsArray($this->subject->getPageLayoutHandles()); + static::assertIsArray(self::$subject->getPageLayoutHandles()); } } diff --git a/tests/unit/Mage/Page/Model/Source/LayoutTest.php b/tests/unit/Mage/Page/Model/Source/LayoutTest.php index cb244aae8e0..a6f4e2e67fe 100644 --- a/tests/unit/Mage/Page/Model/Source/LayoutTest.php +++ b/tests/unit/Mage/Page/Model/Source/LayoutTest.php @@ -19,16 +19,16 @@ use Mage; use Mage_Page_Model_Source_Layout as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class LayoutTest extends TestCase +class LayoutTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::getModel('page/source_layout'); + parent::setUpBeforeClass(); + self::$subject = Mage::getModel('page/source_layout'); } /** @@ -37,6 +37,6 @@ public function setUp(): void */ public function testToOptionArray(): void { - $this->assertIsArray($this->subject->toOptionArray(true)); + static::assertIsArray(self::$subject->toOptionArray(true)); } } diff --git a/tests/unit/Mage/Reports/Helper/DataTest.php b/tests/unit/Mage/Reports/Helper/DataTest.php index 6407fab46bb..d82b4d5f30b 100644 --- a/tests/unit/Mage/Reports/Helper/DataTest.php +++ b/tests/unit/Mage/Reports/Helper/DataTest.php @@ -21,20 +21,20 @@ use Mage; use Mage_Reports_Helper_Data as Subject; use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Reports\ReportsTrait; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; use Varien_Data_Collection; use Zend_Date_Exception; -class DataTest extends TestCase +class DataTest extends OpenMageTest { use ReportsTrait; - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('reports/data'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('reports/data'); } /** @@ -44,7 +44,7 @@ public function setUp(): void */ public function testIsModuleEnabled(): void { - $this->assertTrue($this->subject->isModuleEnabled()); + static::assertTrue(self::$subject->isModuleEnabled()); } /** @@ -54,7 +54,7 @@ public function testIsModuleEnabled(): void */ public function testIsReportsEnabled(): void { - $this->assertTrue($this->subject->isReportsEnabled()); + static::assertTrue(self::$subject->isReportsEnabled()); } /** @@ -63,16 +63,16 @@ public function testIsReportsEnabled(): void * @group Mage_Reports * @group Mage_Reports_Helper */ - public function testGetIntervals($expectedResult, $from, $to, $period): void + public function testGetIntervals(int $expectedResult, string $from, string $to, string $period): void { if (PHP_VERSION_ID >= 80300 && version_compare(InstalledVersions::getPrettyVersion('shardj/zf1-future'), '1.24.2', '<=')) { - $this->markTestSkipped('see https://github.com/Shardj/zf1-future/pull/465'); + static::markTestSkipped('see https://github.com/Shardj/zf1-future/pull/465'); } try { - $this->assertCount($expectedResult, $this->subject->getIntervals($from, $to, $period)); + static::assertCount($expectedResult, self::$subject->getIntervals($from, $to, $period)); } catch (Zend_Date_Exception $exception) { - $this->assertSame("No date part in '' found.", $exception->getMessage()); + static::assertSame("No date part in '' found.", $exception->getMessage()); } } @@ -83,10 +83,10 @@ public function testGetIntervals($expectedResult, $from, $to, $period): void * @group Mage_Reports * @group Mage_Reports_Helper */ - public function testPrepareIntervalsCollection($expectedResult, $from, $to, $period): void + public function testPrepareIntervalsCollection(int $expectedResult, string $from, string $to, string $period): void { - $this->markTestIncomplete('Test needs to be reviewed.'); + static::markTestIncomplete('Test needs to be reviewed.'); // @phpstan-ignore-next-line - $this->subject->prepareIntervalsCollection(new Varien_Data_Collection(), $from, $to, $period); + self::$subject->prepareIntervalsCollection(new Varien_Data_Collection(), $from, $to, $period); } } diff --git a/tests/unit/Mage/Reports/Model/Resource/Report/CollectionTest.php b/tests/unit/Mage/Reports/Model/Resource/Report/CollectionTest.php index 2d57109d708..4b8e5d2908d 100644 --- a/tests/unit/Mage/Reports/Model/Resource/Report/CollectionTest.php +++ b/tests/unit/Mage/Reports/Model/Resource/Report/CollectionTest.php @@ -21,22 +21,21 @@ use Mage_Reports_Model_Report; use Mage_Reports_Model_Resource_Report_Collection as Subject; use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Reports\ReportsTrait; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; use Zend_Date; use Zend_Date_Exception; -class CollectionTest extends TestCase +class CollectionTest extends OpenMageTest { use ReportsTrait; public const SKIP_INCOMPLETE_MESSAGE = 'Test needs to be reviewed.'; - public Subject $subject; + private static Subject $subject; public function setUp(): void { - Mage::app(); - $this->subject = Mage::getModel('reports/resource_report_collection'); + self::$subject = Mage::getModel('reports/resource_report_collection'); } /** @@ -46,7 +45,7 @@ public function setUp(): void */ public function testSetPeriod(): void { - $this->assertInstanceOf(Subject::class, $this->subject->setPeriod(1)); + static::assertInstanceOf(Subject::class, self::$subject->setPeriod('1m')); } /** @@ -56,7 +55,7 @@ public function testSetPeriod(): void */ public function testSetIntervals(): void { - $this->assertInstanceOf(Subject::class, $this->subject->setInterval(new Zend_Date(), new Zend_Date())); + static::assertInstanceOf(Subject::class, self::$subject->setInterval(new Zend_Date(), new Zend_Date())); } /** @@ -64,15 +63,15 @@ public function testSetIntervals(): void * @group Mage_Reports * @group Mage_Reports_Model */ - public function testGetIntervals($expectedResult, $from, $to, $period): void + public function testGetIntervals(int $expectedResult, string|Zend_Date $from, string|Zend_Date $to, string $period): void { - $this->subject->setInterval($from, $to); - $this->subject->setPeriod($period); + self::$subject->setInterval($from, $to); + self::$subject->setPeriod($period); try { - $this->assertIsArray($this->subject->getIntervals()); + static::assertIsArray(self::$subject->getIntervals()); } catch (Zend_Date_Exception $exception) { - $this->assertSame("No date part in '' found.", $exception->getMessage()); + static::assertSame("No date part in '' found.", $exception->getMessage()); } } @@ -83,7 +82,7 @@ public function testGetIntervals($expectedResult, $from, $to, $period): void */ public function testGetPeriods(): void { - $this->assertIsArray($this->subject->getPeriods()); + static::assertIsArray(self::$subject->getPeriods()); } /** @@ -94,8 +93,8 @@ public function testGetPeriods(): void */ public function testStoreIds(): void { - $this->subject->setStoreIds([]); - $this->assertSame([], $this->subject->getStoreIds()); + self::$subject->setStoreIds([]); + static::assertSame([], self::$subject->getStoreIds()); } /** @@ -105,7 +104,7 @@ public function testStoreIds(): void */ public function testGetSize(): void { - $this->assertIsInt($this->subject->getSize()); + static::assertIsInt(self::$subject->getSize()); } /** * @covers Mage_Reports_Model_Resource_Report_Collection::setPageSize() @@ -114,7 +113,7 @@ public function testGetSize(): void */ public function testSetPageSize(): void { - $this->assertInstanceOf(Subject::class, $this->subject->setPageSize(1)); + static::assertInstanceOf(Subject::class, self::$subject->setPageSize(1)); } /** @@ -124,16 +123,16 @@ public function testSetPageSize(): void */ public function testGetPageSize(): void { - $this->assertNull($this->subject->getPageSize()); + static::assertNull(self::$subject->getPageSize()); } /** * @group Mage_Reports * @group Mage_Reports_Model */ - public function testInitReport($modelClass = ''): void + public function testInitReport(string $modelClass = ''): void { - $this->assertInstanceOf(Subject::class, $this->subject->initReport($modelClass)); + static::assertInstanceOf(Subject::class, self::$subject->initReport($modelClass)); } /** @@ -142,8 +141,8 @@ public function testInitReport($modelClass = ''): void */ public function testGetReportFull(): void { - $this->markTestIncomplete(self::SKIP_INCOMPLETE_MESSAGE); - # $this->assertInstanceOf(Mage_Reports_Model_Report::class, $this->subject->getReportFull(1, 1)); + static::markTestIncomplete(self::SKIP_INCOMPLETE_MESSAGE); + # $this->assertInstanceOf(Mage_Reports_Model_Report::class, self::$subject->getReportFull(1, 1)); } /** @@ -152,8 +151,8 @@ public function testGetReportFull(): void */ public function testGetReport(): void { - $this->markTestIncomplete(self::SKIP_INCOMPLETE_MESSAGE); - # $this->assertInstanceOf(Mage_Reports_Model_Report::class, $this->subject->getReport(1, 1)); + static::markTestIncomplete(self::SKIP_INCOMPLETE_MESSAGE); + # $this->assertInstanceOf(Mage_Reports_Model_Report::class, self::$subject->getReport(1, 1)); } /** @@ -162,7 +161,7 @@ public function testGetReport(): void */ public function testTimeShift(): void { - $this->markTestIncomplete(self::SKIP_INCOMPLETE_MESSAGE); - # $this->assertSame($this->subject->timeShift('')); + static::markTestIncomplete(self::SKIP_INCOMPLETE_MESSAGE); + # $this->assertSame(self::$subject->timeShift('')); } } diff --git a/tests/unit/Mage/Review/Model/ReviewTest.php b/tests/unit/Mage/Review/Model/ReviewTest.php new file mode 100644 index 00000000000..7e87a90fd2e --- /dev/null +++ b/tests/unit/Mage/Review/Model/ReviewTest.php @@ -0,0 +1,50 @@ +getMockWithCalledMethods(Subject::class, $methods); + + static::assertInstanceOf(Subject::class, $mock); + static::assertSame($expectedResult, $mock->validate()); + } +} diff --git a/tests/unit/Mage/Rule/Model/AbstractTest.php b/tests/unit/Mage/Rule/Model/AbstractTest.php index e2adf84cd3b..e1f9755d2d9 100644 --- a/tests/unit/Mage/Rule/Model/AbstractTest.php +++ b/tests/unit/Mage/Rule/Model/AbstractTest.php @@ -26,24 +26,23 @@ use Mage_Rule_Model_Condition_Combine; use OpenMage\Tests\Unit\Traits\DataProvider\Base\BoolTrait; use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Rule\RuleTrait; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; use Varien_Data_Form; use Varien_Db_Select; use Varien_Object; -class AbstractTest extends TestCase +class AbstractTest extends OpenMageTest { use BoolTrait; use RuleTrait; public const CALL_TO_A_MEMBER_FUNCTION_SET_RULE_ON_NULL = 'Call to a member function setRule() on null'; - public Subject $subject; + private static Subject $subject; public function setUp(): void { - Mage::app(); - $this->subject = $this->getMockForAbstractClass(Subject::class); + self::$subject = $this->getMockForAbstractClass(Subject::class); } /** @@ -53,9 +52,9 @@ public function setUp(): void public function testGetProductFlatSelect(): void { try { - $this->assertInstanceOf(Varien_Db_Select::class, $this->subject->getProductFlatSelect(0)); + static::assertInstanceOf(Varien_Db_Select::class, self::$subject->getProductFlatSelect(0)); } catch (Mage_Core_Exception $exception) { - $this->assertSame('Resource is not set.', $exception->getMessage()); + static::assertSame('Resource is not set.', $exception->getMessage()); } } @@ -67,13 +66,13 @@ public function testGetProductFlatSelect(): void public function testGetConditions(bool $empty): void { if (!$empty) { - $this->subject->setConditions(new Mage_Rule_Model_Condition_Combine()); + self::$subject->setConditions(new Mage_Rule_Model_Condition_Combine()); } try { - $this->assertInstanceOf(Mage_Rule_Model_Condition_Combine::class, $this->subject->getConditions()); + static::assertInstanceOf(Mage_Rule_Model_Condition_Combine::class, self::$subject->getConditions()); } catch (Error $error) { - $this->assertSame(self::CALL_TO_A_MEMBER_FUNCTION_SET_RULE_ON_NULL, $error->getMessage()); + static::assertSame(self::CALL_TO_A_MEMBER_FUNCTION_SET_RULE_ON_NULL, $error->getMessage()); } } @@ -85,13 +84,13 @@ public function testGetConditions(bool $empty): void public function testGetActions(bool $empty): void { if (!$empty) { - $this->subject->setActions(new Mage_Rule_Model_Action_Collection()); + self::$subject->setActions(new Mage_Rule_Model_Action_Collection()); } try { - $this->assertInstanceOf(Mage_Rule_Model_Action_Collection::class, $this->subject->getActions()); + static::assertInstanceOf(Mage_Rule_Model_Action_Collection::class, self::$subject->getActions()); } catch (Error $error) { - $this->assertSame(self::CALL_TO_A_MEMBER_FUNCTION_SET_RULE_ON_NULL, $error->getMessage()); + static::assertSame(self::CALL_TO_A_MEMBER_FUNCTION_SET_RULE_ON_NULL, $error->getMessage()); } } @@ -101,7 +100,7 @@ public function testGetActions(bool $empty): void */ public function testGetForm(): void { - $this->assertInstanceOf(Varien_Data_Form::class, $this->subject->getForm()); + static::assertInstanceOf(Varien_Data_Form::class, self::$subject->getForm()); } /** @@ -110,7 +109,7 @@ public function testGetForm(): void */ public function testLoadPost(array $data = []): void { - $this->assertInstanceOf(Subject::class, $this->subject->loadPost($data)); + static::assertInstanceOf(Subject::class, self::$subject->loadPost($data)); } /** @@ -119,13 +118,13 @@ public function testLoadPost(array $data = []): void * @group Mage_Rule * @group Mage_Rule_Model */ - public function testValidate($expectedResul, ?array $data = null): void + public function testValidate(bool|array $expectedResul, ?array $data = null): void { $object = new Varien_Object($data); try { - $this->assertSame($expectedResul, $this->subject->validate($object)); + static::assertSame($expectedResul, self::$subject->validate($object)); } catch (Error $error) { - $this->assertSame(self::CALL_TO_A_MEMBER_FUNCTION_SET_RULE_ON_NULL, $error->getMessage()); + static::assertSame(self::CALL_TO_A_MEMBER_FUNCTION_SET_RULE_ON_NULL, $error->getMessage()); } } @@ -135,13 +134,13 @@ public function testValidate($expectedResul, ?array $data = null): void * @group Mage_Rule * @group Mage_Rule_Model */ - public function testValidateData($expectedResul, ?array $data = null): void + public function testValidateData(bool|array $expectedResul, ?array $data = null): void { if (PHP_VERSION_ID >= 80300 && version_compare(InstalledVersions::getPrettyVersion('shardj/zf1-future'), '1.24.2', '<=')) { - $this->markTestSkipped('see https://github.com/Shardj/zf1-future/pull/465'); + static::markTestSkipped('see https://github.com/Shardj/zf1-future/pull/465'); } $object = new Varien_Object($data); - $this->assertSame($expectedResul, $this->subject->validateData($object)); + static::assertSame($expectedResul, self::$subject->validateData($object)); } /** @@ -151,7 +150,7 @@ public function testValidateData($expectedResul, ?array $data = null): void */ public function testIsDeleteable(): void { - $this->assertIsBool($this->subject->isDeleteable()); + static::assertIsBool(self::$subject->isDeleteable()); } /** @@ -162,7 +161,7 @@ public function testIsDeleteable(): void */ public function testSetIsDeleteable(bool $value): void { - $this->assertInstanceOf(Subject::class, $this->subject->setIsDeleteable($value)); + static::assertInstanceOf(Subject::class, self::$subject->setIsDeleteable($value)); } /** @@ -172,7 +171,7 @@ public function testSetIsDeleteable(bool $value): void */ public function testIsReadonly(): void { - $this->assertIsBool($this->subject->isReadonly()); + static::assertIsBool(self::$subject->isReadonly()); } /** @@ -183,7 +182,7 @@ public function testIsReadonly(): void */ public function testSetIsReadonly(bool $value): void { - $this->assertInstanceOf(Subject::class, $this->subject->setIsReadonly($value)); + static::assertInstanceOf(Subject::class, self::$subject->setIsReadonly($value)); } /** @@ -193,9 +192,9 @@ public function testSetIsReadonly(bool $value): void public function testGetWebsiteIds(): void { try { - $this->assertIsArray($this->subject->getWebsiteIds()); + static::assertIsArray(self::$subject->getWebsiteIds()); } catch (Mage_Core_Exception $exception) { - $this->assertSame('Resource is not set.', $exception->getMessage()); + static::assertSame('Resource is not set.', $exception->getMessage()); } } @@ -206,7 +205,7 @@ public function testGetWebsiteIds(): void */ public function testAsString(): void { - $this->assertSame('', $this->subject->asString()); + static::assertSame('', self::$subject->asString()); } /** @@ -216,7 +215,7 @@ public function testAsString(): void */ public function testAsHtml(): void { - $this->assertSame('', $this->subject->asHtml()); + static::assertSame('', self::$subject->asHtml()); } /** @@ -226,6 +225,6 @@ public function testAsHtml(): void */ public function testAsArray(): void { - $this->assertSame([], $this->subject->asArray()); + static::assertSame([], self::$subject->asArray()); } } diff --git a/tests/unit/Mage/Rule/Model/EnvironmentTest.php b/tests/unit/Mage/Rule/Model/EnvironmentTest.php index 8fdae735880..77ee28650d3 100644 --- a/tests/unit/Mage/Rule/Model/EnvironmentTest.php +++ b/tests/unit/Mage/Rule/Model/EnvironmentTest.php @@ -19,16 +19,16 @@ use Mage; use Mage_Rule_Model_Environment as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class EnvironmentTest extends TestCase +class EnvironmentTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::getModel('rule/environment'); + parent::setUpBeforeClass(); + self::$subject = Mage::getModel('rule/environment'); } /** @@ -38,6 +38,6 @@ public function setUp(): void */ public function testGetConditionsInstance(): void { - $this->assertInstanceOf(Subject::class, $this->subject->collect()); + static::assertInstanceOf(Subject::class, self::$subject->collect()); } } diff --git a/tests/unit/Mage/Rule/Model/RuleTest.php b/tests/unit/Mage/Rule/Model/RuleTest.php index 636199a4bbc..232b3a46846 100644 --- a/tests/unit/Mage/Rule/Model/RuleTest.php +++ b/tests/unit/Mage/Rule/Model/RuleTest.php @@ -21,16 +21,16 @@ use Mage_Rule_Model_Action_Collection; use Mage_Rule_Model_Condition_Combine; use Mage_Rule_Model_Rule as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class RuleTest extends TestCase +class RuleTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::getModel('rule/rule'); + parent::setUpBeforeClass(); + self::$subject = Mage::getModel('rule/rule'); } /** @@ -40,7 +40,7 @@ public function setUp(): void */ public function testGetConditionsInstance(): void { - $this->assertInstanceOf(Mage_Rule_Model_Condition_Combine::class, $this->subject->getConditionsInstance()); + static::assertInstanceOf(Mage_Rule_Model_Condition_Combine::class, self::$subject->getConditionsInstance()); } /** @@ -50,6 +50,6 @@ public function testGetConditionsInstance(): void */ public function testGetActionsInstance(): void { - $this->assertInstanceOf(Mage_Rule_Model_Action_Collection::class, $this->subject->getActionsInstance()); + static::assertInstanceOf(Mage_Rule_Model_Action_Collection::class, self::$subject->getActionsInstance()); } } diff --git a/tests/unit/Mage/Sales/Block/Order/Item/Renderer/DefaultTest.php b/tests/unit/Mage/Sales/Block/Order/Item/Renderer/DefaultTest.php index ee0d091914f..5736469c7bf 100644 --- a/tests/unit/Mage/Sales/Block/Order/Item/Renderer/DefaultTest.php +++ b/tests/unit/Mage/Sales/Block/Order/Item/Renderer/DefaultTest.php @@ -19,17 +19,17 @@ use Mage; use Mage_Sales_Block_Order_Item_Renderer_Default as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; use Varien_Object; -class DefaultTest extends TestCase +class DefaultTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = new Subject(); + parent::setUpBeforeClass(); + self::$subject = new Subject(); } /** @@ -39,6 +39,6 @@ public function setUp(): void */ public function testSetItem(): void { - $this->assertInstanceOf(Subject::class, $this->subject->setItem(new Varien_Object())); + static::assertInstanceOf(Subject::class, self::$subject->setItem(new Varien_Object())); } } diff --git a/tests/unit/Mage/Sitemap/Model/SitemapTest.php b/tests/unit/Mage/Sitemap/Model/SitemapTest.php index b2b23d2df97..a32b7c1e8f8 100644 --- a/tests/unit/Mage/Sitemap/Model/SitemapTest.php +++ b/tests/unit/Mage/Sitemap/Model/SitemapTest.php @@ -19,54 +19,55 @@ use Mage; use Mage_Sitemap_Model_Sitemap as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; +use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Sitemap\SitemapTrait; +use Throwable; -class SitemapTest extends TestCase +class SitemapTest extends OpenMageTest { - public const SITEMAP_FILE = '???phpunit.sitemap.xml'; + use SitemapTrait; - public Subject $subject; + /** @phpstan-ignore property.onlyWritten */ + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::getModel('sitemap/sitemap'); + parent::setUpBeforeClass(); + self::$subject = Mage::getModel('sitemap/sitemap'); } /** + * @dataProvider provideGetPreparedFilenameData * @group Mage_Sitemap * @group Mage_Sitemap_Model */ - public function testGetPreparedFilename(): void + public function testGetPreparedFilename(array $methods): void { - $mock = $this->getMockBuilder(Subject::class) - ->setMethods(['getSitemapFilename']) - ->getMock(); + $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - $mock->method('getSitemapFilename')->willReturn('text.xml'); - $this->assertIsString($mock->getPreparedFilename()); + static::assertInstanceOf(Subject::class, $mock); + static::assertIsString($mock->getPreparedFilename()); } /** + * @dataProvider provideGenerateXmlData * @group Mage_Sitemap - * @group Mage_Sitemap - * @group Mage_Sitemap_Model * @group Mage_Sitemap_Model - * @todo test content of xml + * @throws Throwable * @todo test validation + * @todo test content of xml */ - public function testGenerateXml(): void + public function testGenerateXml(array $methods): void { - $mock = $this->getMockBuilder(Subject::class) - ->setMethods(['isDeleted']) # do not save to DB - ->setMethods(['getSitemapFilename']) - ->getMock(); + $mock = $this->getMockWithCalledMethods(Subject::class, $methods); + static::assertInstanceOf(Subject::class, $mock); - $mock->method('isDeleted')->willReturn(true); - $mock->method('getSitemapFilename')->willReturn(self::SITEMAP_FILE); $result = $mock->generateXml(); - $this->assertInstanceOf(Subject::class, $result); - $this->assertFileExists(self::SITEMAP_FILE); - unlink(self::SITEMAP_FILE); + static::assertInstanceOf(Subject::class, $result); + + /** @var string $file */ + $file = $methods['getSitemapFilename']; + static::assertFileExists($file); + unlink($file); } } diff --git a/tests/unit/Mage/Tax/Helper/DataTest.php b/tests/unit/Mage/Tax/Helper/DataTest.php index c09fa730d57..87d21726d21 100644 --- a/tests/unit/Mage/Tax/Helper/DataTest.php +++ b/tests/unit/Mage/Tax/Helper/DataTest.php @@ -17,23 +17,25 @@ namespace OpenMage\Tests\Unit\Mage\Tax\Helper; -use Generator; use Mage; use Mage_Tax_Helper_Data as Subject; use Mage_Tax_Model_Calculation; use Mage_Tax_Model_Config; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; +use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Tax\TaxTrait; -class DataTest extends TestCase +class DataTest extends OpenMageTest { - public Subject $subject; + use TaxTrait; + + private static Subject $subject; public const SKIP_WITH_LOCAL_DATA = 'Constant DATA_MAY_CHANGED is defined.'; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('tax/data'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('tax/data'); } /** @@ -43,7 +45,7 @@ public function setUp(): void */ public function testGetPostCodeSubStringLength(): void { - $this->assertSame(10, $this->subject->getPostCodeSubStringLength()); + static::assertSame(10, self::$subject->getPostCodeSubStringLength()); } /** @@ -53,7 +55,7 @@ public function testGetPostCodeSubStringLength(): void */ public function testGetConfig(): void { - $this->assertInstanceOf(Mage_Tax_Model_Config::class, $this->subject->getConfig()); + static::assertInstanceOf(Mage_Tax_Model_Config::class, self::$subject->getConfig()); } /** @@ -63,7 +65,7 @@ public function testGetConfig(): void */ public function testGetCalculator(): void { - $this->assertInstanceOf(Mage_Tax_Model_Calculation::class, $this->subject->getCalculator()); + static::assertInstanceOf(Mage_Tax_Model_Calculation::class, self::$subject->getCalculator()); } /** @@ -73,8 +75,8 @@ public function testGetCalculator(): void */ public function testGetProductPrice(): void { - #$this->assertSame('', $this->subject->getProductPrice()); - $this->markTestIncomplete(); + #$this->assertSame('', self::$subject->getProductPrice()); + static::markTestIncomplete(); } /** @@ -83,7 +85,7 @@ public function testGetProductPrice(): void */ public function testPriceIncludesTax(): void { - $this->assertFalse($this->subject->priceIncludesTax()); + static::assertFalse(self::$subject->priceIncludesTax()); } /** @@ -93,7 +95,7 @@ public function testPriceIncludesTax(): void */ public function testApplyTaxAfterDiscount(): void { - $this->assertTrue($this->subject->applyTaxAfterDiscount()); + static::assertTrue(self::$subject->applyTaxAfterDiscount()); } /** @@ -104,19 +106,7 @@ public function testApplyTaxAfterDiscount(): void */ public function testGetIncExcText(string $expectedResult, bool $flag): void { - $this->assertStringContainsString($expectedResult, $this->subject->getIncExcText($flag)); - } - - public function provideGetIncExcText(): Generator - { - yield 'true' => [ - 'Incl. Tax', - true, - ]; - yield 'false' => [ - 'Excl. Tax', - false, - ]; + static::assertStringContainsString($expectedResult, self::$subject->getIncExcText($flag)); } /** @@ -126,7 +116,7 @@ public function provideGetIncExcText(): Generator */ public function testGetPriceDisplayType(): void { - $this->assertSame(1, $this->subject->getPriceDisplayType()); + static::assertSame(1, self::$subject->getPriceDisplayType()); } /** @@ -136,8 +126,8 @@ public function testGetPriceDisplayType(): void */ public function testNeedPriceConversion(): void { - #$this->assertSame(1, $this->subject->needPriceConversion()); - $this->markTestIncomplete(); + #$this->assertSame(1, self::$subject->needPriceConversion()); + static::markTestIncomplete(); } /** @@ -149,8 +139,8 @@ public function testNeedPriceConversion(): void */ public function testGetPriceFormat(): void { - #$this->assertSame('', $this->subject->getPriceFormat()); - $this->markTestIncomplete(); + #$this->assertSame('', self::$subject->getPriceFormat()); + static::markTestIncomplete(); } /** @@ -161,9 +151,9 @@ public function testGetPriceFormat(): void public function testGetTaxRatesByProductClass(): void { if (defined('DATA_MAY_CHANGED')) { - $this->markTestSkipped(self::SKIP_WITH_LOCAL_DATA); + static::markTestSkipped(self::SKIP_WITH_LOCAL_DATA); } - $this->assertSame('{"value_2":8.25,"value_4":0}', $this->subject->getTaxRatesByProductClass()); + static::assertSame('{"value_2":8.25,"value_4":0}', self::$subject->getTaxRatesByProductClass()); } /** @@ -174,9 +164,9 @@ public function testGetTaxRatesByProductClass(): void public function testGetAllRatesByProductClass(): void { if (defined('DATA_MAY_CHANGED')) { - $this->markTestSkipped(self::SKIP_WITH_LOCAL_DATA); + static::markTestSkipped(self::SKIP_WITH_LOCAL_DATA); } - $this->assertSame('{"value_2":8.25,"value_4":0}', $this->subject->getAllRatesByProductClass()); + static::assertSame('{"value_2":8.25,"value_4":0}', self::$subject->getAllRatesByProductClass()); } /** @@ -186,8 +176,8 @@ public function testGetAllRatesByProductClass(): void */ public function testGetPrice(): void { - #$this->assertFalse($this->subject->getPrice()); - $this->markTestIncomplete(); + #$this->assertFalse(self::$subject->getPrice()); + static::markTestIncomplete(); } /** @@ -197,7 +187,7 @@ public function testGetPrice(): void */ public function testDisplayPriceIncludingTax(): void { - $this->assertFalse($this->subject->displayPriceIncludingTax()); + static::assertFalse(self::$subject->displayPriceIncludingTax()); } /** @@ -207,7 +197,7 @@ public function testDisplayPriceIncludingTax(): void */ public function testDisplayPriceExcludingTax(): void { - $this->assertTrue($this->subject->displayPriceExcludingTax()); + static::assertTrue(self::$subject->displayPriceExcludingTax()); } /** @@ -217,7 +207,7 @@ public function testDisplayPriceExcludingTax(): void */ public function testDisplayBothPrices(): void { - $this->assertFalse($this->subject->displayBothPrices()); + static::assertFalse(self::$subject->displayBothPrices()); } /** @@ -225,21 +215,9 @@ public function testDisplayBothPrices(): void * @group Mage_Tax * @group Mage_Tax_Helper */ - public function testGetIncExcTaxLabel($expectedResult, bool $flag): void - { - $this->assertStringContainsString($expectedResult, $this->subject->getIncExcTaxLabel($flag)); - } - - public function provideGetIncExcTaxLabel(): Generator + public function testGetIncExcTaxLabel(string $expectedResult, bool $flag): void { - yield 'true' => [ - '(Incl. Tax)', - true, - ]; - yield 'false' => [ - '(Excl. Tax)', - false, - ]; + static::assertStringContainsString($expectedResult, self::$subject->getIncExcTaxLabel($flag)); } /** @@ -249,7 +227,7 @@ public function provideGetIncExcTaxLabel(): Generator */ public function testShippingPriceIncludesTax(): void { - $this->assertFalse($this->subject->shippingPriceIncludesTax()); + static::assertFalse(self::$subject->shippingPriceIncludesTax()); } /** @@ -259,7 +237,7 @@ public function testShippingPriceIncludesTax(): void */ public function testGetShippingPriceDisplayType(): void { - $this->assertSame(1, $this->subject->getShippingPriceDisplayType()); + static::assertSame(1, self::$subject->getShippingPriceDisplayType()); } /** @@ -269,7 +247,7 @@ public function testGetShippingPriceDisplayType(): void */ public function testDisplayShippingPriceIncludingTax(): void { - $this->assertFalse($this->subject->displayShippingPriceIncludingTax()); + static::assertFalse(self::$subject->displayShippingPriceIncludingTax()); } /** @@ -279,7 +257,7 @@ public function testDisplayShippingPriceIncludingTax(): void */ public function testDisplayShippingPriceExcludingTax(): void { - $this->assertTrue($this->subject->displayShippingPriceExcludingTax()); + static::assertTrue(self::$subject->displayShippingPriceExcludingTax()); } /** @@ -289,7 +267,7 @@ public function testDisplayShippingPriceExcludingTax(): void */ public function testDisplayShippingBothPrices(): void { - $this->assertFalse($this->subject->displayShippingBothPrices()); + static::assertFalse(self::$subject->displayShippingBothPrices()); } /** @@ -299,7 +277,7 @@ public function testDisplayShippingBothPrices(): void */ public function testGetShippingTaxClass(): void { - $this->assertSame(0, $this->subject->getShippingTaxClass(null)); + static::assertSame(0, self::$subject->getShippingTaxClass(null)); } /** @@ -308,7 +286,7 @@ public function testGetShippingTaxClass(): void */ public function testGetShippingPrice(): void { - $this->assertEqualsWithDelta(100.0, $this->subject->getShippingPrice(100.0), PHP_FLOAT_EPSILON); + static::assertEqualsWithDelta(100.0, self::$subject->getShippingPrice(100.0), PHP_FLOAT_EPSILON); } /** @@ -318,7 +296,7 @@ public function testGetShippingPrice(): void */ public function testDiscountTax(): void { - $this->assertFalse($this->subject->discountTax()); + static::assertFalse(self::$subject->discountTax()); } /** @@ -328,7 +306,7 @@ public function testDiscountTax(): void */ public function testGetTaxBasedOn(): void { - $this->assertSame('shipping', $this->subject->getTaxBasedOn()); + static::assertSame('shipping', self::$subject->getTaxBasedOn()); } /** @@ -338,7 +316,7 @@ public function testGetTaxBasedOn(): void */ public function testApplyTaxOnCustomPrice(): void { - $this->assertTrue($this->subject->applyTaxOnCustomPrice()); + static::assertTrue(self::$subject->applyTaxOnCustomPrice()); } /** @@ -348,7 +326,7 @@ public function testApplyTaxOnCustomPrice(): void */ public function testApplyTaxOnOriginalPrice(): void { - $this->assertFalse($this->subject->applyTaxOnOriginalPrice()); + static::assertFalse(self::$subject->applyTaxOnOriginalPrice()); } /** @@ -357,7 +335,7 @@ public function testApplyTaxOnOriginalPrice(): void */ public function testGetCalculationSequence(): void { - $this->assertSame('1_0', $this->subject->getCalculationSequence()); + static::assertSame('1_0', self::$subject->getCalculationSequence()); } /** @@ -367,7 +345,7 @@ public function testGetCalculationSequence(): void */ public function testGetCalculationAgorithm(): void { - $this->assertSame('TOTAL_BASE_CALCULATION', $this->subject->getCalculationAgorithm()); + static::assertSame('TOTAL_BASE_CALCULATION', self::$subject->getCalculationAgorithm()); } /** @@ -376,7 +354,7 @@ public function testGetCalculationAgorithm(): void */ public function testIsWrongDisplaySettingsIgnored(): void { - $this->assertFalse($this->subject->isWrongDisplaySettingsIgnored()); + static::assertFalse(self::$subject->isWrongDisplaySettingsIgnored()); } /** @@ -385,7 +363,7 @@ public function testIsWrongDisplaySettingsIgnored(): void */ public function testIsWrongDiscountSettingsIgnored(): void { - $this->assertFalse($this->subject->isWrongDiscountSettingsIgnored()); + static::assertFalse(self::$subject->isWrongDiscountSettingsIgnored()); } /** @@ -394,7 +372,7 @@ public function testIsWrongDiscountSettingsIgnored(): void */ public function testIsConflictingFptTaxConfigurationSettingsIgnored(): void { - $this->assertFalse($this->subject->isConflictingFptTaxConfigurationSettingsIgnored()); + static::assertFalse(self::$subject->isConflictingFptTaxConfigurationSettingsIgnored()); } /** @@ -404,6 +382,6 @@ public function testIsConflictingFptTaxConfigurationSettingsIgnored(): void */ public function testIsCrossBorderTradeEnabled(): void { - $this->assertFalse($this->subject->isCrossBorderTradeEnabled()); + static::assertFalse(self::$subject->isCrossBorderTradeEnabled()); } } diff --git a/tests/unit/Mage/Uploader/Block/AbstractTest.php b/tests/unit/Mage/Uploader/Block/AbstractTest.php index 56f5c2588a0..2ba12112b6b 100644 --- a/tests/unit/Mage/Uploader/Block/AbstractTest.php +++ b/tests/unit/Mage/Uploader/Block/AbstractTest.php @@ -22,16 +22,15 @@ use Mage_Uploader_Model_Config_Browsebutton; use Mage_Uploader_Model_Config_Misc; use Mage_Uploader_Model_Config_Uploader; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class AbstractTest extends TestCase +class AbstractTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; public function setUp(): void { - Mage::app(); - $this->subject = $this->getMockForAbstractClass(Subject::class); + self::$subject = $this->getMockForAbstractClass(Subject::class); } /** @@ -40,7 +39,7 @@ public function setUp(): void */ public function testGetMiscConfig(): void { - $this->assertInstanceOf(Mage_Uploader_Model_Config_Misc::class, $this->subject->getMiscConfig()); + static::assertInstanceOf(Mage_Uploader_Model_Config_Misc::class, self::$subject->getMiscConfig()); } /** @@ -51,7 +50,7 @@ public function testGetMiscConfig(): void */ public function testGetUploaderConfig(): void { - $this->assertInstanceOf(Mage_Uploader_Model_Config_Uploader::class, $this->subject->getUploaderConfig()); + static::assertInstanceOf(Mage_Uploader_Model_Config_Uploader::class, self::$subject->getUploaderConfig()); } /** @@ -60,7 +59,7 @@ public function testGetUploaderConfig(): void */ public function testGetButtonConfig(): void { - $this->assertInstanceOf(Mage_Uploader_Model_Config_Browsebutton::class, $this->subject->getButtonConfig()); + static::assertInstanceOf(Mage_Uploader_Model_Config_Browsebutton::class, self::$subject->getButtonConfig()); } /** @@ -70,8 +69,8 @@ public function testGetButtonConfig(): void public function testGetElementId(): void { $suffix = 'test'; - $result = $this->subject->getElementId($suffix); - $this->assertStringStartsWith('id_', $result); - $this->assertStringEndsWith('-' . $suffix, $result); + $result = self::$subject->getElementId($suffix); + static::assertStringStartsWith('id_', $result); + static::assertStringEndsWith('-' . $suffix, $result); } } diff --git a/tests/unit/Mage/Uploader/Helper/DataTest.php b/tests/unit/Mage/Uploader/Helper/DataTest.php index 591686c376d..1159db035da 100644 --- a/tests/unit/Mage/Uploader/Helper/DataTest.php +++ b/tests/unit/Mage/Uploader/Helper/DataTest.php @@ -19,16 +19,16 @@ use Mage; use Mage_Uploader_Helper_Data as Subject; -use PHPUnit\Framework\TestCase; +use OpenMage\Tests\Unit\OpenMageTest; -class DataTest extends TestCase +class DataTest extends OpenMageTest { - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); - $this->subject = Mage::helper('uploader/data'); + parent::setUpBeforeClass(); + self::$subject = Mage::helper('uploader/data'); } /** @@ -37,6 +37,6 @@ public function setUp(): void */ public function testIsModuleEnabled(): void { - $this->assertIsBool($this->subject->isModuleEnabled()); + static::assertIsBool(self::$subject->isModuleEnabled()); } } diff --git a/tests/unit/Mage/Uploader/Helper/FileTest.php b/tests/unit/Mage/Uploader/Helper/FileTest.php index 3926d5b72bd..936dc827ff0 100644 --- a/tests/unit/Mage/Uploader/Helper/FileTest.php +++ b/tests/unit/Mage/Uploader/Helper/FileTest.php @@ -20,23 +20,23 @@ use Mage; use Mage_Core_Model_Config; use Mage_Uploader_Helper_File as Subject; +use OpenMage\Tests\Unit\OpenMageTest; use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Uploader\UploaderTrait; -use PHPUnit\Framework\TestCase; -class FileTest extends TestCase +class FileTest extends OpenMageTest { use UploaderTrait; - public Subject $subject; + private static Subject $subject; - public function setUp(): void + public static function setUpBeforeClass(): void { - Mage::app(); + parent::setUpBeforeClass(); /** @var Mage_Core_Model_Config $config */ $config = Mage::getConfig(); $config->setNode('global/mime/types/test-new-node', 'application/octet-stream'); - $this->subject = Mage::helper('uploader/file'); + self::$subject = Mage::helper('uploader/file'); } /** @@ -49,7 +49,7 @@ public function setUp(): void */ public function testGetMimeTypeFromExtensionList(array $expectedResult, $extensionsList): void { - $this->assertSame($expectedResult, $this->subject->getMimeTypeFromExtensionList($extensionsList)); + static::assertSame($expectedResult, self::$subject->getMimeTypeFromExtensionList($extensionsList)); } /** @@ -58,7 +58,7 @@ public function testGetMimeTypeFromExtensionList(array $expectedResult, $extensi */ public function testGetPostMaxSize(): void { - $this->assertIsString($this->subject->getPostMaxSize()); + static::assertIsString(self::$subject->getPostMaxSize()); } /** @@ -67,22 +67,20 @@ public function testGetPostMaxSize(): void */ public function testGetUploadMaxSize(): void { - $this->assertIsString($this->subject->getUploadMaxSize()); + static::assertIsString(self::$subject->getUploadMaxSize()); } /** + * @dataProvider provideGetDataMaxSizeData * @group Mage_Uploader * @group Mage_Uploader_Helper */ - public function testGetDataMaxSize(): void + public function testGetDataMaxSize(string $expectedResult, array $methods): void { - $mock = $this->getMockBuilder(Subject::class) - ->setMethods(['getPostMaxSize', 'getUploadMaxSize']) - ->getMock(); + $mock = $this->getMockWithCalledMethods(Subject::class, $methods, true); - $mock->expects($this->once())->method('getPostMaxSize')->willReturn('1G'); - $mock->expects($this->once())->method('getUploadMaxSize')->willReturn('1M'); - $this->assertSame('1M', $mock->getDataMaxSize()); + static::assertInstanceOf(Subject::class, $mock); + static::assertSame($expectedResult, $mock->getDataMaxSize()); } /** @@ -90,13 +88,11 @@ public function testGetDataMaxSize(): void * @group Mage_Uploader * @group Mage_Uploader_Helper */ - public function testGetDataMaxSizeInBytes(int $expectedResult, string $maxSize): void + public function testGetDataMaxSizeInBytes(int $expectedResult, array $methods): void { - $mock = $this->getMockBuilder(Subject::class) - ->setMethods(['getDataMaxSize']) - ->getMock(); + $mock = $this->getMockWithCalledMethods(Subject::class, $methods, true); - $mock->expects($this->once())->method('getDataMaxSize')->willReturn($maxSize); - $this->assertSame($expectedResult, $mock->getDataMaxSizeInBytes()); + static::assertInstanceOf(Subject::class, $mock); + static::assertSame($expectedResult, $mock->getDataMaxSizeInBytes()); } } diff --git a/tests/unit/Mage/Wishlist/Model/ItemTest.php b/tests/unit/Mage/Wishlist/Model/ItemTest.php new file mode 100644 index 00000000000..3961549a85f --- /dev/null +++ b/tests/unit/Mage/Wishlist/Model/ItemTest.php @@ -0,0 +1,102 @@ +setQty($inputQty); + static::assertEquals($expectedQty, self::$subject->getQty()); + } + + public function qtyDataProvider(): \Generator + { + yield 'positive quantity' => [ + 5, + 5, + ]; + yield 'zero quantity' => [ + 0, + 0, + ]; + yield 'negative quantity' => [ + 1, + -1, + ]; + } + + /** + * @dataProvider validateDataProvider + * @group Mage_Wishlist + * @group Mage_Wishlist_Model + * @throws Mage_Core_Exception + */ + public function testValidate(?string $expectedExceptionMessage, ?int $wishlistId, ?int $productId): void + { + self::$subject->setWishlistId($wishlistId); + self::$subject->setProductId($productId); + + if ($expectedExceptionMessage) { + $this->expectExceptionMessage($expectedExceptionMessage); + } + + $result = self::$subject->validate(); + + if (!$expectedExceptionMessage) { + static::assertTrue($result); + } + } + + public function validateDataProvider(): \Generator + { + yield 'valid data' => [ + null, + 1, + 1, + ]; + yield 'missing wishlist ID' => [ + 'Cannot specify wishlist.', + null, + 1, + ]; + yield 'missing product ID' => [ + 'Cannot specify product.', + 1, + null, + ]; + } +} diff --git a/tests/unit/OpenMageTest.php b/tests/unit/OpenMageTest.php new file mode 100644 index 00000000000..cccd57c9484 --- /dev/null +++ b/tests/unit/OpenMageTest.php @@ -0,0 +1,66 @@ +getMockBuilder($class) + ->setMethods(array_keys($methods)) + ->getMock(); + + if (is_null($expectOnce)) { + return $mock; + } + + foreach ($methods as $key => $value) { + if ($expectOnce) { + $mockMethod = $mock->expects(static::once())->method($key); + } else { + $mockMethod = $mock->method($key); + } + + if ($value === self::WILL_RETURN_SELF) { + $mockMethod->willReturnSelf(); + } else { + $mockMethod->willReturn($value); + } + } + + return $mock; + } +} diff --git a/tests/unit/Traits/DataProvider/Mage/Admin/Model/BlockTrait.php b/tests/unit/Traits/DataProvider/Mage/Admin/Model/BlockTrait.php new file mode 100644 index 00000000000..f80f8491eff --- /dev/null +++ b/tests/unit/Traits/DataProvider/Mage/Admin/Model/BlockTrait.php @@ -0,0 +1,99 @@ + [ + true, + [ + 'getBlockName' => 'test/block', + 'getIsAllowed' => '1', + ], + ]; + yield 'invalid' => [ + [$errorIncorrectBlockName], + [ + 'getBlockName' => 'Test_Block', + 'getIsAllowed' => '1', + ], + ]; + yield 'errors: blank blockname' => [ + [ + 'Block Name is required field.', + 'Block Name is incorrect.', + 'Is Allowed is required field.', + ], + [ + 'getBlockName' => '', + 'getIsAllowed' => '', + ], + ]; + yield 'errors: invalid char blockname' => [ + [$errorIncorrectBlockName], + [ + 'getBlockName' => '~', + 'getIsAllowed' => '1', + ], + ]; + yield 'errors: invalid blockname' => [ + [$errorIncorrectBlockName], + [ + 'getBlockName' => 'test', + 'getIsAllowed' => '0', + ], + ]; + yield 'errors: null blockname' => [ + [ + 'Block Name is required field.', + $errorIncorrectBlockName, + ], + [ + 'getBlockName' => null, + 'getIsAllowed' => '1', + ], + ]; + yield 'errors: special chars in blockname' => [ + [$errorIncorrectBlockName], + [ + 'getBlockName' => '!@#$%^&*()', + 'getIsAllowed' => '1', + ], + ]; + yield 'errors: numeric blockname' => [ + [$errorIncorrectBlockName], + [ + 'getBlockName' => '12345', + 'getIsAllowed' => '1', + ], + ]; + yield 'valid: mixed case blockname' => [ + true, + [ + 'getBlockName' => 'Test/Block', + 'getIsAllowed' => '1', + ], + ]; + } +} diff --git a/tests/unit/Traits/DataProvider/Mage/Admin/Model/UserTrait.php b/tests/unit/Traits/DataProvider/Mage/Admin/Model/UserTrait.php new file mode 100644 index 00000000000..41ce6e10599 --- /dev/null +++ b/tests/unit/Traits/DataProvider/Mage/Admin/Model/UserTrait.php @@ -0,0 +1,122 @@ + '999', + 'getUsername' => 'new', + 'getPassword' => 'veryl0ngpassw0rd', + 'getIsActive' => '1', + 'validatePasswordHash' => true, + 'hasAssigned2Role' => true, + ]; + + yield 'pass' => [ + true, + $validData, + ]; + + $data = $validData; + $data['getUsername'] = 'admin'; + yield 'fail #0 account exists' => [ + 'User Name already exists.', + $data, + ]; + + $data = $validData; + $data['getIsActive'] = '0'; + yield 'fail #1 inactive' => [ + 'This account is inactive.', + $data, + ]; + + $data = $validData; + $data['validatePasswordHash'] = false; + yield 'fail #2 invalid hash' => [ + false, + $data, + ]; + + $data = $validData; + $data['hasAssigned2Role'] = false; + yield 'fail #3 no role assigned' => [ + 'Access denied.', + $data, + ]; + } + + public function provideValidateAdminUserData(): Generator + { + yield 'fail #1' => [ + [ + 0 => 'User Name is required field.', + 1 => 'First Name is required field.', + 2 => 'Last Name is required field.', + 3 => 'Please enter a valid email.', + 4 => 'Password must be at least of 14 characters.', + 5 => 'Password must include both numeric and alphabetic characters.', + ], + [ + 'hasNewPassword' => true, + 'getNewPassword' => '123', + 'hasPassword' => false, + 'getPassword' => '456', + ], + ]; + yield 'fails #2' => [ + [ + 0 => 'User Name is required field.', + 1 => 'First Name is required field.', + 2 => 'Last Name is required field.', + 3 => 'Please enter a valid email.', + 4 => 'Password must be at least of 14 characters.', + 5 => 'Password must include both numeric and alphabetic characters.', + ], + [ + 'hasNewPassword' => false, + 'getNewPassword' => '123', + 'hasPassword' => true, + 'getPassword' => '456', + ], + ]; + } + + public function provideIsResetPasswordLinkTokenExpiredData(): Generator + { + yield '#1' => [ + true, + [ + 'getRpToken' => '', + 'getRpTokenCreatedAt' => '', + ], + ]; + yield '#2' => [ + true, + [ + 'getRpToken' => '1', + 'getRpTokenCreatedAt' => '0', + ], + ]; + } +} diff --git a/tests/unit/Traits/DataProvider/Mage/Admin/Model/VariableTrait.php b/tests/unit/Traits/DataProvider/Mage/Admin/Model/VariableTrait.php new file mode 100644 index 00000000000..47aeee87a6e --- /dev/null +++ b/tests/unit/Traits/DataProvider/Mage/Admin/Model/VariableTrait.php @@ -0,0 +1,55 @@ + [ + true, + [ + 'getVariableName' => 'test', + 'getIsAllowed' => '1', + ], + ]; + yield 'test error empty' => [ + ['Variable Name is required field.'], + [ + 'getVariableName' => '', + 'getIsAllowed' => '1', + ], + ]; + yield 'test error regex' => [ + ['Variable Name is incorrect.'], + [ + 'getVariableName' => '#invalid-name#', + 'getIsAllowed' => '1', + ], + ]; + yield 'test error allowed' => [ + ['Is Allowed is required field.'], + [ + 'getVariableName' => 'test', + 'getIsAllowed' => '', + ], + ]; + } +} diff --git a/tests/unit/Traits/DataProvider/Mage/AdminNotification/Model/InboxTrait.php b/tests/unit/Traits/DataProvider/Mage/AdminNotification/Model/InboxTrait.php new file mode 100644 index 00000000000..99f7c20fc22 --- /dev/null +++ b/tests/unit/Traits/DataProvider/Mage/AdminNotification/Model/InboxTrait.php @@ -0,0 +1,45 @@ + [ + [ + Subject::SEVERITY_CRITICAL => 'critical', + Subject::SEVERITY_MAJOR => 'major', + Subject::SEVERITY_MINOR => 'minor', + Subject::SEVERITY_NOTICE => 'notice', + ], + null, + ]; + yield 'valid' => [ + 'critical', + Subject::SEVERITY_CRITICAL, + ]; + yield 'invalid' => [ + null, + 0, + ]; + } +} diff --git a/tests/unit/Traits/DataProvider/Mage/Adminhtml/Block/Widget/GridTrait.php b/tests/unit/Traits/DataProvider/Mage/Adminhtml/Block/Widget/GridTrait.php new file mode 100644 index 00000000000..ee0dc181b28 --- /dev/null +++ b/tests/unit/Traits/DataProvider/Mage/Adminhtml/Block/Widget/GridTrait.php @@ -0,0 +1,152 @@ + [ + [], + [], + ]; + yield 'index entity_id' => [ + [ + 'index' => 'entity_id', + 'align' => 'right', + 'type' => 'number', + 'width' => '1', + ], + [ + 'index' => 'entity_id', + ], + ]; + yield 'index entity_id w/ override' => [ + [ + 'index' => 'entity_id', + 'align' => 'center', + 'type' => 'text', + ], + [ + 'index' => 'entity_id', + 'align' => 'center', + 'type' => 'text', + ], + ]; + yield 'index array - ref #4475' => [ + [ + 'index' => ['firstname', 'lastname'], + 'type' => 'concat', + 'separator' => ' ', + ], + [ + 'index' => ['firstname', 'lastname'], + 'type' => 'concat', + ], + ]; + yield 'type action' => [ + [ + 'type' => 'action', + 'filter' => false, + 'sortable' => false, + 'width' => '40', + 'header' => 'Action', + ], + [ + 'type' => 'action', + ], + ]; + yield 'type action w/ override' => [ + [ + 'type' => 'action', + 'header' => 'test', + 'filter' => false, + 'sortable' => false, + 'width' => '40', + ], + [ + 'type' => 'action', + 'header' => 'test', + ], + ]; + yield 'type currency' => [ + [ + 'type' => 'currency', + 'align' => 'right', + 'index' => 'price', + 'header' => 'Price', + ], + [ + 'type' => 'currency', + ], + ]; + yield 'type date' => [ + [ + 'type' => 'date', + 'width' => '140', + ], + [ + 'type' => 'date', + ], + ]; + yield 'type datetime' => [ + [ + 'type' => 'datetime', + 'width' => '170', + ], + [ + 'type' => 'datetime', + ], + ]; + yield 'type number' => [ + [ + 'type' => 'number', + 'align' => 'right', + 'width' => '1', + ], + [ + 'type' => 'number', + ], + ]; + yield 'type price' => [ + [ + 'type' => 'price', + 'align' => 'right', + 'index' => 'price', + 'header' => 'Price', + ], + [ + 'type' => 'price', + ], + ]; + yield 'type store' => [ + [ + 'type' => 'store', + 'index' => 'store_id', + 'store_view' => true, + 'width' => '160', + 'header' => 'Store View', + ], + [ + 'type' => 'store', + ], + ]; + } +} diff --git a/tests/unit/Traits/DataProvider/Mage/Adminhtml/Helper/AddressTrait.php b/tests/unit/Traits/DataProvider/Mage/Adminhtml/Helper/AddressTrait.php new file mode 100644 index 00000000000..b88de84a543 --- /dev/null +++ b/tests/unit/Traits/DataProvider/Mage/Adminhtml/Helper/AddressTrait.php @@ -0,0 +1,36 @@ + [ + Subject::DEFAULT_STREET_LINES_COUNT, + 0, + ]; + yield 'custom' => [ + 4, + 4, + ]; + } +} diff --git a/tests/unit/Traits/DataProvider/Mage/Adminhtml/Helper/ConfigTrait.php b/tests/unit/Traits/DataProvider/Mage/Adminhtml/Helper/ConfigTrait.php new file mode 100644 index 00000000000..cfa29e33571 --- /dev/null +++ b/tests/unit/Traits/DataProvider/Mage/Adminhtml/Helper/ConfigTrait.php @@ -0,0 +1,57 @@ + [ + [ + 'color' => [ + 'backend_model' => 'adminhtml/system_config_backend_color', + ], + ], + null, + ]; + yield 'color' => [ + [ + 'backend_model' => 'adminhtml/system_config_backend_color', + ], + 'color', + ]; + yield 'invalid' => [ + [], + 'invalid', + ]; + } + + public function provideGetBackendModelByInputType(): Generator + { + yield 'color' => [ + 'adminhtml/system_config_backend_color', + 'color', + ]; + yield 'invalid' => [ + null, + 'invalid', + ]; + } +} diff --git a/tests/unit/Traits/DataProvider/Mage/Adminhtml/Helper/JsTrait.php b/tests/unit/Traits/DataProvider/Mage/Adminhtml/Helper/JsTrait.php new file mode 100644 index 00000000000..9136096ce89 --- /dev/null +++ b/tests/unit/Traits/DataProvider/Mage/Adminhtml/Helper/JsTrait.php @@ -0,0 +1,43 @@ + [ + [ + 0 => 1, + 1 => 2, + 2 => 3, + 3 => 4, + ], + '1&2&3&4', + ]; + yield 'w/ keys' => [ + [ + 1 => [], + 2 => [], + ], + '1=1&2=2', + ]; + } +} diff --git a/tests/unit/Traits/DataProvider/Mage/Adminhtml/Helper/SalesTrait.php b/tests/unit/Traits/DataProvider/Mage/Adminhtml/Helper/SalesTrait.php new file mode 100644 index 00000000000..f0f5e5620cd --- /dev/null +++ b/tests/unit/Traits/DataProvider/Mage/Adminhtml/Helper/SalesTrait.php @@ -0,0 +1,31 @@ + [ + '<a href="https://localhost">', + '', + ]; + } +} diff --git a/tests/unit/Traits/DataProvider/Mage/Api/Model/UserTrait.php b/tests/unit/Traits/DataProvider/Mage/Api/Model/UserTrait.php new file mode 100644 index 00000000000..e65a6b9f961 --- /dev/null +++ b/tests/unit/Traits/DataProvider/Mage/Api/Model/UserTrait.php @@ -0,0 +1,123 @@ + 'validuser', + 'getFirstname' => 'John', + 'getLastname' => 'Doe', + 'getEmail' => 'john.doe@example.com', + 'hasNewApiKey' => false, + 'getNewApiKey' => null, + 'hasApiKey' => true, + 'getApiKey' => 'validapikey123', + 'hasApiKeyConfirmation' => true, + 'getApiKeyConfirmation' => 'validapikey123', + 'userExists' => false, + ]; + + yield 'valid data' => [ + true, + $validUser, + ]; + + $data = $validUser; + $data['getUsername'] = ''; + yield 'missing username' => [ + ['User Name is required field.'], + $data, + ]; + + $data = $validUser; + $data['getFirstname'] = ''; + yield 'missing firstname' => [ + ['First Name is required field.'], + $data, + ]; + + $data = $validUser; + $data['getLastname'] = ''; + yield 'missing lastname' => [ + ['Last Name is required field.'], + $data, + ]; + + $data = $validUser; + $data['getEmail'] = ''; + yield 'missing email' => [ + ['Please enter a valid email.'], + $data, + ]; + + $data = $validUser; + $data['getEmail'] = 'invalid-email'; + yield 'invalid email' => [ + ['Please enter a valid email.'], + $data, + ]; + + $data = $validUser; + $data['getApiKey'] = ''; + yield 'missing api key' => [ + [ + 'Api Key must be at least of 7 characters.', + 'Api Key must include both numeric and alphabetic characters.', + 'Api Key confirmation must be same as Api Key.', + ], + $data, + ]; + + $data = $validUser; + $data['getApiKeyConfirmation'] = ''; + yield 'missing api confirm key' => [ + ['Api Key confirmation must be same as Api Key.'], + $data, + ]; + + $data = $validUser; + $apiKey = '1234567'; + $data['getApiKey'] = $apiKey; + $data['getApiKeyConfirmation'] = $apiKey; + yield 'numeric only api key' => [ + ['Api Key must include both numeric and alphabetic characters.'], + $data, + ]; + + $data = $validUser; + $apiKey = 'abcdefg'; + $data['getApiKey'] = $apiKey; + $data['getApiKeyConfirmation'] = $apiKey; + yield 'string only api key' => [ + ['Api Key must include both numeric and alphabetic characters.'], + $data, + ]; + + $data = $validUser; + $data['userExists'] = true; + yield 'user exists' => [ + ['A user with the same user name or email already exists.'], + $data, + ]; + } +} diff --git a/tests/unit/Traits/DataProvider/Mage/Catalog/Helper/DataTrait.php b/tests/unit/Traits/DataProvider/Mage/Catalog/Helper/DataTrait.php new file mode 100644 index 00000000000..bce164d224e --- /dev/null +++ b/tests/unit/Traits/DataProvider/Mage/Catalog/Helper/DataTrait.php @@ -0,0 +1,41 @@ + [ + [ + '100', + ], + '100', + ]; + yield 'test #2 w/ length' => [ + [ + '10', + '0', + ], + '100', + 2, + ]; + } +} diff --git a/tests/unit/Traits/DataProvider/Mage/Catalog/Helper/Product/UrlTrait.php b/tests/unit/Traits/DataProvider/Mage/Catalog/Helper/Product/UrlTrait.php new file mode 100644 index 00000000000..b476eca3152 --- /dev/null +++ b/tests/unit/Traits/DataProvider/Mage/Catalog/Helper/Product/UrlTrait.php @@ -0,0 +1,43 @@ + [ + '', + null, + ]; + yield 'string' => [ + 'string', + 'string', + ]; + yield 'umlauts' => [ + 'string with aou', + 'string with ÄÖÜ', + ]; + yield 'at' => [ + 'at', + '@', + ]; + } +} diff --git a/tests/unit/Traits/DataProvider/Mage/Catalog/Helper/ProductTrait.php b/tests/unit/Traits/DataProvider/Mage/Catalog/Helper/ProductTrait.php new file mode 100644 index 00000000000..b44c81ea370 --- /dev/null +++ b/tests/unit/Traits/DataProvider/Mage/Catalog/Helper/ProductTrait.php @@ -0,0 +1,59 @@ + [ + 2, + null, + ]; + yield 'invalid' => [ + 0, + 'invalid', + ]; + yield 'multiselect' => [ + 1, + 'multiselect', + ]; + yield 'boolean' => [ + 1, + 'boolean', + ]; + } + + public function provideGetAttributeBackendModelByInputType(): Generator + { + yield 'multiselect' => [ + 'eav/entity_attribute_backend_array', + 'multiselect', + ]; + } + + public function provideGetAttributeSourceModelByInputType(): Generator + { + yield 'boolean' => [ + 'eav/entity_attribute_source_boolean', + 'boolean', + ]; + } +} diff --git a/tests/unit/Traits/DataProvider/Mage/Catalog/Model/UrlTrait.php b/tests/unit/Traits/DataProvider/Mage/Catalog/Model/UrlTrait.php new file mode 100644 index 00000000000..a92ebe6d036 --- /dev/null +++ b/tests/unit/Traits/DataProvider/Mage/Catalog/Model/UrlTrait.php @@ -0,0 +1,95 @@ + '999', + 'store_id' => '1', + 'url_key' => '', + 'name' => 'category', + + ]); + $product = new Varien_Object([ + 'id' => '999', + 'name' => 'product', + ]); + + yield 'test exception' => [ + 'Please specify either a category or a product, or both.', + 'request', + null, + null, + ]; + yield 'request' => [ + 'product.html', + 'request', + $product, + $category, + ]; + // yield 'request w/o product' => [ + // '-.html', + // 'request', + // null, + // $category, + // ]; + yield 'target category' => [ + 'catalog/category/view/id/999', + 'target', + null, + $category, + ]; + yield 'target product' => [ + 'catalog/product/view/id/999', + 'target', + $product, + $category, + ]; + } + + public function provideGetSluggerConfig(): Generator + { + yield 'de_DE' => [ + ['de_DE' => [ + '%' => 'prozent', + '&' => 'und', + ]], + 'de_DE', + ]; + yield 'en_US' => [ + ['en_US' => [ + '%' => 'percent', + '&' => 'and', + ]], + 'en_US', + ]; + yield 'fr_FR' => [ + ['fr_FR' => [ + '%' => 'pour cent', + '&' => 'et', + ]], + 'fr_FR', + ]; + } +} diff --git a/tests/unit/Traits/DataProvider/Mage/Core/Helper/DataTrait.php b/tests/unit/Traits/DataProvider/Mage/Core/Helper/DataTrait.php new file mode 100644 index 00000000000..f8d6faba524 --- /dev/null +++ b/tests/unit/Traits/DataProvider/Mage/Core/Helper/DataTrait.php @@ -0,0 +1,89 @@ +getTimestamp(); + $dateShort = date('n/j/Y', $date); + $dateLong = date('F j, Y', $date); + $dateShortTime = date('n/j/Y g:i A', $date); + + yield 'null' => [ + $dateShort, + null, + ]; + yield 'empty date' => [ + $dateShort, + '', + ]; + yield 'string date' => [ + $dateShort, + 'now', + ]; + yield 'numeric date' => [ + $dateShort, + '0', + ]; + yield 'invalid date' => [ + '', + 'invalid', + ]; + yield 'invalid format' => [ + (string) $date, + $date, + 'invalid', + ]; + yield 'date short' => [ + $dateShort, + $date, + ]; + yield 'date long' => [ + $dateLong, + $date, + 'long', + ]; + // yield 'date short w/ time' => [ + // $dateShortTime, + // $date, + // 'short', + // true, + // ]; + } + + public function provideRemoveAccents(): Generator + { + $string = 'Ae-Ä Oe-Ö Ue-Ü ae-ä oe-ö ue-ü'; + + yield 'german false' => [ + 'Ae-A Oe-O Ue-U ae-a oe-o ue-u', + $string, + false, + ]; + yield 'german true' => [ + 'Ae-Ae Oe-Oe Ue-Ue ae-ae oe-oe ue-ue', + $string, + true, + ]; + } +} diff --git a/tests/unit/Traits/DataProvider/Mage/Core/Helper/PurifierTrait.php b/tests/unit/Traits/DataProvider/Mage/Core/Helper/PurifierTrait.php new file mode 100644 index 00000000000..91b2a094884 --- /dev/null +++ b/tests/unit/Traits/DataProvider/Mage/Core/Helper/PurifierTrait.php @@ -0,0 +1,35 @@ + [ + [], + [], + ]; + yield 'string' => [ + '', + '', + ]; + } +} diff --git a/tests/unit/Traits/DataProvider/Mage/Core/Helper/UnserializeArray.php b/tests/unit/Traits/DataProvider/Mage/Core/Helper/UnserializeArray.php new file mode 100644 index 00000000000..cfb28174eef --- /dev/null +++ b/tests/unit/Traits/DataProvider/Mage/Core/Helper/UnserializeArray.php @@ -0,0 +1,45 @@ + [ + $errorMessage, + null, + ]; + yield 'empty string' => [ + $errorMessage, + '', + ]; + yield 'random string' => [ + $errorMessage, + 'abc', + ]; + yield 'valid' => [ + ['key' => 'value'], + 'a:1:{s:3:"key";s:5:"value";}', + ]; + } +} diff --git a/tests/unit/Traits/DataProvider/Mage/Core/Helper/UrlTrait.php b/tests/unit/Traits/DataProvider/Mage/Core/Helper/UrlTrait.php new file mode 100644 index 00000000000..d48c8c4496c --- /dev/null +++ b/tests/unit/Traits/DataProvider/Mage/Core/Helper/UrlTrait.php @@ -0,0 +1,124 @@ + [ + 'aHR0cDovLw,,', + null, + ]; + yield 'base url' => [ + 'aHR0cHM6Ly9leGFtcGxlLmNvbQ,,', + self::$testUrlBase, + ]; + } + + public function provideAddRequestParam(): Generator + { + yield 'int key' => [ + self::$testUrlBase . '?', + self::$testUrlBase, + [0 => 'int'], + ]; + yield 'int value' => [ + self::$testUrlBase . '?int=0', + self::$testUrlBase, + ['int' => 0], + ]; + yield 'null' => [ + self::$testUrlBase . '?null', + self::$testUrlBase, + ['null' => null], + ]; + yield 'string' => [ + self::$testUrlParam, + self::$testUrlBase, + ['foo' => 'bar'], + ]; + yield 'string extend' => [ + self::$testUrlParams, + self::$testUrlParam, + ['BOO' => 'baz'], + ]; + yield 'array' => [ + self::$testUrlBase . '?key[]=subValue', + self::$testUrlBase, + ['key' => ['subKey' => 'subValue']], + ]; + } + + public function provideRemoveRequestParam(): Generator + { + yield 'remove #1' => [ + self::$testUrlBase, + self::$testUrlParam, + 'foo', + ]; + yield 'remove #2' => [ + self::$testUrlParams, + self::$testUrlParams, + 'boo', + ]; + yield 'remove #1 case sensitive' => [ + self::$testUrlParam, + self::$testUrlParam, + 'FOO', + true, + ]; + yield 'remove #2 case sensitive' => [ + self::$testUrlParam, + self::$testUrlParams, + 'BOO', + true, + ]; + yield 'not-exists' => [ + self::$testUrlParams, + self::$testUrlParams, + 'not-exists', + ]; + yield '___SID' => [ + self::$testUrlSid1, + self::$testUrlSidBoth, + '___SID', + ]; + yield 'SID' => [ + self::$testUrlSid2, + self::$testUrlSidBoth, + 'SID', + ]; + } +} diff --git a/tests/unit/Traits/DataProvider/Mage/Core/Model/AppTrait.php b/tests/unit/Traits/DataProvider/Mage/Core/Model/AppTrait.php new file mode 100644 index 00000000000..711fcc7ed63 --- /dev/null +++ b/tests/unit/Traits/DataProvider/Mage/Core/Model/AppTrait.php @@ -0,0 +1,47 @@ + [ + new Mage_Core_Model_Store(), + ]; + } + + public function provideGetWebsite(): Generator + { + yield 'Mage_Core_Model_Website' => [ + new Mage_Core_Model_Website(), + ]; + } + + public function provideGetGroup(): Generator + { + yield 'Mage_Core_Model_Store_Group' => [ + new Mage_Core_Model_Store_Group(), + ]; + } +} diff --git a/tests/unit/Traits/DataProvider/Mage/Core/Model/Email/Template/AbstractTrait.php b/tests/unit/Traits/DataProvider/Mage/Core/Model/Email/Template/AbstractTrait.php new file mode 100644 index 00000000000..c14329c42e3 --- /dev/null +++ b/tests/unit/Traits/DataProvider/Mage/Core/Model/Email/Template/AbstractTrait.php @@ -0,0 +1,48 @@ + [ + true, + $_SERVER['TEST_ROOT'] . '/unit/fixtures/files/test.css', + 'css', + true, + ]; + yield 'css file exists, but empty' => [ + false, + $_SERVER['TEST_ROOT'] . '/unit/fixtures/files/test-empty.css', + 'css', + true, + ]; + yield 'css file not exists' => [ + false, + $_SERVER['TEST_ROOT'] . '/unit/fixtures/files/test.not-exist', + 'css', + false, + ]; + } +} diff --git a/tests/unit/Traits/DataProvider/Mage/Core/Model/LayoutTrait.php b/tests/unit/Traits/DataProvider/Mage/Core/Model/LayoutTrait.php new file mode 100644 index 00000000000..6b05ee4d1f6 --- /dev/null +++ b/tests/unit/Traits/DataProvider/Mage/Core/Model/LayoutTrait.php @@ -0,0 +1,42 @@ + [ + Mage_Cms_Block_Block::class, + true, + 'cms/block', + null, + [], + ]; + yield 'not instance of Mage_Core_Block_Abstract' => [ + false, + false, + 'rule/conditions', + null, + [], + ]; + } +} diff --git a/tests/unit/Traits/DataProvider/Mage/Core/Model/SecurityTrait.php b/tests/unit/Traits/DataProvider/Mage/Core/Model/SecurityTrait.php new file mode 100644 index 00000000000..51e9cd02a4d --- /dev/null +++ b/tests/unit/Traits/DataProvider/Mage/Core/Model/SecurityTrait.php @@ -0,0 +1,54 @@ +string'; + + public function provideHtmlEscapedStringAsStringData(): Generator + { + yield 'tags null' => [ + 'This is a bold <b>string</b>', + self::$testString, + null, + ]; + yield 'tags array' => [ + self::$testString, + self::$testString, + ['b'], + ]; + } + + public function provideHtmlEscapedStringGetUnescapedValueData(): Generator + { + yield 'tags null' => [ + self::$testString, + self::$testString, + null, + ]; + yield 'tags array' => [ + self::$testString, + self::$testString, + ['some-invalid-value'], + ]; + } +} diff --git a/tests/unit/Traits/DataProvider/Mage/Customer/CustomerTrait.php b/tests/unit/Traits/DataProvider/Mage/Customer/CustomerTrait.php new file mode 100644 index 00000000000..7b2edd38f77 --- /dev/null +++ b/tests/unit/Traits/DataProvider/Mage/Customer/CustomerTrait.php @@ -0,0 +1,130 @@ + 'John', + 'getLastname' => 'Doe', + 'getEmail' => 'john.doe@example.com', + 'getPassword' => 'validpassword123', + 'getPasswordConfirmation' => 'validpassword123', + 'getDob' => '1980-01-01', + 'getTaxvat' => '123456789', + 'getGender' => '1', + 'shouldValidateDob' => false, + 'shouldValidateTaxvat' => false, + 'shouldValidateGender' => false, + ]; + + yield 'valid data' => [ + true, + $validCustomer, + ]; + + $data = $validCustomer; + $data['getFirstname'] = ''; + yield 'missing firstname' => [ + ['The first name cannot be empty.'], + $data, + ]; + + $data = $validCustomer; + $data['getLastname'] = ''; + yield 'missing lastname' => [ + ['The last name cannot be empty.'], + $data, + ]; + + $data = $validCustomer; + $data['getEmail'] = ''; + yield 'missing email' => [ + ['Invalid email address "".'], + $data, + ]; + + $data = $validCustomer; + $data['getEmail'] = 'invalid-email'; + yield 'invalid email' => [ + ['Invalid email address "invalid-email".'], + $data, + ]; + + $data = $validCustomer; + $data['getPasswordConfirmation'] = 'differentpassword'; + yield 'passwords do not match' => [ + ['Please make sure your passwords match.'], + $data, + ]; + + $data = $validCustomer; + $password = '123'; + $data['getPassword'] = $password; + $data['getPasswordConfirmation'] = $password; + yield 'passwords to short' => [ + ['The minimum password length is 7'], + $data, + ]; + + $data = $validCustomer; + $password = str_repeat('x', 257); + $data['getPassword'] = $password; + $data['getPasswordConfirmation'] = $password; + yield 'passwords to long' => [ + ['Please enter a password with at most 256 characters.'], + $data, + ]; + + $data = $validCustomer; + $data['getDob'] = ''; + $data['shouldValidateDob'] = true; + yield 'missing dob' => [ + true, # ['The Date of Birth is required.'], + $data, + ]; + + $data = $validCustomer; + $data['getDob'] = 'abc'; + $data['shouldValidateDob'] = true; + yield 'invalid dob' => [ + true, # ['This value is not a valid date.'], + $data, + ]; + + $data = $validCustomer; + $data['getTaxvat'] = ''; + $data['shouldValidateTaxvat'] = true; + yield 'missing taxvat' => [ + true, # ['The TAX/VAT number is required.'], + $data, + ]; + + $data = $validCustomer; + $data['getGender'] = ''; + $data['shouldValidateGender'] = true; + yield 'missing gender' => [ + true, # ['Gender is required.'], + $data, + ]; + } +} diff --git a/tests/unit/Traits/DataProvider/Mage/Directory/DirectoryTrait.php b/tests/unit/Traits/DataProvider/Mage/Directory/DirectoryTrait.php new file mode 100644 index 00000000000..fa45dda59de --- /dev/null +++ b/tests/unit/Traits/DataProvider/Mage/Directory/DirectoryTrait.php @@ -0,0 +1,66 @@ + [ + '["HK","IE","MO","PA"]', + true, + ]; + yield 'as array' => [ + [ + 0 => 'HK', + 1 => 'IE', + 2 => 'MO', + 3 => 'PA', + ], + false, + ]; + } + + + public function provideGetCountriesWithStatesRequired(): Generator + { + yield 'as json' => [ + '["AT","CA","CH","DE","EE","ES","FI","FR","LT","LV","RO","US"]', + true, + ]; + yield 'as array' => [ + [ + 0 => 'AT', + 1 => 'CA', + 2 => 'CH', + 3 => 'DE', + 4 => 'EE', + 5 => 'ES', + 6 => 'FI', + 7 => 'FR', + 8 => 'LT', + 9 => 'LV', + 10 => 'RO', + 11 => 'US', + ], + false, + ]; + } +} diff --git a/tests/unit/Traits/DataProvider/Mage/GiftMessage/GiftMessageTrait.php b/tests/unit/Traits/DataProvider/Mage/GiftMessage/GiftMessageTrait.php new file mode 100644 index 00000000000..f8556e00c43 --- /dev/null +++ b/tests/unit/Traits/DataProvider/Mage/GiftMessage/GiftMessageTrait.php @@ -0,0 +1,56 @@ + [ + Subject::TYPE_ADDRESS_ITEM, + $entity, + ]; + yield Subject::TYPE_ITEM => [ + Subject::TYPE_ITEM, + $entity->setData('product', new Mage_Catalog_Model_Product()), + ]; + yield Subject::TYPE_ITEMS => [ + Subject::TYPE_ITEMS, + $entity, + ]; + yield Subject::TYPE_ORDER => [ + Subject::TYPE_ORDER, + $entity, + ]; + yield Subject::TYPE_ORDER_ITEM => [ + Subject::TYPE_ORDER_ITEM, + $entity, + ]; + yield 'invalid type' => [ + 'quote', + $entity, + ]; + } +} diff --git a/tests/unit/Traits/DataProvider/Mage/Log/LogTrait.php b/tests/unit/Traits/DataProvider/Mage/Log/LogTrait.php new file mode 100644 index 00000000000..b543ac1e09c --- /dev/null +++ b/tests/unit/Traits/DataProvider/Mage/Log/LogTrait.php @@ -0,0 +1,35 @@ + [ + true, + 'valid.log', + ]; + yield 'invalid' => [ + false, + 'invalid.file', + ]; + } +} diff --git a/tests/unit/Traits/DataProvider/Mage/Review/ReviewTrait.php b/tests/unit/Traits/DataProvider/Mage/Review/ReviewTrait.php new file mode 100644 index 00000000000..5160b5d0390 --- /dev/null +++ b/tests/unit/Traits/DataProvider/Mage/Review/ReviewTrait.php @@ -0,0 +1,61 @@ + 'Great product', + 'getDetail' => 'I really liked this product.', + 'getNickname' => 'JohnDoe', + 'getCustomerId' => 1, + 'getEntityId' => 1, + 'getStoreId' => 1, + ]; + + yield 'valid data' => [ + true, + $validReview, + ]; + + $data = $validReview; + $data['getTitle'] = ''; + yield 'missing title' => [ + ['Review summary can\'t be empty'], + $data, + ]; + + $data = $validReview; + $data['getDetail'] = ''; + yield 'missing detail' => [ + ['Review can\'t be empty'], + $data, + ]; + + $data = $validReview; + $data['getNickname'] = ''; + yield 'missing nickname' => [ + ['Nickname can\'t be empty'], + $data, + ]; + } +} diff --git a/tests/unit/Traits/DataProvider/Mage/Rule/RuleTrait.php b/tests/unit/Traits/DataProvider/Mage/Rule/RuleTrait.php index 9aeb560c67d..6fb0f9efe77 100644 --- a/tests/unit/Traits/DataProvider/Mage/Rule/RuleTrait.php +++ b/tests/unit/Traits/DataProvider/Mage/Rule/RuleTrait.php @@ -43,7 +43,7 @@ public function provideValidateData(): Generator ]; yield 'object with invalid date' => [ [ - 0 => 'End Date must be greater than Start Date.', + 'End Date must be greater than Start Date.', ], [ 'from_date' => '2', @@ -52,7 +52,7 @@ public function provideValidateData(): Generator ]; yield 'object with empty website ids' => [ [ - 0 => 'Websites must be specified.', + 'Websites must be specified.', ], [ 'website_ids' => '', @@ -66,7 +66,7 @@ public function provideValidateData(): Generator ]; yield 'object with empty customer group ids' => [ [ - 0 => 'Customer Groups must be specified.', + 'Customer Groups must be specified.', ], [ 'customer_group_ids' => '', diff --git a/tests/unit/Traits/DataProvider/Mage/Sitemap/SitemapTrait.php b/tests/unit/Traits/DataProvider/Mage/Sitemap/SitemapTrait.php new file mode 100644 index 00000000000..1ba1e600fa1 --- /dev/null +++ b/tests/unit/Traits/DataProvider/Mage/Sitemap/SitemapTrait.php @@ -0,0 +1,42 @@ + [ + [ + 'getSitemapFilename' => 'text.xml', + ], + ]; + } + + public function provideGenerateXmlData(): Generator + { + yield 'default' => [ + [ + 'isDeleted' => true, # do not save to DB + 'getSitemapFilename' => '???phpunit.sitemap.xml', + ], + ]; + } +} diff --git a/tests/unit/Traits/DataProvider/Mage/Tax/TaxTrait.php b/tests/unit/Traits/DataProvider/Mage/Tax/TaxTrait.php new file mode 100644 index 00000000000..26d0abeb6b7 --- /dev/null +++ b/tests/unit/Traits/DataProvider/Mage/Tax/TaxTrait.php @@ -0,0 +1,47 @@ + [ + 'Incl. Tax', + true, + ]; + yield 'false' => [ + 'Excl. Tax', + false, + ]; + } + + public function provideGetIncExcTaxLabel(): Generator + { + yield 'true' => [ + '(Incl. Tax)', + true, + ]; + yield 'false' => [ + '(Excl. Tax)', + false, + ]; + } +} diff --git a/tests/unit/Traits/DataProvider/Mage/Uploader/UploaderTrait.php b/tests/unit/Traits/DataProvider/Mage/Uploader/UploaderTrait.php index f18ca435a37..26c51b9e27b 100644 --- a/tests/unit/Traits/DataProvider/Mage/Uploader/UploaderTrait.php +++ b/tests/unit/Traits/DataProvider/Mage/Uploader/UploaderTrait.php @@ -51,23 +51,49 @@ public function provideGetMimeTypeFromExtensionListData(): Generator ]; } + public function provideGetDataMaxSizeData(): Generator + { + yield 'larger post max size' => [ + '1M', + [ + 'getPostMaxSize' => '1G', + 'getUploadMaxSize' => '1M', + ], + ]; + yield 'larger upload max size' => [ + '1M', + [ + 'getPostMaxSize' => '1M', + 'getUploadMaxSize' => '1G', + ], + ]; + } + public function provideGetDataMaxSizeInBytesData(): Generator { yield 'no unit' => [ 1024, - '1024', + [ + 'getDataMaxSize' => '1024', + ], ]; yield 'kilobyte' => [ 1024, - '1K', + [ + 'getDataMaxSize' => '1K', + ], ]; yield 'megabyte' => [ 1048576, - '1M', + [ + 'getDataMaxSize' => '1M', + ], ]; yield 'gigabyte' => [ 1073741824, - '1G', + [ + 'getDataMaxSize' => '1G', + ], ]; } } diff --git a/tests/unit/Varien/Data/Form/Filter/DateTest.php b/tests/unit/Varien/Data/Form/Filter/DateTest.php index ef118d79732..f84a004ca1a 100644 --- a/tests/unit/Varien/Data/Form/Filter/DateTest.php +++ b/tests/unit/Varien/Data/Form/Filter/DateTest.php @@ -39,11 +39,11 @@ public function setUp(): void public function testInputFilter(?string $expectedResult, ?string $value): void { try { - $this->assertSame($expectedResult, $this->subject->inputFilter($value)); + static::assertSame($expectedResult, $this->subject->inputFilter($value)); } catch (Throwable $e) { // PHP7: bcsub(): bcmath function argument is not well-formed // PHP8: bcsub(): Argument #1 ($num1) is not well-formed - $this->assertStringStartsWith((string) $expectedResult, $e->getMessage()); + static::assertStringStartsWith((string) $expectedResult, $e->getMessage()); } } diff --git a/tests/unit/Varien/Data/Form/Filter/DatetimeTest.php b/tests/unit/Varien/Data/Form/Filter/DatetimeTest.php index 77c35961022..30c68978de7 100644 --- a/tests/unit/Varien/Data/Form/Filter/DatetimeTest.php +++ b/tests/unit/Varien/Data/Form/Filter/DatetimeTest.php @@ -39,11 +39,11 @@ public function setUp(): void public function testInputFilter(?string $expectedResult, ?string $value): void { try { - $this->assertSame($expectedResult, $this->subject->inputFilter($value)); + static::assertSame($expectedResult, $this->subject->inputFilter($value)); } catch (Throwable $e) { // PHP7: bcsub(): bcmath function argument is not well-formed // PHP8: bcsub(): Argument #1 ($num1) is not well-formed - $this->assertStringStartsWith((string) $expectedResult, $e->getMessage()); + static::assertStringStartsWith((string) $expectedResult, $e->getMessage()); } } diff --git a/tests/unit/Varien/Db/Adapter/Pdo/MysqlTest.php b/tests/unit/Varien/Db/Adapter/Pdo/MysqlTest.php index 34a4858ab39..0f70d600885 100644 --- a/tests/unit/Varien/Db/Adapter/Pdo/MysqlTest.php +++ b/tests/unit/Varien/Db/Adapter/Pdo/MysqlTest.php @@ -60,10 +60,10 @@ public function testGetHostInfoWithUnixSocket(): void /** @var Varien_Object $hostInfo */ $hostInfo = $method->invoke($this->adapter, $fakeSocket); - $this->assertSame(Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_UNIX_SOCKET, $hostInfo->getAddressType()); - $this->assertSame($fakeSocket, $hostInfo->getUnixSocket()); - $this->assertNull($hostInfo->getHostName()); - $this->assertNull($hostInfo->getPort()); + static::assertSame(Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_UNIX_SOCKET, $hostInfo->getAddressType()); + static::assertSame($fakeSocket, $hostInfo->getUnixSocket()); + static::assertNull($hostInfo->getHostName()); + static::assertNull($hostInfo->getPort()); } /** @@ -77,10 +77,10 @@ public function testGetHostInfoWithIpv4Address(): void /** @var Varien_Object $hostInfo */ $hostInfo = $method->invoke($this->adapter, '192.168.1.1:3306'); - $this->assertSame(Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_IPV4_ADDRESS, $hostInfo->getAddressType()); - $this->assertSame('192.168.1.1', $hostInfo->getHostName()); - $this->assertSame('3306', $hostInfo->getPort()); - $this->assertNull($hostInfo->getUnixSocket()); + static::assertSame(Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_IPV4_ADDRESS, $hostInfo->getAddressType()); + static::assertSame('192.168.1.1', $hostInfo->getHostName()); + static::assertSame('3306', $hostInfo->getPort()); + static::assertNull($hostInfo->getUnixSocket()); } /** @@ -94,10 +94,10 @@ public function testGetHostInfoWithIpv4AddressWithoutPort(): void /** @var Varien_Object $hostInfo */ $hostInfo = $method->invoke($this->adapter, '192.168.1.1'); - $this->assertSame(Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_IPV4_ADDRESS, $hostInfo->getAddressType()); - $this->assertSame('192.168.1.1', $hostInfo->getHostName()); - $this->assertNull($hostInfo->getPort()); - $this->assertNull($hostInfo->getUnixSocket()); + static::assertSame(Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_IPV4_ADDRESS, $hostInfo->getAddressType()); + static::assertSame('192.168.1.1', $hostInfo->getHostName()); + static::assertNull($hostInfo->getPort()); + static::assertNull($hostInfo->getUnixSocket()); } /** @@ -111,10 +111,10 @@ public function testGetHostInfoWithHostname(): void /** @var Varien_Object $hostInfo */ $hostInfo = $method->invoke($this->adapter, 'db.example.com:3306'); - $this->assertSame(Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_HOSTNAME, $hostInfo->getAddressType()); - $this->assertSame('db.example.com', $hostInfo->getHostName()); - $this->assertSame('3306', $hostInfo->getPort()); - $this->assertNull($hostInfo->getUnixSocket()); + static::assertSame(Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_HOSTNAME, $hostInfo->getAddressType()); + static::assertSame('db.example.com', $hostInfo->getHostName()); + static::assertSame('3306', $hostInfo->getPort()); + static::assertNull($hostInfo->getUnixSocket()); } /** @@ -128,10 +128,10 @@ public function testGetHostInfoWithHostnameWithoutPort(): void /** @var Varien_Object $hostInfo */ $hostInfo = $method->invoke($this->adapter, 'db.example.com'); - $this->assertSame(Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_HOSTNAME, $hostInfo->getAddressType()); - $this->assertSame('db.example.com', $hostInfo->getHostName()); - $this->assertNull($hostInfo->getPort()); - $this->assertNull($hostInfo->getUnixSocket()); + static::assertSame(Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_HOSTNAME, $hostInfo->getAddressType()); + static::assertSame('db.example.com', $hostInfo->getHostName()); + static::assertNull($hostInfo->getPort()); + static::assertNull($hostInfo->getUnixSocket()); } /** @@ -145,10 +145,10 @@ public function testGetHostInfoWithIpv6Address(): void /** @var Varien_Object $hostInfo */ $hostInfo = $method->invoke($this->adapter, '[2001:db8::1]:3306'); - $this->assertSame(Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_IPV6_ADDRESS, $hostInfo->getAddressType()); - $this->assertSame('2001:db8::1', $hostInfo->getHostName()); - $this->assertSame('3306', $hostInfo->getPort()); - $this->assertNull($hostInfo->getUnixSocket()); + static::assertSame(Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_IPV6_ADDRESS, $hostInfo->getAddressType()); + static::assertSame('2001:db8::1', $hostInfo->getHostName()); + static::assertSame('3306', $hostInfo->getPort()); + static::assertNull($hostInfo->getUnixSocket()); } /** @@ -162,10 +162,10 @@ public function testGetHostInfoWithIpv6AddressWithoutPort(): void /** @var Varien_Object $hostInfo */ $hostInfo = $method->invoke($this->adapter, '2001:db8::1'); - $this->assertSame(Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_IPV6_ADDRESS, $hostInfo->getAddressType()); - $this->assertSame('2001:db8::1', $hostInfo->getHostName()); - $this->assertNull($hostInfo->getPort()); - $this->assertNull($hostInfo->getUnixSocket()); + static::assertSame(Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_IPV6_ADDRESS, $hostInfo->getAddressType()); + static::assertSame('2001:db8::1', $hostInfo->getHostName()); + static::assertNull($hostInfo->getPort()); + static::assertNull($hostInfo->getUnixSocket()); } /** @@ -179,10 +179,10 @@ public function testGetHostInfoWithIpv6AddressWithZoneId(): void /** @var Varien_Object $hostInfo */ $hostInfo = $method->invoke($this->adapter, '[fe80::1%eth0]:3306'); - $this->assertSame(Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_IPV6_ADDRESS, $hostInfo->getAddressType()); - $this->assertSame('fe80::1%eth0', $hostInfo->getHostName()); - $this->assertSame('3306', $hostInfo->getPort()); - $this->assertNull($hostInfo->getUnixSocket()); + static::assertSame(Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_IPV6_ADDRESS, $hostInfo->getAddressType()); + static::assertSame('fe80::1%eth0', $hostInfo->getHostName()); + static::assertSame('3306', $hostInfo->getPort()); + static::assertNull($hostInfo->getUnixSocket()); } /** @@ -196,9 +196,9 @@ public function testGetHostInfoWithIpv6AddressWithZoneIdWithoutPort(): void /** @var Varien_Object $hostInfo */ $hostInfo = $method->invoke($this->adapter, 'fe80::1%eth0'); - $this->assertSame(Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_IPV6_ADDRESS, $hostInfo->getAddressType()); - $this->assertSame('fe80::1%eth0', $hostInfo->getHostName()); - $this->assertNull($hostInfo->getPort()); - $this->assertNull($hostInfo->getUnixSocket()); + static::assertSame(Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_IPV6_ADDRESS, $hostInfo->getAddressType()); + static::assertSame('fe80::1%eth0', $hostInfo->getHostName()); + static::assertNull($hostInfo->getPort()); + static::assertNull($hostInfo->getUnixSocket()); } } diff --git a/tests/unit/Varien/ObjectTest.php b/tests/unit/Varien/ObjectTest.php index 919c38fb661..76997f0bfdd 100644 --- a/tests/unit/Varien/ObjectTest.php +++ b/tests/unit/Varien/ObjectTest.php @@ -44,7 +44,7 @@ public function setUp(): void public function testGetData($expectedResult, $setKey, $setValue, string $key, $index = null): void { $this->subject->setData($setKey, $setValue); - $this->assertSame($expectedResult, $this->subject->getData($key, $index)); + static::assertSame($expectedResult, $this->subject->getData($key, $index)); } public function provideGetDataData(): Generator @@ -176,7 +176,7 @@ public function testToString(string $expectedResult, string $format): void $this->subject->setString2('two'); $this->subject->setString3('three'); - $this->assertSame($expectedResult, $this->subject->toString($format)); + static::assertSame($expectedResult, $this->subject->toString($format)); } public function provideToString(): Generator @@ -200,7 +200,7 @@ public function provideToString(): Generator */ public function testGetSetUnsData(): void { - $this->assertTrue($this->subject->isEmpty()); + static::assertTrue($this->subject->isEmpty()); $this->subject->setABC('abc'); $this->subject->setData('efg', 'efg'); $this->subject->set123('123'); @@ -209,46 +209,46 @@ public function testGetSetUnsData(): void $this->subject->setData('key_a_2nd', 'value_a_2nd'); $this->subject->setKeyA3rd('value_a_3rd'); $this->subject->setData('left', 'over'); - $this->assertFalse($this->subject->isEmpty()); + static::assertFalse($this->subject->isEmpty()); - $this->assertSame('abc', $this->subject->getData('a_b_c')); - $this->assertSame('abc', $this->subject->getABC()); + static::assertSame('abc', $this->subject->getData('a_b_c')); + static::assertSame('abc', $this->subject->getABC()); $this->subject->unsetData('a_b_c'); - $this->assertSame('efg', $this->subject->getData('efg')); - $this->assertSame('efg', $this->subject->getEfg()); + static::assertSame('efg', $this->subject->getData('efg')); + static::assertSame('efg', $this->subject->getEfg()); $this->subject->unsEfg(); - $this->assertSame('123', $this->subject->getData('123')); - $this->assertSame('123', $this->subject->get123()); + static::assertSame('123', $this->subject->getData('123')); + static::assertSame('123', $this->subject->get123()); $this->subject->uns123(); $this->subject->unsetData('345'); - $this->assertSame('value_a_first', $this->subject->getData('key_a_first')); - $this->assertSame('value_a_first', $this->subject->getKeyAFirst()); + static::assertSame('value_a_first', $this->subject->getData('key_a_first')); + static::assertSame('value_a_first', $this->subject->getKeyAFirst()); $this->subject->unsetData('key_a_first'); - $this->assertSame('value_a_2nd', $this->subject->getData('key_a_2nd')); - $this->assertSame('value_a_2nd', $this->subject->getKeyA_2nd()); + static::assertSame('value_a_2nd', $this->subject->getData('key_a_2nd')); + static::assertSame('value_a_2nd', $this->subject->getKeyA_2nd()); $this->subject->unsetData('key_a_2nd'); - $this->assertSame('value_a_3rd', $this->subject->getData('key_a3rd')); - $this->assertSame('value_a_3rd', $this->subject->getKeyA3rd()); + static::assertSame('value_a_3rd', $this->subject->getData('key_a3rd')); + static::assertSame('value_a_3rd', $this->subject->getKeyA3rd()); $this->subject->unsetData('key_a3rd'); - $this->assertSame(['left' => 'over'], $this->subject->getData()); + static::assertSame(['left' => 'over'], $this->subject->getData()); $this->subject->unsetData(); - $this->assertSame([], $this->subject->getData()); - $this->assertTrue($this->subject->isEmpty()); + static::assertSame([], $this->subject->getData()); + static::assertTrue($this->subject->isEmpty()); try { /** @phpstan-ignore-next-line */ $this->subject->notData(); - $this->fail('Invalid __call'); + static::fail('Invalid __call'); } catch (Varien_Exception $exception) { - $this->assertStringStartsWith('Invalid method', $exception->getMessage()); + static::assertStringStartsWith('Invalid method', $exception->getMessage()); } } @@ -257,14 +257,14 @@ public function testGetSetUnsData(): void */ public function testOffset(): void { - $this->assertFalse($this->subject->offsetExists('off')); + static::assertFalse($this->subject->offsetExists('off')); $this->subject->offsetSet('off', 'set'); - $this->assertTrue($this->subject->offsetExists('off')); - $this->assertSame('set', $this->subject->offsetGet('off')); - $this->assertNull($this->subject->offsetGet('not-exists')); + static::assertTrue($this->subject->offsetExists('off')); + static::assertSame('set', $this->subject->offsetGet('off')); + static::assertNull($this->subject->offsetGet('not-exists')); $this->subject->offsetUnset('off'); - $this->assertFalse($this->subject->offsetExists('off')); + static::assertFalse($this->subject->offsetExists('off')); } } diff --git a/tests/unit/fixtures/files/test-empty.css b/tests/unit/fixtures/files/test-empty.css new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/unit/fixtures/files/test.css b/tests/unit/fixtures/files/test.css new file mode 100644 index 00000000000..0043c3bd95c --- /dev/null +++ b/tests/unit/fixtures/files/test.css @@ -0,0 +1 @@ +/* test */ From 4f147d13c166c54c9703ccc078fc559f53d05d48 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Tue, 15 Apr 2025 12:25:47 +0200 Subject: [PATCH 02/36] rector --- .rector.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.rector.php b/.rector.php index f10315c5553..b6f02a77d66 100644 --- a/.rector.php +++ b/.rector.php @@ -15,6 +15,7 @@ use Rector\Php82\Rector as Php82; use Rector\Php83\Rector as Php83; use Rector\Php84\Rector as Php84; +use Rector\PHPUnit\CodeQuality\Rector\Class_\PreferPHPUnitThisCallRector; use Rector\TypeDeclaration\Rector as TypeDeclaration; try { @@ -42,6 +43,8 @@ Php80\Class_\ClassPropertyAssignToConstructorPromotionRector::class, # todo: wait for php80 Php80\Class_\StringableForToStringRector::class, # todo: wait for php80 TypeDeclaration\ClassMethod\ReturnNeverTypeRector::class, + # use static methods + PreferPHPUnitThisCallRector::class, __DIR__ . '/shell/translations.php', __DIR__ . '/shell/update-copyright.php', __DIR__ . '/tests/unit/Mage/Reports/Model/Resource/Report/CollectionTest.php', From 0d9da31899439d0d2de5cf8d5a4783106576a2cb Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Wed, 16 Apr 2025 03:23:30 +0200 Subject: [PATCH 03/36] updated test groups --- .github/workflows/phpunit.yml | 2 +- .phpunit.dist.xml | 75 +++++++++++++ composer.json | 6 +- tests/unit/Mage/Admin/Helper/BlockTest.php | 6 +- tests/unit/Mage/Admin/Helper/DataTest.php | 6 +- tests/unit/Mage/Admin/Helper/VariableTest.php | 3 +- tests/unit/Mage/Admin/Model/BlockTest.php | 6 +- tests/unit/Mage/Admin/Model/ConfigTest.php | 12 +-- tests/unit/Mage/Admin/Model/UserTest.php | 33 ++---- tests/unit/Mage/Admin/Model/VariableTest.php | 3 +- .../AdminNotification/Helper/DataTest.php | 9 +- .../Mage/AdminNotification/Model/FeedTest.php | 12 +-- .../AdminNotification/Model/InboxTest.php | 24 ++--- tests/unit/Mage/Adminhtml/Block/CacheTest.php | 6 +- .../Block/Customer/Edit/Tab/AddressesTest.php | 3 +- .../Customer/Edit/Tab/NewsletterTest.php | 3 +- .../Block/System/Cache/Form/FormTest.php | 3 +- .../Block/System/Config/Form/FormTest.php | 2 +- .../System/Convert/Gui/Edit/Tab/ViewTest.php | 3 +- .../Convert/Profile/Edit/Tab/EditTest.php | 3 +- .../Mage/Adminhtml/Block/TemplateTest.php | 12 +-- .../Block/Widget/Grid/ColumnTest.php | 3 +- .../Mage/Adminhtml/Block/Widget/GridTest.php | 3 +- .../Mage/Adminhtml/Helper/AddressesTest.php | 3 +- .../Mage/Adminhtml/Helper/CatalogTest.php | 9 +- .../unit/Mage/Adminhtml/Helper/ConfigTest.php | 6 +- .../Adminhtml/Helper/Dashboard/DataTest.php | 12 +-- tests/unit/Mage/Adminhtml/Helper/DataTest.php | 15 +-- tests/unit/Mage/Adminhtml/Helper/JsTest.php | 3 +- .../Mage/Adminhtml/Helper/Media/JsTest.php | 3 +- .../unit/Mage/Adminhtml/Helper/SalesTest.php | 3 +- tests/unit/Mage/Api/Model/UserTest.php | 3 +- .../unit/Mage/Catalog/Helper/CategoryTest.php | 3 +- tests/unit/Mage/Catalog/Helper/DataTest.php | 18 ++-- tests/unit/Mage/Catalog/Helper/MapTest.php | 9 +- .../Mage/Catalog/Helper/Product/UrlTest.php | 12 +-- .../unit/Mage/Catalog/Helper/ProductTest.php | 12 +-- .../unit/Mage/Catalog/Model/CategoryTest.php | 27 ++--- .../Model/Product/Option/Type/TextTest.php | 9 +- tests/unit/Mage/Catalog/Model/ProductTest.php | 42 +++----- .../Model/Resource/Eav/AttributeTest.php | 3 +- tests/unit/Mage/Catalog/Model/UrlTest.php | 18 ++-- tests/unit/Mage/Cms/Block/BlockTest.php | 3 +- tests/unit/Mage/Cms/Block/PageTest.php | 3 +- .../unit/Mage/Cms/Block/Widget/BlockTest.php | 6 +- .../Mage/Cms/Block/Widget/Page/LinkTest.php | 9 +- tests/unit/Mage/Cms/Helper/DataTest.php | 12 +-- tests/unit/Mage/Cms/Helper/PageTest.php | 3 +- .../Mage/Cms/Helper/Wysiwyg/ImagesTest.php | 18 ++-- tests/unit/Mage/Cms/Model/PageTest.php | 24 ++--- .../Mage/Cms/Model/Wysiwyg/ConfigTest.php | 15 +-- .../Cms/Model/Wysiwyg/Images/StorageTest.php | 18 ++-- .../Controllers/IndexControllerTest.php | 7 +- tests/unit/Mage/Core/Block/Text/ListTest.php | 9 +- tests/unit/Mage/Core/Helper/CookieTest.php | 12 +-- tests/unit/Mage/Core/Helper/DataTest.php | 66 ++++-------- .../Helper/EnvironmentConfigLoaderTest.php | 14 +-- tests/unit/Mage/Core/Helper/HintTest.php | 6 +- tests/unit/Mage/Core/Helper/JsTest.php | 24 ++--- tests/unit/Mage/Core/Helper/PurifierTest.php | 3 +- tests/unit/Mage/Core/Helper/SecurityTest.php | 9 +- tests/unit/Mage/Core/Helper/StringTest.php | 30 ++---- .../Mage/Core/Helper/UnserializeArrayTest.php | 3 +- tests/unit/Mage/Core/Helper/UrlTest.php | 21 ++-- tests/unit/Mage/Core/Model/AppTest.php | 9 +- tests/unit/Mage/Core/Model/ConfigTest.php | 3 +- .../Model/Email/Template/AbstractTest.php | 3 +- tests/unit/Mage/Core/Model/LayoutTest.php | 9 +- tests/unit/Mage/Core/Model/LocaleTest.php | 2 +- .../Model/Security/HtmlEscapedStringTest.php | 4 +- tests/unit/Mage/Core/Model/StoreTest.php | 3 +- tests/unit/Mage/Core/Model/UrlTest.php | 6 +- tests/unit/Mage/Core/Model/VariableTest.php | 3 +- tests/unit/Mage/Core/Model/WebsiteTest.php | 44 +++----- .../Model/Convert/Adapter/CustomerTest.php | 12 +-- tests/unit/Mage/Directory/Block/DataTest.php | 6 +- tests/unit/Mage/Directory/Helper/DataTest.php | 27 ++--- .../Mage/Downloadable/Helper/FileTest.php | 3 +- .../Mage/GiftMessage/Helper/MessageTest.php | 3 +- tests/unit/Mage/Index/Model/ProcessTest.php | 12 +-- tests/unit/Mage/Log/Helper/DataTest.php | 12 +-- tests/unit/Mage/Log/Model/AggregationTest.php | 3 +- tests/unit/Mage/Log/Model/CronTest.php | 3 +- tests/unit/Mage/Log/Model/CustomerTest.php | 3 +- tests/unit/Mage/Log/Model/LogTest.php | 3 +- tests/unit/Mage/Log/Model/VisitorTest.php | 15 +-- .../Mage/Newsletter/Model/TemplateTest.php | 12 +-- tests/unit/Mage/Page/Block/Html/HeadTest.php | 15 +-- .../unit/Mage/Page/Block/Html/HeaderTest.php | 15 +-- tests/unit/Mage/Page/Block/HtmlTest.php | 12 +-- tests/unit/Mage/Page/Block/RedirectTest.php | 24 ++--- tests/unit/Mage/Page/Block/SwitchTest.php | 27 ++--- tests/unit/Mage/Page/Helper/LayoutTest.php | 3 +- tests/unit/Mage/Page/Model/ConfigTest.php | 3 +- .../Mage/Page/Model/Source/LayoutTest.php | 3 +- tests/unit/Mage/Reports/Helper/DataTest.php | 12 +-- .../Model/Resource/Report/CollectionTest.php | 36 +++---- tests/unit/Mage/Review/Model/ReviewTest.php | 3 +- tests/unit/Mage/Rule/Model/AbstractTest.php | 45 +++----- .../unit/Mage/Rule/Model/EnvironmentTest.php | 3 +- tests/unit/Mage/Rule/Model/RuleTest.php | 6 +- .../Block/Order/Item/Renderer/DefaultTest.php | 3 +- tests/unit/Mage/Sitemap/Model/SitemapTest.php | 6 +- tests/unit/Mage/Tax/Helper/DataTest.php | 102 ++++++------------ .../unit/Mage/Uploader/Block/AbstractTest.php | 12 +-- tests/unit/Mage/Uploader/Helper/DataTest.php | 3 +- tests/unit/Mage/Uploader/Helper/FileTest.php | 15 +-- tests/unit/Mage/Wishlist/Model/ItemTest.php | 6 +- 108 files changed, 496 insertions(+), 821 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 19bca6b856c..2bc365180bf 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -87,7 +87,7 @@ jobs: --skip_url_validation 'yes' - name: Run phpUnit - run: php vendor/bin/phpunit --configuration .phpunit.dist.xml + run: php vendor/bin/phpunit --configuration .phpunit.dist.xml --testsuite Base,Error,Mage,Varien - name: Publish Unit Test Results uses: EnricoMi/publish-unit-test-result-action@v2 diff --git a/.phpunit.dist.xml b/.phpunit.dist.xml index 11215357912..dd00746b5ca 100644 --- a/.phpunit.dist.xml +++ b/.phpunit.dist.xml @@ -31,6 +31,81 @@ tests/unit/Mage + + tests/unit/Mage/Admin + + + tests/unit/Mage/Adminhtml + + + tests/unit/Mage/AdminNotification + + + tests/unit/Mage/Api + + + tests/unit/Mage/Catalog + + + tests/unit/Mage/Cms + + + tests/unit/Mage/Contacts + + + tests/unit/Mage/Core + + + tests/unit/Mage/Customer + + + tests/unit/Mage/Directory + + + tests/unit/Mage/Downloadable + + + tests/unit/Mage/Eav + + + tests/unit/Mage/GiftMessage + + + tests/unit/Mage/Index + + + tests/unit/Mage/Log + + + tests/unit/Mage/Newsletter + + + tests/unit/Mage/Page + + + tests/unit/Mage/Reports + + + tests/unit/Mage/Review + + + tests/unit/Mage/Rule + + + tests/unit/Mage/Sales + + + tests/unit/Mage/Sitemap + + + tests/unit/Mage/Tax + + + tests/unit/Mage/Uploader + + + tests/unit/Mage/Wishlist + tests/unit/Varien diff --git a/composer.json b/composer.json index 1ffaac9791b..52881819a57 100644 --- a/composer.json +++ b/composer.json @@ -155,9 +155,9 @@ "phpmd": "vendor/bin/phpmd app/code/core/Mage text .phpmd.dist.xml --color --cache --baseline-file .phpmd.dist.baseline.xml", "phpstan": "XDEBUG_MODE=off php vendor/bin/phpstan analyze", "phpstan:baseline": "XDEBUG_MODE=off php vendor/bin/phpstan analyze -b .phpstan.dist.baseline.neon", - "phpunit:test": "XDEBUG_MODE=off php vendor/bin/phpunit --configuration .phpunit.dist.xml --no-coverage", - "phpunit:coverage": "XDEBUG_MODE=coverage php vendor/bin/phpunit --configuration .phpunit.dist.xml --testdox", - "phpunit:coverage-local": "XDEBUG_MODE=coverage php vendor/bin/phpunit --configuration .phpunit.dist.xml --coverage-html build/coverage", + "phpunit:test": "XDEBUG_MODE=off php vendor/bin/phpunit --configuration .phpunit.dist.xml --testsuite Base,Error,Mage,Varien --no-coverage", + "phpunit:coverage": "XDEBUG_MODE=coverage php vendor/bin/phpunit --configuration .phpunit.dist.xml --testsuite Base,Error,Mage,Varien --testdox", + "phpunit:coverage-local": "XDEBUG_MODE=coverage php vendor/bin/phpunit --configuration .phpunit.dist.xml --testsuite Base,Error,Mage,Varien --coverage-html build/coverage", "rector:test": "vendor/bin/rector process --config .rector.php --dry-run", "rector:fix": "vendor/bin/rector process --config .rector.php", "test": [ diff --git a/tests/unit/Mage/Admin/Helper/BlockTest.php b/tests/unit/Mage/Admin/Helper/BlockTest.php index e4eb009f87f..b0c7915e431 100644 --- a/tests/unit/Mage/Admin/Helper/BlockTest.php +++ b/tests/unit/Mage/Admin/Helper/BlockTest.php @@ -33,8 +33,7 @@ public static function setUpBeforeClass(): void /** * @covers Mage_Admin_Helper_Block::isTypeAllowed() - * @group Mage_Admin - * @group Mage_Admin_Helper + * @group Helper */ public function testIsTypeAllowed(): void { @@ -43,8 +42,7 @@ public function testIsTypeAllowed(): void /** * @covers Mage_Admin_Helper_Block::getDisallowedBlockNames() - * @group Mage_Admin - * @group Mage_Admin_Helper + * @group Helper */ public function testGetDisallowedBlockNames(): void { diff --git a/tests/unit/Mage/Admin/Helper/DataTest.php b/tests/unit/Mage/Admin/Helper/DataTest.php index 87583f73bf2..088c1b7be64 100644 --- a/tests/unit/Mage/Admin/Helper/DataTest.php +++ b/tests/unit/Mage/Admin/Helper/DataTest.php @@ -33,8 +33,7 @@ public static function setUpBeforeClass(): void /** * @covers Mage_Admin_Helper_Data::generateResetPasswordLinkToken() - * @group Mage_Admin - * @group Mage_Admin_Helper + * @group Helper */ public function testGenerateResetPasswordLinkToken(): void { @@ -43,8 +42,7 @@ public function testGenerateResetPasswordLinkToken(): void /** * @covers Mage_Admin_Helper_Data::getResetPasswordLinkExpirationPeriod() - * @group Mage_Admin - * @group Mage_Admin_Helper + * @group Helper */ public function testGetResetPasswordLinkExpirationPeriod(): void { diff --git a/tests/unit/Mage/Admin/Helper/VariableTest.php b/tests/unit/Mage/Admin/Helper/VariableTest.php index 741e9fb8156..8b88696b01c 100644 --- a/tests/unit/Mage/Admin/Helper/VariableTest.php +++ b/tests/unit/Mage/Admin/Helper/VariableTest.php @@ -33,8 +33,7 @@ public static function setUpBeforeClass(): void /** * @covers Mage_Admin_Helper_Variable::isPathAllowed() - * @group Mage_Admin - * @group Mage_Admin_Helper + * @group Helper */ public function testIsPathAllowed(): void { diff --git a/tests/unit/Mage/Admin/Model/BlockTest.php b/tests/unit/Mage/Admin/Model/BlockTest.php index 079f9bbc524..7a19854ae86 100644 --- a/tests/unit/Mage/Admin/Model/BlockTest.php +++ b/tests/unit/Mage/Admin/Model/BlockTest.php @@ -39,8 +39,7 @@ public static function setUpBeforeClass(): void * @dataProvider provideValidateAdminBlockData * @param true|array $expectedResult * - * @group Mage_Admin - * @group Mage_Admin_Model + * @group Model * @throws Exception */ public function testValidate(bool|array $expectedResult, array $methods): void @@ -52,8 +51,7 @@ public function testValidate(bool|array $expectedResult, array $methods): void } /** - * @group Mage_Admin - * @group Mage_Admin_Model + * @group Model */ public function testIsTypeAllowed(): void { diff --git a/tests/unit/Mage/Admin/Model/ConfigTest.php b/tests/unit/Mage/Admin/Model/ConfigTest.php index a13eb781cb2..71cdd96c7e0 100644 --- a/tests/unit/Mage/Admin/Model/ConfigTest.php +++ b/tests/unit/Mage/Admin/Model/ConfigTest.php @@ -34,8 +34,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Admin - * @group Mage_Admin_Model + * @group Model */ public function testGetAclAssert(): void { @@ -43,8 +42,7 @@ public function testGetAclAssert(): void } /** - * @group Mage_Admin - * @group Mage_Admin_Model + * @group Model */ public function testGetAclPrivilegeSet(): void { @@ -52,8 +50,7 @@ public function testGetAclPrivilegeSet(): void } /** - * @group Mage_Admin - * @group Mage_Admin_Model + * @group Model */ public function testLoadAclResources(): void { @@ -61,8 +58,7 @@ public function testLoadAclResources(): void } /** - * @group Mage_Admin - * @group Mage_Admin_Model + * @group Model */ public function testGetAdminhtmlConfig(): void { diff --git a/tests/unit/Mage/Admin/Model/UserTest.php b/tests/unit/Mage/Admin/Model/UserTest.php index 4fc7ac4ca9f..ddcb6d56f19 100644 --- a/tests/unit/Mage/Admin/Model/UserTest.php +++ b/tests/unit/Mage/Admin/Model/UserTest.php @@ -37,8 +37,7 @@ public static function setUpBeforeClass(): void /** * @dataProvider provideAuthenticateData - * @group Mage_Admin - * @group Mage_Admin_Model + * @group Model * @group runInSeparateProcess * @runInSeparateProcess */ @@ -60,8 +59,7 @@ public function testAuthenticate(bool|string $expectedResult, array $methods): v /** * @dataProvider provideValidateAdminUserData * @param array|true $expectedResult - * @group Mage_Admin - * @group Mage_Admin_Model + * @group Model */ public function testValidate($expectedResult, array $methods): void { @@ -74,8 +72,7 @@ public function testValidate($expectedResult, array $methods): void /** - * @group Mage_Admin - * @group Mage_Admin_Model + * @group Model */ public function testValidateCurrentPassword(): void { @@ -84,8 +81,7 @@ public function testValidateCurrentPassword(): void } /** - * @group Mage_Admin - * @group Mage_Admin_Model + * @group Model */ public function testLoadByUsername(): void { @@ -93,8 +89,7 @@ public function testLoadByUsername(): void } /** - * @group Mage_Admin - * @group Mage_Admin_Model + * @group Model */ public function testHasAssigned2Role(): void { @@ -102,8 +97,7 @@ public function testHasAssigned2Role(): void } /** - * @group Mage_Admin - * @group Mage_Admin_Model + * @group Model */ public function testChangeResetPasswordLinkToken(): void { @@ -112,8 +106,7 @@ public function testChangeResetPasswordLinkToken(): void /** * @dataProvider provideIsResetPasswordLinkTokenExpiredData - * @group Mage_Admin - * @group Mage_Admin_Model + * @group Model */ public function testIsResetPasswordLinkTokenExpired(bool $expectedResult, array $methods): void { @@ -124,8 +117,7 @@ public function testIsResetPasswordLinkTokenExpired(bool $expectedResult, array } /** - * @group Mage_Admin - * @group Mage_Admin_Model + * @group Model */ public function testSendPasswordResetConfirmationEmail(): void { @@ -133,8 +125,7 @@ public function testSendPasswordResetConfirmationEmail(): void } /** - * @group Mage_Admin - * @group Mage_Admin_Model + * @group Model */ public function testCleanPasswordsValidationData(): void { @@ -152,8 +143,7 @@ public function testCleanPasswordsValidationData(): void } /** - * @group Mage_Admin - * @group Mage_Admin_Model + * @group Model */ public function testGetMinAdminPasswordLength(): void { @@ -165,8 +155,7 @@ public function testGetMinAdminPasswordLength(): void } /** - * @group Mage_Admin - * @group Mage_Admin_Model + * @group Model */ public function testSendAdminNotification(): void { diff --git a/tests/unit/Mage/Admin/Model/VariableTest.php b/tests/unit/Mage/Admin/Model/VariableTest.php index 0191e2eda4a..c9b9adf9539 100644 --- a/tests/unit/Mage/Admin/Model/VariableTest.php +++ b/tests/unit/Mage/Admin/Model/VariableTest.php @@ -37,8 +37,7 @@ public static function setUpBeforeClass(): void /** * @dataProvider provideValidateAdminVariableData - * @group Mage_Admin - * @group Mage_Admin_Model + * @group Model * @throws Exception */ public function testValidate(bool|array $expectedResult, array $methods): void diff --git a/tests/unit/Mage/AdminNotification/Helper/DataTest.php b/tests/unit/Mage/AdminNotification/Helper/DataTest.php index 87a80cbeef9..ffac2976b26 100644 --- a/tests/unit/Mage/AdminNotification/Helper/DataTest.php +++ b/tests/unit/Mage/AdminNotification/Helper/DataTest.php @@ -33,8 +33,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_AdminNotification - * @group Mage_AdminNotification_Helper + * @group Helper */ public function testGetLatestNotice(): void { @@ -42,8 +41,7 @@ public function testGetLatestNotice(): void } /** - * @group Mage_AdminNotification - * @group Mage_AdminNotification_Helper + * @group Helper */ public function testGetUnreadNoticeCount(): void { @@ -52,8 +50,7 @@ public function testGetUnreadNoticeCount(): void /** * @covers Mage_AdminNotification_Helper_Data::getPopupObjectUrl() - * @group Mage_AdminNotification - * @group Mage_AdminNotification_Helper + * @group Helper */ public function testGetPopupObjectUrl(): void { diff --git a/tests/unit/Mage/AdminNotification/Model/FeedTest.php b/tests/unit/Mage/AdminNotification/Model/FeedTest.php index 6a1ba48caf8..7d2b782dbff 100644 --- a/tests/unit/Mage/AdminNotification/Model/FeedTest.php +++ b/tests/unit/Mage/AdminNotification/Model/FeedTest.php @@ -32,8 +32,7 @@ public function setUp(): void } /** - * @group Mage_AdminNotification - * @group Mage_AdminNotification_Model + * @group Model */ public function testGetFeedUrl(): void { @@ -41,8 +40,7 @@ public function testGetFeedUrl(): void } /** - * @group Mage_AdminNotification - * @group Mage_AdminNotification_Model + * @group Model */ public function testCheckUpdate(): void { @@ -50,8 +48,7 @@ public function testCheckUpdate(): void } /** - * @group Mage_AdminNotification - * @group Mage_AdminNotification_Model + * @group Model */ public function testGetFeedData(): void { @@ -59,8 +56,7 @@ public function testGetFeedData(): void } /** - * @group Mage_AdminNotification - * @group Mage_AdminNotification_Model + * @group Model */ public function testGetFeedXml(): void { diff --git a/tests/unit/Mage/AdminNotification/Model/InboxTest.php b/tests/unit/Mage/AdminNotification/Model/InboxTest.php index f6f84747c7d..2568546f08d 100644 --- a/tests/unit/Mage/AdminNotification/Model/InboxTest.php +++ b/tests/unit/Mage/AdminNotification/Model/InboxTest.php @@ -41,8 +41,7 @@ public static function setUpBeforeClass(): void /** * @dataProvider provideGetSeverities - * @group Mage_AdminNotification - * @group Mage_AdminNotification_Model + * @group Model */ public function testGetSeverities(array|string|null $expectedResult, ?int $severity): void { @@ -50,8 +49,7 @@ public function testGetSeverities(array|string|null $expectedResult, ?int $sever } /** - * @group Mage_AdminNotification - * @group Mage_AdminNotification_Model + * @group Model */ public function testLoadLatestNotice(bool $delete = false): void { @@ -63,8 +61,7 @@ public function testLoadLatestNotice(bool $delete = false): void } /** - * @group Mage_AdminNotification - * @group Mage_AdminNotification_Model + * @group Model */ public function testAdd(): void { @@ -79,8 +76,7 @@ public function testAdd(): void /** * @covers Mage_AdminNotification_Model_Inbox::add() - * @group Mage_AdminNotification - * @group Mage_AdminNotification_Model + * @group Model */ public function testAddException(): void { @@ -93,8 +89,7 @@ public function testAddException(): void /** * @covers Mage_AdminNotification_Model_Inbox::addCritical() - * @group Mage_AdminNotification - * @group Mage_AdminNotification_Model + * @group Model */ public function testAddCritical(): void { @@ -104,8 +99,7 @@ public function testAddCritical(): void /** * @covers Mage_AdminNotification_Model_Inbox::addMajor() - * @group Mage_AdminNotification - * @group Mage_AdminNotification_Model + * @group Model */ public function testAddMajor(): void { @@ -115,8 +109,7 @@ public function testAddMajor(): void /** * @covers Mage_AdminNotification_Model_Inbox::addMinor() - * @group Mage_AdminNotification - * @group Mage_AdminNotification_Model + * @group Model */ public function testAddMinor(): void { @@ -126,8 +119,7 @@ public function testAddMinor(): void /** * @covers Mage_AdminNotification_Model_Inbox::addNotice() - * @group Mage_AdminNotification - * @group Mage_AdminNotification_Model + * @group Model */ public function testAddNotice(): void { diff --git a/tests/unit/Mage/Adminhtml/Block/CacheTest.php b/tests/unit/Mage/Adminhtml/Block/CacheTest.php index 150ac5175b3..c977feefdbf 100644 --- a/tests/unit/Mage/Adminhtml/Block/CacheTest.php +++ b/tests/unit/Mage/Adminhtml/Block/CacheTest.php @@ -30,8 +30,7 @@ public function setUp(): void } /** - * @group Mage_Adminhtml - * @group Mage_Adminhtml_Block + * @group Block * @group runInSeparateProcess * @runInSeparateProcess */ @@ -41,8 +40,7 @@ public function testGetFlushStorageUrl(): void } /** - * @group Mage_Adminhtml - * @group Mage_Adminhtml_Block + * @group Block * @group runInSeparateProcess * @runInSeparateProcess */ diff --git a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php index 853072de898..0ac61dec3f4 100644 --- a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php +++ b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php @@ -34,8 +34,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Adminhtml - * @group Mage_Adminhtml_Block + * @group Block * @throws Mage_Core_Exception */ public function testInitForm(): void diff --git a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php index 2f43beb2c73..6448b429e8f 100644 --- a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php +++ b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php @@ -35,8 +35,7 @@ public static function setUpBeforeClass(): void /** * - * @group Mage_Adminhtml - * @group Mage_Adminhtml_Block + * @group Block */ public function testInitForm(): void { diff --git a/tests/unit/Mage/Adminhtml/Block/System/Cache/Form/FormTest.php b/tests/unit/Mage/Adminhtml/Block/System/Cache/Form/FormTest.php index b76ca1d493f..7b0732129cc 100644 --- a/tests/unit/Mage/Adminhtml/Block/System/Cache/Form/FormTest.php +++ b/tests/unit/Mage/Adminhtml/Block/System/Cache/Form/FormTest.php @@ -32,8 +32,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Adminhtml - * @group Mage_Adminhtml_Block + * @group Block */ public function testInitForm(): void { diff --git a/tests/unit/Mage/Adminhtml/Block/System/Config/Form/FormTest.php b/tests/unit/Mage/Adminhtml/Block/System/Config/Form/FormTest.php index 6f6dede07da..8b8f8afa8dc 100644 --- a/tests/unit/Mage/Adminhtml/Block/System/Config/Form/FormTest.php +++ b/tests/unit/Mage/Adminhtml/Block/System/Config/Form/FormTest.php @@ -32,7 +32,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Adminhtml + * @group Block */ public function testInitForm(): void { diff --git a/tests/unit/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/ViewTest.php b/tests/unit/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/ViewTest.php index 1622460db02..8735cec6c50 100644 --- a/tests/unit/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/ViewTest.php +++ b/tests/unit/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/ViewTest.php @@ -33,8 +33,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Adminhtml - * @group Mage_Adminhtml_Block + * @group Block */ public function testInitForm(): void { diff --git a/tests/unit/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/EditTest.php b/tests/unit/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/EditTest.php index 7714aa2f4d8..81f87e18cfe 100644 --- a/tests/unit/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/EditTest.php +++ b/tests/unit/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/EditTest.php @@ -33,8 +33,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Adminhtml - * @group Mage_Adminhtml_Block + * @group Block */ public function testInitForm(): void { diff --git a/tests/unit/Mage/Adminhtml/Block/TemplateTest.php b/tests/unit/Mage/Adminhtml/Block/TemplateTest.php index e639f413cac..b5f36e44a73 100644 --- a/tests/unit/Mage/Adminhtml/Block/TemplateTest.php +++ b/tests/unit/Mage/Adminhtml/Block/TemplateTest.php @@ -35,8 +35,7 @@ public static function setUpBeforeClass(): void /** * @see Mage_Core_Model_Session::getFormKey() - * @group Mage_Adminhtml - * @group Mage_Adminhtml_Block + * @group Block * @group runInSeparateProcess * @runInSeparateProcess */ @@ -48,8 +47,7 @@ public function testGetFormKey(): void /** * @covers Mage_Adminhtml_Block_Template::isOutputEnabled() * @dataProvider provideIsOutputEnabled - * @group Mage_Adminhtml - * @group Mage_Adminhtml_Block + * @group Block */ public function testIsOutputEnabled(bool $expectedResult, ?string $moduleName): void { @@ -57,8 +55,7 @@ public function testIsOutputEnabled(bool $expectedResult, ?string $moduleName): } /** - * @group Mage_Adminhtml - * @group Mage_Adminhtml_Block + * @group Block */ public function testGetModuleName(): void { @@ -67,8 +64,7 @@ public function testGetModuleName(): void /** * @see Mage_Core_Model_Input_Filter_MaliciousCode::filter() - * @group Mage_Adminhtml - * @group Mage_Adminhtml_Block + * @group Block */ public function testMaliciousCodeFilter(): void { diff --git a/tests/unit/Mage/Adminhtml/Block/Widget/Grid/ColumnTest.php b/tests/unit/Mage/Adminhtml/Block/Widget/Grid/ColumnTest.php index aff78555bb0..7a99dc23eb2 100644 --- a/tests/unit/Mage/Adminhtml/Block/Widget/Grid/ColumnTest.php +++ b/tests/unit/Mage/Adminhtml/Block/Widget/Grid/ColumnTest.php @@ -30,8 +30,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Adminhtml - * @group Mage_Adminhtml_Block + * @group Block */ public function testGetType(): void { diff --git a/tests/unit/Mage/Adminhtml/Block/Widget/GridTest.php b/tests/unit/Mage/Adminhtml/Block/Widget/GridTest.php index 8a8da85e645..d15e10fe470 100644 --- a/tests/unit/Mage/Adminhtml/Block/Widget/GridTest.php +++ b/tests/unit/Mage/Adminhtml/Block/Widget/GridTest.php @@ -35,8 +35,7 @@ public static function setUpBeforeClass(): void /** * @dataProvider provideAddColumnDefaultData - * @group Mage_Adminhtml - * @group Mage_Adminhtml_Block + * @group Block */ public function testAddColumnDefaultData(array $expectedResult, array $column): void { diff --git a/tests/unit/Mage/Adminhtml/Helper/AddressesTest.php b/tests/unit/Mage/Adminhtml/Helper/AddressesTest.php index 48f246bb80b..3d8a5df9362 100644 --- a/tests/unit/Mage/Adminhtml/Helper/AddressesTest.php +++ b/tests/unit/Mage/Adminhtml/Helper/AddressesTest.php @@ -38,8 +38,7 @@ public static function setUpBeforeClass(): void /** * @covers Mage_Adminhtml_Helper_Addresses::processStreetAttribute() * @dataProvider provideProcessStreetAttribute - * @group Mage_Adminhtml - * @group Mage_Adminhtml_Helper + * @group Helper */ public function testProcessStreetAttribute(int $expectedResult, int $lines): void { diff --git a/tests/unit/Mage/Adminhtml/Helper/CatalogTest.php b/tests/unit/Mage/Adminhtml/Helper/CatalogTest.php index c80a304c7ea..2cc0f4c8ec5 100644 --- a/tests/unit/Mage/Adminhtml/Helper/CatalogTest.php +++ b/tests/unit/Mage/Adminhtml/Helper/CatalogTest.php @@ -33,8 +33,7 @@ public static function setUpBeforeClass(): void /** * @covers Mage_Adminhtml_Helper_Catalog::setAttributeTabBlock() - * @group Mage_Adminhtml - * @group Mage_Adminhtml_Helper + * @group Helper */ public function testSetAttributeTabBlock(): void { @@ -43,8 +42,7 @@ public function testSetAttributeTabBlock(): void /** * @covers Mage_Adminhtml_Helper_Catalog::setCategoryAttributeTabBlock() - * @group Mage_Adminhtml - * @group Mage_Adminhtml_Helper + * @group Helper */ public function testSetCategoryAttributeTabBlock(): void { @@ -53,8 +51,7 @@ public function testSetCategoryAttributeTabBlock(): void /** * @covers Mage_Adminhtml_Helper_Catalog::getSitemapValidPaths() - * @group Mage_Adminhtml - * @group Mage_Adminhtml_Helper + * @group Helper */ public function testGetSitemapValidPaths(): void { diff --git a/tests/unit/Mage/Adminhtml/Helper/ConfigTest.php b/tests/unit/Mage/Adminhtml/Helper/ConfigTest.php index 1c2e6a9fb6d..23f2cf4c17b 100644 --- a/tests/unit/Mage/Adminhtml/Helper/ConfigTest.php +++ b/tests/unit/Mage/Adminhtml/Helper/ConfigTest.php @@ -37,8 +37,7 @@ public static function setUpBeforeClass(): void /** * @covers Mage_Adminhtml_Helper_Config::getInputTypes() * @dataProvider provideGetInputTypes - * @group Mage_Adminhtml - * @group Mage_Adminhtml_Helper + * @group Helper */ public function testGetInputTypes(array $expectedResult, ?string $inputType): void { @@ -48,8 +47,7 @@ public function testGetInputTypes(array $expectedResult, ?string $inputType): vo /** * @covers Mage_Adminhtml_Helper_Config::getBackendModelByInputType() * @dataProvider provideGetBackendModelByInputType - * @group Mage_Adminhtml - * @group Mage_Adminhtml_Helper + * @group Helper */ public function testGetBackendModelByInputType(?string $expectedResult, string $inputType): void { diff --git a/tests/unit/Mage/Adminhtml/Helper/Dashboard/DataTest.php b/tests/unit/Mage/Adminhtml/Helper/Dashboard/DataTest.php index f944632d1a8..bf8f7be68c6 100644 --- a/tests/unit/Mage/Adminhtml/Helper/Dashboard/DataTest.php +++ b/tests/unit/Mage/Adminhtml/Helper/Dashboard/DataTest.php @@ -34,8 +34,7 @@ public static function setUpBeforeClass(): void /** * @covers Mage_Adminhtml_Helper_Dashboard_Data::getStores() - * @group Mage_Adminhtml - * @group Mage_Adminhtml_Helper + * @group Helper */ public function testGetStores(): void { @@ -44,8 +43,7 @@ public function testGetStores(): void /** * @covers Mage_Adminhtml_Helper_Dashboard_Data::countStores() - * @group Mage_Adminhtml - * @group Mage_Adminhtml_Helper + * @group Helper */ public function testCountStores(): void { @@ -54,8 +52,7 @@ public function testCountStores(): void /** * @covers Mage_Adminhtml_Helper_Dashboard_Data::getDatePeriods() - * @group Mage_Adminhtml - * @group Mage_Adminhtml_Helper + * @group Helper */ public function testGetDatePeriods(): void { @@ -71,8 +68,7 @@ public function testGetDatePeriods(): void /** * @covers Mage_Adminhtml_Helper_Dashboard_Data::getChartDataHash() - * @group Mage_Adminhtml - * @group Mage_Adminhtml_Helper + * @group Helper */ public function testGetChartDataHash(): void { diff --git a/tests/unit/Mage/Adminhtml/Helper/DataTest.php b/tests/unit/Mage/Adminhtml/Helper/DataTest.php index 04925eab47e..825d3ac33c8 100644 --- a/tests/unit/Mage/Adminhtml/Helper/DataTest.php +++ b/tests/unit/Mage/Adminhtml/Helper/DataTest.php @@ -33,8 +33,7 @@ public static function setUpBeforeClass(): void /** * @covers Mage_Adminhtml_Helper_Data::getUrl() - * @group Mage_Adminhtml - * @group Mage_Adminhtml_Helper + * @group Helper * @group runInSeparateProcess * @runInSeparateProcess */ @@ -45,8 +44,7 @@ public function testGetUrl(): void /** * @covers Mage_Adminhtml_Helper_Data::getCurrentUserId() - * @group Mage_Adminhtml - * @group Mage_Adminhtml_Helper + * @group Helper * @group runInSeparateProcess * @runInSeparateProcess */ @@ -57,8 +55,7 @@ public function testGetCurrentUserId(): void /** * @covers Mage_Adminhtml_Helper_Data::prepareFilterString() - * @group Mage_Adminhtml - * @group Mage_Adminhtml_Helper + * @group Helper */ public function testPrepareFilterString(): void { @@ -67,8 +64,7 @@ public function testPrepareFilterString(): void /** * @covers Mage_Adminhtml_Helper_Data::decodeFilter() - * @group Mage_Adminhtml - * @group Mage_Adminhtml_Helper + * @group Helper */ public function testDecodeFilter(): void { @@ -79,8 +75,7 @@ public function testDecodeFilter(): void /** * @covers Mage_Adminhtml_Helper_Data::isEnabledSecurityKeyUrl() - * @group Mage_Adminhtml - * @group Mage_Adminhtml_Helper + * @group Helper */ public function testIsEnabledSecurityKeyUrl(): void { diff --git a/tests/unit/Mage/Adminhtml/Helper/JsTest.php b/tests/unit/Mage/Adminhtml/Helper/JsTest.php index 7afc0421b0b..ac64d904e58 100644 --- a/tests/unit/Mage/Adminhtml/Helper/JsTest.php +++ b/tests/unit/Mage/Adminhtml/Helper/JsTest.php @@ -37,8 +37,7 @@ public static function setUpBeforeClass(): void /** * @covers Mage_Adminhtml_Helper_Js::decodeGridSerializedInput() * @dataProvider provideDecodeGridSerializedInput - * @group Mage_Adminhtml - * @group Mage_Adminhtml_Helper + * @group Helper */ public function testDecodeGridSerializedInput(array $expectedResult, string $encoded): void { diff --git a/tests/unit/Mage/Adminhtml/Helper/Media/JsTest.php b/tests/unit/Mage/Adminhtml/Helper/Media/JsTest.php index f28900cdc27..566435234ed 100644 --- a/tests/unit/Mage/Adminhtml/Helper/Media/JsTest.php +++ b/tests/unit/Mage/Adminhtml/Helper/Media/JsTest.php @@ -32,8 +32,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Adminhtml - * @group Mage_Adminhtml_Helper + * @group Helper */ public function testDecodeGridSerializedInput(): void { diff --git a/tests/unit/Mage/Adminhtml/Helper/SalesTest.php b/tests/unit/Mage/Adminhtml/Helper/SalesTest.php index b4c6bd217be..e77780c1a12 100644 --- a/tests/unit/Mage/Adminhtml/Helper/SalesTest.php +++ b/tests/unit/Mage/Adminhtml/Helper/SalesTest.php @@ -37,8 +37,7 @@ public static function setUpBeforeClass(): void /** * @covers Mage_Adminhtml_Helper_Sales::escapeHtmlWithLinks() * @dataProvider provideDecodeGridSerializedInput - * @group Mage_Adminhtml - * @group Mage_Adminhtml_Helper + * @group Helper */ public function testEscapeHtmlWithLinks(string $expectedResult, string $data): void { diff --git a/tests/unit/Mage/Api/Model/UserTest.php b/tests/unit/Mage/Api/Model/UserTest.php index 53bec4d836c..6bb40c2543f 100644 --- a/tests/unit/Mage/Api/Model/UserTest.php +++ b/tests/unit/Mage/Api/Model/UserTest.php @@ -38,8 +38,7 @@ public static function setUpBeforeClass(): void /** * @dataProvider provideValidateApiUserData * @param array|true $expectedResult - * @group Mage_Api - * @group Mage_Api_Model + * @group Model */ public function testValidate($expectedResult, array $methods): void { diff --git a/tests/unit/Mage/Catalog/Helper/CategoryTest.php b/tests/unit/Mage/Catalog/Helper/CategoryTest.php index 9f6646d2ada..2c9d16ff8e3 100644 --- a/tests/unit/Mage/Catalog/Helper/CategoryTest.php +++ b/tests/unit/Mage/Catalog/Helper/CategoryTest.php @@ -32,8 +32,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Catalog - * @group Mage_Catalog_Helper + * @group Helper */ public function testCanUseCanonicalTag(): void { diff --git a/tests/unit/Mage/Catalog/Helper/DataTest.php b/tests/unit/Mage/Catalog/Helper/DataTest.php index 646e7d20f8a..6cf9eba9395 100644 --- a/tests/unit/Mage/Catalog/Helper/DataTest.php +++ b/tests/unit/Mage/Catalog/Helper/DataTest.php @@ -37,8 +37,7 @@ public static function setUpBeforeClass(): void /** * @dataProvider provideSplitSku - * @group Mage_Catalog - * @group Mage_Catalog_Helper + * @group Helper */ public function testSplitSku(array $expectedResult, string $sku, int $length = 30): void { @@ -46,8 +45,7 @@ public function testSplitSku(array $expectedResult, string $sku, int $length = 3 } /** - * @group Mage_Catalog - * @group Mage_Catalog_Helper + * @group Helper */ public function testShouldSaveUrlRewritesHistory(): void { @@ -55,8 +53,7 @@ public function testShouldSaveUrlRewritesHistory(): void } /** - * @group Mage_Catalog - * @group Mage_Catalog_Helper + * @group Helper */ public function testIsUsingStaticUrlsAllowed(): void { @@ -64,8 +61,7 @@ public function testIsUsingStaticUrlsAllowed(): void } /** - * @group Mage_Catalog - * @group Mage_Catalog_Helper + * @group Helper */ public function testIsUrlDirectivesParsingAllowed(): void { @@ -73,8 +69,7 @@ public function testIsUrlDirectivesParsingAllowed(): void } /** - * @group Mage_Catalog - * @group Mage_Catalog_Helper + * @group Helper */ public function testGetPageTemplateProcessor(): void { @@ -82,8 +77,7 @@ public function testGetPageTemplateProcessor(): void } /** - * @group Mage_Catalog - * @group Mage_Catalog_Helper + * @group Helper */ public function testGetOldFieldMap(): void { diff --git a/tests/unit/Mage/Catalog/Helper/MapTest.php b/tests/unit/Mage/Catalog/Helper/MapTest.php index 6e52ca623eb..df4dcaa6740 100644 --- a/tests/unit/Mage/Catalog/Helper/MapTest.php +++ b/tests/unit/Mage/Catalog/Helper/MapTest.php @@ -32,8 +32,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Catalog - * @group Mage_Catalog_Helper + * @group Helper * @group runInSeparateProcess * @runInSeparateProcess */ @@ -43,8 +42,7 @@ public function testGetCategoryUrl(): void } /** - * @group Mage_Catalog - * @group Mage_Catalog_Helper + * @group Helper * @group runInSeparateProcess * @runInSeparateProcess */ @@ -54,8 +52,7 @@ public function testGetProductUrl(): void } /** - * @group Mage_Catalog - * @group Mage_Catalog_Helper + * @group Helper */ public function testGetIsUseCategoryTreeMode(): void { diff --git a/tests/unit/Mage/Catalog/Helper/Product/UrlTest.php b/tests/unit/Mage/Catalog/Helper/Product/UrlTest.php index 0abae125db9..9a8a05fc762 100644 --- a/tests/unit/Mage/Catalog/Helper/Product/UrlTest.php +++ b/tests/unit/Mage/Catalog/Helper/Product/UrlTest.php @@ -36,8 +36,7 @@ public static function setUpBeforeClass(): void /** * @covers Mage_Catalog_Helper_Product_Url::getConvertTable() - * @group Mage_Catalog - * @group Mage_Catalog_Helper + * @group Helper */ public function testGetConvertTable(): void { @@ -47,8 +46,7 @@ public function testGetConvertTable(): void /** * @covers Mage_Catalog_Helper_Product_Url::getConvertTableCustom() - * @group Mage_Catalog - * @group Mage_Catalog_Helper + * @group Helper */ public function testGetConvertTableCustom(): void { @@ -58,8 +56,7 @@ public function testGetConvertTableCustom(): void /** * @covers Mage_Catalog_Helper_Product_Url::getConvertTableShort() - * @group Mage_Catalog - * @group Mage_Catalog_Helper + * @group Helper */ public function testGetConvertTableShort(): void { @@ -70,8 +67,7 @@ public function testGetConvertTableShort(): void /** * @covers Mage_Catalog_Helper_Product_Url::format() * @dataProvider provideFormat - * @group Mage_Catalog - * @group Mage_Catalog_Helper + * @group Helper */ public function testFormat(string $expectedResult, ?string $string): void { diff --git a/tests/unit/Mage/Catalog/Helper/ProductTest.php b/tests/unit/Mage/Catalog/Helper/ProductTest.php index a0714c213ef..7cc3a210885 100644 --- a/tests/unit/Mage/Catalog/Helper/ProductTest.php +++ b/tests/unit/Mage/Catalog/Helper/ProductTest.php @@ -35,8 +35,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Catalog - * @group Mage_Catalog_Helper + * @group Helper */ public function testCanUseCanonicalTag(): void { @@ -45,8 +44,7 @@ public function testCanUseCanonicalTag(): void /** * @dataProvider provideGetAttributeInputTypes - * @group Mage_Catalog - * @group Mage_Catalog_Helper + * @group Helper */ public function testGetAttributeInputTypes(int $expectedResult, ?string $inputType = null): void { @@ -55,8 +53,7 @@ public function testGetAttributeInputTypes(int $expectedResult, ?string $inputTy /** * @dataProvider provideGetAttributeBackendModelByInputType - * @group Mage_Catalog - * @group Mage_Catalog_Helper + * @group Helper */ public function testGetAttributeBackendModelByInputType(string $expectedResult, string $inputType): void { @@ -65,8 +62,7 @@ public function testGetAttributeBackendModelByInputType(string $expectedResult, /** * @dataProvider provideGetAttributeSourceModelByInputType - * @group Mage_Catalog - * @group Mage_Catalog_Helper + * @group Helper */ public function testGetAttributeSourceModelByInputType(string $expectedResult, string $inputType): void { diff --git a/tests/unit/Mage/Catalog/Model/CategoryTest.php b/tests/unit/Mage/Catalog/Model/CategoryTest.php index bc696343991..80612fc2068 100644 --- a/tests/unit/Mage/Catalog/Model/CategoryTest.php +++ b/tests/unit/Mage/Catalog/Model/CategoryTest.php @@ -38,8 +38,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Catalog - * @group Mage_Catalog_Model + * @group Model */ public function testGetDefaultAttributeSetId(): void { @@ -47,8 +46,7 @@ public function testGetDefaultAttributeSetId(): void } /** - * @group Mage_Catalog - * @group Mage_Catalog_Model + * @group Model */ public function testGetProductCollection(): void { @@ -56,8 +54,7 @@ public function testGetProductCollection(): void } /** - * @group Mage_Catalog - * @group Mage_Catalog_Model + * @group Model */ public function testGetAvailableSortByOptions(): void { @@ -65,8 +62,7 @@ public function testGetAvailableSortByOptions(): void } /** - * @group Mage_Catalog - * @group Mage_Catalog_Model + * @group Model */ public function testGetDefaultSortBy(): void { @@ -74,8 +70,7 @@ public function testGetDefaultSortBy(): void } /** - * @group Mage_Catalog - * @group Mage_Catalog_Model + * @group Model */ public function testValidate(): void { @@ -83,8 +78,7 @@ public function testValidate(): void } /** - * @group Mage_Catalog - * @group Mage_Catalog_Model + * @group Model */ public function testAfterCommitCallback(): void { @@ -92,8 +86,7 @@ public function testAfterCommitCallback(): void } /** - * @group Mage_Catalog - * @group Mage_Catalog_Model + * @group Model */ public function testGetUrlModel(): void { @@ -103,8 +96,7 @@ public function testGetUrlModel(): void /** * @dataProvider provideFormatUrlKey - * @group Mage_Catalog - * @group Mage_Catalog_Model + * @group Model * @runInSeparateProcess */ // public function testGetCategoryIdUrl($expectedResult, ?string $locale): void @@ -116,8 +108,7 @@ public function testGetUrlModel(): void /** * @dataProvider provideFormatUrlKey - * @group Mage_Catalog - * @group Mage_Catalog_Model + * @group Model */ public function testFormatUrlKey(string $expectedResult, string $locale): void { diff --git a/tests/unit/Mage/Catalog/Model/Product/Option/Type/TextTest.php b/tests/unit/Mage/Catalog/Model/Product/Option/Type/TextTest.php index 4d3fc8a2b2e..a68f9d3b53f 100644 --- a/tests/unit/Mage/Catalog/Model/Product/Option/Type/TextTest.php +++ b/tests/unit/Mage/Catalog/Model/Product/Option/Type/TextTest.php @@ -34,8 +34,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Catalog - * @group Mage_Catalog_Model + * @group Model * @group runInSeparateProcess * @runInSeparateProcess */ @@ -48,8 +47,7 @@ public function testValidateUserValue(): void /** * @dataProvider providePrepareForCart - * @group Mage_Catalog - * @group Mage_Catalog_Model + * @group Model */ public function testPrepareForCart(?string $expectedResult, bool $setIsValid = true, ?string $setUserValue = null): void { @@ -71,8 +69,7 @@ public function providePrepareForCart(): Generator /** * @covers Mage_Catalog_Model_Product_Option_Type_Text::getFormattedOptionValue() - * @group Mage_Catalog - * @group Mage_Catalog_Model + * @group Model */ public function testGetDefaultAttributeSetId(): void { diff --git a/tests/unit/Mage/Catalog/Model/ProductTest.php b/tests/unit/Mage/Catalog/Model/ProductTest.php index 0225dab7f9f..9f416fc1d43 100644 --- a/tests/unit/Mage/Catalog/Model/ProductTest.php +++ b/tests/unit/Mage/Catalog/Model/ProductTest.php @@ -42,8 +42,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Catalog - * @group Mage_Catalog_Model + * @group Model */ public function testGetStoreId(): void { @@ -51,8 +50,7 @@ public function testGetStoreId(): void } /** - * @group Mage_Catalog - * @group Mage_Catalog_Model + * @group Model */ public function testGetResourceCollection(): void { @@ -60,8 +58,7 @@ public function testGetResourceCollection(): void } /** - * @group Mage_Catalog - * @group Mage_Catalog_Model + * @group Model */ public function testGetUrlModel(): void { @@ -70,8 +67,7 @@ public function testGetUrlModel(): void } /** - * @group Mage_Catalog - * @group Mage_Catalog_Model + * @group Model */ public function testValidate(): void { @@ -79,8 +75,7 @@ public function testValidate(): void } /** - * @group Mage_Catalog - * @group Mage_Catalog_Model + * @group Model */ // public function testGetName(): void // { @@ -89,8 +84,7 @@ public function testValidate(): void // } /** - * @group Mage_Catalog - * @group Mage_Catalog_Model + * @group Model */ // public function testGetPrice(): void // { @@ -98,8 +92,7 @@ public function testValidate(): void // } /** - * @group Mage_Catalog - * @group Mage_Catalog_Model + * @group Model */ public function testSetPriceCalculation(): void { @@ -107,8 +100,7 @@ public function testSetPriceCalculation(): void } /** - * @group Mage_Catalog - * @group Mage_Catalog_Model + * @group Model */ // public function testGetTypeId(): void // { @@ -116,8 +108,7 @@ public function testSetPriceCalculation(): void // } /** - * @group Mage_Catalog - * @group Mage_Catalog_Model + * @group Model */ public function testGetStatus(): void { @@ -126,8 +117,7 @@ public function testGetStatus(): void /** * @dataProvider provideBool - * @group Mage_Catalog - * @group Mage_Catalog_Model + * @group Model */ public function testGetTypeInstance(bool $singleton): void { @@ -135,8 +125,7 @@ public function testGetTypeInstance(bool $singleton): void } /** - * @group Mage_Catalog - * @group Mage_Catalog_Model + * @group Model */ public function testGetLinkInstance(): void { @@ -144,8 +133,7 @@ public function testGetLinkInstance(): void } /** - * @group Mage_Catalog - * @group Mage_Catalog_Model + * @group Model */ public function testGetDefaultAttributeSetId(): void { @@ -153,8 +141,7 @@ public function testGetDefaultAttributeSetId(): void } /** - * @group Mage_Catalog - * @group Mage_Catalog_Model + * @group Model */ public function testAfterCommitCallback(): void { @@ -163,8 +150,7 @@ public function testAfterCommitCallback(): void /** * @dataProvider provideFormatUrlKey - * @group Mage_Catalog - * @group Mage_Catalog_Model + * @group Model */ public function testFormatUrlKey(string $expectedResult, string $locale): void { diff --git a/tests/unit/Mage/Catalog/Model/Resource/Eav/AttributeTest.php b/tests/unit/Mage/Catalog/Model/Resource/Eav/AttributeTest.php index e2aefa2fe05..cce4cdf0281 100644 --- a/tests/unit/Mage/Catalog/Model/Resource/Eav/AttributeTest.php +++ b/tests/unit/Mage/Catalog/Model/Resource/Eav/AttributeTest.php @@ -35,8 +35,7 @@ public function setUp(): void /** * @dataProvider provideGetStoreId - * @group Mage_Catalog - * @group Mage_Catalog_Model + * @group Model * @group Mage_Catalog_Model_Resource */ public function testGetStoreId(?int $expectedResult, int|string|null $withStoreId): void diff --git a/tests/unit/Mage/Catalog/Model/UrlTest.php b/tests/unit/Mage/Catalog/Model/UrlTest.php index e1a416a959c..3ebf93234c2 100644 --- a/tests/unit/Mage/Catalog/Model/UrlTest.php +++ b/tests/unit/Mage/Catalog/Model/UrlTest.php @@ -41,8 +41,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Catalog - * @group Mage_Catalog_Model + * @group Model */ public function testGetStoreRootCategory(): void { @@ -51,8 +50,7 @@ public function testGetStoreRootCategory(): void /** * @dataProvider provideIntOrNull - * @group Mage_Catalog - * @group Mage_Catalog_Model + * @group Model */ public function testRefreshRewrites(?int $storeId): void { @@ -62,8 +60,7 @@ public function testRefreshRewrites(?int $storeId): void /** * @dataProvider provideGeneratePathData * - * @group Mage_Catalog - * @group Mage_Catalog_Model + * @group Model */ public function testGeneratePath( string $expectedResult, @@ -81,8 +78,7 @@ public function testGeneratePath( /** * @dataProvider provideFormatUrlKey - * @group Mage_Catalog - * @group Mage_Catalog_Model + * @group Model */ public function testFormatUrlKey(string $expectedResult, string $locale): void { @@ -91,8 +87,7 @@ public function testFormatUrlKey(string $expectedResult, string $locale): void } /** - * @group Mage_Catalog - * @group Mage_Catalog_Model + * @group Model * @doesNotPerformAssertions */ // public function testGetSlugger(): void @@ -102,8 +97,7 @@ public function testFormatUrlKey(string $expectedResult, string $locale): void /** * @dataProvider provideGetSluggerConfig - * @group Mage_Catalog - * @group Mage_Catalog_Model + * @group Model */ public function testGetSluggerConfig(array $expectedResult, string $locale): void { diff --git a/tests/unit/Mage/Cms/Block/BlockTest.php b/tests/unit/Mage/Cms/Block/BlockTest.php index d5fd9b237c0..62823b5b3ab 100644 --- a/tests/unit/Mage/Cms/Block/BlockTest.php +++ b/tests/unit/Mage/Cms/Block/BlockTest.php @@ -27,8 +27,7 @@ class BlockTest extends OpenMageTest /** * @dataProvider provideNumericString - * @group Mage_Cms - * @group Mage_Cms_Block + * @group Block */ public function testGetCacheKeyInfo(string $blockId): void { diff --git a/tests/unit/Mage/Cms/Block/PageTest.php b/tests/unit/Mage/Cms/Block/PageTest.php index 8206e236972..0bfd939f594 100644 --- a/tests/unit/Mage/Cms/Block/PageTest.php +++ b/tests/unit/Mage/Cms/Block/PageTest.php @@ -28,8 +28,7 @@ class PageTest extends OpenMageTest /** * @dataProvider provideNumericString - * @group Mage_Cms - * @group Mage_Cms_Block + * @group Block */ public function testGetPage(string $pageId): void { diff --git a/tests/unit/Mage/Cms/Block/Widget/BlockTest.php b/tests/unit/Mage/Cms/Block/Widget/BlockTest.php index 8c085fa479c..703577e4be1 100644 --- a/tests/unit/Mage/Cms/Block/Widget/BlockTest.php +++ b/tests/unit/Mage/Cms/Block/Widget/BlockTest.php @@ -35,8 +35,7 @@ public static function setUpBeforeClass(): void /** * @dataProvider provideNumericString - * @group Mage_Cms - * @group Mage_Cms_Block + * @group Block */ public function testGetCacheKeyInfo(string $blockId): void { @@ -50,8 +49,7 @@ public function testGetCacheKeyInfo(string $blockId): void } /** - * @group Mage_Cms - * @group Mage_Cms_Block + * @group Block */ public function testIsRequestFromAdminArea(): void { diff --git a/tests/unit/Mage/Cms/Block/Widget/Page/LinkTest.php b/tests/unit/Mage/Cms/Block/Widget/Page/LinkTest.php index 6c8c202b367..7369278cfb3 100644 --- a/tests/unit/Mage/Cms/Block/Widget/Page/LinkTest.php +++ b/tests/unit/Mage/Cms/Block/Widget/Page/LinkTest.php @@ -32,8 +32,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Cms - * @group Mage_Cms_Block + * @group Block */ public function testGetHref(): void { @@ -41,8 +40,7 @@ public function testGetHref(): void } /** - * @group Mage_Cms - * @group Mage_Cms_Block + * @group Block */ public function testGetTitle(): void { @@ -50,8 +48,7 @@ public function testGetTitle(): void } /** - * @group Mage_Cms - * @group Mage_Cms_Block + * @group Block */ // public function testGetAnchorText(): void // { diff --git a/tests/unit/Mage/Cms/Helper/DataTest.php b/tests/unit/Mage/Cms/Helper/DataTest.php index d74810ec23c..cd244fe2c8e 100644 --- a/tests/unit/Mage/Cms/Helper/DataTest.php +++ b/tests/unit/Mage/Cms/Helper/DataTest.php @@ -35,8 +35,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Cms - * @group Mage_Cms_Helper + * @group Helper */ public function testGetAllowedStreamWrappers(): void { @@ -44,8 +43,7 @@ public function testGetAllowedStreamWrappers(): void } /** - * @group Mage_Cms - * @group Mage_Cms_Helper + * @group Helper */ public function testGetBlockTemplateProcessor(): void { @@ -53,8 +51,7 @@ public function testGetBlockTemplateProcessor(): void } /** - * @group Mage_Cms - * @group Mage_Cms_Helper + * @group Helper */ public function testGetPageTemplateProcessor(): void { @@ -62,8 +59,7 @@ public function testGetPageTemplateProcessor(): void } /** - * @group Mage_Cms - * @group Mage_Cms_Helper + * @group Helper */ public function testIsSwfDisabled(): void { diff --git a/tests/unit/Mage/Cms/Helper/PageTest.php b/tests/unit/Mage/Cms/Helper/PageTest.php index e15e79c32d4..a77f21f79f2 100644 --- a/tests/unit/Mage/Cms/Helper/PageTest.php +++ b/tests/unit/Mage/Cms/Helper/PageTest.php @@ -37,8 +37,7 @@ public static function setUpBeforeClass(): void /** * @dataProvider provideGetUsedInStoreConfigPaths - * @group Mage_Cms - * @group Mage_Cms_Helper + * @group Helper */ public function testGetUsedInStoreConfigPaths(array $expectedResult, ?array $path): void { diff --git a/tests/unit/Mage/Cms/Helper/Wysiwyg/ImagesTest.php b/tests/unit/Mage/Cms/Helper/Wysiwyg/ImagesTest.php index b6bfb5b999d..f278b0af0ea 100644 --- a/tests/unit/Mage/Cms/Helper/Wysiwyg/ImagesTest.php +++ b/tests/unit/Mage/Cms/Helper/Wysiwyg/ImagesTest.php @@ -36,8 +36,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Cms - * @group Mage_Cms_Helper + * @group Helper */ public function testGetCurrentPath(): void { @@ -45,8 +44,7 @@ public function testGetCurrentPath(): void } /** - * @group Mage_Cms - * @group Mage_Cms_Helper + * @group Helper */ public function testGetCurrentUrl(): void { @@ -54,8 +52,7 @@ public function testGetCurrentUrl(): void } /** - * @group Mage_Cms - * @group Mage_Cms_Helper + * @group Helper */ public function testGetStorage(): void { @@ -63,8 +60,7 @@ public function testGetStorage(): void } /** - * @group Mage_Cms - * @group Mage_Cms_Helper + * @group Helper */ public function testIdEncode(): void { @@ -72,8 +68,7 @@ public function testIdEncode(): void } /** - * @group Mage_Cms - * @group Mage_Cms_Helper + * @group Helper */ public function testIdDecode(): void { @@ -82,8 +77,7 @@ public function testIdDecode(): void /** * @dataProvider provideGetShortFilename - * @group Mage_Cms - * @group Mage_Cms_Helper + * @group Helper */ public function testGetShortFilename(string $expectedResult, string $filename, int $maxLength): void { diff --git a/tests/unit/Mage/Cms/Model/PageTest.php b/tests/unit/Mage/Cms/Model/PageTest.php index 276459f25df..22d8aa2b616 100644 --- a/tests/unit/Mage/Cms/Model/PageTest.php +++ b/tests/unit/Mage/Cms/Model/PageTest.php @@ -34,8 +34,7 @@ public function setUp(): void } /** - * @group Mage_Cms - * @group Mage_Cms_Model + * @group Model */ public function testLoad(): void { @@ -44,8 +43,7 @@ public function testLoad(): void } /** - * @group Mage_Cms - * @group Mage_Cms_Model + * @group Model */ public function testCheckIdentifier(): void { @@ -53,8 +51,7 @@ public function testCheckIdentifier(): void } /** - * @group Mage_Cms - * @group Mage_Cms_Model + * @group Model */ public function testGetCmsPageTitleByIdentifier(): void { @@ -65,8 +62,7 @@ public function testGetCmsPageTitleByIdentifier(): void } /** - * @group Mage_Cms - * @group Mage_Cms_Model + * @group Model */ public function testGetCmsPageTitleById(): void { @@ -77,8 +73,7 @@ public function testGetCmsPageTitleById(): void } /** - * @group Mage_Cms - * @group Mage_Cms_Model + * @group Model */ public function testGetCmsPageIdentifierById(): void { @@ -86,8 +81,7 @@ public function testGetCmsPageIdentifierById(): void } /** - * @group Mage_Cms - * @group Mage_Cms_Model + * @group Model */ public function testGetAvailableStatuses(): void { @@ -95,8 +89,7 @@ public function testGetAvailableStatuses(): void } /** - * @group Mage_Cms - * @group Mage_Cms_Model + * @group Model * @doesNotPerformAssertions */ public function testGetUsedInStoreConfigCollection(): void @@ -105,8 +98,7 @@ public function testGetUsedInStoreConfigCollection(): void } /** - * @group Mage_Cms - * @group Mage_Cms_Model + * @group Model */ public function testIsUsedInStoreConfig(): void { diff --git a/tests/unit/Mage/Cms/Model/Wysiwyg/ConfigTest.php b/tests/unit/Mage/Cms/Model/Wysiwyg/ConfigTest.php index 12aa71ba61e..06d15a41695 100644 --- a/tests/unit/Mage/Cms/Model/Wysiwyg/ConfigTest.php +++ b/tests/unit/Mage/Cms/Model/Wysiwyg/ConfigTest.php @@ -35,8 +35,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Cms - * @group Mage_Cms_Model + * @group Model * @group runInSeparateProcess * @runInSeparateProcess */ @@ -46,8 +45,7 @@ public function testGetConfig(): void } /** - * @group Mage_Cms - * @group Mage_Cms_Model + * @group Model */ public function testGetSkinImagePlaceholderUrl(): void { @@ -55,8 +53,7 @@ public function testGetSkinImagePlaceholderUrl(): void } /** - * @group Mage_Cms - * @group Mage_Cms_Model + * @group Model */ public function testGetSkinImagePlaceholderPath(): void { @@ -64,8 +61,7 @@ public function testGetSkinImagePlaceholderPath(): void } /** - * @group Mage_Cms - * @group Mage_Cms_Model + * @group Model */ public function testIsEnabled(): void { @@ -73,8 +69,7 @@ public function testIsEnabled(): void } /** - * @group Mage_Cms - * @group Mage_Cms_Model + * @group Model */ public function testIsHidden(): void { diff --git a/tests/unit/Mage/Cms/Model/Wysiwyg/Images/StorageTest.php b/tests/unit/Mage/Cms/Model/Wysiwyg/Images/StorageTest.php index 8641958544a..9843debdf15 100644 --- a/tests/unit/Mage/Cms/Model/Wysiwyg/Images/StorageTest.php +++ b/tests/unit/Mage/Cms/Model/Wysiwyg/Images/StorageTest.php @@ -34,8 +34,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Cms - * @group Mage_Cms_Model + * @group Model */ public function testGetThumbsPath(): void { @@ -43,8 +42,7 @@ public function testGetThumbsPath(): void } /** - * @group Mage_Cms - * @group Mage_Cms_Model + * @group Model * @group runInSeparateProcess * @runInSeparateProcess */ @@ -54,8 +52,7 @@ public function testResizeOnTheFly(): void } /** - * @group Mage_Cms - * @group Mage_Cms_Model + * @group Model */ public function testGetHelper(): void { @@ -63,8 +60,7 @@ public function testGetHelper(): void } /** - * @group Mage_Cms - * @group Mage_Cms_Model + * @group Model * @group runInSeparateProcess * @runInSeparateProcess */ @@ -74,8 +70,7 @@ public function testGetSession(): void } /** - * @group Mage_Cms - * @group Mage_Cms_Model + * @group Model */ public function testGetThumbnailRoot(): void { @@ -83,8 +78,7 @@ public function testGetThumbnailRoot(): void } /** - * @group Mage_Cms - * @group Mage_Cms_Model + * @group Model */ public function testIsImage(): void { diff --git a/tests/unit/Mage/Contacts/Controllers/IndexControllerTest.php b/tests/unit/Mage/Contacts/Controllers/IndexControllerTest.php index 95be345694e..aeb3d4f6d8e 100644 --- a/tests/unit/Mage/Contacts/Controllers/IndexControllerTest.php +++ b/tests/unit/Mage/Contacts/Controllers/IndexControllerTest.php @@ -20,6 +20,7 @@ use Generator; use Mage; use Mage_Contacts_IndexController as Subject; +use Mage_Core_Exception; use Mage_Customer_Model_Session; use OpenMage\Tests\Unit\OpenMageTest; @@ -32,10 +33,10 @@ protected function setUp(): void /** * @dataProvider postActionDataProvider - * @group Mage_Contacts - * @group Mage_Contacts_Controller + * @group Controller + * @group runInSeparateProcess * @runInSeparateProcess - * @throws \Mage_Core_Exception + * @throws Mage_Core_Exception */ public function testPostAction(array $postData, bool $isFormKeyValid, ?string $expectedErrorMessage): void { diff --git a/tests/unit/Mage/Core/Block/Text/ListTest.php b/tests/unit/Mage/Core/Block/Text/ListTest.php index ee7fd775ad2..ff633feecbb 100644 --- a/tests/unit/Mage/Core/Block/Text/ListTest.php +++ b/tests/unit/Mage/Core/Block/Text/ListTest.php @@ -23,8 +23,7 @@ class ListTest extends OpenMageTest { /** - * @group Mage_Core - * @group Mage_Core_Block + * @group Block */ public function testDuplicateBlockName(): void { @@ -42,8 +41,7 @@ public function testDuplicateBlockName(): void } /** - * @group Mage_Core - * @group Mage_Core_Block + * @group Block */ public function testDuplicateBlockNameOrdering(): void { @@ -69,8 +67,7 @@ public function testDuplicateBlockNameOrdering(): void } /** - * @group Mage_Core - * @group Mage_Core_Block + * @group Block */ public function testUniqueBlockNameOrdering(): void { diff --git a/tests/unit/Mage/Core/Helper/CookieTest.php b/tests/unit/Mage/Core/Helper/CookieTest.php index f3c481da883..5eb59199fa7 100644 --- a/tests/unit/Mage/Core/Helper/CookieTest.php +++ b/tests/unit/Mage/Core/Helper/CookieTest.php @@ -32,8 +32,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testIsUserNotAllowSaveCookie(): void { @@ -41,8 +40,7 @@ public function testIsUserNotAllowSaveCookie(): void } /** - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testGetAcceptedSaveCookiesWebsiteIds(): void { @@ -51,8 +49,7 @@ public function testGetAcceptedSaveCookiesWebsiteIds(): void /** * @covers Mage_Core_Helper_Cookie::getCookieRestrictionLifetime() - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testGetCookieRestrictionLifetime(): void { @@ -61,8 +58,7 @@ public function testGetCookieRestrictionLifetime(): void /** * @covers Mage_Core_Helper_Cookie::getCookieRestrictionNoticeCmsBlockIdentifier() - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testGetCookieRestrictionNoticeCmsBlockIdentifier(): void { diff --git a/tests/unit/Mage/Core/Helper/DataTest.php b/tests/unit/Mage/Core/Helper/DataTest.php index 2f23c1623aa..972fe138087 100644 --- a/tests/unit/Mage/Core/Helper/DataTest.php +++ b/tests/unit/Mage/Core/Helper/DataTest.php @@ -40,8 +40,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testGetEncryptor(): void { @@ -49,8 +48,7 @@ public function testGetEncryptor(): void } /** - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testEncrypt(): void { @@ -58,8 +56,7 @@ public function testEncrypt(): void } /** - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testDecrypt(): void { @@ -67,8 +64,7 @@ public function testDecrypt(): void } /** - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testValidateKey(): void { @@ -77,8 +73,7 @@ public function testValidateKey(): void /** * @dataProvider provideFormatTimezoneDate - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper * @group Dates */ public function testFormatTimezoneDate( @@ -92,8 +87,7 @@ public function testFormatTimezoneDate( } /** - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testGetRandomString(): void { @@ -101,8 +95,7 @@ public function testGetRandomString(): void } /** - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testGetHash(): void { @@ -110,8 +103,7 @@ public function testGetHash(): void } /** - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testGetHashPassword(): void { @@ -119,8 +111,7 @@ public function testGetHashPassword(): void } /** - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testValidateHash(): void { @@ -128,8 +119,7 @@ public function testValidateHash(): void } /** - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testGetStoreId(): void { @@ -139,8 +129,7 @@ public function testGetStoreId(): void /** * @covers Mage_Core_Helper_Data::removeAccents() * @dataProvider provideRemoveAccents - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testRemoveAccents(string $expectedResult, string $string, bool $german): void { @@ -149,8 +138,7 @@ public function testRemoveAccents(string $expectedResult, string $string, bool $ /** * @covers Mage_Core_Helper_Data::isDevAllowed() - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testIsDevAllowed(): void { @@ -160,8 +148,7 @@ public function testIsDevAllowed(): void /** * @covers Mage_Core_Helper_Data::getCacheTypes() - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testGetCacheTypes(): void { @@ -180,8 +167,7 @@ public function testGetCacheTypes(): void } /** * @covers Mage_Core_Helper_Data::getCacheBetaTypes() - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testGetCacheBetaTypes(): void @@ -192,8 +178,7 @@ public function testGetCacheBetaTypes(): void /** * @covers Mage_Core_Helper_Data::uniqHash() - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testUniqHash(): void { @@ -203,8 +188,7 @@ public function testUniqHash(): void /** * @covers Mage_Core_Helper_Data::getDefaultCountry() - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testGetDefaultCountry(): void { @@ -213,8 +197,7 @@ public function testGetDefaultCountry(): void /** * @covers Mage_Core_Helper_Data::getProtectedFileExtensions() - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testGetProtectedFileExtensions(): void { @@ -242,8 +225,7 @@ public function testGetProtectedFileExtensions(): void /** * @covers Mage_Core_Helper_Data::getPublicFilesValidPath() - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testGetPublicFilesValidPath(): void { @@ -263,8 +245,7 @@ public function testGetPublicFilesValidPath(): void /** * @covers Mage_Core_Helper_Data::useDbCompatibleMode() - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testUseDbCompatibleMode(): void { @@ -273,8 +254,7 @@ public function testUseDbCompatibleMode(): void /** * @covers Mage_Core_Helper_Data::getMerchantCountryCode() - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testGetMerchantCountryCode(): void { @@ -283,8 +263,7 @@ public function testGetMerchantCountryCode(): void /** * @covers Mage_Core_Helper_Data::getMerchantCountryCode() - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testGetMerchantVatNumber(): void { @@ -293,8 +272,7 @@ public function testGetMerchantVatNumber(): void /** * @covers Mage_Core_Helper_Data::getMerchantCountryCode() - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testIsCountryInEU(): void { diff --git a/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php b/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php index ed6af0c0e49..f7eab2ff67c 100644 --- a/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php +++ b/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php @@ -43,8 +43,7 @@ public function setup(): void } /** - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testBuildPath(): void { @@ -54,8 +53,7 @@ public function testBuildPath(): void } /** - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testBuildNodePath(): void { @@ -65,8 +63,7 @@ public function testBuildNodePath(): void } /** - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testXmlHasTestStrings(): void { @@ -80,8 +77,7 @@ public function testXmlHasTestStrings(): void /** * @dataProvider envOverridesCorrectConfigKeysDataProvider - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper * * @param array $config */ @@ -181,7 +177,7 @@ public function envOverridesCorrectConfigKeysDataProvider(): Generator /** * @dataProvider envDoesNotOverrideOnWrongConfigKeysDataProvider - * @group Mage_Core + * @group Helper * * @param array $config */ diff --git a/tests/unit/Mage/Core/Helper/HintTest.php b/tests/unit/Mage/Core/Helper/HintTest.php index d53b0804cca..ca10bed95f0 100644 --- a/tests/unit/Mage/Core/Helper/HintTest.php +++ b/tests/unit/Mage/Core/Helper/HintTest.php @@ -33,8 +33,7 @@ public static function setUpBeforeClass(): void /** * @covers Mage_Core_Helper_Hint::getAvailableHints() - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testGetAvailableHints(): void { @@ -43,8 +42,7 @@ public function testGetAvailableHints(): void /** * @covers Mage_Core_Helper_Hint::getHintByCode() - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testGetHintByCode(): void { diff --git a/tests/unit/Mage/Core/Helper/JsTest.php b/tests/unit/Mage/Core/Helper/JsTest.php index 354f379a1a2..4f34939b5a7 100644 --- a/tests/unit/Mage/Core/Helper/JsTest.php +++ b/tests/unit/Mage/Core/Helper/JsTest.php @@ -35,8 +35,7 @@ public static function setUpBeforeClass(): void /** * @covers Mage_Core_Helper_Js::getTranslateJson() - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testGetTranslateJson(): void { @@ -45,8 +44,7 @@ public function testGetTranslateJson(): void /** * @covers Mage_Core_Helper_Js::getTranslatorScript() - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testGetTranslatorScript(): void { @@ -54,8 +52,7 @@ public function testGetTranslatorScript(): void } /** - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testIncludeScript(): void { @@ -63,8 +60,7 @@ public function testIncludeScript(): void } /** - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testIncludeSkinScript(): void { @@ -72,8 +68,7 @@ public function testIncludeSkinScript(): void } /** - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testGetDeleteConfirmJs(): void { @@ -82,8 +77,7 @@ public function testGetDeleteConfirmJs(): void } /** - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testGetConfirmSetLocationJs(): void { @@ -92,8 +86,7 @@ public function testGetConfirmSetLocationJs(): void } /** - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testGetSetLocationJs(): void { @@ -104,8 +97,7 @@ public function testGetSetLocationJs(): void /** * @covers Mage_Core_Helper_Js::getSaveAndContinueEditJs() - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testGetSaveAndContinueEditJs(): void { diff --git a/tests/unit/Mage/Core/Helper/PurifierTest.php b/tests/unit/Mage/Core/Helper/PurifierTest.php index ede404d3877..de23339bc26 100644 --- a/tests/unit/Mage/Core/Helper/PurifierTest.php +++ b/tests/unit/Mage/Core/Helper/PurifierTest.php @@ -36,8 +36,7 @@ public static function setUpBeforeClass(): void /** * @dataProvider providePurify - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testPurify(array|string $expectedResult, array|string $content): void { diff --git a/tests/unit/Mage/Core/Helper/SecurityTest.php b/tests/unit/Mage/Core/Helper/SecurityTest.php index adf0bc98640..b64526d2a96 100644 --- a/tests/unit/Mage/Core/Helper/SecurityTest.php +++ b/tests/unit/Mage/Core/Helper/SecurityTest.php @@ -39,8 +39,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function validateAgainstBlockMethodBlacklistDataProvider(): Generator { @@ -64,8 +63,7 @@ public function validateAgainstBlockMethodBlacklistDataProvider(): Generator * @param string[] $args * @throws Mage_Core_Exception * - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testValidateAgainstBlockMethodBlacklist( Mage_Core_Block_Abstract $block, @@ -121,8 +119,7 @@ public function forbiddenBlockMethodsDataProvider(): Generator * @param string[] $args * @throws Mage_Core_Exception * - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testValidateAgainstBlockMethodBlacklistThrowsException( Mage_Core_Block_Abstract $block, diff --git a/tests/unit/Mage/Core/Helper/StringTest.php b/tests/unit/Mage/Core/Helper/StringTest.php index 6facbdc865a..6640bdc36e4 100644 --- a/tests/unit/Mage/Core/Helper/StringTest.php +++ b/tests/unit/Mage/Core/Helper/StringTest.php @@ -37,8 +37,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testTruncate(): void { @@ -55,8 +54,7 @@ public function testTruncate(): void } /** - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testSubstr(): void { @@ -65,8 +63,7 @@ public function testSubstr(): void } /** - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testSplitInjection(): void { @@ -76,8 +73,7 @@ public function testSplitInjection(): void } /** - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testStrlen(): void { @@ -85,8 +81,7 @@ public function testStrlen(): void } /** - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testStrSplit(): void { @@ -97,8 +92,7 @@ public function testStrSplit(): void } /** - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testSplitWords(): void { @@ -110,8 +104,7 @@ public function testSplitWords(): void } /** - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testParseQueryStr(): void { @@ -119,8 +112,7 @@ public function testParseQueryStr(): void } /** - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testGetArrayHelper(): void { @@ -128,8 +120,7 @@ public function testGetArrayHelper(): void } /** - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testUnserialize(): void { @@ -137,8 +128,7 @@ public function testUnserialize(): void } /** - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testValidateSerializedObject(): void { diff --git a/tests/unit/Mage/Core/Helper/UnserializeArrayTest.php b/tests/unit/Mage/Core/Helper/UnserializeArrayTest.php index cbcb615531a..27a1a433c60 100644 --- a/tests/unit/Mage/Core/Helper/UnserializeArrayTest.php +++ b/tests/unit/Mage/Core/Helper/UnserializeArrayTest.php @@ -37,8 +37,7 @@ public static function setUpBeforeClass(): void /** * @dataProvider provideUnserialize - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testUnserialize(array|string $expectedTesult, ?string $string): void { diff --git a/tests/unit/Mage/Core/Helper/UrlTest.php b/tests/unit/Mage/Core/Helper/UrlTest.php index bb5c5c8dc99..b6c6698bc9f 100644 --- a/tests/unit/Mage/Core/Helper/UrlTest.php +++ b/tests/unit/Mage/Core/Helper/UrlTest.php @@ -37,8 +37,7 @@ public static function setUpBeforeClass(): void /** * @covers Mage_Core_Helper_Url::getCurrentBase64Url() - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testGetCurrentBase64Url(): void { @@ -48,8 +47,7 @@ public function testGetCurrentBase64Url(): void /** * @covers Mage_Core_Helper_Url::getEncodedUrl() * @dataProvider provideGetEncodedUrl - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testGetEncodedUrl(string $expectedResult, ?string $url): void { @@ -58,8 +56,7 @@ public function testGetEncodedUrl(string $expectedResult, ?string $url): void /** * @covers Mage_Core_Helper_Url::getHomeUrl() - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testGetHomeUrl(): void { @@ -69,8 +66,7 @@ public function testGetHomeUrl(): void /** * @covers Mage_Core_Helper_Url::addRequestParam() * @dataProvider provideAddRequestParam - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testAddRequestParam(string $expectedResult, string $url, array $param): void { @@ -80,8 +76,7 @@ public function testAddRequestParam(string $expectedResult, string $url, array $ /** * @covers Mage_Core_Helper_Url::removeRequestParam() * @dataProvider provideRemoveRequestParam - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testRemoveRequestParam(string $expectedResult, string $url, string $paramKey, bool $caseSensitive = false): void { @@ -90,8 +85,7 @@ public function testRemoveRequestParam(string $expectedResult, string $url, stri /** * @covers Mage_Core_Helper_Url::encodePunycode() - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper */ public function testEncodePunycode(): void { @@ -102,8 +96,7 @@ public function testEncodePunycode(): void /** * @covers Mage_Core_Helper_Url::decodePunycode() - * @group Mage_Core - * @group Mage_Core_Helper + * @group Helper * @throws Exception */ public function testDecodePunycode(): void diff --git a/tests/unit/Mage/Core/Model/AppTest.php b/tests/unit/Mage/Core/Model/AppTest.php index cc63f344a23..9e3daefb808 100644 --- a/tests/unit/Mage/Core/Model/AppTest.php +++ b/tests/unit/Mage/Core/Model/AppTest.php @@ -30,8 +30,7 @@ public static function setUpBeforeClass(): void /** * @dataProvider provideGetStoreConfig * @dataProvider provideGetStore - * @group Mage_Core - * @group Mage_Core_Model + * @group Model */ public function testGetStore(Mage_Core_Model_Store|int|string|bool|null $id): void { @@ -46,8 +45,7 @@ public function testGetStore(Mage_Core_Model_Store|int|string|bool|null $id): vo /** * @dataProvider provideGetStoreConfig * @dataProvider provideGetWebsite - * @group Mage_Core - * @group Mage_Core_Model + * @group Model */ public function testGetWebsite(Mage_Core_Model_Website|int|string|bool|null $id): void { @@ -62,8 +60,7 @@ public function testGetWebsite(Mage_Core_Model_Website|int|string|bool|null $id) /** * @dataProvider provideGetStoreConfig * @dataProvider provideGetGroup - * @group Mage_Core - * @group Mage_Core_Model + * @group Model */ public function testGetGroup(Mage_Core_Model_Store_Group|int|string|bool|null $id): void { diff --git a/tests/unit/Mage/Core/Model/ConfigTest.php b/tests/unit/Mage/Core/Model/ConfigTest.php index 44033ca6866..6be08a37b8b 100644 --- a/tests/unit/Mage/Core/Model/ConfigTest.php +++ b/tests/unit/Mage/Core/Model/ConfigTest.php @@ -32,8 +32,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Core - * @group Mage_Core_Model + * @group Model */ public function testSaveDeleteGetConfig(): void { diff --git a/tests/unit/Mage/Core/Model/Email/Template/AbstractTest.php b/tests/unit/Mage/Core/Model/Email/Template/AbstractTest.php index 6d9a94044cb..f0bdc788de5 100644 --- a/tests/unit/Mage/Core/Model/Email/Template/AbstractTest.php +++ b/tests/unit/Mage/Core/Model/Email/Template/AbstractTest.php @@ -35,8 +35,7 @@ public function setUp(): void /** * @dataProvider provideValidateFileExension - * @group Mage_Core - * @group Mage_Core_Model + * @group Model */ public function testValidateFileExension(bool $expectedResult, string $filePath, string $extension, bool $fileExists): void { diff --git a/tests/unit/Mage/Core/Model/LayoutTest.php b/tests/unit/Mage/Core/Model/LayoutTest.php index 3ab1a40056e..827501ac59e 100644 --- a/tests/unit/Mage/Core/Model/LayoutTest.php +++ b/tests/unit/Mage/Core/Model/LayoutTest.php @@ -41,8 +41,7 @@ public static function setUpBeforeClass(): void /** * @dataProvider provideCreateBlock - * @group Mage_Core - * @group Mage_Core_Model + * @group Model * * @param bool|class-string $expectedResult */ @@ -60,8 +59,7 @@ public function testCreateBlock(bool|string $expectedResult, bool $willReturnBlo /** * @covers Mage_Core_Model_Layout::getBlockSingleton() * @dataProvider provideGetBlockSingleton - * @group Mage_Core - * @group Mage_Core_Model + * @group Model * @group pr4411 * * @param class-string $expectedResult @@ -109,8 +107,7 @@ public function provideGetBlockSingleton(): Generator /** * @covers Mage_Core_Model_Layout::getBlockSingleton() - * @group Mage_Core - * @group Mage_Core_Model + * @group Model */ public function testGetBlockSingletonError(): void { diff --git a/tests/unit/Mage/Core/Model/LocaleTest.php b/tests/unit/Mage/Core/Model/LocaleTest.php index c219017d566..f814079a178 100644 --- a/tests/unit/Mage/Core/Model/LocaleTest.php +++ b/tests/unit/Mage/Core/Model/LocaleTest.php @@ -38,7 +38,7 @@ public static function setUpBeforeClass(): void * @dataProvider provideGetNumberData * @param string|float|int $value * - * @group Mage_Core + * @group Model */ public function testGetNumber(?float $expectedResult, $value): void { diff --git a/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php b/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php index 659f80d760c..3ceca832d61 100644 --- a/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php +++ b/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php @@ -31,7 +31,7 @@ class HtmlEscapedStringTest extends OpenMageTest * @dataProvider provideHtmlEscapedStringAsStringData * @param array $allowedTags * - * @group Mage_Core + * @group Model */ public function testToSting(string $expectedResult, string $string, ?array $allowedTags): void { @@ -43,7 +43,7 @@ public function testToSting(string $expectedResult, string $string, ?array $allo * @dataProvider provideHtmlEscapedStringGetUnescapedValueData * @param array $allowedTags * - * @group Mage_Core + * @group Model */ public function testGetUnescapedValue(string $expectedResult, string $string, ?array $allowedTags): void { diff --git a/tests/unit/Mage/Core/Model/StoreTest.php b/tests/unit/Mage/Core/Model/StoreTest.php index 2fee6f714d4..16196491cf9 100644 --- a/tests/unit/Mage/Core/Model/StoreTest.php +++ b/tests/unit/Mage/Core/Model/StoreTest.php @@ -37,8 +37,7 @@ public function setUp(): void * @covers Mage_Core_Model_Store::getId() * @dataProvider provideGetStoreId * @param string|int|null $withStore - * @group Mage_Core - * @group Mage_Core_Model + * @group Model */ public function testGetId(?int $expectedResult, $withStore): void { diff --git a/tests/unit/Mage/Core/Model/UrlTest.php b/tests/unit/Mage/Core/Model/UrlTest.php index 8756502a2ac..a2d02123549 100644 --- a/tests/unit/Mage/Core/Model/UrlTest.php +++ b/tests/unit/Mage/Core/Model/UrlTest.php @@ -32,8 +32,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Core - * @group Mage_Core_Model + * @group Model */ public function testEscape(): void { @@ -41,8 +40,7 @@ public function testEscape(): void } /** - * @group Mage_Core - * @group Mage_Core_Model + * @group Model */ public function testGetSecure(): void { diff --git a/tests/unit/Mage/Core/Model/VariableTest.php b/tests/unit/Mage/Core/Model/VariableTest.php index 5c5d4f52c0c..8711363a047 100644 --- a/tests/unit/Mage/Core/Model/VariableTest.php +++ b/tests/unit/Mage/Core/Model/VariableTest.php @@ -32,8 +32,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Core - * @group Mage_Core_Model + * @group Model */ public function testGetVariablesOptionArray(): void { diff --git a/tests/unit/Mage/Core/Model/WebsiteTest.php b/tests/unit/Mage/Core/Model/WebsiteTest.php index a5029b13e4b..b8c8c9f4d57 100644 --- a/tests/unit/Mage/Core/Model/WebsiteTest.php +++ b/tests/unit/Mage/Core/Model/WebsiteTest.php @@ -36,8 +36,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Core - * @group Mage_Core_Model + * @group Model */ public function testLoad(): void { @@ -46,8 +45,7 @@ public function testLoad(): void } /** - * @group Mage_Core - * @group Mage_Core_Model + * @group Model */ public function testLoadConfig(): void { @@ -56,8 +54,7 @@ public function testLoadConfig(): void } /** - * @group Mage_Core - * @group Mage_Core_Model + * @group Model */ public function testGetStoreCollection(): void { @@ -65,8 +62,7 @@ public function testGetStoreCollection(): void } /** - * @group Mage_Core - * @group Mage_Core_Model + * @group Model */ public function testGetGroupCollection(): void { @@ -74,8 +70,7 @@ public function testGetGroupCollection(): void } /** - * @group Mage_Core - * @group Mage_Core_Model + * @group Model */ public function testGetStores(): void { @@ -83,8 +78,7 @@ public function testGetStores(): void } /** - * @group Mage_Core - * @group Mage_Core_Model + * @group Model */ public function testGetStoreIds(): void { @@ -92,8 +86,7 @@ public function testGetStoreIds(): void } /** - * @group Mage_Core - * @group Mage_Core_Model + * @group Model */ public function testGetStoreCodes(): void { @@ -101,8 +94,7 @@ public function testGetStoreCodes(): void } /** - * @group Mage_Core - * @group Mage_Core_Model + * @group Model */ public function testGetStoresCount(): void { @@ -110,8 +102,7 @@ public function testGetStoresCount(): void } /** - * @group Mage_Core - * @group Mage_Core_Model + * @group Model */ public function testGetGroups(): void { @@ -119,8 +110,7 @@ public function testGetGroups(): void } /** - * @group Mage_Core - * @group Mage_Core_Model + * @group Model */ public function testGetGroupIds(): void { @@ -128,8 +118,7 @@ public function testGetGroupIds(): void } /** - * @group Mage_Core - * @group Mage_Core_Model + * @group Model */ public function testGetGroupsCount(): void { @@ -137,8 +126,7 @@ public function testGetGroupsCount(): void } /** - * @group Mage_Core - * @group Mage_Core_Model + * @group Model */ public function testGetBaseCurrency(): void { @@ -147,8 +135,7 @@ public function testGetBaseCurrency(): void } // /** - // * @group Mage_Core - // * @group Mage_Core_Model + // * @group Model // */ // public function testGetDefaultStore(): void // { @@ -157,7 +144,7 @@ public function testGetBaseCurrency(): void // } /** - * @group Mage_Core + * @group Model */ public function testGetDefaultStoresSelect(): void { @@ -166,8 +153,7 @@ public function testGetDefaultStoresSelect(): void } /** - * @group Mage_Core - * @group Mage_Core_Model + * @group Model */ public function testIsReadOnly(): void { diff --git a/tests/unit/Mage/Customer/Model/Convert/Adapter/CustomerTest.php b/tests/unit/Mage/Customer/Model/Convert/Adapter/CustomerTest.php index 6cf7dda57f4..7da21d1f4fc 100644 --- a/tests/unit/Mage/Customer/Model/Convert/Adapter/CustomerTest.php +++ b/tests/unit/Mage/Customer/Model/Convert/Adapter/CustomerTest.php @@ -36,7 +36,7 @@ public static function setUpBeforeClass(): void // * @return void // * @throws Throwable // * - // * @group Mage_Customer + // * @group Model // */ // public function testSaveRowNoWebsite(): void // { @@ -53,7 +53,7 @@ public static function setUpBeforeClass(): void // * @return void // * @throws Throwable // * - // * @group Mage_Customer + // * @group Model // */ // public function testSaveRowNoEmail(): void // { @@ -72,7 +72,7 @@ public static function setUpBeforeClass(): void // * @return void // * @throws Throwable // * - // * @group Mage_Customer + // * @group Model // */ // public function testSaveRowNoGroup(): void // { @@ -92,7 +92,7 @@ public static function setUpBeforeClass(): void // * @return void // * @throws Throwable // * - // * @group Mage_Customer + // * @group Model // */ // public function testSaveRowNoFirstname(): void // { @@ -113,7 +113,7 @@ public static function setUpBeforeClass(): void // * @return void // * @throws Throwable // * - // * @group Mage_Customer + // * @group Model // */ // public function testSaveRowNoLastname(): void // { @@ -132,7 +132,7 @@ public static function setUpBeforeClass(): void // } /** * @throws Throwable - * @group Mage_Customer + * @group Model */ public function testSaveRow(): void { diff --git a/tests/unit/Mage/Directory/Block/DataTest.php b/tests/unit/Mage/Directory/Block/DataTest.php index 4445e3f7ce0..9f8ef1eb1aa 100644 --- a/tests/unit/Mage/Directory/Block/DataTest.php +++ b/tests/unit/Mage/Directory/Block/DataTest.php @@ -34,8 +34,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Directory - * @group Mage_Directory_Block + * @group Block */ public function testGetCountryCollection(): void { @@ -43,8 +42,7 @@ public function testGetCountryCollection(): void } /** - * @group Mage_Directory - * @group Mage_Directory_Block + * @group Block */ public function testGetRegionCollection(): void { diff --git a/tests/unit/Mage/Directory/Helper/DataTest.php b/tests/unit/Mage/Directory/Helper/DataTest.php index 386af0547d5..106fbd172fa 100644 --- a/tests/unit/Mage/Directory/Helper/DataTest.php +++ b/tests/unit/Mage/Directory/Helper/DataTest.php @@ -37,8 +37,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Directory - * @group Mage_Directory_Helper + * @group Helper */ public function testGetRegionCollection(): void { @@ -46,8 +45,7 @@ public function testGetRegionCollection(): void } /** - * @group Mage_Directory - * @group Mage_Directory_Helper + * @group Helper */ public function testGetCountryCollection(): void { @@ -55,8 +53,7 @@ public function testGetCountryCollection(): void } /** - * @group Mage_Directory - * @group Mage_Directory_Helper + * @group Helper */ public function testGetRegionJsonByStore(): void { @@ -64,8 +61,7 @@ public function testGetRegionJsonByStore(): void } /** - * @group Mage_Directory - * @group Mage_Directory_Helper + * @group Helper * @group runInSeparateProcess * @runInSeparateProcess */ @@ -77,8 +73,7 @@ public function testCurrencyConvert(): void /** * @covers Mage_Directory_Helper_Data::getCountriesWithOptionalZip() * @dataProvider provideGetCountriesWithOptionalZip - * @group Mage_Directory - * @group Mage_Directory_Helper + * @group Helper */ public function testGetCountriesWithOptionalZip(array|string $expectedResult, bool $asJson): void { @@ -87,8 +82,7 @@ public function testGetCountriesWithOptionalZip(array|string $expectedResult, bo /** * @covers Mage_Directory_Helper_Data::isZipCodeOptional() - * @group Mage_Directory - * @group Mage_Directory_Helper + * @group Helper */ public function testIsZipCodeOptional(): void { @@ -98,8 +92,7 @@ public function testIsZipCodeOptional(): void /** * @covers Mage_Directory_Helper_Data::getCountriesWithStatesRequired() * @dataProvider provideGetCountriesWithStatesRequired - * @group Mage_Directory - * @group Mage_Directory_Helper + * @group Helper */ public function testGetCountriesWithStatesRequired(array|string $expectedResult, bool $asJson): void { @@ -113,8 +106,7 @@ public function testGetCountriesWithStatesRequired(array|string $expectedResult, /** * @covers Mage_Directory_Helper_Data::getShowNonRequiredState() - * @group Mage_Directory - * @group Mage_Directory_Helper + * @group Helper */ public function testGetShowNonRequiredState(): void { @@ -123,8 +115,7 @@ public function testGetShowNonRequiredState(): void /** * @covers Mage_Directory_Helper_Data::getConfigCurrencyBase() - * @group Mage_Directory - * @group Mage_Directory_Helper + * @group Helper */ public function testGetConfigCurrencyBase(): void { diff --git a/tests/unit/Mage/Downloadable/Helper/FileTest.php b/tests/unit/Mage/Downloadable/Helper/FileTest.php index cd38a698687..3fdec8aef63 100644 --- a/tests/unit/Mage/Downloadable/Helper/FileTest.php +++ b/tests/unit/Mage/Downloadable/Helper/FileTest.php @@ -37,8 +37,7 @@ public static function setUpBeforeClass(): void /** * @dataProvider provideGetFilePathData * - * @group Mage_Downloadable - * @group Mage_Downloadable_Helper + * @group Helper */ public function testGetFilePath(string $expectedResult, string $path, ?string $file): void { diff --git a/tests/unit/Mage/GiftMessage/Helper/MessageTest.php b/tests/unit/Mage/GiftMessage/Helper/MessageTest.php index de96467e981..6cf83612015 100644 --- a/tests/unit/Mage/GiftMessage/Helper/MessageTest.php +++ b/tests/unit/Mage/GiftMessage/Helper/MessageTest.php @@ -39,8 +39,7 @@ public static function setUpBeforeClass(): void /** * @dataProvider provideIsMessagesAvailable * - * @group Mage_GiftMessage - * @group Mage_GiftMessage_Helper + * @group Helper */ public function testIsMessagesAvailable(string $type, Varien_Object $entity, bool|int|Mage_Core_Model_Store|null|string $store = null): void { diff --git a/tests/unit/Mage/Index/Model/ProcessTest.php b/tests/unit/Mage/Index/Model/ProcessTest.php index de05fc9b488..239841545be 100644 --- a/tests/unit/Mage/Index/Model/ProcessTest.php +++ b/tests/unit/Mage/Index/Model/ProcessTest.php @@ -36,8 +36,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Index - * @group Mage_Index_Model + * @group Model */ public function testReindexEverything(): void { @@ -51,8 +50,7 @@ public function testReindexEverything(): void } /** - * @group Mage_Index - * @group Mage_Index_Model + * @group Model */ public function testDisableIndexerKeys(): void { @@ -67,8 +65,7 @@ public function testDisableIndexerKeys(): void } /** - * @group Mage_Index - * @group Mage_Index_Model + * @group Model */ public function testEnableIndexerKeys(): void { @@ -82,8 +79,7 @@ public function testEnableIndexerKeys(): void } /** - * @group Mage_Index - * @group Mage_Index_Model + * @group Model */ public function testGetUnprocessedEventsCollection(): void { diff --git a/tests/unit/Mage/Log/Helper/DataTest.php b/tests/unit/Mage/Log/Helper/DataTest.php index e9e990daf4a..f56a701b3e7 100644 --- a/tests/unit/Mage/Log/Helper/DataTest.php +++ b/tests/unit/Mage/Log/Helper/DataTest.php @@ -36,8 +36,7 @@ public static function setUpBeforeClass(): void /** * @covers Mage_Log_Helper_Data::isVisitorLogEnabled() - * @group Mage_Log - * @group Mage_Log_Helper + * @group Helper */ public function testIsVisitorLogEnabled(): void { @@ -46,8 +45,7 @@ public function testIsVisitorLogEnabled(): void /** * @covers Mage_Log_Helper_Data::isLogEnabled() - * @group Mage_Log - * @group Mage_Log_Helper + * @group Helper */ public function testIsLogEnabled(): void { @@ -56,8 +54,7 @@ public function testIsLogEnabled(): void /** * @covers Mage_Log_Helper_Data::isLogDisabled() - * @group Mage_Log - * @group Mage_Log_Helper + * @group Helper */ public function testIsLogDisabled(): void { @@ -67,8 +64,7 @@ public function testIsLogDisabled(): void /** * @covers Mage_Log_Helper_Data::isLogFileExtensionValid() * @dataProvider provideIsLogFileExtensionValid - * @group Mage_Log - * @group Mage_Log_Helper + * @group Helper */ public function testIsLogFileExtensionValid(bool $expectedResult, string $file): void { diff --git a/tests/unit/Mage/Log/Model/AggregationTest.php b/tests/unit/Mage/Log/Model/AggregationTest.php index 15ba1369644..0a72daa4869 100644 --- a/tests/unit/Mage/Log/Model/AggregationTest.php +++ b/tests/unit/Mage/Log/Model/AggregationTest.php @@ -32,8 +32,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Log - * @group Mage_Log_Model + * @group Model * @doesNotPerformAssertions */ public function testRun(): void diff --git a/tests/unit/Mage/Log/Model/CronTest.php b/tests/unit/Mage/Log/Model/CronTest.php index 0af68addacd..9cf15664db4 100644 --- a/tests/unit/Mage/Log/Model/CronTest.php +++ b/tests/unit/Mage/Log/Model/CronTest.php @@ -32,8 +32,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Log - * @group Mage_Log_Model + * @group Model */ public function testLogClean(): void { diff --git a/tests/unit/Mage/Log/Model/CustomerTest.php b/tests/unit/Mage/Log/Model/CustomerTest.php index 02b1f1aec64..73639d99001 100644 --- a/tests/unit/Mage/Log/Model/CustomerTest.php +++ b/tests/unit/Mage/Log/Model/CustomerTest.php @@ -33,8 +33,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Log - * @group Mage_Log_Model + * @group Model */ public function testGetLoginAtTimestamp(): void { diff --git a/tests/unit/Mage/Log/Model/LogTest.php b/tests/unit/Mage/Log/Model/LogTest.php index 14288babf1a..df147bcb4ea 100644 --- a/tests/unit/Mage/Log/Model/LogTest.php +++ b/tests/unit/Mage/Log/Model/LogTest.php @@ -32,8 +32,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Log - * @group Mage_Log_Model + * @group Model */ public function testClean(): void { diff --git a/tests/unit/Mage/Log/Model/VisitorTest.php b/tests/unit/Mage/Log/Model/VisitorTest.php index 9d3c8d7a842..bcd3874d5e9 100644 --- a/tests/unit/Mage/Log/Model/VisitorTest.php +++ b/tests/unit/Mage/Log/Model/VisitorTest.php @@ -31,8 +31,7 @@ public function setUp(): void } /** - * @group Mage_Log - * @group Mage_Log_Model + * @group Model * @group runInSeparateProcess * @runInSeparateProcess */ @@ -42,8 +41,7 @@ public function testInitServerData(): void } /** - * @group Mage_Log - * @group Mage_Log_Model + * @group Model * @group runInSeparateProcess * @runInSeparateProcess */ @@ -53,8 +51,7 @@ public function testGetOnlineMinutesInterval(): void } /** - * @group Mage_Log - * @group Mage_Log_Model + * @group Model * @group runInSeparateProcess * @runInSeparateProcess */ @@ -64,8 +61,7 @@ public function testGetUrl(): void } /** - * @group Mage_Log - * @group Mage_Log_Model + * @group Model * @group runInSeparateProcess * @runInSeparateProcess */ @@ -75,8 +71,7 @@ public function testGetFirstVisitAt(): void } /** - * @group Mage_Log - * @group Mage_Log_Model + * @group Model * @group runInSeparateProcess * @runInSeparateProcess */ diff --git a/tests/unit/Mage/Newsletter/Model/TemplateTest.php b/tests/unit/Mage/Newsletter/Model/TemplateTest.php index eddd8edbcdf..7a1ef7c047d 100644 --- a/tests/unit/Mage/Newsletter/Model/TemplateTest.php +++ b/tests/unit/Mage/Newsletter/Model/TemplateTest.php @@ -34,8 +34,7 @@ public static function setUpBeforeClass(): void /** * @dataProvider validateTemplateDataProvider - * @group Mage_Newsletter - * @group Mage_Newsletter_Model + * @group Model */ public function testValidate(?string $expected, array $methods): void { @@ -123,8 +122,7 @@ public function validateTemplateDataProvider(): Generator } /** - * @group Mage_Newsletter - * @group Mage_Newsletter_Model + * @group Model */ public function testLoadByCode(): void { @@ -132,8 +130,7 @@ public function testLoadByCode(): void } /** - * @group Mage_Newsletter - * @group Mage_Newsletter_Model + * @group Model */ public function testIsValidForSend(): void { @@ -141,8 +138,7 @@ public function testIsValidForSend(): void } /** - * @group Mage_Newsletter - * @group Mage_Newsletter_Model + * @group Model */ public function testGetProcessedTemplate(): void { diff --git a/tests/unit/Mage/Page/Block/Html/HeadTest.php b/tests/unit/Mage/Page/Block/Html/HeadTest.php index f8a8f92497c..88e022592e6 100644 --- a/tests/unit/Mage/Page/Block/Html/HeadTest.php +++ b/tests/unit/Mage/Page/Block/Html/HeadTest.php @@ -32,8 +32,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Page - * @group Mage_Page_Block + * @group Block */ public function testAddCss(): void { @@ -41,8 +40,7 @@ public function testAddCss(): void } /** - * @group Mage_Page - * @group Mage_Page_Block + * @group Block */ public function testAddJs(): void { @@ -50,8 +48,7 @@ public function testAddJs(): void } /** - * @group Mage_Page - * @group Mage_Page_Block + * @group Block */ public function testAddCssIe(): void { @@ -59,8 +56,7 @@ public function testAddCssIe(): void } /** - * @group Mage_Page - * @group Mage_Page_Block + * @group Block */ public function testAddJsIe(): void { @@ -68,8 +64,7 @@ public function testAddJsIe(): void } /** - * @group Mage_Page - * @group Mage_Page_Block + * @group Block */ public function testAddLinkRel(): void { diff --git a/tests/unit/Mage/Page/Block/Html/HeaderTest.php b/tests/unit/Mage/Page/Block/Html/HeaderTest.php index 3bd654b8f86..881f181b1e3 100644 --- a/tests/unit/Mage/Page/Block/Html/HeaderTest.php +++ b/tests/unit/Mage/Page/Block/Html/HeaderTest.php @@ -32,8 +32,7 @@ public function setUp(): void } /** - * @group Mage_Page - * @group Mage_Page_Block + * @group Block */ // public function testGetIsHomePage(): void // { @@ -41,8 +40,7 @@ public function setUp(): void // } /** - * @group Mage_Page - * @group Mage_Page_Block + * @group Block */ public function testSetLogo(): void { @@ -50,8 +48,7 @@ public function testSetLogo(): void } /** - * @group Mage_Page - * @group Mage_Page_Block + * @group Block */ public function testGetLogoSrc(): void { @@ -59,8 +56,7 @@ public function testGetLogoSrc(): void } /** - * @group Mage_Page - * @group Mage_Page_Block + * @group Block */ public function testGetLogoSrcSmall(): void { @@ -68,8 +64,7 @@ public function testGetLogoSrcSmall(): void } /** - * @group Mage_Page - * @group Mage_Page_Block + * @group Block */ public function testGetLogoAlt(): void { diff --git a/tests/unit/Mage/Page/Block/HtmlTest.php b/tests/unit/Mage/Page/Block/HtmlTest.php index 2eb01fbaca6..8dd7401a9a9 100644 --- a/tests/unit/Mage/Page/Block/HtmlTest.php +++ b/tests/unit/Mage/Page/Block/HtmlTest.php @@ -32,8 +32,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Page - * @group Mage_Page_Block + * @group Block */ public function testGetBaseUrl(): void { @@ -41,8 +40,7 @@ public function testGetBaseUrl(): void } /** - * @group Mage_Page - * @group Mage_Page_Block + * @group Block */ public function testGetBaseSecureUrl(): void { @@ -50,8 +48,7 @@ public function testGetBaseSecureUrl(): void } /** - * @group Mage_Page - * @group Mage_Page_Block + * @group Block */ // public function testGetCurrentUrl(): void // { @@ -59,8 +56,7 @@ public function testGetBaseSecureUrl(): void // } /** - * @group Mage_Page - * @group Mage_Page_Block + * @group Block */ public function testGetPrintLogoUrl(): void { diff --git a/tests/unit/Mage/Page/Block/RedirectTest.php b/tests/unit/Mage/Page/Block/RedirectTest.php index 73bca12da49..da8ebdf7cfa 100644 --- a/tests/unit/Mage/Page/Block/RedirectTest.php +++ b/tests/unit/Mage/Page/Block/RedirectTest.php @@ -32,8 +32,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Page - * @group Mage_Page_Block + * @group Block */ public function testGetTargetUrl(): void { @@ -41,8 +40,7 @@ public function testGetTargetUrl(): void } /** - * @group Mage_Page - * @group Mage_Page_Block + * @group Block */ public function testGetMessage(): void { @@ -50,8 +48,7 @@ public function testGetMessage(): void } /** - * @group Mage_Page - * @group Mage_Page_Block + * @group Block */ public function testGetRedirectOutput(): void { @@ -59,8 +56,7 @@ public function testGetRedirectOutput(): void } /** - * @group Mage_Page - * @group Mage_Page_Block + * @group Block */ public function testGetJsRedirect(): void { @@ -68,8 +64,7 @@ public function testGetJsRedirect(): void } /** - * @group Mage_Page - * @group Mage_Page_Block + * @group Block */ public function testGetHtmlFormRedirect(): void { @@ -77,8 +72,7 @@ public function testGetHtmlFormRedirect(): void } /** - * @group Mage_Page - * @group Mage_Page_Block + * @group Block */ public function testIsHtmlFormRedirect(): void { @@ -86,8 +80,7 @@ public function testIsHtmlFormRedirect(): void } /** - * @group Mage_Page - * @group Mage_Page_Block + * @group Block */ public function testGetFormId(): void { @@ -95,8 +88,7 @@ public function testGetFormId(): void } /** - * @group Mage_Page - * @group Mage_Page_Block + * @group Block */ public function testGetFormMethod(): void { diff --git a/tests/unit/Mage/Page/Block/SwitchTest.php b/tests/unit/Mage/Page/Block/SwitchTest.php index 5214bd8bd14..973148e2d6a 100644 --- a/tests/unit/Mage/Page/Block/SwitchTest.php +++ b/tests/unit/Mage/Page/Block/SwitchTest.php @@ -32,8 +32,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Page - * @group Mage_Page_Block + * @group Block */ public function testGetCurrentWebsiteId(): void { @@ -41,8 +40,7 @@ public function testGetCurrentWebsiteId(): void } /** - * @group Mage_Page - * @group Mage_Page_Block + * @group Block */ public function testGetCurrentGroupId(): void { @@ -50,8 +48,7 @@ public function testGetCurrentGroupId(): void } /** - * @group Mage_Page - * @group Mage_Page_Block + * @group Block */ public function testGetCurrentStoreId(): void { @@ -59,8 +56,7 @@ public function testGetCurrentStoreId(): void } /** - * @group Mage_Page - * @group Mage_Page_Block + * @group Block */ public function testGetCurrentStoreCode(): void { @@ -68,8 +64,7 @@ public function testGetCurrentStoreCode(): void } /** - * @group Mage_Page - * @group Mage_Page_Block + * @group Block */ public function testGetRawGroups(): void { @@ -77,8 +72,7 @@ public function testGetRawGroups(): void } /** - * @group Mage_Page - * @group Mage_Page_Block + * @group Block */ // public function testGetRawStores(): void // { @@ -86,8 +80,7 @@ public function testGetRawGroups(): void // } /** - * @group Mage_Page - * @group Mage_Page_Block + * @group Block */ // public function testGetGroups(): void // { @@ -95,8 +88,7 @@ public function testGetRawGroups(): void // } /** - * @group Mage_Page - * @group Mage_Page_Block + * @group Block */ // public function testGetStores(): void // { @@ -104,8 +96,7 @@ public function testGetRawGroups(): void // } /** - * @group Mage_Page - * @group Mage_Page_Block + * @group Block */ public function testIsStoreInUrl(): void { diff --git a/tests/unit/Mage/Page/Helper/LayoutTest.php b/tests/unit/Mage/Page/Helper/LayoutTest.php index 8ebdebd2579..b57035f2e69 100644 --- a/tests/unit/Mage/Page/Helper/LayoutTest.php +++ b/tests/unit/Mage/Page/Helper/LayoutTest.php @@ -33,8 +33,7 @@ public static function setUpBeforeClass(): void /** * @covers Mage_Core_Helper_Abstract::isModuleEnabled() - * @group Mage_Page - * @group Mage_Page_Helper + * @group Helper */ public function testApplyTemplate(): void { diff --git a/tests/unit/Mage/Page/Model/ConfigTest.php b/tests/unit/Mage/Page/Model/ConfigTest.php index 0084ca537eb..8126a9f3441 100644 --- a/tests/unit/Mage/Page/Model/ConfigTest.php +++ b/tests/unit/Mage/Page/Model/ConfigTest.php @@ -32,8 +32,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Page - * @group Mage_Page_Model + * @group Model */ public function testGetPageLayoutHandles(): void { diff --git a/tests/unit/Mage/Page/Model/Source/LayoutTest.php b/tests/unit/Mage/Page/Model/Source/LayoutTest.php index a6f4e2e67fe..02310888646 100644 --- a/tests/unit/Mage/Page/Model/Source/LayoutTest.php +++ b/tests/unit/Mage/Page/Model/Source/LayoutTest.php @@ -32,8 +32,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Page - * @group Mage_Page_Model + * @group Model */ public function testToOptionArray(): void { diff --git a/tests/unit/Mage/Reports/Helper/DataTest.php b/tests/unit/Mage/Reports/Helper/DataTest.php index d82b4d5f30b..f0eab555d9b 100644 --- a/tests/unit/Mage/Reports/Helper/DataTest.php +++ b/tests/unit/Mage/Reports/Helper/DataTest.php @@ -39,8 +39,7 @@ public static function setUpBeforeClass(): void /** * @covers Mage_Core_Helper_Abstract::isModuleEnabled() - * @group Mage_Reports - * @group Mage_Reports_Helper + * @group Helper */ public function testIsModuleEnabled(): void { @@ -49,8 +48,7 @@ public function testIsModuleEnabled(): void /** * @covers Mage_Reports_Helper_Data::isReportsEnabled() - * @group Mage_Reports - * @group Mage_Reports_Helper + * @group Helper */ public function testIsReportsEnabled(): void { @@ -60,8 +58,7 @@ public function testIsReportsEnabled(): void /** * @covers Mage_Reports_Helper_Data::getIntervals() * @dataProvider provideReportsDateIntervals - * @group Mage_Reports - * @group Mage_Reports_Helper + * @group Helper */ public function testGetIntervals(int $expectedResult, string $from, string $to, string $period): void { @@ -80,8 +77,7 @@ public function testGetIntervals(int $expectedResult, string $from, string $to, * @covers Mage_Reports_Helper_Data::prepareIntervalsCollection() * @dataProvider provideReportsDateIntervals * @doesNotPerformAssertions - * @group Mage_Reports - * @group Mage_Reports_Helper + * @group Helper */ public function testPrepareIntervalsCollection(int $expectedResult, string $from, string $to, string $period): void { diff --git a/tests/unit/Mage/Reports/Model/Resource/Report/CollectionTest.php b/tests/unit/Mage/Reports/Model/Resource/Report/CollectionTest.php index 4b8e5d2908d..aac79be1a6a 100644 --- a/tests/unit/Mage/Reports/Model/Resource/Report/CollectionTest.php +++ b/tests/unit/Mage/Reports/Model/Resource/Report/CollectionTest.php @@ -40,8 +40,7 @@ public function setUp(): void /** * @covers Mage_Reports_Model_Resource_Report_Collection::setPeriod() - * @group Mage_Reports - * @group Mage_Reports_Model + * @group Model */ public function testSetPeriod(): void { @@ -50,8 +49,7 @@ public function testSetPeriod(): void /** * @covers Mage_Reports_Model_Resource_Report_Collection::setInterval() - * @group Mage_Reports - * @group Mage_Reports_Model + * @group Model */ public function testSetIntervals(): void { @@ -60,8 +58,7 @@ public function testSetIntervals(): void /** * @dataProvider provideReportsDateIntervals - * @group Mage_Reports - * @group Mage_Reports_Model + * @group Model */ public function testGetIntervals(int $expectedResult, string|Zend_Date $from, string|Zend_Date $to, string $period): void { @@ -77,8 +74,7 @@ public function testGetIntervals(int $expectedResult, string|Zend_Date $from, st /** * @covers Mage_Reports_Model_Resource_Report_Collection::getPeriods() - * @group Mage_Reports - * @group Mage_Reports_Model + * @group Model */ public function testGetPeriods(): void { @@ -88,8 +84,7 @@ public function testGetPeriods(): void /** * @covers Mage_Reports_Model_Resource_Report_Collection::getStoreIds() * @covers Mage_Reports_Model_Resource_Report_Collection::setStoreIds() - * @group Mage_Reports - * @group Mage_Reports_Model + * @group Model */ public function testStoreIds(): void { @@ -99,8 +94,7 @@ public function testStoreIds(): void /** * @covers Mage_Reports_Model_Resource_Report_Collection::getSize() - * @group Mage_Reports - * @group Mage_Reports_Model + * @group Model */ public function testGetSize(): void { @@ -108,8 +102,7 @@ public function testGetSize(): void } /** * @covers Mage_Reports_Model_Resource_Report_Collection::setPageSize() - * @group Mage_Reports - * @group Mage_Reports_Model + * @group Model */ public function testSetPageSize(): void { @@ -118,8 +111,7 @@ public function testSetPageSize(): void /** * @covers Mage_Reports_Model_Resource_Report_Collection::getPageSize() - * @group Mage_Reports - * @group Mage_Reports_Model + * @group Model */ public function testGetPageSize(): void { @@ -127,8 +119,7 @@ public function testGetPageSize(): void } /** - * @group Mage_Reports - * @group Mage_Reports_Model + * @group Model */ public function testInitReport(string $modelClass = ''): void { @@ -136,8 +127,7 @@ public function testInitReport(string $modelClass = ''): void } /** - * @group Mage_Reports - * @group Mage_Reports_Model + * @group Model */ public function testGetReportFull(): void { @@ -146,8 +136,7 @@ public function testGetReportFull(): void } /** - * @group Mage_Reports - * @group Mage_Reports_Model + * @group Model */ public function testGetReport(): void { @@ -156,8 +145,7 @@ public function testGetReport(): void } /** - * @group Mage_Reports - * @group Mage_Reports_Model + * @group Model */ public function testTimeShift(): void { diff --git a/tests/unit/Mage/Review/Model/ReviewTest.php b/tests/unit/Mage/Review/Model/ReviewTest.php index 7e87a90fd2e..56d96b3fcd2 100644 --- a/tests/unit/Mage/Review/Model/ReviewTest.php +++ b/tests/unit/Mage/Review/Model/ReviewTest.php @@ -37,8 +37,7 @@ public static function setUpBeforeClass(): void /** * @dataProvider provideValidateReviewData * @param array|true $expectedResult - * @group Mage_Review - * @group Mage_Review_Model + * @group Model */ public function testValidate($expectedResult, array $methods): void { diff --git a/tests/unit/Mage/Rule/Model/AbstractTest.php b/tests/unit/Mage/Rule/Model/AbstractTest.php index e1f9755d2d9..ef5716f69c2 100644 --- a/tests/unit/Mage/Rule/Model/AbstractTest.php +++ b/tests/unit/Mage/Rule/Model/AbstractTest.php @@ -46,8 +46,7 @@ public function setUp(): void } /** - * @group Mage_Rule - * @group Mage_Rule_Model + * @group Model */ public function testGetProductFlatSelect(): void { @@ -60,8 +59,7 @@ public function testGetProductFlatSelect(): void /** * @dataProvider provideBool - * @group Mage_Rule - * @group Mage_Rule_Model + * @group Model */ public function testGetConditions(bool $empty): void { @@ -78,8 +76,7 @@ public function testGetConditions(bool $empty): void /** * @dataProvider provideBool - * @group Mage_Rule - * @group Mage_Rule_Model + * @group Model */ public function testGetActions(bool $empty): void { @@ -95,8 +92,7 @@ public function testGetActions(bool $empty): void } /** - * @group Mage_Rule - * @group Mage_Rule_Model + * @group Model */ public function testGetForm(): void { @@ -104,8 +100,7 @@ public function testGetForm(): void } /** - * @group Mage_Rule - * @group Mage_Rule_Model + * @group Model */ public function testLoadPost(array $data = []): void { @@ -115,8 +110,7 @@ public function testLoadPost(array $data = []): void /** * @covers Mage_Rule_Model_Abstract::validate() * @dataProvider provideValidateData - * @group Mage_Rule - * @group Mage_Rule_Model + * @group Model */ public function testValidate(bool|array $expectedResul, ?array $data = null): void { @@ -131,8 +125,7 @@ public function testValidate(bool|array $expectedResul, ?array $data = null): vo /** * @dataProvider provideValidateData - * @group Mage_Rule - * @group Mage_Rule_Model + * @group Model */ public function testValidateData(bool|array $expectedResul, ?array $data = null): void { @@ -145,8 +138,7 @@ public function testValidateData(bool|array $expectedResul, ?array $data = null) /** * @covers Mage_Rule_Model_Abstract::isDeleteable() - * @group Mage_Rule - * @group Mage_Rule_Model + * @group Model */ public function testIsDeleteable(): void { @@ -156,8 +148,7 @@ public function testIsDeleteable(): void /** * @covers Mage_Rule_Model_Abstract::setIsDeleteable() * @dataProvider provideBool - * @group Mage_Rule - * @group Mage_Rule_Model + * @group Model */ public function testSetIsDeleteable(bool $value): void { @@ -166,8 +157,7 @@ public function testSetIsDeleteable(bool $value): void /** * @covers Mage_Rule_Model_Abstract::isReadonly() - * @group Mage_Rule - * @group Mage_Rule_Model + * @group Model */ public function testIsReadonly(): void { @@ -177,8 +167,7 @@ public function testIsReadonly(): void /** * @covers Mage_Rule_Model_Abstract::setIsReadonly() * @dataProvider provideBool - * @group Mage_Rule - * @group Mage_Rule_Model + * @group Model */ public function testSetIsReadonly(bool $value): void { @@ -186,8 +175,7 @@ public function testSetIsReadonly(bool $value): void } /** - * @group Mage_Rule - * @group Mage_Rule_Model + * @group Model */ public function testGetWebsiteIds(): void { @@ -200,8 +188,7 @@ public function testGetWebsiteIds(): void /** * @covers Mage_Rule_Model_Abstract::asString() - * @group Mage_Rule - * @group Mage_Rule_Model + * @group Model */ public function testAsString(): void { @@ -210,8 +197,7 @@ public function testAsString(): void /** * @covers Mage_Rule_Model_Abstract::asHtml() - * @group Mage_Rule - * @group Mage_Rule_Model + * @group Model */ public function testAsHtml(): void { @@ -220,8 +206,7 @@ public function testAsHtml(): void /** * @covers Mage_Rule_Model_Abstract::asArray() - * @group Mage_Rule - * @group Mage_Rule_Model + * @group Model */ public function testAsArray(): void { diff --git a/tests/unit/Mage/Rule/Model/EnvironmentTest.php b/tests/unit/Mage/Rule/Model/EnvironmentTest.php index 77ee28650d3..2431f1f28ed 100644 --- a/tests/unit/Mage/Rule/Model/EnvironmentTest.php +++ b/tests/unit/Mage/Rule/Model/EnvironmentTest.php @@ -33,8 +33,7 @@ public static function setUpBeforeClass(): void /** * @covers Mage_Rule_Model_Environment::collect() - * @group Mage_Rule - * @group Mage_Rule_Model + * @group Model */ public function testGetConditionsInstance(): void { diff --git a/tests/unit/Mage/Rule/Model/RuleTest.php b/tests/unit/Mage/Rule/Model/RuleTest.php index 232b3a46846..fe0484fa094 100644 --- a/tests/unit/Mage/Rule/Model/RuleTest.php +++ b/tests/unit/Mage/Rule/Model/RuleTest.php @@ -35,8 +35,7 @@ public static function setUpBeforeClass(): void /** * @covers Mage_Rule_Model_Rule::getConditionsInstance() - * @group Mage_Rule - * @group Mage_Rule_Model + * @group Model */ public function testGetConditionsInstance(): void { @@ -45,8 +44,7 @@ public function testGetConditionsInstance(): void /** * @covers Mage_Rule_Model_Rule::getActionsInstance() - * @group Mage_Rule - * @group Mage_Rule_Model + * @group Model */ public function testGetActionsInstance(): void { diff --git a/tests/unit/Mage/Sales/Block/Order/Item/Renderer/DefaultTest.php b/tests/unit/Mage/Sales/Block/Order/Item/Renderer/DefaultTest.php index 5736469c7bf..9818ff5dd81 100644 --- a/tests/unit/Mage/Sales/Block/Order/Item/Renderer/DefaultTest.php +++ b/tests/unit/Mage/Sales/Block/Order/Item/Renderer/DefaultTest.php @@ -34,8 +34,7 @@ public static function setUpBeforeClass(): void /** * @covers Mage_Sales_Block_Order_Item_Renderer_Default::setItem() - * @group Mage_Sales - * @group Mage_Sales_Block + * @group Block */ public function testSetItem(): void { diff --git a/tests/unit/Mage/Sitemap/Model/SitemapTest.php b/tests/unit/Mage/Sitemap/Model/SitemapTest.php index a32b7c1e8f8..42f35f8d4d4 100644 --- a/tests/unit/Mage/Sitemap/Model/SitemapTest.php +++ b/tests/unit/Mage/Sitemap/Model/SitemapTest.php @@ -38,8 +38,7 @@ public static function setUpBeforeClass(): void /** * @dataProvider provideGetPreparedFilenameData - * @group Mage_Sitemap - * @group Mage_Sitemap_Model + * @group Model */ public function testGetPreparedFilename(array $methods): void { @@ -51,8 +50,7 @@ public function testGetPreparedFilename(array $methods): void /** * @dataProvider provideGenerateXmlData - * @group Mage_Sitemap - * @group Mage_Sitemap_Model + * @group Model * @throws Throwable * @todo test validation * @todo test content of xml diff --git a/tests/unit/Mage/Tax/Helper/DataTest.php b/tests/unit/Mage/Tax/Helper/DataTest.php index 87d21726d21..775f5fa464c 100644 --- a/tests/unit/Mage/Tax/Helper/DataTest.php +++ b/tests/unit/Mage/Tax/Helper/DataTest.php @@ -40,8 +40,7 @@ public static function setUpBeforeClass(): void /** * @covers Mage_Tax_Helper_Data::getPostCodeSubStringLength() - * @group Mage_Tax - * @group Mage_Tax_Helper + * @group Helper */ public function testGetPostCodeSubStringLength(): void { @@ -50,8 +49,7 @@ public function testGetPostCodeSubStringLength(): void /** * @covers Mage_Tax_Helper_Data::getConfig() - * @group Mage_Tax - * @group Mage_Tax_Helper + * @group Helper */ public function testGetConfig(): void { @@ -60,8 +58,7 @@ public function testGetConfig(): void /** * @covers Mage_Tax_Helper_Data::getCalculator() - * @group Mage_Tax - * @group Mage_Tax_Helper + * @group Helper */ public function testGetCalculator(): void { @@ -69,8 +66,7 @@ public function testGetCalculator(): void } /** - * @group Mage_Tax - * @group Mage_Tax_Helper + * @group Helper * @doesNotPerformAssertions */ public function testGetProductPrice(): void @@ -80,8 +76,7 @@ public function testGetProductPrice(): void } /** - * @group Mage_Tax - * @group Mage_Tax_Helper + * @group Helper */ public function testPriceIncludesTax(): void { @@ -90,8 +85,7 @@ public function testPriceIncludesTax(): void /** * @covers Mage_Tax_Helper_Data::applyTaxAfterDiscount() - * @group Mage_Tax - * @group Mage_Tax_Helper + * @group Helper */ public function testApplyTaxAfterDiscount(): void { @@ -101,8 +95,7 @@ public function testApplyTaxAfterDiscount(): void /** * @covers Mage_Tax_Helper_Data::getIncExcText() * @dataProvider provideGetIncExcText - * @group Mage_Tax - * @group Mage_Tax_Helper + * @group Helper */ public function testGetIncExcText(string $expectedResult, bool $flag): void { @@ -111,8 +104,7 @@ public function testGetIncExcText(string $expectedResult, bool $flag): void /** * @covers Mage_Tax_Helper_Data::getPriceDisplayType() - * @group Mage_Tax - * @group Mage_Tax_Helper + * @group Helper */ public function testGetPriceDisplayType(): void { @@ -120,8 +112,7 @@ public function testGetPriceDisplayType(): void } /** - * @group Mage_Tax - * @group Mage_Tax_Helper + * @group Helper * @doesNotPerformAssertions */ public function testNeedPriceConversion(): void @@ -131,8 +122,7 @@ public function testNeedPriceConversion(): void } /** - * @group Mage_Tax - * @group Mage_Tax_Helper + * @group Helper * @group runInSeparateProcess * @runInSeparateProcess * @doesNotPerformAssertions @@ -144,8 +134,7 @@ public function testGetPriceFormat(): void } /** - * @group Mage_Tax - * @group Mage_Tax_Helper + * @group Helper * @group UsesSampleDataFlag */ public function testGetTaxRatesByProductClass(): void @@ -157,8 +146,7 @@ public function testGetTaxRatesByProductClass(): void } /** - * @group Mage_Tax - * @group Mage_Tax_Helper + * @group Helper * @group UsesSampleDataFlag */ public function testGetAllRatesByProductClass(): void @@ -170,8 +158,7 @@ public function testGetAllRatesByProductClass(): void } /** - * @group Mage_Tax - * @group Mage_Tax_Helper + * @group Helper * @doesNotPerformAssertions */ public function testGetPrice(): void @@ -182,8 +169,7 @@ public function testGetPrice(): void /** * @covers Mage_Tax_Helper_Data::displayPriceIncludingTax() - * @group Mage_Tax - * @group Mage_Tax_Helper + * @group Helper */ public function testDisplayPriceIncludingTax(): void { @@ -192,8 +178,7 @@ public function testDisplayPriceIncludingTax(): void /** * @covers Mage_Tax_Helper_Data::displayPriceExcludingTax() - * @group Mage_Tax - * @group Mage_Tax_Helper + * @group Helper */ public function testDisplayPriceExcludingTax(): void { @@ -202,8 +187,7 @@ public function testDisplayPriceExcludingTax(): void /** * @covers Mage_Tax_Helper_Data::displayBothPrices() - * @group Mage_Tax - * @group Mage_Tax_Helper + * @group Helper */ public function testDisplayBothPrices(): void { @@ -212,8 +196,7 @@ public function testDisplayBothPrices(): void /** * @dataProvider provideGetIncExcTaxLabel - * @group Mage_Tax - * @group Mage_Tax_Helper + * @group Helper */ public function testGetIncExcTaxLabel(string $expectedResult, bool $flag): void { @@ -222,8 +205,7 @@ public function testGetIncExcTaxLabel(string $expectedResult, bool $flag): void /** * @covers Mage_Tax_Helper_Data::shippingPriceIncludesTax() - * @group Mage_Tax - * @group Mage_Tax_Helper + * @group Helper */ public function testShippingPriceIncludesTax(): void { @@ -232,8 +214,7 @@ public function testShippingPriceIncludesTax(): void /** * @covers Mage_Tax_Helper_Data::getShippingPriceDisplayType() - * @group Mage_Tax - * @group Mage_Tax_Helper + * @group Helper */ public function testGetShippingPriceDisplayType(): void { @@ -242,8 +223,7 @@ public function testGetShippingPriceDisplayType(): void /** * @covers Mage_Tax_Helper_Data::displayShippingPriceIncludingTax() - * @group Mage_Tax - * @group Mage_Tax_Helper + * @group Helper */ public function testDisplayShippingPriceIncludingTax(): void { @@ -252,8 +232,7 @@ public function testDisplayShippingPriceIncludingTax(): void /** * @covers Mage_Tax_Helper_Data::displayShippingPriceExcludingTax() - * @group Mage_Tax - * @group Mage_Tax_Helper + * @group Helper */ public function testDisplayShippingPriceExcludingTax(): void { @@ -262,8 +241,7 @@ public function testDisplayShippingPriceExcludingTax(): void /** * @covers Mage_Tax_Helper_Data::displayShippingBothPrices() - * @group Mage_Tax - * @group Mage_Tax_Helper + * @group Helper */ public function testDisplayShippingBothPrices(): void { @@ -272,8 +250,7 @@ public function testDisplayShippingBothPrices(): void /** * @covers Mage_Tax_Helper_Data::getShippingTaxClass() - * @group Mage_Tax - * @group Mage_Tax_Helper + * @group Helper */ public function testGetShippingTaxClass(): void { @@ -281,8 +258,7 @@ public function testGetShippingTaxClass(): void } /** - * @group Mage_Tax - * @group Mage_Tax_Helper + * @group Helper */ public function testGetShippingPrice(): void { @@ -291,8 +267,7 @@ public function testGetShippingPrice(): void /** * @covers Mage_Tax_Helper_Data::discountTax() - * @group Mage_Tax - * @group Mage_Tax_Helper + * @group Helper */ public function testDiscountTax(): void { @@ -301,8 +276,7 @@ public function testDiscountTax(): void /** * @covers Mage_Tax_Helper_Data::getTaxBasedOn() - * @group Mage_Tax - * @group Mage_Tax_Helper + * @group Helper */ public function testGetTaxBasedOn(): void { @@ -311,8 +285,7 @@ public function testGetTaxBasedOn(): void /** * @covers Mage_Tax_Helper_Data::applyTaxOnCustomPrice() - * @group Mage_Tax - * @group Mage_Tax_Helper + * @group Helper */ public function testApplyTaxOnCustomPrice(): void { @@ -321,8 +294,7 @@ public function testApplyTaxOnCustomPrice(): void /** * @covers Mage_Tax_Helper_Data::applyTaxOnOriginalPrice() - * @group Mage_Tax - * @group Mage_Tax_Helper + * @group Helper */ public function testApplyTaxOnOriginalPrice(): void { @@ -330,8 +302,7 @@ public function testApplyTaxOnOriginalPrice(): void } /** - * @group Mage_Tax - * @group Mage_Tax_Helper + * @group Helper */ public function testGetCalculationSequence(): void { @@ -340,8 +311,7 @@ public function testGetCalculationSequence(): void /** * @covers Mage_Tax_Helper_Data::getCalculationAgorithm() - * @group Mage_Tax - * @group Mage_Tax_Helper + * @group Helper */ public function testGetCalculationAgorithm(): void { @@ -349,8 +319,7 @@ public function testGetCalculationAgorithm(): void } /** - * @group Mage_Tax - * @group Mage_Tax_Helper + * @group Helper */ public function testIsWrongDisplaySettingsIgnored(): void { @@ -358,8 +327,7 @@ public function testIsWrongDisplaySettingsIgnored(): void } /** - * @group Mage_Tax - * @group Mage_Tax_Helper + * @group Helper */ public function testIsWrongDiscountSettingsIgnored(): void { @@ -367,8 +335,7 @@ public function testIsWrongDiscountSettingsIgnored(): void } /** - * @group Mage_Tax - * @group Mage_Tax_Helper + * @group Helper */ public function testIsConflictingFptTaxConfigurationSettingsIgnored(): void { @@ -377,8 +344,7 @@ public function testIsConflictingFptTaxConfigurationSettingsIgnored(): void /** * @covers Mage_Tax_Helper_Data::isCrossBorderTradeEnabled() - * @group Mage_Tax - * @group Mage_Tax_Helper + * @group Helper */ public function testIsCrossBorderTradeEnabled(): void { diff --git a/tests/unit/Mage/Uploader/Block/AbstractTest.php b/tests/unit/Mage/Uploader/Block/AbstractTest.php index 2ba12112b6b..b58569a5fe1 100644 --- a/tests/unit/Mage/Uploader/Block/AbstractTest.php +++ b/tests/unit/Mage/Uploader/Block/AbstractTest.php @@ -34,8 +34,7 @@ public function setUp(): void } /** - * @group Mage_Uploader - * @group Mage_Uploader_Block + * @group Block */ public function testGetMiscConfig(): void { @@ -43,8 +42,7 @@ public function testGetMiscConfig(): void } /** - * @group Mage_Uploader - * @group Mage_Uploader_Block + * @group Block * @group runInSeparateProcess * @runInSeparateProcess */ @@ -54,8 +52,7 @@ public function testGetUploaderConfig(): void } /** - * @group Mage_Uploader - * @group Mage_Uploader_Block + * @group Block */ public function testGetButtonConfig(): void { @@ -63,8 +60,7 @@ public function testGetButtonConfig(): void } /** - * @group Mage_Uploader - * @group Mage_Uploader_Block + * @group Block */ public function testGetElementId(): void { diff --git a/tests/unit/Mage/Uploader/Helper/DataTest.php b/tests/unit/Mage/Uploader/Helper/DataTest.php index 1159db035da..fe241150215 100644 --- a/tests/unit/Mage/Uploader/Helper/DataTest.php +++ b/tests/unit/Mage/Uploader/Helper/DataTest.php @@ -32,8 +32,7 @@ public static function setUpBeforeClass(): void } /** - * @group Mage_Uploader - * @group Mage_Uploader_Helper + * @group Helper */ public function testIsModuleEnabled(): void { diff --git a/tests/unit/Mage/Uploader/Helper/FileTest.php b/tests/unit/Mage/Uploader/Helper/FileTest.php index 936dc827ff0..d675d08fcf5 100644 --- a/tests/unit/Mage/Uploader/Helper/FileTest.php +++ b/tests/unit/Mage/Uploader/Helper/FileTest.php @@ -44,8 +44,7 @@ public static function setUpBeforeClass(): void * @param array $expectedResult * @param string|array $extensionsList * - * @group Mage_Uploader - * @group Mage_Uploader_Helper + * @group Helper */ public function testGetMimeTypeFromExtensionList(array $expectedResult, $extensionsList): void { @@ -53,8 +52,7 @@ public function testGetMimeTypeFromExtensionList(array $expectedResult, $extensi } /** - * @group Mage_Uploader - * @group Mage_Uploader_Helper + * @group Helper */ public function testGetPostMaxSize(): void { @@ -62,8 +60,7 @@ public function testGetPostMaxSize(): void } /** - * @group Mage_Uploader - * @group Mage_Uploader_Helper + * @group Helper */ public function testGetUploadMaxSize(): void { @@ -72,8 +69,7 @@ public function testGetUploadMaxSize(): void /** * @dataProvider provideGetDataMaxSizeData - * @group Mage_Uploader - * @group Mage_Uploader_Helper + * @group Helper */ public function testGetDataMaxSize(string $expectedResult, array $methods): void { @@ -85,8 +81,7 @@ public function testGetDataMaxSize(string $expectedResult, array $methods): void /** * @dataProvider provideGetDataMaxSizeInBytesData - * @group Mage_Uploader - * @group Mage_Uploader_Helper + * @group Helper */ public function testGetDataMaxSizeInBytes(int $expectedResult, array $methods): void { diff --git a/tests/unit/Mage/Wishlist/Model/ItemTest.php b/tests/unit/Mage/Wishlist/Model/ItemTest.php index 3961549a85f..e253b10726a 100644 --- a/tests/unit/Mage/Wishlist/Model/ItemTest.php +++ b/tests/unit/Mage/Wishlist/Model/ItemTest.php @@ -34,8 +34,7 @@ protected function setUp(): void /** * @dataProvider qtyDataProvider - * @group Mage_Wishlist - * @group Mage_Wishlist_Model + * @group Model */ public function testSetQty(int $expectedQty, int $inputQty): void { @@ -61,8 +60,7 @@ public function qtyDataProvider(): \Generator /** * @dataProvider validateDataProvider - * @group Mage_Wishlist - * @group Mage_Wishlist_Model + * @group Model * @throws Mage_Core_Exception */ public function testValidate(?string $expectedExceptionMessage, ?int $wishlistId, ?int $productId): void From 7c8d87b4512b13551c3614ed333df60aa0db9dc0 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Thu, 17 Apr 2025 00:30:29 +0200 Subject: [PATCH 04/36] updated tests --- .../core/Mage/Cms/Block/Widget/Page/Link.php | 26 +++- composer.json | 2 +- .../Mage/Cms/Block/Widget/Page/LinkTest.php | 40 +++-- tests/unit/Mage/Log/Helper/DataTest.php | 4 +- tests/unit/Mage/Log/Model/CustomerTest.php | 53 ++++++- .../Mage/Cms/Block/Widget/Page/LinkTrait.php | 144 ++++++++++++++++++ .../{LogTrait.php => Helper/DataTrait.php} | 4 +- .../Mage/Log/Model/CustomerTrait.php | 39 +++++ 8 files changed, 285 insertions(+), 27 deletions(-) create mode 100644 tests/unit/Traits/DataProvider/Mage/Cms/Block/Widget/Page/LinkTrait.php rename tests/unit/Traits/DataProvider/Mage/Log/{LogTrait.php => Helper/DataTrait.php} (90%) create mode 100644 tests/unit/Traits/DataProvider/Mage/Log/Model/CustomerTrait.php diff --git a/app/code/core/Mage/Cms/Block/Widget/Page/Link.php b/app/code/core/Mage/Cms/Block/Widget/Page/Link.php index 773c6d85809..371bbddc90b 100644 --- a/app/code/core/Mage/Cms/Block/Widget/Page/Link.php +++ b/app/code/core/Mage/Cms/Block/Widget/Page/Link.php @@ -68,6 +68,7 @@ public function getHref() * as parameter or retrieve page title from DB using passed identifier or page id. * * @return string + * @throws Mage_Core_Model_Store_Exception */ public function getTitle() { @@ -77,10 +78,9 @@ public function getTitle() // compare to null used here bc user can specify blank title $this->_title = $this->getData('title'); } elseif ($this->getData('page_id')) { - $this->_title = Mage::getResourceSingleton('cms/page')->getCmsPageTitleById($this->getData('page_id')); + $this->_title = $this->getCmsPageTitleById($this->getData('page_id')); } elseif ($this->getData('href')) { - $this->_title = Mage::getResourceSingleton('cms/page')->setStore(Mage::app()->getStore()) - ->getCmsPageTitleByIdentifier($this->getData('href')); + $this->_title = $this->getCmsPageTitleByIdentifier($this->getData('href')); } } @@ -93,6 +93,7 @@ public function getTitle() * if title will be blank string, page identifier will be used. * * @return string + * @throws Mage_Core_Model_Store_Exception */ public function getAnchorText() { @@ -101,14 +102,27 @@ public function getAnchorText() } elseif ($this->getTitle()) { $this->_anchorText = $this->getTitle(); } elseif ($this->getData('href')) { - $this->_anchorText = Mage::getResourceSingleton('cms/page')->setStore(Mage::app()->getStore()) - ->getCmsPageTitleByIdentifier($this->getData('href')); + $this->_anchorText = $this->getCmsPageTitleByIdentifier($this->getData('href')); } elseif ($this->getData('page_id')) { - $this->_anchorText = Mage::getResourceSingleton('cms/page')->getCmsPageTitleById($this->getData('page_id')); + $this->_anchorText = $this->getCmsPageTitleById($this->getData('page_id')); } else { $this->_anchorText = $this->getData('href'); } return $this->_anchorText; } + + protected function getCmsPageTitleById(int|string $pageId): string + { + return Mage::getResourceSingleton('cms/page')->getCmsPageTitleById($pageId); + } + + /** + * @throws Mage_Core_Model_Store_Exception + */ + protected function getCmsPageTitleByIdentifier(int|string $identifier): string + { + return Mage::getResourceSingleton('cms/page')->setStore(Mage::app()->getStore()) + ->getCmsPageTitleByIdentifier($identifier); + } } diff --git a/composer.json b/composer.json index 52881819a57..60af5865466 100644 --- a/composer.json +++ b/composer.json @@ -103,7 +103,7 @@ } ], "autoload-dev": { - "classmap": ["app/code"], + "classmap": ["app/code/*/*/*/controllers"], "psr-4": { "OpenMage\\Tests\\Unit\\": "tests/unit" } diff --git a/tests/unit/Mage/Cms/Block/Widget/Page/LinkTest.php b/tests/unit/Mage/Cms/Block/Widget/Page/LinkTest.php index 7369278cfb3..06c61cd9bb6 100644 --- a/tests/unit/Mage/Cms/Block/Widget/Page/LinkTest.php +++ b/tests/unit/Mage/Cms/Block/Widget/Page/LinkTest.php @@ -17,41 +17,59 @@ namespace OpenMage\Tests\Unit\Mage\Cms\Block\Widget\Page; -use Mage; use Mage_Cms_Block_Widget_Page_Link as Subject; +use Mage_Core_Model_Store_Exception; use OpenMage\Tests\Unit\OpenMageTest; +use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Cms\Block\Widget\Page\LinkTrait; class LinkTest extends OpenMageTest { + use LinkTrait; + private static Subject $subject; - public static function setUpBeforeClass(): void + protected function setUp(): void { - parent::setUpBeforeClass(); self::$subject = new Subject(); } /** + * @dataProvider provideGetHrefData * @group Block + * @group runInSeparateProcess + * @runInSeparateProcess */ - public function testGetHref(): void + public function testGetHref(string $expectedResult, array $data): void { - static::assertIsString(self::$subject->getHref()); + self::$subject->setData($data); + + $result = self::$subject->getHref(); + static::assertSame($expectedResult, $result); } /** + * @dataProvider provideGetTitleData * @group Block + * @throws Mage_Core_Model_Store_Exception */ - public function testGetTitle(): void + public function testGetTitle(string $expectedResult, array $data): void { - static::assertIsString(self::$subject->getTitle()); + self::$subject->setData($data); + + $result = self::$subject->getTitle(); + static::assertSame($expectedResult, $result); } /** + * @dataProvider provideGetAnchorTextData * @group Block + * @throws Mage_Core_Model_Store_Exception */ - // public function testGetAnchorText(): void - // { - // $this->assertIsString(self::$subject->getAnchorText()); - // } + public function testGetAnchorText(bool|string|null $expectedResult, array $data): void + { + self::$subject->setData($data); + + $result = self::$subject->getAnchorText(); + static::assertSame($expectedResult, $result); + } } diff --git a/tests/unit/Mage/Log/Helper/DataTest.php b/tests/unit/Mage/Log/Helper/DataTest.php index f56a701b3e7..4afbb7ef041 100644 --- a/tests/unit/Mage/Log/Helper/DataTest.php +++ b/tests/unit/Mage/Log/Helper/DataTest.php @@ -20,11 +20,11 @@ use Mage; use Mage_Log_Helper_Data as Subject; use OpenMage\Tests\Unit\OpenMageTest; -use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Log\LogTrait; +use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Log\Helper\DataTrait; class DataTest extends OpenMageTest { - use LogTrait; + use DataTrait; private static Subject $subject; diff --git a/tests/unit/Mage/Log/Model/CustomerTest.php b/tests/unit/Mage/Log/Model/CustomerTest.php index 73639d99001..c4977334ec9 100644 --- a/tests/unit/Mage/Log/Model/CustomerTest.php +++ b/tests/unit/Mage/Log/Model/CustomerTest.php @@ -17,12 +17,17 @@ namespace OpenMage\Tests\Unit\Mage\Log\Model; +use Generator; use Mage; +use Mage_Customer_Model_Customer; use Mage_Log_Model_Customer as Subject; use OpenMage\Tests\Unit\OpenMageTest; +use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Log\Model\CustomerTrait; class CustomerTest extends OpenMageTest { + use CustomerTrait; + /** @phpstan-ignore property.onlyWritten */ private static Subject $subject; @@ -33,17 +38,55 @@ public static function setUpBeforeClass(): void } /** + * @dataProvider loadByCustomerDataProvider * @group Model */ - public function testGetLoginAtTimestamp(): void + public function testLoadByCustomer($input, $expectedCustomerId): void { $mock = $this->getMockBuilder(Subject::class) - ->setMethods(['getLoginAt']) + ->onlyMethods(['load']) + ->getMock(); + + $mock->expects(static::once()) + ->method('load') + ->with($expectedCustomerId, 'customer_id') + ->willReturnSelf(); + + $result = $mock->loadByCustomer($input); + + static::assertSame($mock, $result); + } + + public function loadByCustomerDataProvider(): Generator + { + $customerMock = $this->getMockBuilder(Mage_Customer_Model_Customer::class) + ->onlyMethods(['getId']) ->getMock(); + $customerMock->method('getId')->willReturn(456); + + yield 'int' => [ + 123, + 123, + ]; + yield 'model' => [ + $customerMock, + 456, + ]; + } - static::assertNull($mock->getLoginAtTimestamp()); + /** + * @dataProvider provideGetLoginAtTimestampData + * @group Model + */ + public function testGetLoginAtTimestamp(bool $expectedResult, array $methods): void + { + $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - $mock->method('getLoginAt')->willReturn(true); - static::assertIsInt($mock->getLoginAtTimestamp()); + static::assertInstanceOf(Subject::class, $mock); + if ($expectedResult) { + static::assertIsInt($mock->getLoginAtTimestamp()); + } else { + static::assertNull($mock->getLoginAtTimestamp()); + } } } diff --git a/tests/unit/Traits/DataProvider/Mage/Cms/Block/Widget/Page/LinkTrait.php b/tests/unit/Traits/DataProvider/Mage/Cms/Block/Widget/Page/LinkTrait.php new file mode 100644 index 00000000000..a2da8225077 --- /dev/null +++ b/tests/unit/Traits/DataProvider/Mage/Cms/Block/Widget/Page/LinkTrait.php @@ -0,0 +1,144 @@ + null, + 'page_id' => null, + ]; + + #$data = $emptyData; + #$data['page_id'] = 1; + #yield 'page_id is set' => [ + # 'https://magento-lts.ddev.site/no-route', + # $data, + #]; + + $data = $emptyData; + $data['href'] = 'home'; + yield 'href is set' => [ + 'home', + $data, + ]; + + yield 'empty' => [ + '', + $emptyData, + ]; + + yield 'no data set' => [ + '', + [], + ]; + } + + public function provideGetTitleData(): Generator + { + $emptyData = [ + 'href' => null, + 'page_id' => null, + 'title' => null, + ]; + + $data = $emptyData; + $data['title'] = 'Custom Title'; + yield 'title is set' => [ + 'Custom Title', + $data, + ]; + + $data = $emptyData; + $data['page_id'] = 1; + yield 'page_id is set' => [ + '404 Not Found', + $data, + ]; + + $data = $emptyData; + $data['href'] = 'home'; + yield 'href is set' => [ + 'Madison Island', + $data, + ]; + + yield 'empty' => [ + '', + $emptyData, + ]; + + yield 'no data set' => [ + '', + [], + ]; + } + + public function provideGetAnchorTextData(): Generator + { + $emptyData = [ + 'href' => null, + 'page_id' => null, + 'anchor_text' => null, + 'test' => 'Test', + ]; + + $data = $emptyData; + $data['anchor_text'] = 'Custom Text'; + yield 'text is set' => [ + 'Custom Text', + $data, + ]; + + $data = $emptyData; + $data['title'] = 'Custom Title'; + yield 'title is set' => [ + 'Custom Title', + $data, + ]; + + $data = $emptyData; + $data['page_id'] = 1; + yield 'page_id is set' => [ + '404 Not Found', + $data, + ]; + + $data = $emptyData; + $data['href'] = 'home'; + yield 'href is set' => [ + 'Madison Island', + $data, + ]; + + yield 'empty' => [ + null, + $emptyData, + ]; + + yield 'no data set' => [ + null, + [], + ]; + } +} diff --git a/tests/unit/Traits/DataProvider/Mage/Log/LogTrait.php b/tests/unit/Traits/DataProvider/Mage/Log/Helper/DataTrait.php similarity index 90% rename from tests/unit/Traits/DataProvider/Mage/Log/LogTrait.php rename to tests/unit/Traits/DataProvider/Mage/Log/Helper/DataTrait.php index b543ac1e09c..0989a215b7f 100644 --- a/tests/unit/Traits/DataProvider/Mage/Log/LogTrait.php +++ b/tests/unit/Traits/DataProvider/Mage/Log/Helper/DataTrait.php @@ -15,11 +15,11 @@ declare(strict_types=1); -namespace OpenMage\Tests\Unit\Traits\DataProvider\Mage\Log; +namespace OpenMage\Tests\Unit\Traits\DataProvider\Mage\Log\Helper; use Generator; -trait LogTrait +trait DataTrait { public function provideIsLogFileExtensionValid(): Generator { diff --git a/tests/unit/Traits/DataProvider/Mage/Log/Model/CustomerTrait.php b/tests/unit/Traits/DataProvider/Mage/Log/Model/CustomerTrait.php new file mode 100644 index 00000000000..c2d92c73d69 --- /dev/null +++ b/tests/unit/Traits/DataProvider/Mage/Log/Model/CustomerTrait.php @@ -0,0 +1,39 @@ + [ + true, + [ + 'getLoginAt' => true, + ], + ]; + yield 'invalid' => [ + false, + [ + 'getLoginAt' => false, + ], + ]; + } +} From c38e7f792d33b897c99e698fb080f2bb577aec86 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Thu, 17 Apr 2025 01:37:51 +0200 Subject: [PATCH 05/36] updated tests --- .../Mage/Cms/Block/Widget/Page/LinkTest.php | 1 + tests/unit/Mage/Core/Helper/DataTest.php | 18 ++++++++++++++---- tests/unit/Mage/Core/Helper/UrlTest.php | 2 -- tests/unit/Mage/Reports/Helper/DataTest.php | 10 ++++++---- .../Mage/Core/Helper/DataTrait.php | 12 ++++++++++++ .../DataProvider/Mage/Reports/ReportsTrait.php | 9 ++++++++- 6 files changed, 41 insertions(+), 11 deletions(-) diff --git a/tests/unit/Mage/Cms/Block/Widget/Page/LinkTest.php b/tests/unit/Mage/Cms/Block/Widget/Page/LinkTest.php index 06c61cd9bb6..7e1833d5aad 100644 --- a/tests/unit/Mage/Cms/Block/Widget/Page/LinkTest.php +++ b/tests/unit/Mage/Cms/Block/Widget/Page/LinkTest.php @@ -30,6 +30,7 @@ class LinkTest extends OpenMageTest protected function setUp(): void { + parent::setUp(); self::$subject = new Subject(); } diff --git a/tests/unit/Mage/Core/Helper/DataTest.php b/tests/unit/Mage/Core/Helper/DataTest.php index 972fe138087..ed880b10e1f 100644 --- a/tests/unit/Mage/Core/Helper/DataTest.php +++ b/tests/unit/Mage/Core/Helper/DataTest.php @@ -18,6 +18,7 @@ namespace OpenMage\Tests\Unit\Mage\Core\Helper; use Mage; +use Mage_Core_Exception; use Mage_Core_Helper_Data as Subject; use Mage_Core_Model_Encryption; use Mage_Core_Model_Locale; @@ -243,6 +244,16 @@ public function testGetPublicFilesValidPath(): void static::assertSame($expectedResult, self::$subject->getPublicFilesValidPath()); } + /** + * @covers Mage_Core_Helper_Data::checkLfiProtection() + * @group Helper + * @throws Mage_Core_Exception + */ + public function testCheckLfiProtection(string $name): void + { + static::assertTrue(self::$subject->checkLfiProtection($name)); + } + /** * @covers Mage_Core_Helper_Data::useDbCompatibleMode() * @group Helper @@ -272,12 +283,11 @@ public function testGetMerchantVatNumber(): void /** * @covers Mage_Core_Helper_Data::getMerchantCountryCode() + * @dataProvider provideIsCountryInEUData * @group Helper */ - public function testIsCountryInEU(): void + public function testIsCountryInEU(bool $expectedResult, string $value): void { - static::assertTrue(self::$subject->isCountryInEU('DE')); - static::assertFalse(self::$subject->isCountryInEU('XX')); - static::markTestIncomplete('add better tests'); + static::assertSame($expectedResult, self::$subject->isCountryInEU($value)); } } diff --git a/tests/unit/Mage/Core/Helper/UrlTest.php b/tests/unit/Mage/Core/Helper/UrlTest.php index b6c6698bc9f..b2f78fc9669 100644 --- a/tests/unit/Mage/Core/Helper/UrlTest.php +++ b/tests/unit/Mage/Core/Helper/UrlTest.php @@ -91,7 +91,6 @@ public function testEncodePunycode(): void { static::assertSame(self::$testUrlBase, self::$subject->encodePunycode(self::$testUrlBase)); static::assertSame(self::$testUrlPuny, self::$subject->encodePunycode(self::$testUrlPuny)); - static::markTestIncomplete('This test has to be checked.'); } /** @@ -103,6 +102,5 @@ public function testDecodePunycode(): void { static::assertSame(self::$testUrlBase, self::$subject->decodePunycode(self::$testUrlBase)); static::assertSame('https://?foo=bar&BOO=baz', self::$subject->decodePunycode(self::$testUrlPuny)); - static::markTestIncomplete('This test has to be checked.'); } } diff --git a/tests/unit/Mage/Reports/Helper/DataTest.php b/tests/unit/Mage/Reports/Helper/DataTest.php index f0eab555d9b..a89fe81a1b6 100644 --- a/tests/unit/Mage/Reports/Helper/DataTest.php +++ b/tests/unit/Mage/Reports/Helper/DataTest.php @@ -79,10 +79,12 @@ public function testGetIntervals(int $expectedResult, string $from, string $to, * @doesNotPerformAssertions * @group Helper */ - public function testPrepareIntervalsCollection(int $expectedResult, string $from, string $to, string $period): void + public function testPrepareIntervalsCollection(int|string $expectedResult, string $from, string $to, string $period): void { - static::markTestIncomplete('Test needs to be reviewed.'); - // @phpstan-ignore-next-line - self::$subject->prepareIntervalsCollection(new Varien_Data_Collection(), $from, $to, $period); + try { + self::$subject->prepareIntervalsCollection(new Varien_Data_Collection(), $from, $to, $period); + } catch (\Zend_Date_Exception $exception) { + static::assertSame($expectedResult, $exception->getMessage()); + } } } diff --git a/tests/unit/Traits/DataProvider/Mage/Core/Helper/DataTrait.php b/tests/unit/Traits/DataProvider/Mage/Core/Helper/DataTrait.php index f8d6faba524..5d98b5820d4 100644 --- a/tests/unit/Traits/DataProvider/Mage/Core/Helper/DataTrait.php +++ b/tests/unit/Traits/DataProvider/Mage/Core/Helper/DataTrait.php @@ -86,4 +86,16 @@ public function provideRemoveAccents(): Generator true, ]; } + + public function provideIsCountryInEUData(): Generator + { + yield 'DE true' => [ + true, + 'DE', + ]; + yield 'US false' => [ + false, + 'US', + ]; + } } diff --git a/tests/unit/Traits/DataProvider/Mage/Reports/ReportsTrait.php b/tests/unit/Traits/DataProvider/Mage/Reports/ReportsTrait.php index 8004b58e917..bafa044b0c7 100644 --- a/tests/unit/Traits/DataProvider/Mage/Reports/ReportsTrait.php +++ b/tests/unit/Traits/DataProvider/Mage/Reports/ReportsTrait.php @@ -37,12 +37,19 @@ public function provideReportsDateIntervals(): Generator Mage_Reports_Helper_Data::REPORT_PERIOD_TYPE_DAY, ]; yield $prefix . 'no from' => [ - 0, + 'No date part in \'\' found.', '', self::$dateFirstDay, Mage_Reports_Helper_Data::REPORT_PERIOD_TYPE_DAY, ]; + yield $prefix . 'no to' => [ + 'No date part in \'\' found.', + self::$dateFirstDay, + '', + Mage_Reports_Helper_Data::REPORT_PERIOD_TYPE_DAY, + ]; + if (!defined('DATA_MAY_CHANGED')) { yield $prefix . 'no to' => [ 0, From ca66b11830178d69b58752a05e1911efd58d7503 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Thu, 17 Apr 2025 02:26:14 +0200 Subject: [PATCH 06/36] updated tests --- app/code/core/Mage/Core/Helper/Array.php | 8 +- tests/unit/Mage/Core/Helper/ArrayTest.php | 46 ++++++++++ tests/unit/Mage/Core/Helper/DataTest.php | 10 --- .../Model/Email/Template/AbstractTest.php | 2 +- tests/unit/Mage/Reports/Helper/DataTest.php | 8 +- .../Model/Resource/Report/CollectionTest.php | 2 +- .../Mage/Core/Helper/ArrayTrait.php | 85 +++++++++++++++++++ 7 files changed, 141 insertions(+), 20 deletions(-) create mode 100644 tests/unit/Mage/Core/Helper/ArrayTest.php create mode 100644 tests/unit/Traits/DataProvider/Mage/Core/Helper/ArrayTrait.php diff --git a/app/code/core/Mage/Core/Helper/Array.php b/app/code/core/Mage/Core/Helper/Array.php index ef9b5ff64dd..cf9b2cf73b3 100644 --- a/app/code/core/Mage/Core/Helper/Array.php +++ b/app/code/core/Mage/Core/Helper/Array.php @@ -38,12 +38,10 @@ public function mergeRecursiveWithoutOverwriteNumKeys(array $baseArray, array $m } else { $baseArray[$key] = $value; } + } elseif ($key) { + $baseArray[$key] = $value; } else { - if ($key) { - $baseArray[$key] = $value; - } else { - $baseArray[] = $value; - } + $baseArray[] = $value; } } diff --git a/tests/unit/Mage/Core/Helper/ArrayTest.php b/tests/unit/Mage/Core/Helper/ArrayTest.php new file mode 100644 index 00000000000..1e0e5184eb8 --- /dev/null +++ b/tests/unit/Mage/Core/Helper/ArrayTest.php @@ -0,0 +1,46 @@ +mergeRecursiveWithoutOverwriteNumKeys($baseArray, $mergeArray)); + } +} diff --git a/tests/unit/Mage/Core/Helper/DataTest.php b/tests/unit/Mage/Core/Helper/DataTest.php index ed880b10e1f..3f6b072648c 100644 --- a/tests/unit/Mage/Core/Helper/DataTest.php +++ b/tests/unit/Mage/Core/Helper/DataTest.php @@ -244,16 +244,6 @@ public function testGetPublicFilesValidPath(): void static::assertSame($expectedResult, self::$subject->getPublicFilesValidPath()); } - /** - * @covers Mage_Core_Helper_Data::checkLfiProtection() - * @group Helper - * @throws Mage_Core_Exception - */ - public function testCheckLfiProtection(string $name): void - { - static::assertTrue(self::$subject->checkLfiProtection($name)); - } - /** * @covers Mage_Core_Helper_Data::useDbCompatibleMode() * @group Helper diff --git a/tests/unit/Mage/Core/Model/Email/Template/AbstractTest.php b/tests/unit/Mage/Core/Model/Email/Template/AbstractTest.php index f0bdc788de5..c1e416fca4d 100644 --- a/tests/unit/Mage/Core/Model/Email/Template/AbstractTest.php +++ b/tests/unit/Mage/Core/Model/Email/Template/AbstractTest.php @@ -15,7 +15,7 @@ declare(strict_types=1); -namespace unit\Mage\Core\Model\Email\Template; +namespace OpenMage\Tests\Unit\Mage\Core\Model\Email\Template; use Mage_Core_Model_Email_Template_Abstract as Subject; use OpenMage\Tests\Unit\OpenMageTest; diff --git a/tests/unit/Mage/Reports/Helper/DataTest.php b/tests/unit/Mage/Reports/Helper/DataTest.php index a89fe81a1b6..5c67c08323e 100644 --- a/tests/unit/Mage/Reports/Helper/DataTest.php +++ b/tests/unit/Mage/Reports/Helper/DataTest.php @@ -60,7 +60,7 @@ public function testIsReportsEnabled(): void * @dataProvider provideReportsDateIntervals * @group Helper */ - public function testGetIntervals(int $expectedResult, string $from, string $to, string $period): void + public function testGetIntervals(int|string $expectedResult, string $from, string $to, string $period): void { if (PHP_VERSION_ID >= 80300 && version_compare(InstalledVersions::getPrettyVersion('shardj/zf1-future'), '1.24.2', '<=')) { static::markTestSkipped('see https://github.com/Shardj/zf1-future/pull/465'); @@ -76,13 +76,15 @@ public function testGetIntervals(int $expectedResult, string $from, string $to, /** * @covers Mage_Reports_Helper_Data::prepareIntervalsCollection() * @dataProvider provideReportsDateIntervals - * @doesNotPerformAssertions * @group Helper */ public function testPrepareIntervalsCollection(int|string $expectedResult, string $from, string $to, string $period): void { + $collection = new Varien_Data_Collection(); + try { - self::$subject->prepareIntervalsCollection(new Varien_Data_Collection(), $from, $to, $period); + self::$subject->prepareIntervalsCollection($collection, $from, $to, $period); + static::assertGreaterThanOrEqual(0, $collection->count()); } catch (\Zend_Date_Exception $exception) { static::assertSame($expectedResult, $exception->getMessage()); } diff --git a/tests/unit/Mage/Reports/Model/Resource/Report/CollectionTest.php b/tests/unit/Mage/Reports/Model/Resource/Report/CollectionTest.php index aac79be1a6a..17b63dad8a2 100644 --- a/tests/unit/Mage/Reports/Model/Resource/Report/CollectionTest.php +++ b/tests/unit/Mage/Reports/Model/Resource/Report/CollectionTest.php @@ -60,7 +60,7 @@ public function testSetIntervals(): void * @dataProvider provideReportsDateIntervals * @group Model */ - public function testGetIntervals(int $expectedResult, string|Zend_Date $from, string|Zend_Date $to, string $period): void + public function testGetIntervals(int|string $expectedResult, string|Zend_Date $from, string|Zend_Date $to, string $period): void { self::$subject->setInterval($from, $to); self::$subject->setPeriod($period); diff --git a/tests/unit/Traits/DataProvider/Mage/Core/Helper/ArrayTrait.php b/tests/unit/Traits/DataProvider/Mage/Core/Helper/ArrayTrait.php new file mode 100644 index 00000000000..c8ebb006876 --- /dev/null +++ b/tests/unit/Traits/DataProvider/Mage/Core/Helper/ArrayTrait.php @@ -0,0 +1,85 @@ + [ + [], + [], + [], + ]; + yield 'with base array' => [ + ['a' => 1], + ['a' => 1], + [], + ]; + yield 'with merge array' => [ + ['b' => 1], + [], + ['b' => 1], + ]; + yield 'with base & merge array' => [ + [ + 'a' => 1, + 'b' => 1, + ], + ['a' => 1], + ['b' => 1], + ]; + yield 'with nested merge array' => [ + [ + 'a' => 1, + 'b' => [ + 'c' => 1, + ], + ], + [], + [ + 'a' => 1, + 'b' => [ + 'c' => 1, + ], + ], + ]; + + yield 'with nested base & nested merge array' => [ + [ + 'a' => 1, + 'b' => [ + 'c' => 1, + ], + ], + [ + 'a' => [ + 'b' => 1, + ], + ], + [ + 'a' => 1, + 'b' => [ + 'c' => 1, + ], + ], + ]; + } +} From a1f65c25f4fc64d562e2cf1a516558ebcb8672ff Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Thu, 17 Apr 2025 02:49:20 +0200 Subject: [PATCH 07/36] updated tests --- .../DataProvider/Mage/Cms/Block/Widget/Page/LinkTrait.php | 8 ++++---- .../Traits/DataProvider/Mage/Reports/ReportsTrait.php | 7 ------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/tests/unit/Traits/DataProvider/Mage/Cms/Block/Widget/Page/LinkTrait.php b/tests/unit/Traits/DataProvider/Mage/Cms/Block/Widget/Page/LinkTrait.php index a2da8225077..bfe807539fa 100644 --- a/tests/unit/Traits/DataProvider/Mage/Cms/Block/Widget/Page/LinkTrait.php +++ b/tests/unit/Traits/DataProvider/Mage/Cms/Block/Widget/Page/LinkTrait.php @@ -72,14 +72,14 @@ public function provideGetTitleData(): Generator $data = $emptyData; $data['page_id'] = 1; yield 'page_id is set' => [ - '404 Not Found', + '404 Not Found 1', $data, ]; $data = $emptyData; $data['href'] = 'home'; yield 'href is set' => [ - 'Madison Island', + 'Home page', $data, ]; @@ -120,14 +120,14 @@ public function provideGetAnchorTextData(): Generator $data = $emptyData; $data['page_id'] = 1; yield 'page_id is set' => [ - '404 Not Found', + '404 Not Found 1', $data, ]; $data = $emptyData; $data['href'] = 'home'; yield 'href is set' => [ - 'Madison Island', + 'Home page', $data, ]; diff --git a/tests/unit/Traits/DataProvider/Mage/Reports/ReportsTrait.php b/tests/unit/Traits/DataProvider/Mage/Reports/ReportsTrait.php index bafa044b0c7..81036d15f45 100644 --- a/tests/unit/Traits/DataProvider/Mage/Reports/ReportsTrait.php +++ b/tests/unit/Traits/DataProvider/Mage/Reports/ReportsTrait.php @@ -43,13 +43,6 @@ public function provideReportsDateIntervals(): Generator Mage_Reports_Helper_Data::REPORT_PERIOD_TYPE_DAY, ]; - yield $prefix . 'no to' => [ - 'No date part in \'\' found.', - self::$dateFirstDay, - '', - Mage_Reports_Helper_Data::REPORT_PERIOD_TYPE_DAY, - ]; - if (!defined('DATA_MAY_CHANGED')) { yield $prefix . 'no to' => [ 0, From ac3a95632076b6c56d1772165ab13bc81ba2fee4 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Thu, 17 Apr 2025 03:11:56 +0200 Subject: [PATCH 08/36] updated tests --- .../unit/Traits/DataProvider/Mage/Reports/ReportsTrait.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/unit/Traits/DataProvider/Mage/Reports/ReportsTrait.php b/tests/unit/Traits/DataProvider/Mage/Reports/ReportsTrait.php index 81036d15f45..9160997db28 100644 --- a/tests/unit/Traits/DataProvider/Mage/Reports/ReportsTrait.php +++ b/tests/unit/Traits/DataProvider/Mage/Reports/ReportsTrait.php @@ -50,6 +50,13 @@ public function provideReportsDateIntervals(): Generator '', Mage_Reports_Helper_Data::REPORT_PERIOD_TYPE_DAY, ]; + } else { + yield $prefix . 'no to' => [ + 'No date part in \'\' found.', + self::$dateFirstDay, + '', + Mage_Reports_Helper_Data::REPORT_PERIOD_TYPE_DAY, + ]; } yield $prefix . 'same day' => [ From 8395a83fd74fa2e80f0b39fb4d74e313288c5b2f Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Thu, 17 Apr 2025 03:37:28 +0200 Subject: [PATCH 09/36] updated tests --- .../Mage/Reports/ReportsTrait.php | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/tests/unit/Traits/DataProvider/Mage/Reports/ReportsTrait.php b/tests/unit/Traits/DataProvider/Mage/Reports/ReportsTrait.php index 9160997db28..758bee177e2 100644 --- a/tests/unit/Traits/DataProvider/Mage/Reports/ReportsTrait.php +++ b/tests/unit/Traits/DataProvider/Mage/Reports/ReportsTrait.php @@ -43,21 +43,12 @@ public function provideReportsDateIntervals(): Generator Mage_Reports_Helper_Data::REPORT_PERIOD_TYPE_DAY, ]; - if (!defined('DATA_MAY_CHANGED')) { - yield $prefix . 'no to' => [ - 0, - self::$dateFirstDay, - '', - Mage_Reports_Helper_Data::REPORT_PERIOD_TYPE_DAY, - ]; - } else { - yield $prefix . 'no to' => [ - 'No date part in \'\' found.', - self::$dateFirstDay, - '', - Mage_Reports_Helper_Data::REPORT_PERIOD_TYPE_DAY, - ]; - } + yield $prefix . 'no to' => [ + 'No date part in \'\' found.', + self::$dateFirstDay, + '', + Mage_Reports_Helper_Data::REPORT_PERIOD_TYPE_DAY, + ]; yield $prefix . 'same day' => [ 1, From d30e9f52027fd983f5ef9222dc87eea29fcac252 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Thu, 17 Apr 2025 04:27:33 +0200 Subject: [PATCH 10/36] updated tests --- app/code/core/Mage/Index/Model/Indexer.php | 2 +- tests/unit/Mage/Admin/Model/BlockTest.php | 2 +- tests/unit/Mage/Admin/Model/ConfigTest.php | 2 +- tests/unit/Mage/Admin/Model/UserTest.php | 18 +-- tests/unit/Mage/Admin/Model/VariableTest.php | 2 +- .../Mage/AdminNotification/Model/FeedTest.php | 2 +- .../AdminNotification/Model/InboxTest.php | 12 +- .../Block/Customer/Edit/Tab/AddressesTest.php | 4 +- .../Customer/Edit/Tab/NewsletterTest.php | 4 +- .../Block/System/Cache/Form/FormTest.php | 2 +- .../Block/System/Config/Form/FormTest.php | 2 +- .../System/Convert/Gui/Edit/Tab/ViewTest.php | 4 +- .../Convert/Profile/Edit/Tab/EditTest.php | 4 +- .../Mage/Adminhtml/Helper/CatalogTest.php | 4 +- tests/unit/Mage/Api/Model/UserTest.php | 2 +- .../unit/Mage/Catalog/Model/CategoryTest.php | 2 +- .../Model/Product/Option/Type/TextTest.php | 2 +- tests/unit/Mage/Catalog/Model/ProductTest.php | 6 +- tests/unit/Mage/Catalog/Model/UrlTest.php | 2 +- tests/unit/Mage/Cms/Block/BlockTest.php | 10 +- tests/unit/Mage/Cms/Block/PageTest.php | 10 +- .../unit/Mage/Cms/Block/Widget/BlockTest.php | 2 +- tests/unit/Mage/Cms/Model/PageTest.php | 4 +- tests/unit/Mage/Core/Model/WebsiteTest.php | 8 +- .../Model/Convert/Adapter/CustomerTest.php | 2 +- .../unit/Mage/Customer/Model/CustomerTest.php | 2 +- tests/unit/Mage/Index/Model/IndexerTest.php | 116 ++++++++++++++++++ tests/unit/Mage/Index/Model/ProcessTest.php | 6 +- tests/unit/Mage/Log/Model/CronTest.php | 2 +- tests/unit/Mage/Log/Model/CustomerTest.php | 2 +- tests/unit/Mage/Log/Model/LogTest.php | 2 +- tests/unit/Mage/Log/Model/VisitorTest.php | 2 +- .../Mage/Newsletter/Model/TemplateTest.php | 2 +- tests/unit/Mage/Page/Block/Html/HeadTest.php | 10 +- .../unit/Mage/Page/Block/Html/HeaderTest.php | 2 +- .../Model/Resource/Report/CollectionTest.php | 8 +- tests/unit/Mage/Review/Model/ReviewTest.php | 2 +- tests/unit/Mage/Rule/Model/AbstractTest.php | 6 +- .../unit/Mage/Rule/Model/EnvironmentTest.php | 2 +- .../Block/Order/Item/Renderer/DefaultTest.php | 2 +- tests/unit/Mage/Sitemap/Model/SitemapTest.php | 6 +- tests/unit/Mage/Uploader/Helper/FileTest.php | 4 +- 42 files changed, 211 insertions(+), 79 deletions(-) create mode 100644 tests/unit/Mage/Index/Model/IndexerTest.php diff --git a/app/code/core/Mage/Index/Model/Indexer.php b/app/code/core/Mage/Index/Model/Indexer.php index d2aec7c6948..92b8672b159 100644 --- a/app/code/core/Mage/Index/Model/Indexer.php +++ b/app/code/core/Mage/Index/Model/Indexer.php @@ -84,7 +84,7 @@ public function getProcessesCollection() * Get index process by specific id * * @param int $processId - * @return Mage_Index_Model_Process | false + * @return Mage_Index_Model_Process|false */ public function getProcessById($processId) { diff --git a/tests/unit/Mage/Admin/Model/BlockTest.php b/tests/unit/Mage/Admin/Model/BlockTest.php index 7a19854ae86..7320f1db427 100644 --- a/tests/unit/Mage/Admin/Model/BlockTest.php +++ b/tests/unit/Mage/Admin/Model/BlockTest.php @@ -46,7 +46,7 @@ public function testValidate(bool|array $expectedResult, array $methods): void { $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(Subject::class, $mock); + static::assertInstanceOf(self::$subject::class, $mock); static::assertEquals($expectedResult, $mock->validate()); } diff --git a/tests/unit/Mage/Admin/Model/ConfigTest.php b/tests/unit/Mage/Admin/Model/ConfigTest.php index 71cdd96c7e0..3513af330cf 100644 --- a/tests/unit/Mage/Admin/Model/ConfigTest.php +++ b/tests/unit/Mage/Admin/Model/ConfigTest.php @@ -54,7 +54,7 @@ public function testGetAclPrivilegeSet(): void */ public function testLoadAclResources(): void { - static::assertInstanceOf(Subject::class, self::$subject->loadAclResources(new Mage_Admin_Model_Acl())); + static::assertInstanceOf(self::$subject::class, self::$subject->loadAclResources(new Mage_Admin_Model_Acl())); } /** diff --git a/tests/unit/Mage/Admin/Model/UserTest.php b/tests/unit/Mage/Admin/Model/UserTest.php index ddcb6d56f19..937a4eb5bdb 100644 --- a/tests/unit/Mage/Admin/Model/UserTest.php +++ b/tests/unit/Mage/Admin/Model/UserTest.php @@ -47,7 +47,7 @@ public function testAuthenticate(bool|string $expectedResult, array $methods): v $methods = array_merge($defaultMethods, $methods); $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(Subject::class, $mock); + static::assertInstanceOf(self::$subject::class, $mock); try { static::assertSame($expectedResult, $mock->authenticate($methods['getUsername'], $methods['getPassword'])); @@ -65,7 +65,7 @@ public function testValidate($expectedResult, array $methods): void { $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(Subject::class, $mock); + static::assertInstanceOf(self::$subject::class, $mock); static::assertSame($expectedResult, $mock->validate()); } @@ -85,7 +85,7 @@ public function testValidateCurrentPassword(): void */ public function testLoadByUsername(): void { - static::assertInstanceOf(Subject::class, self::$subject->loadByUsername('invalid-user')); + static::assertInstanceOf(self::$subject::class, self::$subject->loadByUsername('invalid-user')); } /** @@ -101,7 +101,7 @@ public function testHasAssigned2Role(): void */ public function testChangeResetPasswordLinkToken(): void { - static::assertInstanceOf(Subject::class, self::$subject->changeResetPasswordLinkToken('123')); + static::assertInstanceOf(self::$subject::class, self::$subject->changeResetPasswordLinkToken('123')); } /** @@ -112,7 +112,7 @@ public function testIsResetPasswordLinkTokenExpired(bool $expectedResult, array { $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(Subject::class, $mock); + static::assertInstanceOf(self::$subject::class, $mock); static::assertSame($expectedResult, $mock->isResetPasswordLinkTokenExpired()); } @@ -121,7 +121,7 @@ public function testIsResetPasswordLinkTokenExpired(bool $expectedResult, array */ public function testSendPasswordResetConfirmationEmail(): void { - static::assertInstanceOf(Subject::class, self::$subject->sendPasswordResetConfirmationEmail()); + static::assertInstanceOf(self::$subject::class, self::$subject->sendPasswordResetConfirmationEmail()); } /** @@ -150,7 +150,7 @@ public function testGetMinAdminPasswordLength(): void $methods = ['getStoreConfigAsInt' => 10]; $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(Subject::class, $mock); + static::assertInstanceOf(self::$subject::class, $mock); static::assertSame(14, $mock->getMinAdminPasswordLength()); } @@ -162,7 +162,7 @@ public function testSendAdminNotification(): void $methods = ['getUserCreateAdditionalEmail' => ['test@example.com']]; $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(Subject::class, $mock); - static::assertInstanceOf(Subject::class, $mock->sendAdminNotification(self::$subject)); + static::assertInstanceOf(self::$subject::class, $mock); + static::assertInstanceOf(self::$subject::class, $mock->sendAdminNotification(self::$subject)); } } diff --git a/tests/unit/Mage/Admin/Model/VariableTest.php b/tests/unit/Mage/Admin/Model/VariableTest.php index c9b9adf9539..0fd7aeed0fe 100644 --- a/tests/unit/Mage/Admin/Model/VariableTest.php +++ b/tests/unit/Mage/Admin/Model/VariableTest.php @@ -44,7 +44,7 @@ public function testValidate(bool|array $expectedResult, array $methods): void { $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(Subject::class, $mock); + static::assertInstanceOf(self::$subject::class, $mock); static::assertSame($expectedResult, $mock->validate()); } diff --git a/tests/unit/Mage/AdminNotification/Model/FeedTest.php b/tests/unit/Mage/AdminNotification/Model/FeedTest.php index 7d2b782dbff..f7bd574cea4 100644 --- a/tests/unit/Mage/AdminNotification/Model/FeedTest.php +++ b/tests/unit/Mage/AdminNotification/Model/FeedTest.php @@ -44,7 +44,7 @@ public function testGetFeedUrl(): void */ public function testCheckUpdate(): void { - static::assertInstanceOf(Subject::class, self::$subject->checkUpdate()); + static::assertInstanceOf(self::$subject::class, self::$subject->checkUpdate()); } /** diff --git a/tests/unit/Mage/AdminNotification/Model/InboxTest.php b/tests/unit/Mage/AdminNotification/Model/InboxTest.php index 2568546f08d..63c0cd6a04d 100644 --- a/tests/unit/Mage/AdminNotification/Model/InboxTest.php +++ b/tests/unit/Mage/AdminNotification/Model/InboxTest.php @@ -54,7 +54,7 @@ public function testGetSeverities(array|string|null $expectedResult, ?int $sever public function testLoadLatestNotice(bool $delete = false): void { $result = self::$subject->loadLatestNotice(); - static::assertInstanceOf(Subject::class, $result); + static::assertInstanceOf(self::$subject::class, $result); if ($delete) { $result->delete(); } @@ -65,7 +65,7 @@ public function testLoadLatestNotice(bool $delete = false): void */ public function testAdd(): void { - static::assertInstanceOf(Subject::class, self::$subject->add( + static::assertInstanceOf(self::$subject::class, self::$subject->add( Subject::SEVERITY_CRITICAL, self::TITLE, [__METHOD__], @@ -93,7 +93,7 @@ public function testAddException(): void */ public function testAddCritical(): void { - static::assertInstanceOf(Subject::class, self::$subject->addCritical(self::TITLE, __METHOD__)); + static::assertInstanceOf(self::$subject::class, self::$subject->addCritical(self::TITLE, __METHOD__)); $this->testLoadLatestNotice(true); } @@ -103,7 +103,7 @@ public function testAddCritical(): void */ public function testAddMajor(): void { - static::assertInstanceOf(Subject::class, self::$subject->addMajor(self::TITLE, __METHOD__)); + static::assertInstanceOf(self::$subject::class, self::$subject->addMajor(self::TITLE, __METHOD__)); $this->testLoadLatestNotice(true); } @@ -113,7 +113,7 @@ public function testAddMajor(): void */ public function testAddMinor(): void { - static::assertInstanceOf(Subject::class, self::$subject->addMinor(self::TITLE, __METHOD__)); + static::assertInstanceOf(self::$subject::class, self::$subject->addMinor(self::TITLE, __METHOD__)); $this->testLoadLatestNotice(true); } @@ -123,7 +123,7 @@ public function testAddMinor(): void */ public function testAddNotice(): void { - static::assertInstanceOf(Subject::class, self::$subject->addNotice(self::TITLE, __METHOD__)); + static::assertInstanceOf(self::$subject::class, self::$subject->addNotice(self::TITLE, __METHOD__)); $this->testLoadLatestNotice(true); } } diff --git a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php index 0ac61dec3f4..caae208b106 100644 --- a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php +++ b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php @@ -45,7 +45,7 @@ public function testInitForm(): void ]; $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(Subject::class, $mock); - static::assertInstanceOf(Subject::class, $mock->initForm()); + static::assertInstanceOf(self::$subject::class, $mock); + static::assertInstanceOf(self::$subject::class, $mock->initForm()); } } diff --git a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php index 6448b429e8f..278805a80ac 100644 --- a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php +++ b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php @@ -44,7 +44,7 @@ public function testInitForm(): void ]; $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(Subject::class, $mock); - static::assertInstanceOf(Subject::class, $mock->initForm()); + static::assertInstanceOf(self::$subject::class, $mock); + static::assertInstanceOf(self::$subject::class, $mock->initForm()); } } diff --git a/tests/unit/Mage/Adminhtml/Block/System/Cache/Form/FormTest.php b/tests/unit/Mage/Adminhtml/Block/System/Cache/Form/FormTest.php index 7b0732129cc..7e79bbfb489 100644 --- a/tests/unit/Mage/Adminhtml/Block/System/Cache/Form/FormTest.php +++ b/tests/unit/Mage/Adminhtml/Block/System/Cache/Form/FormTest.php @@ -36,6 +36,6 @@ public static function setUpBeforeClass(): void */ public function testInitForm(): void { - static::assertInstanceOf(Subject::class, self::$subject->initForm()); + static::assertInstanceOf(self::$subject::class, self::$subject->initForm()); } } diff --git a/tests/unit/Mage/Adminhtml/Block/System/Config/Form/FormTest.php b/tests/unit/Mage/Adminhtml/Block/System/Config/Form/FormTest.php index 8b8f8afa8dc..1415121e6b0 100644 --- a/tests/unit/Mage/Adminhtml/Block/System/Config/Form/FormTest.php +++ b/tests/unit/Mage/Adminhtml/Block/System/Config/Form/FormTest.php @@ -36,6 +36,6 @@ public static function setUpBeforeClass(): void */ public function testInitForm(): void { - static::assertInstanceOf(Subject::class, self::$subject->initForm()); + static::assertInstanceOf(self::$subject::class, self::$subject->initForm()); } } diff --git a/tests/unit/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/ViewTest.php b/tests/unit/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/ViewTest.php index 8735cec6c50..d906d6a8f75 100644 --- a/tests/unit/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/ViewTest.php +++ b/tests/unit/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/ViewTest.php @@ -42,7 +42,7 @@ public function testInitForm(): void ]; $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(Subject::class, $mock); - static::assertInstanceOf(Subject::class, $mock->initForm()); + static::assertInstanceOf(self::$subject::class, $mock); + static::assertInstanceOf(self::$subject::class, $mock->initForm()); } } diff --git a/tests/unit/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/EditTest.php b/tests/unit/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/EditTest.php index 81f87e18cfe..e9fe44d2016 100644 --- a/tests/unit/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/EditTest.php +++ b/tests/unit/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/EditTest.php @@ -42,7 +42,7 @@ public function testInitForm(): void ]; $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(Subject::class, $mock); - static::assertInstanceOf(Subject::class, $mock->initForm()); + static::assertInstanceOf(self::$subject::class, $mock); + static::assertInstanceOf(self::$subject::class, $mock->initForm()); } } diff --git a/tests/unit/Mage/Adminhtml/Helper/CatalogTest.php b/tests/unit/Mage/Adminhtml/Helper/CatalogTest.php index 2cc0f4c8ec5..70862ae1b12 100644 --- a/tests/unit/Mage/Adminhtml/Helper/CatalogTest.php +++ b/tests/unit/Mage/Adminhtml/Helper/CatalogTest.php @@ -37,7 +37,7 @@ public static function setUpBeforeClass(): void */ public function testSetAttributeTabBlock(): void { - static::assertInstanceOf(Subject::class, self::$subject->setAttributeTabBlock('')); + static::assertInstanceOf(self::$subject::class, self::$subject->setAttributeTabBlock('')); } /** @@ -46,7 +46,7 @@ public function testSetAttributeTabBlock(): void */ public function testSetCategoryAttributeTabBlock(): void { - static::assertInstanceOf(Subject::class, self::$subject->setCategoryAttributeTabBlock('')); + static::assertInstanceOf(self::$subject::class, self::$subject->setCategoryAttributeTabBlock('')); } /** diff --git a/tests/unit/Mage/Api/Model/UserTest.php b/tests/unit/Mage/Api/Model/UserTest.php index 6bb40c2543f..1dd8e9173fe 100644 --- a/tests/unit/Mage/Api/Model/UserTest.php +++ b/tests/unit/Mage/Api/Model/UserTest.php @@ -44,7 +44,7 @@ public function testValidate($expectedResult, array $methods): void { $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(Subject::class, $mock); + static::assertInstanceOf(self::$subject::class, $mock); static::assertSame($expectedResult, $mock->validate()); } } diff --git a/tests/unit/Mage/Catalog/Model/CategoryTest.php b/tests/unit/Mage/Catalog/Model/CategoryTest.php index 80612fc2068..a25df0f5b4e 100644 --- a/tests/unit/Mage/Catalog/Model/CategoryTest.php +++ b/tests/unit/Mage/Catalog/Model/CategoryTest.php @@ -82,7 +82,7 @@ public function testValidate(): void */ public function testAfterCommitCallback(): void { - static::assertInstanceOf(Subject::class, self::$subject->afterCommitCallback()); + static::assertInstanceOf(self::$subject::class, self::$subject->afterCommitCallback()); } /** diff --git a/tests/unit/Mage/Catalog/Model/Product/Option/Type/TextTest.php b/tests/unit/Mage/Catalog/Model/Product/Option/Type/TextTest.php index a68f9d3b53f..0b3ee8a32c2 100644 --- a/tests/unit/Mage/Catalog/Model/Product/Option/Type/TextTest.php +++ b/tests/unit/Mage/Catalog/Model/Product/Option/Type/TextTest.php @@ -41,7 +41,7 @@ public static function setUpBeforeClass(): void public function testValidateUserValue(): void { self::$subject->setOption(new Mage_Catalog_Model_Product_Option()); - static::assertInstanceOf(Subject::class, self::$subject->validateUserValue([])); + static::assertInstanceOf(self::$subject::class, self::$subject->validateUserValue([])); } diff --git a/tests/unit/Mage/Catalog/Model/ProductTest.php b/tests/unit/Mage/Catalog/Model/ProductTest.php index 9f416fc1d43..e5255b17b6e 100644 --- a/tests/unit/Mage/Catalog/Model/ProductTest.php +++ b/tests/unit/Mage/Catalog/Model/ProductTest.php @@ -71,7 +71,7 @@ public function testGetUrlModel(): void */ public function testValidate(): void { - static::assertInstanceOf(Subject::class, self::$subject->validate()); + static::assertInstanceOf(self::$subject::class, self::$subject->validate()); } /** @@ -96,7 +96,7 @@ public function testValidate(): void */ public function testSetPriceCalculation(): void { - static::assertInstanceOf(Subject::class, self::$subject->setPriceCalculation()); + static::assertInstanceOf(self::$subject::class, self::$subject->setPriceCalculation()); } /** @@ -145,7 +145,7 @@ public function testGetDefaultAttributeSetId(): void */ public function testAfterCommitCallback(): void { - static::assertInstanceOf(Subject::class, self::$subject->afterCommitCallback()); + static::assertInstanceOf(self::$subject::class, self::$subject->afterCommitCallback()); } /** diff --git a/tests/unit/Mage/Catalog/Model/UrlTest.php b/tests/unit/Mage/Catalog/Model/UrlTest.php index 3ebf93234c2..ba251113f6e 100644 --- a/tests/unit/Mage/Catalog/Model/UrlTest.php +++ b/tests/unit/Mage/Catalog/Model/UrlTest.php @@ -54,7 +54,7 @@ public function testGetStoreRootCategory(): void */ public function testRefreshRewrites(?int $storeId): void { - static::assertInstanceOf(Subject::class, self::$subject->refreshRewrites($storeId)); + static::assertInstanceOf(self::$subject::class, self::$subject->refreshRewrites($storeId)); } /** diff --git a/tests/unit/Mage/Cms/Block/BlockTest.php b/tests/unit/Mage/Cms/Block/BlockTest.php index 62823b5b3ab..108ba35abf5 100644 --- a/tests/unit/Mage/Cms/Block/BlockTest.php +++ b/tests/unit/Mage/Cms/Block/BlockTest.php @@ -25,6 +25,14 @@ class BlockTest extends OpenMageTest { use NumericStringTrait; + private static Subject $subject; + + public static function setUpBeforeClass(): void + { + parent::setUpBeforeClass(); + self::$subject = new Subject(); + } + /** * @dataProvider provideNumericString * @group Block @@ -36,7 +44,7 @@ public function testGetCacheKeyInfo(string $blockId): void ]; $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(Subject::class, $mock); + static::assertInstanceOf(self::$subject::class, $mock); static::assertIsArray($mock->getCacheKeyInfo()); } } diff --git a/tests/unit/Mage/Cms/Block/PageTest.php b/tests/unit/Mage/Cms/Block/PageTest.php index 0bfd939f594..b7c7ccba117 100644 --- a/tests/unit/Mage/Cms/Block/PageTest.php +++ b/tests/unit/Mage/Cms/Block/PageTest.php @@ -26,6 +26,14 @@ class PageTest extends OpenMageTest { use NumericStringTrait; + private static Subject $subject; + + public static function setUpBeforeClass(): void + { + parent::setUpBeforeClass(); + self::$subject = new Subject(); + } + /** * @dataProvider provideNumericString * @group Block @@ -37,7 +45,7 @@ public function testGetPage(string $pageId): void ]; $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(Subject::class, $mock); + static::assertInstanceOf(self::$subject::class, $mock); static::assertInstanceOf(Mage_Cms_Model_Page::class, $mock->getPage()); } } diff --git a/tests/unit/Mage/Cms/Block/Widget/BlockTest.php b/tests/unit/Mage/Cms/Block/Widget/BlockTest.php index 703577e4be1..ba3d5c30654 100644 --- a/tests/unit/Mage/Cms/Block/Widget/BlockTest.php +++ b/tests/unit/Mage/Cms/Block/Widget/BlockTest.php @@ -44,7 +44,7 @@ public function testGetCacheKeyInfo(string $blockId): void ]; $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(Subject::class, $mock); + static::assertInstanceOf(self::$subject::class, $mock); static::assertIsArray($mock->getCacheKeyInfo()); } diff --git a/tests/unit/Mage/Cms/Model/PageTest.php b/tests/unit/Mage/Cms/Model/PageTest.php index 22d8aa2b616..6e49247682b 100644 --- a/tests/unit/Mage/Cms/Model/PageTest.php +++ b/tests/unit/Mage/Cms/Model/PageTest.php @@ -38,8 +38,8 @@ public function setUp(): void */ public function testLoad(): void { - static::assertInstanceOf(Subject::class, self::$subject->load(null)); - static::assertInstanceOf(Subject::class, self::$subject->load(2)); + static::assertInstanceOf(self::$subject::class, self::$subject->load(null)); + static::assertInstanceOf(self::$subject::class, self::$subject->load(2)); } /** diff --git a/tests/unit/Mage/Core/Model/WebsiteTest.php b/tests/unit/Mage/Core/Model/WebsiteTest.php index b8c8c9f4d57..a3bd8d62d73 100644 --- a/tests/unit/Mage/Core/Model/WebsiteTest.php +++ b/tests/unit/Mage/Core/Model/WebsiteTest.php @@ -40,8 +40,8 @@ public static function setUpBeforeClass(): void */ public function testLoad(): void { - static::assertInstanceOf(Subject::class, self::$subject->load(1)); - static::assertInstanceOf(Subject::class, self::$subject->load('default')); + static::assertInstanceOf(self::$subject::class, self::$subject->load(1)); + static::assertInstanceOf(self::$subject::class, self::$subject->load('default')); } /** @@ -49,8 +49,8 @@ public function testLoad(): void */ public function testLoadConfig(): void { - static::assertInstanceOf(Subject::class, self::$subject->loadConfig('1')); - static::assertInstanceOf(Subject::class, self::$subject->loadConfig('default')); + static::assertInstanceOf(self::$subject::class, self::$subject->loadConfig('1')); + static::assertInstanceOf(self::$subject::class, self::$subject->loadConfig('default')); } /** diff --git a/tests/unit/Mage/Customer/Model/Convert/Adapter/CustomerTest.php b/tests/unit/Mage/Customer/Model/Convert/Adapter/CustomerTest.php index 7da21d1f4fc..21f75ad1908 100644 --- a/tests/unit/Mage/Customer/Model/Convert/Adapter/CustomerTest.php +++ b/tests/unit/Mage/Customer/Model/Convert/Adapter/CustomerTest.php @@ -143,6 +143,6 @@ public function testSaveRow(): void 'firstname' => 'John', 'lastname' => 'Doe', ]; - static::assertInstanceOf(Subject::class, self::$subject->saveRow($data)); + static::assertInstanceOf(self::$subject::class, self::$subject->saveRow($data)); } } diff --git a/tests/unit/Mage/Customer/Model/CustomerTest.php b/tests/unit/Mage/Customer/Model/CustomerTest.php index d1c5a72c314..093eddabc4a 100644 --- a/tests/unit/Mage/Customer/Model/CustomerTest.php +++ b/tests/unit/Mage/Customer/Model/CustomerTest.php @@ -46,7 +46,7 @@ public function testValidate($expectedResult, array $methods): void { $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(Subject::class, $mock); + static::assertInstanceOf(self::$subject::class, $mock); static::assertSame($expectedResult, $mock->validate()); } } diff --git a/tests/unit/Mage/Index/Model/IndexerTest.php b/tests/unit/Mage/Index/Model/IndexerTest.php new file mode 100644 index 00000000000..666dfd04964 --- /dev/null +++ b/tests/unit/Mage/Index/Model/IndexerTest.php @@ -0,0 +1,116 @@ +getProcessesCollection()); + } + + /** + * @covers Mage_Index_Model_Indexer::hasErrors() + * @group Model + */ + public function testHasErrors(): void + { + static::assertIsBool(self::$subject->hasErrors()); + } + + /** + * @covers Mage_Index_Model_Indexer::getErrors() + * @group Model + */ + public function testGetErrors(): void + { + static::assertIsArray(self::$subject->getErrors()); + } + + /** + * @covers Mage_Index_Model_Indexer::lockIndexer() + * @group Model + */ + public function testLockIndexer(): void + { + static::assertInstanceOf(self::$subject::class, self::$subject->lockIndexer()); + } + + /** + * @covers Mage_Index_Model_Indexer::unlockIndexer() + * @group Model + */ + public function testUnlockIndexer(): void + { + static::assertInstanceOf(self::$subject::class, self::$subject->unlockIndexer()); + } + + /** + * @group Model + */ + public function testIndexEvent(): void + { + $event = new Mage_Index_Model_Event(); + static::assertInstanceOf(self::$subject::class, self::$subject->indexEvent($event)); + } + + /** + * @group Model + */ + public function testRegisterEvent(): void + { + $event = new Mage_Index_Model_Event(); + static::assertInstanceOf(self::$subject::class, self::$subject->registerEvent($event)); + } + + /** + * @covers Mage_Index_Model_Indexer::allowTableChanges() + * @group Model + */ + public function testAllowTableChanges(): void + { + static::assertInstanceOf(self::$subject::class, self::$subject->allowTableChanges()); + } + + /** + * @covers Mage_Index_Model_Indexer::disallowTableChanges() + * @group Model + */ + public function testDisallowTableChanges(): void + { + static::assertInstanceOf(self::$subject::class, self::$subject->disallowTableChanges()); + } +} diff --git a/tests/unit/Mage/Index/Model/ProcessTest.php b/tests/unit/Mage/Index/Model/ProcessTest.php index 239841545be..8b94b15afda 100644 --- a/tests/unit/Mage/Index/Model/ProcessTest.php +++ b/tests/unit/Mage/Index/Model/ProcessTest.php @@ -43,7 +43,7 @@ public function testReindexEverything(): void self::$subject->setIndexerCode('html'); try { - static::assertInstanceOf(Subject::class, self::$subject->reindexEverything()); + static::assertInstanceOf(self::$subject::class, self::$subject->reindexEverything()); } catch (Mage_Core_Exception $exception) { static::assertSame(self::INDEXER_MODEL_IS_NOT_DEFINED, $exception->getMessage()); } @@ -57,7 +57,7 @@ public function testDisableIndexerKeys(): void self::$subject->setIndexerCode('html'); try { - static::assertInstanceOf(Subject::class, self::$subject->disableIndexerKeys()); + static::assertInstanceOf(self::$subject::class, self::$subject->disableIndexerKeys()); } catch (Mage_Core_Exception $exception) { static::assertSame(self::INDEXER_MODEL_IS_NOT_DEFINED, $exception->getMessage()); } @@ -72,7 +72,7 @@ public function testEnableIndexerKeys(): void self::$subject->setIndexerCode('html'); try { - static::assertInstanceOf(Subject::class, self::$subject->enableIndexerKeys()); + static::assertInstanceOf(self::$subject::class, self::$subject->enableIndexerKeys()); } catch (Mage_Core_Exception $exception) { static::assertSame(self::INDEXER_MODEL_IS_NOT_DEFINED, $exception->getMessage()); } diff --git a/tests/unit/Mage/Log/Model/CronTest.php b/tests/unit/Mage/Log/Model/CronTest.php index 9cf15664db4..1dc9d3c3355 100644 --- a/tests/unit/Mage/Log/Model/CronTest.php +++ b/tests/unit/Mage/Log/Model/CronTest.php @@ -36,6 +36,6 @@ public static function setUpBeforeClass(): void */ public function testLogClean(): void { - static::assertInstanceOf(Subject::class, self::$subject->logClean()); + static::assertInstanceOf(self::$subject::class, self::$subject->logClean()); } } diff --git a/tests/unit/Mage/Log/Model/CustomerTest.php b/tests/unit/Mage/Log/Model/CustomerTest.php index c4977334ec9..ede2668717f 100644 --- a/tests/unit/Mage/Log/Model/CustomerTest.php +++ b/tests/unit/Mage/Log/Model/CustomerTest.php @@ -82,7 +82,7 @@ public function testGetLoginAtTimestamp(bool $expectedResult, array $methods): v { $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(Subject::class, $mock); + static::assertInstanceOf(self::$subject::class, $mock); if ($expectedResult) { static::assertIsInt($mock->getLoginAtTimestamp()); } else { diff --git a/tests/unit/Mage/Log/Model/LogTest.php b/tests/unit/Mage/Log/Model/LogTest.php index df147bcb4ea..985ed44ed53 100644 --- a/tests/unit/Mage/Log/Model/LogTest.php +++ b/tests/unit/Mage/Log/Model/LogTest.php @@ -36,6 +36,6 @@ public static function setUpBeforeClass(): void */ public function testClean(): void { - static::assertInstanceOf(Subject::class, self::$subject->clean()); + static::assertInstanceOf(self::$subject::class, self::$subject->clean()); } } diff --git a/tests/unit/Mage/Log/Model/VisitorTest.php b/tests/unit/Mage/Log/Model/VisitorTest.php index bcd3874d5e9..94d8950bea7 100644 --- a/tests/unit/Mage/Log/Model/VisitorTest.php +++ b/tests/unit/Mage/Log/Model/VisitorTest.php @@ -37,7 +37,7 @@ public function setUp(): void */ public function testInitServerData(): void { - static::assertInstanceOf(Subject::class, self::$subject->initServerData()); + static::assertInstanceOf(self::$subject::class, self::$subject->initServerData()); } /** diff --git a/tests/unit/Mage/Newsletter/Model/TemplateTest.php b/tests/unit/Mage/Newsletter/Model/TemplateTest.php index 7a1ef7c047d..3c368e00adc 100644 --- a/tests/unit/Mage/Newsletter/Model/TemplateTest.php +++ b/tests/unit/Mage/Newsletter/Model/TemplateTest.php @@ -126,7 +126,7 @@ public function validateTemplateDataProvider(): Generator */ public function testLoadByCode(): void { - static::assertInstanceOf(Subject::class, self::$subject->loadByCode('test_code')); + static::assertInstanceOf(self::$subject::class, self::$subject->loadByCode('test_code')); } /** diff --git a/tests/unit/Mage/Page/Block/Html/HeadTest.php b/tests/unit/Mage/Page/Block/Html/HeadTest.php index 88e022592e6..52cce1ae086 100644 --- a/tests/unit/Mage/Page/Block/Html/HeadTest.php +++ b/tests/unit/Mage/Page/Block/Html/HeadTest.php @@ -36,7 +36,7 @@ public static function setUpBeforeClass(): void */ public function testAddCss(): void { - static::assertInstanceOf(Subject::class, self::$subject->addCss('test')); + static::assertInstanceOf(self::$subject::class, self::$subject->addCss('test')); } /** @@ -44,7 +44,7 @@ public function testAddCss(): void */ public function testAddJs(): void { - static::assertInstanceOf(Subject::class, self::$subject->addJs('test')); + static::assertInstanceOf(self::$subject::class, self::$subject->addJs('test')); } /** @@ -52,7 +52,7 @@ public function testAddJs(): void */ public function testAddCssIe(): void { - static::assertInstanceOf(Subject::class, self::$subject->addCssIe('test')); + static::assertInstanceOf(self::$subject::class, self::$subject->addCssIe('test')); } /** @@ -60,7 +60,7 @@ public function testAddCssIe(): void */ public function testAddJsIe(): void { - static::assertInstanceOf(Subject::class, self::$subject->addJsIe('test')); + static::assertInstanceOf(self::$subject::class, self::$subject->addJsIe('test')); } /** @@ -68,6 +68,6 @@ public function testAddJsIe(): void */ public function testAddLinkRel(): void { - static::assertInstanceOf(Subject::class, self::$subject->addLinkRel('test', 'ref')); + static::assertInstanceOf(self::$subject::class, self::$subject->addLinkRel('test', 'ref')); } } diff --git a/tests/unit/Mage/Page/Block/Html/HeaderTest.php b/tests/unit/Mage/Page/Block/Html/HeaderTest.php index 881f181b1e3..4295a0758c7 100644 --- a/tests/unit/Mage/Page/Block/Html/HeaderTest.php +++ b/tests/unit/Mage/Page/Block/Html/HeaderTest.php @@ -44,7 +44,7 @@ public function setUp(): void */ public function testSetLogo(): void { - static::assertInstanceOf(Subject::class, self::$subject->setLogo('src', 'alt')); + static::assertInstanceOf(self::$subject::class, self::$subject->setLogo('src', 'alt')); } /** diff --git a/tests/unit/Mage/Reports/Model/Resource/Report/CollectionTest.php b/tests/unit/Mage/Reports/Model/Resource/Report/CollectionTest.php index 17b63dad8a2..cedc196dd13 100644 --- a/tests/unit/Mage/Reports/Model/Resource/Report/CollectionTest.php +++ b/tests/unit/Mage/Reports/Model/Resource/Report/CollectionTest.php @@ -44,7 +44,7 @@ public function setUp(): void */ public function testSetPeriod(): void { - static::assertInstanceOf(Subject::class, self::$subject->setPeriod('1m')); + static::assertInstanceOf(self::$subject::class, self::$subject->setPeriod('1m')); } /** @@ -53,7 +53,7 @@ public function testSetPeriod(): void */ public function testSetIntervals(): void { - static::assertInstanceOf(Subject::class, self::$subject->setInterval(new Zend_Date(), new Zend_Date())); + static::assertInstanceOf(self::$subject::class, self::$subject->setInterval(new Zend_Date(), new Zend_Date())); } /** @@ -106,7 +106,7 @@ public function testGetSize(): void */ public function testSetPageSize(): void { - static::assertInstanceOf(Subject::class, self::$subject->setPageSize(1)); + static::assertInstanceOf(self::$subject::class, self::$subject->setPageSize(1)); } /** @@ -123,7 +123,7 @@ public function testGetPageSize(): void */ public function testInitReport(string $modelClass = ''): void { - static::assertInstanceOf(Subject::class, self::$subject->initReport($modelClass)); + static::assertInstanceOf(self::$subject::class, self::$subject->initReport($modelClass)); } /** diff --git a/tests/unit/Mage/Review/Model/ReviewTest.php b/tests/unit/Mage/Review/Model/ReviewTest.php index 56d96b3fcd2..4f1968f120a 100644 --- a/tests/unit/Mage/Review/Model/ReviewTest.php +++ b/tests/unit/Mage/Review/Model/ReviewTest.php @@ -43,7 +43,7 @@ public function testValidate($expectedResult, array $methods): void { $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(Subject::class, $mock); + static::assertInstanceOf(self::$subject::class, $mock); static::assertSame($expectedResult, $mock->validate()); } } diff --git a/tests/unit/Mage/Rule/Model/AbstractTest.php b/tests/unit/Mage/Rule/Model/AbstractTest.php index ef5716f69c2..cab0fd359fb 100644 --- a/tests/unit/Mage/Rule/Model/AbstractTest.php +++ b/tests/unit/Mage/Rule/Model/AbstractTest.php @@ -104,7 +104,7 @@ public function testGetForm(): void */ public function testLoadPost(array $data = []): void { - static::assertInstanceOf(Subject::class, self::$subject->loadPost($data)); + static::assertInstanceOf(self::$subject::class, self::$subject->loadPost($data)); } /** @@ -152,7 +152,7 @@ public function testIsDeleteable(): void */ public function testSetIsDeleteable(bool $value): void { - static::assertInstanceOf(Subject::class, self::$subject->setIsDeleteable($value)); + static::assertInstanceOf(self::$subject::class, self::$subject->setIsDeleteable($value)); } /** @@ -171,7 +171,7 @@ public function testIsReadonly(): void */ public function testSetIsReadonly(bool $value): void { - static::assertInstanceOf(Subject::class, self::$subject->setIsReadonly($value)); + static::assertInstanceOf(self::$subject::class, self::$subject->setIsReadonly($value)); } /** diff --git a/tests/unit/Mage/Rule/Model/EnvironmentTest.php b/tests/unit/Mage/Rule/Model/EnvironmentTest.php index 2431f1f28ed..98ba4b17cdc 100644 --- a/tests/unit/Mage/Rule/Model/EnvironmentTest.php +++ b/tests/unit/Mage/Rule/Model/EnvironmentTest.php @@ -37,6 +37,6 @@ public static function setUpBeforeClass(): void */ public function testGetConditionsInstance(): void { - static::assertInstanceOf(Subject::class, self::$subject->collect()); + static::assertInstanceOf(self::$subject::class, self::$subject->collect()); } } diff --git a/tests/unit/Mage/Sales/Block/Order/Item/Renderer/DefaultTest.php b/tests/unit/Mage/Sales/Block/Order/Item/Renderer/DefaultTest.php index 9818ff5dd81..bbe4891ff0d 100644 --- a/tests/unit/Mage/Sales/Block/Order/Item/Renderer/DefaultTest.php +++ b/tests/unit/Mage/Sales/Block/Order/Item/Renderer/DefaultTest.php @@ -38,6 +38,6 @@ public static function setUpBeforeClass(): void */ public function testSetItem(): void { - static::assertInstanceOf(Subject::class, self::$subject->setItem(new Varien_Object())); + static::assertInstanceOf(self::$subject::class, self::$subject->setItem(new Varien_Object())); } } diff --git a/tests/unit/Mage/Sitemap/Model/SitemapTest.php b/tests/unit/Mage/Sitemap/Model/SitemapTest.php index 42f35f8d4d4..89a2930997b 100644 --- a/tests/unit/Mage/Sitemap/Model/SitemapTest.php +++ b/tests/unit/Mage/Sitemap/Model/SitemapTest.php @@ -44,7 +44,7 @@ public function testGetPreparedFilename(array $methods): void { $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(Subject::class, $mock); + static::assertInstanceOf(self::$subject::class, $mock); static::assertIsString($mock->getPreparedFilename()); } @@ -58,10 +58,10 @@ public function testGetPreparedFilename(array $methods): void public function testGenerateXml(array $methods): void { $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(Subject::class, $mock); + static::assertInstanceOf(self::$subject::class, $mock); $result = $mock->generateXml(); - static::assertInstanceOf(Subject::class, $result); + static::assertInstanceOf(self::$subject::class, $result); /** @var string $file */ $file = $methods['getSitemapFilename']; diff --git a/tests/unit/Mage/Uploader/Helper/FileTest.php b/tests/unit/Mage/Uploader/Helper/FileTest.php index d675d08fcf5..5a7655c3b73 100644 --- a/tests/unit/Mage/Uploader/Helper/FileTest.php +++ b/tests/unit/Mage/Uploader/Helper/FileTest.php @@ -75,7 +75,7 @@ public function testGetDataMaxSize(string $expectedResult, array $methods): void { $mock = $this->getMockWithCalledMethods(Subject::class, $methods, true); - static::assertInstanceOf(Subject::class, $mock); + static::assertInstanceOf(self::$subject::class, $mock); static::assertSame($expectedResult, $mock->getDataMaxSize()); } @@ -87,7 +87,7 @@ public function testGetDataMaxSizeInBytes(int $expectedResult, array $methods): { $mock = $this->getMockWithCalledMethods(Subject::class, $methods, true); - static::assertInstanceOf(Subject::class, $mock); + static::assertInstanceOf(self::$subject::class, $mock); static::assertSame($expectedResult, $mock->getDataMaxSizeInBytes()); } } From c39085a65521e2d8e7cd6407b425d06a4e5feacd Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Thu, 17 Apr 2025 04:50:28 +0200 Subject: [PATCH 11/36] updated tests --- .../Index/Block/Adminhtml/Process/Grid.php | 4 +++- app/code/core/Mage/Index/Model/Process.php | 6 ++++++ tests/unit/Mage/Admin/Model/BlockTest.php | 2 +- tests/unit/Mage/Admin/Model/ConfigTest.php | 2 +- tests/unit/Mage/Admin/Model/UserTest.php | 18 +++++++++--------- tests/unit/Mage/Admin/Model/VariableTest.php | 2 +- .../Mage/AdminNotification/Model/FeedTest.php | 2 +- .../Mage/AdminNotification/Model/InboxTest.php | 12 ++++++------ .../Block/Customer/Edit/Tab/AddressesTest.php | 5 ++--- .../Block/Customer/Edit/Tab/NewsletterTest.php | 4 ++-- .../Block/System/Cache/Form/FormTest.php | 2 +- .../Block/System/Config/Form/FormTest.php | 2 +- .../System/Convert/Gui/Edit/Tab/ViewTest.php | 4 ++-- .../Convert/Profile/Edit/Tab/EditTest.php | 4 ++-- .../unit/Mage/Adminhtml/Helper/CatalogTest.php | 4 ++-- tests/unit/Mage/Api/Model/UserTest.php | 2 +- tests/unit/Mage/Catalog/Model/CategoryTest.php | 2 +- .../Model/Product/Option/Type/TextTest.php | 2 +- tests/unit/Mage/Catalog/Model/ProductTest.php | 6 +++--- tests/unit/Mage/Catalog/Model/UrlTest.php | 2 +- tests/unit/Mage/Cms/Block/BlockTest.php | 2 +- tests/unit/Mage/Cms/Block/PageTest.php | 2 +- tests/unit/Mage/Cms/Block/Widget/BlockTest.php | 2 +- tests/unit/Mage/Cms/Model/PageTest.php | 4 ++-- tests/unit/Mage/Core/Model/WebsiteTest.php | 8 ++++---- .../Model/Convert/Adapter/CustomerTest.php | 2 +- .../unit/Mage/Customer/Model/CustomerTest.php | 2 +- tests/unit/Mage/Index/Model/IndexerTest.php | 12 ++++++------ tests/unit/Mage/Index/Model/ProcessTest.php | 6 +++--- tests/unit/Mage/Log/Model/CronTest.php | 2 +- tests/unit/Mage/Log/Model/CustomerTest.php | 2 +- tests/unit/Mage/Log/Model/LogTest.php | 2 +- tests/unit/Mage/Log/Model/VisitorTest.php | 2 +- .../Mage/Newsletter/Model/TemplateTest.php | 2 +- tests/unit/Mage/Page/Block/Html/HeadTest.php | 10 +++++----- tests/unit/Mage/Page/Block/Html/HeaderTest.php | 2 +- .../Model/Resource/Report/CollectionTest.php | 8 ++++---- tests/unit/Mage/Review/Model/ReviewTest.php | 2 +- tests/unit/Mage/Rule/Model/AbstractTest.php | 6 +++--- tests/unit/Mage/Rule/Model/EnvironmentTest.php | 2 +- .../Block/Order/Item/Renderer/DefaultTest.php | 2 +- tests/unit/Mage/Sitemap/Model/SitemapTest.php | 6 +++--- tests/unit/Mage/Uploader/Helper/FileTest.php | 4 ++-- 43 files changed, 93 insertions(+), 86 deletions(-) diff --git a/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php b/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php index 9daee9c0fbd..4339faeb45c 100644 --- a/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php +++ b/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php @@ -52,6 +52,7 @@ public function __construct() * Prepare grid collection * * @return $this + * @throws Exception */ protected function _prepareCollection() { @@ -66,6 +67,7 @@ protected function _prepareCollection() * Add name and description to collection elements * * @return $this + * @throws Mage_Core_Exception */ protected function _afterLoadCollection() { @@ -89,10 +91,10 @@ protected function _afterLoadCollection() * Prepare grid columns * * @return $this + * @throws Exception */ protected function _prepareColumns() { - $baseUrl = $this->getUrl(); $this->addColumn('indexer_code', [ 'header' => Mage::helper('index')->__('Index'), 'width' => '180', diff --git a/app/code/core/Mage/Index/Model/Process.php b/app/code/core/Mage/Index/Model/Process.php index 504c19a602e..9cc4da17fde 100644 --- a/app/code/core/Mage/Index/Model/Process.php +++ b/app/code/core/Mage/Index/Model/Process.php @@ -23,6 +23,10 @@ * @method string getIndexCode() * @method string getIndexerCode() * @method $this setIndexerCode(string $value) + * @method string getName() + * @method $this setName(string $value) + * @method string getDescription() + * @method $this setDescription(string $value) * @method string getStatus() * @method $this setStatus(string $value) * @method string getStartedAt() @@ -33,6 +37,8 @@ * @method $this setMode(string $value) * @method bool getForcePartialReindex() * @method $this setForcePartialReindex(bool $value) + * @method int getUpdateRequired() + * @method $this setUpdateRequired(int $value) */ class Mage_Index_Model_Process extends Mage_Core_Model_Abstract { diff --git a/tests/unit/Mage/Admin/Model/BlockTest.php b/tests/unit/Mage/Admin/Model/BlockTest.php index 7320f1db427..7a19854ae86 100644 --- a/tests/unit/Mage/Admin/Model/BlockTest.php +++ b/tests/unit/Mage/Admin/Model/BlockTest.php @@ -46,7 +46,7 @@ public function testValidate(bool|array $expectedResult, array $methods): void { $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(self::$subject::class, $mock); + static::assertInstanceOf(Subject::class, $mock); static::assertEquals($expectedResult, $mock->validate()); } diff --git a/tests/unit/Mage/Admin/Model/ConfigTest.php b/tests/unit/Mage/Admin/Model/ConfigTest.php index 3513af330cf..71cdd96c7e0 100644 --- a/tests/unit/Mage/Admin/Model/ConfigTest.php +++ b/tests/unit/Mage/Admin/Model/ConfigTest.php @@ -54,7 +54,7 @@ public function testGetAclPrivilegeSet(): void */ public function testLoadAclResources(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->loadAclResources(new Mage_Admin_Model_Acl())); + static::assertInstanceOf(Subject::class, self::$subject->loadAclResources(new Mage_Admin_Model_Acl())); } /** diff --git a/tests/unit/Mage/Admin/Model/UserTest.php b/tests/unit/Mage/Admin/Model/UserTest.php index 937a4eb5bdb..ddcb6d56f19 100644 --- a/tests/unit/Mage/Admin/Model/UserTest.php +++ b/tests/unit/Mage/Admin/Model/UserTest.php @@ -47,7 +47,7 @@ public function testAuthenticate(bool|string $expectedResult, array $methods): v $methods = array_merge($defaultMethods, $methods); $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(self::$subject::class, $mock); + static::assertInstanceOf(Subject::class, $mock); try { static::assertSame($expectedResult, $mock->authenticate($methods['getUsername'], $methods['getPassword'])); @@ -65,7 +65,7 @@ public function testValidate($expectedResult, array $methods): void { $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(self::$subject::class, $mock); + static::assertInstanceOf(Subject::class, $mock); static::assertSame($expectedResult, $mock->validate()); } @@ -85,7 +85,7 @@ public function testValidateCurrentPassword(): void */ public function testLoadByUsername(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->loadByUsername('invalid-user')); + static::assertInstanceOf(Subject::class, self::$subject->loadByUsername('invalid-user')); } /** @@ -101,7 +101,7 @@ public function testHasAssigned2Role(): void */ public function testChangeResetPasswordLinkToken(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->changeResetPasswordLinkToken('123')); + static::assertInstanceOf(Subject::class, self::$subject->changeResetPasswordLinkToken('123')); } /** @@ -112,7 +112,7 @@ public function testIsResetPasswordLinkTokenExpired(bool $expectedResult, array { $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(self::$subject::class, $mock); + static::assertInstanceOf(Subject::class, $mock); static::assertSame($expectedResult, $mock->isResetPasswordLinkTokenExpired()); } @@ -121,7 +121,7 @@ public function testIsResetPasswordLinkTokenExpired(bool $expectedResult, array */ public function testSendPasswordResetConfirmationEmail(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->sendPasswordResetConfirmationEmail()); + static::assertInstanceOf(Subject::class, self::$subject->sendPasswordResetConfirmationEmail()); } /** @@ -150,7 +150,7 @@ public function testGetMinAdminPasswordLength(): void $methods = ['getStoreConfigAsInt' => 10]; $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(self::$subject::class, $mock); + static::assertInstanceOf(Subject::class, $mock); static::assertSame(14, $mock->getMinAdminPasswordLength()); } @@ -162,7 +162,7 @@ public function testSendAdminNotification(): void $methods = ['getUserCreateAdditionalEmail' => ['test@example.com']]; $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(self::$subject::class, $mock); - static::assertInstanceOf(self::$subject::class, $mock->sendAdminNotification(self::$subject)); + static::assertInstanceOf(Subject::class, $mock); + static::assertInstanceOf(Subject::class, $mock->sendAdminNotification(self::$subject)); } } diff --git a/tests/unit/Mage/Admin/Model/VariableTest.php b/tests/unit/Mage/Admin/Model/VariableTest.php index 0fd7aeed0fe..c9b9adf9539 100644 --- a/tests/unit/Mage/Admin/Model/VariableTest.php +++ b/tests/unit/Mage/Admin/Model/VariableTest.php @@ -44,7 +44,7 @@ public function testValidate(bool|array $expectedResult, array $methods): void { $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(self::$subject::class, $mock); + static::assertInstanceOf(Subject::class, $mock); static::assertSame($expectedResult, $mock->validate()); } diff --git a/tests/unit/Mage/AdminNotification/Model/FeedTest.php b/tests/unit/Mage/AdminNotification/Model/FeedTest.php index f7bd574cea4..7d2b782dbff 100644 --- a/tests/unit/Mage/AdminNotification/Model/FeedTest.php +++ b/tests/unit/Mage/AdminNotification/Model/FeedTest.php @@ -44,7 +44,7 @@ public function testGetFeedUrl(): void */ public function testCheckUpdate(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->checkUpdate()); + static::assertInstanceOf(Subject::class, self::$subject->checkUpdate()); } /** diff --git a/tests/unit/Mage/AdminNotification/Model/InboxTest.php b/tests/unit/Mage/AdminNotification/Model/InboxTest.php index 63c0cd6a04d..2568546f08d 100644 --- a/tests/unit/Mage/AdminNotification/Model/InboxTest.php +++ b/tests/unit/Mage/AdminNotification/Model/InboxTest.php @@ -54,7 +54,7 @@ public function testGetSeverities(array|string|null $expectedResult, ?int $sever public function testLoadLatestNotice(bool $delete = false): void { $result = self::$subject->loadLatestNotice(); - static::assertInstanceOf(self::$subject::class, $result); + static::assertInstanceOf(Subject::class, $result); if ($delete) { $result->delete(); } @@ -65,7 +65,7 @@ public function testLoadLatestNotice(bool $delete = false): void */ public function testAdd(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->add( + static::assertInstanceOf(Subject::class, self::$subject->add( Subject::SEVERITY_CRITICAL, self::TITLE, [__METHOD__], @@ -93,7 +93,7 @@ public function testAddException(): void */ public function testAddCritical(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->addCritical(self::TITLE, __METHOD__)); + static::assertInstanceOf(Subject::class, self::$subject->addCritical(self::TITLE, __METHOD__)); $this->testLoadLatestNotice(true); } @@ -103,7 +103,7 @@ public function testAddCritical(): void */ public function testAddMajor(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->addMajor(self::TITLE, __METHOD__)); + static::assertInstanceOf(Subject::class, self::$subject->addMajor(self::TITLE, __METHOD__)); $this->testLoadLatestNotice(true); } @@ -113,7 +113,7 @@ public function testAddMajor(): void */ public function testAddMinor(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->addMinor(self::TITLE, __METHOD__)); + static::assertInstanceOf(Subject::class, self::$subject->addMinor(self::TITLE, __METHOD__)); $this->testLoadLatestNotice(true); } @@ -123,7 +123,7 @@ public function testAddMinor(): void */ public function testAddNotice(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->addNotice(self::TITLE, __METHOD__)); + static::assertInstanceOf(Subject::class, self::$subject->addNotice(self::TITLE, __METHOD__)); $this->testLoadLatestNotice(true); } } diff --git a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php index caae208b106..b1d97a5254f 100644 --- a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php +++ b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php @@ -24,7 +24,6 @@ class AddressesTest extends OpenMageTest { - /** @phpstan-ignore property.onlyWritten */ private static Subject $subject; public static function setUpBeforeClass(): void @@ -45,7 +44,7 @@ public function testInitForm(): void ]; $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(self::$subject::class, $mock); - static::assertInstanceOf(self::$subject::class, $mock->initForm()); + static::assertInstanceOf(Subject::class, $mock); + static::assertInstanceOf(Subject::class, $mock->initForm()); } } diff --git a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php index 278805a80ac..6448b429e8f 100644 --- a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php +++ b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php @@ -44,7 +44,7 @@ public function testInitForm(): void ]; $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(self::$subject::class, $mock); - static::assertInstanceOf(self::$subject::class, $mock->initForm()); + static::assertInstanceOf(Subject::class, $mock); + static::assertInstanceOf(Subject::class, $mock->initForm()); } } diff --git a/tests/unit/Mage/Adminhtml/Block/System/Cache/Form/FormTest.php b/tests/unit/Mage/Adminhtml/Block/System/Cache/Form/FormTest.php index 7e79bbfb489..7b0732129cc 100644 --- a/tests/unit/Mage/Adminhtml/Block/System/Cache/Form/FormTest.php +++ b/tests/unit/Mage/Adminhtml/Block/System/Cache/Form/FormTest.php @@ -36,6 +36,6 @@ public static function setUpBeforeClass(): void */ public function testInitForm(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->initForm()); + static::assertInstanceOf(Subject::class, self::$subject->initForm()); } } diff --git a/tests/unit/Mage/Adminhtml/Block/System/Config/Form/FormTest.php b/tests/unit/Mage/Adminhtml/Block/System/Config/Form/FormTest.php index 1415121e6b0..8b8f8afa8dc 100644 --- a/tests/unit/Mage/Adminhtml/Block/System/Config/Form/FormTest.php +++ b/tests/unit/Mage/Adminhtml/Block/System/Config/Form/FormTest.php @@ -36,6 +36,6 @@ public static function setUpBeforeClass(): void */ public function testInitForm(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->initForm()); + static::assertInstanceOf(Subject::class, self::$subject->initForm()); } } diff --git a/tests/unit/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/ViewTest.php b/tests/unit/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/ViewTest.php index d906d6a8f75..8735cec6c50 100644 --- a/tests/unit/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/ViewTest.php +++ b/tests/unit/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/ViewTest.php @@ -42,7 +42,7 @@ public function testInitForm(): void ]; $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(self::$subject::class, $mock); - static::assertInstanceOf(self::$subject::class, $mock->initForm()); + static::assertInstanceOf(Subject::class, $mock); + static::assertInstanceOf(Subject::class, $mock->initForm()); } } diff --git a/tests/unit/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/EditTest.php b/tests/unit/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/EditTest.php index e9fe44d2016..81f87e18cfe 100644 --- a/tests/unit/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/EditTest.php +++ b/tests/unit/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/EditTest.php @@ -42,7 +42,7 @@ public function testInitForm(): void ]; $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(self::$subject::class, $mock); - static::assertInstanceOf(self::$subject::class, $mock->initForm()); + static::assertInstanceOf(Subject::class, $mock); + static::assertInstanceOf(Subject::class, $mock->initForm()); } } diff --git a/tests/unit/Mage/Adminhtml/Helper/CatalogTest.php b/tests/unit/Mage/Adminhtml/Helper/CatalogTest.php index 70862ae1b12..2cc0f4c8ec5 100644 --- a/tests/unit/Mage/Adminhtml/Helper/CatalogTest.php +++ b/tests/unit/Mage/Adminhtml/Helper/CatalogTest.php @@ -37,7 +37,7 @@ public static function setUpBeforeClass(): void */ public function testSetAttributeTabBlock(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->setAttributeTabBlock('')); + static::assertInstanceOf(Subject::class, self::$subject->setAttributeTabBlock('')); } /** @@ -46,7 +46,7 @@ public function testSetAttributeTabBlock(): void */ public function testSetCategoryAttributeTabBlock(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->setCategoryAttributeTabBlock('')); + static::assertInstanceOf(Subject::class, self::$subject->setCategoryAttributeTabBlock('')); } /** diff --git a/tests/unit/Mage/Api/Model/UserTest.php b/tests/unit/Mage/Api/Model/UserTest.php index 1dd8e9173fe..6bb40c2543f 100644 --- a/tests/unit/Mage/Api/Model/UserTest.php +++ b/tests/unit/Mage/Api/Model/UserTest.php @@ -44,7 +44,7 @@ public function testValidate($expectedResult, array $methods): void { $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(self::$subject::class, $mock); + static::assertInstanceOf(Subject::class, $mock); static::assertSame($expectedResult, $mock->validate()); } } diff --git a/tests/unit/Mage/Catalog/Model/CategoryTest.php b/tests/unit/Mage/Catalog/Model/CategoryTest.php index a25df0f5b4e..80612fc2068 100644 --- a/tests/unit/Mage/Catalog/Model/CategoryTest.php +++ b/tests/unit/Mage/Catalog/Model/CategoryTest.php @@ -82,7 +82,7 @@ public function testValidate(): void */ public function testAfterCommitCallback(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->afterCommitCallback()); + static::assertInstanceOf(Subject::class, self::$subject->afterCommitCallback()); } /** diff --git a/tests/unit/Mage/Catalog/Model/Product/Option/Type/TextTest.php b/tests/unit/Mage/Catalog/Model/Product/Option/Type/TextTest.php index 0b3ee8a32c2..a68f9d3b53f 100644 --- a/tests/unit/Mage/Catalog/Model/Product/Option/Type/TextTest.php +++ b/tests/unit/Mage/Catalog/Model/Product/Option/Type/TextTest.php @@ -41,7 +41,7 @@ public static function setUpBeforeClass(): void public function testValidateUserValue(): void { self::$subject->setOption(new Mage_Catalog_Model_Product_Option()); - static::assertInstanceOf(self::$subject::class, self::$subject->validateUserValue([])); + static::assertInstanceOf(Subject::class, self::$subject->validateUserValue([])); } diff --git a/tests/unit/Mage/Catalog/Model/ProductTest.php b/tests/unit/Mage/Catalog/Model/ProductTest.php index e5255b17b6e..9f416fc1d43 100644 --- a/tests/unit/Mage/Catalog/Model/ProductTest.php +++ b/tests/unit/Mage/Catalog/Model/ProductTest.php @@ -71,7 +71,7 @@ public function testGetUrlModel(): void */ public function testValidate(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->validate()); + static::assertInstanceOf(Subject::class, self::$subject->validate()); } /** @@ -96,7 +96,7 @@ public function testValidate(): void */ public function testSetPriceCalculation(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->setPriceCalculation()); + static::assertInstanceOf(Subject::class, self::$subject->setPriceCalculation()); } /** @@ -145,7 +145,7 @@ public function testGetDefaultAttributeSetId(): void */ public function testAfterCommitCallback(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->afterCommitCallback()); + static::assertInstanceOf(Subject::class, self::$subject->afterCommitCallback()); } /** diff --git a/tests/unit/Mage/Catalog/Model/UrlTest.php b/tests/unit/Mage/Catalog/Model/UrlTest.php index ba251113f6e..3ebf93234c2 100644 --- a/tests/unit/Mage/Catalog/Model/UrlTest.php +++ b/tests/unit/Mage/Catalog/Model/UrlTest.php @@ -54,7 +54,7 @@ public function testGetStoreRootCategory(): void */ public function testRefreshRewrites(?int $storeId): void { - static::assertInstanceOf(self::$subject::class, self::$subject->refreshRewrites($storeId)); + static::assertInstanceOf(Subject::class, self::$subject->refreshRewrites($storeId)); } /** diff --git a/tests/unit/Mage/Cms/Block/BlockTest.php b/tests/unit/Mage/Cms/Block/BlockTest.php index 108ba35abf5..38357be6e55 100644 --- a/tests/unit/Mage/Cms/Block/BlockTest.php +++ b/tests/unit/Mage/Cms/Block/BlockTest.php @@ -44,7 +44,7 @@ public function testGetCacheKeyInfo(string $blockId): void ]; $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(self::$subject::class, $mock); + static::assertInstanceOf(Subject::class, $mock); static::assertIsArray($mock->getCacheKeyInfo()); } } diff --git a/tests/unit/Mage/Cms/Block/PageTest.php b/tests/unit/Mage/Cms/Block/PageTest.php index b7c7ccba117..9540cb2e016 100644 --- a/tests/unit/Mage/Cms/Block/PageTest.php +++ b/tests/unit/Mage/Cms/Block/PageTest.php @@ -45,7 +45,7 @@ public function testGetPage(string $pageId): void ]; $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(self::$subject::class, $mock); + static::assertInstanceOf(Subject::class, $mock); static::assertInstanceOf(Mage_Cms_Model_Page::class, $mock->getPage()); } } diff --git a/tests/unit/Mage/Cms/Block/Widget/BlockTest.php b/tests/unit/Mage/Cms/Block/Widget/BlockTest.php index ba3d5c30654..703577e4be1 100644 --- a/tests/unit/Mage/Cms/Block/Widget/BlockTest.php +++ b/tests/unit/Mage/Cms/Block/Widget/BlockTest.php @@ -44,7 +44,7 @@ public function testGetCacheKeyInfo(string $blockId): void ]; $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(self::$subject::class, $mock); + static::assertInstanceOf(Subject::class, $mock); static::assertIsArray($mock->getCacheKeyInfo()); } diff --git a/tests/unit/Mage/Cms/Model/PageTest.php b/tests/unit/Mage/Cms/Model/PageTest.php index 6e49247682b..22d8aa2b616 100644 --- a/tests/unit/Mage/Cms/Model/PageTest.php +++ b/tests/unit/Mage/Cms/Model/PageTest.php @@ -38,8 +38,8 @@ public function setUp(): void */ public function testLoad(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->load(null)); - static::assertInstanceOf(self::$subject::class, self::$subject->load(2)); + static::assertInstanceOf(Subject::class, self::$subject->load(null)); + static::assertInstanceOf(Subject::class, self::$subject->load(2)); } /** diff --git a/tests/unit/Mage/Core/Model/WebsiteTest.php b/tests/unit/Mage/Core/Model/WebsiteTest.php index a3bd8d62d73..b8c8c9f4d57 100644 --- a/tests/unit/Mage/Core/Model/WebsiteTest.php +++ b/tests/unit/Mage/Core/Model/WebsiteTest.php @@ -40,8 +40,8 @@ public static function setUpBeforeClass(): void */ public function testLoad(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->load(1)); - static::assertInstanceOf(self::$subject::class, self::$subject->load('default')); + static::assertInstanceOf(Subject::class, self::$subject->load(1)); + static::assertInstanceOf(Subject::class, self::$subject->load('default')); } /** @@ -49,8 +49,8 @@ public function testLoad(): void */ public function testLoadConfig(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->loadConfig('1')); - static::assertInstanceOf(self::$subject::class, self::$subject->loadConfig('default')); + static::assertInstanceOf(Subject::class, self::$subject->loadConfig('1')); + static::assertInstanceOf(Subject::class, self::$subject->loadConfig('default')); } /** diff --git a/tests/unit/Mage/Customer/Model/Convert/Adapter/CustomerTest.php b/tests/unit/Mage/Customer/Model/Convert/Adapter/CustomerTest.php index 21f75ad1908..7da21d1f4fc 100644 --- a/tests/unit/Mage/Customer/Model/Convert/Adapter/CustomerTest.php +++ b/tests/unit/Mage/Customer/Model/Convert/Adapter/CustomerTest.php @@ -143,6 +143,6 @@ public function testSaveRow(): void 'firstname' => 'John', 'lastname' => 'Doe', ]; - static::assertInstanceOf(self::$subject::class, self::$subject->saveRow($data)); + static::assertInstanceOf(Subject::class, self::$subject->saveRow($data)); } } diff --git a/tests/unit/Mage/Customer/Model/CustomerTest.php b/tests/unit/Mage/Customer/Model/CustomerTest.php index 093eddabc4a..d1c5a72c314 100644 --- a/tests/unit/Mage/Customer/Model/CustomerTest.php +++ b/tests/unit/Mage/Customer/Model/CustomerTest.php @@ -46,7 +46,7 @@ public function testValidate($expectedResult, array $methods): void { $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(self::$subject::class, $mock); + static::assertInstanceOf(Subject::class, $mock); static::assertSame($expectedResult, $mock->validate()); } } diff --git a/tests/unit/Mage/Index/Model/IndexerTest.php b/tests/unit/Mage/Index/Model/IndexerTest.php index 666dfd04964..0d32e5aa775 100644 --- a/tests/unit/Mage/Index/Model/IndexerTest.php +++ b/tests/unit/Mage/Index/Model/IndexerTest.php @@ -66,7 +66,7 @@ public function testGetErrors(): void */ public function testLockIndexer(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->lockIndexer()); + static::assertInstanceOf(Subject::class, self::$subject->lockIndexer()); } /** @@ -75,7 +75,7 @@ public function testLockIndexer(): void */ public function testUnlockIndexer(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->unlockIndexer()); + static::assertInstanceOf(Subject::class, self::$subject->unlockIndexer()); } /** @@ -84,7 +84,7 @@ public function testUnlockIndexer(): void public function testIndexEvent(): void { $event = new Mage_Index_Model_Event(); - static::assertInstanceOf(self::$subject::class, self::$subject->indexEvent($event)); + static::assertInstanceOf(Subject::class, self::$subject->indexEvent($event)); } /** @@ -93,7 +93,7 @@ public function testIndexEvent(): void public function testRegisterEvent(): void { $event = new Mage_Index_Model_Event(); - static::assertInstanceOf(self::$subject::class, self::$subject->registerEvent($event)); + static::assertInstanceOf(Subject::class, self::$subject->registerEvent($event)); } /** @@ -102,7 +102,7 @@ public function testRegisterEvent(): void */ public function testAllowTableChanges(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->allowTableChanges()); + static::assertInstanceOf(Subject::class, self::$subject->allowTableChanges()); } /** @@ -111,6 +111,6 @@ public function testAllowTableChanges(): void */ public function testDisallowTableChanges(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->disallowTableChanges()); + static::assertInstanceOf(Subject::class, self::$subject->disallowTableChanges()); } } diff --git a/tests/unit/Mage/Index/Model/ProcessTest.php b/tests/unit/Mage/Index/Model/ProcessTest.php index 8b94b15afda..239841545be 100644 --- a/tests/unit/Mage/Index/Model/ProcessTest.php +++ b/tests/unit/Mage/Index/Model/ProcessTest.php @@ -43,7 +43,7 @@ public function testReindexEverything(): void self::$subject->setIndexerCode('html'); try { - static::assertInstanceOf(self::$subject::class, self::$subject->reindexEverything()); + static::assertInstanceOf(Subject::class, self::$subject->reindexEverything()); } catch (Mage_Core_Exception $exception) { static::assertSame(self::INDEXER_MODEL_IS_NOT_DEFINED, $exception->getMessage()); } @@ -57,7 +57,7 @@ public function testDisableIndexerKeys(): void self::$subject->setIndexerCode('html'); try { - static::assertInstanceOf(self::$subject::class, self::$subject->disableIndexerKeys()); + static::assertInstanceOf(Subject::class, self::$subject->disableIndexerKeys()); } catch (Mage_Core_Exception $exception) { static::assertSame(self::INDEXER_MODEL_IS_NOT_DEFINED, $exception->getMessage()); } @@ -72,7 +72,7 @@ public function testEnableIndexerKeys(): void self::$subject->setIndexerCode('html'); try { - static::assertInstanceOf(self::$subject::class, self::$subject->enableIndexerKeys()); + static::assertInstanceOf(Subject::class, self::$subject->enableIndexerKeys()); } catch (Mage_Core_Exception $exception) { static::assertSame(self::INDEXER_MODEL_IS_NOT_DEFINED, $exception->getMessage()); } diff --git a/tests/unit/Mage/Log/Model/CronTest.php b/tests/unit/Mage/Log/Model/CronTest.php index 1dc9d3c3355..9cf15664db4 100644 --- a/tests/unit/Mage/Log/Model/CronTest.php +++ b/tests/unit/Mage/Log/Model/CronTest.php @@ -36,6 +36,6 @@ public static function setUpBeforeClass(): void */ public function testLogClean(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->logClean()); + static::assertInstanceOf(Subject::class, self::$subject->logClean()); } } diff --git a/tests/unit/Mage/Log/Model/CustomerTest.php b/tests/unit/Mage/Log/Model/CustomerTest.php index ede2668717f..c4977334ec9 100644 --- a/tests/unit/Mage/Log/Model/CustomerTest.php +++ b/tests/unit/Mage/Log/Model/CustomerTest.php @@ -82,7 +82,7 @@ public function testGetLoginAtTimestamp(bool $expectedResult, array $methods): v { $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(self::$subject::class, $mock); + static::assertInstanceOf(Subject::class, $mock); if ($expectedResult) { static::assertIsInt($mock->getLoginAtTimestamp()); } else { diff --git a/tests/unit/Mage/Log/Model/LogTest.php b/tests/unit/Mage/Log/Model/LogTest.php index 985ed44ed53..df147bcb4ea 100644 --- a/tests/unit/Mage/Log/Model/LogTest.php +++ b/tests/unit/Mage/Log/Model/LogTest.php @@ -36,6 +36,6 @@ public static function setUpBeforeClass(): void */ public function testClean(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->clean()); + static::assertInstanceOf(Subject::class, self::$subject->clean()); } } diff --git a/tests/unit/Mage/Log/Model/VisitorTest.php b/tests/unit/Mage/Log/Model/VisitorTest.php index 94d8950bea7..bcd3874d5e9 100644 --- a/tests/unit/Mage/Log/Model/VisitorTest.php +++ b/tests/unit/Mage/Log/Model/VisitorTest.php @@ -37,7 +37,7 @@ public function setUp(): void */ public function testInitServerData(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->initServerData()); + static::assertInstanceOf(Subject::class, self::$subject->initServerData()); } /** diff --git a/tests/unit/Mage/Newsletter/Model/TemplateTest.php b/tests/unit/Mage/Newsletter/Model/TemplateTest.php index 3c368e00adc..7a1ef7c047d 100644 --- a/tests/unit/Mage/Newsletter/Model/TemplateTest.php +++ b/tests/unit/Mage/Newsletter/Model/TemplateTest.php @@ -126,7 +126,7 @@ public function validateTemplateDataProvider(): Generator */ public function testLoadByCode(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->loadByCode('test_code')); + static::assertInstanceOf(Subject::class, self::$subject->loadByCode('test_code')); } /** diff --git a/tests/unit/Mage/Page/Block/Html/HeadTest.php b/tests/unit/Mage/Page/Block/Html/HeadTest.php index 52cce1ae086..88e022592e6 100644 --- a/tests/unit/Mage/Page/Block/Html/HeadTest.php +++ b/tests/unit/Mage/Page/Block/Html/HeadTest.php @@ -36,7 +36,7 @@ public static function setUpBeforeClass(): void */ public function testAddCss(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->addCss('test')); + static::assertInstanceOf(Subject::class, self::$subject->addCss('test')); } /** @@ -44,7 +44,7 @@ public function testAddCss(): void */ public function testAddJs(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->addJs('test')); + static::assertInstanceOf(Subject::class, self::$subject->addJs('test')); } /** @@ -52,7 +52,7 @@ public function testAddJs(): void */ public function testAddCssIe(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->addCssIe('test')); + static::assertInstanceOf(Subject::class, self::$subject->addCssIe('test')); } /** @@ -60,7 +60,7 @@ public function testAddCssIe(): void */ public function testAddJsIe(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->addJsIe('test')); + static::assertInstanceOf(Subject::class, self::$subject->addJsIe('test')); } /** @@ -68,6 +68,6 @@ public function testAddJsIe(): void */ public function testAddLinkRel(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->addLinkRel('test', 'ref')); + static::assertInstanceOf(Subject::class, self::$subject->addLinkRel('test', 'ref')); } } diff --git a/tests/unit/Mage/Page/Block/Html/HeaderTest.php b/tests/unit/Mage/Page/Block/Html/HeaderTest.php index 4295a0758c7..881f181b1e3 100644 --- a/tests/unit/Mage/Page/Block/Html/HeaderTest.php +++ b/tests/unit/Mage/Page/Block/Html/HeaderTest.php @@ -44,7 +44,7 @@ public function setUp(): void */ public function testSetLogo(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->setLogo('src', 'alt')); + static::assertInstanceOf(Subject::class, self::$subject->setLogo('src', 'alt')); } /** diff --git a/tests/unit/Mage/Reports/Model/Resource/Report/CollectionTest.php b/tests/unit/Mage/Reports/Model/Resource/Report/CollectionTest.php index cedc196dd13..17b63dad8a2 100644 --- a/tests/unit/Mage/Reports/Model/Resource/Report/CollectionTest.php +++ b/tests/unit/Mage/Reports/Model/Resource/Report/CollectionTest.php @@ -44,7 +44,7 @@ public function setUp(): void */ public function testSetPeriod(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->setPeriod('1m')); + static::assertInstanceOf(Subject::class, self::$subject->setPeriod('1m')); } /** @@ -53,7 +53,7 @@ public function testSetPeriod(): void */ public function testSetIntervals(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->setInterval(new Zend_Date(), new Zend_Date())); + static::assertInstanceOf(Subject::class, self::$subject->setInterval(new Zend_Date(), new Zend_Date())); } /** @@ -106,7 +106,7 @@ public function testGetSize(): void */ public function testSetPageSize(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->setPageSize(1)); + static::assertInstanceOf(Subject::class, self::$subject->setPageSize(1)); } /** @@ -123,7 +123,7 @@ public function testGetPageSize(): void */ public function testInitReport(string $modelClass = ''): void { - static::assertInstanceOf(self::$subject::class, self::$subject->initReport($modelClass)); + static::assertInstanceOf(Subject::class, self::$subject->initReport($modelClass)); } /** diff --git a/tests/unit/Mage/Review/Model/ReviewTest.php b/tests/unit/Mage/Review/Model/ReviewTest.php index 4f1968f120a..56d96b3fcd2 100644 --- a/tests/unit/Mage/Review/Model/ReviewTest.php +++ b/tests/unit/Mage/Review/Model/ReviewTest.php @@ -43,7 +43,7 @@ public function testValidate($expectedResult, array $methods): void { $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(self::$subject::class, $mock); + static::assertInstanceOf(Subject::class, $mock); static::assertSame($expectedResult, $mock->validate()); } } diff --git a/tests/unit/Mage/Rule/Model/AbstractTest.php b/tests/unit/Mage/Rule/Model/AbstractTest.php index cab0fd359fb..ef5716f69c2 100644 --- a/tests/unit/Mage/Rule/Model/AbstractTest.php +++ b/tests/unit/Mage/Rule/Model/AbstractTest.php @@ -104,7 +104,7 @@ public function testGetForm(): void */ public function testLoadPost(array $data = []): void { - static::assertInstanceOf(self::$subject::class, self::$subject->loadPost($data)); + static::assertInstanceOf(Subject::class, self::$subject->loadPost($data)); } /** @@ -152,7 +152,7 @@ public function testIsDeleteable(): void */ public function testSetIsDeleteable(bool $value): void { - static::assertInstanceOf(self::$subject::class, self::$subject->setIsDeleteable($value)); + static::assertInstanceOf(Subject::class, self::$subject->setIsDeleteable($value)); } /** @@ -171,7 +171,7 @@ public function testIsReadonly(): void */ public function testSetIsReadonly(bool $value): void { - static::assertInstanceOf(self::$subject::class, self::$subject->setIsReadonly($value)); + static::assertInstanceOf(Subject::class, self::$subject->setIsReadonly($value)); } /** diff --git a/tests/unit/Mage/Rule/Model/EnvironmentTest.php b/tests/unit/Mage/Rule/Model/EnvironmentTest.php index 98ba4b17cdc..2431f1f28ed 100644 --- a/tests/unit/Mage/Rule/Model/EnvironmentTest.php +++ b/tests/unit/Mage/Rule/Model/EnvironmentTest.php @@ -37,6 +37,6 @@ public static function setUpBeforeClass(): void */ public function testGetConditionsInstance(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->collect()); + static::assertInstanceOf(Subject::class, self::$subject->collect()); } } diff --git a/tests/unit/Mage/Sales/Block/Order/Item/Renderer/DefaultTest.php b/tests/unit/Mage/Sales/Block/Order/Item/Renderer/DefaultTest.php index bbe4891ff0d..9818ff5dd81 100644 --- a/tests/unit/Mage/Sales/Block/Order/Item/Renderer/DefaultTest.php +++ b/tests/unit/Mage/Sales/Block/Order/Item/Renderer/DefaultTest.php @@ -38,6 +38,6 @@ public static function setUpBeforeClass(): void */ public function testSetItem(): void { - static::assertInstanceOf(self::$subject::class, self::$subject->setItem(new Varien_Object())); + static::assertInstanceOf(Subject::class, self::$subject->setItem(new Varien_Object())); } } diff --git a/tests/unit/Mage/Sitemap/Model/SitemapTest.php b/tests/unit/Mage/Sitemap/Model/SitemapTest.php index 89a2930997b..42f35f8d4d4 100644 --- a/tests/unit/Mage/Sitemap/Model/SitemapTest.php +++ b/tests/unit/Mage/Sitemap/Model/SitemapTest.php @@ -44,7 +44,7 @@ public function testGetPreparedFilename(array $methods): void { $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(self::$subject::class, $mock); + static::assertInstanceOf(Subject::class, $mock); static::assertIsString($mock->getPreparedFilename()); } @@ -58,10 +58,10 @@ public function testGetPreparedFilename(array $methods): void public function testGenerateXml(array $methods): void { $mock = $this->getMockWithCalledMethods(Subject::class, $methods); - static::assertInstanceOf(self::$subject::class, $mock); + static::assertInstanceOf(Subject::class, $mock); $result = $mock->generateXml(); - static::assertInstanceOf(self::$subject::class, $result); + static::assertInstanceOf(Subject::class, $result); /** @var string $file */ $file = $methods['getSitemapFilename']; diff --git a/tests/unit/Mage/Uploader/Helper/FileTest.php b/tests/unit/Mage/Uploader/Helper/FileTest.php index 5a7655c3b73..d675d08fcf5 100644 --- a/tests/unit/Mage/Uploader/Helper/FileTest.php +++ b/tests/unit/Mage/Uploader/Helper/FileTest.php @@ -75,7 +75,7 @@ public function testGetDataMaxSize(string $expectedResult, array $methods): void { $mock = $this->getMockWithCalledMethods(Subject::class, $methods, true); - static::assertInstanceOf(self::$subject::class, $mock); + static::assertInstanceOf(Subject::class, $mock); static::assertSame($expectedResult, $mock->getDataMaxSize()); } @@ -87,7 +87,7 @@ public function testGetDataMaxSizeInBytes(int $expectedResult, array $methods): { $mock = $this->getMockWithCalledMethods(Subject::class, $methods, true); - static::assertInstanceOf(self::$subject::class, $mock); + static::assertInstanceOf(Subject::class, $mock); static::assertSame($expectedResult, $mock->getDataMaxSizeInBytes()); } } From fbc036757e77b883fe2eb338f599761f54b8cc89 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Thu, 17 Apr 2025 05:07:54 +0200 Subject: [PATCH 12/36] updated tests --- .../Block/Customer/Edit/Tab/AddressesTest.php | 8 -------- .../Block/Customer/Edit/Tab/NewsletterTest.php | 11 ----------- .../Block/System/Convert/Gui/Edit/Tab/ViewTest.php | 9 --------- .../System/Convert/Profile/Edit/Tab/EditTest.php | 9 --------- tests/unit/Mage/Api/Model/UserTest.php | 12 ++---------- tests/unit/Mage/Cms/Helper/PageTest.php | 9 --------- tests/unit/Mage/Customer/Model/CustomerTest.php | 11 ++--------- tests/unit/Mage/Log/Model/CustomerTest.php | 9 --------- tests/unit/Mage/Review/Model/ReviewTest.php | 11 ++--------- tests/unit/Mage/Sitemap/Model/SitemapTest.php | 9 --------- 10 files changed, 6 insertions(+), 92 deletions(-) diff --git a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php index b1d97a5254f..1038c686dd8 100644 --- a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php +++ b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php @@ -24,14 +24,6 @@ class AddressesTest extends OpenMageTest { - private static Subject $subject; - - public static function setUpBeforeClass(): void - { - parent::setUpBeforeClass(); - self::$subject = new Subject(); - } - /** * @group Block * @throws Mage_Core_Exception diff --git a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php index 6448b429e8f..8b4eed91a80 100644 --- a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php +++ b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php @@ -17,24 +17,13 @@ namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Customer\Edit\Tab; -use Mage; use Mage_Adminhtml_Block_Customer_Edit_Tab_Newsletter as Subject; use Mage_Customer_Model_Customer; use OpenMage\Tests\Unit\OpenMageTest; class NewsletterTest extends OpenMageTest { - /** @phpstan-ignore property.onlyWritten */ - private static Subject $subject; - - public static function setUpBeforeClass(): void - { - parent::setUpBeforeClass(); - self::$subject = new Subject(); - } - /** - * * @group Block */ public function testInitForm(): void diff --git a/tests/unit/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/ViewTest.php b/tests/unit/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/ViewTest.php index 8735cec6c50..08f044dd052 100644 --- a/tests/unit/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/ViewTest.php +++ b/tests/unit/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/ViewTest.php @@ -23,15 +23,6 @@ class ViewTest extends OpenMageTest { - /** @phpstan-ignore property.onlyWritten */ - private static Subject $subject; - - public static function setUpBeforeClass(): void - { - parent::setUpBeforeClass(); - self::$subject = new Subject(); - } - /** * @group Block */ diff --git a/tests/unit/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/EditTest.php b/tests/unit/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/EditTest.php index 81f87e18cfe..57e800c373e 100644 --- a/tests/unit/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/EditTest.php +++ b/tests/unit/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/EditTest.php @@ -23,15 +23,6 @@ class EditTest extends OpenMageTest { - /** @phpstan-ignore property.onlyWritten */ - private static Subject $subject; - - public static function setUpBeforeClass(): void - { - parent::setUpBeforeClass(); - self::$subject = new Subject(); - } - /** * @group Block */ diff --git a/tests/unit/Mage/Api/Model/UserTest.php b/tests/unit/Mage/Api/Model/UserTest.php index 6bb40c2543f..ad2439e72fe 100644 --- a/tests/unit/Mage/Api/Model/UserTest.php +++ b/tests/unit/Mage/Api/Model/UserTest.php @@ -17,28 +17,20 @@ namespace OpenMage\Tests\Unit\Mage\Api\Model; -use Mage; use Mage_Api_Model_User as Subject; use OpenMage\Tests\Unit\OpenMageTest; use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Api\Model\UserTrait; +use Zend_Validate_Exception; class UserTest extends OpenMageTest { use UserTrait; - /** @phpstan-ignore property.onlyWritten */ - private static Subject $subject; - - public static function setUpBeforeClass(): void - { - parent::setUpBeforeClass(); - self::$subject = Mage::getModel('api/user'); - } - /** * @dataProvider provideValidateApiUserData * @param array|true $expectedResult * @group Model + * @throws Zend_Validate_Exception */ public function testValidate($expectedResult, array $methods): void { diff --git a/tests/unit/Mage/Cms/Helper/PageTest.php b/tests/unit/Mage/Cms/Helper/PageTest.php index a77f21f79f2..1f62ed2034b 100644 --- a/tests/unit/Mage/Cms/Helper/PageTest.php +++ b/tests/unit/Mage/Cms/Helper/PageTest.php @@ -26,15 +26,6 @@ class PageTest extends OpenMageTest { use CmsTrait; - /** @phpstan-ignore property.onlyWritten */ - private static Subject $subject; - - public static function setUpBeforeClass(): void - { - parent::setUpBeforeClass(); - self::$subject = Mage::helper('cms/page'); - } - /** * @dataProvider provideGetUsedInStoreConfigPaths * @group Helper diff --git a/tests/unit/Mage/Customer/Model/CustomerTest.php b/tests/unit/Mage/Customer/Model/CustomerTest.php index d1c5a72c314..8ee7e8d626e 100644 --- a/tests/unit/Mage/Customer/Model/CustomerTest.php +++ b/tests/unit/Mage/Customer/Model/CustomerTest.php @@ -22,25 +22,18 @@ use Mage_Customer_Model_Customer as Subject; use OpenMage\Tests\Unit\OpenMageTest; use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Customer\CustomerTrait; +use Zend_Validate_Exception; class CustomerTest extends OpenMageTest { use CustomerTrait; - /** @phpstan-ignore property.onlyWritten */ - private static Subject $subject; - - public static function setUpBeforeClass(): void - { - parent::setUpBeforeClass(); - self::$subject = Mage::getModel('customer/customer'); - } - /** * @dataProvider provideValidateCustomerData * @param array|true $expectedResult * @group Mage_Customer_Model * @throws Mage_Core_Exception + * @throws Zend_Validate_Exception */ public function testValidate($expectedResult, array $methods): void { diff --git a/tests/unit/Mage/Log/Model/CustomerTest.php b/tests/unit/Mage/Log/Model/CustomerTest.php index c4977334ec9..8766a0919ab 100644 --- a/tests/unit/Mage/Log/Model/CustomerTest.php +++ b/tests/unit/Mage/Log/Model/CustomerTest.php @@ -28,15 +28,6 @@ class CustomerTest extends OpenMageTest { use CustomerTrait; - /** @phpstan-ignore property.onlyWritten */ - private static Subject $subject; - - public static function setUpBeforeClass(): void - { - parent::setUpBeforeClass(); - self::$subject = Mage::getModel('log/customer'); - } - /** * @dataProvider loadByCustomerDataProvider * @group Model diff --git a/tests/unit/Mage/Review/Model/ReviewTest.php b/tests/unit/Mage/Review/Model/ReviewTest.php index 56d96b3fcd2..435be9741eb 100644 --- a/tests/unit/Mage/Review/Model/ReviewTest.php +++ b/tests/unit/Mage/Review/Model/ReviewTest.php @@ -20,24 +20,17 @@ use Mage_Review_Model_Review as Subject; use OpenMage\Tests\Unit\OpenMageTest; use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Review\ReviewTrait; +use Zend_Validate_Exception; class ReviewTest extends OpenMageTest { use ReviewTrait; - /** @phpstan-ignore property.onlyWritten */ - private static Subject $subject; - - public static function setUpBeforeClass(): void - { - parent::setUpBeforeClass(); - self::$subject = Mage::getModel('review/review'); - } - /** * @dataProvider provideValidateReviewData * @param array|true $expectedResult * @group Model + * @throws Zend_Validate_Exception */ public function testValidate($expectedResult, array $methods): void { diff --git a/tests/unit/Mage/Sitemap/Model/SitemapTest.php b/tests/unit/Mage/Sitemap/Model/SitemapTest.php index 42f35f8d4d4..cd09fb49758 100644 --- a/tests/unit/Mage/Sitemap/Model/SitemapTest.php +++ b/tests/unit/Mage/Sitemap/Model/SitemapTest.php @@ -27,15 +27,6 @@ class SitemapTest extends OpenMageTest { use SitemapTrait; - /** @phpstan-ignore property.onlyWritten */ - private static Subject $subject; - - public static function setUpBeforeClass(): void - { - parent::setUpBeforeClass(); - self::$subject = Mage::getModel('sitemap/sitemap'); - } - /** * @dataProvider provideGetPreparedFilenameData * @group Model From cb7fcffa6f585455f7403d356d22fac6adf10358 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Thu, 17 Apr 2025 05:13:27 +0200 Subject: [PATCH 13/36] updated tests --- tests/unit/Mage/Cms/Block/BlockTest.php | 10 ++-------- tests/unit/Mage/Cms/Block/PageTest.php | 10 ++-------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/tests/unit/Mage/Cms/Block/BlockTest.php b/tests/unit/Mage/Cms/Block/BlockTest.php index 38357be6e55..6199d345e0e 100644 --- a/tests/unit/Mage/Cms/Block/BlockTest.php +++ b/tests/unit/Mage/Cms/Block/BlockTest.php @@ -18,6 +18,7 @@ namespace OpenMage\Tests\Unit\Mage\Cms\Block; use Mage_Cms_Block_Block as Subject; +use Mage_Core_Model_Store_Exception; use OpenMage\Tests\Unit\OpenMageTest; use OpenMage\Tests\Unit\Traits\DataProvider\Base\NumericStringTrait; @@ -25,17 +26,10 @@ class BlockTest extends OpenMageTest { use NumericStringTrait; - private static Subject $subject; - - public static function setUpBeforeClass(): void - { - parent::setUpBeforeClass(); - self::$subject = new Subject(); - } - /** * @dataProvider provideNumericString * @group Block + * @throws Mage_Core_Model_Store_Exception */ public function testGetCacheKeyInfo(string $blockId): void { diff --git a/tests/unit/Mage/Cms/Block/PageTest.php b/tests/unit/Mage/Cms/Block/PageTest.php index 9540cb2e016..ec54f4351d4 100644 --- a/tests/unit/Mage/Cms/Block/PageTest.php +++ b/tests/unit/Mage/Cms/Block/PageTest.php @@ -19,6 +19,7 @@ use Mage_Cms_Block_Page as Subject; use Mage_Cms_Model_Page; +use Mage_Core_Model_Store_Exception; use OpenMage\Tests\Unit\OpenMageTest; use OpenMage\Tests\Unit\Traits\DataProvider\Base\NumericStringTrait; @@ -26,17 +27,10 @@ class PageTest extends OpenMageTest { use NumericStringTrait; - private static Subject $subject; - - public static function setUpBeforeClass(): void - { - parent::setUpBeforeClass(); - self::$subject = new Subject(); - } - /** * @dataProvider provideNumericString * @group Block + * @throws Mage_Core_Model_Store_Exception */ public function testGetPage(string $pageId): void { From baf6ac76ef63c934d189a999e55337ca248703f6 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Thu, 17 Apr 2025 06:58:21 +0200 Subject: [PATCH 14/36] updated tests --- .../core/Mage/Adminhtml/Block/Widget/Grid.php | 5 ++ .../Index/Block/Adminhtml/Process/Grid.php | 14 ++-- .../Block/Adminhtml/Process/GridTest.php | 73 +++++++++++++++++++ .../Block/Adminhtml/Process/GridTrait.php | 56 ++++++++++++++ 4 files changed, 141 insertions(+), 7 deletions(-) create mode 100644 tests/unit/Mage/Index/Block/Adminhtml/Process/GridTest.php create mode 100644 tests/unit/Traits/DataProvider/Mage/Index/Block/Adminhtml/Process/GridTrait.php diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php index 5179c843b65..da91859cc5b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php @@ -25,6 +25,11 @@ */ class Mage_Adminhtml_Block_Widget_Grid extends Mage_Adminhtml_Block_Widget { + public const SEVERITY_CRITICAL = 'grid-severity-critical'; + public const SEVERITY_MAJOR = 'grid-severity-major'; + public const SEVERITY_MINOR = 'grid-severity-minor'; + public const SEVERITY_NOTICE = 'grid-severity-notice'; + /** * Columns array * diff --git a/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php b/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php index 4339faeb45c..6fc3cb46f8a 100644 --- a/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php +++ b/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php @@ -185,16 +185,16 @@ public function decorateStatus($value, $row, $column, $isExport) $class = ''; switch ($row->getStatus()) { case Mage_Index_Model_Process::STATUS_PENDING: - $class = 'grid-severity-notice'; + $class = self::SEVERITY_NOTICE; break; case Mage_Index_Model_Process::STATUS_RUNNING: - $class = 'grid-severity-major'; + $class = self::SEVERITY_MAJOR; break; case Mage_Index_Model_Process::STATUS_REQUIRE_REINDEX: - $class = 'grid-severity-critical'; + $class = self::SEVERITY_CRITICAL; break; } - return '' . $value . ''; + return sprintf('%s', $class, $value); } /** @@ -212,13 +212,13 @@ public function decorateUpdateRequired($value, $row, $column, $isExport) $class = ''; switch ($row->getUpdateRequired()) { case 0: - $class = 'grid-severity-notice'; + $class = self::SEVERITY_NOTICE; break; case 1: - $class = 'grid-severity-critical'; + $class = self::SEVERITY_CRITICAL; break; } - return '' . $value . ''; + return sprintf('%s', $class, $value); } /** diff --git a/tests/unit/Mage/Index/Block/Adminhtml/Process/GridTest.php b/tests/unit/Mage/Index/Block/Adminhtml/Process/GridTest.php new file mode 100644 index 00000000000..0cfaaaf0cdd --- /dev/null +++ b/tests/unit/Mage/Index/Block/Adminhtml/Process/GridTest.php @@ -0,0 +1,73 @@ +setStatus($data); + + $expectedResult = sprintf('%s', $expectedResult, $value); + static::assertSame($expectedResult, self::$subject->decorateStatus($value, $row, $column, $isExpected)); + } + + /** + * @covers Mage_Index_Model_Indexer::decorateUpdateRequired() + * @dataProvider provideDecorateUpdateRequiredData + * @group Model + */ + public function testDecorateUpdateRequired(string $expectedResult, int $data): void + { + $value = '1'; + $row = new Mage_Index_Model_Process(); + $column = new Mage_Adminhtml_Block_Widget_Grid_Column(); + $isExpected = false; + + $row->setUpdateRequired($data); + + $expectedResult = sprintf('%s', $expectedResult, $value); + static::assertSame($expectedResult, self::$subject->decorateUpdateRequired($value, $row, $column, $isExpected)); + } +} diff --git a/tests/unit/Traits/DataProvider/Mage/Index/Block/Adminhtml/Process/GridTrait.php b/tests/unit/Traits/DataProvider/Mage/Index/Block/Adminhtml/Process/GridTrait.php new file mode 100644 index 00000000000..4c962e2eea7 --- /dev/null +++ b/tests/unit/Traits/DataProvider/Mage/Index/Block/Adminhtml/Process/GridTrait.php @@ -0,0 +1,56 @@ + [ + Mage_Adminhtml_Block_Widget_Grid::SEVERITY_NOTICE, + Mage_Index_Model_Process::STATUS_PENDING, + ]; + + yield 'working' => [ + Mage_Adminhtml_Block_Widget_Grid::SEVERITY_MAJOR, + Mage_Index_Model_Process::STATUS_RUNNING, + ]; + + yield 'require reindex' => [ + Mage_Adminhtml_Block_Widget_Grid::SEVERITY_CRITICAL, + Mage_Index_Model_Process::STATUS_REQUIRE_REINDEX, + ]; + } + + public function provideDecorateUpdateRequiredData(): Generator + { + yield 'no' => [ + Mage_Adminhtml_Block_Widget_Grid::SEVERITY_NOTICE, + 0, + ]; + + yield 'yes' => [ + Mage_Adminhtml_Block_Widget_Grid::SEVERITY_CRITICAL, + 1, + ]; + } +} From 2b611a6f0ffe85182e77960889281da78db66dc7 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Thu, 17 Apr 2025 07:59:05 +0200 Subject: [PATCH 15/36] update --- app/code/core/Mage/Adminhtml/Block/Widget/Grid.php | 1 + app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php | 4 ++-- tests/unit/Mage/Index/Block/Adminhtml/Process/GridTest.php | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php index da91859cc5b..36d85a525de 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php @@ -25,6 +25,7 @@ */ class Mage_Adminhtml_Block_Widget_Grid extends Mage_Adminhtml_Block_Widget { + public const PATTERN_SEVERITY = '%s'; public const SEVERITY_CRITICAL = 'grid-severity-critical'; public const SEVERITY_MAJOR = 'grid-severity-major'; public const SEVERITY_MINOR = 'grid-severity-minor'; diff --git a/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php b/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php index 6fc3cb46f8a..f0fc34f4c4c 100644 --- a/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php +++ b/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php @@ -194,7 +194,7 @@ public function decorateStatus($value, $row, $column, $isExport) $class = self::SEVERITY_CRITICAL; break; } - return sprintf('%s', $class, $value); + return sprintf(self::PATTERN_SEVERITY, $class, $value); } /** @@ -218,7 +218,7 @@ public function decorateUpdateRequired($value, $row, $column, $isExport) $class = self::SEVERITY_CRITICAL; break; } - return sprintf('%s', $class, $value); + return sprintf(self::PATTERN_SEVERITY, $class, $value); } /** diff --git a/tests/unit/Mage/Index/Block/Adminhtml/Process/GridTest.php b/tests/unit/Mage/Index/Block/Adminhtml/Process/GridTest.php index 0cfaaaf0cdd..d09d43ebf77 100644 --- a/tests/unit/Mage/Index/Block/Adminhtml/Process/GridTest.php +++ b/tests/unit/Mage/Index/Block/Adminhtml/Process/GridTest.php @@ -49,7 +49,7 @@ public function testDecorateStatus(string $expectedResult, string $data): void $row->setStatus($data); - $expectedResult = sprintf('%s', $expectedResult, $value); + $expectedResult = sprintf(self::$subject::PATTERN_SEVERITY, $expectedResult, $value); static::assertSame($expectedResult, self::$subject->decorateStatus($value, $row, $column, $isExpected)); } @@ -67,7 +67,7 @@ public function testDecorateUpdateRequired(string $expectedResult, int $data): v $row->setUpdateRequired($data); - $expectedResult = sprintf('%s', $expectedResult, $value); + $expectedResult = sprintf(self::$subject::PATTERN_SEVERITY, $expectedResult, $value); static::assertSame($expectedResult, self::$subject->decorateUpdateRequired($value, $row, $column, $isExpected)); } } From ef60fa0fdb56725606ad3e51612e9fb1ab99b08b Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Thu, 17 Apr 2025 08:06:40 +0200 Subject: [PATCH 16/36] update --- app/code/core/Mage/Adminhtml/Block/Cache/Grid.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php b/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php index 0052b72901d..010754b55b6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php @@ -107,15 +107,14 @@ public function decorateStatus($value, $row, $column, $isExport) { $class = ''; if (isset($this->_invalidatedTypes[$row->getId()])) { - $cell = '' . $this->__('Invalidated') . ''; + $class = self::SEVERITY_MINOR; + $value = $this->__('Invalidated'); + } elseif ($row->getStatus()) { + $class = self::SEVERITY_NOTICE; } else { - if ($row->getStatus()) { - $cell = '' . $value . ''; - } else { - $cell = '' . $value . ''; - } + $class = self::SEVERITY_CRITICAL; } - return $cell; + return sprintf(self::PATTERN_SEVERITY, $class, $value); } /** From 2b8504f5a91040fc4b97ba734412bd610fab81cb Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Thu, 17 Apr 2025 08:12:06 +0200 Subject: [PATCH 17/36] update --- app/code/core/Mage/Adminhtml/Block/Cache/Grid.php | 6 +++--- app/code/core/Mage/Adminhtml/Block/Widget/Grid.php | 10 +++++----- .../core/Mage/Index/Block/Adminhtml/Process/Grid.php | 10 +++++----- .../Mage/Index/Block/Adminhtml/Process/GridTrait.php | 10 +++++----- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php b/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php index 010754b55b6..09f28c28366 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php @@ -107,12 +107,12 @@ public function decorateStatus($value, $row, $column, $isExport) { $class = ''; if (isset($this->_invalidatedTypes[$row->getId()])) { - $class = self::SEVERITY_MINOR; + $class = self::CLASS_SEVERITY_MINOR; $value = $this->__('Invalidated'); } elseif ($row->getStatus()) { - $class = self::SEVERITY_NOTICE; + $class = self::CLASS_SEVERITY_NOTICE; } else { - $class = self::SEVERITY_CRITICAL; + $class = self::CLASS_SEVERITY_CRITICAL; } return sprintf(self::PATTERN_SEVERITY, $class, $value); } diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php index 36d85a525de..f7e6b78c2fc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php @@ -25,11 +25,11 @@ */ class Mage_Adminhtml_Block_Widget_Grid extends Mage_Adminhtml_Block_Widget { - public const PATTERN_SEVERITY = '%s'; - public const SEVERITY_CRITICAL = 'grid-severity-critical'; - public const SEVERITY_MAJOR = 'grid-severity-major'; - public const SEVERITY_MINOR = 'grid-severity-minor'; - public const SEVERITY_NOTICE = 'grid-severity-notice'; + public const PATTERN_SEVERITY = '%s'; + public const CLASS_SEVERITY_CRITICAL = 'grid-severity-critical'; + public const CLASS_SEVERITY_MAJOR = 'grid-severity-major'; + public const CLASS_SEVERITY_MINOR = 'grid-severity-minor'; + public const CLASS_SEVERITY_NOTICE = 'grid-severity-notice'; /** * Columns array diff --git a/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php b/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php index f0fc34f4c4c..6397eeb819f 100644 --- a/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php +++ b/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php @@ -185,13 +185,13 @@ public function decorateStatus($value, $row, $column, $isExport) $class = ''; switch ($row->getStatus()) { case Mage_Index_Model_Process::STATUS_PENDING: - $class = self::SEVERITY_NOTICE; + $class = self::CLASS_SEVERITY_NOTICE; break; case Mage_Index_Model_Process::STATUS_RUNNING: - $class = self::SEVERITY_MAJOR; + $class = self::CLASS_SEVERITY_MAJOR; break; case Mage_Index_Model_Process::STATUS_REQUIRE_REINDEX: - $class = self::SEVERITY_CRITICAL; + $class = self::CLASS_SEVERITY_CRITICAL; break; } return sprintf(self::PATTERN_SEVERITY, $class, $value); @@ -212,10 +212,10 @@ public function decorateUpdateRequired($value, $row, $column, $isExport) $class = ''; switch ($row->getUpdateRequired()) { case 0: - $class = self::SEVERITY_NOTICE; + $class = self::CLASS_SEVERITY_NOTICE; break; case 1: - $class = self::SEVERITY_CRITICAL; + $class = self::CLASS_SEVERITY_CRITICAL; break; } return sprintf(self::PATTERN_SEVERITY, $class, $value); diff --git a/tests/unit/Traits/DataProvider/Mage/Index/Block/Adminhtml/Process/GridTrait.php b/tests/unit/Traits/DataProvider/Mage/Index/Block/Adminhtml/Process/GridTrait.php index 4c962e2eea7..7df719eb888 100644 --- a/tests/unit/Traits/DataProvider/Mage/Index/Block/Adminhtml/Process/GridTrait.php +++ b/tests/unit/Traits/DataProvider/Mage/Index/Block/Adminhtml/Process/GridTrait.php @@ -26,17 +26,17 @@ trait GridTrait public function provideDecorateStatusData(): Generator { yield 'pending' => [ - Mage_Adminhtml_Block_Widget_Grid::SEVERITY_NOTICE, + Mage_Adminhtml_Block_Widget_Grid::CLASS_SEVERITY_NOTICE, Mage_Index_Model_Process::STATUS_PENDING, ]; yield 'working' => [ - Mage_Adminhtml_Block_Widget_Grid::SEVERITY_MAJOR, + Mage_Adminhtml_Block_Widget_Grid::CLASS_SEVERITY_MAJOR, Mage_Index_Model_Process::STATUS_RUNNING, ]; yield 'require reindex' => [ - Mage_Adminhtml_Block_Widget_Grid::SEVERITY_CRITICAL, + Mage_Adminhtml_Block_Widget_Grid::CLASS_SEVERITY_CRITICAL, Mage_Index_Model_Process::STATUS_REQUIRE_REINDEX, ]; } @@ -44,12 +44,12 @@ public function provideDecorateStatusData(): Generator public function provideDecorateUpdateRequiredData(): Generator { yield 'no' => [ - Mage_Adminhtml_Block_Widget_Grid::SEVERITY_NOTICE, + Mage_Adminhtml_Block_Widget_Grid::CLASS_SEVERITY_NOTICE, 0, ]; yield 'yes' => [ - Mage_Adminhtml_Block_Widget_Grid::SEVERITY_CRITICAL, + Mage_Adminhtml_Block_Widget_Grid::CLASS_SEVERITY_CRITICAL, 1, ]; } From e402396b514bf2d1e274726ce2cf68fa53f1560c Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Thu, 17 Apr 2025 08:13:56 +0200 Subject: [PATCH 18/36] update --- app/code/core/Mage/Adminhtml/Block/Cache/Grid.php | 6 +++--- app/code/core/Mage/Adminhtml/Block/Widget/Grid.php | 8 ++++---- .../core/Mage/Index/Block/Adminhtml/Process/Grid.php | 10 +++++----- .../Mage/Index/Block/Adminhtml/Process/GridTrait.php | 10 +++++----- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php b/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php index 09f28c28366..6b18284bd58 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php @@ -107,12 +107,12 @@ public function decorateStatus($value, $row, $column, $isExport) { $class = ''; if (isset($this->_invalidatedTypes[$row->getId()])) { - $class = self::CLASS_SEVERITY_MINOR; + $class = self::CSS_SEVERITY_MINOR; $value = $this->__('Invalidated'); } elseif ($row->getStatus()) { - $class = self::CLASS_SEVERITY_NOTICE; + $class = self::CSS_SEVERITY_NOTICE; } else { - $class = self::CLASS_SEVERITY_CRITICAL; + $class = self::CSS_SEVERITY_CRITICAL; } return sprintf(self::PATTERN_SEVERITY, $class, $value); } diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php index f7e6b78c2fc..a6343110903 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php @@ -26,10 +26,10 @@ class Mage_Adminhtml_Block_Widget_Grid extends Mage_Adminhtml_Block_Widget { public const PATTERN_SEVERITY = '%s'; - public const CLASS_SEVERITY_CRITICAL = 'grid-severity-critical'; - public const CLASS_SEVERITY_MAJOR = 'grid-severity-major'; - public const CLASS_SEVERITY_MINOR = 'grid-severity-minor'; - public const CLASS_SEVERITY_NOTICE = 'grid-severity-notice'; + public const CSS_SEVERITY_CRITICAL = 'grid-severity-critical'; + public const CSS_SEVERITY_MAJOR = 'grid-severity-major'; + public const CSS_SEVERITY_MINOR = 'grid-severity-minor'; + public const CSS_SEVERITY_NOTICE = 'grid-severity-notice'; /** * Columns array diff --git a/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php b/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php index 6397eeb819f..b9c13823fdb 100644 --- a/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php +++ b/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php @@ -185,13 +185,13 @@ public function decorateStatus($value, $row, $column, $isExport) $class = ''; switch ($row->getStatus()) { case Mage_Index_Model_Process::STATUS_PENDING: - $class = self::CLASS_SEVERITY_NOTICE; + $class = self::CSS_SEVERITY_NOTICE; break; case Mage_Index_Model_Process::STATUS_RUNNING: - $class = self::CLASS_SEVERITY_MAJOR; + $class = self::CSS_SEVERITY_MAJOR; break; case Mage_Index_Model_Process::STATUS_REQUIRE_REINDEX: - $class = self::CLASS_SEVERITY_CRITICAL; + $class = self::CSS_SEVERITY_CRITICAL; break; } return sprintf(self::PATTERN_SEVERITY, $class, $value); @@ -212,10 +212,10 @@ public function decorateUpdateRequired($value, $row, $column, $isExport) $class = ''; switch ($row->getUpdateRequired()) { case 0: - $class = self::CLASS_SEVERITY_NOTICE; + $class = self::CSS_SEVERITY_NOTICE; break; case 1: - $class = self::CLASS_SEVERITY_CRITICAL; + $class = self::CSS_SEVERITY_CRITICAL; break; } return sprintf(self::PATTERN_SEVERITY, $class, $value); diff --git a/tests/unit/Traits/DataProvider/Mage/Index/Block/Adminhtml/Process/GridTrait.php b/tests/unit/Traits/DataProvider/Mage/Index/Block/Adminhtml/Process/GridTrait.php index 7df719eb888..ee388e7708c 100644 --- a/tests/unit/Traits/DataProvider/Mage/Index/Block/Adminhtml/Process/GridTrait.php +++ b/tests/unit/Traits/DataProvider/Mage/Index/Block/Adminhtml/Process/GridTrait.php @@ -26,17 +26,17 @@ trait GridTrait public function provideDecorateStatusData(): Generator { yield 'pending' => [ - Mage_Adminhtml_Block_Widget_Grid::CLASS_SEVERITY_NOTICE, + Mage_Adminhtml_Block_Widget_Grid::CSS_SEVERITY_NOTICE, Mage_Index_Model_Process::STATUS_PENDING, ]; yield 'working' => [ - Mage_Adminhtml_Block_Widget_Grid::CLASS_SEVERITY_MAJOR, + Mage_Adminhtml_Block_Widget_Grid::CSS_SEVERITY_MAJOR, Mage_Index_Model_Process::STATUS_RUNNING, ]; yield 'require reindex' => [ - Mage_Adminhtml_Block_Widget_Grid::CLASS_SEVERITY_CRITICAL, + Mage_Adminhtml_Block_Widget_Grid::CSS_SEVERITY_CRITICAL, Mage_Index_Model_Process::STATUS_REQUIRE_REINDEX, ]; } @@ -44,12 +44,12 @@ public function provideDecorateStatusData(): Generator public function provideDecorateUpdateRequiredData(): Generator { yield 'no' => [ - Mage_Adminhtml_Block_Widget_Grid::CLASS_SEVERITY_NOTICE, + Mage_Adminhtml_Block_Widget_Grid::CSS_SEVERITY_NOTICE, 0, ]; yield 'yes' => [ - Mage_Adminhtml_Block_Widget_Grid::CLASS_SEVERITY_CRITICAL, + Mage_Adminhtml_Block_Widget_Grid::CSS_SEVERITY_CRITICAL, 1, ]; } From 22372a5a0fbf6299cd410b30f4500d07c3d3b1db Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Thu, 17 Apr 2025 08:18:14 +0200 Subject: [PATCH 19/36] update --- .../Adminhtml/Block/Permissions/OrphanedResource/Grid.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/OrphanedResource/Grid.php b/app/code/core/Mage/Adminhtml/Block/Permissions/OrphanedResource/Grid.php index 143a2dd87e2..8ae15a176ea 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/OrphanedResource/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/OrphanedResource/Grid.php @@ -15,6 +15,8 @@ * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +use Mage_Adminhtml_Block_Widget_Grid_Massaction_Abstract as MassAction; + /** * Adminhtml permissions orphanedResource grid * @@ -75,7 +77,7 @@ protected function _prepareMassaction() $this->setMassactionIdField('resource_id'); $this->getMassactionBlock()->setFormFieldName('resource_id'); - $this->getMassactionBlock()->addItem('delete', [ + $this->getMassactionBlock()->addItem(MassAction::DELETE, [ 'label' => Mage::helper('adminhtml')->__('Delete'), 'url' => $this->getUrl('*/*/massDelete'), 'confirm' => Mage::helper('adminhtml')->__('Are you sure you want to do this?'), From f14d4f8fc4b8cc8418c4eaec0716b5da56974250 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Thu, 17 Apr 2025 08:25:40 +0200 Subject: [PATCH 20/36] typo --- tests/unit/Mage/Index/Block/Adminhtml/Process/GridTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/Mage/Index/Block/Adminhtml/Process/GridTest.php b/tests/unit/Mage/Index/Block/Adminhtml/Process/GridTest.php index d09d43ebf77..80c7c14d2bf 100644 --- a/tests/unit/Mage/Index/Block/Adminhtml/Process/GridTest.php +++ b/tests/unit/Mage/Index/Block/Adminhtml/Process/GridTest.php @@ -36,7 +36,7 @@ public static function setUpBeforeClass(): void } /** - * @covers Mage_Index_Model_Indexer::decorateStatus() + * @covers Mage_Index_Block_Adminhtml_Process_Grid::decorateStatus() * @dataProvider provideDecorateStatusData * @group Model */ @@ -54,7 +54,7 @@ public function testDecorateStatus(string $expectedResult, string $data): void } /** - * @covers Mage_Index_Model_Indexer::decorateUpdateRequired() + * @covers Mage_Index_Block_Adminhtml_Process_Grid::decorateUpdateRequired() * @dataProvider provideDecorateUpdateRequiredData * @group Model */ From 3dc1304e459ca49029418b0d65ea8464fb7e444b Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Thu, 17 Apr 2025 09:06:56 +0200 Subject: [PATCH 21/36] updated tests --- .../Controllers/IndexControllerTest.php | 64 +-------------- .../Controllers/IndexControllerTrait.php | 78 +++++++++++++++++++ 2 files changed, 81 insertions(+), 61 deletions(-) create mode 100644 tests/unit/Traits/DataProvider/Mage/Contacts/Controllers/IndexControllerTrait.php diff --git a/tests/unit/Mage/Contacts/Controllers/IndexControllerTest.php b/tests/unit/Mage/Contacts/Controllers/IndexControllerTest.php index aeb3d4f6d8e..6a4a47159b1 100644 --- a/tests/unit/Mage/Contacts/Controllers/IndexControllerTest.php +++ b/tests/unit/Mage/Contacts/Controllers/IndexControllerTest.php @@ -17,22 +17,19 @@ namespace OpenMage\Tests\Unit\Mage\Contacts\Controllers; -use Generator; use Mage; use Mage_Contacts_IndexController as Subject; use Mage_Core_Exception; use Mage_Customer_Model_Session; use OpenMage\Tests\Unit\OpenMageTest; +use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Contacts\Controllers\IndexControllerTrait; class IndexControllerTest extends OpenMageTest { - protected function setUp(): void - { - Mage::app(); - } + use IndexControllerTrait; /** - * @dataProvider postActionDataProvider + * @dataProvider providePostActionData * @group Controller * @group runInSeparateProcess * @runInSeparateProcess @@ -75,59 +72,4 @@ public function testPostAction(array $postData, bool $isFormKeyValid, ?string $e Mage::unregister('_singleton/customer/session'); } - - public function postActionDataProvider(): Generator - { - $validData = [ - 'name' => 'John Doe', - 'email' => 'john.doe@example.com', - 'comment' => 'Test comment', - ]; - - $error = 'Unable to submit your request. Please, try again later'; - - #yield 'valid data' => [ - # $validData, - # true, - # null, - #]; - - yield 'invalid form key' => [ - $validData, - false, - 'Invalid Form Key. Please submit your request again.', - ]; - - $data = $validData; - $data['name'] = ''; - yield 'missing name' => [ - $data, - true, - $error, - ]; - - $data = $validData; - $data['email'] = ''; - yield 'missing email' => [ - $data, - true, - $error, - ]; - - $data = $validData; - $data['email'] = 'invalid-email'; - yield 'invalid email' => [ - $data, - true, - $error, - ]; - - $data = $validData; - $data['comment'] = ''; - yield 'missing comment' => [ - $data, - true, - $error, - ]; - } } diff --git a/tests/unit/Traits/DataProvider/Mage/Contacts/Controllers/IndexControllerTrait.php b/tests/unit/Traits/DataProvider/Mage/Contacts/Controllers/IndexControllerTrait.php new file mode 100644 index 00000000000..cb7c6f371d2 --- /dev/null +++ b/tests/unit/Traits/DataProvider/Mage/Contacts/Controllers/IndexControllerTrait.php @@ -0,0 +1,78 @@ + 'John Doe', + 'email' => 'john.doe@example.com', + 'comment' => 'Test comment', + ]; + + $error = 'Unable to submit your request. Please, try again later'; + + #yield 'valid data' => [ + # $validData, + # true, + # null, + #]; + + yield 'invalid form key' => [ + $validData, + false, + 'Invalid Form Key. Please submit your request again.', + ]; + + $data = $validData; + $data['name'] = ''; + yield 'missing name' => [ + $data, + true, + $error, + ]; + + $data = $validData; + $data['email'] = ''; + yield 'missing email' => [ + $data, + true, + $error, + ]; + + $data = $validData; + $data['email'] = 'invalid-email'; + yield 'invalid email' => [ + $data, + true, + $error, + ]; + + $data = $validData; + $data['comment'] = ''; + yield 'missing comment' => [ + $data, + true, + $error, + ]; + } +} From 8d179d6b3a89e7fa25d24ebaaf2d1fc1df9e13e3 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Thu, 17 Apr 2025 15:28:12 +0200 Subject: [PATCH 22/36] updated tests --- tests/unit/Base/ClassLoadingTest.php | 1 - tests/unit/Base/DefaultConfigTest.php | 2 -- tests/unit/Base/XmlFileLoadingTest.php | 2 -- tests/unit/Error/ProcessorTest.php | 1 - tests/unit/Mage/Catalog/Model/Resource/Eav/AttributeTest.php | 1 - tests/unit/Mage/Core/Model/LayoutTest.php | 1 - tests/unit/Mage/Customer/Model/CustomerTest.php | 1 - tests/unit/Mage/Tax/Helper/DataTest.php | 2 -- 8 files changed, 11 deletions(-) diff --git a/tests/unit/Base/ClassLoadingTest.php b/tests/unit/Base/ClassLoadingTest.php index 15bc6fb8bfd..8832abdce76 100644 --- a/tests/unit/Base/ClassLoadingTest.php +++ b/tests/unit/Base/ClassLoadingTest.php @@ -23,7 +23,6 @@ class ClassLoadingTest extends TestCase { /** - * @group Base * @dataProvider provideClassExistsData */ public function testClassExists(bool $expectedResult, string $class): void diff --git a/tests/unit/Base/DefaultConfigTest.php b/tests/unit/Base/DefaultConfigTest.php index ad12d65c5c3..273ffea7335 100644 --- a/tests/unit/Base/DefaultConfigTest.php +++ b/tests/unit/Base/DefaultConfigTest.php @@ -27,8 +27,6 @@ class DefaultConfigTest extends TestCase { /** * @dataProvider provideGetStoreConfig - * @group Base - * @group Default_Config */ public function testGetStoreConfig(string $expectedResult, string $path, bool|int|Mage_Core_Model_Store|null|string $store = null): void { diff --git a/tests/unit/Base/XmlFileLoadingTest.php b/tests/unit/Base/XmlFileLoadingTest.php index b2fea26ceae..b94277fd373 100644 --- a/tests/unit/Base/XmlFileLoadingTest.php +++ b/tests/unit/Base/XmlFileLoadingTest.php @@ -25,7 +25,6 @@ class XmlFileLoadingTest extends TestCase { /** - * @group Base * @dataProvider provideXmlFiles */ public function testFileLoading(string $filepath): void @@ -40,7 +39,6 @@ public function testFileLoading(string $filepath): void } /** - * @group Base * @dataProvider provideXmlFiles */ public function testXmlReaderIsValid(string $filepath): void diff --git a/tests/unit/Error/ProcessorTest.php b/tests/unit/Error/ProcessorTest.php index 1be6cef4ed3..12085d32518 100644 --- a/tests/unit/Error/ProcessorTest.php +++ b/tests/unit/Error/ProcessorTest.php @@ -39,7 +39,6 @@ public function tearDown(): void /** * @dataProvider provideGetHostUrl - * @group Error */ public function testGetHostUrl(string $expectedResult, array $serverVars): void { diff --git a/tests/unit/Mage/Catalog/Model/Resource/Eav/AttributeTest.php b/tests/unit/Mage/Catalog/Model/Resource/Eav/AttributeTest.php index cce4cdf0281..f43e50e1382 100644 --- a/tests/unit/Mage/Catalog/Model/Resource/Eav/AttributeTest.php +++ b/tests/unit/Mage/Catalog/Model/Resource/Eav/AttributeTest.php @@ -36,7 +36,6 @@ public function setUp(): void /** * @dataProvider provideGetStoreId * @group Model - * @group Mage_Catalog_Model_Resource */ public function testGetStoreId(?int $expectedResult, int|string|null $withStoreId): void { diff --git a/tests/unit/Mage/Core/Model/LayoutTest.php b/tests/unit/Mage/Core/Model/LayoutTest.php index 827501ac59e..8204c55a095 100644 --- a/tests/unit/Mage/Core/Model/LayoutTest.php +++ b/tests/unit/Mage/Core/Model/LayoutTest.php @@ -60,7 +60,6 @@ public function testCreateBlock(bool|string $expectedResult, bool $willReturnBlo * @covers Mage_Core_Model_Layout::getBlockSingleton() * @dataProvider provideGetBlockSingleton * @group Model - * @group pr4411 * * @param class-string $expectedResult */ diff --git a/tests/unit/Mage/Customer/Model/CustomerTest.php b/tests/unit/Mage/Customer/Model/CustomerTest.php index 8ee7e8d626e..c8ba2ef629a 100644 --- a/tests/unit/Mage/Customer/Model/CustomerTest.php +++ b/tests/unit/Mage/Customer/Model/CustomerTest.php @@ -31,7 +31,6 @@ class CustomerTest extends OpenMageTest /** * @dataProvider provideValidateCustomerData * @param array|true $expectedResult - * @group Mage_Customer_Model * @throws Mage_Core_Exception * @throws Zend_Validate_Exception */ diff --git a/tests/unit/Mage/Tax/Helper/DataTest.php b/tests/unit/Mage/Tax/Helper/DataTest.php index 775f5fa464c..fac737e0f8b 100644 --- a/tests/unit/Mage/Tax/Helper/DataTest.php +++ b/tests/unit/Mage/Tax/Helper/DataTest.php @@ -135,7 +135,6 @@ public function testGetPriceFormat(): void /** * @group Helper - * @group UsesSampleDataFlag */ public function testGetTaxRatesByProductClass(): void { @@ -147,7 +146,6 @@ public function testGetTaxRatesByProductClass(): void /** * @group Helper - * @group UsesSampleDataFlag */ public function testGetAllRatesByProductClass(): void { From f25ae0102ad8e99f5267bf8b7ab78cfa088e402a Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Thu, 17 Apr 2025 15:29:23 +0200 Subject: [PATCH 23/36] updated tests --- tests/unit/Mage/Core/Helper/DataTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/unit/Mage/Core/Helper/DataTest.php b/tests/unit/Mage/Core/Helper/DataTest.php index 3f6b072648c..a401cb5f197 100644 --- a/tests/unit/Mage/Core/Helper/DataTest.php +++ b/tests/unit/Mage/Core/Helper/DataTest.php @@ -75,7 +75,6 @@ public function testValidateKey(): void /** * @dataProvider provideFormatTimezoneDate * @group Helper - * @group Dates */ public function testFormatTimezoneDate( string $expectedResult, From 64b1ebf3d42493ee73de3fd3f5853654e3b2e5f5 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Thu, 17 Apr 2025 15:43:48 +0200 Subject: [PATCH 24/36] updated tests --- tests/unit/Mage/Adminhtml/Block/System/Cache/Form/FormTest.php | 1 - tests/unit/Mage/Adminhtml/Block/System/Config/Form/FormTest.php | 1 - tests/unit/Mage/Cms/Helper/PageTest.php | 1 - tests/unit/Mage/Cms/Model/PageTest.php | 1 - tests/unit/Mage/Core/Helper/DataTest.php | 1 - tests/unit/Mage/Customer/Model/CustomerTest.php | 1 - tests/unit/Mage/Page/Block/RedirectTest.php | 1 - tests/unit/Mage/Review/Model/ReviewTest.php | 1 - tests/unit/Mage/Rule/Model/AbstractTest.php | 1 - tests/unit/Mage/Sales/Block/Order/Item/Renderer/DefaultTest.php | 1 - tests/unit/Mage/Sitemap/Model/SitemapTest.php | 1 - tests/unit/Mage/Uploader/Block/AbstractTest.php | 1 - 12 files changed, 12 deletions(-) diff --git a/tests/unit/Mage/Adminhtml/Block/System/Cache/Form/FormTest.php b/tests/unit/Mage/Adminhtml/Block/System/Cache/Form/FormTest.php index 7b0732129cc..4363da92935 100644 --- a/tests/unit/Mage/Adminhtml/Block/System/Cache/Form/FormTest.php +++ b/tests/unit/Mage/Adminhtml/Block/System/Cache/Form/FormTest.php @@ -17,7 +17,6 @@ namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\System\Cache\Form; -use Mage; use Mage_Adminhtml_Block_System_Cache_Form as Subject; use OpenMage\Tests\Unit\OpenMageTest; diff --git a/tests/unit/Mage/Adminhtml/Block/System/Config/Form/FormTest.php b/tests/unit/Mage/Adminhtml/Block/System/Config/Form/FormTest.php index 8b8f8afa8dc..94fdbd31319 100644 --- a/tests/unit/Mage/Adminhtml/Block/System/Config/Form/FormTest.php +++ b/tests/unit/Mage/Adminhtml/Block/System/Config/Form/FormTest.php @@ -17,7 +17,6 @@ namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\System\Config\Form; -use Mage; use Mage_Adminhtml_Block_System_Config_Form as Subject; use OpenMage\Tests\Unit\OpenMageTest; diff --git a/tests/unit/Mage/Cms/Helper/PageTest.php b/tests/unit/Mage/Cms/Helper/PageTest.php index 1f62ed2034b..383f7008b50 100644 --- a/tests/unit/Mage/Cms/Helper/PageTest.php +++ b/tests/unit/Mage/Cms/Helper/PageTest.php @@ -17,7 +17,6 @@ namespace OpenMage\Tests\Unit\Mage\Cms\Helper; -use Mage; use Mage_Cms_Helper_Page as Subject; use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Cms\CmsTrait; use OpenMage\Tests\Unit\OpenMageTest; diff --git a/tests/unit/Mage/Cms/Model/PageTest.php b/tests/unit/Mage/Cms/Model/PageTest.php index 22d8aa2b616..a830768bcd8 100644 --- a/tests/unit/Mage/Cms/Model/PageTest.php +++ b/tests/unit/Mage/Cms/Model/PageTest.php @@ -19,7 +19,6 @@ use Mage; use Mage_Cms_Model_Page as Subject; -use Mage_Core_Model_Resource_Db_Collection_Abstract; use OpenMage\Tests\Unit\OpenMageTest; class PageTest extends OpenMageTest diff --git a/tests/unit/Mage/Core/Helper/DataTest.php b/tests/unit/Mage/Core/Helper/DataTest.php index a401cb5f197..149471e795f 100644 --- a/tests/unit/Mage/Core/Helper/DataTest.php +++ b/tests/unit/Mage/Core/Helper/DataTest.php @@ -18,7 +18,6 @@ namespace OpenMage\Tests\Unit\Mage\Core\Helper; use Mage; -use Mage_Core_Exception; use Mage_Core_Helper_Data as Subject; use Mage_Core_Model_Encryption; use Mage_Core_Model_Locale; diff --git a/tests/unit/Mage/Customer/Model/CustomerTest.php b/tests/unit/Mage/Customer/Model/CustomerTest.php index c8ba2ef629a..d5494efc371 100644 --- a/tests/unit/Mage/Customer/Model/CustomerTest.php +++ b/tests/unit/Mage/Customer/Model/CustomerTest.php @@ -17,7 +17,6 @@ namespace OpenMage\Tests\Unit\Mage\Customer\Model; -use Mage; use Mage_Core_Exception; use Mage_Customer_Model_Customer as Subject; use OpenMage\Tests\Unit\OpenMageTest; diff --git a/tests/unit/Mage/Page/Block/RedirectTest.php b/tests/unit/Mage/Page/Block/RedirectTest.php index da8ebdf7cfa..08ae089091c 100644 --- a/tests/unit/Mage/Page/Block/RedirectTest.php +++ b/tests/unit/Mage/Page/Block/RedirectTest.php @@ -17,7 +17,6 @@ namespace OpenMage\Tests\Unit\Mage\Page\Block; -use Mage; use Mage_Page_Block_Redirect as Subject; use OpenMage\Tests\Unit\OpenMageTest; diff --git a/tests/unit/Mage/Review/Model/ReviewTest.php b/tests/unit/Mage/Review/Model/ReviewTest.php index 435be9741eb..30eefd82914 100644 --- a/tests/unit/Mage/Review/Model/ReviewTest.php +++ b/tests/unit/Mage/Review/Model/ReviewTest.php @@ -16,7 +16,6 @@ namespace OpenMage\Tests\Unit\Mage\Review\Model; -use Mage; use Mage_Review_Model_Review as Subject; use OpenMage\Tests\Unit\OpenMageTest; use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Review\ReviewTrait; diff --git a/tests/unit/Mage/Rule/Model/AbstractTest.php b/tests/unit/Mage/Rule/Model/AbstractTest.php index ef5716f69c2..94adefe68eb 100644 --- a/tests/unit/Mage/Rule/Model/AbstractTest.php +++ b/tests/unit/Mage/Rule/Model/AbstractTest.php @@ -19,7 +19,6 @@ use Composer\InstalledVersions; use Error; -use Mage; use Mage_Core_Exception; use Mage_Rule_Model_Abstract as Subject; use Mage_Rule_Model_Action_Collection; diff --git a/tests/unit/Mage/Sales/Block/Order/Item/Renderer/DefaultTest.php b/tests/unit/Mage/Sales/Block/Order/Item/Renderer/DefaultTest.php index 9818ff5dd81..b1542c4031c 100644 --- a/tests/unit/Mage/Sales/Block/Order/Item/Renderer/DefaultTest.php +++ b/tests/unit/Mage/Sales/Block/Order/Item/Renderer/DefaultTest.php @@ -17,7 +17,6 @@ namespace OpenMage\Tests\Unit\Mage\Sales\Block\Order\Item\Renderer; -use Mage; use Mage_Sales_Block_Order_Item_Renderer_Default as Subject; use OpenMage\Tests\Unit\OpenMageTest; use Varien_Object; diff --git a/tests/unit/Mage/Sitemap/Model/SitemapTest.php b/tests/unit/Mage/Sitemap/Model/SitemapTest.php index cd09fb49758..c48b032549f 100644 --- a/tests/unit/Mage/Sitemap/Model/SitemapTest.php +++ b/tests/unit/Mage/Sitemap/Model/SitemapTest.php @@ -17,7 +17,6 @@ namespace OpenMage\Tests\Unit\Mage\Sitemap\Model; -use Mage; use Mage_Sitemap_Model_Sitemap as Subject; use OpenMage\Tests\Unit\OpenMageTest; use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Sitemap\SitemapTrait; diff --git a/tests/unit/Mage/Uploader/Block/AbstractTest.php b/tests/unit/Mage/Uploader/Block/AbstractTest.php index b58569a5fe1..5bd42bbebfa 100644 --- a/tests/unit/Mage/Uploader/Block/AbstractTest.php +++ b/tests/unit/Mage/Uploader/Block/AbstractTest.php @@ -17,7 +17,6 @@ namespace OpenMage\Tests\Unit\Mage\Uploader\Block; -use Mage; use Mage_Uploader_Block_Abstract as Subject; use Mage_Uploader_Model_Config_Browsebutton; use Mage_Uploader_Model_Config_Misc; From 716860f0861b97341167de14cc8bbfebeae4b35f Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Sat, 19 Apr 2025 18:45:54 +0200 Subject: [PATCH 25/36] sonar 1 --- .../Model/Resource/Report/CollectionTest.php | 12 +++++----- tests/unit/Mage/Tax/Helper/DataTest.php | 12 +++++----- .../Mage/Adminhtml/Helper/ConfigTrait.php | 10 +++++--- .../DataProvider/Mage/Api/Model/UserTrait.php | 23 +++++++++++-------- 4 files changed, 33 insertions(+), 24 deletions(-) diff --git a/tests/unit/Mage/Reports/Model/Resource/Report/CollectionTest.php b/tests/unit/Mage/Reports/Model/Resource/Report/CollectionTest.php index 17b63dad8a2..48aeda9fc51 100644 --- a/tests/unit/Mage/Reports/Model/Resource/Report/CollectionTest.php +++ b/tests/unit/Mage/Reports/Model/Resource/Report/CollectionTest.php @@ -131,8 +131,8 @@ public function testInitReport(string $modelClass = ''): void */ public function testGetReportFull(): void { - static::markTestIncomplete(self::SKIP_INCOMPLETE_MESSAGE); - # $this->assertInstanceOf(Mage_Reports_Model_Report::class, self::$subject->getReportFull(1, 1)); + static::markTestSkipped(self::SKIP_INCOMPLETE_MESSAGE); + $this->assertInstanceOf(Mage_Reports_Model_Report::class, self::$subject->getReportFull(1, 1)); } /** @@ -140,8 +140,8 @@ public function testGetReportFull(): void */ public function testGetReport(): void { - static::markTestIncomplete(self::SKIP_INCOMPLETE_MESSAGE); - # $this->assertInstanceOf(Mage_Reports_Model_Report::class, self::$subject->getReport(1, 1)); + static::markTestSkipped(self::SKIP_INCOMPLETE_MESSAGE); + $this->assertInstanceOf(Mage_Reports_Model_Report::class, self::$subject->getReport(1, 1)); } /** @@ -149,7 +149,7 @@ public function testGetReport(): void */ public function testTimeShift(): void { - static::markTestIncomplete(self::SKIP_INCOMPLETE_MESSAGE); - # $this->assertSame(self::$subject->timeShift('')); + static::markTestSkipped(self::SKIP_INCOMPLETE_MESSAGE); + $this->assertSame(self::$subject->timeShift('')); } } diff --git a/tests/unit/Mage/Tax/Helper/DataTest.php b/tests/unit/Mage/Tax/Helper/DataTest.php index fac737e0f8b..867d9ed11ef 100644 --- a/tests/unit/Mage/Tax/Helper/DataTest.php +++ b/tests/unit/Mage/Tax/Helper/DataTest.php @@ -71,8 +71,8 @@ public function testGetCalculator(): void */ public function testGetProductPrice(): void { - #$this->assertSame('', self::$subject->getProductPrice()); - static::markTestIncomplete(); + static::markTestSkipped(); + $this->assertSame('', self::$subject->getProductPrice()); } /** @@ -129,8 +129,8 @@ public function testNeedPriceConversion(): void */ public function testGetPriceFormat(): void { - #$this->assertSame('', self::$subject->getPriceFormat()); - static::markTestIncomplete(); + static::markTestSkipped(); + $this->assertSame('', self::$subject->getPriceFormat()); } /** @@ -161,8 +161,8 @@ public function testGetAllRatesByProductClass(): void */ public function testGetPrice(): void { - #$this->assertFalse(self::$subject->getPrice()); - static::markTestIncomplete(); + static::markTestSkipped(); + $this->assertFalse(self::$subject->getPrice()); } /** diff --git a/tests/unit/Traits/DataProvider/Mage/Adminhtml/Helper/ConfigTrait.php b/tests/unit/Traits/DataProvider/Mage/Adminhtml/Helper/ConfigTrait.php index cfa29e33571..b99e7823369 100644 --- a/tests/unit/Traits/DataProvider/Mage/Adminhtml/Helper/ConfigTrait.php +++ b/tests/unit/Traits/DataProvider/Mage/Adminhtml/Helper/ConfigTrait.php @@ -21,19 +21,23 @@ trait ConfigTrait { + public static $backendModel = [ + 'color' => 'adminhtml/system_config_backend_color', + ]; + public function provideGetInputTypes(): Generator { yield 'null' => [ [ 'color' => [ - 'backend_model' => 'adminhtml/system_config_backend_color', + 'backend_model' => self::$backendModel['color'], ], ], null, ]; yield 'color' => [ [ - 'backend_model' => 'adminhtml/system_config_backend_color', + 'backend_model' => self::$backendModel['color'], ], 'color', ]; @@ -46,7 +50,7 @@ public function provideGetInputTypes(): Generator public function provideGetBackendModelByInputType(): Generator { yield 'color' => [ - 'adminhtml/system_config_backend_color', + self::$backendModel['color'], 'color', ]; yield 'invalid' => [ diff --git a/tests/unit/Traits/DataProvider/Mage/Api/Model/UserTrait.php b/tests/unit/Traits/DataProvider/Mage/Api/Model/UserTrait.php index e65a6b9f961..c323f535833 100644 --- a/tests/unit/Traits/DataProvider/Mage/Api/Model/UserTrait.php +++ b/tests/unit/Traits/DataProvider/Mage/Api/Model/UserTrait.php @@ -23,7 +23,12 @@ trait UserTrait { public function provideValidateApiUserData(): Generator { - $validUser = [ + $errorAlphaNumeric = 'Api Key must include both numeric and alphabetic characters.'; + $errorIdentical = 'Api Key confirmation must be same as Api Key.'; + $errorInvalidEmail = 'Please enter a valid email.'; + $errorLength = 'Api Key must be at least of 7 characters.'; + + $validUser = [ 'getUsername' => 'validuser', 'getFirstname' => 'John', 'getLastname' => 'Doe', @@ -66,14 +71,14 @@ public function provideValidateApiUserData(): Generator $data = $validUser; $data['getEmail'] = ''; yield 'missing email' => [ - ['Please enter a valid email.'], + [$errorInvalidEmail], $data, ]; $data = $validUser; $data['getEmail'] = 'invalid-email'; yield 'invalid email' => [ - ['Please enter a valid email.'], + [$errorInvalidEmail], $data, ]; @@ -81,9 +86,9 @@ public function provideValidateApiUserData(): Generator $data['getApiKey'] = ''; yield 'missing api key' => [ [ - 'Api Key must be at least of 7 characters.', - 'Api Key must include both numeric and alphabetic characters.', - 'Api Key confirmation must be same as Api Key.', + $errorLength, + $errorAlphaNumeric, + $errorIdentical, ], $data, ]; @@ -91,7 +96,7 @@ public function provideValidateApiUserData(): Generator $data = $validUser; $data['getApiKeyConfirmation'] = ''; yield 'missing api confirm key' => [ - ['Api Key confirmation must be same as Api Key.'], + [$errorIdentical], $data, ]; @@ -100,7 +105,7 @@ public function provideValidateApiUserData(): Generator $data['getApiKey'] = $apiKey; $data['getApiKeyConfirmation'] = $apiKey; yield 'numeric only api key' => [ - ['Api Key must include both numeric and alphabetic characters.'], + [$errorAlphaNumeric], $data, ]; @@ -109,7 +114,7 @@ public function provideValidateApiUserData(): Generator $data['getApiKey'] = $apiKey; $data['getApiKeyConfirmation'] = $apiKey; yield 'string only api key' => [ - ['Api Key must include both numeric and alphabetic characters.'], + [$errorAlphaNumeric], $data, ]; From 78c163f745e6505d4d72e145dbed62a1ace6b20f Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Sat, 19 Apr 2025 18:49:05 +0200 Subject: [PATCH 26/36] sonar 2 --- .../Mage/Cms/Block/Widget/Page/LinkTrait.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/unit/Traits/DataProvider/Mage/Cms/Block/Widget/Page/LinkTrait.php b/tests/unit/Traits/DataProvider/Mage/Cms/Block/Widget/Page/LinkTrait.php index bfe807539fa..36c2b042acf 100644 --- a/tests/unit/Traits/DataProvider/Mage/Cms/Block/Widget/Page/LinkTrait.php +++ b/tests/unit/Traits/DataProvider/Mage/Cms/Block/Widget/Page/LinkTrait.php @@ -103,17 +103,20 @@ public function provideGetAnchorTextData(): Generator 'test' => 'Test', ]; + $customText = 'Custom Text'; + $customTitle = 'Custom Title'; + $data = $emptyData; - $data['anchor_text'] = 'Custom Text'; + $data['anchor_text'] = $customText; yield 'text is set' => [ - 'Custom Text', + $customText, $data, ]; $data = $emptyData; - $data['title'] = 'Custom Title'; + $data['title'] = $customTitle; yield 'title is set' => [ - 'Custom Title', + $customTitle, $data, ]; From 16073521e535b0b5e6a331e5bf4dcf66927856c4 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Sat, 19 Apr 2025 19:00:47 +0200 Subject: [PATCH 27/36] phpcs/phpstan --- .../Reports/Model/Resource/Report/CollectionTest.php | 9 ++++++--- tests/unit/Mage/Tax/Helper/DataTest.php | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/tests/unit/Mage/Reports/Model/Resource/Report/CollectionTest.php b/tests/unit/Mage/Reports/Model/Resource/Report/CollectionTest.php index 48aeda9fc51..8066aa242a4 100644 --- a/tests/unit/Mage/Reports/Model/Resource/Report/CollectionTest.php +++ b/tests/unit/Mage/Reports/Model/Resource/Report/CollectionTest.php @@ -132,7 +132,8 @@ public function testInitReport(string $modelClass = ''): void public function testGetReportFull(): void { static::markTestSkipped(self::SKIP_INCOMPLETE_MESSAGE); - $this->assertInstanceOf(Mage_Reports_Model_Report::class, self::$subject->getReportFull(1, 1)); + /** @phpstan-ignore deadCode.unreachable */ + static::assertInstanceOf(Mage_Reports_Model_Report::class, self::$subject->getReportFull(1, 1)); } /** @@ -141,7 +142,8 @@ public function testGetReportFull(): void public function testGetReport(): void { static::markTestSkipped(self::SKIP_INCOMPLETE_MESSAGE); - $this->assertInstanceOf(Mage_Reports_Model_Report::class, self::$subject->getReport(1, 1)); + /** @phpstan-ignore deadCode.unreachable */ + static::assertInstanceOf(Mage_Reports_Model_Report::class, self::$subject->getReport(1, 1)); } /** @@ -150,6 +152,7 @@ public function testGetReport(): void public function testTimeShift(): void { static::markTestSkipped(self::SKIP_INCOMPLETE_MESSAGE); - $this->assertSame(self::$subject->timeShift('')); + /** @phpstan-ignore deadCode.unreachable */ + static::assertSame(self::$subject->timeShift('')); } } diff --git a/tests/unit/Mage/Tax/Helper/DataTest.php b/tests/unit/Mage/Tax/Helper/DataTest.php index 867d9ed11ef..35e763acdbe 100644 --- a/tests/unit/Mage/Tax/Helper/DataTest.php +++ b/tests/unit/Mage/Tax/Helper/DataTest.php @@ -72,7 +72,8 @@ public function testGetCalculator(): void public function testGetProductPrice(): void { static::markTestSkipped(); - $this->assertSame('', self::$subject->getProductPrice()); + /** @phpstan-ignore deadCode.unreachable */ + static::assertSame('', self::$subject->getProductPrice()); } /** @@ -130,7 +131,8 @@ public function testNeedPriceConversion(): void public function testGetPriceFormat(): void { static::markTestSkipped(); - $this->assertSame('', self::$subject->getPriceFormat()); + /** @phpstan-ignore deadCode.unreachable */ + static::assertSame('', self::$subject->getPriceFormat()); } /** @@ -162,7 +164,8 @@ public function testGetAllRatesByProductClass(): void public function testGetPrice(): void { static::markTestSkipped(); - $this->assertFalse(self::$subject->getPrice()); + /** @phpstan-ignore deadCode.unreachable */ + static::assertFalse(self::$subject->getPrice()); } /** From 1b8c55eb567a95192404cde817ec4af23ab02b66 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Sat, 19 Apr 2025 19:23:33 +0200 Subject: [PATCH 28/36] sonar 4 --- .../Mage/Cms/Block/Widget/Page/LinkTrait.php | 57 +++++++++++-------- 1 file changed, 34 insertions(+), 23 deletions(-) diff --git a/tests/unit/Traits/DataProvider/Mage/Cms/Block/Widget/Page/LinkTrait.php b/tests/unit/Traits/DataProvider/Mage/Cms/Block/Widget/Page/LinkTrait.php index 36c2b042acf..131d8b50139 100644 --- a/tests/unit/Traits/DataProvider/Mage/Cms/Block/Widget/Page/LinkTrait.php +++ b/tests/unit/Traits/DataProvider/Mage/Cms/Block/Widget/Page/LinkTrait.php @@ -22,6 +22,20 @@ trait LinkTrait { + public static $defaults = [ + 'custom_title' => 'Custom Title', + 'custom_text' => 'Custom Text', + ]; + + public static $tests = [ + 'empty' => 'empty', + 'href' => 'href is set', + 'no_data' => 'no data is set', + 'page_id' => 'page_id is set', + 'text' => 'text is set', + 'title' => 'title is set', + ]; + public function provideGetHrefData(): Generator { $emptyData = [ @@ -38,17 +52,17 @@ public function provideGetHrefData(): Generator $data = $emptyData; $data['href'] = 'home'; - yield 'href is set' => [ + yield self::$tests['href'] => [ 'home', $data, ]; - yield 'empty' => [ + yield self::$tests['empty'] => [ '', $emptyData, ]; - yield 'no data set' => [ + yield self::$tests['no_data'] => [ '', [], ]; @@ -63,32 +77,32 @@ public function provideGetTitleData(): Generator ]; $data = $emptyData; - $data['title'] = 'Custom Title'; - yield 'title is set' => [ - 'Custom Title', + $data['title'] = self::$defaults['custom_title']; + yield self::$tests['title'] => [ + self::$defaults['custom_title'], $data, ]; $data = $emptyData; $data['page_id'] = 1; - yield 'page_id is set' => [ + yield self::$tests['page_id'] => [ '404 Not Found 1', $data, ]; $data = $emptyData; $data['href'] = 'home'; - yield 'href is set' => [ + yield self::$tests['href'] => [ 'Home page', $data, ]; - yield 'empty' => [ + yield self::$tests['empty'] => [ '', $emptyData, ]; - yield 'no data set' => [ + yield self::$tests['no_data'] => [ '', [], ]; @@ -103,43 +117,40 @@ public function provideGetAnchorTextData(): Generator 'test' => 'Test', ]; - $customText = 'Custom Text'; - $customTitle = 'Custom Title'; - $data = $emptyData; - $data['anchor_text'] = $customText; - yield 'text is set' => [ - $customText, + $data['anchor_text'] = self::$defaults['custom_text']; + yield self::$tests['text'] => [ + self::$defaults['custom_text'], $data, ]; $data = $emptyData; - $data['title'] = $customTitle; - yield 'title is set' => [ - $customTitle, + $data['title'] = self::$defaults['custom_title']; + yield self::$tests['title'] => [ + self::$defaults['custom_title'], $data, ]; $data = $emptyData; $data['page_id'] = 1; - yield 'page_id is set' => [ + yield self::$tests['page_id'] => [ '404 Not Found 1', $data, ]; $data = $emptyData; $data['href'] = 'home'; - yield 'href is set' => [ + yield self::$tests['href'] => [ 'Home page', $data, ]; - yield 'empty' => [ + yield self::$tests['empty'] => [ null, $emptyData, ]; - yield 'no data set' => [ + yield self::$tests['no_data'] => [ null, [], ]; From 59acdde32878ea912b57089b0c81f2bc613b9691 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Sat, 19 Apr 2025 19:36:25 +0200 Subject: [PATCH 29/36] sonar 5 --- tests/unit/Mage/Tax/Helper/DataTest.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/unit/Mage/Tax/Helper/DataTest.php b/tests/unit/Mage/Tax/Helper/DataTest.php index 35e763acdbe..4c40408194b 100644 --- a/tests/unit/Mage/Tax/Helper/DataTest.php +++ b/tests/unit/Mage/Tax/Helper/DataTest.php @@ -30,6 +30,7 @@ class DataTest extends OpenMageTest private static Subject $subject; + public const SKIP_INCOMPLETE = 'incomplete'; public const SKIP_WITH_LOCAL_DATA = 'Constant DATA_MAY_CHANGED is defined.'; public static function setUpBeforeClass(): void @@ -71,7 +72,7 @@ public function testGetCalculator(): void */ public function testGetProductPrice(): void { - static::markTestSkipped(); + static::markTestSkipped(self::SKIP_INCOMPLETE); /** @phpstan-ignore deadCode.unreachable */ static::assertSame('', self::$subject->getProductPrice()); } @@ -130,7 +131,7 @@ public function testNeedPriceConversion(): void */ public function testGetPriceFormat(): void { - static::markTestSkipped(); + static::markTestSkipped(self::SKIP_INCOMPLETE); /** @phpstan-ignore deadCode.unreachable */ static::assertSame('', self::$subject->getPriceFormat()); } @@ -163,7 +164,7 @@ public function testGetAllRatesByProductClass(): void */ public function testGetPrice(): void { - static::markTestSkipped(); + static::markTestSkipped(self::SKIP_INCOMPLETE); /** @phpstan-ignore deadCode.unreachable */ static::assertFalse(self::$subject->getPrice()); } From 47af7e2af0e4e99db125bc6fbd1fc9e447908be9 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Sat, 19 Apr 2025 19:49:29 +0200 Subject: [PATCH 30/36] sonar 6 --- tests/unit/Mage/Tax/Helper/DataTest.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/unit/Mage/Tax/Helper/DataTest.php b/tests/unit/Mage/Tax/Helper/DataTest.php index 4c40408194b..a7b8ff0f4a5 100644 --- a/tests/unit/Mage/Tax/Helper/DataTest.php +++ b/tests/unit/Mage/Tax/Helper/DataTest.php @@ -119,8 +119,9 @@ public function testGetPriceDisplayType(): void */ public function testNeedPriceConversion(): void { - #$this->assertSame(1, self::$subject->needPriceConversion()); - static::markTestIncomplete(); + static::markTestSkipped(self::SKIP_INCOMPLETE); + /** @phpstan-ignore deadCode.unreachable */ + $this->assertSame(1, self::$subject->needPriceConversion()); } /** From 14d8f9330a4d87d9ca97b78a5d39e10a686aae4c Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Sat, 19 Apr 2025 19:54:18 +0200 Subject: [PATCH 31/36] phpcs --- tests/unit/Mage/Tax/Helper/DataTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/Mage/Tax/Helper/DataTest.php b/tests/unit/Mage/Tax/Helper/DataTest.php index a7b8ff0f4a5..85db714b45e 100644 --- a/tests/unit/Mage/Tax/Helper/DataTest.php +++ b/tests/unit/Mage/Tax/Helper/DataTest.php @@ -121,7 +121,7 @@ public function testNeedPriceConversion(): void { static::markTestSkipped(self::SKIP_INCOMPLETE); /** @phpstan-ignore deadCode.unreachable */ - $this->assertSame(1, self::$subject->needPriceConversion()); + static::assertSame(1, self::$subject->needPriceConversion()); } /** From b4a8cf3bb8fa8311a45c36804007d7507b1042be Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Mon, 21 Apr 2025 15:25:12 +0200 Subject: [PATCH 32/36] copyright, ref #4767 --- tests/unit/Mage/Api/Model/UserTest.php | 13 +++---------- .../Catalog/Model/Resource/Eav/AttributeTest.php | 13 +++---------- .../Contacts/Controllers/IndexControllerTest.php | 13 +++---------- tests/unit/Mage/Reports/Helper/DataTest.php | 13 +++---------- .../Model/Resource/Report/CollectionTest.php | 13 +++---------- tests/unit/Mage/Rule/Model/AbstractTest.php | 13 +++---------- tests/unit/Mage/Rule/Model/EnvironmentTest.php | 13 +++---------- tests/unit/Mage/Rule/Model/RuleTest.php | 13 +++---------- tests/unit/Mage/Wishlist/Model/ItemTest.php | 13 +++---------- tests/unit/Traits/DataProvider/Base/BoolTrait.php | 13 +++---------- .../Traits/DataProvider/Base/IntOrNullTrait.php | 13 +++---------- .../unit/Traits/DataProvider/Base/ModulesTrait.php | 13 +++---------- .../Traits/DataProvider/Base/NumericStringTrait.php | 13 +++---------- .../DataProvider/Mage/Admin/Model/BlockTrait.php | 13 +++---------- .../DataProvider/Mage/Admin/Model/UserTrait.php | 13 +++---------- .../DataProvider/Mage/Admin/Model/VariableTrait.php | 13 +++---------- .../Mage/AdminNotification/Model/InboxTrait.php | 13 +++---------- .../Mage/Adminhtml/Block/Widget/GridTrait.php | 13 +++---------- .../Mage/Adminhtml/Helper/AddressTrait.php | 13 +++---------- .../Mage/Adminhtml/Helper/ConfigTrait.php | 13 +++---------- .../DataProvider/Mage/Adminhtml/Helper/JsTrait.php | 13 +++---------- .../Mage/Adminhtml/Helper/SalesTrait.php | 13 +++---------- .../DataProvider/Mage/Api/Model/UserTrait.php | 13 +++---------- .../DataProvider/Mage/Catalog/CatalogTrait.php | 13 +++---------- .../DataProvider/Mage/Catalog/Helper/DataTrait.php | 13 +++---------- .../Mage/Catalog/Helper/Product/UrlTrait.php | 13 +++---------- .../Mage/Catalog/Helper/ProductTrait.php | 13 +++---------- .../DataProvider/Mage/Catalog/Model/LocaleTrait.php | 13 +++---------- .../DataProvider/Mage/Catalog/Model/UrlTrait.php | 13 +++---------- .../Mage/Cms/Block/Widget/Page/LinkTrait.php | 13 +++---------- .../unit/Traits/DataProvider/Mage/Cms/CmsTrait.php | 13 +++---------- .../Contacts/Controllers/IndexControllerTrait.php | 13 +++---------- .../Traits/DataProvider/Mage/Core/CoreTrait.php | 13 +++---------- .../DataProvider/Mage/Core/Helper/ArrayTrait.php | 13 +++---------- .../DataProvider/Mage/Core/Helper/DataTrait.php | 13 +++---------- .../DataProvider/Mage/Core/Helper/PurifierTrait.php | 13 +++---------- .../Mage/Core/Helper/UnserializeArray.php | 13 +++---------- .../DataProvider/Mage/Core/Helper/UrlTrait.php | 13 +++---------- .../DataProvider/Mage/Core/Model/AppTrait.php | 13 +++---------- .../Core/Model/Email/Template/AbstractTrait.php | 13 +++---------- .../DataProvider/Mage/Core/Model/LayoutTrait.php | 13 +++---------- .../DataProvider/Mage/Core/Model/SecurityTrait.php | 13 +++---------- .../DataProvider/Mage/Customer/CustomerTrait.php | 13 +++---------- .../DataProvider/Mage/Directory/DirectoryTrait.php | 13 +++---------- .../Mage/Downloadable/DownloadableTrait.php | 13 +++---------- .../Mage/GiftMessage/GiftMessageTrait.php | 13 +++---------- .../Index/Block/Adminhtml/Process/GridTrait.php | 13 +++---------- .../DataProvider/Mage/Log/Helper/DataTrait.php | 13 +++---------- .../DataProvider/Mage/Log/Model/CustomerTrait.php | 13 +++---------- .../DataProvider/Mage/Reports/ReportsTrait.php | 13 +++---------- .../Traits/DataProvider/Mage/Review/ReviewTrait.php | 13 +++---------- .../Traits/DataProvider/Mage/Rule/RuleTrait.php | 13 +++---------- .../DataProvider/Mage/Sitemap/SitemapTrait.php | 13 +++---------- .../unit/Traits/DataProvider/Mage/Tax/TaxTrait.php | 13 +++---------- .../DataProvider/Mage/Uploader/UploaderTrait.php | 13 +++---------- 55 files changed, 165 insertions(+), 550 deletions(-) diff --git a/tests/unit/Mage/Api/Model/UserTest.php b/tests/unit/Mage/Api/Model/UserTest.php index ad2439e72fe..96156c0adbe 100644 --- a/tests/unit/Mage/Api/Model/UserTest.php +++ b/tests/unit/Mage/Api/Model/UserTest.php @@ -1,16 +1,9 @@ Date: Fri, 25 Apr 2025 22:14:19 +0200 Subject: [PATCH 33/36] added Makefile --- .gitattributes | 2 ++ Makefile | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 Makefile diff --git a/.gitattributes b/.gitattributes index dfddb2c3183..a636a7583ff 100644 --- a/.gitattributes +++ b/.gitattributes @@ -23,6 +23,8 @@ /README.md export-ignore +/Makefile export-ignore + # Enforce checkout with linux lf consistent over all platforms *.html text eol=lf *.css text eol=lf diff --git a/Makefile b/Makefile new file mode 100644 index 00000000000..43639b1ca3d --- /dev/null +++ b/Makefile @@ -0,0 +1,13 @@ +mkdocs-serve: + @if command -v mkdocs >/dev/null ; then \ + mkdocs serve; \ + else \ + echo "mkdocs is not installed, see https://docs.openmage.org/developers/mkdocs/" && exit 2; \ + fi; \ + +phpunit-serve: + @if test -f build/coverage/index.html ; then \ + xdg-open build/coverage/index.html; \ + else \ + echo "phpunit coverage not found, run \"composer run phpunit:coverage-local\"" && exit 2; \ + fi; \ From f9bf285cba82b5b45ad53c56eeb10edf7c7f82c5 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Mon, 5 May 2025 05:18:12 +0200 Subject: [PATCH 34/36] merge fix --- .../Mage/Adminhtml/Helper/Dashboard/DataTest.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/unit/Mage/Adminhtml/Helper/Dashboard/DataTest.php b/tests/unit/Mage/Adminhtml/Helper/Dashboard/DataTest.php index 3b612eca722..c94b78698ab 100644 --- a/tests/unit/Mage/Adminhtml/Helper/Dashboard/DataTest.php +++ b/tests/unit/Mage/Adminhtml/Helper/Dashboard/DataTest.php @@ -57,13 +57,13 @@ public function testCountStores(): void public function testGetDatePeriods(): void { $expectedResult = [ - '24h' => $this->subject->__('Last 24 Hours'), - '7d' => $this->subject->__('Last 7 Days'), - '1m' => $this->subject->__('Current Month'), - '3m' => $this->subject->__('Last 3 Months'), - '6m' => $this->subject->__('Last 6 Months'), - '1y' => $this->subject->__('YTD'), - '2y' => $this->subject->__('2YTD'), + '24h' => self::$subject->__('Last 24 Hours'), + '7d' => self::$subject->__('Last 7 Days'), + '1m' => self::$subject->__('Current Month'), + '3m' => self::$subject->__('Last 3 Months'), + '6m' => self::$subject->__('Last 6 Months'), + '1y' => self::$subject->__('YTD'), + '2y' => self::$subject->__('2YTD'), ]; static::assertSame($expectedResult, self::$subject->getDatePeriods()); } From 63e5f77a8e49ba5d56a8f8b5543b10884eeaf13e Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Tue, 6 May 2025 23:20:04 +0200 Subject: [PATCH 35/36] reverted all changes to core files --- .../core/Mage/Adminhtml/Block/Cache/Grid.php | 13 +++++----- .../Permissions/OrphanedResource/Grid.php | 4 +-- .../core/Mage/Adminhtml/Block/Widget/Grid.php | 6 ----- .../core/Mage/Cms/Block/Widget/Page/Link.php | 26 +++++-------------- app/code/core/Mage/Core/Helper/Array.php | 8 +++--- .../Index/Block/Adminhtml/Process/Grid.php | 18 ++++++------- app/code/core/Mage/Index/Model/Indexer.php | 2 +- app/code/core/Mage/Index/Model/Process.php | 6 ----- .../Model/Resource/Report/Collection.php | 4 +-- 9 files changed, 30 insertions(+), 57 deletions(-) diff --git a/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php b/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php index 6b18284bd58..0052b72901d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php @@ -107,14 +107,15 @@ public function decorateStatus($value, $row, $column, $isExport) { $class = ''; if (isset($this->_invalidatedTypes[$row->getId()])) { - $class = self::CSS_SEVERITY_MINOR; - $value = $this->__('Invalidated'); - } elseif ($row->getStatus()) { - $class = self::CSS_SEVERITY_NOTICE; + $cell = '' . $this->__('Invalidated') . ''; } else { - $class = self::CSS_SEVERITY_CRITICAL; + if ($row->getStatus()) { + $cell = '' . $value . ''; + } else { + $cell = '' . $value . ''; + } } - return sprintf(self::PATTERN_SEVERITY, $class, $value); + return $cell; } /** diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/OrphanedResource/Grid.php b/app/code/core/Mage/Adminhtml/Block/Permissions/OrphanedResource/Grid.php index 8ae15a176ea..143a2dd87e2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/OrphanedResource/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/OrphanedResource/Grid.php @@ -15,8 +15,6 @@ * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -use Mage_Adminhtml_Block_Widget_Grid_Massaction_Abstract as MassAction; - /** * Adminhtml permissions orphanedResource grid * @@ -77,7 +75,7 @@ protected function _prepareMassaction() $this->setMassactionIdField('resource_id'); $this->getMassactionBlock()->setFormFieldName('resource_id'); - $this->getMassactionBlock()->addItem(MassAction::DELETE, [ + $this->getMassactionBlock()->addItem('delete', [ 'label' => Mage::helper('adminhtml')->__('Delete'), 'url' => $this->getUrl('*/*/massDelete'), 'confirm' => Mage::helper('adminhtml')->__('Are you sure you want to do this?'), diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php index a6343110903..5179c843b65 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php @@ -25,12 +25,6 @@ */ class Mage_Adminhtml_Block_Widget_Grid extends Mage_Adminhtml_Block_Widget { - public const PATTERN_SEVERITY = '%s'; - public const CSS_SEVERITY_CRITICAL = 'grid-severity-critical'; - public const CSS_SEVERITY_MAJOR = 'grid-severity-major'; - public const CSS_SEVERITY_MINOR = 'grid-severity-minor'; - public const CSS_SEVERITY_NOTICE = 'grid-severity-notice'; - /** * Columns array * diff --git a/app/code/core/Mage/Cms/Block/Widget/Page/Link.php b/app/code/core/Mage/Cms/Block/Widget/Page/Link.php index 371bbddc90b..773c6d85809 100644 --- a/app/code/core/Mage/Cms/Block/Widget/Page/Link.php +++ b/app/code/core/Mage/Cms/Block/Widget/Page/Link.php @@ -68,7 +68,6 @@ public function getHref() * as parameter or retrieve page title from DB using passed identifier or page id. * * @return string - * @throws Mage_Core_Model_Store_Exception */ public function getTitle() { @@ -78,9 +77,10 @@ public function getTitle() // compare to null used here bc user can specify blank title $this->_title = $this->getData('title'); } elseif ($this->getData('page_id')) { - $this->_title = $this->getCmsPageTitleById($this->getData('page_id')); + $this->_title = Mage::getResourceSingleton('cms/page')->getCmsPageTitleById($this->getData('page_id')); } elseif ($this->getData('href')) { - $this->_title = $this->getCmsPageTitleByIdentifier($this->getData('href')); + $this->_title = Mage::getResourceSingleton('cms/page')->setStore(Mage::app()->getStore()) + ->getCmsPageTitleByIdentifier($this->getData('href')); } } @@ -93,7 +93,6 @@ public function getTitle() * if title will be blank string, page identifier will be used. * * @return string - * @throws Mage_Core_Model_Store_Exception */ public function getAnchorText() { @@ -102,27 +101,14 @@ public function getAnchorText() } elseif ($this->getTitle()) { $this->_anchorText = $this->getTitle(); } elseif ($this->getData('href')) { - $this->_anchorText = $this->getCmsPageTitleByIdentifier($this->getData('href')); + $this->_anchorText = Mage::getResourceSingleton('cms/page')->setStore(Mage::app()->getStore()) + ->getCmsPageTitleByIdentifier($this->getData('href')); } elseif ($this->getData('page_id')) { - $this->_anchorText = $this->getCmsPageTitleById($this->getData('page_id')); + $this->_anchorText = Mage::getResourceSingleton('cms/page')->getCmsPageTitleById($this->getData('page_id')); } else { $this->_anchorText = $this->getData('href'); } return $this->_anchorText; } - - protected function getCmsPageTitleById(int|string $pageId): string - { - return Mage::getResourceSingleton('cms/page')->getCmsPageTitleById($pageId); - } - - /** - * @throws Mage_Core_Model_Store_Exception - */ - protected function getCmsPageTitleByIdentifier(int|string $identifier): string - { - return Mage::getResourceSingleton('cms/page')->setStore(Mage::app()->getStore()) - ->getCmsPageTitleByIdentifier($identifier); - } } diff --git a/app/code/core/Mage/Core/Helper/Array.php b/app/code/core/Mage/Core/Helper/Array.php index cf9b2cf73b3..ef9b5ff64dd 100644 --- a/app/code/core/Mage/Core/Helper/Array.php +++ b/app/code/core/Mage/Core/Helper/Array.php @@ -38,10 +38,12 @@ public function mergeRecursiveWithoutOverwriteNumKeys(array $baseArray, array $m } else { $baseArray[$key] = $value; } - } elseif ($key) { - $baseArray[$key] = $value; } else { - $baseArray[] = $value; + if ($key) { + $baseArray[$key] = $value; + } else { + $baseArray[] = $value; + } } } diff --git a/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php b/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php index b9c13823fdb..9daee9c0fbd 100644 --- a/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php +++ b/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php @@ -52,7 +52,6 @@ public function __construct() * Prepare grid collection * * @return $this - * @throws Exception */ protected function _prepareCollection() { @@ -67,7 +66,6 @@ protected function _prepareCollection() * Add name and description to collection elements * * @return $this - * @throws Mage_Core_Exception */ protected function _afterLoadCollection() { @@ -91,10 +89,10 @@ protected function _afterLoadCollection() * Prepare grid columns * * @return $this - * @throws Exception */ protected function _prepareColumns() { + $baseUrl = $this->getUrl(); $this->addColumn('indexer_code', [ 'header' => Mage::helper('index')->__('Index'), 'width' => '180', @@ -185,16 +183,16 @@ public function decorateStatus($value, $row, $column, $isExport) $class = ''; switch ($row->getStatus()) { case Mage_Index_Model_Process::STATUS_PENDING: - $class = self::CSS_SEVERITY_NOTICE; + $class = 'grid-severity-notice'; break; case Mage_Index_Model_Process::STATUS_RUNNING: - $class = self::CSS_SEVERITY_MAJOR; + $class = 'grid-severity-major'; break; case Mage_Index_Model_Process::STATUS_REQUIRE_REINDEX: - $class = self::CSS_SEVERITY_CRITICAL; + $class = 'grid-severity-critical'; break; } - return sprintf(self::PATTERN_SEVERITY, $class, $value); + return '' . $value . ''; } /** @@ -212,13 +210,13 @@ public function decorateUpdateRequired($value, $row, $column, $isExport) $class = ''; switch ($row->getUpdateRequired()) { case 0: - $class = self::CSS_SEVERITY_NOTICE; + $class = 'grid-severity-notice'; break; case 1: - $class = self::CSS_SEVERITY_CRITICAL; + $class = 'grid-severity-critical'; break; } - return sprintf(self::PATTERN_SEVERITY, $class, $value); + return '' . $value . ''; } /** diff --git a/app/code/core/Mage/Index/Model/Indexer.php b/app/code/core/Mage/Index/Model/Indexer.php index 92b8672b159..d2aec7c6948 100644 --- a/app/code/core/Mage/Index/Model/Indexer.php +++ b/app/code/core/Mage/Index/Model/Indexer.php @@ -84,7 +84,7 @@ public function getProcessesCollection() * Get index process by specific id * * @param int $processId - * @return Mage_Index_Model_Process|false + * @return Mage_Index_Model_Process | false */ public function getProcessById($processId) { diff --git a/app/code/core/Mage/Index/Model/Process.php b/app/code/core/Mage/Index/Model/Process.php index 9cc4da17fde..504c19a602e 100644 --- a/app/code/core/Mage/Index/Model/Process.php +++ b/app/code/core/Mage/Index/Model/Process.php @@ -23,10 +23,6 @@ * @method string getIndexCode() * @method string getIndexerCode() * @method $this setIndexerCode(string $value) - * @method string getName() - * @method $this setName(string $value) - * @method string getDescription() - * @method $this setDescription(string $value) * @method string getStatus() * @method $this setStatus(string $value) * @method string getStartedAt() @@ -37,8 +33,6 @@ * @method $this setMode(string $value) * @method bool getForcePartialReindex() * @method $this setForcePartialReindex(bool $value) - * @method int getUpdateRequired() - * @method $this setUpdateRequired(int $value) */ class Mage_Index_Model_Process extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php index c6c8b479679..1bcce912c74 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php @@ -39,7 +39,7 @@ class Mage_Reports_Model_Resource_Report_Collection /** * Report period * - * @var string + * @var int */ protected $_period; @@ -76,7 +76,7 @@ protected function _construct() {} /** * Set period * - * @param string $period + * @param int $period * @return $this */ public function setPeriod($period) From dc817dd54f9a707283f1d0feb7d1b8e9fb158fe5 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Tue, 6 May 2025 23:23:16 +0200 Subject: [PATCH 36/36] Revert "reverted all changes to core files" This reverts commit 63e5f77a8e49ba5d56a8f8b5543b10884eeaf13e. --- .../core/Mage/Adminhtml/Block/Cache/Grid.php | 13 +++++----- .../Permissions/OrphanedResource/Grid.php | 4 ++- .../core/Mage/Adminhtml/Block/Widget/Grid.php | 6 +++++ .../core/Mage/Cms/Block/Widget/Page/Link.php | 26 ++++++++++++++----- app/code/core/Mage/Core/Helper/Array.php | 8 +++--- .../Index/Block/Adminhtml/Process/Grid.php | 18 +++++++------ app/code/core/Mage/Index/Model/Indexer.php | 2 +- app/code/core/Mage/Index/Model/Process.php | 6 +++++ .../Model/Resource/Report/Collection.php | 4 +-- 9 files changed, 57 insertions(+), 30 deletions(-) diff --git a/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php b/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php index 0052b72901d..6b18284bd58 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php @@ -107,15 +107,14 @@ public function decorateStatus($value, $row, $column, $isExport) { $class = ''; if (isset($this->_invalidatedTypes[$row->getId()])) { - $cell = '' . $this->__('Invalidated') . ''; + $class = self::CSS_SEVERITY_MINOR; + $value = $this->__('Invalidated'); + } elseif ($row->getStatus()) { + $class = self::CSS_SEVERITY_NOTICE; } else { - if ($row->getStatus()) { - $cell = '' . $value . ''; - } else { - $cell = '' . $value . ''; - } + $class = self::CSS_SEVERITY_CRITICAL; } - return $cell; + return sprintf(self::PATTERN_SEVERITY, $class, $value); } /** diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/OrphanedResource/Grid.php b/app/code/core/Mage/Adminhtml/Block/Permissions/OrphanedResource/Grid.php index 143a2dd87e2..8ae15a176ea 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/OrphanedResource/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/OrphanedResource/Grid.php @@ -15,6 +15,8 @@ * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +use Mage_Adminhtml_Block_Widget_Grid_Massaction_Abstract as MassAction; + /** * Adminhtml permissions orphanedResource grid * @@ -75,7 +77,7 @@ protected function _prepareMassaction() $this->setMassactionIdField('resource_id'); $this->getMassactionBlock()->setFormFieldName('resource_id'); - $this->getMassactionBlock()->addItem('delete', [ + $this->getMassactionBlock()->addItem(MassAction::DELETE, [ 'label' => Mage::helper('adminhtml')->__('Delete'), 'url' => $this->getUrl('*/*/massDelete'), 'confirm' => Mage::helper('adminhtml')->__('Are you sure you want to do this?'), diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php index 5179c843b65..a6343110903 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php @@ -25,6 +25,12 @@ */ class Mage_Adminhtml_Block_Widget_Grid extends Mage_Adminhtml_Block_Widget { + public const PATTERN_SEVERITY = '%s'; + public const CSS_SEVERITY_CRITICAL = 'grid-severity-critical'; + public const CSS_SEVERITY_MAJOR = 'grid-severity-major'; + public const CSS_SEVERITY_MINOR = 'grid-severity-minor'; + public const CSS_SEVERITY_NOTICE = 'grid-severity-notice'; + /** * Columns array * diff --git a/app/code/core/Mage/Cms/Block/Widget/Page/Link.php b/app/code/core/Mage/Cms/Block/Widget/Page/Link.php index 773c6d85809..371bbddc90b 100644 --- a/app/code/core/Mage/Cms/Block/Widget/Page/Link.php +++ b/app/code/core/Mage/Cms/Block/Widget/Page/Link.php @@ -68,6 +68,7 @@ public function getHref() * as parameter or retrieve page title from DB using passed identifier or page id. * * @return string + * @throws Mage_Core_Model_Store_Exception */ public function getTitle() { @@ -77,10 +78,9 @@ public function getTitle() // compare to null used here bc user can specify blank title $this->_title = $this->getData('title'); } elseif ($this->getData('page_id')) { - $this->_title = Mage::getResourceSingleton('cms/page')->getCmsPageTitleById($this->getData('page_id')); + $this->_title = $this->getCmsPageTitleById($this->getData('page_id')); } elseif ($this->getData('href')) { - $this->_title = Mage::getResourceSingleton('cms/page')->setStore(Mage::app()->getStore()) - ->getCmsPageTitleByIdentifier($this->getData('href')); + $this->_title = $this->getCmsPageTitleByIdentifier($this->getData('href')); } } @@ -93,6 +93,7 @@ public function getTitle() * if title will be blank string, page identifier will be used. * * @return string + * @throws Mage_Core_Model_Store_Exception */ public function getAnchorText() { @@ -101,14 +102,27 @@ public function getAnchorText() } elseif ($this->getTitle()) { $this->_anchorText = $this->getTitle(); } elseif ($this->getData('href')) { - $this->_anchorText = Mage::getResourceSingleton('cms/page')->setStore(Mage::app()->getStore()) - ->getCmsPageTitleByIdentifier($this->getData('href')); + $this->_anchorText = $this->getCmsPageTitleByIdentifier($this->getData('href')); } elseif ($this->getData('page_id')) { - $this->_anchorText = Mage::getResourceSingleton('cms/page')->getCmsPageTitleById($this->getData('page_id')); + $this->_anchorText = $this->getCmsPageTitleById($this->getData('page_id')); } else { $this->_anchorText = $this->getData('href'); } return $this->_anchorText; } + + protected function getCmsPageTitleById(int|string $pageId): string + { + return Mage::getResourceSingleton('cms/page')->getCmsPageTitleById($pageId); + } + + /** + * @throws Mage_Core_Model_Store_Exception + */ + protected function getCmsPageTitleByIdentifier(int|string $identifier): string + { + return Mage::getResourceSingleton('cms/page')->setStore(Mage::app()->getStore()) + ->getCmsPageTitleByIdentifier($identifier); + } } diff --git a/app/code/core/Mage/Core/Helper/Array.php b/app/code/core/Mage/Core/Helper/Array.php index ef9b5ff64dd..cf9b2cf73b3 100644 --- a/app/code/core/Mage/Core/Helper/Array.php +++ b/app/code/core/Mage/Core/Helper/Array.php @@ -38,12 +38,10 @@ public function mergeRecursiveWithoutOverwriteNumKeys(array $baseArray, array $m } else { $baseArray[$key] = $value; } + } elseif ($key) { + $baseArray[$key] = $value; } else { - if ($key) { - $baseArray[$key] = $value; - } else { - $baseArray[] = $value; - } + $baseArray[] = $value; } } diff --git a/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php b/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php index 9daee9c0fbd..b9c13823fdb 100644 --- a/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php +++ b/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php @@ -52,6 +52,7 @@ public function __construct() * Prepare grid collection * * @return $this + * @throws Exception */ protected function _prepareCollection() { @@ -66,6 +67,7 @@ protected function _prepareCollection() * Add name and description to collection elements * * @return $this + * @throws Mage_Core_Exception */ protected function _afterLoadCollection() { @@ -89,10 +91,10 @@ protected function _afterLoadCollection() * Prepare grid columns * * @return $this + * @throws Exception */ protected function _prepareColumns() { - $baseUrl = $this->getUrl(); $this->addColumn('indexer_code', [ 'header' => Mage::helper('index')->__('Index'), 'width' => '180', @@ -183,16 +185,16 @@ public function decorateStatus($value, $row, $column, $isExport) $class = ''; switch ($row->getStatus()) { case Mage_Index_Model_Process::STATUS_PENDING: - $class = 'grid-severity-notice'; + $class = self::CSS_SEVERITY_NOTICE; break; case Mage_Index_Model_Process::STATUS_RUNNING: - $class = 'grid-severity-major'; + $class = self::CSS_SEVERITY_MAJOR; break; case Mage_Index_Model_Process::STATUS_REQUIRE_REINDEX: - $class = 'grid-severity-critical'; + $class = self::CSS_SEVERITY_CRITICAL; break; } - return '' . $value . ''; + return sprintf(self::PATTERN_SEVERITY, $class, $value); } /** @@ -210,13 +212,13 @@ public function decorateUpdateRequired($value, $row, $column, $isExport) $class = ''; switch ($row->getUpdateRequired()) { case 0: - $class = 'grid-severity-notice'; + $class = self::CSS_SEVERITY_NOTICE; break; case 1: - $class = 'grid-severity-critical'; + $class = self::CSS_SEVERITY_CRITICAL; break; } - return '' . $value . ''; + return sprintf(self::PATTERN_SEVERITY, $class, $value); } /** diff --git a/app/code/core/Mage/Index/Model/Indexer.php b/app/code/core/Mage/Index/Model/Indexer.php index d2aec7c6948..92b8672b159 100644 --- a/app/code/core/Mage/Index/Model/Indexer.php +++ b/app/code/core/Mage/Index/Model/Indexer.php @@ -84,7 +84,7 @@ public function getProcessesCollection() * Get index process by specific id * * @param int $processId - * @return Mage_Index_Model_Process | false + * @return Mage_Index_Model_Process|false */ public function getProcessById($processId) { diff --git a/app/code/core/Mage/Index/Model/Process.php b/app/code/core/Mage/Index/Model/Process.php index 504c19a602e..9cc4da17fde 100644 --- a/app/code/core/Mage/Index/Model/Process.php +++ b/app/code/core/Mage/Index/Model/Process.php @@ -23,6 +23,10 @@ * @method string getIndexCode() * @method string getIndexerCode() * @method $this setIndexerCode(string $value) + * @method string getName() + * @method $this setName(string $value) + * @method string getDescription() + * @method $this setDescription(string $value) * @method string getStatus() * @method $this setStatus(string $value) * @method string getStartedAt() @@ -33,6 +37,8 @@ * @method $this setMode(string $value) * @method bool getForcePartialReindex() * @method $this setForcePartialReindex(bool $value) + * @method int getUpdateRequired() + * @method $this setUpdateRequired(int $value) */ class Mage_Index_Model_Process extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php index 1bcce912c74..c6c8b479679 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php @@ -39,7 +39,7 @@ class Mage_Reports_Model_Resource_Report_Collection /** * Report period * - * @var int + * @var string */ protected $_period; @@ -76,7 +76,7 @@ protected function _construct() {} /** * Set period * - * @param int $period + * @param string $period * @return $this */ public function setPeriod($period)