MAGETWO-37981: fixed integration tests

Author: Joan He

dev/tests/integration/testsuite/Magento/Backend/Utility/Controller.php renamed to dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php

@@ -3,14 +3,14 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Backend\Utility;
+namespace Magento\TestFramework\TestCase;
 
 /**
  * A parent class for backend controllers - contains directives for admin user creation and authentication
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @SuppressWarnings(PHPMD.numberOfChildren)
  */
-class Controller extends \Magento\TestFramework\TestCase\AbstractController
+abstract class AbstractBackendController extends \Magento\TestFramework\TestCase\AbstractController
 {
     /**
      * @var \Magento\Backend\Model\Auth\Session
@@ -22,6 +22,20 @@ class Controller extends \Magento\TestFramework\TestCase\AbstractController
      */
     protected $_auth;
 
+    /**
+     * The resource used to authorize action
+     *
+     * @var string
+     */
+    protected $resource = null;
+
+    /**
+     * The uri at which to access the controller
+     *
+     * @var string
+     */
+    protected $uri;
+
     protected function setUp()
     {
         parent::setUp();
@@ -70,4 +84,29 @@ public function assertSessionMessages(
     ) {
         parent::assertSessionMessages($constraint, $messageType, $messageManagerClass);
     }
+
+
+    public function testAclHasAccess()
+    {
+        if ($this->resource === null) {
+            $this->markTestIncomplete('Acl test is not complete');
+        }
+        $this->_objectManager->get('Magento\Framework\Acl\Builder')
+            ->getAcl()
+            ->allow(null, $this->resource);
+        $this->dispatch($this->uri);
+        $this->assertNotSame(403, $this->getResponse()->getHttpResponseCode());
+    }
+
+    public function testAclNoAccess()
+    {
+        if ($this->resource === null) {
+            $this->markTestIncomplete('Acl test is not complete');
+        }
+        $this->_objectManager->get('Magento\Framework\Acl\Builder')
+            ->getAcl()
+            ->deny(null, $this->resource);
+        $this->dispatch($this->uri);
+        $this->assertSame(403, $this->getResponse()->getHttpResponseCode());
+    }
 }

dev/tests/integration/testsuite/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsReadTest.php

@@ -5,7 +5,7 @@
  */
 namespace Magento\AdminNotification\Controller\Adminhtml\Notification;
 
-class MarkAsReadTest extends \Magento\Backend\Utility\BackendAclAbstractTest
+class MarkAsReadTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
     public function setUp()
     {

dev/tests/integration/testsuite/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsReadTest.php

@@ -5,7 +5,7 @@
  */
 namespace Magento\AdminNotification\Controller\Adminhtml\Notification;
 
-class MassMarkAsReadTest extends \Magento\Backend\Utility\BackendAclAbstractTest
+class MassMarkAsReadTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
     public function setUp()
     {

dev/tests/integration/testsuite/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemoveTest.php

@@ -5,7 +5,7 @@
  */
 namespace Magento\AdminNotification\Controller\Adminhtml\Notification;
 
-class MassRemoveTest extends \Magento\Backend\Utility\BackendAclAbstractTest
+class MassRemoveTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
     public function setUp()
     {

dev/tests/integration/testsuite/Magento/AdminNotification/Controller/Adminhtml/Notification/RemoveTest.php

@@ -5,7 +5,7 @@
  */
 namespace Magento\AdminNotification\Controller\Adminhtml\Notification;
 
-class RemoveTest extends \Magento\Backend\Utility\BackendAclAbstractTest
+class RemoveTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
     public function setUp()
     {

dev/tests/integration/testsuite/Magento/Backend/App/AbstractActionTest.php

@@ -9,7 +9,7 @@
  * Test class for \Magento\Backend\Controller\AbstractAction.
  * @magentoAppArea adminhtml
  */
-class AbstractActionTest extends \Magento\Backend\Utility\Controller
+class AbstractActionTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
     /**
      * Check redirection to startup page for logged user

dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Cache/MassActionTest.php

@@ -11,7 +11,7 @@
 use Magento\Framework\Config\File\ConfigFilePool;
 use Magento\Framework\App\Filesystem\DirectoryList;
 
-class MassActionTest extends \Magento\Backend\Utility\Controller
+class MassActionTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
     /**
      * Configuration of cache types

dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/CacheTest.php

@@ -8,7 +8,7 @@
 /**
  * @magentoAppArea adminhtml
  */
-class CacheTest extends \Magento\Backend\Utility\Controller
+class CacheTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
     /**
      * @magentoDataFixture Magento/Backend/controllers/_files/cache/application_cache.php

dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewedTest.php

@@ -6,7 +6,7 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\Dashboard;
 
-class ProductsViewedTest extends \Magento\Backend\Utility\Controller
+class ProductsViewedTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
     /**
      * @magentoDataFixture Magento/Reports/_files/viewed_products.php

dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php

@@ -8,7 +8,7 @@
 /**
  * @magentoAppArea adminhtml
  */
-class DashboardTest extends \Magento\Backend\Utility\Controller
+class DashboardTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
     public function testAjaxBlockAction()
     {