ACP2E-1120: update unit tests; fix static errors

Author: alzota

app/code/Magento/Payment/Model/Method/Free.php

@@ -5,16 +5,8 @@
  */
 namespace Magento\Payment\Model\Method;
 
-use Magento\Framework\Api\AttributeValueFactory;
-use Magento\Framework\Api\ExtensionAttributesFactory;
-use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Data\Collection\AbstractDb;
-use Magento\Framework\Model\Context;
-use Magento\Framework\Model\ResourceModel\AbstractResource;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
-use Magento\Framework\Registry;
-use Magento\Payment\Helper\Data;
 use Magento\Sales\Model\Order\Config;
 use Magento\Sales\Model\Order\Status;
 
@@ -26,21 +18,22 @@
  * Magento contains special flow for handling this payment method.
  * Inheritance is allowed to modify it behavior.
  *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
  * @since 100.0.2
  */
 class Free extends \Magento\Payment\Model\Method\AbstractMethod
 {
-    const PAYMENT_METHOD_FREE_CODE = 'free';
+    protected const PAYMENT_METHOD_FREE_CODE = 'free';
 
     /**
      * XML Paths for configuration constants
      */
-    const XML_PATH_PAYMENT_FREE_ACTIVE = 'payment/free/active';
+    protected const XML_PATH_PAYMENT_FREE_ACTIVE = 'payment/free/active';
 
-    const XML_PATH_PAYMENT_FREE_ORDER_STATUS = 'payment/free/order_status';
+    protected const XML_PATH_PAYMENT_FREE_ORDER_STATUS = 'payment/free/order_status';
 
-    const XML_PATH_PAYMENT_FREE_PAYMENT_ACTION = 'payment/free/payment_action';
+    protected const XML_PATH_PAYMENT_FREE_PAYMENT_ACTION = 'payment/free/payment_action';
 
     /**
      * Payment Method features
@@ -146,6 +139,9 @@ public function getConfigPaymentAction()
     {
         $newStateStatuses = $this->config->getStateStatuses('new');
         $configNewOrderStatus = $this->getConfigData('order_status');
-        return $configNewOrderStatus == 'pending' || array_key_exists($configNewOrderStatus, $newStateStatuses) ? null : parent::getConfigPaymentAction();
+        return
+            $configNewOrderStatus == 'pending' ||
+            array_key_exists($configNewOrderStatus, $newStateStatuses) ?
+                null : parent::getConfigPaymentAction();
     }
 }

app/code/Magento/Payment/Test/Unit/Model/Method/FreeTest.php

@@ -18,6 +18,7 @@
 use Magento\Payment\Model\Method\Free;
 use Magento\Payment\Model\Method\Logger;
 use Magento\Quote\Model\Quote;
+use Magento\Sales\Model\Order\Config;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
@@ -42,6 +43,11 @@ class FreeTest extends TestCase
      */
     protected $currencyPrice;
 
+    /**
+     * @var MockObject
+     */
+    protected $configMock;
+
     /**
      * @inheritdoc
      */
@@ -64,6 +70,8 @@ protected function setUp(): void
             ->setConstructorArgs([$this->getMockForAbstractClass(LoggerInterface::class)])
             ->getMock();
 
+        $this->configMock = $this->createMock(Config::class);
+
         $this->methodFree = new Free(
             $context,
             $registry,
@@ -72,26 +80,32 @@ protected function setUp(): void
             $paymentData,
             $this->scopeConfig,
             $loggerMock,
-            $this->currencyPrice
+            $this->currencyPrice,
+            null,
+            null,
+            [],
+            $this->configMock
         );
     }
 
     /**
      * @param string $orderStatus
      * @param string $paymentAction
      * @param mixed $result
+     * @param array $stateStatuses
      *
      * @return void
      * @dataProvider getConfigPaymentActionProvider
      */
-    public function testGetConfigPaymentAction($orderStatus, $paymentAction, $result): void
+    public function testGetConfigPaymentAction($orderStatus, $paymentAction, $result, $stateStatuses): void
     {
-
-        if ($orderStatus != 'pending') {
-            $this->scopeConfig
-                ->method('getValue')
-                ->willReturnOnConsecutiveCalls($orderStatus, $paymentAction);
-        }
+        $this->configMock
+            ->method('getStateStatuses')
+            ->with('new')
+            ->willReturn($stateStatuses);
+        $this->scopeConfig
+            ->method('getValue')
+            ->willReturnOnConsecutiveCalls($orderStatus, $paymentAction);
         $this->assertEquals($result, $this->methodFree->getConfigPaymentAction());
     }
 
@@ -150,8 +164,10 @@ public function getIsAvailableProvider(): array
     public function getConfigPaymentActionProvider(): array
     {
         return [
-            ['pending', 'action', null],
-            ['processing', 'payment_action', 'payment_action']
+            ['pending', 'action', null, ['pending' => 'Pending']],
+            ['new', 'action', null, ['pending' => 'Pending', 'new' => 'New']],
+            ['new', 'payment_action', 'payment_action', ['pending' => 'Pending']],
+            ['processing', 'payment_action', 'payment_action', ['pending' => 'Pending']]
         ];
     }
 }