Skip to content

EspoCRM – Open Source CRM Application

Move tests

Yuriib7715f54519d
diff --git a/tests/integration/Espo/Core/Utils/FieldManager/ArrayTypeTest.php b/tests/integration/Espo/Tools/FieldManager/FieldTypes/ArrayTypeTest.php
similarity index 85%
rename from tests/integration/Espo/Core/Utils/FieldManager/ArrayTypeTest.php
rename to tests/integration/Espo/Tools/FieldManager/FieldTypes/ArrayTypeTest.php
index 272f0802cd..255e0f7630 100644
--- a/tests/integration/Espo/Core/Utils/FieldManager/ArrayTypeTest.php
+++ b/tests/integration/Espo/Tools/FieldManager/FieldTypes/ArrayTypeTest.php
@@ -27,9 +27,11 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
-namespace tests\integration\Espo\Core\Utils\FieldManager;
+namespace tests\integration\Espo\Tools\FieldManager\FieldTypes;
+use Espo\Core\Utils\Metadata;
use Espo\ORM\EntityManager;
+use Espo\Tools\FieldManager\FieldManager;
use tests\integration\Core\BaseTestCase;
class ArrayTypeTest extends BaseTestCase
@@ -54,18 +56,16 @@ class ArrayTypeTest extends BaseTestCase
"tooltip":false
}';
- protected function createFieldManager($app = null)
+ protected function createFieldManager($app = null): FieldManager
{
if (!$app) {
$app = $this;
}
- return $app->getContainer()->get('injectableFactory')->create(
- 'Espo\\Tools\\FieldManager\\FieldManager'
- );
+ return $app->getInjectableFactory()->create(FieldManager::class);
}
- public function testCreate()
+ public function testCreate(): void
{
$fieldManager = $this->createFieldManager();
@@ -73,11 +73,12 @@ class ArrayTypeTest extends BaseTestCase
$fieldManager->create('Account', 'testArray', $fieldDefs);
- $this->getContainer()->get('dataManager')->rebuild(['Account']);
+ $this->getDataManager()->rebuild(['Account']);
$app = $this->createApplication();
- $metadata = $app->getContainer()->get('metadata');
+ $metadata = $app->getContainer()->getByClass(Metadata::class);
+
$savedFieldDefs = $metadata->get('entityDefs.Account.fields.cTestArray');
$this->assertArrayHasKey('type', $savedFieldDefs);
@@ -89,7 +90,7 @@ class ArrayTypeTest extends BaseTestCase
$entityManager = $app->getContainer()->getByClass(EntityManager::class);
$account = $entityManager->getNewEntity('Account');
- $account->set([
+ $account->setMultiple([
'name' => 'Test',
'cTestArray' => ['option1', 'option3']
]);
@@ -100,7 +101,7 @@ class ArrayTypeTest extends BaseTestCase
$this->assertEquals(['option1', 'option3'], $account->get('cTestArray'));
}
- public function testUpdate()
+ public function testUpdate(): void
{
$this->testCreate();
@@ -113,21 +114,21 @@ class ArrayTypeTest extends BaseTestCase
$fieldManager->update('Account', 'cTestArray', $fieldDefs);
- $this->getContainer()->get('dataManager')->rebuild(['Account']);
+ $this->getDataManager()->rebuild(['Account']);
$app = $this->createApplication();
- $metadata = $app->getContainer()->get('metadata');
+ $metadata = $app->getContainer()->getByClass(Metadata::class);
$savedFieldDefs = $metadata->get('entityDefs.Account.fields.cTestArray');
$this->assertTrue($savedFieldDefs['required']);
$entityManager = $app->getContainer()->getByClass(EntityManager::class);
+
$account = $entityManager->getNewEntity('Account');
- $account->set([
+ $account->setMultiple([
'name' => 'Test',
]);
-
$entityManager->saveEntity($account);
}
}
diff --git a/tests/integration/Espo/Core/Utils/FieldManager/EnumTypeTest.php b/tests/integration/Espo/Tools/FieldManager/FieldTypes/EnumTypeTest.php
similarity index 92%
rename from tests/integration/Espo/Core/Utils/FieldManager/EnumTypeTest.php
rename to tests/integration/Espo/Tools/FieldManager/FieldTypes/EnumTypeTest.php
index cb5eab3553..54892e276c 100644
--- a/tests/integration/Espo/Core/Utils/FieldManager/EnumTypeTest.php
+++ b/tests/integration/Espo/Tools/FieldManager/FieldTypes/EnumTypeTest.php
@@ -27,10 +27,11 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
-namespace tests\integration\Espo\Core\Utils\FieldManager;
+namespace tests\integration\Espo\Tools\FieldManager\FieldTypes;
use Espo\Core\Utils\Metadata;
use Espo\ORM\EntityManager;
+use Espo\Tools\FieldManager\FieldManager;
use tests\integration\Core\BaseTestCase;
class EnumTypeTest extends BaseTestCase
@@ -55,18 +56,16 @@ class EnumTypeTest extends BaseTestCase
"tooltip":false
}';
- protected function createFieldManager($app = null)
+ protected function createFieldManager($app = null): FieldManager
{
if (!$app) {
$app = $this;
}
- return $app->getContainer()->get('injectableFactory')->create(
- 'Espo\\Tools\\FieldManager\\FieldManager'
- );
+ return $app->getInjectableFactory()->create(FieldManager::class);
}
- public function testCreate()
+ public function testCreate(): void
{
$fieldManager = $this->createFieldManager();
@@ -89,7 +88,7 @@ class EnumTypeTest extends BaseTestCase
$entityManager = $app->getContainer()->getByClass(EntityManager::class);
$account = $entityManager->getNewEntity('Account');
- $account->set([
+ $account->setMultiple([
'name' => 'Test',
'cTestEnum' => 'option1',
]);
@@ -100,7 +99,7 @@ class EnumTypeTest extends BaseTestCase
$this->assertEquals('option1', $account->get('cTestEnum'));
}
- public function testUpdate()
+ public function testUpdate(): void
{
$this->testCreate();
@@ -129,7 +128,7 @@ class EnumTypeTest extends BaseTestCase
$entityManager = $app->getContainer()->getByClass(EntityManager::class);
$account = $entityManager->getNewEntity('Account');
- $account->set([
+ $account->setMultiple([
'name' => 'New Test',
]);
diff --git a/tests/integration/Espo/Core/Utils/FieldManager/VarcharTypeTest.php b/tests/integration/Espo/Tools/FieldManager/FieldTypes/VarcharTypeTest.php
similarity index 78%
rename from tests/integration/Espo/Core/Utils/FieldManager/VarcharTypeTest.php
rename to tests/integration/Espo/Tools/FieldManager/FieldTypes/VarcharTypeTest.php
index 95c1da7e45..91325d19f1 100644
--- a/tests/integration/Espo/Core/Utils/FieldManager/VarcharTypeTest.php
+++ b/tests/integration/Espo/Tools/FieldManager/FieldTypes/VarcharTypeTest.php
@@ -27,8 +27,11 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
-namespace tests\integration\Espo\Core\Utils\FieldManager;
+namespace tests\integration\Espo\Tools\FieldManager\FieldTypes;
+use Espo\Core\Utils\Metadata;
+use Espo\ORM\EntityManager;
+use Espo\Tools\FieldManager\FieldManager;
use tests\integration\Core\BaseTestCase;
class VarcharTypeTest extends BaseTestCase
@@ -51,18 +54,16 @@ class VarcharTypeTest extends BaseTestCase
"tooltip":false
}';
- protected function createFieldManager($app = null)
+ protected function createFieldManager($app = null): FieldManager
{
if (!$app) {
$app = $this;
}
- return $app->getContainer()->get('injectableFactory')->create(
- 'Espo\\Tools\\FieldManager\\FieldManager'
- );
+ return $app->getInjectableFactory()->create(FieldManager::class);
}
- public function testCreate()
+ public function testCreate(): void
{
$fieldManager = $this->createFieldManager();
@@ -73,7 +74,7 @@ class VarcharTypeTest extends BaseTestCase
$app = $this->createApplication();
- $metadata = $app->getContainer()->get('metadata');
+ $metadata = $app->getContainer()->getByClass(Metadata::class);
$savedFieldDefs = $metadata->get('entityDefs.Account.fields.cTestVarchar');
$this->assertArrayHasKey('type', $savedFieldDefs);
@@ -82,20 +83,21 @@ class VarcharTypeTest extends BaseTestCase
$this->assertTrue($savedFieldDefs['required']);
$this->assertTrue($savedFieldDefs['isCustom']);
- $entityManager = $app->getContainer()->get('entityManager');
- $account = $entityManager->getEntity('Account');
- $account->set([
+ $entityManager = $app->getContainer()->getByClass(EntityManager::class);
+
+ $account = $entityManager->getNewEntity('Account');
+ $account->setMultiple([
'name' => 'Test',
'cTestVarchar' => 'test-value'
]);
$entityManager->saveEntity($account);
- $account = $entityManager->getEntity('Account', $account->getId());
+ $account = $entityManager->getEntityById('Account', $account->getId());
$this->assertEquals('test-value', $account->get('cTestVarchar'));
}
- public function testUpdate()
+ public function testUpdate(): void
{
$this->testCreate();
@@ -112,22 +114,22 @@ class VarcharTypeTest extends BaseTestCase
$app = $this->createApplication();
- $metadata = $app->getContainer()->get('metadata');
+ $metadata = $app->getContainer()->getByClass(Metadata::class);
$savedFieldDefs = $metadata->get('entityDefs.Account.fields.cTestVarchar');
$this->assertFalse($savedFieldDefs['required']);
$this->assertEquals('default-value', $savedFieldDefs['default']);
- $entityManager = $app->getContainer()->get('entityManager');
+ $entityManager = $app->getContainer()->getByClass(EntityManager::class);
- $account = $entityManager->getEntity('Account');
- $account->set([
+ $account = $entityManager->getNewEntity('Account');
+ $account->setMultiple([
'name' => 'New Test',
]);
$entityManager->saveEntity($account);
- $account = $entityManager->getEntity('Account', $account->getId());
+ $account = $entityManager->getEntityById('Account', $account->getId());
$this->assertEquals('default-value', $account->get('cTestVarchar'));
}
}