MAGETWO-71414: Merge 2.2-develop into develop

Igor Melnikov · Igor Melnikov · commit 36974fec32b8 · 2017-08-11T19:19:45.000-05:00
- fix tests
diff --git a/app/code/Magento/ProductAlert/Test/Unit/Block/Product/ImageProviderTest.php b/app/code/Magento/ProductAlert/Test/Unit/Block/Product/ImageProviderTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\ProductAlert\Test\Unit\Block\Product;
 
-class ImageProviderTest extends \PHPUnit_Framework_TestCase
+class ImageProviderTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var \Magento\Catalog\Block\Product\ImageBuilder|\PHPUnit_Framework_MockObject_MockObject
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ReorderTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ReorderTest.php
@@ -26,7 +26,7 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
  */
-class ReorderTest extends \PHPUnit_Framework_TestCase
+class ReorderTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var Reorder
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Reorder/OrderProductAvailabilityCheckerTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Reorder/OrderProductAvailabilityCheckerTest.php
@@ -14,7 +14,7 @@
 /**
  * Class OrderProductAvailabilityCheckerTest
  */
-class OrderProductAvailabilityCheckerTest extends \PHPUnit_Framework_TestCase
+class OrderProductAvailabilityCheckerTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var OrderedProductAvailabilityCheckerInterface[]
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Reorder/UnavailableProductsProviderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Reorder/UnavailableProductsProviderTest.php
@@ -14,7 +14,7 @@
 /**
  * Class UnavailableProductsProviderTest
  */
-class UnavailableProductsProviderTest extends \PHPUnit_Framework_TestCase
+class UnavailableProductsProviderTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var Config|\PHPUnit_Framework_MockObject_MockObject
diff --git a/app/code/Magento/SampleData/Test/Unit/Model/DependencyTest.php b/app/code/Magento/SampleData/Test/Unit/Model/DependencyTest.php
@@ -15,7 +15,7 @@
 use Magento\Framework\Phrase;
 use Magento\SampleData\Model\Dependency;
 
-class DependencyTest extends \PHPUnit_Framework_TestCase
+class DependencyTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @dataProvider dataPackagesFromComposerSuggest
diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/ItemProvider/CategoryTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/ItemProvider/CategoryTest.php
@@ -15,7 +15,7 @@
 use Magento\Sitemap\Model\SitemapItem;
 use Magento\Sitemap\Model\SitemapItemInterfaceFactory;
 
-class CategoryTest extends \PHPUnit_Framework_TestCase
+class CategoryTest extends \PHPUnit\Framework\TestCase
 {
     public function testGetItemsEmpty()
     {
diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/ItemProvider/CmsPageTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/ItemProvider/CmsPageTest.php
@@ -15,7 +15,7 @@
 use Magento\Sitemap\Model\SitemapItem;
 use Magento\Sitemap\Model\SitemapItemInterfaceFactory;
 
-class CmsPageTest extends \PHPUnit_Framework_TestCase
+class CmsPageTest extends \PHPUnit\Framework\TestCase
 {
     public function testGetItemsEmpty()
     {
diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/ItemProvider/CompositeTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/ItemProvider/CompositeTest.php
@@ -10,7 +10,7 @@
 use Magento\Sitemap\Model\ItemProvider\ItemProviderInterface;
 use Magento\Sitemap\Model\SitemapItemInterface;
 
-class CompositeTest extends \PHPUnit_Framework_TestCase
+class CompositeTest extends \PHPUnit\Framework\TestCase
 {
     public function testNoResolvers()
     {
diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/ItemProvider/ProductTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/ItemProvider/ProductTest.php
@@ -15,7 +15,7 @@
 use Magento\Sitemap\Model\SitemapItem;
 use Magento\Sitemap\Model\SitemapItemInterfaceFactory;
 
-class ProductTest extends \PHPUnit_Framework_TestCase
+class ProductTest extends \PHPUnit\Framework\TestCase
 {
     public function testGetItemsEmpty()
     {
diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/SitemapConfigReaderTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/SitemapConfigReaderTest.php
@@ -10,7 +10,7 @@
 use Magento\Sitemap\Model\SitemapConfigReader;
 use Magento\Store\Model\ScopeInterface;
 
-class SitemapConfigReaderTest extends \PHPUnit_Framework_TestCase
+class SitemapConfigReaderTest extends \PHPUnit\Framework\TestCase
 {
     public function testGetValidPaths()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Reorder/UnavailableProductsProviderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Reorder/UnavailableProductsProviderTest.php
@@ -10,7 +10,7 @@
 /**
  * Class UnavailableProductsProviderTest
  */
-class UnavailableProductsProviderTest extends \PHPUnit_Framework_TestCase
+class UnavailableProductsProviderTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @magentoDataFixture Magento/Sales/_files/order_item_with_configurable_for_reorder.php
diff --git a/dev/tests/integration/testsuite/Magento/Sitemap/Model/ItemProvider/CategoryConfigReaderTest.php b/dev/tests/integration/testsuite/Magento/Sitemap/Model/ItemProvider/CategoryConfigReaderTest.php
@@ -9,7 +9,7 @@
 use Magento\Store\Model\Store;
 use Magento\TestFramework\Helper\Bootstrap;
 
-class CategoryConfigReaderTest extends \PHPUnit_Framework_TestCase
+class CategoryConfigReaderTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var CategoryConfigReader
diff --git a/dev/tests/integration/testsuite/Magento/Sitemap/Model/ItemProvider/CmsPageConfigReaderTest.php b/dev/tests/integration/testsuite/Magento/Sitemap/Model/ItemProvider/CmsPageConfigReaderTest.php
@@ -9,7 +9,7 @@
 use Magento\Store\Model\Store;
 use Magento\TestFramework\Helper\Bootstrap;
 
-class CmsPageConfigReaderTest extends \PHPUnit_Framework_TestCase
+class CmsPageConfigReaderTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var CategoryConfigReader
diff --git a/dev/tests/integration/testsuite/Magento/Sitemap/Model/ItemProvider/ProductConfigReaderTest.php b/dev/tests/integration/testsuite/Magento/Sitemap/Model/ItemProvider/ProductConfigReaderTest.php
@@ -9,7 +9,7 @@
 use Magento\Store\Model\Store;
 use Magento\TestFramework\Helper\Bootstrap;
 
-class ProductConfigReaderTest extends \PHPUnit_Framework_TestCase
+class ProductConfigReaderTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var CategoryConfigReader
diff --git a/dev/tests/integration/testsuite/Magento/Sitemap/Model/SitemapConfigReaderTest.php b/dev/tests/integration/testsuite/Magento/Sitemap/Model/SitemapConfigReaderTest.php
@@ -9,7 +9,7 @@
 use Magento\Store\Model\Store;
 use Magento\TestFramework\Helper\Bootstrap;
 
-class SitemapConfigReaderTest extends \PHPUnit_Framework_TestCase
+class SitemapConfigReaderTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var SitemapConfigReader

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*/`
`6`	`6`	`namespace Magento\ProductAlert\Test\Unit\Block\Product;`
`7`	`7`
`8`		`-class ImageProviderTest extends \PHPUnit_Framework_TestCase`
	`8`	`+class ImageProviderTest extends \PHPUnit\Framework\TestCase`
`9`	`9`	`{`
`10`	`10`	`/**`
`11`	`11`	`* @var \Magento\Catalog\Block\Product\ImageBuilder\|\PHPUnit_Framework_MockObject_MockObject`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`* @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
`27`	`27`	`* @SuppressWarnings(PHPMD.TooManyFields)`
`28`	`28`	`*/`
`29`		`-class ReorderTest extends \PHPUnit_Framework_TestCase`
	`29`	`+class ReorderTest extends \PHPUnit\Framework\TestCase`
`30`	`30`	`{`
`31`	`31`	`/**`
`32`	`32`	`* @var Reorder`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`/**`
`15`	`15`	`* Class OrderProductAvailabilityCheckerTest`
`16`	`16`	`*/`
`17`		`-class OrderProductAvailabilityCheckerTest extends \PHPUnit_Framework_TestCase`
	`17`	`+class OrderProductAvailabilityCheckerTest extends \PHPUnit\Framework\TestCase`
`18`	`18`	`{`
`19`	`19`	`/**`
`20`	`20`	`* @var OrderedProductAvailabilityCheckerInterface[]`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`use Magento\Framework\Phrase;`
`16`	`16`	`use Magento\SampleData\Model\Dependency;`
`17`	`17`
`18`		`-class DependencyTest extends \PHPUnit_Framework_TestCase`
	`18`	`+class DependencyTest extends \PHPUnit\Framework\TestCase`
`19`	`19`	`{`
`20`	`20`	`/**`
`21`	`21`	`* @dataProvider dataPackagesFromComposerSuggest`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`use Magento\Sitemap\Model\ItemProvider\ItemProviderInterface;`
`11`	`11`	`use Magento\Sitemap\Model\SitemapItemInterface;`
`12`	`12`
`13`		`-class CompositeTest extends \PHPUnit_Framework_TestCase`
	`13`	`+class CompositeTest extends \PHPUnit\Framework\TestCase`
`14`	`14`	`{`
`15`	`15`	`public function testNoResolvers()`
`16`	`16`	`{`