Merge remote-tracking branch 'origin/MC-33071-CE-2' into MC-33071

zakdma · zakdma · commit d5eb185f7125 · 2020-04-21T21:29:52.000+03:00
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/AttributeSetManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/AttributeSetManagementTest.php
@@ -185,7 +185,7 @@ public function testCreateThrowsExceptionIfAttributeSetWithGivenNameAlreadyExist
             $this->_webApiCall($this->createServiceInfo, $arguments);
             $this->fail("Expected exception");
         } catch (\SoapFault $e) {
-            $this->assertContains(
+            $this->assertStringContainsString(
                 $expectedMessage,
                 $e->getMessage(),
                 "SoapFault does not contain expected message."
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryLinkManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryLinkManagementTest.php
@@ -39,7 +39,7 @@ public function testInfoNoSuchEntityException()
         try {
             $this->getAssignedProducts(-1);
         } catch (\Exception $e) {
-            $this->assertContains('No such entity with %fieldName = %fieldValue', $e->getMessage());
+            $this->assertStringContainsString('No such entity with %fieldName = %fieldValue', $e->getMessage());
         }
     }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryRepositoryTest.php
@@ -89,7 +89,7 @@ public function testInfoNoSuchEntityException()
         try {
             $this->getInfoCategory(-1);
         } catch (\Exception $e) {
-            $this->assertContains('No such entity with %fieldName = %fieldValue', $e->getMessage());
+            $this->assertStringContainsString('No such entity with %fieldName = %fieldValue', $e->getMessage());
         }
     }
 
@@ -168,7 +168,7 @@ public function testDeleteNoSuchEntityException()
         try {
             $this->deleteCategory(-1);
         } catch (\Exception $e) {
-            $this->assertContains('No such entity with %fieldName = %fieldValue', $e->getMessage());
+            $this->assertStringContainsString('No such entity with %fieldName = %fieldValue', $e->getMessage());
         }
     }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CostStorageTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CostStorageTest.php
@@ -58,7 +58,7 @@ public function testGet()
         $product = $productRepository->get(self::SIMPLE_PRODUCT_SKU);
 
         $this->assertNotEmpty($response);
-        $this->assertEquals($product->getCost(), $cost);
+        $this->assertEquals($cost, (int)$product->getCost());
     }
 
     /**
@@ -97,7 +97,7 @@ public function testUpdate()
         /** @var \Magento\Catalog\Api\Data\ProductInterface $product */
         $product = $productRepository->get(self::SIMPLE_PRODUCT_SKU);
         $this->assertEmpty($response);
-        $this->assertEquals($product->getCost(), $newCost);
+        $this->assertEquals($newCost, (int)$product->getCost());
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeManagementTest.php
@@ -63,7 +63,7 @@ public function testAssignAttributeWrongAttributeSet()
             $this->_webApiCall($this->getAssignServiceInfo(), $payload);
             $this->fail("Expected exception");
         } catch (\SoapFault $e) {
-            $this->assertContains(
+            $this->assertStringContainsString(
                 $expectedMessage,
                 $e->getMessage(),
                 "SoapFault does not contain expected message."
@@ -86,7 +86,7 @@ public function testAssignAttributeWrongAttributeGroup()
             $this->_webApiCall($this->getAssignServiceInfo(), $payload);
             $this->fail("Expected exception");
         } catch (\SoapFault $e) {
-            $this->assertContains(
+            $this->assertStringContainsString(
                 $expectedMessage,
                 $e->getMessage(),
                 "SoapFault does not contain expected message."
@@ -110,7 +110,7 @@ public function testAssignAttributeWrongAttribute()
             $this->_webApiCall($this->getAssignServiceInfo(), $payload);
             $this->fail("Expected exception");
         } catch (\SoapFault $e) {
-            $this->assertContains(
+            $this->assertStringContainsString(
                 $expectedMessage,
                 $e->getMessage(),
                 "SoapFault does not contain expected message."
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeRepositoryTest.php
@@ -362,7 +362,7 @@ public function testDeleteNoSuchEntityException()
             $this->_webApiCall($serviceInfo, ['attributeCode' => $attributeCode]);
             $this->fail("Expected exception");
         } catch (\SoapFault $e) {
-            $this->assertContains(
+            $this->assertStringContainsString(
                 $expectedMessage,
                 $e->getMessage(),
                 "SoapFault does not contain expected message."
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionTypeListTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionTypeListTest.php
@@ -38,6 +38,6 @@ public function testGetTypes()
             'group' => __('Select'),
         ];
         $this->assertGreaterThanOrEqual(10, count($types));
-        $this->assertContains($excepted, $types);
+        $this->assertContainsEquals($excepted, $types);
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductLinkTypeListTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductLinkTypeListTest.php
@@ -29,7 +29,7 @@ public function testGetItems()
         ];
         $actual = $this->_webApiCall($serviceInfo);
         $expectedItems = ['name' => 'related', 'code' => Link::LINK_TYPE_RELATED];
-        $this->assertContains($expectedItems, $actual);
+        $this->assertContainsEquals($expectedItems, $actual);
     }
 
     public function testGetItemAttributes()
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php
@@ -170,7 +170,7 @@ public function testGetNoSuchEntityException()
             $this->_webApiCall($serviceInfo, ['sku' => $invalidSku]);
             $this->fail("Expected throwing exception");
         } catch (\SoapFault $e) {
-            $this->assertContains(
+            $this->assertStringContainsString(
                 $expectedMessage,
                 $e->getMessage(),
                 "SoapFault does not contain expected message."
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductSwatchAttributeOptionManagementInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductSwatchAttributeOptionManagementInterfaceTest.php
@@ -46,7 +46,7 @@ public function testAdd($optionData)
         $updatedData = $this->getAttributeOptions($testAttributeCode);
         $lastOption = array_pop($updatedData);
         foreach ($updatedData as $option) {
-            $this->assertNotContains('id', $option['value']);
+            $this->assertStringNotContainsString('id', $option['value']);
         }
         $this->assertEquals(
             $optionData[AttributeOptionInterface::STORE_LABELS][0][AttributeOptionLabelInterface::LABEL],

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function testInfoNoSuchEntityException()`
`39`	`39`	`try {`
`40`	`40`	`$this->getAssignedProducts(-1);`
`41`	`41`	`} catch (\Exception $e) {`
`42`		`- $this->assertContains('No such entity with %fieldName = %fieldValue', $e->getMessage());`
	`42`	`+ $this->assertStringContainsString('No such entity with %fieldName = %fieldValue', $e->getMessage());`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public function testInfoNoSuchEntityException()`
`89`	`89`	`try {`
`90`	`90`	`$this->getInfoCategory(-1);`
`91`	`91`	`} catch (\Exception $e) {`
`92`		`- $this->assertContains('No such entity with %fieldName = %fieldValue', $e->getMessage());`
	`92`	`+ $this->assertStringContainsString('No such entity with %fieldName = %fieldValue', $e->getMessage());`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`
`@@ -168,7 +168,7 @@ public function testDeleteNoSuchEntityException()`
`168`	`168`	`try {`
`169`	`169`	`$this->deleteCategory(-1);`
`170`	`170`	`} catch (\Exception $e) {`
`171`		`- $this->assertContains('No such entity with %fieldName = %fieldValue', $e->getMessage());`
	`171`	`+ $this->assertStringContainsString('No such entity with %fieldName = %fieldValue', $e->getMessage());`
`172`	`172`	`}`
`173`	`173`	`}`
`174`	`174`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function testGet()`
`58`	`58`	`$product = $productRepository->get(self::SIMPLE_PRODUCT_SKU);`
`59`	`59`
`60`	`60`	`$this->assertNotEmpty($response);`
`61`		`- $this->assertEquals($product->getCost(), $cost);`
	`61`	`+ $this->assertEquals($cost, (int)$product->getCost());`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`/**`
`@@ -97,7 +97,7 @@ public function testUpdate()`
`97`	`97`	`/** @var \Magento\Catalog\Api\Data\ProductInterface $product */`
`98`	`98`	`$product = $productRepository->get(self::SIMPLE_PRODUCT_SKU);`
`99`	`99`	`$this->assertEmpty($response);`
`100`		`- $this->assertEquals($product->getCost(), $newCost);`
	`100`	`+ $this->assertEquals($newCost, (int)$product->getCost());`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,6 @@ public function testGetTypes()`
`38`	`38`	`'group' => __('Select'),`
`39`	`39`	`];`
`40`	`40`	`$this->assertGreaterThanOrEqual(10, count($types));`
`41`		`- $this->assertContains($excepted, $types);`
	`41`	`+ $this->assertContainsEquals($excepted, $types);`
`42`	`42`	`}`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function testGetItems()`
`29`	`29`	`];`
`30`	`30`	`$actual = $this->_webApiCall($serviceInfo);`
`31`	`31`	`$expectedItems = ['name' => 'related', 'code' => Link::LINK_TYPE_RELATED];`
`32`		`- $this->assertContains($expectedItems, $actual);`
	`32`	`+ $this->assertContainsEquals($expectedItems, $actual);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`public function testGetItemAttributes()`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public function testAdd($optionData)`
`46`	`46`	`$updatedData = $this->getAttributeOptions($testAttributeCode);`
`47`	`47`	`$lastOption = array_pop($updatedData);`
`48`	`48`	`foreach ($updatedData as $option) {`
`49`		`- $this->assertNotContains('id', $option['value']);`
	`49`	`+ $this->assertStringNotContainsString('id', $option['value']);`
`50`	`50`	`}`
`51`	`51`	`$this->assertEquals(`
`52`	`52`	`$optionData[AttributeOptionInterface::STORE_LABELS][0][AttributeOptionLabelInterface::LABEL],`