updated test

Author: sreichel

app/code/core/Mage/Customer/Model/Customer.php

@@ -1729,9 +1729,7 @@ public function getMinPasswordLength()
      */
     public function shouldValidateDob($entityType): bool
     {
-        /** @var Mage_Customer_Model_Attribute $model */
-        $model = Mage::getModel('customer/attribute');
-        $attribute = $model->loadByCode($entityType, 'dob');
+        $attribute = $this->getCustomerAttributeModel()->loadByCode($entityType, 'dob');
         return $attribute->getIsRequired();
     }
 
@@ -1740,20 +1738,23 @@ public function shouldValidateDob($entityType): bool
      */
     public function shouldValidateGender($entityType): bool
     {
-        /** @var Mage_Customer_Model_Attribute $model */
-        $model = Mage::getModel('customer/attribute');
-        $attribute = $model->loadByCode($entityType, 'gender');
+        $attribute = $this->getCustomerAttributeModel()->loadByCode($entityType, 'gender');
         return $attribute->getIsRequired();
     }
 
     /**
      * @throws Mage_Core_Exception
      */
     public function shouldValidateTaxvat($entityType): bool
+    {
+        $attribute = $this->getCustomerAttributeModel()->loadByCode($entityType, 'taxvat');
+        return $attribute->getIsRequired();
+    }
+
+    public function getCustomerAttributeModel(): Mage_Customer_Model_Attribute
     {
         /** @var Mage_Customer_Model_Attribute $model */
         $model = Mage::getModel('customer/attribute');
-        $attribute = $model->loadByCode($entityType, 'taxvat');
-        return $attribute->getIsRequired();
+        return $model->getIsRequired();
     }
 }

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

@@ -56,6 +56,8 @@ public function testValidate($expectedResult, array $methods): void
 
     public function provideValidateAdminBlockData(): Generator
     {
+        $errorIncorrectBlockName = 'Block Name is incorrect.';
+
         yield 'valid' => [
             true,
             [
@@ -64,9 +66,7 @@ public function provideValidateAdminBlockData(): Generator
             ],
         ];
         yield 'invalid' => [
-            [
-                0 => 'Block Name is incorrect.',
-            ],
+            [$errorIncorrectBlockName],
             [
                 'getBlockName' => 'Test_Block',
                 'getIsAllowed' => '1',
@@ -83,18 +83,14 @@ public function provideValidateAdminBlockData(): Generator
             ],
         ];
         yield 'errors: invalid char blockname' => [
-            [
-                0 => 'Block Name is incorrect.',
-            ],
+            [$errorIncorrectBlockName],
             [
                 'getBlockName' => '~',
                 'getIsAllowed' => '0',
             ],
         ];
         yield 'errors: invalid blockname' => [
-            [
-                0 => 'Block Name is incorrect.',
-            ],
+            [$errorIncorrectBlockName],
             [
                 'getBlockName' => 'test',
                 'getIsAllowed' => '0',