extra tests for current interception behavior

dev/tests/integration/testsuite/Magento/Framework/Interception/AbstractPlugin.php

@@ -0,0 +1,73 @@
+<?php
+/**
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace Magento\Framework\Interception;
+
+use Magento\Framework\ObjectManager\Config\Config as ObjectManagerConfig;
+
+/**
+ * Class GeneralTest
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+abstract class AbstractPlugin extends \PHPUnit_Framework_TestCase
+{
+    public function setUpInterceptionConfig($pluginConfig)
+    {
+        $config = new \Magento\Framework\Interception\ObjectManager\Config\Developer();
+        $factory = new \Magento\Framework\ObjectManager\Factory\Dynamic\Developer($config, null);
+
+        $this->_configReader = $this->getMock('Magento\Framework\Config\ReaderInterface');
+        $this->_configReader->expects(
+            $this->any()
+        )->method(
+            'read'
+        )->will(
+            $this->returnValue($pluginConfig)
+        );
+
+        $areaList = $this->getMock('Magento\Framework\App\AreaList', [], [], '', false);
+        $areaList->expects($this->any())->method('getCodes')->will($this->returnValue([]));
+        $configScope = new \Magento\Framework\Config\Scope($areaList, 'global');
+        $cache = $this->getMock('Magento\Framework\Config\CacheInterface');
+        $cache->expects($this->any())->method('load')->will($this->returnValue(false));
+        $definitions = new \Magento\Framework\ObjectManager\Definition\Runtime();
+        $relations = new \Magento\Framework\ObjectManager\Relations\Runtime();
+        $interceptionConfig = new Config\Config(
+            $this->_configReader,
+            $configScope,
+            $cache,
+            $relations,
+            $config,
+            $definitions
+        );
+        $interceptionDefinitions = new Definition\Runtime();
+        $this->_objectManager = new \Magento\Framework\ObjectManager\ObjectManager(
+            $factory,
+            $config,
+            [
+                'Magento\Framework\Config\CacheInterface'                      => $cache,
+                'Magento\Framework\Config\ScopeInterface'                      => $configScope,
+                'Magento\Framework\Config\ReaderInterface'                     => $this->_configReader,
+                'Magento\Framework\ObjectManager\RelationsInterface'           => $relations,
+                'Magento\Framework\ObjectManager\ConfigInterface'              => $config,
+                'Magento\Framework\Interception\ObjectManager\ConfigInterface' => $config,
+                'Magento\Framework\ObjectManager\DefinitionInterface'          => $definitions,
+                'Magento\Framework\Interception\DefinitionInterface'           => $interceptionDefinitions
+            ]
+        );
+        $factory->setObjectManager($this->_objectManager);
+        $config->setInterceptionConfig($interceptionConfig);
+        $config->extend(
+            [
+                'preferences' => [
+                    'Magento\Framework\Interception\PluginListInterface' =>
+                        'Magento\Framework\Interception\PluginList\PluginList',
+                    'Magento\Framework\Interception\ChainInterface'      =>
+                        'Magento\Framework\Interception\Chain\Chain',
+                ],
+            ]
+        );
+    }
+}

dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/Intercepted.php

@@ -49,4 +49,29 @@ public function K($param1)
     {
         return '<K>' . $param1 . '</K>';
     }
+
+    public function V($param1)
+    {
+        return '<V>' . $param1 . '</V>';
+    }
+
+    public function W($param1)
+    {
+        return '<W>' . $param1 . '</W>';
+    }
+
+    public function X($param1)
+    {
+        return '<X>' . $param1 . '</X>';
+    }
+
+    public function Y($param1)
+    {
+        return '<Y>' . $param1 . '</Y>';
+    }
+
+    public function Z($param1)
+    {
+        return '<Z>' . $param1 . '</Z>';
+    }
 }

dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/Intercepted/FirstPlugin.php

@@ -0,0 +1,88 @@
+<?php
+/**
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace Magento\Framework\Interception\Fixture\Intercepted;
+
+use Magento\Framework\Interception\Fixture\Intercepted;
+
+class FirstPlugin
+{
+    /**
+     * @var int
+     */
+    protected $_counter = 0;
+
+    public function aroundC(Intercepted $subject, \Closure $next, $param1)
+    {
+        return '<F:C>' . $next($param1) . '</F:C>';
+    }
+
+    public function aroundD(Intercepted $subject, \Closure $next, $param1)
+    {
+        $this->_counter++;
+        return '<F:D>' . $this->_counter . ': ' . $next($param1) . '</F:D>';
+    }
+
+    public function aroundK(Intercepted $subject, \Closure $next, $param1)
+    {
+        $result = $subject->C($param1);
+        return '<F:K>' . $subject->F($result) . '</F:K>';
+    }
+
+    public function beforeG(Intercepted $subject, $param1)
+    {
+        return ['<F:bG>' . $param1 . '</F:bG>'];
+    }
+
+    public function aroundG(Intercepted $subject, \Closure $next, $param1)
+    {
+        return $next('<F:G>' . $param1 . '</F:G>');
+    }
+
+    public function afterG(Intercepted $subject, $result)
+    {
+        return '<F:aG>' . $result . '</F:aG>';
+    }
+
+    public function beforeV(Intercepted $subject, $param1)
+    {
+        return ['<F:bV/>'];
+    }
+
+    public function aroundV(Intercepted $subject, \Closure $next, $param1)
+    {
+        return '<F:V>' . $param1 . '<F:V/>';
+    }
+
+    public function beforeW(Intercepted $subject, $param1)
+    {
+        return ['<F:bW/>'];
+    }
+
+    public function aroundW(Intercepted $subject, \Closure $next, $param1)
+    {
+        return '<F:W>' . $param1 . '<F:W/>';
+    }
+
+    public function afterW(Intercepted $subject, $result)
+    {
+        return '<F:aW/>';
+    }
+
+    public function beforeX(Intercepted $subject, $param1)
+    {
+        return ['<F:bX/>'];
+    }
+
+    public function aroundY(Intercepted $subject, \Closure $next, $param1)
+    {
+        return '<F:Y>' . $param1 . '<F:Y/>';
+    }
+
+    public function afterZ(Intercepted $subject, $result)
+    {
+        return '<F:aZ/>';
+    }
+}

dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/Intercepted/Plugin.php

@@ -45,4 +45,44 @@ public function afterG(Intercepted $subject, $result)
     {
         return '<P:aG>' . $result . '</P:aG>';
     }
+
+    public function beforeV(Intercepted $subject, $param1)
+    {
+        return ['<P:bV/>'];
+    }
+
+    public function aroundV(Intercepted $subject, \Closure $next, $param1)
+    {
+        return '<P:V>' . $param1 . '<P:V/>';
+    }
+
+    public function beforeW(Intercepted $subject, $param1)
+    {
+        return ['<P:bW/>'];
+    }
+
+    public function aroundW(Intercepted $subject, \Closure $next, $param1)
+    {
+        return '<P:W>' . $param1 . '<P:W/>';
+    }
+
+    public function afterW(Intercepted $subject, $result)
+    {
+        return '<P:aW/>';
+    }
+
+    public function beforeX(Intercepted $subject, $param1)
+    {
+        return ['<P:bX/>'];
+    }
+
+    public function aroundY(Intercepted $subject, \Closure $next, $param1)
+    {
+        return '<P:Y>' . $param1 . '<P:Y/>';
+    }
+
+    public function afterZ(Intercepted $subject, $result)
+    {
+        return '<P:aZ/>';
+    }
 }

dev/tests/integration/testsuite/Magento/Framework/Interception/GeneralTest.php

@@ -11,7 +11,7 @@
  * Class GeneralTest
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class GeneralTest extends \PHPUnit_Framework_TestCase
+class GeneralTest extends AbstractPlugin
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
@@ -25,76 +25,26 @@ class GeneralTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $config = new \Magento\Framework\Interception\ObjectManager\Config\Developer();
-        $factory = new \Magento\Framework\ObjectManager\Factory\Dynamic\Developer($config, null);
-
-        $this->_configReader = $this->getMock('Magento\Framework\Config\ReaderInterface');
-        $this->_configReader->expects(
-            $this->any()
-        )->method(
-            'read'
-        )->will(
-            $this->returnValue(
-                [
-                    'Magento\Framework\Interception\Fixture\InterceptedInterface' => [
+        $this->setUpInterceptionConfig(
+            [
+                'Magento\Framework\Interception\Fixture\InterceptedInterface' =>
+                    [
                         'plugins' => [
                             'first' => [
-                                'instance' => 'Magento\Framework\Interception\Fixture\Intercepted\InterfacePlugin',
+                                'instance'  => 'Magento\Framework\Interception\Fixture\Intercepted\InterfacePlugin',
                                 'sortOrder' => 10,
                             ],
                         ],
                     ],
-                    'Magento\Framework\Interception\Fixture\Intercepted' => [
+                'Magento\Framework\Interception\Fixture\Intercepted'          =>
+                    [
                         'plugins' => [
                             'second' => [
-                                'instance' => 'Magento\Framework\Interception\Fixture\Intercepted\Plugin',
+                                'instance'  => 'Magento\Framework\Interception\Fixture\Intercepted\Plugin',
                                 'sortOrder' => 20,
                             ],
                         ],
                     ],
-                ]
-            )
-        );
-
-        $areaList = $this->getMock('Magento\Framework\App\AreaList', [], [], '', false);
-        $areaList->expects($this->any())->method('getCodes')->will($this->returnValue([]));
-        $configScope = new \Magento\Framework\Config\Scope($areaList, 'global');
-        $cache = $this->getMock('Magento\Framework\Config\CacheInterface');
-        $cache->expects($this->any())->method('load')->will($this->returnValue(false));
-        $definitions = new \Magento\Framework\ObjectManager\Definition\Runtime();
-        $relations = new \Magento\Framework\ObjectManager\Relations\Runtime();
-        $interceptionConfig = new Config\Config(
-            $this->_configReader,
-            $configScope,
-            $cache,
-            $relations,
-            $config,
-            $definitions
-        );
-        $interceptionDefinitions = new Definition\Runtime();
-        $this->_objectManager = new \Magento\Framework\ObjectManager\ObjectManager(
-            $factory,
-            $config,
-            [
-                'Magento\Framework\Config\CacheInterface' => $cache,
-                'Magento\Framework\Config\ScopeInterface' => $configScope,
-                'Magento\Framework\Config\ReaderInterface' => $this->_configReader,
-                'Magento\Framework\ObjectManager\RelationsInterface' => $relations,
-                'Magento\Framework\ObjectManager\ConfigInterface' => $config,
-                'Magento\Framework\Interception\ObjectManager\ConfigInterface' => $config,
-                'Magento\Framework\ObjectManager\DefinitionInterface' => $definitions,
-                'Magento\Framework\Interception\DefinitionInterface' => $interceptionDefinitions
-            ]
-        );
-        $factory->setObjectManager($this->_objectManager);
-        $config->setInterceptionConfig($interceptionConfig);
-        $config->extend(
-            [
-                'preferences' => [
-                    'Magento\Framework\Interception\PluginListInterface' =>
-                        'Magento\Framework\Interception\PluginList\PluginList',
-                    'Magento\Framework\Interception\ChainInterface' => 'Magento\Framework\Interception\Chain\Chain',
-                ],
             ]
         );
     }

dev/tests/integration/testsuite/Magento/Framework/Interception/TwoPluginTest.php

@@ -0,0 +1,61 @@
+<?php
+/**
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace Magento\Framework\Interception;
+
+/**
+ * Class TwoPluginTest
+ */
+class TwoPluginTest extends AbstractPlugin
+{
+    public function setUp()
+    {
+        $this->setUpInterceptionConfig(
+            [
+                'Magento\Framework\Interception\Fixture\Intercepted' => [
+                    'plugins' => [
+                        'first'     => [
+                            'instance'  => 'Magento\Framework\Interception\Fixture\Intercepted\FirstPlugin',
+                            'sortOrder' => 10,
+                        ], 'second' => [
+                            'instance'  => 'Magento\Framework\Interception\Fixture\Intercepted\Plugin',
+                            'sortOrder' => 20,
+                        ]
+                    ],
+                ]
+            ]
+        );
+    }
+
+    public function testPluginBeforeWins()
+    {
+        $subject = $this->_objectManager->create('Magento\Framework\Interception\Fixture\Intercepted');
+        $this->assertEquals('<X><P:bX/></X>', $subject->X('test'));
+    }
+
+    public function testPluginAroundWins()
+    {
+        $subject = $this->_objectManager->create('Magento\Framework\Interception\Fixture\Intercepted');
+        $this->assertEquals('<F:Y>test<F:Y/>', $subject->Y('test'));
+    }
+
+    public function testPluginAfterWins()
+    {
+        $subject = $this->_objectManager->create('Magento\Framework\Interception\Fixture\Intercepted');
+        $this->assertEquals('<P:aZ/>', $subject->Z('test'));
+    }
+
+    public function testPluginBeforeAroundWins()
+    {
+        $subject = $this->_objectManager->create('Magento\Framework\Interception\Fixture\Intercepted');
+        $this->assertEquals('<F:V><F:bV/><F:V/>', $subject->V('test'));
+    }
+
+    public function testPluginBeforeAroundAfterWins()
+    {
+        $subject = $this->_objectManager->create('Magento\Framework\Interception\Fixture\Intercepted');
+        $this->assertEquals('<F:aW/>', $subject->W('test'));
+    }
+}