updated tests

Author: sreichel

.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.

app/code/core/Mage/Core/Model/Email/Queue.php

@@ -35,8 +35,8 @@
  * @method string getMessageBody()
  * @method $this setMessageBody(string $value)
  * @method $this setMessageBodyHash(string $value)
- * @method string getMessageParameters()
- * @method $this setMessageParameters(string $value)
+ * @method array getMessageParameters()
+ * @method $this setMessageParameters(array $value)
  * @method $this setProcessedAt(string $value)
  */
 class Mage_Core_Model_Email_Queue extends Mage_Core_Model_Abstract

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

tests/unit/Base/DefaultConfigTest.php

@@ -31,7 +31,7 @@ class DefaultConfigTest extends TestCase
      */
     public function testGetStoreConfig(string $expectedResult, string $path, $store = null): void
     {
-        $this->assertSame($expectedResult, Mage::getStoreConfig($path, $store));
+        static::assertSame($expectedResult, Mage::getStoreConfig($path, $store));
     }
 
 

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

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

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

@@ -23,12 +23,12 @@
 
 class BlockTest extends TestCase
 {
-    public Subject $subject;
+    private static Subject $subject;
 
-    public function setUp(): void
+    public static function setUpBeforeClass(): void
     {
         Mage::app();
-        $this->subject = Mage::helper('admin/block');
+        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());
     }
 }

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

@@ -23,12 +23,12 @@
 
 class DataTest extends TestCase
 {
-    public Subject $subject;
+    private static Subject $subject;
 
-    public function setUp(): void
+    public static function setUpBeforeClass(): void
     {
         Mage::app();
-        $this->subject = Mage::helper('admin/data');
+        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());
     }
 }

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

@@ -23,12 +23,12 @@
 
 class VariableTest extends TestCase
 {
-    public Subject $subject;
+    public static Subject $subject;
 
-    public function setUp(): void
+    public static function setUpBeforeClass(): void
     {
         Mage::app();
-        $this->subject = Mage::helper('admin/variable');
+        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(''));
     }
 }

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

@@ -17,19 +17,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;
 
 class BlockTest extends TestCase
 {
-    public Subject $subject;
+    private static Subject $subject;
 
-    public function setUp(): void
+    public static function setUpBeforeClass(): void
     {
         Mage::app();
-        $this->subject = Mage::getModel('admin/block');
+        self::$subject = Mage::getModel('admin/block');
     }
 
     /**
@@ -38,7 +39,7 @@ public function setUp(): void
      *
      * @group Mage_Admin
      * @group Mage_Admin_Model
-     * @group Mage_Admin_Model_Test
+     * @throws Exception
      */
     public function testValidate($expectedResult, array $methods): void
     {
@@ -51,7 +52,7 @@ public function testValidate($expectedResult, array $methods): void
 
         $mock->method('getBlockName')->willReturn($methods['getBlockName']);
         $mock->method('getIsAllowed')->willReturn($methods['getIsAllowed']);
-        $this->assertEquals($expectedResult, $mock->validate());
+        static::assertEquals($expectedResult, $mock->validate());
     }
 
     public function provideValidateAdminBlockData(): Generator
@@ -86,7 +87,7 @@ public function provideValidateAdminBlockData(): Generator
             [$errorIncorrectBlockName],
             [
                 'getBlockName' => '~',
-                'getIsAllowed' => '0',
+                'getIsAllowed' => '1',
             ],
         ];
         yield 'errors: invalid blockname' => [
@@ -96,6 +97,34 @@ public function provideValidateAdminBlockData(): Generator
                 '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',
+            ],
+        ];
     }
 
     /**
@@ -104,6 +133,6 @@ public function provideValidateAdminBlockData(): Generator
      */
     public function testIsTypeAllowed(): void
     {
-        $this->assertIsBool($this->subject->isTypeAllowed('invalid-type'));
+        static::assertIsBool(self::$subject->isTypeAllowed('invalid-type'));
     }
 }