MAGETWO-70279: Issue with the config merging introduced for the Analytics integration

Author: akaplya

app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ColumnsResolverTest.php

@@ -18,11 +18,6 @@
  */
 class ColumnsResolverTest extends \PHPUnit_Framework_TestCase
 {
-    /**
-     * @var NameResolver|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $nameResolverMock;
-
     /**
      * @var SelectBuilder|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -48,10 +43,6 @@ class ColumnsResolverTest extends \PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
-//        $this->nameResolverMock = $this->getMockBuilder(NameResolver::class)
-//            ->disableOriginalConstructor()
-//            ->getMock();
-
         $this->selectBuilderMock = $this->getMockBuilder(SelectBuilder::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -91,8 +82,6 @@ public function testGetColumnsWithFunction($expectedColumns, $expectedGroup, $en
             ->method('quoteIdentifier')
             ->with('cpe.name')
             ->willReturn('`cpe`.`name`');
-
-//        $expr = new ColumnValueExpression($expression);
         $this->selectBuilderMock->expects($this->once())
             ->method('getColumns')
             ->willReturn([]);