MAGETWO-31363: [MPI] Unit and Integration tests coverage

Pechenushko · Pechenushko · commit 45549012036e · 2015-01-20T17:31:38.000+02:00
diff --git a/app/code/Magento/OfflinePayments/Block/Form/AbstractInstruction.php b/app/code/Magento/OfflinePayments/Block/Form/AbstractInstruction.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflinePayments\Block\Form;
+
+/**
+ * Abstract class for Cash On Delivery and Bank Transfer payment method form
+ */
+abstract class AbstractInstruction extends \Magento\Payment\Block\Form
+{
+    /**
+     * Instructions text
+     *
+     * @var string
+     */
+    protected $_instructions;
+
+    /**
+     * Get instructions text from config
+     *
+     * @return string
+     */
+    public function getInstructions()
+    {
+        if (is_null($this->_instructions)) {
+            $this->_instructions = $this->getMethod()->getInstructions();
+        }
+        return $this->_instructions;
+    }
+}
diff --git a/app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php b/app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php
@@ -8,32 +8,12 @@
 /**
  * Block for Bank Transfer payment method form
  */
-class Banktransfer extends \Magento\Payment\Block\Form
+class Banktransfer extends \Magento\OfflinePayments\Block\Form\AbstractInstruction
 {
-    /**
-     * Instructions text
-     *
-     * @var string
-     */
-    protected $_instructions;
-
     /**
      * Bank transfer template
      *
      * @var string
      */
     protected $_template = 'form/banktransfer.phtml';
-
-    /**
-     * Get instructions text from config
-     *
-     * @return string
-     */
-    public function getInstructions()
-    {
-        if (is_null($this->_instructions)) {
-            $this->_instructions = $this->getMethod()->getInstructions();
-        }
-        return $this->_instructions;
-    }
 }
diff --git a/app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php b/app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php
@@ -8,32 +8,12 @@
 /**
  * Block for Cash On Delivery payment method form
  */
-class Cashondelivery extends \Magento\Payment\Block\Form
+class Cashondelivery extends \Magento\OfflinePayments\Block\Form\AbstractInstruction
 {
-    /**
-     * Instructions text
-     *
-     * @var string
-     */
-    protected $_instructions;
-
     /**
      * Cash on delivery template
      *
      * @var string
      */
     protected $_template = 'form/cashondelivery.phtml';
-
-    /**
-     * Get instructions text from config
-     *
-     * @return string
-     */
-    public function getInstructions()
-    {
-        if (is_null($this->_instructions)) {
-            $this->_instructions = $this->getMethod()->getInstructions();
-        }
-        return $this->_instructions;
-    }
 }
diff --git a/app/code/Magento/OfflinePayments/Model/Banktransfer.php b/app/code/Magento/OfflinePayments/Model/Banktransfer.php
@@ -39,14 +39,4 @@ class Banktransfer extends \Magento\Payment\Model\Method\AbstractMethod
      * @var bool
      */
     protected $_isOffline = true;
-
-    /**
-     * Get instructions text from config
-     *
-     * @return string
-     */
-    public function getInstructions()
-    {
-        return trim($this->getConfigData('instructions'));
-    }
 }
diff --git a/app/code/Magento/OfflinePayments/Model/Observer.php b/app/code/Magento/OfflinePayments/Model/Observer.php
@@ -21,9 +21,13 @@ public function beforeOrderPaymentSave(\Magento\Framework\Event\Observer $observ
     {
         /** @var \Magento\Sales\Model\Order\Payment $payment */
         $payment = $observer->getEvent()->getPayment();
-        $banktransfer = \Magento\OfflinePayments\Model\Banktransfer::PAYMENT_METHOD_BANKTRANSFER_CODE;
-        if ($payment->getMethod() === $banktransfer) {
-            $payment->setAdditionalInformation('instructions', $payment->getMethodInstance()->getInstructions());
+        if ($payment->getMethod() ===
+            \Magento\OfflinePayments\Model\Banktransfer::PAYMENT_METHOD_BANKTRANSFER_CODE
+        ) {
+            $payment->setAdditionalInformation(
+                'instructions',
+                $payment->getMethodInstance()->getConfigData('instructions')
+            );
         }
     }
 }
diff --git a/app/code/Magento/Payment/Block/Info/Instructions.php b/app/code/Magento/Payment/Block/Info/Instructions.php
@@ -33,7 +33,7 @@ public function getInstructions()
         if (is_null($this->_instructions)) {
             $this->_instructions = $this->getInfo()->getAdditionalInformation(
                 'instructions'
-            ) ?: $this->getMethod()->getInstructions();
+            ) ?: $this->getMethod()->getConfigData('instructions');
         }
         return $this->_instructions;
     }
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/AbstractInstructionTest.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/AbstractInstructionTest.php
@@ -5,17 +5,20 @@
  */
 namespace Magento\OfflinePayments\Block\Form;
 
-class BanktransferTest extends \PHPUnit_Framework_TestCase
+class AbstractInstructionTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\OfflinePayments\Block\Form\Banktransfer
+     * @var \Magento\OfflinePayments\Block\Form\AbstractInstruction
      */
-    protected $_object;
+    protected $_model;
 
     protected function setUp()
     {
-        $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
-        $this->_object = $objectManagerHelper->getObject('Magento\OfflinePayments\Block\Form\Banktransfer');
+        $context = $this->getMock('Magento\Framework\View\Element\Template\Context', [], [], '', false);
+        $this->_model = $this->getMockForAbstractClass(
+            'Magento\OfflinePayments\Block\Form\AbstractInstruction',
+            ['context' => $context]
+        );
     }
 
     public function testGetInstructions()
@@ -30,8 +33,8 @@ public function testGetInstructions()
         $method->expects($this->once())
             ->method('getInstructions')
             ->willReturn('instructions');
-        $this->_object->setData('method', $method);
+        $this->_model->setData('method', $method);
 
-        $this->assertEquals('instructions', $this->_object->getInstructions());
+        $this->assertEquals('instructions', $this->_model->getInstructions());
     }
 }
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/Cashondelivery.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/Cashondelivery.php
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Info/CheckmoTest.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Info/CheckmoTest.php
@@ -10,33 +10,12 @@ class CheckmoTest extends \PHPUnit_Framework_TestCase
     /**
      * @var \Magento\OfflinePayments\Block\Info\Checkmo
      */
-    protected $_object;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $_scopeConfig;
+    protected $_model;
 
     protected function setUp()
     {
-        $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
-        $eventManager = $this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false);
-        $paymentDataMock = $this->getMock('Magento\Payment\Helper\Data', [], [], '', false);
-        $this->_scopeConfig = $this->getMock(
-            'Magento\Framework\App\Config\ScopeConfigInterface',
-            ['getValue', 'isSetFlag'],
-            [],
-            '',
-            false
-        );
-        $this->_object = $objectManagerHelper->getObject(
-            'Magento\OfflinePayments\Block\Info\Checkmo',
-            [
-                'eventManager' => $eventManager,
-                'paymentData' => $paymentDataMock,
-                'scopeConfig' => $this->_scopeConfig,
-            ]
-        );
+        $context = $this->getMock('Magento\Framework\View\Element\Template\Context', [], [], '', false);
+        $this->_model = new \Magento\OfflinePayments\Block\Info\Checkmo($context);
     }
 
     /**
@@ -48,9 +27,9 @@ public function testGetPayableTo($details, $expected)
         $info->expects($this->once())
             ->method('getAdditionalData')
             ->willReturn(serialize($details));
-        $this->_object->setData('info', $info);
+        $this->_model->setData('info', $info);
 
-        $this->assertEquals($expected, $this->_object->getPayableTo());
+        $this->assertEquals($expected, $this->_model->getPayableTo());
     }
 
     /**
@@ -73,9 +52,9 @@ public function testGetMailingAddress($details, $expected)
         $info->expects($this->once())
             ->method('getAdditionalData')
             ->willReturn(serialize($details));
-        $this->_object->setData('info', $info);
+        $this->_model->setData('info', $info);
 
-        $this->assertEquals($expected, $this->_object->getMailingAddress());
+        $this->assertEquals($expected, $this->_model->getMailingAddress());
     }
 
     /**
@@ -88,4 +67,19 @@ public function getMailingAddressDataProvider()
             ['', '']
         ];
     }
+
+    public function testConvertAdditionalDataIsNeverCalled()
+    {
+        $info = $this->getMock('Magento\Payment\Model\Info', ['getAdditionalData'], [], '', false);
+        $info->expects($this->once())
+            ->method('getAdditionalData')
+            ->willReturn(serialize(['mailing_address' => 'blah@blah.com']));
+        $this->_model->setData('info', $info);
+
+        // First we set the property $this->_mailingAddress
+        $this->_model->getMailingAddress();
+
+        // And now we get already setted property $this->_mailingAddress
+        $this->assertEquals('blah@blah.com', $this->_model->getMailingAddress());
+    }
 }
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/BanktransferTest.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/BanktransferTest.php
@@ -37,14 +37,4 @@ public function testGetInfoBlockType()
     {
         $this->assertEquals('Magento\Payment\Block\Info\Instructions', $this->_object->getInfoBlockType());
     }
-
-    public function testGetInstructions()
-    {
-        $this->_object->setStore(1);
-        $this->_scopeConfig->expects($this->once())
-            ->method('getValue')
-            ->with('payment/banktransfer/instructions', 'store', 1)
-            ->willReturn('payment configuration');
-        $this->assertEquals('payment configuration', $this->_object->getInstructions());
-    }
 }
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/CashondeliveryTest.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/CashondeliveryTest.php
@@ -39,14 +39,4 @@ public function testGetInfoBlockType()
     {
         $this->assertEquals('Magento\Payment\Block\Info\Instructions', $this->_object->getInfoBlockType());
     }
-
-    public function testGetInstructions()
-    {
-        $this->_object->setStore(1);
-        $this->_scopeConfig->expects($this->once())
-            ->method('getValue')
-            ->with('payment/cashondelivery/instructions', 'store', 1)
-            ->willReturn('payment configuration');
-        $this->assertEquals('payment configuration', $this->_object->getInstructions());
-    }
 }
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/ObserverTest.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/ObserverTest.php
@@ -37,13 +37,13 @@ public function testBeforeOrderPaymentSave()
             ->with('instructions', 'payment configuration');
         $method = $this->getMock(
             'Magento\Payment\Model\MethodInterface',
-            ['getInstructions', 'getFormBlockType', 'getTitle', 'getCode'],
+            ['getConfigData', 'getFormBlockType', 'getTitle', 'getCode'],
             [],
             '',
             false
         );
         $method->expects($this->once())
-            ->method('getInstructions')
+            ->method('getConfigData')
             ->willReturn('payment configuration');
         $payment->expects($this->once())
             ->method('getMethodInstance')
@@ -56,4 +56,29 @@ public function testBeforeOrderPaymentSave()
             ->willReturn($event);
         $this->_model->beforeOrderPaymentSave($observer);
     }
+
+    public function testBeforeOrderPaymentSaveNoBanktransfer()
+    {
+        $observer = $this->getMock('Magento\Framework\Event\Observer', ['getEvent'], [], '', false);
+        $event = $this->getMock('Magento\Framework\Event', ['getPayment'], [], '', false);
+        $payment = $this->getMock(
+            'Magento\Sales\Model\Order\Payment',
+            ['getMethod', 'setAdditionalInformation', 'getMethodInstance'],
+            [],
+            '',
+            false
+        );
+        $payment->expects($this->once())
+            ->method('getMethod')
+            ->willReturn('somepaymentmethod');
+        $payment->expects($this->never())
+            ->method('setAdditionalInformation');
+        $event->expects($this->once())
+            ->method('getPayment')
+            ->willReturn($payment);
+        $observer->expects($this->once())
+            ->method('getEvent')
+            ->willReturn($event);
+        $this->_model->beforeOrderPaymentSave($observer);
+    }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Payment/Block/Info/InstructionsTest.php b/dev/tests/unit/testsuite/Magento/Payment/Block/Info/InstructionsTest.php

Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,13 @@ public function beforeOrderPaymentSave(\Magento\Framework\Event\Observer $observ`
`21`	`21`	`{`
`22`	`22`	`/** @var \Magento\Sales\Model\Order\Payment $payment */`
`23`	`23`	`$payment = $observer->getEvent()->getPayment();`
`24`		`- $banktransfer = \Magento\OfflinePayments\Model\Banktransfer::PAYMENT_METHOD_BANKTRANSFER_CODE;`
`25`		`- if ($payment->getMethod() === $banktransfer) {`
`26`		`- $payment->setAdditionalInformation('instructions', $payment->getMethodInstance()->getInstructions());`
	`24`	`+ if ($payment->getMethod() ===`
	`25`	`+ \Magento\OfflinePayments\Model\Banktransfer::PAYMENT_METHOD_BANKTRANSFER_CODE`
	`26`	`+ ) {`
	`27`	`+ $payment->setAdditionalInformation(`
	`28`	`+ 'instructions',`
	`29`	`+ $payment->getMethodInstance()->getConfigData('instructions')`
	`30`	`+ );`
`27`	`31`	`}`
`28`	`32`	`}`
`29`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function getInstructions()`
`33`	`33`	`if (is_null($this->_instructions)) {`
`34`	`34`	`$this->_instructions = $this->getInfo()->getAdditionalInformation(`
`35`	`35`	`'instructions'`
`36`		`- ) ?: $this->getMethod()->getInstructions();`
	`36`	`+ ) ?: $this->getMethod()->getConfigData('instructions');`
`37`	`37`	`}`
`38`	`38`	`return $this->_instructions;`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,14 +37,4 @@ public function testGetInfoBlockType()`
`37`	`37`	`{`
`38`	`38`	`$this->assertEquals('Magento\Payment\Block\Info\Instructions', $this->_object->getInfoBlockType());`
`39`	`39`	`}`
`40`		`-`
`41`		`- public function testGetInstructions()`
`42`		`- {`
`43`		`- $this->_object->setStore(1);`
`44`		`- $this->_scopeConfig->expects($this->once())`
`45`		`- ->method('getValue')`
`46`		`- ->with('payment/banktransfer/instructions', 'store', 1)`
`47`		`- ->willReturn('payment configuration');`
`48`		`- $this->assertEquals('payment configuration', $this->_object->getInstructions());`
`49`		`- }`
`50`	`40`	`}`