MAGETWO-33060: Refactor __() to return Phrase object

- Expected result in unit tests modified for it to contain Phrase objects instead of raw strings;

Author: Dmytro Poperechnyy

dev/tests/unit/testsuite/Magento/CatalogWidget/Model/Rule/Condition/CombineTest.php

@@ -45,9 +45,9 @@ protected function setUp()
     public function testGetNewChildSelectOptions()
     {
         $expectedOptions = [
-            ['value' => '', 'label' => 'Please choose a condition to add.'],
-            ['value' => 'Magento\CatalogWidget\Model\Rule\Condition\Combine', 'label' => 'Conditions Combination'],
-            ['label' => 'Product Attribute', 'value' => [
+            ['value' => '', 'label' => __('Please choose a condition to add.')],
+            ['value' => 'Magento\CatalogWidget\Model\Rule\Condition\Combine', 'label' => __('Conditions Combination')],
+            ['label' => __('Product Attribute'), 'value' => [
                 ['value' => 'Magento\CatalogWidget\Model\Rule\Condition\Product|sku', 'label' => 'SKU'],
                 ['value' => 'Magento\CatalogWidget\Model\Rule\Condition\Product|category', 'label' => 'Category'],
             ]],
@@ -67,12 +67,7 @@ public function testGetNewChildSelectOptions()
 
         $this->conditionFactory->expects($this->atLeastOnce())->method('create')->willReturn($productCondition);
 
-        $actualOptions = $this->condition->getNewChildSelectOptions();
-        foreach ($actualOptions as $key => $option) {
-            $actualOptions[$key]['label'] = (string)$option['label'];
-        }
-
-        $this->assertSame($expectedOptions, $actualOptions);
+        $this->assertEquals($expectedOptions, $this->condition->getNewChildSelectOptions());
     }
 
     public function testCollectValidatedAttributes()

dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php

@@ -321,22 +321,17 @@ public function testGetAllDesignAbstractions()
         $expected = [
             'customer_account' => [
                 'name' => 'customer_account',
-                'label' => 'Customer My Account (All Pages)',
+                'label' => __('Customer My Account (All Pages)'),
                 'design_abstraction' => 'custom',
             ],
             'page_empty' => [
                 'name' => 'page_empty',
-                'label' => 'All Empty Layout Pages',
+                'label' => __('All Empty Layout Pages'),
                 'design_abstraction' => 'page_layout',
             ],
         ];
 
-        $actualAbstractions = $this->_model->getAllDesignAbstractions();
-        foreach ($actualAbstractions as $key => $abstraction) {
-            $actualAbstractions[$key]['label'] = (string)$abstraction['label'];
-        }
-
-        $this->assertSame($expected, $actualAbstractions);
+        $this->assertEquals($expected, $this->_model->getAllDesignAbstractions());
     }
 
     public function testIsPageLayoutDesignAbstractions()

dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php

@@ -701,7 +701,7 @@ public function testGetLabel()
     {
         $objectManager = new ObjectManager($this);
         $taxTotalsCalcModel = $objectManager->getObject('Magento\Tax\Model\Sales\Total\Quote\Tax');
-        $this->assertSame((string)$taxTotalsCalcModel->getLabel(), (string)__('Tax'));
+        $this->assertEquals($taxTotalsCalcModel->getLabel(), __('Tax'));
     }
 
     /**