OXDEV-6932: Use assign instead of directly change property

OXID-eSales · Jul 14, 2023 · 8737ef9 · 8737ef9
1 parent 4a14890
commit 8737ef9
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 14 deletions.
diff --git a/tests/Integration/Model/Evidence/Item/BillingCountryEvidenceTest.php b/tests/Integration/Model/Evidence/Item/BillingCountryEvidenceTest.php
@@ -32,7 +32,8 @@ public function testGetId()
     public function testGetCountryId()
     {
         $oUser = oxNew(User::class);
-        $oUser->oxuser__oxcountryid = new Field('a7c40f631fc920687.20179984');
+        $oUser->assign(['oxcountryid' => 'a7c40f631fc920687.20179984']);
+        $oUser->save();
 
         $session = Registry::getSession();
         $session->setUser($oUser);

diff --git a/tests/Integration/Model/IncorrectVATArticlesMessageFormatterTest.php b/tests/Integration/Model/IncorrectVATArticlesMessageFormatterTest.php
@@ -22,7 +22,8 @@ class IncorrectVATArticlesMessageFormatterTest extends TestCase
     public function testGetMessage()
     {
         $oArticle = oxNew(Article::class);
-        $oArticle->oxarticles__oxtitle = new Field('some other name', Field::T_RAW);
+        $oArticle->assign(['oxtitle' => 'some other name']);
+        $oArticle->save();
 
         /** @var IncorrectVATArticlesMessageFormatter $oVATTBEArticleMessageFormer */
         $oVATTBEArticleMessageFormer = oxNew(IncorrectVATArticlesMessageFormatter::class);

diff --git a/tests/Integration/Model/UserSessionTest.php b/tests/Integration/Model/UserSessionTest.php
@@ -7,7 +7,6 @@
 namespace OxidEsales\EVatModule\Tests\Integration\Model;
 
 use OxidEsales\Eshop\Core\Registry;
-use OxidEsales\Eshop\Core\Field;
 use OxidEsales\EshopCommunity\Internal\Container\ContainerFactory;
 use OxidEsales\EVatModule\Model\Evidence\Item\BillingCountryEvidence;
 use OxidEsales\EVatModule\Model\Evidence\Item\GeoLocationEvidence;
@@ -49,7 +48,8 @@ public function testTBEEvidenceListCaching()
         $moduleSettings->saveDefaultEvidence('billing_country');
 
         $oUser = oxNew(EShopUser::class);
-        $oUser->oxuser__oxcountryid = new Field('GermanyId');
+        $oUser->assign(['oxcountryid' => 'GermanyId']);
+        $oUser->save();
         Registry::getSession()->setUser($oUser);
 
         /** @var User $oTBEUser */
@@ -59,7 +59,8 @@ public function testTBEEvidenceListCaching()
         $moduleSettings->saveEvidenceClasses([GeoLocationEvidence::class]);
         $moduleSettings->saveDefaultEvidence('geo_location');
 
-        $oUser->oxuser__oxcountryid = new Field('LithuaniaId');
+        $oUser->assign(['oxcountryid' => 'LithuaniaId']);
+        $oUser->save();
 
         $aExpectedList = [
             'billing_country' => [

diff --git a/tests/Integration/Shop/BasketTest.php b/tests/Integration/Shop/BasketTest.php
@@ -128,13 +128,13 @@ public function testSetCountryIdOnChangeEventWhenMessageShouldBeShown($bAddToBas
         /** @var Country $oCountry */
         $oCountry = oxNew(Country::class);
         $oCountry->load($sLithuaniaId);
-        $oCountry->oxcountry__oevattbe_appliestbevat = new Field(true);
+        $oCountry->assign(['oevattbe_appliestbevat' => true]);
         $oCountry->save();
 
         /** @var Article $oArticle */
         $oArticle = oxNew(Article::class);
         $oArticle->setId('_testArticle1');
-        $oArticle->oxarticles__oevattbe_istbeservice = new Field(true);
+        $oCountry->assign(['oevattbe_istbeservice' => true]);
         $oArticle->save();
 
         /** @var EShopBasket|Basket $oBasket */

diff --git a/tests/Integration/Shop/CategoryTest.php b/tests/Integration/Shop/CategoryTest.php
@@ -21,10 +21,12 @@ class CategoryTest extends TestCase
     public function testIsOEVATTBETBE()
     {
         $oCategory = oxNew(Category::class);
-        $oCategory->oxcategories__oevattbe_istbe = new Field(1);
+        $oCategory->assign(['oevattbe_istbe' => 1]);
+        $oCategory->save();
         $this->assertTrue($oCategory->isOeVATTBETBE());
 
-        $oCategory->oxcategories__oevattbe_istbe = new Field(0);
+        $oCategory->assign(['oevattbe_istbe' => 0]);
+        $oCategory->save();
         $this->assertFalse($oCategory->isOeVATTBETBE());
     }
 }
diff --git a/tests/Integration/Shop/CountryTest.php b/tests/Integration/Shop/CountryTest.php
@@ -21,10 +21,12 @@ class CountryTest extends TestCase
     public function testAppliesOeTBEVATTbeVat()
     {
         $oCountry = oxNew(Country::class);
-        $oCountry->oxcountry__oevattbe_appliestbevat = new Field(1);
+        $oCountry->assign(['oevattbe_appliestbevat' => 1]);
+        $oCountry->save();
         $this->assertTrue($oCountry->appliesOeTBEVATTbeVat());
 
-        $oCountry->oxcountry__oevattbe_appliestbevat = new Field(0);
+        $oCountry->assign(['oevattbe_appliestbevat' => 0]);
+        $oCountry->save();
         $this->assertFalse($oCountry->appliesOeTBEVATTbeVat());
     }
 
@@ -34,10 +36,12 @@ public function testAppliesOeTBEVATTbeVat()
     public function testIsOEVATTBEAtLeastOneGroupConfigured()
     {
         $oCountry = oxNew(Country::class);
-        $oCountry->oxcountry__oevattbe_istbevatconfigured = new Field(1);
+        $oCountry->assign(['oevattbe_istbevatconfigured' => 1]);
+        $oCountry->save();
         $this->assertTrue($oCountry->isOEVATTBEAtLeastOneGroupConfigured());
 
-        $oCountry->oxcountry__oevattbe_istbevatconfigured = new Field(0);
+        $oCountry->assign(['oevattbe_istbevatconfigured' => 0]);
+        $oCountry->save();
         $this->assertFalse($oCountry->isOEVATTBEAtLeastOneGroupConfigured());
     }
 
@@ -47,7 +51,8 @@ public function testIsOEVATTBEAtLeastOneGroupConfigured()
     public function testGetOeVATTBEName()
     {
         $oCountry = oxNew(Country::class);
-        $oCountry->oxcountry__oxtitle = new Field('LT');
+        $oCountry->assign(['oxtitle' => 'LT']);
+        $oCountry->save();
         $this->assertSame('LT', $oCountry->getOeVATTBEName());
     }
 }