MAGETWO-53865: [GITHUB#4741] CC Model doesn't assigns cc data passed in additional_data field

Author: dkvashninbay

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

@@ -5,9 +5,14 @@
  */
 namespace Magento\Payment\Model\Method;
 
+use Magento\Framework\DataObject;
+use Magento\Quote\Api\Data\PaymentInterface;
+use Magento\Quote\Model\Quote\Payment;
+
 /**
  * @method \Magento\Quote\Api\Data\PaymentMethodExtensionInterface getExtensionAttributes()
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @deprecated
  */
 class Cc extends \Magento\Payment\Model\Method\AbstractMethod
 {
@@ -237,6 +242,40 @@ protected function _validateExpDate($expYear, $expMonth)
         return true;
     }
 
+    /**
+     * Assign data to info model instance
+     *
+     * @param \Magento\Framework\DataObject|mixed $data
+     * @return $this
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function assignData(\Magento\Framework\DataObject $data)
+    {
+        $additionalData = $data->getData(PaymentInterface::KEY_ADDITIONAL_DATA);
+        if (!is_object($additionalData)) {
+            $additionalData = new DataObject($additionalData ?: []);
+        }
+
+        /** @var DataObject $info */
+        $info = $this->getInfoInstance();
+        $info->addData(
+            [
+                'cc_type' => $additionalData->getCcType(),
+                'cc_owner' => $additionalData->getCcOwner(),
+                'cc_last_4' => substr($additionalData->getCcNumber(), -4),
+                'cc_number' => $additionalData->getCcNumber(),
+                'cc_cid' => $additionalData->getCcCid(),
+                'cc_exp_month' => $additionalData->getCcExpMonth(),
+                'cc_exp_year' => $additionalData->getCcExpYear(),
+                'cc_ss_issue' => $additionalData->getCcSsIssue(),
+                'cc_ss_start_month' => $additionalData->getCcSsStartMonth(),
+                'cc_ss_start_year' => $additionalData->getCcSsStartYear()
+            ]
+        );
+
+        return $this;
+    }
+
     /**
      * @param string $type
      * @return bool

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

@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Payment\Test\Unit\Model\Method;
+
+use Magento\Framework\DataObject;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Payment\Model\Method\Cc;
+use Magento\Quote\Api\Data\PaymentInterface;
+use Magento\Quote\Model\Quote\Payment;
+
+class CcTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Cc
+     */
+    private $ccModel;
+
+    public function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->ccModel = $objectManager->getObject(Cc::class);
+    }
+    
+    public function testAssignData()
+    {
+        $additionalData = [
+            'cc_type' => 'VI',
+            'cc_owner' => 'Bruce',
+            'cc_number' => '41111111111111',
+            'cc_cid' => '42',
+            'cc_exp_month' => '02',
+            'cc_exp_year' => '30',
+            'cc_ss_issue' => '9',
+            'cc_ss_start_month' => '01',
+            'cc_ss_start_year' => '30'
+        ];
+
+        $inputData = new DataObject(
+            [
+                PaymentInterface::KEY_ADDITIONAL_DATA => $additionalData
+            ]
+        );
+
+        $payment = $this->getMockBuilder(Payment::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $expectedData = [
+            'cc_type' => 'VI',
+            'cc_owner' => 'Bruce',
+            'cc_last_4' => '1111',
+            'cc_number' => '41111111111111',
+            'cc_cid' => '42',
+            'cc_exp_month' => '02',
+            'cc_exp_year' => '30',
+            'cc_ss_issue' => '9',
+            'cc_ss_start_month' => '01',
+            'cc_ss_start_year' => '30'
+        ];
+
+        $payment->expects(static::once())
+            ->method('addData')
+            ->with(
+                $expectedData
+            );
+
+        $this->ccModel->setInfoInstance($payment);
+        $this->ccModel->assignData($inputData);
+    }
+}