From dc4d62d4a19d44dae9a7d1db14c6ea3f796bec70 Mon Sep 17 00:00:00 2001
From: Bryant Luk <bluk@ebay.com>
Date: Sat, 14 Mar 2015 15:34:07 -0500
Subject: [PATCH] MAGETWO-34952: Final cleanup to ensure Core module is
 properly removed

- Remove Magento/Core references
---
 .../Api/ProductRepositoryMultiStoreTest.php   |  2 +-
 .../Controller/Adminhtml/CategoryTest.php     |  2 +-
 .../Magento/Catalog/Model/CategoryTest.php    |  2 +-
 .../Indexer/Product/Flat/ProcessorTest.php    |  2 +-
 .../_files/product_simple_multistore.php      |  2 +-
 .../Model/Import/ProductTest.php              |  2 +-
 .../Source/_files/design/frontend/a_d/file    |  0
 .../Source/_files/design/frontend/b_e/file    |  0
 .../design/frontend/magento_default/file      |  0
 .../_files/design/frontend/magento_g/file     |  0
 .../Magento/Core/_files/config_cache.php      | 10 ----------
 .../Magento/Core/_files/etc/config.xml        | 20 -------------------
 .../testsuite/Magento/Core/_files/fixture.csv |  3 ---
 .../Customer/Model/Config/ShareTest.php       |  2 +-
 .../Customer/Model/GroupManagementTest.php    |  2 +-
 .../Magento/Email/Model/TemplateTest.php      |  4 ++--
 .../Magento/Newsletter/Model/TemplateTest.php |  2 +-
 .../Magento/Newsletter/_files/subscribers.php |  2 +-
 .../Sales/_files/order_fixture_store.php      |  2 +-
 .../_files/core_fixturestore.php}             |  0
 .../core_second_third_fixturestore.php}       |  0
 .../Magento/Theme/Model/View/DesignTest.php   |  2 +-
 .../Block/Catalog/Edit/FormTest.php           |  8 ++++----
 .../Block/Cms/Page/Edit/FormTest.php          |  4 ++--
 .../UrlRewrite/Block/Cms/Page/GridTest.php    |  2 +-
 .../UrlRewrite/Block/Edit/FormTest.php        |  2 +-
 .../Webapi/Controller/PathProcessorTest.php   |  2 +-
 .../Integrity/Readme/_files/blacklist/ce.txt  |  1 -
 28 files changed, 23 insertions(+), 57 deletions(-)
 delete mode 100644 dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/a_d/file
 delete mode 100644 dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/b_e/file
 delete mode 100644 dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_default/file
 delete mode 100644 dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_g/file
 delete mode 100644 dev/tests/integration/testsuite/Magento/Core/_files/config_cache.php
 delete mode 100644 dev/tests/integration/testsuite/Magento/Core/_files/etc/config.xml
 delete mode 100644 dev/tests/integration/testsuite/Magento/Core/_files/fixture.csv
 rename dev/tests/integration/testsuite/Magento/{Core/_files/store.php => Store/_files/core_fixturestore.php} (100%)
 rename dev/tests/integration/testsuite/Magento/{Core/_files/second_third_store.php => Store/_files/core_second_third_fixturestore.php} (100%)

diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryMultiStoreTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryMultiStoreTest.php
index e31a51c9313..38470a864d4 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryMultiStoreTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryMultiStoreTest.php
@@ -34,7 +34,7 @@ class ProductRepositoryMultiStoreTest extends WebapiAbstract
 
     /**
      * Create another store one time for testSearch
-     * @magentoApiDataFixture Magento/Core/_files/store.php
+     * @magentoApiDataFixture Magento/Store/_files/core_fixturestore.php
      */
     public function testCreateAnotherStore()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php
index 2d221e570a8..75f51727273 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php
@@ -11,7 +11,7 @@ namespace Magento\Catalog\Controller\Adminhtml;
 class CategoryTest extends \Magento\Backend\Utility\Controller
 {
     /**
-     * @magentoDataFixture Magento/Core/_files/store.php
+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
      * @magentoDbIsolation enabled
      * @magentoConfigFixture current_store catalog/frontend/flat_catalog_product 1
      * @dataProvider saveActionDataProvider
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php
index 72a723413d2..2eb662d331f 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php
@@ -115,7 +115,7 @@ class CategoryTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * @magentoDataFixture Magento/Core/_files/store.php
+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
      * @magentoAppIsolation enabled
      * @magentoConfigFixture current_store catalog/frontend/flat_catalog_product 1
      */
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/ProcessorTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/ProcessorTest.php
index 16bc2ff9e71..2eb856f8f82 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/ProcessorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/ProcessorTest.php
@@ -88,7 +88,7 @@ class ProcessorTest extends \Magento\TestFramework\Indexer\TestCase
      * @magentoDbIsolation enabled
      * @magentoAppIsolation enabled
      * @magentoAppArea adminhtml
-     * @magentoDataFixture Magento/Core/_files/store.php
+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
      * @magentoConfigFixture current_store catalog/frontend/flat_catalog_product 1
      */
     public function testAddNewStore()
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_multistore.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_multistore.php
index 4f9c3e4c3fe..133bc16660b 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_multistore.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_multistore.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-require __DIR__ . '/../../Core/_files/store.php';
+require __DIR__ . '/../../Store/_files/core_fixturestore.php';
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
 /** @var Magento\Store\Model\Store $store */
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
index 1563fc9e8d6..19996ca0d1f 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
@@ -779,7 +779,7 @@ class ProductTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @magentoDataFixture Magento/Catalog/_files/categories.php
-     * @magentoDataFixture Magento/Core/_files/store.php
+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
      * @magentoDataFixture Magento/Catalog/Model/Layer/Filter/_files/attribute_with_option.php
      * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_attribute.php
      * @magentoAppIsolation enabled
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/a_d/file b/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/a_d/file
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/b_e/file b/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/b_e/file
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_default/file b/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_default/file
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_g/file b/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_g/file
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/dev/tests/integration/testsuite/Magento/Core/_files/config_cache.php b/dev/tests/integration/testsuite/Magento/Core/_files/config_cache.php
deleted file mode 100644
index 6a4289fe4ea..00000000000
--- a/dev/tests/integration/testsuite/Magento/Core/_files/config_cache.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-/** @var \Magento\Framework\App\Cache\Type\Config $layoutCache */
-$layoutCache = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-    ->get('Magento\Framework\App\Cache\Type\Config');
-$layoutCache->save('fixture config cache data', 'CONFIG_CACHE_FIXTURE');
diff --git a/dev/tests/integration/testsuite/Magento/Core/_files/etc/config.xml b/dev/tests/integration/testsuite/Magento/Core/_files/etc/config.xml
deleted file mode 100644
index abb86faf817..00000000000
--- a/dev/tests/integration/testsuite/Magento/Core/_files/etc/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../app/code/Magento/Store/etc/config.xsd">
-    <default>
-        <areas>
-            <test_area1>
-                <areaNode>value</areaNode>
-            </test_area1>
-            <test_area2>
-            </test_area2>
-            <test_area3>
-            </test_area3>
-        </areas>
-    </default>
-</config>
diff --git a/dev/tests/integration/testsuite/Magento/Core/_files/fixture.csv b/dev/tests/integration/testsuite/Magento/Core/_files/fixture.csv
deleted file mode 100644
index 297c90f5e6e..00000000000
--- a/dev/tests/integration/testsuite/Magento/Core/_files/fixture.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"Search:","Fixture search:"
-"Search entire store here...","Fixture search entire store here..."
-"Fixture string","Fixture translation"
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/Config/ShareTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/Config/ShareTest.php
index 67243448374..7ec75e92d51 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/Config/ShareTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/Config/ShareTest.php
@@ -23,7 +23,7 @@ class ShareTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * @magentoDataFixture Magento/Core/_files/second_third_store.php
+     * @magentoDataFixture Magento/Store/_files/core_second_third_fixturestore.php
      * @magentoConfigFixture current_store customer/account_share/scope 0
      */
     public function testGetSharedWebsiteIdsMultipleSites()
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/GroupManagementTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/GroupManagementTest.php
index e0848641002..b0d28164299 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/GroupManagementTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/GroupManagementTest.php
@@ -42,7 +42,7 @@ class GroupManagementTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * @magentoDataFixture Magento/Core/_files/second_third_store.php
+     * @magentoDataFixture Magento/Store/_files/core_second_third_fixturestore.php
      */
     public function testGetDefaultGroupWithNonDefaultStoreId()
     {   
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
index 33795b03195..72cbb8f071d 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
@@ -89,7 +89,7 @@ class TemplateTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @magentoAppIsolation enabled
-     * @magentoDataFixture Magento/Core/_files/store.php
+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
      */
     public function testGetProcessedTemplate()
     {
@@ -137,7 +137,7 @@ class TemplateTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @magentoAppIsolation enabled
-     * @magentoDataFixture Magento/Core/_files/store.php
+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
      */
     public function testGetProcessedTemplateSubject()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Model/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Model/TemplateTest.php
index 8eadd1a288a..d501af84c4c 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/Model/TemplateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Model/TemplateTest.php
@@ -6,7 +6,7 @@
 namespace Magento\Newsletter\Model;
 
 /**
- * @magentoDataFixture Magento/Core/_files/store.php
+ * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
  */
 class TemplateTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/_files/subscribers.php b/dev/tests/integration/testsuite/Magento/Newsletter/_files/subscribers.php
index fe3cc067ec3..470db3b9ad9 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/_files/subscribers.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/_files/subscribers.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-require __DIR__ . '/../../../Magento/Core/_files/store.php';
+require __DIR__ . '/../../../Magento/Store/_files/core_fixturestore.php';
 require __DIR__ . '/../../../Magento/Customer/_files/customer.php';
 
 $currentStore = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_fixture_store.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_fixture_store.php
index 6bbd0430c0b..4d4c2d92a90 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_fixture_store.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_fixture_store.php
@@ -6,7 +6,7 @@
 
 // @codingStandardsIgnoreFile
 
-require __DIR__ . '/../../../Magento/Core/_files/store.php';
+require __DIR__ . '/../../../Magento/Store/_files/core_fixturestore.php';
 
 require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_duplicated.php';
 /** @var \Magento\Catalog\Model\Product $product */
diff --git a/dev/tests/integration/testsuite/Magento/Core/_files/store.php b/dev/tests/integration/testsuite/Magento/Store/_files/core_fixturestore.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/_files/store.php
rename to dev/tests/integration/testsuite/Magento/Store/_files/core_fixturestore.php
diff --git a/dev/tests/integration/testsuite/Magento/Core/_files/second_third_store.php b/dev/tests/integration/testsuite/Magento/Store/_files/core_second_third_fixturestore.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/_files/second_third_store.php
rename to dev/tests/integration/testsuite/Magento/Store/_files/core_second_third_fixturestore.php
diff --git a/dev/tests/integration/testsuite/Magento/Theme/Model/View/DesignTest.php b/dev/tests/integration/testsuite/Magento/Theme/Model/View/DesignTest.php
index 2fe398ded09..4eec44f4a23 100644
--- a/dev/tests/integration/testsuite/Magento/Theme/Model/View/DesignTest.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/Model/View/DesignTest.php
@@ -126,7 +126,7 @@ class DesignTest extends \PHPUnit_Framework_TestCase
     /**
      * @magentoConfigFixture current_store design/theme/theme_id one
      * @magentoConfigFixture fixturestore_store design/theme/theme_id two
-     * @magentoDataFixture Magento/Core/_files/store.php
+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
      */
     public function testGetConfigurationDesignThemeStore()
     {
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Edit/FormTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Edit/FormTest.php
index a17d3e18b91..d4780d259aa 100644
--- a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Edit/FormTest.php
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Edit/FormTest.php
@@ -88,7 +88,7 @@ class FormTest extends \PHPUnit_Framework_TestCase
      *
      * @dataProvider getEntityStoresDataProvider
      * @magentoAppIsolation enabled
-     * @magentoDataFixture Magento/Core/_files/store.php
+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
      *
      * @param array $productData
      * @param array $categoryData
@@ -117,7 +117,7 @@ class FormTest extends \PHPUnit_Framework_TestCase
      * Check exception is thrown when product does not associated with stores
      *
      * @magentoAppIsolation enabled
-     * @magentoDataFixture Magento/Core/_files/store.php
+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
      */
     public function testGetEntityStoresProductStoresException()
     {
@@ -139,7 +139,7 @@ class FormTest extends \PHPUnit_Framework_TestCase
      * Check exception is thrown when product stores in intersection with category stores is empty
      *
      * @magentoAppIsolation enabled
-     * @magentoDataFixture Magento/Core/_files/store.php
+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
      *
      */
     public function testGetEntityStoresProductCategoryStoresException()
@@ -166,7 +166,7 @@ class FormTest extends \PHPUnit_Framework_TestCase
      * Check exception is thrown when category does not associated with stores
      *
      * @magentoAppIsolation enabled
-     * @magentoDataFixture Magento/Core/_files/store.php
+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
      */
     public function testGetEntityStoresCategoryStoresException()
     {
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Cms/Page/Edit/FormTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Cms/Page/Edit/FormTest.php
index 8e95b21be58..8eb255b89d9 100644
--- a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Cms/Page/Edit/FormTest.php
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Cms/Page/Edit/FormTest.php
@@ -70,7 +70,7 @@ class FormTest extends \PHPUnit_Framework_TestCase
      * Test entity stores
      *
      * @magentoAppIsolation enabled
-     * @magentoDataFixture Magento/Core/_files/store.php
+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
      */
     public function testGetEntityStores()
     {
@@ -91,7 +91,7 @@ class FormTest extends \PHPUnit_Framework_TestCase
      * Check exception is thrown when product does not associated with stores
      *
      * @magentoAppIsolation enabled
-     * @magentoDataFixture Magento/Core/_files/store.php
+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
      */
     public function testGetEntityStoresProductStoresException()
     {
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Cms/Page/GridTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Cms/Page/GridTest.php
index cd1827579b2..a201e3105ae 100644
--- a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Cms/Page/GridTest.php
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Cms/Page/GridTest.php
@@ -48,7 +48,7 @@ class GridTest extends \PHPUnit_Framework_TestCase
     /**
      * Test prepare grid when there is more than one store
      *
-     * @magentoDataFixture Magento/Core/_files/store.php
+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
      */
     public function testPrepareGridForMultipleStores()
     {
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Edit/FormTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Edit/FormTest.php
index 18382c4b69f..570e42dad7d 100644
--- a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Edit/FormTest.php
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Edit/FormTest.php
@@ -116,7 +116,7 @@ class FormTest extends \PHPUnit_Framework_TestCase
      * Test store selection is available and correctly configured
      *
      * @magentoAppIsolation enabled
-     * @magentoDataFixture Magento/Core/_files/store.php
+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
      */
     public function testStoreElementMultiStores()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Webapi/Controller/PathProcessorTest.php b/dev/tests/integration/testsuite/Magento/Webapi/Controller/PathProcessorTest.php
index 268d2274beb..f9f6ceda847 100644
--- a/dev/tests/integration/testsuite/Magento/Webapi/Controller/PathProcessorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Webapi/Controller/PathProcessorTest.php
@@ -26,7 +26,7 @@ class PathProcessorTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * @magentoDataFixture Magento/Core/_files/store.php
+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
      */
     public function testProcessWithValidStoreCode()
     {
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Readme/_files/blacklist/ce.txt b/dev/tests/static/testsuite/Magento/Test/Integrity/Readme/_files/blacklist/ce.txt
index f40e2c359dd..2fd6ad12362 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Readme/_files/blacklist/ce.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Readme/_files/blacklist/ce.txt
@@ -2,7 +2,6 @@ app/code/Magento/CatalogImportExport
 app/code/Magento/CatalogUrlRewrite
 app/code/Magento/CmsUrlRewrite
 app/code/Magento/ConfigurableImportExport
-app/code/Magento/Core
 app/code/Magento/Doc
 app/code/Magento/GroupedImportExport
 app/code/Magento/Msrp
-- 
GitLab