Fix failed tests

Author: Mastiuhin Oleksandr

app/code/Magento/Catalog/Test/Unit/Model/CategoryRepositoryTest.php

@@ -285,7 +285,8 @@ public function saveWithValidateCategoryExceptionDataProvider()
         return [
             [
                 true, \Magento\Framework\Exception\CouldNotSaveException::class,
-                'Could not save category: Attribute "ValidateCategoryTest" is required.',
+                'Could not save category: Attribute The "ValidateCategoryTest" attribute is required.' .
+                'Enter and try again.',
             ], [
                 'Something went wrong', \Magento\Framework\Exception\CouldNotSaveException::class,
                 'Could not save category: Something went wrong'

app/code/Magento/Cms/Test/Unit/Helper/Wysiwyg/ImagesTest.php

@@ -380,7 +380,7 @@ public function testGetCurrentPath($pathId, $expectedPath, $isExist)
     public function testGetCurrentPathThrowException()
     {
         $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
-        $this->expectExceptionMessage('The directory PATH/wysiwyg is not writable by server.');
+        $this->expectExceptionMessage('The directory PATH is not writable by server.');
 
         $this->directoryWriteMock->expects($this->once())
             ->method('isExist')

app/code/Magento/Payment/Test/Unit/Block/Transparent/FormTest.php

@@ -291,7 +291,7 @@ public function testGetMethodSuccess()
     public function testGetMethodNotTransparentInterface()
     {
         $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
-        $this->expectExceptionMessage(__('We cannot retrieve the transparent payment method model object.'));
+        $this->expectExceptionMessage((string)__('We cannot retrieve the transparent payment method model object.'));
 
         $methodMock = $this->getMockBuilder(\Magento\Payment\Model\MethodInterface::class)
             ->getMockForAbstractClass();

app/code/Magento/Security/Test/Unit/Model/SecurityManagerTest.php

@@ -128,7 +128,7 @@ public function testConstructorException()
 
         $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
         $this->expectExceptionMessage(
-            __('Incorrect Security Checker class. It has to implement SecurityCheckerInterface')
+            (string)__('Incorrect Security Checker class. It has to implement SecurityCheckerInterface')
         );
 
         $this->model->__construct(

app/code/Magento/Ui/Test/Unit/Model/ManagerTest.php

@@ -153,7 +153,9 @@ public function testGetReader()
     public function testPrepareDataWithoutName()
     {
         $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
-        $this->expectExceptionMessage(__('The "" UI component element name is invalid. Verify the name and try again.'));
+        $this->expectExceptionMessage(
+            (string)__('The "" UI component element name is invalid. Verify the name and try again.')
+        );
         $this->manager->prepareData(null);
     }
 

app/code/Magento/Ui/Test/Unit/Model/ResourceModel/BookmarkRepositoryTest.php

@@ -124,9 +124,11 @@ public function testGetByIdWithException()
             ->with($this->bookmarkMock, $notExistsBookmarkId)
             ->willReturn($this->bookmarkMock);
         $this->expectException(\Magento\Framework\Exception\NoSuchEntityException::class);
-        $this->expectExceptionMessage(
-            __('The bookmark with "%1" ID doesn\'t exist. Verify your information and try again.', $notExistsBookmarkId)
+        $exceptionMessage = (string)__(
+            'The bookmark with "%1" ID doesn\'t exist. Verify your information and try again.',
+            $notExistsBookmarkId
         );
+        $this->expectExceptionMessage($exceptionMessage);
         $this->bookmarkRepository->getById($notExistsBookmarkId);
     }
 
@@ -146,7 +148,7 @@ public function testDeleteWithException()
             ->with($this->bookmarkMock)
             ->willThrowException(new \Exception($exceptionMessage));
         $this->expectException(\Magento\Framework\Exception\CouldNotDeleteException::class);
-        $this->expectExceptionMessage(__($exceptionMessage));
+        $this->expectExceptionMessage((string)__($exceptionMessage));
         $this->expectExceptionMessage($exceptionMessage);
         $this->assertTrue($this->bookmarkRepository->delete($this->bookmarkMock));
     }

app/code/Magento/User/Test/Unit/Model/UserTest.php

@@ -779,13 +779,13 @@ public function testPerformIdentityCheck($verifyIdentityResult, $lockExpires)
 
         if ($lockExpires) {
             $this->expectException(\Magento\Framework\Exception\State\UserLockedException::class);
-            $this->expectExceptionMessage(__('Your account is temporarily disabled. Please try again later.'));
+            $this->expectExceptionMessage((string)__('Your account is temporarily disabled. Please try again later.'));
         }
 
         if (!$verifyIdentityResult) {
             $this->expectException(\Magento\Framework\Exception\AuthenticationException::class);
             $this->expectExceptionMessage(
-                __('The password entered for the current user is invalid. Verify the password and try again.')
+                (string)__('The password entered for the current user is invalid. Verify the password and try again.')
             );
         }
 

app/code/Magento/Wishlist/Test/Unit/Model/ItemTest.php

@@ -300,7 +300,7 @@ public function testSetAndSaveItemOptions()
     public function testGetProductWithException()
     {
         $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
-        $this->expectExceptionMessage(__('Cannot specify product.'));
+        $this->expectExceptionMessage((string)__('Cannot specify product.'));
         $this->expectExceptionMessage('Cannot specify product.');
         $this->model->getProduct();
     }

dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFileTest.php

@@ -79,8 +79,10 @@ public function testRunValidationException()
     public function testLargeSizeFile()
     {
         $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $exceptionMessage = 'The file was too big and couldn\'t be uploaded. Use a file smaller than %s MBs and try ' .
+            'to upload again.';
         $this->expectExceptionMessage(
-            sprintf('The file you uploaded is larger than %s Megabytes allowed by server', $this->maxFileSizeInMb)
+            sprintf($exceptionMessage, $this->maxFileSizeInMb)
         );
         $this->prepareEnv();
         $_SERVER['CONTENT_LENGTH'] = $this->maxFileSize + 1;

lib/internal/Magento/Framework/DB/Test/Unit/Tree/NodeTest.php

@@ -109,7 +109,7 @@ public function constructorDataProvider()
                     'node_data' => true,
                     'keys' => null,
                 ], \Magento\Framework\Exception\LocalizedException::class,
-                'Enter the encryption key and try again.'
+                'The encryption key can\'t be empty. Enter the key and try again.'
             ]
         ];
     }