From 7d44c20c7b9dd4c32848e4098c20f22f6f363302 Mon Sep 17 00:00:00 2001
From: Christopher O'Toole <otoolec@x.com>
Date: Thu, 22 Jan 2015 16:43:10 -0600
Subject: [PATCH] MAGETWO-32870: [GITHUB] extra tests for current interception
 behavior #965

- Fixed license headers
- Moved fields from GeneralTest to AbstractPlugin
---
 .../Framework/Interception/AbstractPlugin.php   | 17 +++++++++++++----
 .../Framework/Interception/GeneralTest.php      | 11 -----------
 .../Framework/Interception/TwoPluginTest.php    |  4 ++--
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/AbstractPlugin.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/AbstractPlugin.php
index 5201891a8c2..1539ad87f28 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Interception/AbstractPlugin.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/AbstractPlugin.php
@@ -1,18 +1,27 @@
 <?php
 /**
- *
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 namespace Magento\Framework\Interception;
 
-use Magento\Framework\ObjectManager\Config\Config as ObjectManagerConfig;
-
 /**
  * Class GeneralTest
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 abstract class AbstractPlugin extends \PHPUnit_Framework_TestCase
 {
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $_configReader;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    protected $_objectManager;
+
     public function setUpInterceptionConfig($pluginConfig)
     {
         $config = new \Magento\Framework\Interception\ObjectManager\Config\Developer();
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/GeneralTest.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/GeneralTest.php
index 9a702f5bff9..dfeb1490029 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Interception/GeneralTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/GeneralTest.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -12,16 +11,6 @@ namespace Magento\Framework\Interception;
  */
 class GeneralTest extends AbstractPlugin
 {
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $_configReader;
-
-    /**
-     * @var \Magento\Framework\ObjectManagerInterface
-     */
-    protected $_objectManager;
-
     public function setUp()
     {
         $this->setUpInterceptionConfig(
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/TwoPluginTest.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/TwoPluginTest.php
index 8a0c2e8c1e9..a4cbcd18f11 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Interception/TwoPluginTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/TwoPluginTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- *
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 namespace Magento\Framework\Interception;
 
-- 
GitLab