Merge pull request #2497 from magento-borg/DEVOPS-2174-2.1

Fixed issues:
- DEVOPS-232 Static Testing in Jenkins

Author: slavvka

dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixture.php

@@ -171,8 +171,13 @@ protected function _applyOneFixture($fixture)
                 require $fixture;
             }
         } catch (\Exception $e) {
-            throw new \Exception(
-                sprintf("Error in fixture: %s.\n %s", json_encode($fixture), $e->getMessage()),
+            throw new \PHPUnit_Framework_Exception(
+                sprintf(
+                    "Error in fixture: %s.\n %s\n %s",
+                    json_encode($fixture),
+                    $e->getMessage(),
+                    $e->getTraceAsString()
+                ),
                 500,
                 $e
             );

dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixtureBeforeTransaction.php

@@ -138,8 +138,15 @@ protected function _applyOneFixture($fixture)
                 require $fixture;
             }
         } catch (\Exception $e) {
-            throw new \Exception(
-                sprintf("Error in fixture: %s.\n %s", json_encode($fixture), (string)$e)
+            throw new \PHPUnit_Framework_Exception(
+                sprintf(
+                    "Error in fixture: %s.\n %s\n %s",
+                    json_encode($fixture),
+                    $e->getMessage(),
+                    $e->getTraceAsString()
+                ),
+                500,
+                $e
             );
         }
     }

dev/tests/integration/testsuite/Magento/Customer/Model/GroupManagementTest.php

@@ -15,7 +15,7 @@
 class GroupManagementTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Framework\ObjectManagerInterface
+     * @var \Magento\TestFramework\ObjectManager
      */
     protected $objectManager;
 
@@ -42,21 +42,21 @@ public function testGetDefaultGroupWithStoreId($testGroup, $storeId)
     }
 
     /**
-     * @magentoDataFixture Magento/Store/_files/core_second_third_fixturestore.php
+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
      */
     public function testGetDefaultGroupWithNonDefaultStoreId()
     {
         /** @var \Magento\Store\Model\StoreManagerInterface  $storeManager */
         $storeManager = Bootstrap::getObjectManager()->get('Magento\Store\Model\StoreManagerInterface');
-        $nonDefaultStore = $storeManager->getStore('secondstore');
+        $nonDefaultStore = $storeManager->getStore('fixturestore');
         $nonDefaultStoreId = $nonDefaultStore->getId();
         /** @var \Magento\Framework\App\MutableScopeConfig $scopeConfig */
         $scopeConfig = $this->objectManager->get('Magento\Framework\App\MutableScopeConfig');
         $scopeConfig->setValue(
             \Magento\Customer\Model\GroupManagement::XML_PATH_DEFAULT_ID,
             2,
             ScopeInterface::SCOPE_STORE,
-            'secondstore'
+            'fixturestore'
         );
         $testGroup = ['id' => 2, 'code' => 'Wholesale', 'tax_class_id' => 3, 'tax_class_name' => 'Retail Customer'];
         $this->assertDefaultGroupMatches($testGroup, $nonDefaultStoreId);

dev/tests/integration/testsuite/Magento/Framework/TranslateCachingTest.php

@@ -48,7 +48,7 @@ public function testLoadDataCaching()
         /** @var \Magento\Framework\Translate $model */
         $model = $this->objectManager->get('Magento\Framework\Translate');
 
-        $model->loadData(\Magento\Framework\App\Area::AREA_FRONTEND); // this is supposed to cache the fixture
+        $model->loadData(\Magento\Framework\App\Area::AREA_FRONTEND, true); // this is supposed to cache the fixture
         $this->assertEquals('Fixture Db Translation', new Phrase('Fixture String'));
 
         /** @var \Magento\Translation\Model\ResourceModel\StringUtils $translateString */

dev/tests/static/testsuite/Magento/Test/Less/LiveCodeTest.php

@@ -43,7 +43,7 @@ public static function setUpBeforeClass()
      */
     public function testCodeStyle()
     {
-        $reportFile = self::$reportDir . '/less_report.txt';
+        $reportFile = self::$reportDir . '/csless_report.txt';
         $wrapper = new LessWrapper();
         $codeSniffer = new CodeSniffer(realpath(__DIR__ . '/_files/lesscs'), $reportFile, $wrapper);
 
@@ -57,10 +57,11 @@ public function testCodeStyle()
 
         $result = $codeSniffer->run($this->filterFiles($fileList));
 
+        $report = file_exists($reportFile) ? file_get_contents($reportFile) : "";
         $this->assertEquals(
             0,
             $result,
-            "PHP Code Sniffer has found {$result} error(s): See detailed report in {$reportFile}"
+            "PHP Code Sniffer has found {$result} error(s): " . PHP_EOL . $report
         );
     }