Fix static and unit tests.

Author: nmalevanec

setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php

@@ -28,6 +28,9 @@ class CacheTest extends \PHPUnit\Framework\TestCase
      */
     private $deploymentConfigMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->validatorMock = $this->createMock(RedisConnectionValidator::class);
@@ -122,11 +125,6 @@ public function testCreateConfigWithRedisConfig()
         $this->assertEquals($expectedConfigData, $configData->getData());
     }
 
-<<<<<<< HEAD
-=======
-    /**
-     * testCreateConfigCacheRedis
-     */
     public function testCreateConfigWithFileCache()
     {
         $this->deploymentConfigMock->method('get')->willReturn('');
@@ -146,9 +144,6 @@ public function testCreateConfigWithFileCache()
         $this->assertEquals($expectedConfigData, $configData->getData());
     }
 
-    /**
-     * testCreateConfigCacheRedis
-     */
     public function testCreateConfigWithIdPrefix()
     {
         $this->deploymentConfigMock->method('get')->willReturn('');
@@ -172,10 +167,6 @@ public function testCreateConfigWithIdPrefix()
         $this->assertEquals($expectedConfigData, $configData->getData());
     }
 
-    /**
-     * testValidateWithValidInput
-     */
->>>>>>> 12b7e08c2f26... Set cache id prefix on installation
     public function testValidateWithValidInput()
     {
         $options = [

setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php

@@ -28,6 +28,9 @@ class PageCacheTest extends \PHPUnit\Framework\TestCase
      */
     private $deploymentConfigMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->validatorMock = $this->createMock(RedisConnectionValidator::class, [], [], '', false);
@@ -130,11 +133,6 @@ public function testCreateConfigWithRedisConfiguration()
         $this->assertEquals($expectedConfigData, $configData->getData());
     }
 
-<<<<<<< HEAD
-=======
-    /**
-     * testCreateConfigWithRedis
-     */
     public function testCreateConfigWithFileCache()
     {
         $this->deploymentConfigMock->method('get')->willReturn('');
@@ -154,10 +152,6 @@ public function testCreateConfigWithFileCache()
         $this->assertEquals($expectedConfigData, $configData->getData());
     }
 
-
-    /**
-     * testCreateConfigCacheRedis
-     */
     public function testCreateConfigWithIdPrefix()
     {
         $this->deploymentConfigMock->method('get')->willReturn('');
@@ -181,10 +175,6 @@ public function testCreateConfigWithIdPrefix()
         $this->assertEquals($expectedConfigData, $configData->getData());
     }
 
-    /**
-     * testValidationWithValidData
-     */
->>>>>>> 12b7e08c2f26... Set cache id prefix on installation
     public function testValidationWithValidData()
     {
         $this->validatorMock->expects($this->once())