updated tests

Author: sreichel

app/code/core/Mage/Core/Model/App.php

@@ -973,7 +973,7 @@ public function getDistroLocaleCode()
     /**
      * Retrieve application website object
      *
-     * @param null|Mage_Core_Model_Website|true|int|string $id
+     * @param null|Mage_Core_Model_Website|bool|int|string $id
      * @return Mage_Core_Model_Website
      */
     public function getWebsite($id = null)

tests/unit/Mage/Admin/Helper/BlockTest.php

@@ -19,15 +19,15 @@
 
 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
 {
     private static Subject $subject;
 
     public static function setUpBeforeClass(): void
     {
-        Mage::app();
+        parent::setUpBeforeClass();
         self::$subject = Mage::helper('admin/block');
     }
 

tests/unit/Mage/Admin/Helper/DataTest.php

@@ -19,15 +19,15 @@
 
 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
 {
     private static Subject $subject;
 
     public static function setUpBeforeClass(): void
     {
-        Mage::app();
+        parent::setUpBeforeClass();
         self::$subject = Mage::helper('admin/data');
     }
 

tests/unit/Mage/Admin/Helper/VariableTest.php

@@ -19,15 +19,15 @@
 
 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 static Subject $subject;
 
     public static function setUpBeforeClass(): void
     {
-        Mage::app();
+        parent::setUpBeforeClass();
         self::$subject = Mage::helper('admin/variable');
     }
 

tests/unit/Mage/Admin/Model/BlockTest.php

@@ -18,18 +18,20 @@
 namespace OpenMage\Tests\Unit\Mage\Admin\Model;
 
 use Exception;
-use Generator;
 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
 {
+    use BlockTrait;
+
     private static Subject $subject;
 
     public static function setUpBeforeClass(): void
     {
-        Mage::app();
+        parent::setUpBeforeClass();
         self::$subject = Mage::getModel('admin/block');
     }
 
@@ -43,90 +45,12 @@ public static function setUpBeforeClass(): void
      */
     public function testValidate(bool|array $expectedResult, array $methods): void
     {
-        $mock = $this->getMockBuilder(Subject::class)
-            ->setMethods([
-                'getBlockName',
-                'getIsAllowed',
-            ])
-            ->getMock();
+        $mock = $this->getMockWithCalledMethods(Subject::class, $methods);
 
-        $mock->method('getBlockName')->willReturn($methods['getBlockName']);
-        $mock->method('getIsAllowed')->willReturn($methods['getIsAllowed']);
+        static::assertInstanceOf(Subject::class, $mock);
         static::assertEquals($expectedResult, $mock->validate());
     }
 
-    public function provideValidateAdminBlockData(): Generator
-    {
-        $errorIncorrectBlockName = 'Block Name is incorrect.';
-
-        yield 'valid' => [
-            true,
-            [
-                'getBlockName' => 'test/block',
-                'getIsAllowed' => '1',
-            ],
-        ];
-        yield 'invalid' => [
-            [$errorIncorrectBlockName],
-            [
-                'getBlockName' => 'Test_Block',
-                'getIsAllowed' => '1',
-            ],
-        ];
-        yield 'errors: blank blockname' => [
-            [
-                0 => 'Block Name is required field.',
-                1 => '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.'],
-            [
-                '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',
-            ],
-        ];
-    }
-
     /**
      * @group Mage_Admin
      * @group Mage_Admin_Model

tests/unit/Mage/Admin/Model/ConfigTest.php

@@ -20,16 +20,16 @@
 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
 {
     private static Subject $subject;
 
     public static function setUpBeforeClass(): void
     {
-        Mage::app();
+        parent::setUpBeforeClass();
         self::$subject = Mage::getModel('admin/config');
     }