MC-33071: Stabilize Web-API tests

Author: DianaRusin

dev/tests/api-functional/testsuite/Magento/Swatches/Api/ProductAttributeOptionManagementInterfaceTest.php

@@ -35,7 +35,7 @@ class ProductAttributeOptionManagementInterfaceTest extends WebapiAbstract
      * @magentoApiDataFixture Magento/Catalog/Model/Product/Attribute/_files/select_attribute.php
      * @param array $data
      * @param array $payload
-     * @param string $expectedSwatchType
+     * @param int $expectedSwatchType
      * @param string $expectedLabel
      * @param string $expectedValue
      *
@@ -44,7 +44,7 @@ class ProductAttributeOptionManagementInterfaceTest extends WebapiAbstract
     public function testAdd(
         array $data,
         array $payload,
-        string $expectedSwatchType,
+        int $expectedSwatchType,
         string $expectedLabel,
         string $expectedValue
     ) {

dev/tests/api-functional/testsuite/Magento/Tax/Api/TaxRateRepositoryTest.php

@@ -126,7 +126,7 @@ public function testCreateTaxRateExistingCode()
             $this->_webApiCall($serviceInfo, $data);
             $this->fail('Expected exception was not raised');
         } catch (\SoapFault $e) {
-            $this->assertContains(
+            $this->assertStringContainsString(
                 $expectedMessage,
                 $e->getMessage(),
                 'SoapFault does not contain expected message.'
@@ -164,7 +164,7 @@ public function testCreateTaxRateWithoutValue()
             $this->_webApiCall($serviceInfo, $data);
             $this->fail('Expected exception was not raised');
         } catch (\SoapFault $e) {
-            $this->assertContains(
+            $this->assertStringContainsString(
                 'SOAP-ERROR: Encoding: object has no \'rate\' property',
                 $e->getMessage(),
                 'SoapFault does not contain expected message.'
@@ -369,7 +369,7 @@ public function testUpdateTaxRateNotExisting()
         } catch (\Exception $e) {
             $expectedMessage = 'No such entity with %fieldName = %fieldValue';
 
-            $this->assertContains(
+            $this->assertStringContainsString(
                 $expectedMessage,
                 $e->getMessage(),
                 "Exception does not contain expected message."
@@ -426,7 +426,7 @@ public function testGetTaxRateNotExist()
         } catch (\Exception $e) {
             $expectedMessage = 'No such entity with %fieldName = %fieldValue';
 
-            $this->assertContains(
+            $this->assertStringContainsString(
                 $expectedMessage,
                 $e->getMessage(),
                 "Exception does not contain expected message."
@@ -493,7 +493,7 @@ public function testCannotDeleteTaxRate()
         } catch (\Exception $e) {
             $expectedMessage = "The tax rate can't be removed because it exists in a tax rule.";
 
-            $this->assertContains(
+            $this->assertStringContainsString(
                 $expectedMessage,
                 $e->getMessage(),
                 "Exception does not contain expected message."

dev/tests/api-functional/testsuite/Magento/Tax/Api/TaxRuleRepositoryInterfaceTest.php

@@ -195,9 +195,9 @@ public function testCreateTaxRuleInvalidTaxClassIds()
             $this->_webApiCall($serviceInfo, $requestData);
             $this->fail('Did not throw expected InputException');
         } catch (\SoapFault $e) {
-            $this->assertContains('No such entity with customer_tax_class_ids = %fieldValue', $e->getMessage());
+            $this->assertStringContainsString('No such entity with customer_tax_class_ids = %fieldValue', $e->getMessage());
         } catch (\Exception $e) {
-            $this->assertContains('No such entity with customer_tax_class_ids = %fieldValue', $e->getMessage());
+            $this->assertStringContainsString('No such entity with customer_tax_class_ids = %fieldValue', $e->getMessage());
         }
     }
 
@@ -232,7 +232,7 @@ public function testCreateTaxRuleExistingCode()
             $this->_webApiCall($serviceInfo, $requestData);
             $this->fail('Expected exception was not raised');
         } catch (\SoapFault $e) {
-            $this->assertContains(
+            $this->assertStringContainsString(
                 $expectedMessage,
                 $e->getMessage(),
                 'SoapFault does not contain expected message.'
@@ -430,7 +430,7 @@ public function testGetTaxRuleNotExist()
         } catch (\Exception $e) {
             $expectedMessage = 'No such entity with %fieldName = %fieldValue';
 
-            $this->assertContains(
+            $this->assertStringContainsString(
                 $expectedMessage,
                 $e->getMessage(),
                 "Exception does not contain expected message."
@@ -542,7 +542,7 @@ public function testUpdateTaxRuleNotExisting()
         } catch (\Exception $e) {
             $expectedMessage = 'No such entity with %fieldName = %fieldValue';
 
-            $this->assertContains(
+            $this->assertStringContainsString(
                 $expectedMessage,
                 $e->getMessage(),
                 "Exception does not contain expected message."