- Fixed Unit tests

- Refactored PaymentToken to use data array instead of own variable.

Author: dverkade

app/code/Magento/Vault/Api/Data/PaymentTokenFactoryInterface.php

@@ -24,5 +24,5 @@ interface PaymentTokenFactoryInterface
      * @param $type string
      * @return PaymentTokenInterface
      */
-    public function create($type);
+    public function create($type = null);
 }

app/code/Magento/Vault/Model/PaymentToken.php

@@ -20,26 +20,6 @@ class PaymentToken extends AbstractModel implements PaymentTokenInterface
      */
     protected $_eventPrefix = 'vault_payment_token';
 
-    /**
-     * @param string $type
-     * @param \Magento\Framework\Model\Context $context
-     * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
-     * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
-     * @param array $data
-     */
-    public function __construct(
-        $type,
-        \Magento\Framework\Model\Context $context,
-        \Magento\Framework\Registry $registry,
-        \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
-        \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
-    ) {
-        $this->setType($type);
-        parent::__construct($context, $registry, $resource, $resourceCollection, $data);
-    }
-
     /**
      * @inheritdoc
      */

app/code/Magento/Vault/Model/PaymentTokenFactory.php

@@ -6,7 +6,9 @@
 
 namespace Magento\Vault\Model;
 
+use Magento\Framework\ObjectManagerInterface;
 use Magento\Vault\Api\Data\PaymentTokenFactoryInterface;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
 
 /**
  * PaymentTokenFactory class
@@ -35,12 +37,12 @@ public function __construct(ObjectManagerInterface $objectManager, $tokenTypes =
      * @param $type string
      * @return PaymentTokenInterface
      */
-    public function create($type)
+    public function create($type = null)
     {
-        if (!in_array($type, $this->tokenTypes, true)) {
+        if ($type !== null && !in_array($type, $this->tokenTypes, true)) {
             throw new \LogicException('There is no such payment token type: ' . $type);
         }
 
-        return $this->objectManager->create(PaymentTokenInterface::class, $type);
+        return $this->objectManager->create(PaymentTokenInterface::class, ['data' => [PaymentTokenInterface::TYPE => $type]]);
     }
 }

app/code/Magento/Vault/Test/Unit/Model/AccountPaymentTokenFactoryTest.php

@@ -8,6 +8,7 @@
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
+use Magento\Vault\Model\PaymentTokenFactory;
 use Magento\Vault\Model\AccountPaymentTokenFactory;
 use Magento\Vault\Model\PaymentToken;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
@@ -36,10 +37,16 @@ protected function setUp()
     {
         $objectManager = new ObjectManager($this);
 
-        $this->paymentToken = $objectManager->getObject(PaymentToken::class);
+        $tokenTypes = array(
+            'account' => \Magento\Vault\Api\Data\PaymentTokenFactoryInterface::TOKEN_TYPE_ACCOUNT,
+            'credit_card' => \Magento\Vault\Api\Data\PaymentTokenFactoryInterface::TOKEN_TYPE_CREDIT_CARD
+        );
 
+        $this->paymentToken = $objectManager->getObject(PaymentToken::class);
         $this->objectManager = $this->getMock(ObjectManagerInterface::class);
-        $this->factory = new AccountPaymentTokenFactory($this->objectManager);
+
+        $this->paymentTokenFactory = new PaymentTokenFactory($this->objectManager, $tokenTypes);
+        $this->factory = new AccountPaymentTokenFactory($this->objectManager, $this->paymentTokenFactory);
     }
 
     /**
@@ -51,6 +58,8 @@ public function testCreate()
             ->method('create')
             ->willReturn($this->paymentToken);
 
+        $this->paymentToken->setType(\Magento\Vault\Api\Data\PaymentTokenFactoryInterface::TOKEN_TYPE_ACCOUNT);
+
         /** @var PaymentTokenInterface $paymentToken */
         $paymentToken = $this->factory->create();
         static::assertInstanceOf(PaymentTokenInterface::class, $paymentToken);

app/code/Magento/Vault/Test/Unit/Model/CreditCardTokenFactoryTest.php

@@ -8,6 +8,7 @@
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
+use Magento\Vault\Model\PaymentTokenFactory;
 use Magento\Vault\Model\CreditCardTokenFactory;
 use Magento\Vault\Model\PaymentToken;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
@@ -36,10 +37,16 @@ protected function setUp()
     {
         $objectManager = new ObjectManager($this);
 
-        $this->paymentToken = $objectManager->getObject(PaymentToken::class);
+        $tokenTypes = array(
+            'account' => \Magento\Vault\Api\Data\PaymentTokenFactoryInterface::TOKEN_TYPE_ACCOUNT,
+            'credit_card' => \Magento\Vault\Api\Data\PaymentTokenFactoryInterface::TOKEN_TYPE_CREDIT_CARD
+        );
 
+        $this->paymentToken = $objectManager->getObject(PaymentToken::class);
         $this->objectManager = $this->getMock(ObjectManagerInterface::class);
-        $this->factory = new CreditCardTokenFactory($this->objectManager);
+
+        $this->paymentTokenFactory = new PaymentTokenFactory($this->objectManager, $tokenTypes);
+        $this->factory = new CreditCardTokenFactory($this->objectManager, $this->paymentTokenFactory);
     }
 
     /**
@@ -51,6 +58,8 @@ public function testCreate()
             ->method('create')
             ->willReturn($this->paymentToken);
 
+        $this->paymentToken->setType(\Magento\Vault\Api\Data\PaymentTokenFactoryInterface::TOKEN_TYPE_CREDIT_CARD);
+
         /** @var PaymentTokenInterface $paymentToken */
         $paymentToken = $this->factory->create();
         static::assertInstanceOf(PaymentTokenInterface::class, $paymentToken);