OXDEV-7458 Cleanup duplicated basic context mock creation

Signed-off-by: Anton Fedurtsya <[email protected]>
OXID-eSales · Nov 17, 2023 · 78f3317 · 78f3317
1 parent e51b9c4
commit 78f3317
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 18 deletions.
diff --git a/tests/Unit/Infrastructure/ModuleSettingRepositoryTest.php b/tests/Unit/Infrastructure/ModuleSettingRepositoryTest.php
@@ -228,12 +228,9 @@ public function testGetSettingsList(): void
                 ])
             );
 
-        $basicContext = $this->createMock(BasicContextInterface::class);
-        $basicContext->method('getCurrentShopId')->willReturn($shopId);
-
         $moduleRepository = $this->getSut(
             moduleConfigurationDao: $moduleConfigurationDao,
-            basicContext: $basicContext,
+            basicContext: $this->getBasicContextMock($shopId),
         );
 
         $this->assertSame(

diff --git a/tests/Unit/Infrastructure/ShopSettingRepositoryGettersTest.php b/tests/Unit/Infrastructure/ShopSettingRepositoryGettersTest.php
@@ -4,7 +4,6 @@
 
 use OxidEsales\EshopCommunity\Internal\Framework\Config\Dao\ShopConfigurationSettingDaoInterface;
 use OxidEsales\EshopCommunity\Internal\Framework\Config\DataObject\ShopConfigurationSetting;
-use OxidEsales\EshopCommunity\Internal\Transition\Utility\BasicContextInterface;
 use OxidEsales\GraphQL\ConfigurationAccess\Setting\Enum\FieldType;
 use OxidEsales\GraphQL\ConfigurationAccess\Setting\Exception\WrongSettingTypeException;
 use OxidEsales\GraphQL\ConfigurationAccess\Setting\Exception\WrongSettingValueException;
@@ -31,11 +30,8 @@ public function testGetShopSetting($method, $type, $possibleValue, $expectedResu
                 ])
             );
 
-        $basicContext = $this->createStub(BasicContextInterface::class);
-        $basicContext->method('getCurrentShopId')->willReturn($shopId);
-
         $sut = $this->getSut(
-            basicContext: $basicContext,
+            basicContext: $this->getBasicContextMock($shopId),
             shopSettingDao: $shopSettingDaoStub
         );
 

diff --git a/tests/Unit/Infrastructure/ShopSettingRepositorySettersTest.php b/tests/Unit/Infrastructure/ShopSettingRepositorySettersTest.php
@@ -4,7 +4,6 @@
 
 use OxidEsales\EshopCommunity\Internal\Framework\Config\Dao\ShopConfigurationSettingDaoInterface;
 use OxidEsales\EshopCommunity\Internal\Framework\Config\DataObject\ShopConfigurationSetting;
-use OxidEsales\EshopCommunity\Internal\Transition\Utility\BasicContextInterface;
 use OxidEsales\GraphQL\ConfigurationAccess\Setting\Enum\FieldType;
 
 /**
@@ -20,14 +19,11 @@ public function testSetShopSetting(string $method, $settingValue, string $settin
 
         $setting = $this->buildShopSettingStub($shopId, $settingType, $settingName, $settingValue);
 
-        $basicContextStub = $this->createStub(BasicContextInterface::class);
-        $basicContextStub->method('getCurrentShopId')->willReturn($shopId);
-
         $shopSettingDaoSpy = $this->createMock(ShopConfigurationSettingDaoInterface::class);
         $shopSettingDaoSpy->expects($this->once())->method('save')->with($setting);
 
         $sut = $this->getSut(
-            basicContext: $basicContextStub,
+            basicContext: $this->getBasicContextMock($shopId),
             shopSettingDao: $shopSettingDaoSpy
         );
 

diff --git a/tests/Unit/UnitTestCase.php b/tests/Unit/UnitTestCase.php
@@ -81,12 +81,10 @@ protected function getSettingTypeList(): array
         return [$intSetting, $stringSetting, $arraySetting];
     }
 
-    protected function getBasicContextMock(int $shopId = 1): BasicContextInterface|MockObject
+    protected function getBasicContextMock(int $shopId = 1): BasicContextInterface
     {
         $basicContext = $this->createMock(BasicContextInterface::class);
-        $basicContext->expects($this->any())
-            ->method('getCurrentShopId')
-            ->willReturn($shopId);
+        $basicContext->method('getCurrentShopId')->willReturn($shopId);
 
         return $basicContext;
     }