* [MOD] Update PHPunit to latest version.

* [MOD] Load fixtures using plain SQL files.
* [MOD] Raise PHP version requirements (7.2 will be deprecated within a month).

Signed-off-by: Rubén D <nuxsmin@syspass.org>

.travis.yml

@@ -5,7 +5,6 @@ language: php
 sudo: false
 
 php:
-  - '7.2'
   - '7.3'
   - '7.4'
 

composer.json

@@ -19,18 +19,18 @@
   },
   "require": {
     "roave/security-advisories": "dev-master",
-    "php": "~7.2 || ~7.3 || ~7.4",
+    "php": "~7.3 || ~7.4",
     "defuse/php-encryption": "^2.1",
     "phpmailer/phpmailer": "^6.0",
     "ademarre/binary-to-text-php": "dev-master",
     "phpseclib/phpseclib": "^2.0",
-    "klein/klein": "~2.1",
+    "klein/klein": "^2.1",
     "php-di/php-di": "^6.0",
-    "doctrine/common": "~v2.7",
-    "guzzlehttp/guzzle": "~6.3",
+    "doctrine/common": "^v2.7",
+    "guzzlehttp/guzzle": "^6.3",
     "monolog/monolog": "^1.23",
-    "symfony/debug" : "~v3.4",
-    "vlucas/phpdotenv" : "~v4.1",
+    "symfony/debug" : "^v3.4",
+    "vlucas/phpdotenv" : "^v4.1",
     "ext-pdo": "*",
     "ext-dom": "*",
     "ext-gd": "*",
@@ -43,13 +43,12 @@
     "league/fractal": "^0.18.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^6",
-    "phpunit/dbunit": "^3",
-    "fzaninotto/faker": "~v1.8",
-    "fabpot/goutte": "~v3.2",
+    "phpunit/phpunit": "^9",
+    "fzaninotto/faker": "^v1.8",
+    "fabpot/goutte": "^v3.2",
     "syspass/extension-installer-plugin": "dev-develop",
     "syspass/plugin-authenticator": "dev-develop",
-    "nikic/php-parser": "~v4.1"
+    "nikic/php-parser": "^v4.1"
   },
   "suggest": {
     "syspass/plugin-authenticator": "^v2.1.0",

lib/SP/Repositories/PublicLink/PublicLinkRepository.php

@@ -518,7 +518,6 @@ final class PublicLinkRepository extends Repository implements RepositoryItemInt
      * @return QueryResult
      * @throws ConstraintException
      * @throws QueryException
-     * @todo Update tests to include userId
      */
     public function getHashForItem($itemId)
     {

lib/SP/Storage/Database/DatabaseConnectionData.php

@@ -65,7 +65,7 @@ final class DatabaseConnectionData
      */
     public static function getFromConfig(ConfigData $configData)
     {
-        return (new static())
+        return (new DatabaseConnectionData())
             ->setDbHost($configData->getDbHost())
             ->setDbName($configData->getDbName())
             ->setDbUser($configData->getDbUser())

tests/SP/Config/ConfigTest.php

@@ -59,7 +59,7 @@ class ConfigTest extends TestCase
     /**
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         self::$dic = setupContext();
 
@@ -70,7 +70,7 @@ class ConfigTest extends TestCase
     /**
      * This method is called after the last test of this test class is run.
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
         // Restore to the initial state
         saveResource('config', 'config.xml', self::$currentConfig);

tests/SP/Core/Acl/AclTest.php

@@ -881,7 +881,7 @@ class AclTest extends TestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $dic = setupContext();
 

tests/SP/Core/Crypt/CryptPKITest.php

@@ -103,7 +103,7 @@ class CryptPKITest extends TestCase
 
         $this->assertNotEmpty($key);
 
-        $this->assertRegExp('/^-----BEGIN PUBLIC KEY-----.*/', $key);
+        $this->assertMatchesRegularExpression('/^-----BEGIN PUBLIC KEY-----.*/', $key);
     }
 
     /**
@@ -115,7 +115,7 @@ class CryptPKITest extends TestCase
 
         $this->assertNotEmpty($key);
 
-        $this->assertRegExp('/^-----BEGIN RSA PRIVATE KEY-----.*/', $key);
+        $this->assertMatchesRegularExpression('/^-----BEGIN RSA PRIVATE KEY-----.*/', $key);
     }
 
     /**
@@ -169,7 +169,7 @@ class CryptPKITest extends TestCase
      *
      * @throws SPException
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->cryptPki = new CryptPKI(new RSA());
     }
@@ -178,7 +178,7 @@ class CryptPKITest extends TestCase
      * Tears down the fixture, for example, close a network connection.
      * This method is called after a test is executed.
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         unlink(CryptPKI::PUBLIC_KEY_FILE);
         unlink(CryptPKI::PRIVATE_KEY_FILE);

tests/SP/Core/Crypt/SecureKeyCookieTest.php

@@ -64,7 +64,7 @@ class SecureKeyCookieTest extends TestCase
             $data = $this->cookie->sign($text, $cypher);
 
             $this->assertNotEmpty($data);
-            $this->assertContains(';', $data);
+            $this->assertStringContainsString(';', $data);
             $this->assertEquals($text, $this->cookie->getCookieData($data, $cypher));
         }
     }
@@ -94,7 +94,7 @@ class SecureKeyCookieTest extends TestCase
      * Sets up the fixture, for example, open a network connection.
      * This method is called before a test is executed.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->cookie = SecureKeyCookie::factory(new Request(\Klein\Request::createFromGlobals()));
     }

tests/SP/Core/Crypt/VaultTest.php

@@ -48,7 +48,7 @@ class VaultTest extends TestCase
      *
      * @throws EnvironmentIsBrokenException
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->key = PasswordUtil::generateRandomBytes();
     }

tests/SP/DatabaseTestCase.php

@@ -25,12 +25,8 @@
 namespace SP\Tests;
 
 use PDO;
-use PHPUnit\DbUnit\Database\DefaultConnection;
-use PHPUnit\DbUnit\DataSet\IDataSet;
-use PHPUnit\DbUnit\TestCaseTrait;
 use PHPUnit\Framework\TestCase;
-use SP\Core\Exceptions\SPException;
-use SP\Storage\Database\DatabaseConnectionData;
+use SP\Storage\Database\DatabaseException;
 
 /**
  * Class DatabaseBaseTest
@@ -41,51 +37,75 @@ use SP\Storage\Database\DatabaseConnectionData;
  */
 abstract class DatabaseTestCase extends TestCase
 {
-    use TestCaseTrait;
-
     /**
-     * @var DatabaseConnectionData
+     * @var bool
      */
-    protected static $databaseConnectionData;
-    /**
-     * @var string
-     */
-    protected static $dataset = 'syspass.xml';
+    protected static $loadFixtures = false;
     /**
      * @var PDO
      */
-    private static $pdo;
-    /**
-     * @var DefaultConnection
-     */
-    protected $conn;
+    private static $conn;
 
     /**
-     * Returns the test database connection.
+     * @param string $table
      *
-     * @return DefaultConnection
-     * @throws SPException
+     * @return int
      */
-    final public function getConnection()
+    protected static function getRowCount(string $table): int
     {
-        if ($this->conn === null) {
-            if (self::$pdo === null) {
-                self::$pdo = getDbHandler()->getConnection();
-            }
-
-            $this->conn = $this->createDefaultDBConnection(self::$pdo, 'syspass');
+        if (!self::$conn) {
+            return 0;
         }
 
-        return $this->conn;
+        $sql = sprintf('SELECT count(*) FROM `%s`', $table);
+
+        return (int)self::$conn->query($sql)->fetchColumn();
     }
 
-    /**
-     * Returns the test dataset.
-     *
-     * @return IDataSet
-     */
-    protected function getDataSet()
+    protected function setUp(): void
     {
-        return $this->createMySQLXMLDataSet(RESOURCE_DIR . DIRECTORY_SEPARATOR . 'datasets' . DIRECTORY_SEPARATOR . self::$dataset);
+        parent::setUp();
+
+        if (self::$loadFixtures) {
+            self::loadFixtures();
+        }
     }
+
+    protected static function loadFixtures()
+    {
+        foreach (FIXTURE_FILES as $file) {
+            $cmd = sprintf(
+                'mysql -h %s -u %s -p%s %s < %s',
+                getenv('DB_SERVER'),
+                getenv('DB_USER'),
+                getenv('DB_PASS'),
+                getenv('DB_NAME'),
+                $file
+            );
+
+            exec($cmd, $output, $res);
+
+            if ($res !== 0) {
+                error_log(sprintf('Cannot load fixtures from: %s', $file));
+                error_log(sprintf('CMD: %s', $cmd));
+                error_log(print_r($output, true));
+
+                exit(1);
+            }
+
+            printf('Fixtures loaded from: %s' . PHP_EOL, $file);
+        }
+
+        if (!self::$conn) {
+            try {
+                self::$conn = getDbHandler()->getConnection();
+            } catch (DatabaseException $e) {
+                processException($e);
+
+                exit(1);
+            }
+        }
+    }
+
+
 }

tests/SP/Mvc/Controller/Validators/PasswordValidatorTest.php

@@ -142,7 +142,7 @@ class PasswordValidatorTest extends TestCase
      * Sets up the fixture, for example, open a network connection.
      * This method is called before a test is executed.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->password = new Password();
         $this->password->setLength(10);

tests/SP/Repositories/AccountFileRepositoryTest.php

@@ -33,7 +33,6 @@ use SP\DataModel\FileData;
 use SP\DataModel\FileExtData;
 use SP\DataModel\ItemSearchData;
 use SP\Repositories\Account\AccountFileRepository;
-use SP\Storage\Database\DatabaseConnectionData;
 use SP\Tests\DatabaseTestCase;
 use function SP\Tests\setupContext;
 
@@ -54,14 +53,11 @@ class AccountFileRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_accountFile.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(AccountFileRepository::class);
@@ -77,7 +73,7 @@ class AccountFileRepositoryTest extends DatabaseTestCase
         $this->assertEquals(1, self::$repository->delete(3));
         $this->assertEquals(0, self::$repository->delete(10));
 
-        $this->assertEquals(1, $this->conn->getRowCount('AccountFile'));
+        $this->assertEquals(1, self::getRowCount('AccountFile'));
     }
 
     /**
@@ -89,7 +85,7 @@ class AccountFileRepositoryTest extends DatabaseTestCase
         $this->assertEquals(2, self::$repository->deleteByIdBatch([1, 3, 10]));
         $this->assertEquals(0, self::$repository->deleteByIdBatch([]));
 
-        $this->assertEquals(1, $this->conn->getRowCount('AccountFile'));
+        $this->assertEquals(1, self::getRowCount('AccountFile'));
     }
 
     /**
@@ -193,7 +189,7 @@ class AccountFileRepositoryTest extends DatabaseTestCase
         $this->assertEquals($data->getContent(), $resultData->getContent());
         $this->assertEquals($data->getThumb(), $resultData->getThumb());
 
-        $this->assertEquals(4, $this->conn->getRowCount('AccountFile'));
+        $this->assertEquals(4, self::getRowCount('AccountFile'));
     }
 
     /**

tests/SP/Repositories/AccountHistoryRepositoryTest.php

@@ -58,14 +58,11 @@ class AccountHistoryRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_accountHistory.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(AccountHistoryRepository::class);
@@ -81,7 +78,7 @@ class AccountHistoryRepositoryTest extends DatabaseTestCase
         $this->assertEquals(1, self::$repository->delete(3));
         $this->assertEquals(1, self::$repository->delete(4));
 
-        $this->assertEquals(3, $this->conn->getRowCount('AccountHistory'));
+        $this->assertEquals(3, self::getRowCount('AccountHistory'));
     }
 
     /**
@@ -160,7 +157,7 @@ class AccountHistoryRepositoryTest extends DatabaseTestCase
         $result = self::$repository->create(new AccountHistoryCreateDto(10, true, false, PasswordUtil::generateRandomBytes()));
         $this->assertEquals(0, $result);
 
-        $this->assertEquals(7, $this->conn->getRowCount('AccountHistory'));
+        $this->assertEquals(7, self::getRowCount('AccountHistory'));
     }
 
     /**
@@ -195,7 +192,7 @@ class AccountHistoryRepositoryTest extends DatabaseTestCase
         $this->assertEquals(3, self::$repository->deleteByIdBatch([1, 3, 4, 5]));
         $this->assertEquals(0, self::$repository->deleteByIdBatch([]));
 
-        $this->assertEquals(2, $this->conn->getRowCount('AccountHistory'));
+        $this->assertEquals(2, self::getRowCount('AccountHistory'));
     }
 
     /**
@@ -258,6 +255,6 @@ class AccountHistoryRepositoryTest extends DatabaseTestCase
 
         $this->assertEquals(0, self::$repository->deleteByAccountIdBatch([]));
 
-        $this->assertEquals(1, $this->conn->getRowCount('AccountHistory'));
+        $this->assertEquals(1, self::getRowCount('AccountHistory'));
     }
 }

tests/SP/Repositories/AccountRepositoryTest.php

@@ -66,14 +66,11 @@ class AccountRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_account.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(AccountRepository::class);
@@ -87,18 +84,18 @@ class AccountRepositoryTest extends DatabaseTestCase
     public function testDelete()
     {
         // Comprobar registros iniciales
-        $this->assertEquals(2, $this->conn->getRowCount('Account'));
+        $this->assertEquals(4, self::getRowCount('Account'));
 
         // Eliminar un registro y comprobar el total de registros
         $this->assertEquals(1, self::$repository->delete(1));
-        $this->assertEquals(1, $this->conn->getRowCount('Account'));
+        $this->assertEquals(3, self::getRowCount('Account'));
 
         // Eliminar un registro no existente
         $this->assertEquals(0, self::$repository->delete(100));
 
         // Eliminar un registro y comprobar el total de registros
         $this->assertEquals(1, self::$repository->delete(2));
-        $this->assertEquals(0, $this->conn->getRowCount('Account'));
+        $this->assertEquals(2, self::getRowCount('Account'));
     }
 
     /**
@@ -109,7 +106,7 @@ class AccountRepositoryTest extends DatabaseTestCase
     {
         $this->assertTrue(self::$repository->editRestore(3, 1));
 
-        $this->assertEquals(5, $this->conn->getRowCount('AccountHistory'));
+        $this->assertEquals(5, self::getRowCount('AccountHistory'));
 
         $this->assertEquals(0, self::$repository->editRestore(1, 1));
     }
@@ -238,12 +235,12 @@ class AccountRepositoryTest extends DatabaseTestCase
     public function testDeleteByIdBatch()
     {
         // Comprobar registros iniciales
-        $this->assertEquals(2, $this->conn->getRowCount('Account'));
+        $this->assertEquals(4, self::getRowCount('Account'));
 
         $this->assertEquals(2, self::$repository->deleteByIdBatch([1, 2, 100]));
 
         // Comprobar registros tras eliminación
-        $this->assertEquals(0, $this->conn->getRowCount('Account'));
+        $this->assertEquals(2, self::getRowCount('Account'));
     }
 
     /**
@@ -327,16 +324,20 @@ class AccountRepositoryTest extends DatabaseTestCase
     {
         $result = self::$repository->getAll();
 
-        $this->assertEquals(2, $result->getNumRows());
+        $this->assertEquals(4, $result->getNumRows());
 
         /** @var AccountData[] $data */
         $data = $result->getDataAsArray();
 
-        $this->assertCount(2, $data);
+        $this->assertCount(4, $data);
         $this->assertInstanceOf(AccountData::class, $data[0]);
         $this->assertEquals(1, $data[0]->getId());
         $this->assertInstanceOf(AccountData::class, $data[1]);
         $this->assertEquals(2, $data[1]->getId());
+        $this->assertInstanceOf(AccountData::class, $data[2]);
+        $this->assertEquals(3, $data[2]->getId());
+        $this->assertInstanceOf(AccountData::class, $data[3]);
+        $this->assertEquals(4, $data[3]->getId());
     }
 
     /**
@@ -389,7 +390,7 @@ class AccountRepositoryTest extends DatabaseTestCase
      */
     public function testGetTotalNumAccounts()
     {
-        $this->assertEquals(7, self::$repository->getTotalNumAccounts()->num);
+        $this->assertEquals(9, self::$repository->getTotalNumAccounts()->num);
     }
 
     /**
@@ -429,7 +430,7 @@ class AccountRepositoryTest extends DatabaseTestCase
         $queryCondition = new QueryCondition();
         $queryCondition->addFilter('Account.isPrivate = 1');
 
-        $this->assertCount(0, self::$repository->getForUser($queryCondition)->getDataAsArray());
+        $this->assertCount(1, self::$repository->getForUser($queryCondition)->getDataAsArray());
     }
 
     /**
@@ -440,7 +441,7 @@ class AccountRepositoryTest extends DatabaseTestCase
      */
     public function testGetAccountsPassData()
     {
-        $this->assertCount(2, self::$repository->getAccountsPassData());
+        $this->assertCount(4, self::$repository->getAccountsPassData());
     }
 
     /**
@@ -471,12 +472,12 @@ class AccountRepositoryTest extends DatabaseTestCase
         $accountRequest->pass = Crypt::encrypt('1234', $accountRequest->key, self::SECURE_KEY_PASSWORD);
 
         // Comprobar registros iniciales
-        $this->assertEquals(2, $this->conn->getRowCount('Account'));
+        $this->assertEquals(4, self::getRowCount('Account'));
 
         self::$repository->create($accountRequest);
 
         // Comprobar registros finales
-        $this->assertEquals(3, $this->conn->getRowCount('Account'));
+        $this->assertEquals(5, self::getRowCount('Account'));
     }
 
     /**
@@ -591,7 +592,7 @@ class AccountRepositoryTest extends DatabaseTestCase
 
         $response = self::$repository->getByFilter($searchFilter, new QueryCondition());
 
-        $this->assertEquals(0, $response->getNumRows());
+        $this->assertEquals(1, $response->getNumRows());
 
         // Comprobar las etiquetas
         $searchFilter->reset();
@@ -600,12 +601,13 @@ class AccountRepositoryTest extends DatabaseTestCase
 
         $response = self::$repository->getByFilter($searchFilter, new QueryCondition());
 
-        $this->assertEquals(1, $response->getNumRows());
+        $this->assertEquals(2, $response->getNumRows());
 
         /** @var AccountSearchVData[] $data */
         $data = $response->getDataAsArray();
 
-        $this->assertEquals(1, $data[0]->getId());
+        $this->assertEquals(2, $data[0]->getId());
+        $this->assertEquals(1, $data[1]->getId());
     }
 
     /**

tests/SP/Repositories/AccountToFavoriteRepositoryTest.php

@@ -51,14 +51,11 @@ class AccountToFavoriteRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_accountFavorite.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(AccountToFavoriteRepository::class);

tests/SP/Repositories/AccountToTagRepositoryTest.php

@@ -55,14 +55,11 @@ class AccountToTagRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(AccountToTagRepository::class);
@@ -76,7 +73,7 @@ class AccountToTagRepositoryTest extends DatabaseTestCase
      */
     public function testGetTagsByAccountId()
     {
-        $this->assertEquals(1, self::$repository->getTagsByAccountId(1)->getNumRows());
+        $this->assertEquals(2, self::$repository->getTagsByAccountId(1)->getNumRows());
         $this->assertEquals(0, self::$repository->getTagsByAccountId(10)->getNumRows());
     }
 
@@ -90,9 +87,9 @@ class AccountToTagRepositoryTest extends DatabaseTestCase
     {
         $accountRequest = new AccountRequest();
         $accountRequest->id = 1;
-        $accountRequest->tags = [2, 3];
+        $accountRequest->tags = [3];
 
-        $this->assertEquals(2, self::$repository->add($accountRequest));
+        $this->assertEquals(1, self::$repository->add($accountRequest));
 
         $result = self::$repository->getTagsByAccountId($accountRequest->id);
         $data = $result->getDataAsArray();
@@ -122,7 +119,7 @@ class AccountToTagRepositoryTest extends DatabaseTestCase
      */
     public function testDeleteByAccountId()
     {
-        $this->assertEquals(1, self::$repository->deleteByAccountId(1));
+        $this->assertEquals(2, self::$repository->deleteByAccountId(1));
 
         $this->assertEquals(0, self::$repository->getTagsByAccountId(1)->getNumRows());
 

tests/SP/Repositories/AccountToUserGroupRepositoryTest.php

@@ -55,14 +55,11 @@ class AccountToUserGroupRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(AccountToUserGroupRepository::class);
@@ -97,14 +94,14 @@ class AccountToUserGroupRepositoryTest extends DatabaseTestCase
         $result = self::$repository->getUserGroupsByAccountId(2);
         $data = $result->getDataAsArray();
 
-        $this->assertEquals(1, $result->getNumRows());
+        $this->assertEquals(2, $result->getNumRows());
         $this->assertInstanceOf(ItemData::class, $data[0]);
 
         $userGroupsView = array_filter($data, function ($user) {
             return (int)$user->isEdit === 0;
         });
 
-        $this->assertCount(1, $userGroupsView);
+        $this->assertCount(2, $userGroupsView);
 
         $userGroupsEdit = array_filter($data, function ($user) {
             return (int)$user->isEdit === 1;
@@ -164,7 +161,7 @@ class AccountToUserGroupRepositoryTest extends DatabaseTestCase
         $accountRequest->id = 2;
         $accountRequest->userGroupsEdit = [2, 3];
 
-        $this->assertEquals(3, self::$repository->updateByType($accountRequest, true));
+        self::$repository->updateByType($accountRequest, true);
 
         $result = self::$repository->getUserGroupsByAccountId($accountRequest->id);
         $data = $result->getDataAsArray();
@@ -197,13 +194,13 @@ class AccountToUserGroupRepositoryTest extends DatabaseTestCase
      */
     public function testViewDeleteByAccountId()
     {
-        $this->assertEquals(1, self::$repository->deleteTypeByAccountId(2, false));
+        $this->assertEquals(2, self::$repository->deleteTypeByAccountId(2, false));
 
         $this->assertEquals(0, self::$repository->getUserGroupsByAccountId(2)->getNumRows());
 
         $this->assertEquals(0, self::$repository->deleteTypeByAccountId(10, false));
 
-        $this->assertEquals(1, $this->conn->getRowCount('AccountToUserGroup'));
+        $this->assertEquals(1, self::getRowCount('AccountToUserGroup'));
     }
 
     /**
@@ -220,7 +217,7 @@ class AccountToUserGroupRepositoryTest extends DatabaseTestCase
 
         $this->assertEquals(0, self::$repository->deleteByAccountId(10));
 
-        $this->assertEquals(1, $this->conn->getRowCount('AccountToUserGroup'));
+        $this->assertEquals(2, self::getRowCount('AccountToUserGroup'));
     }
 
     /**
@@ -311,7 +308,7 @@ class AccountToUserGroupRepositoryTest extends DatabaseTestCase
 
         $this->assertEquals(0, self::$repository->deleteTypeByAccountId(10, true));
 
-        $this->assertEquals(1, $this->conn->getRowCount('AccountToUserGroup'));
+        $this->assertEquals(2, self::getRowCount('AccountToUserGroup'));
     }
 
     /**
@@ -324,7 +321,7 @@ class AccountToUserGroupRepositoryTest extends DatabaseTestCase
     {
         $this->assertEquals(2, self::$repository->getUserGroupsByUserGroupId(2)->getNumRows());
 
-        $this->assertEquals(0, self::$repository->getUserGroupsByUserGroupId(3)->getNumRows());
+        $this->assertEquals(1, self::$repository->getUserGroupsByUserGroupId(3)->getNumRows());
 
         $this->assertEquals(0, self::$repository->getUserGroupsByUserGroupId(10)->getNumRows());
     }

tests/SP/Repositories/AccountToUserRepositoryTest.php

@@ -55,14 +55,11 @@ class AccountToUserRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(AccountToUserRepository::class);
@@ -210,7 +207,7 @@ class AccountToUserRepositoryTest extends DatabaseTestCase
 
         $this->assertEquals(0, self::$repository->deleteTypeByAccountId(10, false));
 
-        $this->assertEquals(1, $this->conn->getRowCount('AccountToUser'));
+        $this->assertEquals(1, self::getRowCount('AccountToUser'));
     }
 
     /**
@@ -226,7 +223,7 @@ class AccountToUserRepositoryTest extends DatabaseTestCase
 
         $this->assertEquals(0, self::$repository->deleteByAccountId(10));
 
-        $this->assertEquals(1, $this->conn->getRowCount('AccountToUser'));
+        $this->assertEquals(1, self::getRowCount('AccountToUser'));
     }
 
     /**
@@ -318,6 +315,6 @@ class AccountToUserRepositoryTest extends DatabaseTestCase
 
         $this->assertEquals(0, self::$repository->deleteTypeByAccountId(10, true));
 
-        $this->assertEquals(1, $this->conn->getRowCount('AccountToUser'));
+        $this->assertEquals(1, self::getRowCount('AccountToUser'));
     }
 }

tests/SP/Repositories/AuthTokenRepositoryTest.php

@@ -66,14 +66,11 @@ class AuthTokenRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(AuthTokenRepository::class);
@@ -93,7 +90,7 @@ class AuthTokenRepositoryTest extends DatabaseTestCase
         $this->assertInstanceOf(AuthTokenData::class, $data);
         $this->assertEquals(1, $data->getId());
         $this->assertEquals(ActionsInterface::ACCOUNT_SEARCH, $data->getActionId());
-        $this->assertEquals(self::AUTH_TOKEN, $data->getToken());
+        $this->assertEquals('12b9027d24efff7bfbaca8bd774a4c34b45de35e033d2b192a88f4dfaee5c233', $data->getToken());
         $this->assertNull($data->getHash());
 
         $result = self::$repository->getById(2);
@@ -116,7 +113,7 @@ class AuthTokenRepositoryTest extends DatabaseTestCase
     {
         $this->assertEquals(self::AUTH_TOKEN, self::$repository->getTokenByUserId(1));
 
-        $this->assertNull(self::$repository->getTokenByUserId(2));
+        $this->assertNull(self::$repository->getTokenByUserId(3));
     }
 
     /**
@@ -184,12 +181,12 @@ class AuthTokenRepositoryTest extends DatabaseTestCase
         $token = PasswordUtil::generateRandomBytes();
 
         // Comprobar actualización con usuario que existe
-        $this->assertEquals(2, self::$repository->refreshTokenByUserId(1, $token));
+        $this->assertEquals(4, self::$repository->refreshTokenByUserId(1, $token));
         $this->assertEquals($token, self::$repository->getTokenByUserId(1));
 
         // Comprobar actualización con usuario que NO existe
-        $this->assertEquals(0, self::$repository->refreshTokenByUserId(2, $token));
-        $this->assertNull(self::$repository->getTokenByUserId(2));
+        $this->assertEquals(0, self::$repository->refreshTokenByUserId(10, $token));
+        $this->assertNull(self::$repository->getTokenByUserId(10));
     }
 
     /**
@@ -248,15 +245,15 @@ class AuthTokenRepositoryTest extends DatabaseTestCase
         $result = self::$repository->search($itemSearchData);
         $data = $result->getDataAsArray();
 
-        $this->assertEquals(2, $result->getNumRows());
-        $this->assertCount(2, $data);
+        $this->assertEquals(4, $result->getNumRows());
+        $this->assertCount(4, $data);
 
         $this->assertInstanceOf(stdClass::class, $data[0]);
         $this->assertEquals(ActionsInterface::ACCOUNT_SEARCH, $data[0]->actionId);
         $this->assertEquals(self::AUTH_TOKEN, $data[0]->token);
 
         $this->assertInstanceOf(stdClass::class, $data[1]);
-        $this->assertEquals(ActionsInterface::ACCOUNT_VIEW_PASS, $data[1]->actionId);
+        $this->assertEquals(ActionsInterface::ACCOUNT_VIEW, $data[1]->actionId);
         $this->assertEquals(self::AUTH_TOKEN, $data[1]->token);
 
         $itemSearchData = new ItemSearchData();
@@ -274,10 +271,11 @@ class AuthTokenRepositoryTest extends DatabaseTestCase
      */
     public function testDeleteByIdBatch()
     {
-        $this->assertEquals(2, $this->conn->getRowCount('AuthToken'));
+        $this->assertEquals(5, self::getRowCount('AuthToken'));
 
-        $this->assertEquals(2, self::$repository->deleteByIdBatch([1, 2, 3]));
-        $this->assertEquals(0, $this->conn->getRowCount('AuthToken'));
+        $this->assertEquals(3, self::$repository->deleteByIdBatch([1, 2, 3]));
+
+        $this->assertEquals(2, self::getRowCount('AuthToken'));
 
         $this->assertEquals(0, self::$repository->deleteByIdBatch([]));
     }
@@ -325,8 +323,8 @@ class AuthTokenRepositoryTest extends DatabaseTestCase
         $authTokenData->setVault($vault);
         $authTokenData->setUserId(2);
 
-        $this->assertEquals(3, self::$repository->create($authTokenData));
-        $this->assertEquals(3, $this->conn->getRowCount('AuthToken'));
+        $this->assertEquals(6, self::$repository->create($authTokenData));
+        $this->assertEquals(6, self::getRowCount('AuthToken'));
 
         $result = self::$repository->getTokenByToken(ActionsInterface::ACCOUNT_CREATE, $token);
         /** @var AuthTokenData $data */
@@ -336,7 +334,7 @@ class AuthTokenRepositoryTest extends DatabaseTestCase
         $this->assertInstanceOf(AuthTokenData::class, $data);
         $this->assertEquals(ActionsInterface::ACCOUNT_CREATE, $data->getActionId());
         $this->assertEquals($hash, $data->getHash());
-        $this->assertEquals(3, $data->getId());
+        $this->assertEquals(6, $data->getId());
         $this->assertEquals(2, $data->getUserId());
         $this->assertEquals($vault->getSerialized(), $data->getVault());
 

tests/SP/Repositories/CategoryRepositoryTest.php

@@ -58,14 +58,11 @@ class CategoryRepositoryTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(CategoryRepository::class);
@@ -164,7 +161,7 @@ class CategoryRepositoryTest extends DatabaseTestCase
      */
     public function testGetAll()
     {
-        $count = $this->conn->getRowCount('Category');
+        $count = self::getRowCount('Category');
 
         $result = self::$repository->getAll();
         $this->assertEquals($count, $result->getNumRows());
@@ -224,11 +221,11 @@ class CategoryRepositoryTest extends DatabaseTestCase
      */
     public function testDeleteByIdBatch()
     {
-        $countBefore = $this->conn->getRowCount('Category');
+        $countBefore = self::getRowCount('Category');
 
         $this->assertEquals(1, self::$repository->deleteByIdBatch([3]));
 
-        $countAfter = $this->conn->getRowCount('Category');
+        $countAfter = self::getRowCount('Category');
 
         $this->assertEquals($countBefore - 1, $countAfter);
 
@@ -246,7 +243,7 @@ class CategoryRepositoryTest extends DatabaseTestCase
      */
     public function testCreate()
     {
-        $countBefore = $this->conn->getRowCount('Category');
+        $countBefore = self::getRowCount('Category');
 
         $categoryData = new CategoryData();
         $categoryData->name = 'Categoría prueba';
@@ -260,7 +257,7 @@ class CategoryRepositoryTest extends DatabaseTestCase
 
         $this->assertEquals($categoryData->name, $data->getName());
 
-        $countAfter = $this->conn->getRowCount('Category');
+        $countAfter = self::getRowCount('Category');
 
         $this->assertEquals($countBefore + 1, $countAfter);
     }
@@ -273,11 +270,11 @@ class CategoryRepositoryTest extends DatabaseTestCase
      */
     public function testDelete()
     {
-        $countBefore = $this->conn->getRowCount('Category');
+        $countBefore = self::getRowCount('Category');
 
         $this->assertEquals(1, self::$repository->delete(3));
 
-        $countAfter = $this->conn->getRowCount('Category');
+        $countAfter = self::getRowCount('Category');
 
         $this->assertEquals($countBefore - 1, $countAfter);
 

tests/SP/Repositories/ClientRepositoryTest.php

@@ -58,14 +58,11 @@ class ClientRepositoryTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(ClientRepository::class);
@@ -79,7 +76,7 @@ class ClientRepositoryTest extends DatabaseTestCase
      */
     public function testGetByName()
     {
-        $this->assertNull(self::$repository->getByName('Amazon')->getData());
+        $this->assertNull(self::$repository->getByName('Spotify')->getData());
 
         $data = self::$repository->getByName('Google')->getData();
 
@@ -158,7 +155,7 @@ class ClientRepositoryTest extends DatabaseTestCase
      */
     public function testGetAll()
     {
-        $count = $this->conn->getRowCount('Client');
+        $count = self::getRowCount('Client');
 
         $results = self::$repository->getAll();
         /** @var ClientData[] $data */
@@ -167,13 +164,16 @@ class ClientRepositoryTest extends DatabaseTestCase
         $this->assertCount($count, $data);
 
         $this->assertInstanceOf(ClientData::class, $data[0]);
-        $this->assertEquals('Apple', $data[0]->getName());
+        $this->assertEquals('Amazon', $data[0]->getName());
 
         $this->assertInstanceOf(ClientData::class, $data[1]);
-        $this->assertEquals('Google', $data[1]->getName());
+        $this->assertEquals('Apple', $data[1]->getName());
 
         $this->assertInstanceOf(ClientData::class, $data[2]);
-        $this->assertEquals('Microsoft', $data[2]->getName());
+        $this->assertEquals('Google', $data[2]->getName());
+
+        $this->assertInstanceOf(ClientData::class, $data[3]);
+        $this->assertEquals('Microsoft', $data[3]->getName());
     }
 
     /**
@@ -216,11 +216,11 @@ class ClientRepositoryTest extends DatabaseTestCase
      */
     public function testDeleteByIdBatch()
     {
-        $countBefore = $this->conn->getRowCount('Client');
+        $countBefore = self::getRowCount('Client');
 
-        $this->assertEquals(1, self::$repository->deleteByIdBatch([3]));
+        $this->assertEquals(1, self::$repository->deleteByIdBatch([4]));
 
-        $countAfter = $this->conn->getRowCount('Client');
+        $countAfter = self::getRowCount('Client');
 
         $this->assertEquals($countBefore - 1, $countAfter);
 
@@ -238,7 +238,7 @@ class ClientRepositoryTest extends DatabaseTestCase
      */
     public function testCreate()
     {
-        $countBefore = $this->conn->getRowCount('Client');
+        $countBefore = self::getRowCount('Client');
 
         $data = new ClientData();
         $data->name = 'Cliente prueba';
@@ -254,7 +254,7 @@ class ClientRepositoryTest extends DatabaseTestCase
         $this->assertEquals($data->name, $result->getName());
         $this->assertEquals($data->isGlobal, $result->getIsGlobal());
 
-        $countAfter = $this->conn->getRowCount('Client');
+        $countAfter = self::getRowCount('Client');
 
         $this->assertEquals($countBefore + 1, $countAfter);
 
@@ -271,11 +271,11 @@ class ClientRepositoryTest extends DatabaseTestCase
      */
     public function testDelete()
     {
-        $countBefore = $this->conn->getRowCount('Client');
+        $countBefore = self::getRowCount('Client');
 
-        $this->assertEquals(1, self::$repository->delete(3));
+        $this->assertEquals(1, self::$repository->delete(4));
 
-        $countAfter = $this->conn->getRowCount('Client');
+        $countAfter = self::getRowCount('Client');
 
         $this->assertEquals($countBefore - 1, $countAfter);
 
@@ -294,7 +294,7 @@ class ClientRepositoryTest extends DatabaseTestCase
     public function testGetByIdBatch()
     {
         $this->assertCount(3, self::$repository->getByIdBatch([1, 2, 3]));
-        $this->assertCount(3, self::$repository->getByIdBatch([1, 2, 3, 4, 5]));
+        $this->assertCount(4, self::$repository->getByIdBatch([1, 2, 3, 4, 5]));
         $this->assertCount(0, self::$repository->getByIdBatch([]));
     }
 
@@ -307,6 +307,6 @@ class ClientRepositoryTest extends DatabaseTestCase
         $filter = new QueryCondition();
         $filter->addFilter('Account.isPrivate = 0');
 
-        $this->assertEquals(3, self::$repository->getAllForFilter($filter)->getNumRows());
+        $this->assertEquals(4, self::$repository->getAllForFilter($filter)->getNumRows());
     }
 }

tests/SP/Repositories/ConfigRepositoryTest.php

@@ -52,14 +52,11 @@ class ConfigRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_config.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(ConfigRepository::class);
@@ -126,7 +123,7 @@ class ConfigRepositoryTest extends DatabaseTestCase
     {
         $result = self::$repository->getAll();
 
-        $this->assertEquals($this->conn->getRowCount('Config'), $result->getNumRows());
+        $this->assertEquals(self::getRowCount('Config'), $result->getNumRows());
 
         $data = $result->getDataAsArray();
 

tests/SP/Repositories/CustomFieldDefRepositoryTest.php

@@ -56,14 +56,11 @@ class CustomFieldDefRepositoryTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(CustomFieldDefRepository::class);
@@ -131,7 +128,7 @@ class CustomFieldDefRepositoryTest extends DatabaseTestCase
     public function testDeleteByIdBatch()
     {
         $this->assertEquals(1, self::$repository->deleteByIdBatch([3, 4]));
-        $this->assertEquals(2, $this->conn->getRowCount('CustomFieldDefinition'));
+        $this->assertEquals(2, self::getRowCount('CustomFieldDefinition'));
         $this->assertEquals(0, self::$repository->deleteByIdBatch([]));
 
         $this->expectException(ConstraintException::class);
@@ -257,9 +254,9 @@ class CustomFieldDefRepositoryTest extends DatabaseTestCase
         $result = self::$repository->search($itemSearchData);
         $data = $result->getDataAsArray();
 
-        $this->assertEquals(2, $result->getNumRows());
-        $this->assertEquals(2, $result->getTotalNumRows());
-        $this->assertCount(2, $data);
+        $this->assertEquals(1, $result->getNumRows());
+        $this->assertEquals(1, $result->getTotalNumRows());
+        $this->assertCount(1, $data);
         $this->assertInstanceOf(CustomFieldDefinitionData::class, $data[0]);
         $this->assertEquals(2, $data[0]->id);
         $this->assertEquals('password', $data[0]->typeName);
@@ -280,7 +277,7 @@ class CustomFieldDefRepositoryTest extends DatabaseTestCase
     {
         $this->assertEquals(1, self::$repository->delete(3));
         $this->assertEquals(0, self::$repository->delete(10));
-        $this->assertEquals(2, $this->conn->getRowCount('CustomFieldDefinition'));
+        $this->assertEquals(2, self::getRowCount('CustomFieldDefinition'));
 
         $this->expectException(ConstraintException::class);
 
@@ -290,7 +287,7 @@ class CustomFieldDefRepositoryTest extends DatabaseTestCase
     /**
      * Performs operation returned by getSetUpOperation().
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/SP/Repositories/CustomFieldRepositoryTest.php

@@ -53,14 +53,11 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(CustomFieldRepository::class);
@@ -72,11 +69,11 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
      */
     public function testDeleteCustomFieldDataBatch()
     {
-        $this->assertEquals(1, self::$repository->deleteCustomFieldDataBatch([1, 2, 3], ActionsInterface::ACCOUNT));
+        $this->assertEquals(2, self::$repository->deleteCustomFieldDataBatch([1, 2, 3], ActionsInterface::ACCOUNT));
 
         $this->assertEquals(1, self::$repository->deleteCustomFieldDataBatch([1, 2, 3], ActionsInterface::CATEGORY));
 
-        $this->assertEquals(0, $this->conn->getRowCount('CustomFieldData'));
+        $this->assertEquals(0, self::getRowCount('CustomFieldData'));
 
         $this->assertEquals(0, self::$repository->deleteCustomFieldDataBatch([], ActionsInterface::CATEGORY));
 
@@ -135,12 +132,12 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
     public function testGetAllEncrypted()
     {
         $result = self::$repository->getAllEncrypted();
-        $this->assertEquals(1, $result->getNumRows());
+        $this->assertEquals(2, $result->getNumRows());
 
         /** @var CustomFieldData[] $data */
         $data = $result->getDataAsArray();
 
-        $this->assertCount(1, $data);
+        $this->assertCount(2, $data);
         $this->assertInstanceOf(CustomFieldData::class, $data[0]);
         $this->assertEquals(1, $data[0]->getItemId());
         $this->assertEquals(ActionsInterface::ACCOUNT, $data[0]->getModuleId());
@@ -153,9 +150,9 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
      */
     public function testDeleteCustomFieldDefinitionDataBatch()
     {
-        $this->assertEquals(2, self::$repository->deleteCustomFieldDefinitionDataBatch([1, 2, 3]));
+        $this->assertEquals(3, self::$repository->deleteCustomFieldDefinitionDataBatch([1, 2, 3]));
 
-        $this->assertEquals(0, $this->conn->getRowCount('CustomFieldData'));
+        $this->assertEquals(0, self::getRowCount('CustomFieldData'));
 
         $this->assertEquals(0, self::$repository->deleteCustomFieldDefinitionDataBatch([]));
     }
@@ -167,11 +164,11 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
     public function testGetAll()
     {
         $result = self::$repository->getAll();
-        $this->assertEquals(2, $result->getNumRows());
+        $this->assertEquals(3, $result->getNumRows());
 
         $data = $result->getDataAsArray();
 
-        $this->assertCount(2, $data);
+        $this->assertCount(3, $data);
         $this->assertInstanceOf(CustomFieldData::class, $data[0]);
         $this->assertInstanceOf(CustomFieldData::class, $data[1]);
     }
@@ -185,9 +182,9 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
         $this->assertEquals(1, self::$repository->deleteCustomFieldData(1, ActionsInterface::ACCOUNT));
         $this->assertEquals(1, self::$repository->deleteCustomFieldData(1, ActionsInterface::CATEGORY));
 
-        $this->assertEquals(0, $this->conn->getRowCount('CustomFieldData'));
+        $this->assertEquals(1, self::getRowCount('CustomFieldData'));
 
-        $this->assertEquals(0, self::$repository->deleteCustomFieldData(2, ActionsInterface::ACCOUNT));
+        $this->assertEquals(1, self::$repository->deleteCustomFieldData(2, ActionsInterface::ACCOUNT));
 
         $this->assertEquals(0, self::$repository->deleteCustomFieldData(2, ActionsInterface::CATEGORY));
 
@@ -234,8 +231,8 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
         $this->assertEquals(1, $data[0]->typeId);
         $this->assertEquals('text', $data[0]->typeName);
         $this->assertEquals('Texto', $data[0]->typeText);
-        $this->assertNull($data[0]->data);
-        $this->assertNull($data[0]->key);
+        $this->assertNotNull($data[0]->data);
+        $this->assertNotNull($data[0]->key);
 
         $result = self::$repository->getForModuleAndItemId(ActionsInterface::ACCOUNT, 3);
 
@@ -247,17 +244,17 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
         $data = $result->getDataAsArray();
 
         $this->assertCount(2, $data);
-        $this->assertEquals('RSA', $data[0]->definitionName);
-        $this->assertEquals(2, $data[0]->definitionId);
+        $this->assertEquals('SSL', $data[0]->definitionName);
+        $this->assertEquals(3, $data[0]->definitionId);
         $this->assertEquals(ActionsInterface::CATEGORY, $data[0]->moduleId);
         $this->assertEquals(0, $data[0]->required);
         $this->assertEquals(0, $data[0]->showInList);
         $this->assertEquals(null, $data[0]->help);
-        $this->assertEquals(0, $data[0]->isEncrypted);
-        $this->assertEquals(2, $data[0]->typeId);
-        $this->assertEquals('password', $data[0]->typeName);
-        $this->assertEquals('Clave', $data[0]->typeText);
-        $this->assertNotEmpty($data[0]->data);
+        $this->assertEquals(1, $data[0]->isEncrypted);
+        $this->assertEquals(10, $data[0]->typeId);
+        $this->assertEquals('textarea', $data[0]->typeName);
+        $this->assertEquals('Área de Texto', $data[0]->typeText);
+        $this->assertNull($data[0]->data);
         $this->assertNull($data[0]->key);
 
         $result = self::$repository->getForModuleAndItemId(ActionsInterface::CATEGORY, 2);
@@ -266,16 +263,16 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
         $data = $result->getDataAsArray();
 
         $this->assertCount(2, $data);
-        $this->assertEquals('RSA', $data[0]->definitionName);
-        $this->assertEquals(2, $data[0]->definitionId);
+        $this->assertEquals('SSL', $data[0]->definitionName);
+        $this->assertEquals(3, $data[0]->definitionId);
         $this->assertEquals(ActionsInterface::CATEGORY, $data[0]->moduleId);
         $this->assertEquals(0, $data[0]->required);
         $this->assertEquals(0, $data[0]->showInList);
         $this->assertEquals(null, $data[0]->help);
-        $this->assertEquals(0, $data[0]->isEncrypted);
-        $this->assertEquals(2, $data[0]->typeId);
-        $this->assertEquals('password', $data[0]->typeName);
-        $this->assertEquals('Clave', $data[0]->typeText);
+        $this->assertEquals(1, $data[0]->isEncrypted);
+        $this->assertEquals(10, $data[0]->typeId);
+        $this->assertEquals('textarea', $data[0]->typeName);
+        $this->assertEquals('Área de Texto', $data[0]->typeText);
         $this->assertNull($data[0]->data);
         $this->assertNull($data[0]->key);
 
@@ -299,7 +296,7 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
         $data->setData('cuenta');
         $data->setKey('nan');
 
-        $this->assertEquals(3, self::$repository->create($data));
+        $this->assertEquals(4, self::$repository->create($data));
 
         $data = new CustomFieldData();
         $data->setId(2);
@@ -308,7 +305,7 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
         $data->setData('categoria');
         $data->setKey('nan');
 
-        $this->assertEquals(4, self::$repository->create($data));
+        $this->assertEquals(5, self::$repository->create($data));
 
         $this->expectException(ConstraintException::class);
 
@@ -338,7 +335,7 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
 
         self::$repository->create($data);
 
-        $this->assertEquals(4, $this->conn->getRowCount('CustomFieldData'));
+        $this->assertEquals(4, self::getRowCount('CustomFieldData'));
     }
 
     /**
@@ -347,10 +344,10 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
      */
     public function testDeleteCustomFieldDefinitionData()
     {
-        $this->assertEquals(1, self::$repository->deleteCustomFieldDefinitionData(1));
+        $this->assertEquals(2, self::$repository->deleteCustomFieldDefinitionData(1));
         $this->assertEquals(1, self::$repository->deleteCustomFieldDefinitionData(2));
 
-        $this->assertEquals(0, $this->conn->getRowCount('CustomFieldData'));
+        $this->assertEquals(0, self::getRowCount('CustomFieldData'));
     }
 
     /**
@@ -407,6 +404,6 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
 
         $this->assertEquals(0, self::$repository->update($data));
 
-        $this->assertEquals(2, $this->conn->getRowCount('CustomFieldData'));
+        $this->assertEquals(3, self::getRowCount('CustomFieldData'));
     }
 }

tests/SP/Repositories/CustomFieldTypeRepositoryTest.php

@@ -53,14 +53,11 @@ class CustomFieldTypeRepositoryTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(CustomFieldTypeRepository::class);
@@ -72,11 +69,11 @@ class CustomFieldTypeRepositoryTest extends DatabaseTestCase
      */
     public function testDeleteByIdBatch()
     {
-        $countBefore = $this->conn->getRowCount('CustomFieldType');
+        $countBefore = self::getRowCount('CustomFieldType');
 
         $this->assertEquals(2, self::$repository->deleteByIdBatch([3, 4, 100]));
         $this->assertEquals(0, self::$repository->deleteByIdBatch([]));
-        $this->assertEquals($countBefore - 2, $this->conn->getRowCount('CustomFieldType'));
+        $this->assertEquals($countBefore - 2, self::getRowCount('CustomFieldType'));
 
         $this->expectException(ConstraintException::class);
 
@@ -89,11 +86,11 @@ class CustomFieldTypeRepositoryTest extends DatabaseTestCase
      */
     public function testDelete()
     {
-        $countBefore = $this->conn->getRowCount('CustomFieldType');
+        $countBefore = self::getRowCount('CustomFieldType');
 
         $this->assertEquals(1, self::$repository->delete(3));
         $this->assertEquals(0, self::$repository->delete(100));
-        $this->assertEquals($countBefore - 1, $this->conn->getRowCount('CustomFieldType'));
+        $this->assertEquals($countBefore - 1, self::getRowCount('CustomFieldType'));
 
         $this->expectException(ConstraintException::class);
 

tests/SP/Repositories/EventlogRepositoryTest.php

@@ -56,14 +56,11 @@ class EventlogRepositoryTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_eventlog.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(EventlogRepository::class);
@@ -125,7 +122,7 @@ class EventlogRepositoryTest extends DatabaseTestCase
     {
         self::$repository->clear();
 
-        $this->assertEquals(0, $this->conn->getRowCount('EventLog'));
+        $this->assertEquals(0, self::getRowCount('EventLog'));
     }
 
     /**
@@ -144,11 +141,11 @@ class EventlogRepositoryTest extends DatabaseTestCase
         $eventlogData->setIpAddress('127.0.0.1');
         $eventlogData->setDescription('Prueba');
 
-        $countBefore = $this->conn->getRowCount('EventLog');
+        $countBefore = self::getRowCount('EventLog');
 
         self::$repository->create($eventlogData);
 
-        $countAfter = $this->conn->getRowCount('EventLog');
+        $countAfter = self::getRowCount('EventLog');
 
         $this->assertEquals($countBefore + 1, $countAfter);
 

tests/SP/Repositories/ItemPresetRepositoryTest.php

@@ -54,14 +54,11 @@ class ItemPresetRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_itemPreset.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(ItemPresetRepository::class);
@@ -75,7 +72,7 @@ class ItemPresetRepositoryTest extends DatabaseTestCase
     {
         $this->assertEquals(3, self::$repository->deleteByIdBatch([1, 2, 3, 10]));
 
-        $this->assertEquals(2, $this->conn->getRowCount('ItemPreset'));
+        $this->assertEquals(2, self::getRowCount('ItemPreset'));
 
         $this->assertEquals(0, self::$repository->deleteByIdBatch([]));
     }
@@ -92,7 +89,7 @@ class ItemPresetRepositoryTest extends DatabaseTestCase
 
         $this->assertEquals(0, self::$repository->delete(10));
 
-        $this->assertEquals(3, $this->conn->getRowCount('ItemPreset'));
+        $this->assertEquals(3, self::getRowCount('ItemPreset'));
     }
 
     /**
@@ -245,7 +242,7 @@ class ItemPresetRepositoryTest extends DatabaseTestCase
      */
     public function testGetAll()
     {
-        $count = $this->conn->getRowCount('ItemPreset');
+        $count = self::getRowCount('ItemPreset');
 
         $result = self::$repository->getAll();
         $this->assertEquals($count, $result->getNumRows());

tests/SP/Repositories/NotificationRepositoryTest.php

@@ -54,14 +54,11 @@ class NotificationRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(NotificationRepository::class);
@@ -73,10 +70,10 @@ class NotificationRepositoryTest extends DatabaseTestCase
      */
     public function testDeleteAdmin()
     {
-        $countBefore = $this->conn->getRowCount('Notification');
+        $countBefore = self::getRowCount('Notification');
 
         $this->assertEquals(1, self::$repository->deleteAdmin(3));
-        $this->assertEquals($countBefore - 1, $this->conn->getRowCount('Notification'));
+        $this->assertEquals($countBefore - 1, self::getRowCount('Notification'));
     }
 
     /**
@@ -86,7 +83,7 @@ class NotificationRepositoryTest extends DatabaseTestCase
     public function testDeleteAdminBatch()
     {
         $this->assertEquals(3, self::$repository->deleteAdminBatch([1, 2, 3, 5]));
-        $this->assertEquals(0, $this->conn->getRowCount('Notification'));
+        $this->assertEquals(0, self::getRowCount('Notification'));
     }
 
     /**
@@ -404,7 +401,7 @@ class NotificationRepositoryTest extends DatabaseTestCase
         $this->assertEquals(2, self::$repository->deleteByIdBatch([1, 2, 3, 4]));
         $this->assertEquals(0, self::$repository->deleteByIdBatch([]));
 
-        $this->assertEquals(1, $this->conn->getRowCount('Notification'));
+        $this->assertEquals(1, self::getRowCount('Notification'));
     }
 
     /**

tests/SP/Repositories/PluginDataRepositoryTest.php

@@ -55,14 +55,11 @@ class PluginDataRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_plugin.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(PluginDataRepository::class);

tests/SP/Repositories/PluginRepositoryTest.php

@@ -55,14 +55,11 @@ class PluginRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_plugin.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(PluginRepository::class);

tests/SP/Repositories/PublicLinkRepositoryTest.php

@@ -58,14 +58,11 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(PublicLinkRepository::class);
@@ -82,8 +79,9 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
         $data = $result->getData();
 
         $this->assertEquals(1, $result->getNumRows());
-        $this->assertEquals(1, $data->getId());
-        $this->assertEquals(pack('H*', '646134633934396166303637386334353130313363626137633133626463396137636135383731383034663137343134306636626161653236346464'), $data->getHash());
+        $this->assertEquals(3, $data->getId());
+        $this->assertEquals(1, $data->getUserId());
+        $this->assertEquals(pack('H*', '616337343462363934383832336362303531343534366335363739383163653466653732343064663339363832366439396632346664396131333434'), $data->getHash());
 
         $result = self::$repository->getHashForItem(3);
         $this->assertEquals(0, $result->getNumRows());
@@ -108,13 +106,13 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
         $this->assertInstanceOf(PublicLinkListData::class, $data[0]);
         $this->assertEquals(2, $data[0]->getId());
         $this->assertEquals(1, $data[0]->getItemId());
-        $this->assertEquals(pack('H*', '313065363937306666653833623531393234356635333433333732626366663433376461623565356134386238326131653238636131356235346635'), $data[0]->getHash());
+        $this->assertEquals(pack('H*', '636564333430306561313730363139616437643235383934383862366236303734376561393966313265323230663561393130656465366438333466'), $data[0]->getHash());
         $this->assertNotEmpty($data[0]->getData());
         $this->assertEquals(1, $data[0]->getUserId());
         $this->assertEquals(1, $data[0]->getTypeId());
         $this->assertEquals(0, $data[0]->isNotify());
         $this->assertEquals(1529228863, $data[0]->getDateAdd());
-        $this->assertEquals(1529229463, $data[0]->getDateExpire());
+        $this->assertEquals(1532280825, $data[0]->getDateExpire());
         $this->assertEquals(0, $data[0]->getDateUpdate());
         $this->assertEquals(0, $data[0]->getCountViews());
         $this->assertEquals(3, $data[0]->getMaxCountViews());
@@ -132,7 +130,7 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
         $this->assertEquals(1, $result->getNumRows());
         $this->assertCount(1, $data);
         $this->assertInstanceOf(PublicLinkListData::class, $data[0]);
-        $this->assertEquals(1, $data[0]->getId());
+        $this->assertEquals(3, $data[0]->getId());
         $this->assertEquals(2, $data[0]->getItemId());
 
         $itemSearchData->setSeachString('');
@@ -151,7 +149,7 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
         $this->assertEquals(2, self::$repository->deleteByIdBatch([1, 2, 3]));
         $this->assertEquals(0, self::$repository->deleteByIdBatch([]));
 
-        $this->assertEquals(0, $this->conn->getRowCount('PublicLink'));
+        $this->assertEquals(0, self::getRowCount('PublicLink'));
     }
 
     /**
@@ -176,12 +174,12 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
         $data->setDateAdd(time());
         $data->setMaxCountViews(3);
 
-        $this->assertEquals(3, self::$repository->create($data)->getLastId());
+        $this->assertEquals(4, self::$repository->create($data)->getLastId());
 
         /** @var PublicLinkListData $resultData */
-        $resultData = self::$repository->getById(3)->getData();
+        $resultData = self::$repository->getById(4)->getData();
 
-        $this->assertEquals(3, $resultData->getId());
+        $this->assertEquals(4, $resultData->getId());
         $this->assertEquals($data->getItemId(), $resultData->getItemId());
         $this->assertEquals($data->getHash(), $resultData->getHash());
         $this->assertEquals($data->getData(), $resultData->getData());
@@ -198,7 +196,7 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
 
         $this->expectException(ConstraintException::class);
 
-        $data->setItemId(3);
+        $data->setItemId(10);
 
         self::$repository->create($data);
     }
@@ -217,13 +215,13 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
         $this->assertInstanceOf(PublicLinkListData::class, $data);
         $this->assertEquals(2, $data->getId());
         $this->assertEquals(1, $data->getItemId());
-        $this->assertEquals(pack('H*', '313065363937306666653833623531393234356635333433333732626366663433376461623565356134386238326131653238636131356235346635'), $data->getHash());
+        $this->assertEquals(pack('H*', '636564333430306561313730363139616437643235383934383862366236303734376561393966313265323230663561393130656465366438333466'), $data->getHash());
         $this->assertNotEmpty($data->getData());
         $this->assertEquals(1, $data->getUserId());
         $this->assertEquals(1, $data->getTypeId());
         $this->assertEquals(0, $data->isNotify());
         $this->assertEquals(1529228863, $data->getDateAdd());
-        $this->assertEquals(1529229463, $data->getDateExpire());
+        $this->assertEquals(1532280825, $data->getDateExpire());
         $this->assertEquals(0, $data->getDateUpdate());
         $this->assertEquals(0, $data->getCountViews());
         $this->assertEquals(3, $data->getMaxCountViews());
@@ -232,7 +230,7 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
         $this->assertEquals('Google', $data->getAccountName());
         $this->assertEquals('admin', $data->getUserLogin());
 
-        $this->assertEquals(0, self::$repository->getById(3)->getNumRows());
+        $this->assertEquals(0, self::$repository->getById(10)->getNumRows());
     }
 
     /**
@@ -241,11 +239,11 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
      */
     public function testDelete()
     {
-        $this->assertEquals(1, self::$repository->delete(1));
         $this->assertEquals(1, self::$repository->delete(2));
-        $this->assertEquals(0, self::$repository->delete(3));
+        $this->assertEquals(1, self::$repository->delete(3));
+        $this->assertEquals(0, self::$repository->delete(4));
 
-        $this->assertEquals(0, $this->conn->getRowCount('PublicLink'));
+        $this->assertEquals(0, self::getRowCount('PublicLink'));
     }
 
     /**
@@ -254,7 +252,7 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
      */
     public function testAddLinkView()
     {
-        $hash = pack('H*', '313065363937306666653833623531393234356635333433333732626366663433376461623565356134386238326131653238636131356235346635');
+        $hash = pack('H*', '636564333430306561313730363139616437643235383934383862366236303734376561393966313265323230663561393130656465366438333466');
 
         $useInfo = [
             'who' => SELF_IP_ADDRESS,
@@ -284,7 +282,7 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
      */
     public function testGetByHash()
     {
-        $hash = pack('H*', '313065363937306666653833623531393234356635333433333732626366663433376461623565356134386238326131653238636131356235346635');
+        $hash = pack('H*', '636564333430306561313730363139616437643235383934383862366236303734376561393966313265323230663561393130656465366438333466');
 
         $result = self::$repository->getByHash($hash);
         /** @var PublicLinkData $data */
@@ -300,7 +298,7 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
         $this->assertEquals(1, $data->getTypeId());
         $this->assertEquals(0, $data->isNotify());
         $this->assertEquals(1529228863, $data->getDateAdd());
-        $this->assertEquals(1529229463, $data->getDateExpire());
+        $this->assertEquals(1532280825, $data->getDateExpire());
         $this->assertEquals(0, $data->getDateUpdate());
         $this->assertEquals(0, $data->getCountViews());
         $this->assertEquals(3, $data->getMaxCountViews());
@@ -323,23 +321,17 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
         $data->setDateExpire(time() + 3600);
         $data->setMaxCountViews(6);
         $data->setData('data_new');
-        $data->setId(1);
+        $data->setId(2);
 
         $this->assertEquals(1, self::$repository->refresh($data));
 
         /** @var PublicLinkListData $resultData */
-        $resultData = self::$repository->getById(1)->getData();
+        $resultData = self::$repository->getById(2)->getData();
 
         $this->assertEquals($data->getHash(), $resultData->getHash());
         $this->assertEquals($data->getDateExpire(), $resultData->getDateExpire());
         $this->assertEquals($data->getMaxCountViews(), $resultData->getMaxCountViews());
         $this->assertEquals($data->getData(), $resultData->getData());
-
-        $this->expectException(ConstraintException::class);
-
-        $data->setId(2);
-
-        self::$repository->refresh($data);
     }
 
     /**
@@ -376,24 +368,24 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
         $this->assertEquals(2, $result->getNumRows());
 
         $this->assertInstanceOf(PublicLinkListData::class, $data[0]);
-        $this->assertEquals(1, $data[0]->getId());
+        $this->assertEquals(2, $data[0]->getId());
 
         $this->assertInstanceOf(PublicLinkListData::class, $data[1]);
-        $this->assertEquals(2, $data[1]->getId());
-        $this->assertEquals(1, $data[1]->getItemId());
-        $this->assertEquals(pack('H*', '313065363937306666653833623531393234356635333433333732626366663433376461623565356134386238326131653238636131356235346635'), $data[1]->getHash());
+        $this->assertEquals(3, $data[1]->getId());
+        $this->assertEquals(2, $data[1]->getItemId());
+        $this->assertEquals(pack('H*', '616337343462363934383832336362303531343534366335363739383163653466653732343064663339363832366439396632346664396131333434'), $data[1]->getHash());
         $this->assertNotEmpty($data[1]->getData());
         $this->assertEquals(1, $data[1]->getUserId());
         $this->assertEquals(1, $data[1]->getTypeId());
         $this->assertEquals(0, $data[1]->isNotify());
-        $this->assertEquals(1529228863, $data[1]->getDateAdd());
-        $this->assertEquals(1529229463, $data[1]->getDateExpire());
+        $this->assertEquals(1529276100, $data[1]->getDateAdd());
+        $this->assertEquals(1532280828, $data[1]->getDateExpire());
         $this->assertEquals(0, $data[1]->getDateUpdate());
         $this->assertEquals(0, $data[1]->getCountViews());
         $this->assertEquals(3, $data[1]->getMaxCountViews());
         $this->assertEquals(0, $data[1]->getTotalCountViews());
         $this->assertNull($data[1]->getUseInfo());
-        $this->assertEquals('Google', $data[1]->getAccountName());
+        $this->assertEquals('Apple', $data[1]->getAccountName());
         $this->assertEquals('admin', $data[1]->getUserLogin());
 
         $this->assertEquals(0, self::$repository->getByIdBatch([])->getNumRows());
@@ -412,24 +404,24 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
         $this->assertEquals(2, $result->getNumRows());
 
         $this->assertInstanceOf(PublicLinkListData::class, $data[0]);
-        $this->assertEquals(1, $data[0]->getId());
+        $this->assertEquals(2, $data[0]->getId());
 
         $this->assertInstanceOf(PublicLinkListData::class, $data[1]);
-        $this->assertEquals(2, $data[1]->getId());
-        $this->assertEquals(1, $data[1]->getItemId());
-        $this->assertEquals(pack('H*', '313065363937306666653833623531393234356635333433333732626366663433376461623565356134386238326131653238636131356235346635'), $data[1]->getHash());
+        $this->assertEquals(3, $data[1]->getId());
+        $this->assertEquals(2, $data[1]->getItemId());
+        $this->assertEquals(pack('H*', '616337343462363934383832336362303531343534366335363739383163653466653732343064663339363832366439396632346664396131333434'), $data[1]->getHash());
         $this->assertNotEmpty($data[1]->getData());
         $this->assertEquals(1, $data[1]->getUserId());
         $this->assertEquals(1, $data[1]->getTypeId());
         $this->assertEquals(0, $data[1]->isNotify());
-        $this->assertEquals(1529228863, $data[1]->getDateAdd());
-        $this->assertEquals(1529229463, $data[1]->getDateExpire());
+        $this->assertEquals(1529276100, $data[1]->getDateAdd());
+        $this->assertEquals(1532280828, $data[1]->getDateExpire());
         $this->assertEquals(0, $data[1]->getDateUpdate());
         $this->assertEquals(0, $data[1]->getCountViews());
         $this->assertEquals(3, $data[1]->getMaxCountViews());
         $this->assertEquals(0, $data[1]->getTotalCountViews());
         $this->assertNull($data[1]->getUseInfo());
-        $this->assertEquals('Google', $data[1]->getAccountName());
+        $this->assertEquals('Apple', $data[1]->getAccountName());
         $this->assertEquals('admin', $data[1]->getUserLogin());
     }
 
@@ -442,8 +434,8 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
     public function testUpdate()
     {
         $data = new PublicLinkData();
-        $data->setId(1);
-        $data->setItemId(2);
+        $data->setId(2);
+        $data->setItemId(3);
         $data->setHash(PasswordUtil::generateRandomBytes());
         $data->setData('data');
         $data->setUserId(2);
@@ -456,9 +448,9 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
         $this->assertEquals(1, self::$repository->update($data));
 
         /** @var PublicLinkListData $resultData */
-        $resultData = self::$repository->getById(1)->getData();
+        $resultData = self::$repository->getById(2)->getData();
 
-        $this->assertEquals(1, $resultData->getId());
+        $this->assertEquals(2, $resultData->getId());
         $this->assertEquals($data->getItemId(), $resultData->getItemId());
         $this->assertEquals($data->getHash(), $resultData->getHash());
         $this->assertEquals($data->getData(), $resultData->getData());
@@ -471,7 +463,7 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
 
         $this->expectException(ConstraintException::class);
 
-        $data->setItemId(1);
+        $data->setItemId(2);
 
         self::$repository->update($data);
     }

tests/SP/Repositories/TagRepositoryTest.php

@@ -59,14 +59,11 @@ class TagRepositoryTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(TagRepository::class);
@@ -131,7 +128,7 @@ class TagRepositoryTest extends DatabaseTestCase
      */
     public function testGetAll()
     {
-        $count = $this->conn->getRowCount('Tag');
+        $count = self::getRowCount('Tag');
 
         $results = self::$repository->getAll();
 
@@ -187,7 +184,7 @@ class TagRepositoryTest extends DatabaseTestCase
         $this->assertEquals(0, self::$repository->deleteByIdBatch([4]));
         $this->assertEquals(3, self::$repository->deleteByIdBatch([1, 2, 3]));
 
-        $this->assertEquals(0, $this->conn->getRowCount('Tag'));
+        $this->assertEquals(0, self::getRowCount('Tag'));
     }
 
     /**
@@ -198,7 +195,7 @@ class TagRepositoryTest extends DatabaseTestCase
      */
     public function testCreate()
     {
-        $countBefore = $this->conn->getRowCount('Tag');
+        $countBefore = self::getRowCount('Tag');
 
         $tagData = new TagData();
         $tagData->name = 'Core';
@@ -210,7 +207,7 @@ class TagRepositoryTest extends DatabaseTestCase
 
         $this->assertEquals($tagData->name, $data->getName());
 
-        $countAfter = $this->conn->getRowCount('Tag');
+        $countAfter = self::getRowCount('Tag');
 
         $this->assertEquals($countBefore + 1, $countAfter);
     }
@@ -223,11 +220,11 @@ class TagRepositoryTest extends DatabaseTestCase
      */
     public function testDelete()
     {
-        $countBefore = $this->conn->getRowCount('Tag');
+        $countBefore = self::getRowCount('Tag');
 
         $this->assertEquals(1, self::$repository->delete(3));
 
-        $countAfter = $this->conn->getRowCount('Tag');
+        $countAfter = self::getRowCount('Tag');
 
         $this->assertEquals($countBefore - 1, $countAfter);
 

tests/SP/Repositories/TrackRepositoryTest.php

@@ -54,14 +54,11 @@ class TrackRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_track.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(TrackRepository::class);
@@ -75,7 +72,7 @@ class TrackRepositoryTest extends DatabaseTestCase
     {
         $this->assertEquals(1, self::$repository->delete(1));
 
-        $this->assertEquals(5, $this->conn->getRowCount('Track'));
+        $this->assertEquals(5, self::getRowCount('Track'));
 
         $this->assertEquals(0, self::$repository->delete(10));
     }

tests/SP/Repositories/UserGroupRepositoryTest.php

@@ -57,14 +57,11 @@ class UserGroupRepositoryTestCase extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_userGroup.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(UserGroupRepository::class);
@@ -82,7 +79,7 @@ class UserGroupRepositoryTestCase extends DatabaseTestCase
 
         $this->assertEquals(5, self::$repository->getUsageByUsers(2)->getNumRows());
 
-        $this->assertEquals(0, self::$repository->getUsageByUsers(4)->getNumRows());
+        $this->assertEquals(0, self::$repository->getUsageByUsers(10)->getNumRows());
     }
 
     /**
@@ -128,9 +125,9 @@ class UserGroupRepositoryTestCase extends DatabaseTestCase
      */
     public function testDeleteByIdBatch()
     {
-        $this->assertEquals(2, self::$repository->deleteByIdBatch([4, 5]));
+        $this->assertEquals(2, self::$repository->deleteByIdBatch([5, 6]));
 
-        $this->assertEquals(3, $this->conn->getRowCount('UserGroup'));
+        $this->assertEquals(4, self::getRowCount('UserGroup'));
     }
 
     /**
@@ -151,9 +148,9 @@ class UserGroupRepositoryTestCase extends DatabaseTestCase
      */
     public function testDeleteByIdBatchUnknown()
     {
-        $this->assertEquals(2, self::$repository->deleteByIdBatch([4, 5, 10]));
+        $this->assertEquals(2, self::$repository->deleteByIdBatch([5, 6, 10]));
 
-        $this->assertEquals(3, $this->conn->getRowCount('UserGroup'));
+        $this->assertEquals(4, self::getRowCount('UserGroup'));
     }
 
     /**
@@ -212,7 +209,7 @@ class UserGroupRepositoryTestCase extends DatabaseTestCase
     public function testCreate()
     {
         $data = new UserGroupData();
-        $data->setId(6);
+        $data->setId(7);
         $data->setName('Grupo Prueba');
         $data->setDescription('Grupo de prueba para usuarios');
 
@@ -247,12 +244,12 @@ class UserGroupRepositoryTestCase extends DatabaseTestCase
     {
         $result = self::$repository->getAll();
 
-        $this->assertEquals(5, $result->getNumRows());
+        $this->assertEquals(6, $result->getNumRows());
 
         /** @var UserGroupData[] $data */
         $data = $result->getDataAsArray();
 
-        $this->assertCount(5, $data);
+        $this->assertCount(6, $data);
 
         $this->assertInstanceOf(UserGroupData::class, $data[0]);
         $this->assertEquals('Admins', $data[0]->getName());
@@ -270,9 +267,9 @@ class UserGroupRepositoryTestCase extends DatabaseTestCase
      */
     public function testDelete()
     {
-        $this->assertEquals(1, self::$repository->delete(3));
+        $this->assertEquals(1, self::$repository->delete(5));
 
-        $this->assertEquals(4, $this->conn->getRowCount('UserGroup'));
+        $this->assertEquals(5, self::getRowCount('UserGroup'));
 
         $this->assertEquals(0, self::$repository->delete(10));
     }
@@ -299,9 +296,9 @@ class UserGroupRepositoryTestCase extends DatabaseTestCase
     {
         $this->assertEquals(7, self::$repository->getUsage(2)->getNumRows());
 
-        $this->assertEquals(1, self::$repository->getUsage(3)->getNumRows());
+        $this->assertEquals(3, self::$repository->getUsage(3)->getNumRows());
 
-        $this->assertEquals(0, self::$repository->getUsage(4)->getNumRows());
+        $this->assertEquals(0, self::$repository->getUsage(10)->getNumRows());
     }
 
     /**

tests/SP/Repositories/UserPassRecoverRepositoryTest.php

@@ -54,14 +54,11 @@ class UserPassRecoverRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(UserPassRecoverRepository::class);

tests/SP/Repositories/UserProfileRepositoryTest.php

@@ -59,14 +59,11 @@ class UserProfileRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(UserProfileRepository::class);
@@ -159,7 +156,7 @@ class UserProfileRepositoryTest extends DatabaseTestCase
         $result = self::$repository->delete(3);
 
         $this->assertEquals(1, $result);
-        $this->assertEquals(2, $this->conn->getRowCount('UserProfile'));
+        $this->assertEquals(2, self::getRowCount('UserProfile'));
 
         $this->expectException(ConstraintException::class);
 
@@ -201,7 +198,7 @@ class UserProfileRepositoryTest extends DatabaseTestCase
         $result = self::$repository->create($data);
 
         $this->assertEquals($data->getId(), $result);
-        $this->assertEquals(4, $this->conn->getRowCount('UserProfile'));
+        $this->assertEquals(4, self::getRowCount('UserProfile'));
 
         /** @var UserProfileData $resultData */
         $resultData = self::$repository->getById($result)->getData();

tests/SP/Repositories/UserRepositoryTest.php

@@ -64,14 +64,11 @@ class UserRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(UserRepository::class);
@@ -149,7 +146,7 @@ class UserRepositoryTest extends DatabaseTestCase
         $this->assertEquals('sysPass demo', $data->getName());
         $this->assertEquals('demo', $data->getLogin());
 
-        $result = self::$repository->getById(5);
+        $result = self::$repository->getById(10);
 
         $this->assertEquals(0, $result->getNumRows());
     }
@@ -212,7 +209,7 @@ class UserRepositoryTest extends DatabaseTestCase
      */
     public function testGetByIdBatch()
     {
-        $users = self::$repository->getByIdBatch([1, 2, 5]);
+        $users = self::$repository->getByIdBatch([1, 2, 10]);
 
         $this->assertCount(2, $users);
         $this->assertInstanceOf(UserData::class, $users[0]);
@@ -230,7 +227,7 @@ class UserRepositoryTest extends DatabaseTestCase
     {
         $users = self::$repository->getAll();
 
-        $this->assertCount(4, $users);
+        $this->assertCount(5, $users);
         $this->assertInstanceOf(UserData::class, $users[0]);
         $this->assertEquals('admin', $users[0]->getLogin());
     }
@@ -301,10 +298,10 @@ class UserRepositoryTest extends DatabaseTestCase
      */
     public function testDelete()
     {
-        $result = self::$repository->delete(3);
+        $result = self::$repository->delete(4);
 
         $this->assertEquals(1, $result);
-        $this->assertEquals(3, $this->conn->getRowCount('User'));
+        $this->assertEquals(4, self::getRowCount('User'));
 
         $this->expectException(ConstraintException::class);
 
@@ -321,11 +318,11 @@ class UserRepositoryTest extends DatabaseTestCase
     {
         $result = self::$repository->getBasicInfo();
 
-        $this->assertEquals(4, $result->getNumRows());
+        $this->assertEquals(5, $result->getNumRows());
 
         $data = $result->getDataAsArray();
 
-        $this->assertCount(4, $data);
+        $this->assertCount(5, $data);
         $this->assertInstanceOf(UserData::class, $data[0]);
     }
 
@@ -418,7 +415,7 @@ class UserRepositoryTest extends DatabaseTestCase
         $userData->setIsLdap(0);
         $userData->setPass(Hash::hashKey('prueba123'));
 
-        $this->assertEquals(5, self::$repository->create($userData));
+        $this->assertEquals(6, self::$repository->create($userData));
 
         $userData->setLogin('demo');
         $userData->setEmail('prueba@syspass.org');

tests/SP/Repositories/UserToUserGroupRepositoryTest.php

@@ -52,14 +52,11 @@ class UserToUserGroupRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_userGroup.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(UserToUserGroupRepository::class);
@@ -82,13 +79,12 @@ class UserToUserGroupRepositoryTest extends DatabaseTestCase
 
         $result = self::$repository->getGroupsForUser(2);
 
-        $this->assertEquals(2, $result->getNumRows());
+        $this->assertEquals(1, $result->getNumRows());
 
         $data = $result->getDataAsArray();
 
-        $this->assertCount(2, $data);
+        $this->assertCount(1, $data);
         $this->assertEquals(1, $data[0]->userGroupId);
-        $this->assertEquals(3, $data[1]->userGroupId);
 
         $this->assertEquals(0, self::$repository->getGroupsForUser(10)->getNumRows());
     }
@@ -146,12 +142,12 @@ class UserToUserGroupRepositoryTest extends DatabaseTestCase
         $this->assertEquals(2, $data[1]->getUserGroupId());
         $this->assertEquals(3, $data[1]->getUserId());
 
-        $data = self::$repository->getById(3)->getDataAsArray();
+        $data = self::$repository->getById(1)->getDataAsArray();
 
         $this->assertCount(1, $data);
 
         $this->assertInstanceOf(UserToUserGroupData::class, $data[0]);
-        $this->assertEquals(3, $data[0]->getUserGroupId());
+        $this->assertEquals(1, $data[0]->getUserGroupId());
         $this->assertEquals(2, $data[0]->getUserId());
 
         $this->assertEquals(0, self::$repository->getById(10)->getNumRows());

tests/SP/Services/Account/AccountAclServiceTest.php

@@ -89,14 +89,11 @@ class AccountAclServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_accountAcl.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         self::$context = $dic->get(ContextInterface::class);
 
@@ -437,14 +434,15 @@ class AccountAclServiceTest extends DatabaseTestCase
         $this->checkViewFiles($accountAclDto);
 
         $accountAclDto = $this->setUpAccountEnvironment(2, 2, 2);
+        $should = ['view' => true, 'edit' => false];
 
-        $this->checkView($accountAclDto);
-        $this->checkViewPass($accountAclDto);
-        $this->checkDelete($accountAclDto);
-        $this->checkEditPass($accountAclDto);
-        $this->checkEditAndRestore($accountAclDto);
-        $this->checkPermissions($accountAclDto);
-        $this->checkViewFiles($accountAclDto);
+        $this->checkView($accountAclDto, $should);
+        $this->checkViewPass($accountAclDto, $should);
+        $this->checkDelete($accountAclDto, $should);
+        $this->checkEditPass($accountAclDto, $should);
+        $this->checkEditAndRestore($accountAclDto, $should);
+        $this->checkPermissions($accountAclDto, $should);
+        $this->checkViewFiles($accountAclDto, $should);
 
         $accountAclDto = $this->setUpAccountEnvironment(2, 3, 3);
         $should = ['view' => true, 'edit' => false];

tests/SP/Services/Account/AccountCryptServiceTest.php

@@ -64,14 +64,11 @@ class AccountCryptServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_accountCrypt.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(AccountCryptService::class);

tests/SP/Services/Account/AccountFileServiceTest.php

@@ -58,14 +58,11 @@ class AccountFileServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_accountFile.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(AccountFileService::class);
@@ -123,7 +120,7 @@ class AccountFileServiceTest extends DatabaseTestCase
         $this->assertEquals($data->getContent(), $resultData->getContent());
         $this->assertEquals('no_thumb', $resultData->getThumb());
 
-        $this->assertEquals(5, $this->conn->getRowCount('AccountFile'));
+        $this->assertEquals(5, self::getRowCount('AccountFile'));
     }
 
     /**
@@ -314,7 +311,7 @@ class AccountFileServiceTest extends DatabaseTestCase
             ->delete(1)
             ->delete(3);
 
-        $this->assertEquals(1, $this->conn->getRowCount('AccountFile'));
+        $this->assertEquals(1, self::getRowCount('AccountFile'));
 
         $this->expectException(NoSuchItemException::class);
 
@@ -331,7 +328,7 @@ class AccountFileServiceTest extends DatabaseTestCase
         $this->assertEquals(2, self::$service->deleteByIdBatch([1, 3]));
         $this->assertEquals(0, self::$service->deleteByIdBatch([]));
 
-        $this->assertEquals(1, $this->conn->getRowCount('AccountFile'));
+        $this->assertEquals(1, self::getRowCount('AccountFile'));
 
         $this->expectException(ServiceException::class);
 

tests/SP/Services/Account/AccountHistoryServiceTest.php

@@ -60,14 +60,11 @@ class AccountHistoryServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_accountHistory.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(AccountHistoryService::class);
@@ -105,7 +102,7 @@ class AccountHistoryServiceTest extends DatabaseTestCase
         $result = self::$service->create(new AccountHistoryCreateDto(10, true, false, PasswordUtil::generateRandomBytes()));
         $this->assertEquals(0, $result);
 
-        $this->assertEquals(7, $this->conn->getRowCount('AccountHistory'));
+        $this->assertEquals(7, self::getRowCount('AccountHistory'));
     }
 
     /**
@@ -189,7 +186,7 @@ class AccountHistoryServiceTest extends DatabaseTestCase
 
         self::$service->delete(1);
 
-        $this->assertEquals(3, $this->conn->getRowCount('AccountHistory'));
+        $this->assertEquals(3, self::getRowCount('AccountHistory'));
     }
 
     /**
@@ -201,7 +198,7 @@ class AccountHistoryServiceTest extends DatabaseTestCase
         $this->assertEquals(3, self::$service->deleteByIdBatch([1, 3, 4, 5]));
         $this->assertEquals(0, self::$service->deleteByIdBatch([]));
 
-        $this->assertEquals(2, $this->conn->getRowCount('AccountHistory'));
+        $this->assertEquals(2, self::getRowCount('AccountHistory'));
     }
 
     /**
@@ -258,6 +255,6 @@ class AccountHistoryServiceTest extends DatabaseTestCase
 
         $this->assertEquals(0, self::$service->deleteByAccountIdBatch([]));
 
-        $this->assertEquals(1, $this->conn->getRowCount('AccountHistory'));
+        $this->assertEquals(1, self::getRowCount('AccountHistory'));
     }
 }

tests/SP/Services/Account/AccountSearchServiceTest.php

@@ -64,14 +64,11 @@ class AccountSearchServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_accountSearch.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(AccountSearchService::class);

tests/SP/Services/Account/AccountServiceTest.php

@@ -81,17 +81,14 @@ class AccountServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_account.xml';
+        self::$loadFixtures = true;
 
         self::$context = $dic->get(ContextInterface::class);
 
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
-
         // Inicializar el servicio
         self::$service = $dic->get(AccountService::class);
         self::$accountHistoryService = $dic->get(AccountHistoryService::class);
@@ -127,9 +124,11 @@ class AccountServiceTest extends DatabaseTestCase
         $accountRequest->userGroupsView = [2, 3];
         $accountRequest->userGroupsEdit = [2];
 
-        $this->assertEquals(3, self::$service->create($accountRequest));
+        $expectedId = 5;
 
-        $result = self::$service->getById(3);
+        $this->assertEquals($expectedId, self::$service->create($accountRequest));
+
+        $result = self::$service->getById($expectedId);
 
         self::$service->withTagsById($result);
         self::$service->withUsersById($result);
@@ -137,7 +136,7 @@ class AccountServiceTest extends DatabaseTestCase
 
         $data = $result->getAccountVData();
 
-        $this->assertEquals(3, $result->getId());
+        $this->assertEquals($expectedId, $result->getId());
         $this->assertEquals($accountRequest->name, $data->getName());
         $this->assertEquals($accountRequest->login, $data->getLogin());
         $this->assertEquals($accountRequest->url, $data->getUrl());
@@ -173,7 +172,7 @@ class AccountServiceTest extends DatabaseTestCase
         $this->assertEquals(3, $groups[1]->getId());
         $this->assertEquals(0, (int)$groups[1]->isEdit);
 
-        $data = self::$service->getPasswordForId(3);
+        $data = self::$service->getPasswordForId($expectedId);
 
         $this->assertEquals('1234abc', Crypt::decrypt($data->getPass(), $data->getKey(), self::SECURE_KEY_PASSWORD));
     }
@@ -184,13 +183,13 @@ class AccountServiceTest extends DatabaseTestCase
     public function testDelete()
     {
         // Comprobar registros iniciales
-        $this->assertEquals(2, $this->conn->getRowCount('Account'));
+        $this->assertEquals(4, self::getRowCount('Account'));
 
         // Eliminar registros y comprobar el total de registros
         self::$service->delete(1);
         self::$service->delete(2);
 
-        $this->assertEquals(0, $this->conn->getRowCount('Account'));
+        $this->assertEquals(2, self::getRowCount('Account'));
 
         $this->expectException(NoSuchItemException::class);
 
@@ -227,7 +226,7 @@ class AccountServiceTest extends DatabaseTestCase
      */
     public function testGetTotalNumAccounts()
     {
-        $this->assertEquals(7, self::$service->getTotalNumAccounts());
+        $this->assertEquals(9, self::$service->getTotalNumAccounts());
     }
 
     /**
@@ -260,7 +259,7 @@ class AccountServiceTest extends DatabaseTestCase
      */
     public function testGetAccountsPassData()
     {
-        $this->assertCount(2, self::$service->getAccountsPassData());
+        $this->assertCount(4, self::$service->getAccountsPassData());
     }
 
     /**
@@ -275,7 +274,7 @@ class AccountServiceTest extends DatabaseTestCase
         self::$service->editRestore(1, 1);
         self::$service->editRestore(3, 10);
 
-        $this->assertEquals(6, $this->conn->getRowCount('AccountHistory'));
+        $this->assertEquals(6, self::getRowCount('AccountHistory'));
     }
 
     /**
@@ -618,7 +617,7 @@ class AccountServiceTest extends DatabaseTestCase
     public function testUpdateNotFound()
     {
         $accountRequest = new AccountRequest();
-        $accountRequest->id = 3;
+        $accountRequest->id = 10;
 
         $this->expectException(NoSuchItemException::class);
 
@@ -654,12 +653,12 @@ class AccountServiceTest extends DatabaseTestCase
     public function testDeleteByIdBatch()
     {
         // Comprobar registros iniciales
-        $this->assertEquals(2, $this->conn->getRowCount('Account'));
+        $this->assertEquals(4, self::getRowCount('Account'));
 
         self::$service->deleteByIdBatch([1, 2, 100]);
 
         // Comprobar registros tras eliminación
-        $this->assertEquals(0, $this->conn->getRowCount('Account'));
+        $this->assertEquals(2, self::getRowCount('Account'));
 
         $this->expectException(ServiceException::class);
 
@@ -732,7 +731,7 @@ class AccountServiceTest extends DatabaseTestCase
         /** @var AccountSearchVData[] $result */
         $result = self::$service->getByFilter($searchFilter)->getDataAsArray();
 
-        $this->assertCount(0, $result);
+        $this->assertCount(1, $result);
 
         // Comprobar las etiquetas
         $searchFilter->reset();
@@ -742,8 +741,8 @@ class AccountServiceTest extends DatabaseTestCase
         /** @var AccountSearchVData[] $result */
         $result = self::$service->getByFilter($searchFilter)->getDataAsArray();
 
-        $this->assertCount(1, $result);
-        $this->assertEquals(1, $result[0]->getId());
+        $this->assertCount(2, $result);
+        $this->assertEquals(2, $result[0]->getId());
     }
 
     /**
@@ -847,11 +846,15 @@ class AccountServiceTest extends DatabaseTestCase
     {
         $data = self::$service->getAllBasic();
 
-        $this->assertCount(2, $data);
+        $this->assertCount(4, $data);
         $this->assertInstanceOf(AccountData::class, $data[0]);
         $this->assertEquals(1, $data[0]->getId());
         $this->assertInstanceOf(AccountData::class, $data[1]);
         $this->assertEquals(2, $data[1]->getId());
+        $this->assertInstanceOf(AccountData::class, $data[2]);
+        $this->assertEquals(3, $data[2]->getId());
+        $this->assertInstanceOf(AccountData::class, $data[3]);
+        $this->assertEquals(4, $data[3]->getId());
     }
 
     /**
@@ -861,9 +864,11 @@ class AccountServiceTest extends DatabaseTestCase
     {
         $data = self::$accountHistoryService->getById(7);
 
-        $this->assertEquals(3, self::$service->createFromHistory($data));
+        $expectedId = 5;
 
-        $result = self::$service->getById(3);
+        $this->assertEquals($expectedId, self::$service->createFromHistory($data));
+
+        $result = self::$service->getById($expectedId);
         $resultData = $result->getAccountVData();
 
         $this->assertEquals($data->getName(), $resultData->getName());
@@ -879,7 +884,7 @@ class AccountServiceTest extends DatabaseTestCase
         $this->assertEquals($data->getIsPrivate(), $resultData->getIsPrivate());
         $this->assertEquals($data->getIsPrivateGroup(), $resultData->getIsPrivateGroup());
 
-        $resultData = self::$service->getPasswordForId(3);
+        $resultData = self::$service->getPasswordForId($expectedId);
 
         $this->assertEquals($data->getPass(), $resultData->getPass());
         $this->assertEquals($data->getKey(), $resultData->getKey());

tests/SP/Services/Account/AccountToFavoriteServiceTest.php

@@ -51,14 +51,11 @@ class AccountToFavoriteServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_accountFavorite.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(AccountToFavoriteService::class);

tests/SP/Services/Account/AccountToTagServiceTest.php

@@ -51,14 +51,11 @@ class AccountToTagServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(AccountToTagService::class);
@@ -70,7 +67,7 @@ class AccountToTagServiceTest extends DatabaseTestCase
      */
     public function testGetTagsByAccountId()
     {
-        $this->assertCount(1, self::$service->getTagsByAccountId(1));
+        $this->assertCount(2, self::$service->getTagsByAccountId(1));
         $this->assertCount(0, self::$service->getTagsByAccountId(10));
     }
 }

tests/SP/Services/Api/ApiServiceTest.php

@@ -63,14 +63,11 @@ class ApiServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_authToken.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(ApiService::class);

tests/SP/Services/AuthToken/AuthTokenServiceTest.php

@@ -68,14 +68,11 @@ class AuthTokenServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_authToken.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(AuthTokenService::class);
@@ -94,7 +91,7 @@ class AuthTokenServiceTest extends DatabaseTestCase
 
         self::$service->delete(10);
 
-        $this->assertEquals(4, $this->conn->getRowCount('AuthToken'));
+        $this->assertEquals(4, self::getRowCount('AuthToken'));
     }
 
     /**
@@ -112,7 +109,7 @@ class AuthTokenServiceTest extends DatabaseTestCase
 
         self::$service->deleteByIdBatch([3, 10]);
 
-        $this->assertEquals(2, $this->conn->getRowCount('AuthToken'));
+        $this->assertEquals(2, self::getRowCount('AuthToken'));
 
     }
 
@@ -284,7 +281,7 @@ class AuthTokenServiceTest extends DatabaseTestCase
         $authTokenData->setUserId(2);
 
         $this->assertEquals(6, self::$service->create($authTokenData));
-        $this->assertEquals(6, $this->conn->getRowCount('AuthToken'));
+        $this->assertEquals(6, self::getRowCount('AuthToken'));
 
         $data = self::$service->getTokenByToken(ActionsInterface::ACCOUNT_CREATE, $authTokenData->getToken());
 

tests/SP/Services/Backup/FileBackupServiceTest.php

@@ -49,9 +49,9 @@ class FileBackupServiceTest extends TestCase
     {
         $dic = setupContext();
         $service = $dic->get(FileBackupService::class);
-        $service->doBackup(RESOURCE_DIR);
+        $service->doBackup(TMP_PATH);
 
-        $this->assertFileExists(FileBackupService::getAppBackupFilename(RESOURCE_DIR, $service->getHash(), true));
-        $this->assertFileExists(FileBackupService::getDbBackupFilename(RESOURCE_DIR, $service->getHash(), true));
+        $this->assertFileExists(FileBackupService::getAppBackupFilename(TMP_PATH, $service->getHash(), true));
+        $this->assertFileExists(FileBackupService::getDbBackupFilename(TMP_PATH, $service->getHash(), true));
     }
 }

tests/SP/Services/Category/CategoryServiceTest.php

@@ -58,14 +58,11 @@ class CategoryServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$service = $dic->get(CategoryService::class);
@@ -131,7 +128,7 @@ class CategoryServiceTest extends DatabaseTestCase
      */
     public function testGetAllBasic()
     {
-        $count = $this->conn->getRowCount('Category');
+        $count = self::getRowCount('Category');
 
         $data = self::$service->getAllBasic();
 
@@ -154,11 +151,11 @@ class CategoryServiceTest extends DatabaseTestCase
      */
     public function testDeleteByIdBatch()
     {
-        $countBefore = $this->conn->getRowCount('Category');
+        $countBefore = self::getRowCount('Category');
 
         $this->assertEquals(1, self::$service->deleteByIdBatch([3]));
 
-        $countAfter = $this->conn->getRowCount('Category');
+        $countAfter = self::getRowCount('Category');
 
         $this->assertEquals($countBefore - 1, $countAfter);
 
@@ -177,7 +174,7 @@ class CategoryServiceTest extends DatabaseTestCase
      */
     public function testCreate()
     {
-        $countBefore = $this->conn->getRowCount('Category');
+        $countBefore = self::getRowCount('Category');
 
         $data = new CategoryData();
         $data->name = 'Categoría prueba';
@@ -191,7 +188,7 @@ class CategoryServiceTest extends DatabaseTestCase
         $this->assertEquals($data->name, $result->getName());
         $this->assertEquals($data->description, $result->getDescription());
 
-        $countAfter = $this->conn->getRowCount('Category');
+        $countAfter = self::getRowCount('Category');
 
         $this->assertEquals($countBefore + 1, $countAfter);
 
@@ -259,11 +256,11 @@ class CategoryServiceTest extends DatabaseTestCase
      */
     public function testDelete()
     {
-        $countBefore = $this->conn->getRowCount('Category');
+        $countBefore = self::getRowCount('Category');
 
         self::$service->delete(3);
 
-        $countAfter = $this->conn->getRowCount('Category');
+        $countAfter = self::getRowCount('Category');
 
         $this->assertEquals($countBefore - 1, $countAfter);
 

tests/SP/Services/Client/ClientServiceTest.php

@@ -64,14 +64,11 @@ class ClientServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(ClientService::class);
@@ -118,20 +115,23 @@ class ClientServiceTest extends DatabaseTestCase
      */
     public function testGetAllBasic()
     {
-        $count = $this->conn->getRowCount('Client');
+        $count = self::getRowCount('Client');
 
         $results = self::$service->getAllBasic();
 
         $this->assertCount($count, $results);
 
         $this->assertInstanceOf(ClientData::class, $results[0]);
-        $this->assertEquals('Apple', $results[0]->getName());
+        $this->assertEquals('Amazon', $results[0]->getName());
 
         $this->assertInstanceOf(ClientData::class, $results[1]);
-        $this->assertEquals('Google', $results[1]->getName());
+        $this->assertEquals('Apple', $results[1]->getName());
 
         $this->assertInstanceOf(ClientData::class, $results[2]);
-        $this->assertEquals('Microsoft', $results[2]->getName());
+        $this->assertEquals('Google', $results[2]->getName());
+
+        $this->assertInstanceOf(ClientData::class, $results[3]);
+        $this->assertEquals('Microsoft', $results[3]->getName());
     }
 
     /**
@@ -162,7 +162,7 @@ class ClientServiceTest extends DatabaseTestCase
      */
     public function testGetAllForUserAdmin()
     {
-        $this->assertCount(3, self::$service->getAllForUser());
+        $this->assertCount(4, self::$service->getAllForUser());
     }
 
     /**
@@ -176,7 +176,7 @@ class ClientServiceTest extends DatabaseTestCase
 
         self::$setupUser->call($this, $userData);
 
-        $this->assertCount(1, self::$service->getAllForUser());
+        $this->assertCount(2, self::$service->getAllForUser());
     }
 
     /**
@@ -200,9 +200,9 @@ class ClientServiceTest extends DatabaseTestCase
         $this->assertEquals($data->name, $result->getName());
         $this->assertEquals($data->isGlobal, $result->getIsGlobal());
 
-        $countAfter = $this->conn->getRowCount('Client');
+        $countAfter = self::getRowCount('Client');
 
-        $this->assertEquals(4, $countAfter);
+        $this->assertEquals(5, $countAfter);
 
         $this->expectException(DuplicatedItemException::class);
 
@@ -216,11 +216,11 @@ class ClientServiceTest extends DatabaseTestCase
      */
     public function testDeleteByIdBatch()
     {
-        $countBefore = $this->conn->getRowCount('Client');
+        $countBefore = self::getRowCount('Client');
 
-        self::$service->deleteByIdBatch([3]);
+        self::$service->deleteByIdBatch([4]);
 
-        $countAfter = $this->conn->getRowCount('Client');
+        $countAfter = self::getRowCount('Client');
 
         $this->assertEquals($countBefore - 1, $countAfter);
 
@@ -259,7 +259,7 @@ class ClientServiceTest extends DatabaseTestCase
 
         $this->expectException(NoSuchItemException::class);
 
-        self::$service->getByName('Amazon');
+        self::$service->getByName('Spotify');
     }
 
     /**
@@ -267,11 +267,11 @@ class ClientServiceTest extends DatabaseTestCase
      */
     public function testDelete()
     {
-        $countBefore = $this->conn->getRowCount('Client');
+        $countBefore = self::getRowCount('Client');
 
-        self::$service->delete(3);
+        self::$service->delete(4);
 
-        $countAfter = $this->conn->getRowCount('Client');
+        $countAfter = self::getRowCount('Client');
 
         $this->assertEquals($countBefore - 1, $countAfter);
 

tests/SP/Services/Config/ConfigBackupServiceTest.php

@@ -47,7 +47,7 @@ class ConfigBackupServiceTest extends TestCase
 {
     protected static $currentConfig;
 
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         self::$currentConfig = getResource('config', 'config.xml');
     }
@@ -55,7 +55,7 @@ class ConfigBackupServiceTest extends TestCase
     /**
      * This method is called after the last test of this test class is run.
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
         saveResource('config', 'config.xml', self::$currentConfig);
         recreateDir(CACHE_PATH);

tests/SP/Services/Config/ConfigServiceTest.php

@@ -55,14 +55,11 @@ class ConfigServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_config.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$service = $dic->get(ConfigService::class);
@@ -77,7 +74,7 @@ class ConfigServiceTest extends DatabaseTestCase
     {
         $data = self::$service->getAll();
 
-        $this->assertCount($this->conn->getRowCount('Config'), $data);
+        $this->assertCount(self::getRowCount('Config'), $data);
 
         $this->assertEquals('config_backup', $data[0]->parameter);
         $this->assertEquals('789ca558db6edb3810edb718c5be6c6b88ba4b45814de3a497a48d374e832cb0404191944d589654916a9216f9f71d5292633ba1a4621f628bf11cce68e6cc85bc886d2b9e2ce6ff1e1779ca97edd70c4b3c89c328fe2562c78e272f9e13785197cb0a5376c6ee276f440cdba82f273089d3625ddff2353fc97192313a79c3634b019c21c0d72afb2d0520ff0e0bb68b7107318255bf059863217601d110e00bde305162b2675768426514973396e23a93efaba22e95b710205c6b04625e1529cf588731bf4c591577f7a3e3a1a517acfab1ef2ad42b3f2f2aa9b60eadd01a963e0cc3c0de0731307ab3ac938ce76bf119df5d73762b94414e2f977610577ca35de95bd628c88e3ffbbd8f0929ea5c1eab0fada0d7fbadf439a818de9aac18597f2d29964c6c03db2f9d1792931d6963da13fdf8018bd5a42524b6701a440125a1635386b01721124436b27c9fb1d0775ddb4d9dc8f394bc6d0c124d3e14422a1904968a7b4816215ed3e435653f74788dd4a7c9a2206b2677b8d0a74665a29209b65a86101dd1901f4f2e681cf0facbf787e4e5d9fd59fc6b08db515a6145f9cd4b506061d7717c8cc9a0de36791cc752e4b0cda58f25f5724445659be230dd8dea550911475956dc327a7227c101384661fcabc5c593f9ec74cbc478f269fe5eadec66f5fee3e936c940f28bfecd6d5617b32bb5f2bad5624bfe7832bb3856ab40314baf6e74f1687ebc39d7a251bb5a9c6bf5ad35d78b995eb6e65cdd6825a8b5e77871ad97ad41ef8ecef4b2b5e87236d7cbd6a4b3937ff4b2b5e9f8b2d92a68f57e06bd0f633db7e03f9b426cd96e6f126ad0e8dab1cc8a04670b862bb2da86d2582d792e24ce7637ee6d235df7b481b294bc55ac41afe021ad18e325568f45b5ecef937a1f9ed38efe1e70b7e6f42da61b9ebf22f9db1a7e10eaa12d6ce2d5ff55d56529b4e205231593c87634d2eb43ce9feb3bc60c5288830cb28dad5f091f51311c1f25d8b6f9471b8c0558493fb6611b76054f4db5eba6addfa6a39ca6de1a4b598dd35a2c0fd9697e1f90fdc1f2a666d85dc900064054a0254dbb1d2030ca8e69934fc6eab6c13c3baae58a8d9d5414e0d05823e395f069556cba220d2d53fed53686ad1f7bd1dbf600cefbe3d3cbdbb5fc13fdbd621723906d81b755e5718dfe54a297ec7b0d9689c3fa6d8cb002411ed41597f7a322dc003a5e2957a8ff4c7fcb15bbddee5947fafdef4878c93be2a08e38cf6ff630f42e8f14dceeb44fb83efee412d8961336ec6765d16d51d105cef404e28383528a2c2f24d84a129c467e40ad10852ea3b6cd984d42eaf98107bf92089e228252db09e02f85f19da6fd6eaa9880095f1c89635ced9416a3bc6042f02257436c51cba6253683ac318e824b768e731d2f7030cbfb4771257eb562cd4c851cc51ac92a8eb3d74956b3fe02dccc92d7d009c0c62e851ccb9aa2d0f21c64a181131f7c24d0ac86363006fab9f3a891534af894677264ab684e894b56ef1f5f8dbe50f24d433f400c4ce2f0d84c18f0be8ee7f8be1a795c23a83ba67cdc806d8745d2f8320926ebbafcb6da99fa49845c3b0ac324a211c28e2274e83861905a5ee49000239be1d4c376bf97d85d0935707f633742294e08248b150528f1121b411e3976e0fbd8713d0b0784fa76d2dfe05652964f8aa5d1f95059f61b9cd55b901bf14b68b9928d2ec80de8e901da18aa06d0f5084f4fabe60b80768e52cde8aad0d11d6e940d8316b8b508dca3e7b3fe12c47252dd9772d15496edcdc4d039f7b4ce323de41c1138678a2de78c633486960fa32827072c758df5608b8069a1382f963c3f24f8307456a8ea3feac24988e2b93b1af35dd023e0e08ac69caeadf34eee4a5e3d4957a3a23d547781812cc70f2d28fe0fff0152be6bea', $data[0]->value);

tests/SP/Services/Crypt/MasterPassServiceTest.php

@@ -68,14 +68,11 @@ class MasterPassServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_accountCrypt.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$service = $dic->get(MasterPassService::class);

tests/SP/Services/Crypt/TemporaryMasterPassServiceTest.php

@@ -56,7 +56,7 @@ class TemporaryMasterPassServiceTest extends TestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public function setUp()
+    public function setUp(): void
     {
         $dic = setupContext();
 

tests/SP/Services/CustomField/CustomFieldCryptServiceTest.php

@@ -61,14 +61,11 @@ class CustomFieldCryptServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_accountCrypt.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$service = $dic->get(CustomFieldCryptService::class);

tests/SP/Services/CustomField/CustomFieldDefServiceTest.php

@@ -56,14 +56,11 @@ class CustomFieldDefServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_customField.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$service = $dic->get(CustomFieldDefService::class);
@@ -84,8 +81,8 @@ class CustomFieldDefServiceTest extends DatabaseTestCase
 
         self::$service->delete(1);
 
-        $this->assertEquals(2, $this->conn->getRowCount('CustomFieldDefinition'));
-        $this->assertEquals(3, $this->conn->getRowCount('CustomFieldData'));
+        $this->assertEquals(2, self::getRowCount('CustomFieldDefinition'));
+        $this->assertEquals(3, self::getRowCount('CustomFieldData'));
     }
 
     /**
@@ -139,8 +136,8 @@ class CustomFieldDefServiceTest extends DatabaseTestCase
 
         self::$service->deleteByIdBatch([1, 2]);
 
-        $this->assertEquals(2, $this->conn->getRowCount('CustomFieldDefinition'));
-        $this->assertEquals(3, $this->conn->getRowCount('CustomFieldData'));
+        $this->assertEquals(2, self::getRowCount('CustomFieldDefinition'));
+        $this->assertEquals(3, self::getRowCount('CustomFieldData'));
     }
 
     /**
@@ -162,7 +159,7 @@ class CustomFieldDefServiceTest extends DatabaseTestCase
 
         $this->assertEquals(4, self::$service->create($data));
 
-        $this->assertEquals(4, $this->conn->getRowCount('CustomFieldDefinition'));
+        $this->assertEquals(4, self::getRowCount('CustomFieldDefinition'));
 
         $this->assertEquals($data, self::$service->getById(4));
 
@@ -216,7 +213,7 @@ class CustomFieldDefServiceTest extends DatabaseTestCase
 
         $this->assertEquals($data, $dataUpdated);
 
-        $this->assertEquals(1, $this->conn->getRowCount('CustomFieldData'));
+        $this->assertEquals(1, self::getRowCount('CustomFieldData'));
 
         $data->setTypeId(100);
 

tests/SP/Services/CustomField/CustomFieldServiceTest.php

@@ -59,14 +59,11 @@ class CustomFieldServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_customField.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$service = $dic->get(CustomFieldService::class);
@@ -80,7 +77,7 @@ class CustomFieldServiceTest extends DatabaseTestCase
     {
         $this->assertEquals(3, self::$service->deleteCustomFieldDefinitionDataBatch([1, 2, 3]));
 
-        $this->assertEquals(0, $this->conn->getRowCount('CustomFieldData'));
+        $this->assertEquals(0, self::getRowCount('CustomFieldData'));
 
         $this->assertEquals(0, self::$service->deleteCustomFieldDefinitionDataBatch([]));
     }
@@ -132,7 +129,7 @@ class CustomFieldServiceTest extends DatabaseTestCase
 
         $this->assertEquals(1, self::$service->deleteCustomFieldDataBatch([1, 2, 3], ActionsInterface::CATEGORY));
 
-        $this->assertEquals(0, $this->conn->getRowCount('CustomFieldData'));
+        $this->assertEquals(0, self::getRowCount('CustomFieldData'));
 
         $this->assertEquals(0, self::$service->deleteCustomFieldDataBatch([], ActionsInterface::CATEGORY));
 
@@ -189,7 +186,7 @@ class CustomFieldServiceTest extends DatabaseTestCase
 
         $this->assertEquals(true, self::$service->updateOrCreateData($data));
 
-        $this->assertEquals(5, $this->conn->getRowCount('CustomFieldData'));
+        $this->assertEquals(5, self::getRowCount('CustomFieldData'));
     }
 
     /**
@@ -310,7 +307,7 @@ class CustomFieldServiceTest extends DatabaseTestCase
         $this->assertEquals(1, self::$service->deleteCustomFieldData(2, ActionsInterface::ACCOUNT));
         $this->assertEquals(1, self::$service->deleteCustomFieldData(1, ActionsInterface::CATEGORY));
 
-        $this->assertEquals(0, $this->conn->getRowCount('CustomFieldData'));
+        $this->assertEquals(0, self::getRowCount('CustomFieldData'));
 
         $this->assertEquals(0, self::$service->deleteCustomFieldData(2, ActionsInterface::ACCOUNT));
 
@@ -329,7 +326,7 @@ class CustomFieldServiceTest extends DatabaseTestCase
         $this->assertEquals(1, self::$service->deleteCustomFieldDefinitionData(2));
         $this->assertEquals(0, self::$service->deleteCustomFieldDefinitionData(3));
 
-        $this->assertEquals(0, $this->conn->getRowCount('CustomFieldData'));
+        $this->assertEquals(0, self::getRowCount('CustomFieldData'));
     }
 
     /**
@@ -400,6 +397,6 @@ class CustomFieldServiceTest extends DatabaseTestCase
 
         self::$service->create($data);
 
-        $this->assertEquals(4, $this->conn->getRowCount('CustomFieldData'));
+        $this->assertEquals(4, self::getRowCount('CustomFieldData'));
     }
 }

tests/SP/Services/Eventlog/EventlogServiceTest.php

@@ -55,14 +55,11 @@ class EventlogServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_eventlog.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(EventlogService::class);
@@ -77,7 +74,7 @@ class EventlogServiceTest extends DatabaseTestCase
     {
         self::$service->clear();
 
-        $this->assertEquals(0, $this->conn->getRowCount('EventLog'));
+        $this->assertEquals(0, self::getRowCount('EventLog'));
     }
 
     /**
@@ -138,11 +135,11 @@ class EventlogServiceTest extends DatabaseTestCase
         $eventlogData->setIpAddress('127.0.0.1');
         $eventlogData->setDescription('Prueba');
 
-        $countBefore = $this->conn->getRowCount('EventLog');
+        $countBefore = self::getRowCount('EventLog');
 
         self::$service->create($eventlogData);
 
-        $countAfter = $this->conn->getRowCount('EventLog');
+        $countAfter = self::getRowCount('EventLog');
 
         $this->assertEquals($countBefore + 1, $countAfter);
 

tests/SP/Services/Export/XmlExportServiceTest.php

@@ -59,16 +59,14 @@ class XmlExportServiceTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         array_map('unlink', glob(TMP_PATH . DIRECTORY_SEPARATOR . '*.xml'));
 
         $dic = setupContext();
 
-        self::$dataset = 'syspass_import.xml';
+        self::$loadFixtures = true;
 
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
         self::$xmlExportService = $dic->get(XmlExportService::class);
         self::$xmlVerifyService = $dic->get(XmlVerifyService::class);
     }
@@ -115,9 +113,9 @@ class XmlExportServiceTest extends DatabaseTestCase
         $this->assertArrayHasKey('Category', $nodes);
         $this->assertArrayHasKey('Client', $nodes);
         $this->assertArrayHasKey('Tag', $nodes);
-        $this->assertEquals(2, $nodes['Account']);
+        $this->assertEquals(4, $nodes['Account']);
         $this->assertEquals(3, $nodes['Category']);
-        $this->assertEquals(3, $nodes['Client']);
+        $this->assertEquals(4, $nodes['Client']);
         $this->assertEquals(3, $nodes['Tag']);
     }
 

tests/SP/Services/Export/XmlVerifyServiceTest.php

@@ -53,7 +53,7 @@ class XmlVerifyServiceTest extends TestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 

tests/SP/Services/Import/CsvImportTest.php

@@ -40,7 +40,6 @@ use SP\Services\Import\CsvImport;
 use SP\Services\Import\FileImport;
 use SP\Services\Import\ImportException;
 use SP\Services\Import\ImportParams;
-use SP\Storage\Database\DatabaseConnectionData;
 use SP\Storage\File\FileException;
 use SP\Tests\DatabaseTestCase;
 use function SP\Tests\setupContext;
@@ -58,18 +57,13 @@ class CsvImportTest extends DatabaseTestCase
     protected static $dic;
 
     /**
-     * @throws NotFoundException
      * @throws ContextException
-     * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         self::$dic = setupContext();
 
-        self::$dataset = 'syspass_import.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = self::$dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
     }
 
     /**
@@ -110,19 +104,20 @@ class CsvImportTest extends DatabaseTestCase
     {
         // Checkout categories
         $this->assertEquals('CSV Category 1', self::$dic->get(CategoryService::class)->getByName('CSV Category 1')->getName());
-        $this->assertEquals(4, $this->conn->getRowCount('Category'));
+        $this->assertEquals(4, self::getRowCount('Category'));
 
         // Checkout clients
         $this->assertEquals('CSV Client 1', self::$dic->get(ClientService::class)->getByName('CSV Client 1')->getName());
-        $this->assertEquals(4, $this->conn->getRowCount('Client'));
+        $this->assertEquals(5, self::getRowCount('Client'));
 
         // Checkout accounts
         $accountService = self::$dic->get(AccountService::class);
 
         // 1st account
-        $data = $accountService->getById(3)->getAccountVData();
+        $expectedId = 5;
+        $data = $accountService->getById($expectedId)->getAccountVData();
 
-        $this->assertEquals(3, $data->getId());
+        $this->assertEquals($expectedId, $data->getId());
         $this->assertEquals('Test CSV 1', $data->getName());
         $this->assertEquals('CSV Client 1', $data->getClientName());
         $this->assertEquals('CSV Category 1', $data->getCategoryName());
@@ -135,10 +130,10 @@ class CsvImportTest extends DatabaseTestCase
         $this->assertEquals('csv_pass1', Crypt::decrypt($pass->getPass(), $pass->getKey(), '12345678900'));
 
         // 2nd account
+        $expectedId = 6;
+        $data = $accountService->getById($expectedId)->getAccountVData();
 
-        $data = $accountService->getById(4)->getAccountVData();
-
-        $this->assertEquals(4, $data->getId());
+        $this->assertEquals($expectedId, $data->getId());
         $this->assertEquals('Test CSV 2', $data->getName());
         $this->assertEquals('Google', $data->getClientName());
         $this->assertEquals('Linux', $data->getCategoryName());
@@ -151,9 +146,10 @@ class CsvImportTest extends DatabaseTestCase
         $this->assertEquals('csv_pass2', Crypt::decrypt($pass->getPass(), $pass->getKey(), '12345678900'));
 
         // 3rd account
-        $data = $accountService->getById(5)->getAccountVData();
+        $expectedId = 7;
+        $data = $accountService->getById($expectedId)->getAccountVData();
 
-        $this->assertEquals(5, $data->getId());
+        $this->assertEquals($expectedId, $data->getId());
         $this->assertEquals('Test CSV 3', $data->getName());
         $this->assertEquals('Apple', $data->getClientName());
         $this->assertEquals('SSH', $data->getCategoryName());
@@ -165,7 +161,7 @@ class CsvImportTest extends DatabaseTestCase
 
         $this->assertEquals('csv_pass3', Crypt::decrypt($pass->getPass(), $pass->getKey(), '12345678900'));
 
-        $this->assertEquals(6, $this->conn->getRowCount('Account'));
+        $this->assertEquals(8, self::getRowCount('Account'));
     }
 
     /**

tests/SP/Services/Import/KeepassImportTest.php

@@ -62,18 +62,13 @@ class KeepassImportTest extends DatabaseTestCase
     protected static $dic;
 
     /**
-     * @throws NotFoundException
      * @throws ContextException
-     * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         self::$dic = setupContext();
 
-        self::$dataset = 'syspass_import.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = self::$dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
     }
 
     /**
@@ -120,14 +115,14 @@ class KeepassImportTest extends DatabaseTestCase
         $this->assertEquals('Servers', $categoryService->getByName('Servers')->getName());
         $this->assertEquals('General', $categoryService->getByName('General')->getName());
 
-        $this->assertEquals(11, $this->conn->getRowCount('Category'));
+        $this->assertEquals(11, self::getRowCount('Category'));
 
         // Checkout clients
         $client = self::$dic->get(ClientService::class)->getByName('KeePass');
 
         $this->assertEquals('KeePass', $client->getName());
 
-        $this->assertEquals(4, $this->conn->getRowCount('Client'));
+        $this->assertEquals(5, self::getRowCount('Client'));
 
         // Checkout accounts
         $accountService = self::$dic->get(AccountService::class);
@@ -141,7 +136,7 @@ class KeepassImportTest extends DatabaseTestCase
 
         $this->assertCount(5, $data);
 
-        $this->assertEquals(3, $data[0]->getId());
+        $this->assertEquals(5, $data[0]->getId());
         $this->assertEquals(1, $data[0]->getUserId());
         $this->assertEquals(2, $data[0]->getUserGroupId());
         $this->assertEquals('DC1', $data[0]->getName());
@@ -157,7 +152,7 @@ class KeepassImportTest extends DatabaseTestCase
 
         // 2nd account
 
-        $this->assertEquals(4, $data[1]->getId());
+        $this->assertEquals(6, $data[1]->getId());
         $this->assertEquals(1, $data[1]->getUserId());
         $this->assertEquals(2, $data[1]->getUserGroupId());
         $this->assertEquals('debian', $data[1]->getName());
@@ -172,7 +167,7 @@ class KeepassImportTest extends DatabaseTestCase
         $this->assertEquals('TKr321zqCZhgbzmmAX13', Crypt::decrypt($pass->getPass(), $pass->getKey(), '12345678900'));
 
         // 3rd account
-        $this->assertEquals(5, $data[2]->getId());
+        $this->assertEquals(7, $data[2]->getId());
         $this->assertEquals(1, $data[2]->getUserId());
         $this->assertEquals(2, $data[2]->getUserGroupId());
         $this->assertEquals('proxy', $data[2]->getName());
@@ -186,18 +181,18 @@ class KeepassImportTest extends DatabaseTestCase
 
         $this->assertEquals('TKr321zqCZhgbzmmAX13', Crypt::decrypt($pass->getPass(), $pass->getKey(), '12345678900'));
 
-        $this->assertEquals(6, $data[3]->getId());
+        $this->assertEquals(8, $data[3]->getId());
         $this->assertEquals(1, $data[3]->getUserId());
         $this->assertEquals(2, $data[3]->getUserGroupId());
         $this->assertEquals('Sample Entry', $data[3]->getName());
         $this->assertEquals('NewDatabase', $data[3]->getCategoryName());
 
-        $this->assertEquals(7, $data[4]->getId());
+        $this->assertEquals(9, $data[4]->getId());
         $this->assertEquals(1, $data[4]->getUserId());
         $this->assertEquals(2, $data[4]->getUserGroupId());
         $this->assertEquals('Sample Entry #2', $data[4]->getName());
         $this->assertEquals('NewDatabase', $data[4]->getCategoryName());
 
-        $this->assertEquals(7, $this->conn->getRowCount('Account'));
+        $this->assertEquals(9, self::getRowCount('Account'));
     }
 }

tests/SP/Services/Import/SyspassImportTest.php

@@ -59,18 +59,13 @@ class SyspassImportTest extends DatabaseTestCase
     protected static $dic;
 
     /**
-     * @throws NotFoundException
      * @throws ContextException
-     * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         self::$dic = setupContext();
 
-        self::$dataset = 'syspass_import.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = self::$dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
     }
 
     /**
@@ -110,21 +105,22 @@ class SyspassImportTest extends DatabaseTestCase
         // Checkout categories
         $this->assertEquals('CSV Category 1', self::$dic->get(CategoryService::class)->getByName('CSV Category 1')->getName());
 
-        $this->assertEquals(5, $this->conn->getRowCount('Category'));
+        $this->assertEquals(5, self::getRowCount('Category'));
 
         // Checkout clients
         $this->assertEquals('CSV Client 1', self::$dic->get(ClientService::class)->getByName('CSV Client 1')->getName());
 
-        $this->assertEquals(5, $this->conn->getRowCount('Client'));
+        $this->assertEquals(6, self::getRowCount('Client'));
 
         // Checkout accounts
         $accountService = self::$dic->get(AccountService::class);
 
         // 1st account
-        $result = $accountService->getById(3);
+        $expectedId = 5;
+        $result = $accountService->getById($expectedId);
         $data = $result->getAccountVData();
 
-        $this->assertEquals(3, $data->getId());
+        $this->assertEquals($expectedId, $data->getId());
         $this->assertEquals(1, $data->getUserId());
         $this->assertEquals(2, $data->getUserGroupId());
         $this->assertEquals('Google', $data->getName());
@@ -148,11 +144,12 @@ class SyspassImportTest extends DatabaseTestCase
 
         $this->assertEquals('-{?^··\mjC<c', Crypt::decrypt($pass->getPass(), $pass->getKey(), '12345678900'));
 
-        // 1st account
-        $result = $accountService->getById(4);
+        // 2nd account
+        $expectedId = 6;
+        $result = $accountService->getById($expectedId);
         $data = $result->getAccountVData();
 
-        $this->assertEquals(4, $data->getId());
+        $this->assertEquals($expectedId, $data->getId());
         $this->assertEquals(1, $data->getUserId());
         $this->assertEquals(2, $data->getUserGroupId());
         $this->assertEquals('Google', $data->getName());
@@ -176,11 +173,12 @@ class SyspassImportTest extends DatabaseTestCase
 
         $this->assertEquals('\'ynHRMJy-fRa', Crypt::decrypt($pass->getPass(), $pass->getKey(), '12345678900'));
 
-        // 1st account
-        $result = $accountService->getById(5);
+        // 3rd account
+        $expectedId = 7;
+        $result = $accountService->getById($expectedId);
         $data = $result->getAccountVData();
 
-        $this->assertEquals(5, $data->getId());
+        $this->assertEquals($expectedId, $data->getId());
         $this->assertEquals(1, $data->getUserId());
         $this->assertEquals(2, $data->getUserGroupId());
         $this->assertEquals('Test CSV 1', $data->getName());
@@ -194,11 +192,12 @@ class SyspassImportTest extends DatabaseTestCase
 
         $this->assertEquals('csv_pass1', Crypt::decrypt($pass->getPass(), $pass->getKey(), '12345678900'));
 
-        // 2nd account
-        $result = $accountService->getById(6);
+        // 4th account
+        $expectedId = 8;
+        $result = $accountService->getById($expectedId);
         $data = $result->getAccountVData();
 
-        $this->assertEquals(6, $data->getId());
+        $this->assertEquals($expectedId, $data->getId());
         $this->assertEquals(1, $data->getUserId());
         $this->assertEquals(2, $data->getUserGroupId());
         $this->assertEquals('Test CSV 2', $data->getName());
@@ -212,11 +211,12 @@ class SyspassImportTest extends DatabaseTestCase
 
         $this->assertEquals('csv_pass2', Crypt::decrypt($pass->getPass(), $pass->getKey(), '12345678900'));
 
-        // 3rd account
-        $result = $accountService->getById(7);
+        // 5th account
+        $expectedId = 9;
+        $result = $accountService->getById($expectedId);
         $data = $result->getAccountVData();
 
-        $this->assertEquals(7, $data->getId());
+        $this->assertEquals($expectedId, $data->getId());
         $this->assertEquals(1, $data->getUserId());
         $this->assertEquals(2, $data->getUserGroupId());
         $this->assertEquals('Test CSV 3', $data->getName());
@@ -230,6 +230,6 @@ class SyspassImportTest extends DatabaseTestCase
 
         $this->assertEquals('csv_pass3', Crypt::decrypt($pass->getPass(), $pass->getKey(), '12345678900'));
 
-        $this->assertEquals(7, $this->conn->getRowCount('Account'));
+        $this->assertEquals(9, self::getRowCount('Account'));
     }
 }

tests/SP/Services/Import/XmlImportTest.php

@@ -52,18 +52,13 @@ class XmlImportTest extends DatabaseTestCase
     protected static $dic;
 
     /**
-     * @throws NotFoundException
      * @throws ContextException
-     * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         self::$dic = setupContext();
 
-        self::$dataset = 'syspass_import.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = self::$dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
     }
 
     /**

tests/SP/Services/Install/InstallerTest.php

@@ -63,7 +63,7 @@ class InstallerTest extends TestCase
     /**
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         self::$dic = setupContext();
 
@@ -73,7 +73,7 @@ class InstallerTest extends TestCase
     /**
      * This method is called after the last test of this test class is run.
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
         saveResource('config', 'config.xml', self::$currentConfig);
         recreateDir(CACHE_PATH);
@@ -306,7 +306,7 @@ class InstallerTest extends TestCase
         DatabaseUtil::dropUser('syspass_user', $host);
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         @unlink(CONFIG_FILE);
     }

tests/SP/Services/ItemPreset/ItemPresetServiceTest.php

@@ -58,14 +58,11 @@ class ItemPresetServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_itemPreset.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(ItemPresetService::class);
@@ -133,7 +130,7 @@ class ItemPresetServiceTest extends DatabaseTestCase
      */
     public function testGetAll()
     {
-        $count = $this->conn->getRowCount('ItemPreset');
+        $count = self::getRowCount('ItemPreset');
 
         $result = self::$service->getAll();
         $this->assertCount($count, $result);
@@ -221,7 +218,7 @@ class ItemPresetServiceTest extends DatabaseTestCase
             ->delete(3)
             ->delete(4);
 
-        $this->assertEquals(3, $this->conn->getRowCount('ItemPreset'));
+        $this->assertEquals(3, self::getRowCount('ItemPreset'));
     }
 
     /**

tests/SP/Services/Notification/NotificationServiceTest.php

@@ -62,14 +62,11 @@ class NotificationServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_notification.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         self::$context = $dic->get(ContextInterface::class);
 
@@ -456,7 +453,7 @@ class NotificationServiceTest extends DatabaseTestCase
 
         $this->assertEquals(0, self::$service->deleteAdminBatch([]));
 
-        $this->assertEquals(0, $this->conn->getRowCount('Notification'));
+        $this->assertEquals(0, self::getRowCount('Notification'));
 
         $this->expectException(ServiceException::class);
 
@@ -470,11 +467,11 @@ class NotificationServiceTest extends DatabaseTestCase
      */
     public function testDeleteAdmin()
     {
-        $countBefore = $this->conn->getRowCount('Notification');
+        $countBefore = self::getRowCount('Notification');
 
         self::$service->deleteAdmin(3);
 
-        $this->assertEquals($countBefore - 1, $this->conn->getRowCount('Notification'));
+        $this->assertEquals($countBefore - 1, self::getRowCount('Notification'));
 
         $this->expectException(NoSuchItemException::class);
 
@@ -548,7 +545,7 @@ class NotificationServiceTest extends DatabaseTestCase
     {
         self::$service->delete(3);
 
-        $this->assertEquals(2, $this->conn->getRowCount('Notification'));
+        $this->assertEquals(2, self::getRowCount('Notification'));
 
         $this->expectException(NoSuchItemException::class);
 
@@ -566,7 +563,7 @@ class NotificationServiceTest extends DatabaseTestCase
 
         $this->assertEquals(0, self::$service->deleteByIdBatch([]));
 
-        $this->assertEquals(1, $this->conn->getRowCount('Notification'));
+        $this->assertEquals(1, self::getRowCount('Notification'));
 
         $this->expectException(ServiceException::class);
 

tests/SP/Services/Plugin/PluginDataServiceTest.php

@@ -57,14 +57,11 @@ class PluginDataServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_plugin.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(PluginDataService::class);
@@ -143,11 +140,11 @@ class PluginDataServiceTest extends DatabaseTestCase
     {
         self::$service->delete('Authenticator');
 
-        $this->assertTableRowCount('PluginData', 2);
+        $this->assertEquals(2, self::getRowCount('PluginData'));
 
         self::$service->delete('DokuWiki');
 
-        $this->assertTableRowCount('PluginData', 1);
+        $this->assertEquals(1, self::getRowCount('PluginData'));
     }
 
     /**

tests/SP/Services/Plugin/PluginOperationTest.php

@@ -59,14 +59,11 @@ class PluginOperationTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_plugin.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$pluginOperation = function ($name) use ($dic) {
@@ -143,13 +140,13 @@ class PluginOperationTest extends DatabaseTestCase
      */
     public function testDelete()
     {
-        $this->assertTableRowCount('PluginData', 4);
+        $this->assertEquals(4, self::getRowCount('PluginData'));
 
         /** @var PluginOperation $pluginOperation */
         $pluginOperation = self::$pluginOperation->call($this, 'Authenticator');
         $pluginOperation->delete(1);
 
-        $this->assertTableRowCount('PluginData', 3);
+        $this->assertEquals(3, self::getRowCount('PluginData'));
     }
 
     /**

tests/SP/Services/Plugin/PluginServiceTest.php

@@ -57,14 +57,11 @@ class PluginServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_plugin.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(PluginService::class);
@@ -112,7 +109,7 @@ class PluginServiceTest extends DatabaseTestCase
     {
         self::$service->deleteByIdBatch([1, 2]);
 
-        $this->assertEquals(1, $this->conn->getRowCount('Plugin'));
+        $this->assertEquals(1, self::getRowCount('Plugin'));
 
         $this->expectException(ServiceException::class);
 
@@ -185,7 +182,7 @@ class PluginServiceTest extends DatabaseTestCase
     {
         self::$service->delete(1);
 
-        $this->assertEquals(2, $this->conn->getRowCount('Plugin'));
+        $this->assertEquals(2, self::getRowCount('Plugin'));
 
         $this->expectException(NoSuchItemException::class);
 

tests/SP/Services/PublicLink/PublicLinkServiceTest.php

@@ -69,14 +69,11 @@ class PublicLinkServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_publicLink.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(PublicLinkService::class);
@@ -309,7 +306,7 @@ class PublicLinkServiceTest extends DatabaseTestCase
         self::$service->delete(2);
         self::$service->delete(3);
 
-        $this->assertEquals(0, $this->conn->getRowCount('PublicLink'));
+        $this->assertEquals(0, self::getRowCount('PublicLink'));
 
         $this->expectException(NoSuchItemException::class);
 
@@ -346,7 +343,7 @@ class PublicLinkServiceTest extends DatabaseTestCase
     {
         $this->assertEquals(2, self::$service->deleteByIdBatch([2, 3]));
 
-        $this->assertEquals(0, $this->conn->getRowCount('PublicLink'));
+        $this->assertEquals(0, self::getRowCount('PublicLink'));
 
         $this->expectException(ServiceException::class);
 

tests/SP/Services/Tag/TagServiceTest.php

@@ -58,14 +58,11 @@ class TagServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_tag.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(TagService::class);
@@ -78,7 +75,7 @@ class TagServiceTest extends DatabaseTestCase
     {
         self::$service->deleteByIdBatch([1, 2, 3]);
 
-        $this->assertEquals(0, $this->conn->getRowCount('Tag'));
+        $this->assertEquals(0, self::getRowCount('Tag'));
 
         $this->expectException(ServiceException::class);
 
@@ -96,7 +93,7 @@ class TagServiceTest extends DatabaseTestCase
 
         self::$service->delete(2);
 
-        $this->assertEquals(1, $this->conn->getRowCount('Tag'));
+        $this->assertEquals(1, self::getRowCount('Tag'));
 
         $this->expectException(NoSuchItemException::class);
 
@@ -218,7 +215,7 @@ class TagServiceTest extends DatabaseTestCase
 
         $this->assertEquals($tagData->name, $data->getName());
 
-        $this->assertEquals(4, $this->conn->getRowCount('Tag'));
+        $this->assertEquals(4, self::getRowCount('Tag'));
     }
 
     /**

tests/SP/Services/Task/TaskServiceTest.php

@@ -26,6 +26,7 @@ namespace SP\Tests\Services\Task;
 
 use PHPUnit\Framework\TestCase;
 use SP\Core\Context\ContextException;
+use SP\Services\ServiceException;
 use SP\Services\Task\Task;
 use SP\Services\Task\TaskFactory;
 use SP\Services\Task\TaskService;
@@ -44,6 +45,7 @@ class TaskServiceTest extends TestCase
     /**
      * @throws FileException
      * @throws ContextException
+     * @throws ServiceException
      */
     public function testTrackStatus()
     {
@@ -97,8 +99,8 @@ class TaskServiceTest extends TestCase
             sleep(1);
         }
 
-        $this->assertFileNotExists($task->getFileTask()->getFile());
-        $this->assertFileNotExists($task->getFileOut()->getFile());
+        $this->assertFileDoesNotExist($task->getFileTask()->getFile());
+        $this->assertFileDoesNotExist($task->getFileOut()->getFile());
     }
 
     /**

tests/SP/Services/Track/TrackServiceTest.php

@@ -57,14 +57,11 @@ class TrackServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_track.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(TrackService::class);
@@ -79,7 +76,7 @@ class TrackServiceTest extends DatabaseTestCase
     {
         self::$service->delete(1);
 
-        $this->assertEquals(5, $this->conn->getRowCount('Track'));
+        $this->assertEquals(5, self::getRowCount('Track'));
 
         $this->expectException(NoSuchItemException::class);
 

tests/SP/Services/User/UserPassServiceTest.php

@@ -68,14 +68,11 @@ class UserPassServiceTest extends DatabaseTestCase
      * @throws DependencyException
      * @throws SPException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_user.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(UserPassService::class);

tests/SP/Services/User/UserServiceTest.php

@@ -71,14 +71,11 @@ class UserServiceTest extends DatabaseTestCase
      * @throws DependencyException
      * @throws SPException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_user.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(UserService::class);
@@ -94,7 +91,7 @@ class UserServiceTest extends DatabaseTestCase
     {
         $data = self::$service->getAllBasic();
 
-        $this->assertCount(4, $data);
+        $this->assertCount(5, $data);
         $this->assertInstanceOf(UserData::class, $data[0]);
         $this->assertEquals('admin', $data[0]->getLogin());
     }
@@ -121,7 +118,7 @@ class UserServiceTest extends DatabaseTestCase
 
         $result = self::$service->createOnLogin($data);
 
-        $this->assertEquals(5, $result);
+        $this->assertEquals(6, $result);
 
         /** @var UserData $resultData */
         $resultData = self::$service->getById($result);
@@ -143,7 +140,7 @@ class UserServiceTest extends DatabaseTestCase
 
         $result = self::$service->createOnLogin($data);
 
-        $this->assertEquals(6, $result);
+        $this->assertEquals(7, $result);
 
         /** @var UserData $resultData */
         $resultData = self::$service->getById($result);
@@ -358,7 +355,7 @@ class UserServiceTest extends DatabaseTestCase
      */
     public function testDeleteByIdBatch()
     {
-        $this->assertEquals(2, self::$service->deleteByIdBatch([3, 4]));
+        $this->assertEquals(2, self::$service->deleteByIdBatch([4, 5]));
 
         $this->expectException(ConstraintException::class);
 
@@ -655,9 +652,9 @@ class UserServiceTest extends DatabaseTestCase
      */
     public function testDelete()
     {
-        self::$service->delete(3);
+        self::$service->delete(4);
 
-        $this->assertEquals(3, $this->conn->getRowCount('User'));
+        $this->assertEquals(4, self::getRowCount('User'));
     }
 
     /**

tests/SP/Services/UserGroup/UserGroupServiceTest.php

@@ -59,14 +59,11 @@ class UserGroupServiceTest extends DatabaseTestCase
      * @throws DependencyException
      * @throws SPException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_userGroup.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(UserGroupService::class);
@@ -80,7 +77,7 @@ class UserGroupServiceTest extends DatabaseTestCase
     {
         $data = self::$service->getAllBasic();
 
-        $this->assertCount(5, $data);
+        $this->assertCount(6, $data);
 
         $this->assertInstanceOf(UserGroupData::class, $data[0]);
         $this->assertEquals('Admins', $data[0]->getName());
@@ -96,9 +93,9 @@ class UserGroupServiceTest extends DatabaseTestCase
      */
     public function testDelete()
     {
-        self::$service->delete(3);
+        self::$service->delete(5);
 
-        $this->assertEquals(4, $this->conn->getRowCount('UserGroup'));
+        $this->assertEquals(5, self::getRowCount('UserGroup'));
     }
 
     /**
@@ -128,9 +125,9 @@ class UserGroupServiceTest extends DatabaseTestCase
      */
     public function testDeleteByIdBatch()
     {
-        $this->assertEquals(2, self::$service->deleteByIdBatch([4, 5]));
+        $this->assertEquals(2, self::$service->deleteByIdBatch([5, 6]));
 
-        $this->assertEquals(3, $this->conn->getRowCount('UserGroup'));
+        $this->assertEquals(4, self::getRowCount('UserGroup'));
     }
 
     /**
@@ -155,7 +152,7 @@ class UserGroupServiceTest extends DatabaseTestCase
     {
         $this->expectException(ServiceException::class);
 
-        self::$service->deleteByIdBatch([4, 5, 10]);
+        self::$service->deleteByIdBatch([5, 6, 10]);
     }
 
     /**
@@ -198,9 +195,11 @@ class UserGroupServiceTest extends DatabaseTestCase
     {
         $this->assertCount(7, self::$service->getUsage(2));
 
-        $this->assertCount(1, self::$service->getUsage(3));
+        $this->assertCount(3, self::$service->getUsage(3));
 
-        $this->assertCount(0, self::$service->getUsage(4));
+        $this->assertCount(1, self::$service->getUsage(4));
+
+        $this->assertCount(0, self::$service->getUsage(5));
     }
 
     /**
@@ -212,7 +211,7 @@ class UserGroupServiceTest extends DatabaseTestCase
     public function testCreate()
     {
         $data = new UserGroupData();
-        $data->setId(6);
+        $data->setId(7);
         $data->setName('Test group');
         $data->setDescription('Group for demo users');
         $data->setUsers([2]);
@@ -262,7 +261,7 @@ class UserGroupServiceTest extends DatabaseTestCase
 
         $result = self::$service->search($itemSearchData);
 
-        $this->assertEquals(2, $result->getNumRows());
+        $this->assertEquals(3, $result->getNumRows());
 
         $itemSearchData = new ItemSearchData();
         $itemSearchData->setLimitCount(10);
@@ -320,6 +319,6 @@ class UserGroupServiceTest extends DatabaseTestCase
 
         $this->assertCount(5, self::$service->getUsageByUsers(2));
 
-        $this->assertCount(0, self::$service->getUsageByUsers(4));
+        $this->assertCount(0, self::$service->getUsageByUsers(5));
     }
 }

tests/SP/Services/UserGroup/UserToUserGroupServiceTest.php

@@ -56,14 +56,11 @@ class UserToUserGroupServiceTest extends DatabaseTestCase
      * @throws DependencyException
      * @throws SPException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_userGroup.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(UserToUserGroupService::class);
@@ -95,9 +92,8 @@ class UserToUserGroupServiceTest extends DatabaseTestCase
 
         $data = self::$service->getGroupsForUser(2);
 
-        $this->assertCount(2, $data);
+        $this->assertCount(1, $data);
         $this->assertEquals(1, $data[0]->userGroupId);
-        $this->assertEquals(3, $data[1]->userGroupId);
 
         $data = self::$service->getGroupsForUser(10);
 
@@ -170,11 +166,11 @@ class UserToUserGroupServiceTest extends DatabaseTestCase
         $this->assertEquals(2, $data[1]->getUserGroupId());
         $this->assertEquals(3, $data[1]->getUserId());
 
-        $data = self::$service->getById(3);
+        $data = self::$service->getById(1);
 
         $this->assertCount(1, $data);
 
-        $this->assertEquals(3, $data[0]->getUserGroupId());
+        $this->assertEquals(1, $data[0]->getUserGroupId());
         $this->assertEquals(2, $data[0]->getUserId());
 
         $this->expectException(NoSuchItemException::class);

tests/SP/Services/UserPassRecover/UserPassRecoverServiceTest.php

@@ -56,14 +56,11 @@ class UserPassRecoverServiceTest extends DatabaseTestCase
      * @throws DependencyException
      * @throws SPException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(UserPassRecoverService::class);

tests/SP/Services/UserProfile/UserProfileServiceTest.php

@@ -60,14 +60,11 @@ class UserProfileServiceTest extends DatabaseTestCase
      * @throws DependencyException
      * @throws SPException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(UserProfileService::class);
@@ -188,7 +185,7 @@ class UserProfileServiceTest extends DatabaseTestCase
     {
         $this->assertEquals(1, self::$service->deleteByIdBatch([3]));
 
-        $this->assertEquals(2, $this->conn->getRowCount('UserProfile'));
+        $this->assertEquals(2, self::getRowCount('UserProfile'));
     }
 
     /**
@@ -202,7 +199,7 @@ class UserProfileServiceTest extends DatabaseTestCase
 
         self::$service->deleteByIdBatch([1, 2]);
 
-        $this->assertEquals(3, $this->conn->getRowCount('UserProfile'));
+        $this->assertEquals(3, self::getRowCount('UserProfile'));
     }
 
     /**
@@ -216,7 +213,7 @@ class UserProfileServiceTest extends DatabaseTestCase
 
         self::$service->deleteByIdBatch([3, 10]);
 
-        $this->assertEquals(2, $this->conn->getRowCount('UserProfile'));
+        $this->assertEquals(2, self::getRowCount('UserProfile'));
     }
 
     /**
@@ -245,7 +242,7 @@ class UserProfileServiceTest extends DatabaseTestCase
     {
         self::$service->delete(3);
 
-        $this->assertEquals(2, $this->conn->getRowCount('UserProfile'));
+        $this->assertEquals(2, self::getRowCount('UserProfile'));
 
         $this->expectException(ConstraintException::class);
 
@@ -271,7 +268,7 @@ class UserProfileServiceTest extends DatabaseTestCase
 
         $this->assertEquals($data->getId(), $result);
 
-        $this->assertEquals(4, $this->conn->getRowCount('UserProfile'));
+        $this->assertEquals(4, self::getRowCount('UserProfile'));
 
         $this->assertEquals($data, self::$service->getById($result));
     }

tests/SP/Storage/ArchiveHandlerTest.php

@@ -101,7 +101,7 @@ class ArchiveHandlerTest extends TestCase
      * Sets up the fixture, for example, open a network connection.
      * This method is called before a test is executed.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         array_map('unlink', glob(TMP_PATH . DIRECTORY_SEPARATOR . 'test_archive_*'));
     }

tests/SP/Storage/FileCachePackedTest.php

@@ -44,7 +44,7 @@ class FileCachePackedTest extends TestCase
     /**
      * This method is called before the first test of this test class is run.
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         self::$data = [];
         $i = 0;

tests/SP/Storage/FileCacheTest.php

@@ -44,7 +44,7 @@ class FileCacheTest extends TestCase
     /**
      * This method is called before the first test of this test class is run.
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         self::$data = [];
         $i = 0;

tests/SP/Storage/FileHandlerTest.php

@@ -96,15 +96,26 @@ class FileHandlerTest extends TestCase
     /**
      * Comprobar un archivo válido
      *
-     * @doesNotPerformAssertions
      * @throws FileException
      */
     public function testCheckFileExists()
     {
+        $this->markTestSkipped();
+
         (new FileHandler(self::$validFile))
             ->clearCache()
             ->checkFileExists();
 
+        $this->assertTrue(true);
+    }
+
+    /**
+     * Comprobar un archivo válido
+     *
+     * @throws FileException
+     */
+    public function testCheckFileDoesNotExists()
+    {
         $this->expectException(FileException::class);
 
         (new FileHandler(self::$missingFile))
@@ -143,7 +154,6 @@ class FileHandlerTest extends TestCase
     /**
      * Comprobar si es posible leer el archivo
      *
-     * @doesNotPerformAssertions
      * @throws FileException
      */
     public function testCheckIsReadable()
@@ -151,6 +161,8 @@ class FileHandlerTest extends TestCase
         (new FileHandler(self::$validFile))
             ->clearCache()
             ->checkIsReadable();
+
+        $this->assertTrue(true);
     }
 
     /**
@@ -162,6 +174,6 @@ class FileHandlerTest extends TestCase
     {
         (new FileHandler(self::$validFile))->delete();
 
-        $this->assertFileNotExists(self::$validFile);
+        $this->assertFileDoesNotExist(self::$validFile);
     }
 }

tests/SP/Storage/XmlHandlerTest.php

@@ -53,7 +53,7 @@ class XmlHandlerTest extends TestCase
      */
     protected $items;
 
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $file = RESOURCE_DIR . DIRECTORY_SEPARATOR . 'config.xml';
         self::$xmlHandler = new XmlHandler(new FileHandler($file));

tests/SP/Util/UtilTest.php

@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\SP\Util;
+namespace SP\Tests\Util;
 
 use PHPUnit\Framework\TestCase;
 use SP\Util\Util;
@@ -37,7 +37,7 @@ class UtilTest extends TestCase
     /**
      * This method is called after the last test of this test class is run.
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
         ini_set('memory_limit', -1);
     }

tests/SP/bootstrap.php

@@ -53,6 +53,10 @@ define('TMP_PATH', TEST_ROOT . DIRECTORY_SEPARATOR . 'tmp');
 define('XML_SCHEMA', APP_ROOT . DIRECTORY_SEPARATOR . 'schemas' . DIRECTORY_SEPARATOR . 'syspass.xsd');
 
 define('LOG_FILE', TMP_PATH . DIRECTORY_SEPARATOR . 'test.log');
+define('FIXTURE_FILES', [
+    RESOURCE_DIR . DIRECTORY_SEPARATOR . 'datasets' . DIRECTORY_SEPARATOR . 'truncate.sql',
+    RESOURCE_DIR . DIRECTORY_SEPARATOR . 'datasets' . DIRECTORY_SEPARATOR . 'syspass.sql'
+]);
 define('SELF_IP_ADDRESS', getRealIpAddress());
 define('SELF_HOSTNAME', gethostbyaddr(SELF_IP_ADDRESS));
 
@@ -85,7 +89,7 @@ if (!function_exists('\gettext')) {
      *
      * @return string
      */
-    function gettext($str)
+    function gettext($str): string
     {
         return $str;
     }
@@ -106,7 +110,7 @@ function getRealIpAddress()
  * @throws ContextException
  * @throws Exception
  */
-function setupContext()
+function setupContext(): Container
 {
     // Instancia del contenedor de dependencias con las definiciones de los objetos necesarios
     // para la aplicación
@@ -144,7 +148,7 @@ function setupContext()
  *
  * @return MySQLHandler
  */
-function getDbHandler(DatabaseConnectionData $connectionData = null)
+function getDbHandler(DatabaseConnectionData $connectionData = null): MySQLHandler
 {
     if ($connectionData === null) {
         // Establecer configuración de conexión con la BBDD
@@ -164,7 +168,7 @@ function getDbHandler(DatabaseConnectionData $connectionData = null)
  *
  * @return string
  */
-function getResource($dir, $file)
+function getResource($dir, $file): string
 {
     return file_get_contents(RESOURCE_DIR . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR . $file) ?: '';
 }
@@ -176,7 +180,7 @@ function getResource($dir, $file)
  *
  * @return string
  */
-function saveResource($dir, $file, $data)
+function saveResource($dir, $file, $data): string
 {
     return file_put_contents(RESOURCE_DIR . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR . $file, $data);
 }

tests/res/config/config.xml

@@ -13,8 +13,8 @@
   <authBasicEnabled>1</authBasicEnabled>
   <checkNotices></checkNotices>
   <checkUpdates></checkUpdates>
-  <configDate>1607363733</configDate>
-  <configHash>0384920872756be7d264ec32433e78cef0180442</configHash>
+  <configDate>1607511675</configDate>
+  <configHash>3e1df63a6c16da5b01961dcbb7281b3ebaa3a277</configHash>
   <configSaver>Admin</configSaver>
   <configVersion></configVersion>
   <databaseVersion></databaseVersion>
@@ -33,7 +33,7 @@
   <dokuwikiUrlBase></dokuwikiUrlBase>
   <dokuwikiUser></dokuwikiUser>
   <encryptSession></encryptSession>
-  <export_hash>46aa537c917e043aa59e60d91e7f69aecbf727c7</export_hash>
+  <export_hash>f3b3e5240ad0d36be1b3cde7e471cdcb204216b5</export_hash>
   <filesAllowedMime/>
   <filesAllowedSize>1024</filesAllowedSize>
   <filesEnabled>1</filesEnabled>

tests/res/datasets/syspass_account.xml

@@ -1,437 +0,0 @@
-<?xml version="1.0"?>
-<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-<database name="syspass">
-	<table_data name="UserProfile">
-		<row>
-			<field name="id">1</field>
-			<field name="name">Admin</field>
-			<field name="profile" xsi:type="xs:hexBinary">4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A303B733A31343A22002A006163635669657750617373223B623A303B733A31373A22002A0061636356696577486973746F7279223B623A303B733A31303A22002A0061636345646974223B623A303B733A31343A22002A006163634564697450617373223B623A303B733A393A22002A00616363416464223B623A303B733A31323A22002A0061636344656C657465223B623A303B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A313B733A31383A22002A006163635072697661746547726F7570223B623A313B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D</field>
-		</row>
-		<row>
-			<field name="id">2</field>
-			<field name="name">Demo</field>
-			<field name="profile" xsi:type="xs:hexBinary">4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A313B733A31343A22002A006163635669657750617373223B623A313B733A31373A22002A0061636356696577486973746F7279223B623A313B733A31303A22002A0061636345646974223B623A313B733A31343A22002A006163634564697450617373223B623A313B733A393A22002A00616363416464223B623A313B733A31323A22002A0061636344656C657465223B623A313B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A303B733A31383A22002A006163635072697661746547726F7570223B623A303B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D</field>
-		</row>
-		<row>
-			<field name="id">3</field>
-			<field name="name">Usuarios</field>
-			<field name="profile" xsi:type="xs:hexBinary">4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A313B733A31343A22002A006163635669657750617373223B623A313B733A31373A22002A0061636356696577486973746F7279223B623A313B733A31303A22002A0061636345646974223B623A313B733A31343A22002A006163634564697450617373223B623A313B733A393A22002A00616363416464223B623A313B733A31323A22002A0061636344656C657465223B623A313B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A303B733A31383A22002A006163635072697661746547726F7570223B623A303B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D</field>
-		</row>
-	</table_data>
-	<table_data name="Category">
-		<row>
-			<field name="id">1</field>
-			<field name="name">Web</field>
-			<field name="description">Web sites</field>
-			<field name="hash" xsi:type="xs:hexBinary">3235363761356563393730356562376163326339383430333365303631383964</field>
-		</row>
-		<row>
-			<field name="id">2</field>
-			<field name="name">Linux</field>
-			<field name="description">Linux server</field>
-			<field name="hash" xsi:type="xs:hexBinary">6532303661353465393736393063636535306363383732646437306565383936</field>
-		</row>
-		<row>
-			<field name="id">3</field>
-			<field name="name">SSH</field>
-			<field name="description">SSH access</field>
-			<field name="hash" xsi:type="xs:hexBinary">3137383764373634363330346335643938376366346536346133393733646337</field>
-		</row>
-	</table_data>
-	<table_data name="Client">
-		<row>
-			<field name="id">1</field>
-			<field name="name">Google</field>
-			<field name="hash" xsi:type="xs:hexBinary">6338323263316236333835336564323733623839363837616335303566396661</field>
-			<field name="description">Google Inc.</field>
-			<field name="isGlobal">0</field>
-		</row>
-		<row>
-			<field name="id">2</field>
-			<field name="name">Apple</field>
-			<field name="hash" xsi:type="xs:hexBinary">3166333837306265323734663663343962336533316130633637323839353766</field>
-			<field name="description">Apple Inc.</field>
-			<field name="isGlobal">0</field>
-		</row>
-		<row>
-			<field name="id">3</field>
-			<field name="name">Microsoft</field>
-			<field name="hash" xsi:type="xs:hexBinary">3566353332613366633466316561343033663337303730663539613761353361</field>
-			<field name="description">Microsoft Inc.</field>
-			<field name="isGlobal">1</field>
-		</row>
-	</table_data>
-	<table_data name="Tag">
-		<row>
-			<field name="id">1</field>
-			<field name="name">www</field>
-			<field name="hash" xsi:type="xs:hexBinary">3465616533356631623335393737613030656264383038366332353964346339</field>
-		</row>
-		<row>
-			<field name="id">2</field>
-			<field name="name">windows</field>
-			<field name="hash" xsi:type="xs:hexBinary">3066343133376564313530326235303435643630383361613235386235633432</field>
-		</row>
-		<row>
-			<field name="id">3</field>
-			<field name="name">Linux</field>
-			<field name="hash" xsi:type="xs:hexBinary">6532303661353465393736393063636535306363383732646437306565383936</field>
-		</row>
-	</table_data>
-	<table_data name="UserGroup">
-		<row>
-			<field name="id">1</field>
-			<field name="name">Admins</field>
-			<field name="description">sysPass Admins</field>
-		</row>
-		<row>
-			<field name="id">2</field>
-			<field name="name">Demo</field>
-			<field name="description"/>
-		</row>
-		<row>
-			<field name="id">3</field>
-			<field name="name">Usuarios</field>
-			<field name="description">Grupo Usuarios</field>
-		</row>
-	</table_data>
-	<table_data name="User">
-		<row>
-			<field name="id">1</field>
-			<field name="name">sysPass Admin</field>
-			<field name="userGroupId">1</field>
-			<field name="login">admin</field>
-			<field name="ssoLogin" xsi:nil="true" />
-			<field name="pass" xsi:type="xs:hexBinary">243279243130247635695230547A4933744E3036416A304C4A656B39755371496834356C70575539366E644A71444A704E6969713139306A444A486D</field>
-			<field name="mPass" xsi:type="xs:hexBinary">64656635303230306330383635633335373637316233366261353266333137346134356466333633626135656431613962323261356461353965376134373930356664656239373436356462373934613831373635316133316432626363636266663836626233353235643930333932393734323535663937316261616239656436346637383266363066646465386539336637363164356663633436393031356433363164333234643436633533633138313335613334663739633039</field>
-			<field name="mKey" xsi:type="xs:hexBinary">6465663130303030646566353032303062316163626161346361643036643237386562323533616462643433613966376463636439343063656265313962343061383436643464633035303636306466653630613561653139363433643636353936643733333764646236386536363930336562383031373764356463386430663963623661643361663565643766303936376262393964663530373936316330656132373462663830346333663966373563336538643539396336326231623738333730303963616263373836383637366433636337376162383365386338323335336335626164396534656535333532656132346632653434653663316336656131643162313264393332386335303539623437656235343534666138356435626437343637353333383132636662313230316634633635383733316465323934613664643035396332613362373333613765343462633539306338363337393032306662303263363262303565613030623234646235323566653863303263323138666561356661353139306563396266333461316637613937633733396637343534323333316466323932343965323138656338343233306161623038373336346463353236363935383630656638623232313439626262656636656266373030366638376434343661333535353863323062353462376336623330</field>
-			<field name="email" xsi:nil="true" />
-			<field name="notes" xsi:nil="true" />
-			<field name="loginCount">81</field>
-			<field name="userProfileId">1</field>
-			<field name="lastLogin">2018-04-19 23:46:48</field>
-			<field name="lastUpdate" xsi:nil="true" />
-			<field name="lastUpdateMPass">1521887152</field>
-			<field name="isAdminApp">1</field>
-			<field name="isAdminAcc">0</field>
-			<field name="isLdap">0</field>
-			<field name="isDisabled">0</field>
-			<field name="hashSalt"></field>
-			<field name="isMigrate">0</field>
-			<field name="isChangePass">0</field>
-			<field name="isChangedPass">0</field>
-			<field name="preferences" xsi:type="xs:hexBinary">4F3A33323A2253505C446174614D6F64656C5C55736572507265666572656E63657344617461223A31303A7B733A373A22757365725F6964223B693A313B733A363A22757365324661223B623A303B733A343A226C616E67223B733A353A22656E5F5553223B733A353A227468656D65223B733A31333A226D6174657269616C2D626C7565223B733A31343A22726573756C747350657250616765223B693A34383B733A31313A226163636F756E744C696E6B223B623A313B733A393A22736F72745669657773223B623A303B733A393A22746F704E6176626172223B623A303B733A31353A226F7074696F6E616C416374696F6E73223B623A303B733A31343A22726573756C747341734361726473223B623A303B7D</field>
-		</row>
-		<row>
-			<field name="id">2</field>
-			<field name="name">sysPass demo</field>
-			<field name="userGroupId">2</field>
-			<field name="login">demo</field>
-			<field name="ssoLogin">demo</field>
-			<field name="pass" xsi:type="xs:hexBinary">2432792431302454726E69756C5763754361433635346F76566F35392E766B4C5433414E31624A6D726A79553462696335325069436A6B5572396669</field>
-			<field name="mPass" xsi:type="xs:hexBinary">64656635303230303231616533353730373263373165626239393534353966366236636164373235336534316336633534353036336339326136653730616366333930393165373934613865376662386662326664333931383932363562396466303133333631623063323732323339653465373165343839313030646534326265633737623966343238396635633936613837646531343864313963653663643338613131343932623163313765653630326430623532343564346566</field>
-			<field name="mKey" xsi:type="xs:hexBinary">6465663130303030646566353032303035643534316262633462653032333563313338626561366561333536626436663037353365313035653030333563653166316235336534663364343565366262353335626163396639646538653131316262356334383865336535633637323333666632626365313837626335386135353839373535373034386564353634366361646638623736396132323164363032353435653034306264613135663138323638383665373536313236353361313037306530333261323365636364336339616438323162306363383962643130333035303931653965626332653935313465656631373462663339343664656132393661346262366264343463646333363361643335623032373561356633323430313936346531633131663937313764313139633130633561373161666332356365346534366661623234646663626362326237303964336335316532623834326464303933653230353965373265356638376363366236626239306231346265376264373637663163303937366231313362393630613265636565336633313131663538656131346139353736623332653163303962636435313366383733656664653062373333366238643464646637616237323333373038613264393965633738356139393036306135643262316366306262663739346262663765</field>
-			<field name="email">demo@syspass.org</field>
-			<field name="notes">aaaa</field>
-			<field name="loginCount">12</field>
-			<field name="userProfileId">2</field>
-			<field name="lastLogin">2018-04-01 21:29:47</field>
-			<field name="lastUpdate">2018-04-14 08:47:43</field>
-			<field name="lastUpdateMPass">1522582852</field>
-			<field name="isAdminApp">0</field>
-			<field name="isAdminAcc">0</field>
-			<field name="isLdap">0</field>
-			<field name="isDisabled">0</field>
-			<field name="hashSalt"></field>
-			<field name="isMigrate">0</field>
-			<field name="isChangePass">0</field>
-			<field name="isChangedPass">0</field>
-			<field name="preferences" xsi:nil="true" />
-		</row>
-		<row>
-			<field name="id">3</field>
-			<field name="name">User A</field>
-			<field name="userGroupId">2</field>
-			<field name="login">user_a</field>
-			<field name="ssoLogin">user_a</field>
-			<field name="pass" xsi:type="xs:hexBinary">2432792431302469444B442E2F4F624D79742E6F43594F5249514D5065624454783966744D636A703034365A435976662E765479597A594F6A4C472E</field>
-			<field name="mPass" xsi:nil="true" />
-			<field name="mKey" xsi:nil="true" />
-			<field name="email">user_a@syspass.org</field>
-			<field name="notes"></field>
-			<field name="loginCount">0</field>
-			<field name="userProfileId">1</field>
-			<field name="lastLogin" xsi:nil="true" />
-			<field name="lastUpdate">2018-04-14 08:48:08</field>
-			<field name="lastUpdateMPass">0</field>
-			<field name="isAdminApp">0</field>
-			<field name="isAdminAcc">0</field>
-			<field name="isLdap">0</field>
-			<field name="isDisabled">0</field>
-			<field name="hashSalt"></field>
-			<field name="isMigrate">0</field>
-			<field name="isChangePass">0</field>
-			<field name="isChangedPass">0</field>
-			<field name="preferences" xsi:nil="true" />
-		</row>
-		<row>
-			<field name="id">4</field>
-			<field name="name">User B</field>
-			<field name="userGroupId">2</field>
-			<field name="login">user_b</field>
-			<field name="ssoLogin" xsi:nil="true" />
-			<field name="pass" xsi:type="xs:hexBinary">243279243130244C37643658736A663955794F6E583662472E6F384E4F713961674B6F64536B4B5674485350462F6861414E657971517065372E6532</field>
-			<field name="mPass" xsi:nil="true" />
-			<field name="mKey" xsi:nil="true" />
-			<field name="email">user_b@syspass.org</field>
-			<field name="notes"></field>
-			<field name="loginCount">0</field>
-			<field name="userProfileId">1</field>
-			<field name="lastLogin" xsi:nil="true" />
-			<field name="lastUpdate">2018-03-30 18:38:32</field>
-			<field name="lastUpdateMPass">0</field>
-			<field name="isAdminApp">0</field>
-			<field name="isAdminAcc">0</field>
-			<field name="isLdap">0</field>
-			<field name="isDisabled">0</field>
-			<field name="hashSalt"></field>
-			<field name="isMigrate">0</field>
-			<field name="isChangePass">0</field>
-			<field name="isChangedPass">0</field>
-			<field name="preferences" xsi:nil="true" />
-		</row>
-	</table_data>
-	<table_data name="Account">
-	<row>
-		<field name="id">1</field>
-		<field name="userGroupId">1</field>
-		<field name="userId">1</field>
-		<field name="userEditId">1</field>
-		<field name="clientId">1</field>
-		<field name="name">Google</field>
-		<field name="categoryId">1</field>
-		<field name="login">admin</field>
-		<field name="url">http://google.com</field>
-		<field name="pass" xsi:type="xs:hexBinary">6465663530323030656135663361636362366237656462653536343938666234313231616635323237363539663162346532383963386361346565323732656530636238333632316436393736353665373631393435623033353236616164333730336662306531333535626437333638653033666137623565633364306365323634663863643436393436633365353234316534373338376130393133663935303736396364613365313234643432306636393834386434613262316231306138</field>
-		<field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303065646434636466636231333437613739616166313734343462343839626362643364353664376664356562373233363235653130316261666432323539343633336664626639326630613135373461653562613562323535353230393236353237623863633534313862653363376361376536366139356366353366356162663031623064343236613234336162643533643837643239636633643165326532663732626664396433366133653061343534656664373134633661366237616338363966636263366435303166613964316338386365623264303861333438626633656638653135356538633865353838623938636465653061306463313835646636366535393138393831653366303464323139386236383738333539616563653034376434643637663835313235636661313237633138373865643530616630393434613934616363356265316130323566623065633362663831613933626365366365343734336164363562656638353131343466343332323837356438323339303236656363613866643862376330396563356465373233666466313636656166386336356539666537353436333535333664393766383366316366663931396530386339373730636166633136376661656364306366656262323931666334343831333238333662366432</field>
-		<field name="notes">aaaa</field>
-		<field name="countView">341</field>
-		<field name="countDecrypt">35</field>
-		<field name="dateAdd">2018-03-25 09:54:07</field>
-		<field name="dateEdit">2018-04-02 21:38:25</field>
-		<field name="otherUserGroupEdit">0</field>
-		<field name="otherUserEdit">0</field>
-		<field name="isPrivate">0</field>
-		<field name="isPrivateGroup">0</field>
-		<field name="passDate">1522341709</field>
-		<field name="passDateChange">0</field>
-		<field name="parentId">0</field>
-	</row>
-    <row>
-        <field name="id">2</field>
-        <field name="userGroupId">1</field>
-        <field name="userId">1</field>
-        <field name="userEditId">1</field>
-        <field name="clientId">2</field>
-        <field name="name">Apple</field>
-        <field name="categoryId">2</field>
-        <field name="login">admin</field>
-        <field name="url">http://apple.com</field>
-        <field name="pass" xsi:type="xs:hexBinary">6465663530323030656135663361636362366237656462653536343938666234313231616635323237363539663162346532383963386361346565323732656530636238333632316436393736353665373631393435623033353236616164333730336662306531333535626437333638653033666137623565633364306365323634663863643436393436633365353234316534373338376130393133663935303736396364613365313234643432306636393834386434613262316231306138</field>
-        <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303065646434636466636231333437613739616166313734343462343839626362643364353664376664356562373233363235653130316261666432323539343633336664626639326630613135373461653562613562323535353230393236353237623863633534313862653363376361376536366139356366353366356162663031623064343236613234336162643533643837643239636633643165326532663732626664396433366133653061343534656664373134633661366237616338363966636263366435303166613964316338386365623264303861333438626633656638653135356538633865353838623938636465653061306463313835646636366535393138393831653366303464323139386236383738333539616563653034376434643637663835313235636661313237633138373865643530616630393434613934616363356265316130323566623065633362663831613933626365366365343734336164363562656638353131343466343332323837356438323339303236656363613866643862376330396563356465373233666466313636656166386336356539666537353436333535333664393766383366316366663931396530386339373730636166633136376661656364306366656262323931666334343831333238333662366432</field>
-        <field name="notes">bbbb</field>
-        <field name="countView">341</field>
-        <field name="countDecrypt">35</field>
-        <field name="dateAdd">2018-03-25 09:54:07</field>
-        <field name="dateEdit">2018-04-02 21:38:25</field>
-        <field name="otherUserGroupEdit">0</field>
-        <field name="otherUserEdit">0</field>
-        <field name="isPrivate">0</field>
-        <field name="isPrivateGroup">0</field>
-        <field name="passDate">1522341709</field>
-        <field name="passDateChange">0</field>
-        <field name="parentId">1</field>
-    </row>
-	</table_data>
-	<table_data name="AccountToFavorite">
-	</table_data>
-	<table_data name="AccountToTag">
-	<row>
-		<field name="accountId">1</field>
-		<field name="tagId">1</field>
-	</row>
-	</table_data>
-	<table_data name="AccountToUser">
-	<row>
-		<field name="accountId">1</field>
-		<field name="userId">3</field>
-		<field name="isEdit">1</field>
-	</row>
-    <row>
-        <field name="accountId">2</field>
-        <field name="userId">2</field>
-        <field name="isEdit">0</field>
-    </row>
-	</table_data>
-	<table_data name="AccountToUserGroup">
-        <row>
-            <field name="accountId">1</field>
-            <field name="userGroupId">2</field>
-            <field name="isEdit">1</field>
-        </row>
-        <row>
-            <field name="accountId">2</field>
-            <field name="userGroupId">2</field>
-            <field name="isEdit">0</field>
-        </row>
-	</table_data>
-	<table_data name="AccountHistory">
-		<row>
-			<field name="id">3</field>
-			<field name="accountId">2</field>
-			<field name="userGroupId">1</field>
-			<field name="userId">1</field>
-			<field name="userEditId">1</field>
-			<field name="clientId">1</field>
-			<field name="name">Google</field>
-			<field name="categoryId">1</field>
-			<field name="login">admin</field>
-			<field name="url">https://google.com</field>
-			<field name="pass" xsi:type="xs:hexBinary">646566353032303064396362643366376662646536326637663732663861383732623430613839386131643134333933663662623033316664343362366461643762626564643634386437363964346634616234386638336636653236396166623734636261383134313363626162326461393733343934613231653934666331616664633637313732316562356666396562646132613665313937626233333563613632383830393934333863643731333230383132316430366433303838</field>
-			<field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303032636635623034396437656539356531653838663166613438643061616132663133613163663766346238316165663837326134373665316461653661353865316666626438346130383166303062633138646136373265653935643234626564336565303063333262646262303433336633356534323263616337613238363532336233313666316137333462616337343839346631333632643863376430373861373862396135633064396239653061353537626562666336636566623766363166376330393734356461623536373762303436313865343936383434663932666364303634316330303935636239363938336361336631363161623134663339643536636233653938333833613062396464356365383736333334376364363933313563306436343362623937366139383831376632346431303364316533353133306262393862353034353262346334663934663162323531383632356530653331346438343430323362666334306264616265376437386238663632326535353338636537663431626261616461613138646333333662623762636565333030656565333734616537356365303131363731323239383132383964346634383661376635303136303835336138663335653366393230383632386162373332343335633037656432616234</field>
-			<field name="notes">blablacar</field>
-			<field name="countView">7</field>
-			<field name="countDecrypt">1</field>
-			<field name="dateAdd">2018-06-05 22:49:34</field>
-			<field name="dateEdit">2018-06-06 22:20:29</field>
-			<field name="isModify">1</field>
-			<field name="isDeleted">0</field>
-			<field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
-			<field name="otherUserEdit">0</field>
-			<field name="otherUserGroupEdit">0</field>
-			<field name="passDate" xsi:nil="true" />
-			<field name="passDateChange" xsi:nil="true" />
-			<field name="parentId" xsi:nil="true" />
-			<field name="isPrivate">0</field>
-			<field name="isPrivateGroup">0</field>
-		</row>
-		<row>
-			<field name="id">4</field>
-			<field name="accountId">1</field>
-			<field name="userGroupId">1</field>
-			<field name="userId">1</field>
-			<field name="userEditId">1</field>
-			<field name="clientId">1</field>
-			<field name="name">Google</field>
-			<field name="categoryId">1</field>
-			<field name="login">admin</field>
-			<field name="url">https://google.com</field>
-			<field name="pass" xsi:type="xs:hexBinary">64656635303230303864313263313434383662336363353938366164613564643563393465356664353138363635643062626362613938353236646336396662333833366537363635393931353336653262326533336339323232396663636336373139393662316631616432323839326539323332343633656164386262326234363033666565306630643666323364383337363661363363353139356334333330633139636634623664343131396362356136386232636332653465616232393561</field>
-			<field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303039326134383433323238376332636136626165313731363538316661316663393832356364653733316361623361316661343832646536626336663066646138623133323366396137626666643837386434623862633234653364363731626136613661393631343738633437653864626363656565333136343436346262623235623563633362663935363030653034346636326666636237303635343362333330616561363036336332383433383063303931383533653436616430396131393534653064393233643438313932393532646631353931623031333636356461373337646435653536623436653639396332613165363438653761623736653766383732653566376535623133303838666636663133313461376336353964373561386162323535346635653137626139626266396236363062613735306461313737626339303662316636633766343736383462346638353630356661663863323365646437393766333961303033666137653361366665383631373137613465333037366637393364356135326536646236363032663061373934373930383635336238616437333839646338653738383930303234633561623365336431373836396261626630363234326661306165663138396163376138616636313636323037313930333762666565</field>
-			<field name="notes"></field>
-			<field name="countView">11</field>
-			<field name="countDecrypt">0</field>
-			<field name="dateAdd">2018-06-05 22:11:40</field>
-			<field name="dateEdit" xsi:nil="true" />
-			<field name="isModify">1</field>
-			<field name="isDeleted">0</field>
-			<field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
-			<field name="otherUserEdit">0</field>
-			<field name="otherUserGroupEdit">0</field>
-			<field name="passDate" xsi:nil="true" />
-			<field name="passDateChange" xsi:nil="true" />
-			<field name="parentId" xsi:nil="true" />
-			<field name="isPrivate">0</field>
-			<field name="isPrivateGroup">0</field>
-		</row>
-		<row>
-			<field name="id">5</field>
-			<field name="accountId">1</field>
-			<field name="userGroupId">1</field>
-			<field name="userId">1</field>
-			<field name="userEditId">1</field>
-			<field name="clientId">1</field>
-			<field name="name">Google</field>
-			<field name="categoryId">1</field>
-			<field name="login">admin</field>
-			<field name="url">https://google.com</field>
-			<field name="pass" xsi:type="xs:hexBinary">64656635303230303864313263313434383662336363353938366164613564643563393465356664353138363635643062626362613938353236646336396662333833366537363635393931353336653262326533336339323232396663636336373139393662316631616432323839326539323332343633656164386262326234363033666565306630643666323364383337363661363363353139356334333330633139636634623664343131396362356136386232636332653465616232393561</field>
-			<field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303039326134383433323238376332636136626165313731363538316661316663393832356364653733316361623361316661343832646536626336663066646138623133323366396137626666643837386434623862633234653364363731626136613661393631343738633437653864626363656565333136343436346262623235623563633362663935363030653034346636326666636237303635343362333330616561363036336332383433383063303931383533653436616430396131393534653064393233643438313932393532646631353931623031333636356461373337646435653536623436653639396332613165363438653761623736653766383732653566376535623133303838666636663133313461376336353964373561386162323535346635653137626139626266396236363062613735306461313737626339303662316636633766343736383462346638353630356661663863323365646437393766333961303033666137653361366665383631373137613465333037366637393364356135326536646236363032663061373934373930383635336238616437333839646338653738383930303234633561623365336431373836396261626630363234326661306165663138396163376138616636313636323037313930333762666565</field>
-			<field name="notes"></field>
-			<field name="countView">11</field>
-			<field name="countDecrypt">0</field>
-			<field name="dateAdd">2018-06-05 22:11:40</field>
-			<field name="dateEdit">2018-06-13 20:13:53</field>
-			<field name="isModify">1</field>
-			<field name="isDeleted">0</field>
-			<field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
-			<field name="otherUserEdit">0</field>
-			<field name="otherUserGroupEdit">0</field>
-			<field name="passDate" xsi:nil="true" />
-			<field name="passDateChange" xsi:nil="true" />
-			<field name="parentId" xsi:nil="true" />
-			<field name="isPrivate">0</field>
-			<field name="isPrivateGroup">0</field>
-		</row>
-		<row>
-			<field name="id">6</field>
-			<field name="accountId">1</field>
-			<field name="userGroupId">1</field>
-			<field name="userId">1</field>
-			<field name="userEditId">1</field>
-			<field name="clientId">1</field>
-			<field name="name">Google</field>
-			<field name="categoryId">1</field>
-			<field name="login">admin</field>
-			<field name="url">https://google.com</field>
-			<field name="pass" xsi:type="xs:hexBinary">64656635303230303864313263313434383662336363353938366164613564643563393465356664353138363635643062626362613938353236646336396662333833366537363635393931353336653262326533336339323232396663636336373139393662316631616432323839326539323332343633656164386262326234363033666565306630643666323364383337363661363363353139356334333330633139636634623664343131396362356136386232636332653465616232393561</field>
-			<field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303039326134383433323238376332636136626165313731363538316661316663393832356364653733316361623361316661343832646536626336663066646138623133323366396137626666643837386434623862633234653364363731626136613661393631343738633437653864626363656565333136343436346262623235623563633362663935363030653034346636326666636237303635343362333330616561363036336332383433383063303931383533653436616430396131393534653064393233643438313932393532646631353931623031333636356461373337646435653536623436653639396332613165363438653761623736653766383732653566376535623133303838666636663133313461376336353964373561386162323535346635653137626139626266396236363062613735306461313737626339303662316636633766343736383462346638353630356661663863323365646437393766333961303033666137653361366665383631373137613465333037366637393364356135326536646236363032663061373934373930383635336238616437333839646338653738383930303234633561623365336431373836396261626630363234326661306165663138396163376138616636313636323037313930333762666565</field>
-			<field name="notes"></field>
-			<field name="countView">11</field>
-			<field name="countDecrypt">0</field>
-			<field name="dateAdd">2018-06-05 22:11:40</field>
-			<field name="dateEdit">2018-06-13 20:13:58</field>
-			<field name="isModify">1</field>
-			<field name="isDeleted">0</field>
-			<field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
-			<field name="otherUserEdit">0</field>
-			<field name="otherUserGroupEdit">0</field>
-			<field name="passDate" xsi:nil="true" />
-			<field name="passDateChange" xsi:nil="true" />
-			<field name="parentId" xsi:nil="true" />
-			<field name="isPrivate">0</field>
-			<field name="isPrivateGroup">0</field>
-		</row>
-		<row>
-			<field name="id">7</field>
-			<field name="accountId">1</field>
-			<field name="userGroupId">1</field>
-			<field name="userId">1</field>
-			<field name="userEditId">1</field>
-			<field name="clientId">1</field>
-			<field name="name">Google</field>
-			<field name="categoryId">1</field>
-			<field name="login">admin</field>
-			<field name="url">https://google.com</field>
-			<field name="pass" xsi:type="xs:hexBinary">64656635303230303864313263313434383662336363353938366164613564643563393465356664353138363635643062626362613938353236646336396662333833366537363635393931353336653262326533336339323232396663636336373139393662316631616432323839326539323332343633656164386262326234363033666565306630643666323364383337363661363363353139356334333330633139636634623664343131396362356136386232636332653465616232393561</field>
-			<field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303039326134383433323238376332636136626165313731363538316661316663393832356364653733316361623361316661343832646536626336663066646138623133323366396137626666643837386434623862633234653364363731626136613661393631343738633437653864626363656565333136343436346262623235623563633362663935363030653034346636326666636237303635343362333330616561363036336332383433383063303931383533653436616430396131393534653064393233643438313932393532646631353931623031333636356461373337646435653536623436653639396332613165363438653761623736653766383732653566376535623133303838666636663133313461376336353964373561386162323535346635653137626139626266396236363062613735306461313737626339303662316636633766343736383462346638353630356661663863323365646437393766333961303033666137653361366665383631373137613465333037366637393364356135326536646236363032663061373934373930383635336238616437333839646338653738383930303234633561623365336431373836396261626630363234326661306165663138396163376138616636313636323037313930333762666565</field>
-			<field name="notes"></field>
-			<field name="countView">11</field>
-			<field name="countDecrypt">0</field>
-			<field name="dateAdd">2018-06-05 22:11:40</field>
-			<field name="dateEdit">2018-06-13 20:14:23</field>
-			<field name="isModify">1</field>
-			<field name="isDeleted">0</field>
-			<field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
-			<field name="otherUserEdit">0</field>
-			<field name="otherUserGroupEdit">0</field>
-			<field name="passDate" xsi:nil="true" />
-			<field name="passDateChange" xsi:nil="true" />
-			<field name="parentId" xsi:nil="true" />
-			<field name="isPrivate">0</field>
-			<field name="isPrivateGroup">0</field>
-		</row>
-	</table_data>
-	<table_data name="ItemPreset"/>
-</database>
-</mysqldump>

tests/res/datasets/syspass_accountAcl.xml

@@ -1,209 +0,0 @@
-<?xml version="1.0"?>
-<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <database name="syspass">
-        <table_data name="UserGroup">
-            <row>
-                <field name="id">1</field>
-                <field name="name">Admins</field>
-                <field name="description">sysPass Admins</field>
-            </row>
-            <row>
-                <field name="id">2</field>
-                <field name="name">Demo</field>
-                <field name="description"/>
-            </row>
-            <row>
-                <field name="id">3</field>
-                <field name="name">Usuarios</field>
-                <field name="description">Grupo Usuarios</field>
-            </row>
-            <row>
-                <field name="id">4</field>
-                <field name="name">Operadores</field>
-                <field name="description">Grupo Operadores</field>
-            </row>
-        </table_data>
-        <table_data name="User">
-            <row>
-                <field name="id">1</field>
-                <field name="name">sysPass Admin</field>
-                <field name="userGroupId">1</field>
-                <field name="login">admin</field>
-                <field name="ssoLogin" xsi:nil="true" />
-                <field name="pass" xsi:type="xs:hexBinary">243279243130247635695230547A4933744E3036416A304C4A656B39755371496834356C70575539366E644A71444A704E6969713139306A444A486D</field>
-                <field name="mPass" xsi:type="xs:hexBinary">64656635303230306330383635633335373637316233366261353266333137346134356466333633626135656431613962323261356461353965376134373930356664656239373436356462373934613831373635316133316432626363636266663836626233353235643930333932393734323535663937316261616239656436346637383266363066646465386539336637363164356663633436393031356433363164333234643436633533633138313335613334663739633039</field>
-                <field name="mKey" xsi:type="xs:hexBinary">6465663130303030646566353032303062316163626161346361643036643237386562323533616462643433613966376463636439343063656265313962343061383436643464633035303636306466653630613561653139363433643636353936643733333764646236386536363930336562383031373764356463386430663963623661643361663565643766303936376262393964663530373936316330656132373462663830346333663966373563336538643539396336326231623738333730303963616263373836383637366433636337376162383365386338323335336335626164396534656535333532656132346632653434653663316336656131643162313264393332386335303539623437656235343534666138356435626437343637353333383132636662313230316634633635383733316465323934613664643035396332613362373333613765343462633539306338363337393032306662303263363262303565613030623234646235323566653863303263323138666561356661353139306563396266333461316637613937633733396637343534323333316466323932343965323138656338343233306161623038373336346463353236363935383630656638623232313439626262656636656266373030366638376434343661333535353863323062353462376336623330</field>
-                <field name="email" xsi:nil="true" />
-                <field name="loginCount">81</field>
-                <field name="userProfileId">1</field>
-                <field name="lastLogin">2018-04-19 23:46:48</field>
-                <field name="lastUpdateMPass">1521887152</field>
-                <field name="isAdminApp">1</field>
-                <field name="isAdminAcc">0</field>
-                <field name="hashSalt"></field>
-            </row>
-            <row>
-                <field name="id">2</field>
-                <field name="name">sysPass demo</field>
-                <field name="userGroupId">2</field>
-                <field name="login">demo</field>
-                <field name="ssoLogin">demo</field>
-                <field name="pass" xsi:type="xs:hexBinary">2432792431302454726E69756C5763754361433635346F76566F35392E766B4C5433414E31624A6D726A79553462696335325069436A6B5572396669</field>
-                <field name="mPass" xsi:type="xs:hexBinary">64656635303230303231616533353730373263373165626239393534353966366236636164373235336534316336633534353036336339326136653730616366333930393165373934613865376662386662326664333931383932363562396466303133333631623063323732323339653465373165343839313030646534326265633737623966343238396635633936613837646531343864313963653663643338613131343932623163313765653630326430623532343564346566</field>
-                <field name="mKey" xsi:type="xs:hexBinary">6465663130303030646566353032303035643534316262633462653032333563313338626561366561333536626436663037353365313035653030333563653166316235336534663364343565366262353335626163396639646538653131316262356334383865336535633637323333666632626365313837626335386135353839373535373034386564353634366361646638623736396132323164363032353435653034306264613135663138323638383665373536313236353361313037306530333261323365636364336339616438323162306363383962643130333035303931653965626332653935313465656631373462663339343664656132393661346262366264343463646333363361643335623032373561356633323430313936346531633131663937313764313139633130633561373161666332356365346534366661623234646663626362326237303964336335316532623834326464303933653230353965373265356638376363366236626239306231346265376264373637663163303937366231313362393630613265636565336633313131663538656131346139353736623332653163303962636435313366383733656664653062373333366238643464646637616237323333373038613264393965633738356139393036306135643262316366306262663739346262663765</field>
-                <field name="email">demo@syspass.org</field>
-                <field name="loginCount">12</field>
-                <field name="userProfileId">2</field>
-                <field name="lastLogin">2018-04-01 21:29:47</field>
-                <field name="lastUpdateMPass">1522582852</field>
-                <field name="isAdminApp">0</field>
-                <field name="isAdminAcc">0</field>
-                <field name="hashSalt"></field>
-            </row>
-            <row>
-                <field name="id">3</field>
-                <field name="name">User A</field>
-                <field name="userGroupId">3</field>
-                <field name="login">user_a</field>
-                <field name="ssoLogin">user_a</field>
-                <field name="pass" xsi:type="xs:hexBinary">2432792431302469444B442E2F4F624D79742E6F43594F5249514D5065624454783966744D636A703034365A435976662E765479597A594F6A4C472E</field>
-                <field name="mPass" xsi:nil="true" />
-                <field name="mKey" xsi:nil="true" />
-                <field name="email">user_a@syspass.org</field>
-                <field name="loginCount">0</field>
-                <field name="userProfileId">1</field>
-                <field name="lastLogin" xsi:nil="true" />
-                <field name="lastUpdateMPass">0</field>
-                <field name="isAdminApp">0</field>
-                <field name="isAdminAcc">0</field>
-                <field name="hashSalt"></field>
-            </row>
-            <row>
-                <field name="id">4</field>
-                <field name="name">User B</field>
-                <field name="userGroupId">3</field>
-                <field name="login">user_b</field>
-                <field name="ssoLogin" xsi:nil="true" />
-                <field name="pass" xsi:type="xs:hexBinary">243279243130244C37643658736A663955794F6E583662472E6F384E4F713961674B6F64536B4B5674485350462F6861414E657971517065372E6532</field>
-                <field name="mPass" xsi:nil="true" />
-                <field name="mKey" xsi:nil="true" />
-                <field name="email">user_b@syspass.org</field>
-                <field name="loginCount">0</field>
-                <field name="userProfileId">1</field>
-                <field name="lastLogin" xsi:nil="true" />
-                <field name="lastUpdateMPass">0</field>
-                <field name="isAdminApp">0</field>
-                <field name="isAdminAcc">0</field>
-                <field name="hashSalt"></field>
-            </row>
-            <row>
-                <field name="id">5</field>
-                <field name="name">User C</field>
-                <field name="userGroupId">4</field>
-                <field name="login">user_c</field>
-                <field name="ssoLogin" xsi:nil="true" />
-                <field name="pass" xsi:type="xs:hexBinary">243279243130244C37643658736A663955794F6E583662472E6F384E4F713961674B6F64536B4B5674485350462F6861414E657971517065372E6532</field>
-                <field name="mPass" xsi:nil="true" />
-                <field name="mKey" xsi:nil="true" />
-                <field name="email">user_c@syspass.org</field>
-                <field name="loginCount">0</field>
-                <field name="userProfileId">1</field>
-                <field name="lastLogin" xsi:nil="true" />
-                <field name="lastUpdateMPass">0</field>
-                <field name="isAdminApp">0</field>
-                <field name="isAdminAcc">1</field>
-                <field name="hashSalt"></field>
-            </row>
-        </table_data>
-        <table_data name="Account">
-            <row>
-                <field name="id">1</field>
-                <field name="userGroupId">1</field>
-                <field name="userId">1</field>
-                <field name="userEditId">1</field>
-                <field name="clientId">1</field>
-                <field name="name">Google</field>
-                <field name="categoryId">1</field>
-                <field name="login">admin</field>
-                <field name="url">http://google.com</field>
-                <field name="pass" xsi:type="xs:hexBinary">6465663530323030656135663361636362366237656462653536343938666234313231616635323237363539663162346532383963386361346565323732656530636238333632316436393736353665373631393435623033353236616164333730336662306531333535626437333638653033666137623565633364306365323634663863643436393436633365353234316534373338376130393133663935303736396364613365313234643432306636393834386434613262316231306138</field>
-                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303065646434636466636231333437613739616166313734343462343839626362643364353664376664356562373233363235653130316261666432323539343633336664626639326630613135373461653562613562323535353230393236353237623863633534313862653363376361376536366139356366353366356162663031623064343236613234336162643533643837643239636633643165326532663732626664396433366133653061343534656664373134633661366237616338363966636263366435303166613964316338386365623264303861333438626633656638653135356538633865353838623938636465653061306463313835646636366535393138393831653366303464323139386236383738333539616563653034376434643637663835313235636661313237633138373865643530616630393434613934616363356265316130323566623065633362663831613933626365366365343734336164363562656638353131343466343332323837356438323339303236656363613866643862376330396563356465373233666466313636656166386336356539666537353436333535333664393766383366316366663931396530386339373730636166633136376661656364306366656262323931666334343831333238333662366432</field>
-                <field name="notes">aaaa</field>
-                <field name="countView">341</field>
-                <field name="countDecrypt">35</field>
-                <field name="dateAdd">2018-03-25 09:54:07</field>
-                <field name="dateEdit">2018-04-02 21:38:25</field>
-                <field name="otherUserGroupEdit">0</field>
-                <field name="otherUserEdit">0</field>
-                <field name="isPrivate">0</field>
-                <field name="isPrivateGroup">0</field>
-                <field name="passDate">1522341709</field>
-                <field name="passDateChange">0</field>
-                <field name="parentId">0</field>
-            </row>
-            <row>
-                <field name="id">2</field>
-                <field name="userGroupId">2</field>
-                <field name="userId">2</field>
-                <field name="userEditId">1</field>
-                <field name="clientId">2</field>
-                <field name="name">Apple</field>
-                <field name="categoryId">2</field>
-                <field name="login">admin</field>
-                <field name="url">http://apple.com</field>
-                <field name="pass" xsi:type="xs:hexBinary">6465663530323030656135663361636362366237656462653536343938666234313231616635323237363539663162346532383963386361346565323732656530636238333632316436393736353665373631393435623033353236616164333730336662306531333535626437333638653033666137623565633364306365323634663863643436393436633365353234316534373338376130393133663935303736396364613365313234643432306636393834386434613262316231306138</field>
-                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303065646434636466636231333437613739616166313734343462343839626362643364353664376664356562373233363235653130316261666432323539343633336664626639326630613135373461653562613562323535353230393236353237623863633534313862653363376361376536366139356366353366356162663031623064343236613234336162643533643837643239636633643165326532663732626664396433366133653061343534656664373134633661366237616338363966636263366435303166613964316338386365623264303861333438626633656638653135356538633865353838623938636465653061306463313835646636366535393138393831653366303464323139386236383738333539616563653034376434643637663835313235636661313237633138373865643530616630393434613934616363356265316130323566623065633362663831613933626365366365343734336164363562656638353131343466343332323837356438323339303236656363613866643862376330396563356465373233666466313636656166386336356539666537353436333535333664393766383366316366663931396530386339373730636166633136376661656364306366656262323931666334343831333238333662366432</field>
-                <field name="notes">bbbb</field>
-                <field name="countView">341</field>
-                <field name="countDecrypt">35</field>
-                <field name="dateAdd">2018-03-25 09:54:07</field>
-                <field name="dateEdit">2018-04-02 21:38:25</field>
-                <field name="otherUserGroupEdit">0</field>
-                <field name="otherUserEdit">0</field>
-                <field name="isPrivate">0</field>
-                <field name="isPrivateGroup">0</field>
-                <field name="passDate">1522341709</field>
-                <field name="passDateChange">0</field>
-                <field name="parentId">0</field>
-            </row>
-        </table_data>
-        <table_data name="AccountToUser">
-            <row>
-                <field name="accountId">1</field>
-                <field name="userId">3</field>
-                <field name="isEdit">1</field>
-            </row>
-            <row>
-                <field name="accountId">2</field>
-                <field name="userId">3</field>
-                <field name="isEdit">0</field>
-            </row>
-        </table_data>
-        <table_data name="AccountToUserGroup">
-            <row>
-                <field name="accountId">1</field>
-                <field name="userGroupId">2</field>
-                <field name="isEdit">1</field>
-            </row>
-            <row>
-                <field name="accountId">2</field>
-                <field name="userGroupId">3</field>
-                <field name="isEdit">0</field>
-            </row>
-        </table_data>
-        <table_data name="UserToUserGroup">
-            <row>
-                <field name="userId">1</field>
-                <field name="userGroupId">2</field>
-            </row>
-            <row>
-                <field name="userId">3</field>
-                <field name="userGroupId">2</field>
-            </row>
-            <row>
-                <field name="userId">2</field>
-                <field name="userGroupId">1</field>
-            </row>
-        </table_data>
-    </database>
-</mysqldump>

tests/res/datasets/syspass_accountCrypt.xml

@@ -1,232 +0,0 @@
-<?xml version="1.0"?>
-<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <database name="syspass">
-        <table_data name="Account">
-            <row>
-                <field name="id">1</field>
-                <field name="userGroupId">1</field>
-                <field name="userId">1</field>
-                <field name="userEditId">1</field>
-                <field name="clientId">1</field>
-                <field name="name">Google</field>
-                <field name="categoryId">1</field>
-                <field name="login">admin</field>
-                <field name="url">http://google.com</field>
-                <field name="pass" xsi:type="xs:hexBinary">6465663530323030656135663361636362366237656462653536343938666234313231616635323237363539663162346532383963386361346565323732656530636238333632316436393736353665373631393435623033353236616164333730336662306531333535626437333638653033666137623565633364306365323634663863643436393436633365353234316534373338376130393133663935303736396364613365313234643432306636393834386434613262316231306138</field>
-                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303065646434636466636231333437613739616166313734343462343839626362643364353664376664356562373233363235653130316261666432323539343633336664626639326630613135373461653562613562323535353230393236353237623863633534313862653363376361376536366139356366353366356162663031623064343236613234336162643533643837643239636633643165326532663732626664396433366133653061343534656664373134633661366237616338363966636263366435303166613964316338386365623264303861333438626633656638653135356538633865353838623938636465653061306463313835646636366535393138393831653366303464323139386236383738333539616563653034376434643637663835313235636661313237633138373865643530616630393434613934616363356265316130323566623065633362663831613933626365366365343734336164363562656638353131343466343332323837356438323339303236656363613866643862376330396563356465373233666466313636656166386336356539666537353436333535333664393766383366316366663931396530386339373730636166633136376661656364306366656262323931666334343831333238333662366432</field>
-                <field name="notes">aaaa</field>
-                <field name="countView">341</field>
-                <field name="countDecrypt">35</field>
-                <field name="dateAdd">2018-03-25 09:54:07</field>
-                <field name="dateEdit">2018-04-02 21:38:25</field>
-                <field name="otherUserGroupEdit">0</field>
-                <field name="otherUserEdit">0</field>
-                <field name="isPrivate">0</field>
-                <field name="isPrivateGroup">0</field>
-                <field name="passDate">1522341709</field>
-                <field name="passDateChange">0</field>
-                <field name="parentId">0</field>
-            </row>
-            <row>
-                <field name="id">2</field>
-                <field name="userGroupId">2</field>
-                <field name="userId">2</field>
-                <field name="userEditId">1</field>
-                <field name="clientId">2</field>
-                <field name="name">Apple</field>
-                <field name="categoryId">2</field>
-                <field name="login">admin</field>
-                <field name="url">http://apple.com</field>
-                <field name="pass" xsi:type="xs:hexBinary">6465663530323030656135663361636362366237656462653536343938666234313231616635323237363539663162346532383963386361346565323732656530636238333632316436393736353665373631393435623033353236616164333730336662306531333535626437333638653033666137623565633364306365323634663863643436393436633365353234316534373338376130393133663935303736396364613365313234643432306636393834386434613262316231306138</field>
-                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303065646434636466636231333437613739616166313734343462343839626362643364353664376664356562373233363235653130316261666432323539343633336664626639326630613135373461653562613562323535353230393236353237623863633534313862653363376361376536366139356366353366356162663031623064343236613234336162643533643837643239636633643165326532663732626664396433366133653061343534656664373134633661366237616338363966636263366435303166613964316338386365623264303861333438626633656638653135356538633865353838623938636465653061306463313835646636366535393138393831653366303464323139386236383738333539616563653034376434643637663835313235636661313237633138373865643530616630393434613934616363356265316130323566623065633362663831613933626365366365343734336164363562656638353131343466343332323837356438323339303236656363613866643862376330396563356465373233666466313636656166386336356539666537353436333535333664393766383366316366663931396530386339373730636166633136376661656364306366656262323931666334343831333238333662366432</field>
-                <field name="notes">bbbb</field>
-                <field name="countView">341</field>
-                <field name="countDecrypt">35</field>
-                <field name="dateAdd">2018-03-25 09:54:07</field>
-                <field name="dateEdit">2018-04-02 21:38:25</field>
-                <field name="otherUserGroupEdit">0</field>
-                <field name="otherUserEdit">0</field>
-                <field name="isPrivate">0</field>
-                <field name="isPrivateGroup">0</field>
-                <field name="passDate">1522341709</field>
-                <field name="passDateChange">0</field>
-                <field name="parentId">0</field>
-            </row>
-        </table_data>
-        <table_data name="AccountHistory">
-            <row>
-                <field name="id">3</field>
-                <field name="accountId">2</field>
-                <field name="userGroupId">1</field>
-                <field name="userId">1</field>
-                <field name="userEditId">1</field>
-                <field name="clientId">1</field>
-                <field name="name">Google</field>
-                <field name="categoryId">1</field>
-                <field name="login">admin</field>
-                <field name="url">https://google.com</field>
-                <field name="pass" xsi:type="xs:hexBinary">646566353032303064396362643366376662646536326637663732663861383732623430613839386131643134333933663662623033316664343362366461643762626564643634386437363964346634616234386638336636653236396166623734636261383134313363626162326461393733343934613231653934666331616664633637313732316562356666396562646132613665313937626233333563613632383830393934333863643731333230383132316430366433303838</field>
-                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303032636635623034396437656539356531653838663166613438643061616132663133613163663766346238316165663837326134373665316461653661353865316666626438346130383166303062633138646136373265653935643234626564336565303063333262646262303433336633356534323263616337613238363532336233313666316137333462616337343839346631333632643863376430373861373862396135633064396239653061353537626562666336636566623766363166376330393734356461623536373762303436313865343936383434663932666364303634316330303935636239363938336361336631363161623134663339643536636233653938333833613062396464356365383736333334376364363933313563306436343362623937366139383831376632346431303364316533353133306262393862353034353262346334663934663162323531383632356530653331346438343430323362666334306264616265376437386238663632326535353338636537663431626261616461613138646333333662623762636565333030656565333734616537356365303131363731323239383132383964346634383661376635303136303835336138663335653366393230383632386162373332343335633037656432616234</field>
-                <field name="notes">blablacar</field>
-                <field name="countView">7</field>
-                <field name="countDecrypt">1</field>
-                <field name="dateAdd">2018-06-05 22:49:34</field>
-                <field name="dateEdit">2018-06-06 22:20:29</field>
-                <field name="isModify">1</field>
-                <field name="isDeleted">0</field>
-                <field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
-                <field name="otherUserEdit">0</field>
-                <field name="otherUserGroupEdit">0</field>
-                <field name="passDate" xsi:nil="true" />
-                <field name="passDateChange" xsi:nil="true" />
-                <field name="parentId" xsi:nil="true" />
-                <field name="isPrivate">0</field>
-                <field name="isPrivateGroup">0</field>
-            </row>
-            <row>
-                <field name="id">4</field>
-                <field name="accountId">1</field>
-                <field name="userGroupId">1</field>
-                <field name="userId">1</field>
-                <field name="userEditId">1</field>
-                <field name="clientId">1</field>
-                <field name="name">Google</field>
-                <field name="categoryId">1</field>
-                <field name="login">admin</field>
-                <field name="url">https://google.com</field>
-                <field name="pass" xsi:type="xs:hexBinary">64656635303230303864313263313434383662336363353938366164613564643563393465356664353138363635643062626362613938353236646336396662333833366537363635393931353336653262326533336339323232396663636336373139393662316631616432323839326539323332343633656164386262326234363033666565306630643666323364383337363661363363353139356334333330633139636634623664343131396362356136386232636332653465616232393561</field>
-                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303039326134383433323238376332636136626165313731363538316661316663393832356364653733316361623361316661343832646536626336663066646138623133323366396137626666643837386434623862633234653364363731626136613661393631343738633437653864626363656565333136343436346262623235623563633362663935363030653034346636326666636237303635343362333330616561363036336332383433383063303931383533653436616430396131393534653064393233643438313932393532646631353931623031333636356461373337646435653536623436653639396332613165363438653761623736653766383732653566376535623133303838666636663133313461376336353964373561386162323535346635653137626139626266396236363062613735306461313737626339303662316636633766343736383462346638353630356661663863323365646437393766333961303033666137653361366665383631373137613465333037366637393364356135326536646236363032663061373934373930383635336238616437333839646338653738383930303234633561623365336431373836396261626630363234326661306165663138396163376138616636313636323037313930333762666565</field>
-                <field name="notes"></field>
-                <field name="countView">11</field>
-                <field name="countDecrypt">0</field>
-                <field name="dateAdd">2018-06-05 22:11:40</field>
-                <field name="dateEdit" xsi:nil="true" />
-                <field name="isModify">1</field>
-                <field name="isDeleted">0</field>
-                <field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
-                <field name="otherUserEdit">0</field>
-                <field name="otherUserGroupEdit">0</field>
-                <field name="passDate" xsi:nil="true" />
-                <field name="passDateChange" xsi:nil="true" />
-                <field name="parentId" xsi:nil="true" />
-                <field name="isPrivate">0</field>
-                <field name="isPrivateGroup">0</field>
-            </row>
-            <row>
-                <field name="id">5</field>
-                <field name="accountId">1</field>
-                <field name="userGroupId">1</field>
-                <field name="userId">1</field>
-                <field name="userEditId">1</field>
-                <field name="clientId">1</field>
-                <field name="name">Google</field>
-                <field name="categoryId">1</field>
-                <field name="login">admin</field>
-                <field name="url">https://google.com</field>
-                <field name="pass" xsi:type="xs:hexBinary">64656635303230303864313263313434383662336363353938366164613564643563393465356664353138363635643062626362613938353236646336396662333833366537363635393931353336653262326533336339323232396663636336373139393662316631616432323839326539323332343633656164386262326234363033666565306630643666323364383337363661363363353139356334333330633139636634623664343131396362356136386232636332653465616232393561</field>
-                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303039326134383433323238376332636136626165313731363538316661316663393832356364653733316361623361316661343832646536626336663066646138623133323366396137626666643837386434623862633234653364363731626136613661393631343738633437653864626363656565333136343436346262623235623563633362663935363030653034346636326666636237303635343362333330616561363036336332383433383063303931383533653436616430396131393534653064393233643438313932393532646631353931623031333636356461373337646435653536623436653639396332613165363438653761623736653766383732653566376535623133303838666636663133313461376336353964373561386162323535346635653137626139626266396236363062613735306461313737626339303662316636633766343736383462346638353630356661663863323365646437393766333961303033666137653361366665383631373137613465333037366637393364356135326536646236363032663061373934373930383635336238616437333839646338653738383930303234633561623365336431373836396261626630363234326661306165663138396163376138616636313636323037313930333762666565</field>
-                <field name="notes"></field>
-                <field name="countView">11</field>
-                <field name="countDecrypt">0</field>
-                <field name="dateAdd">2018-06-05 22:11:40</field>
-                <field name="dateEdit">2018-06-13 20:13:53</field>
-                <field name="isModify">1</field>
-                <field name="isDeleted">0</field>
-                <field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
-                <field name="otherUserEdit">0</field>
-                <field name="otherUserGroupEdit">0</field>
-                <field name="passDate" xsi:nil="true" />
-                <field name="passDateChange" xsi:nil="true" />
-                <field name="parentId" xsi:nil="true" />
-                <field name="isPrivate">0</field>
-                <field name="isPrivateGroup">0</field>
-            </row>
-            <row>
-                <field name="id">6</field>
-                <field name="accountId">1</field>
-                <field name="userGroupId">1</field>
-                <field name="userId">1</field>
-                <field name="userEditId">1</field>
-                <field name="clientId">1</field>
-                <field name="name">Google</field>
-                <field name="categoryId">1</field>
-                <field name="login">admin</field>
-                <field name="url">https://google.com</field>
-                <field name="pass" xsi:type="xs:hexBinary">64656635303230303864313263313434383662336363353938366164613564643563393465356664353138363635643062626362613938353236646336396662333833366537363635393931353336653262326533336339323232396663636336373139393662316631616432323839326539323332343633656164386262326234363033666565306630643666323364383337363661363363353139356334333330633139636634623664343131396362356136386232636332653465616232393561</field>
-                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303039326134383433323238376332636136626165313731363538316661316663393832356364653733316361623361316661343832646536626336663066646138623133323366396137626666643837386434623862633234653364363731626136613661393631343738633437653864626363656565333136343436346262623235623563633362663935363030653034346636326666636237303635343362333330616561363036336332383433383063303931383533653436616430396131393534653064393233643438313932393532646631353931623031333636356461373337646435653536623436653639396332613165363438653761623736653766383732653566376535623133303838666636663133313461376336353964373561386162323535346635653137626139626266396236363062613735306461313737626339303662316636633766343736383462346638353630356661663863323365646437393766333961303033666137653361366665383631373137613465333037366637393364356135326536646236363032663061373934373930383635336238616437333839646338653738383930303234633561623365336431373836396261626630363234326661306165663138396163376138616636313636323037313930333762666565</field>
-                <field name="notes"></field>
-                <field name="countView">11</field>
-                <field name="countDecrypt">0</field>
-                <field name="dateAdd">2018-06-05 22:11:40</field>
-                <field name="dateEdit">2018-06-13 20:13:58</field>
-                <field name="isModify">1</field>
-                <field name="isDeleted">0</field>
-                <field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
-                <field name="otherUserEdit">0</field>
-                <field name="otherUserGroupEdit">0</field>
-                <field name="passDate" xsi:nil="true" />
-                <field name="passDateChange" xsi:nil="true" />
-                <field name="parentId" xsi:nil="true" />
-                <field name="isPrivate">0</field>
-                <field name="isPrivateGroup">0</field>
-            </row>
-            <row>
-                <field name="id">7</field>
-                <field name="accountId">1</field>
-                <field name="userGroupId">1</field>
-                <field name="userId">1</field>
-                <field name="userEditId">1</field>
-                <field name="clientId">1</field>
-                <field name="name">Google</field>
-                <field name="categoryId">1</field>
-                <field name="login">admin</field>
-                <field name="url">https://google.com</field>
-                <field name="pass" xsi:type="xs:hexBinary">64656635303230303864313263313434383662336363353938366164613564643563393465356664353138363635643062626362613938353236646336396662333833366537363635393931353336653262326533336339323232396663636336373139393662316631616432323839326539323332343633656164386262326234363033666565306630643666323364383337363661363363353139356334333330633139636634623664343131396362356136386232636332653465616232393561</field>
-                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303039326134383433323238376332636136626165313731363538316661316663393832356364653733316361623361316661343832646536626336663066646138623133323366396137626666643837386434623862633234653364363731626136613661393631343738633437653864626363656565333136343436346262623235623563633362663935363030653034346636326666636237303635343362333330616561363036336332383433383063303931383533653436616430396131393534653064393233643438313932393532646631353931623031333636356461373337646435653536623436653639396332613165363438653761623736653766383732653566376535623133303838666636663133313461376336353964373561386162323535346635653137626139626266396236363062613735306461313737626339303662316636633766343736383462346638353630356661663863323365646437393766333961303033666137653361366665383631373137613465333037366637393364356135326536646236363032663061373934373930383635336238616437333839646338653738383930303234633561623365336431373836396261626630363234326661306165663138396163376138616636313636323037313930333762666565</field>
-                <field name="notes"></field>
-                <field name="countView">11</field>
-                <field name="countDecrypt">0</field>
-                <field name="dateAdd">2018-06-05 22:11:40</field>
-                <field name="dateEdit">2018-06-13 20:14:23</field>
-                <field name="isModify">1</field>
-                <field name="isDeleted">0</field>
-                <field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
-                <field name="otherUserEdit">0</field>
-                <field name="otherUserGroupEdit">0</field>
-                <field name="passDate" xsi:nil="true" />
-                <field name="passDateChange" xsi:nil="true" />
-                <field name="parentId" xsi:nil="true" />
-                <field name="isPrivate">0</field>
-                <field name="isPrivateGroup">0</field>
-            </row>
-        </table_data>
-        <table_data name="CustomFieldData">
-            <row>
-                <field name="id">1</field>
-                <field name="moduleId">10</field>
-                <field name="itemId">1</field>
-                <field name="definitionId">1</field>
-                <field name="data" xsi:type="xs:hexBinary">6465663530323030633262353536613539613465333330646461323833363730363462623861326463336630643963386565333935366134326631326135326261323035633036663063313933313263626465353630396562303133356364613461353738636534616263323436343235613739343338663461393231353433623437633062386134363566336466663131373061613162663532356466646434383165613664333763303537396132</field>
-                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303061356237393366343238663337393936356539393836656663363632396332613462336662323431666131343731326332333138323465376632366639313863383663653164636330393838333735343463326237316232383361663135633731363438326630303863313135326563623238383939313939346139376165613836623432613534333166383261343734343565636336376137643462633266396263343065653162333236343030373163333334386338626331613632323165613534346433396630636537343538356561653432376266373131633864366237336166316561613237623630643863626631643531666636366133366562636364353232643538633734653664626363613534646334366662303739626631653537626530646231643363316464313264303139633665663437633366353431303231633233376639303066333633323838613864346464393463323637306365313239393864626237396235333262623266383330323164663062656631326138363664646132343132653338333535636137646465613364336663366535303532346634653961313435366466313034626238376433633532353837643036613162383066613361613064643330633866356239373338663930336535653432653362363333333739333863</field>
-            </row>
-            <row>
-                <field name="id">2</field>
-                <field name="moduleId">61</field>
-                <field name="itemId">1</field>
-                <field name="definitionId">2</field>
-                <field name="data" xsi:type="xs:hexBinary">4C6F72656D20697073756D20646F6C6F722073697420616D65742C20636F6E73656374657475722061646970697363696E6720656C69742E205365642075742074696E636964756E74206C6F72656D2E205072616573656E74207665686963756C6120766F6C7574706174206C696265726F2073697420616D65742066617563696275732E2041656E65616E20766974616520617263752071756973206C616375732070756C76696E617220737573636970697420617420656765742074656C6C75732E204E616D2066656C6973207475727069732C207363656C657269737175652075742066656C69732061632C2074696E636964756E74206D6178696D7573206D692E205365642076756C7075746174652076697461652073656D20616320736F6C6C696369747564696E2E20446F6E6563206672696E67696C6C61206C6F626F7274697320657820657520706F72747469746F722E20457469616D2073656D70657220736F6C6C696369747564696E207665686963756C612E20467573636520766172697573206E756C6C61206D657475732C206E65632076697665727261206E696268206469676E697373696D2069642E</field>
-                <field name="key" xsi:nil="true" />
-            </row>
-        </table_data>
-        <table_data name="Config">
-            <row>
-                <field name="parameter">lastupdatempass</field>
-                <field name="VALUE">1528236611</field>
-            </row>
-            <row>
-                <field name="parameter">masterPwd</field>
-                <field name="VALUE">$2y$10$xtsuN2PUvgSH/0mrfBlsbOActVgCjYcqDqC6L3T9QraNxZC4RXGYa</field>
-            </row>
-        </table_data>
-    </database>
-</mysqldump>

tests/res/datasets/syspass_accountFavorite.xml

@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<mysqldump>
-<database name="syspass">
-    <table_data name="User">
-        <row>
-            <field name="id">1</field>
-            <field name="name">sysPass Admin</field>
-            <field name="userGroupId">1</field>
-            <field name="login">admin</field>
-            <field name="ssoLogin" xsi:nil="true" />
-            <field name="pass" xsi:type="xs:hexBinary">243279243130247635695230547A4933744E3036416A304C4A656B39755371496834356C70575539366E644A71444A704E6969713139306A444A486D</field>
-            <field name="mPass" xsi:type="xs:hexBinary">64656635303230306330383635633335373637316233366261353266333137346134356466333633626135656431613962323261356461353965376134373930356664656239373436356462373934613831373635316133316432626363636266663836626233353235643930333932393734323535663937316261616239656436346637383266363066646465386539336637363164356663633436393031356433363164333234643436633533633138313335613334663739633039</field>
-            <field name="mKey" xsi:type="xs:hexBinary">6465663130303030646566353032303062316163626161346361643036643237386562323533616462643433613966376463636439343063656265313962343061383436643464633035303636306466653630613561653139363433643636353936643733333764646236386536363930336562383031373764356463386430663963623661643361663565643766303936376262393964663530373936316330656132373462663830346333663966373563336538643539396336326231623738333730303963616263373836383637366433636337376162383365386338323335336335626164396534656535333532656132346632653434653663316336656131643162313264393332386335303539623437656235343534666138356435626437343637353333383132636662313230316634633635383733316465323934613664643035396332613362373333613765343462633539306338363337393032306662303263363262303565613030623234646235323566653863303263323138666561356661353139306563396266333461316637613937633733396637343534323333316466323932343965323138656338343233306161623038373336346463353236363935383630656638623232313439626262656636656266373030366638376434343661333535353863323062353462376336623330</field>
-            <field name="email" xsi:nil="true" />
-            <field name="notes" xsi:nil="true" />
-            <field name="loginCount">81</field>
-            <field name="userProfileId">1</field>
-            <field name="lastLogin">2018-04-19 23:46:48</field>
-            <field name="lastUpdate">2018-04-19 23:46:48</field>
-            <field name="lastUpdateMPass">1521887152</field>
-            <field name="isAdminApp">1</field>
-            <field name="isAdminAcc">0</field>
-            <field name="isLdap">0</field>
-            <field name="isDisabled">0</field>
-            <field name="hashSalt"></field>
-            <field name="isMigrate">0</field>
-            <field name="isChangePass">0</field>
-            <field name="isChangedPass">0</field>
-            <field name="preferences" xsi:type="xs:hexBinary">4F3A33323A2253505C446174614D6F64656C5C55736572507265666572656E63657344617461223A31303A7B733A373A22757365725F6964223B693A313B733A363A22757365324661223B623A303B733A343A226C616E67223B733A353A22656E5F5553223B733A353A227468656D65223B733A31333A226D6174657269616C2D626C7565223B733A31343A22726573756C747350657250616765223B693A34383B733A31313A226163636F756E744C696E6B223B623A313B733A393A22736F72745669657773223B623A303B733A393A22746F704E6176626172223B623A303B733A31353A226F7074696F6E616C416374696F6E73223B623A303B733A31343A22726573756C747341734361726473223B623A303B7D</field>
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="name">sysPass demo</field>
-            <field name="userGroupId">2</field>
-            <field name="login">demo</field>
-            <field name="ssoLogin">demo</field>
-            <field name="pass" xsi:type="xs:hexBinary">2432792431302454726E69756C5763754361433635346F76566F35392E766B4C5433414E31624A6D726A79553462696335325069436A6B5572396669</field>
-            <field name="mPass" xsi:type="xs:hexBinary">64656635303230303231616533353730373263373165626239393534353966366236636164373235336534316336633534353036336339326136653730616366333930393165373934613865376662386662326664333931383932363562396466303133333631623063323732323339653465373165343839313030646534326265633737623966343238396635633936613837646531343864313963653663643338613131343932623163313765653630326430623532343564346566</field>
-            <field name="mKey" xsi:type="xs:hexBinary">6465663130303030646566353032303035643534316262633462653032333563313338626561366561333536626436663037353365313035653030333563653166316235336534663364343565366262353335626163396639646538653131316262356334383865336535633637323333666632626365313837626335386135353839373535373034386564353634366361646638623736396132323164363032353435653034306264613135663138323638383665373536313236353361313037306530333261323365636364336339616438323162306363383962643130333035303931653965626332653935313465656631373462663339343664656132393661346262366264343463646333363361643335623032373561356633323430313936346531633131663937313764313139633130633561373161666332356365346534366661623234646663626362326237303964336335316532623834326464303933653230353965373265356638376363366236626239306231346265376264373637663163303937366231313362393630613265636565336633313131663538656131346139353736623332653163303962636435313366383733656664653062373333366238643464646637616237323333373038613264393965633738356139393036306135643262316366306262663739346262663765</field>
-            <field name="email">demo@syspass.org</field>
-            <field name="notes">aaaa</field>
-            <field name="loginCount">12</field>
-            <field name="userProfileId">2</field>
-            <field name="lastLogin">2018-04-01 21:29:47</field>
-            <field name="lastUpdate">2018-04-14 08:47:43</field>
-            <field name="lastUpdateMPass">1522582852</field>
-            <field name="isAdminApp">0</field>
-            <field name="isAdminAcc">0</field>
-            <field name="isLdap">0</field>
-            <field name="isDisabled">0</field>
-            <field name="hashSalt"></field>
-            <field name="isMigrate">0</field>
-            <field name="isChangePass">0</field>
-            <field name="isChangedPass">0</field>
-            <field name="preferences" xsi:nil="true" />
-        </row>
-        <row>
-            <field name="id">3</field>
-            <field name="name">User A</field>
-            <field name="userGroupId">2</field>
-            <field name="login">user_a</field>
-            <field name="ssoLogin">user_a</field>
-            <field name="pass" xsi:type="xs:hexBinary">2432792431302469444B442E2F4F624D79742E6F43594F5249514D5065624454783966744D636A703034365A435976662E765479597A594F6A4C472E</field>
-            <field name="mPass" xsi:nil="true" />
-            <field name="mKey" xsi:nil="true" />
-            <field name="email">user_a@syspass.org</field>
-            <field name="notes"></field>
-            <field name="loginCount">0</field>
-            <field name="userProfileId">1</field>
-            <field name="lastLogin">2018-04-14 08:48:08</field>
-            <field name="lastUpdate">2018-04-14 08:48:08</field>
-            <field name="lastUpdateMPass">0</field>
-            <field name="isAdminApp">0</field>
-            <field name="isAdminAcc">0</field>
-            <field name="isLdap">0</field>
-            <field name="isDisabled">0</field>
-            <field name="hashSalt"></field>
-            <field name="isMigrate">0</field>
-            <field name="isChangePass">0</field>
-            <field name="isChangedPass">0</field>
-            <field name="preferences" xsi:nil="true" />
-        </row>
-        <row>
-            <field name="id">4</field>
-            <field name="name">User B</field>
-            <field name="userGroupId">2</field>
-            <field name="login">user_b</field>
-            <field name="ssoLogin" xsi:nil="true" />
-            <field name="pass" xsi:type="xs:hexBinary">243279243130244C37643658736A663955794F6E583662472E6F384E4F713961674B6F64536B4B5674485350462F6861414E657971517065372E6532</field>
-            <field name="mPass" xsi:nil="true" />
-            <field name="mKey" xsi:nil="true" />
-            <field name="email">user_b@syspass.org</field>
-            <field name="notes"></field>
-            <field name="loginCount">0</field>
-            <field name="userProfileId">1</field>
-            <field name="lastLogin">2018-03-30 18:38:32</field>
-            <field name="lastUpdate">2018-03-30 18:38:32</field>
-            <field name="lastUpdateMPass">0</field>
-            <field name="isAdminApp">0</field>
-            <field name="isAdminAcc">0</field>
-            <field name="isLdap">0</field>
-            <field name="isDisabled">0</field>
-            <field name="hashSalt"></field>
-            <field name="isMigrate">0</field>
-            <field name="isChangePass">0</field>
-            <field name="isChangedPass">0</field>
-            <field name="preferences" xsi:nil="true" />
-        </row>
-    </table_data>
-    <table_data name="Account">
-        <row>
-            <field name="id">1</field>
-            <field name="userGroupId">1</field>
-            <field name="userId">1</field>
-            <field name="userEditId">1</field>
-            <field name="clientId">1</field>
-            <field name="name">Google</field>
-            <field name="categoryId">1</field>
-            <field name="login">admin</field>
-            <field name="url">http://google.com</field>
-            <field name="pass" xsi:type="xs:hexBinary">6465663530323030656135663361636362366237656462653536343938666234313231616635323237363539663162346532383963386361346565323732656530636238333632316436393736353665373631393435623033353236616164333730336662306531333535626437333638653033666137623565633364306365323634663863643436393436633365353234316534373338376130393133663935303736396364613365313234643432306636393834386434613262316231306138</field>
-            <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303065646434636466636231333437613739616166313734343462343839626362643364353664376664356562373233363235653130316261666432323539343633336664626639326630613135373461653562613562323535353230393236353237623863633534313862653363376361376536366139356366353366356162663031623064343236613234336162643533643837643239636633643165326532663732626664396433366133653061343534656664373134633661366237616338363966636263366435303166613964316338386365623264303861333438626633656638653135356538633865353838623938636465653061306463313835646636366535393138393831653366303464323139386236383738333539616563653034376434643637663835313235636661313237633138373865643530616630393434613934616363356265316130323566623065633362663831613933626365366365343734336164363562656638353131343466343332323837356438323339303236656363613866643862376330396563356465373233666466313636656166386336356539666537353436333535333664393766383366316366663931396530386339373730636166633136376661656364306366656262323931666334343831333238333662366432</field>
-            <field name="notes">aaaa</field>
-            <field name="countView">341</field>
-            <field name="countDecrypt">35</field>
-            <field name="dateAdd">2018-03-25 09:54:07</field>
-            <field name="dateEdit">2018-04-02 21:38:25</field>
-            <field name="otherUserGroupEdit">0</field>
-            <field name="otherUserEdit">0</field>
-            <field name="isPrivate">0</field>
-            <field name="isPrivateGroup">0</field>
-            <field name="passDate">1522341709</field>
-            <field name="passDateChange">0</field>
-            <field name="parentId">0</field>
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="userGroupId">1</field>
-            <field name="userId">1</field>
-            <field name="userEditId">1</field>
-            <field name="clientId">2</field>
-            <field name="name">Apple</field>
-            <field name="categoryId">2</field>
-            <field name="login">admin</field>
-            <field name="url">http://apple.com</field>
-            <field name="pass" xsi:type="xs:hexBinary">6465663530323030656135663361636362366237656462653536343938666234313231616635323237363539663162346532383963386361346565323732656530636238333632316436393736353665373631393435623033353236616164333730336662306531333535626437333638653033666137623565633364306365323634663863643436393436633365353234316534373338376130393133663935303736396364613365313234643432306636393834386434613262316231306138</field>
-            <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303065646434636466636231333437613739616166313734343462343839626362643364353664376664356562373233363235653130316261666432323539343633336664626639326630613135373461653562613562323535353230393236353237623863633534313862653363376361376536366139356366353366356162663031623064343236613234336162643533643837643239636633643165326532663732626664396433366133653061343534656664373134633661366237616338363966636263366435303166613964316338386365623264303861333438626633656638653135356538633865353838623938636465653061306463313835646636366535393138393831653366303464323139386236383738333539616563653034376434643637663835313235636661313237633138373865643530616630393434613934616363356265316130323566623065633362663831613933626365366365343734336164363562656638353131343466343332323837356438323339303236656363613866643862376330396563356465373233666466313636656166386336356539666537353436333535333664393766383366316366663931396530386339373730636166633136376661656364306366656262323931666334343831333238333662366432</field>
-            <field name="notes">bbbb</field>
-            <field name="countView">341</field>
-            <field name="countDecrypt">35</field>
-            <field name="dateAdd">2018-03-25 09:54:07</field>
-            <field name="dateEdit">2018-04-02 21:38:25</field>
-            <field name="otherUserGroupEdit">0</field>
-            <field name="otherUserEdit">0</field>
-            <field name="isPrivate">0</field>
-            <field name="isPrivateGroup">0</field>
-            <field name="passDate">1522341709</field>
-            <field name="passDateChange">0</field>
-            <field name="parentId">1</field>
-        </row>
-    </table_data>
-	<table_data name="AccountToFavorite">
-        <row>
-            <field name="accountId">1</field>
-            <field name="userId">3</field>
-        </row>
-        <row>
-            <field name="accountId">2</field>
-            <field name="userId">3</field>
-        </row>
-        <row>
-            <field name="accountId">1</field>
-            <field name="userId">1</field>
-        </row>
-        <row>
-            <field name="accountId">2</field>
-            <field name="userId">2</field>
-        </row>
-	</table_data>
-</database>
-</mysqldump>

tests/res/datasets/syspass_accountHistory.xml

@@ -1,387 +0,0 @@
-<?xml version="1.0"?>
-<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <database name="syspass">
-        <table_data name="Client">
-            <row>
-                <field name="id">1</field>
-                <field name="name">Google</field>
-                <field name="hash" xsi:type="xs:hexBinary">6338323263316236333835336564323733623839363837616335303566396661</field>
-                <field name="description">Google Inc.</field>
-                <field name="isGlobal">0</field>
-            </row>
-            <row>
-                <field name="id">2</field>
-                <field name="name">Apple</field>
-                <field name="hash" xsi:type="xs:hexBinary">3166333837306265323734663663343962336533316130633637323839353766</field>
-                <field name="description">Apple Inc.</field>
-                <field name="isGlobal">0</field>
-            </row>
-            <row>
-                <field name="id">3</field>
-                <field name="name">Microsoft</field>
-                <field name="hash" xsi:type="xs:hexBinary">3566353332613366633466316561343033663337303730663539613761353361</field>
-                <field name="description">Microsoft Inc.</field>
-                <field name="isGlobal">1</field>
-            </row>
-        </table_data>
-        <table_data name="Category">
-            <row>
-                <field name="id">1</field>
-                <field name="name">Web</field>
-                <field name="description">Web sites</field>
-                <field name="hash" xsi:type="xs:hexBinary">3235363761356563393730356562376163326339383430333365303631383964</field>
-            </row>
-            <row>
-                <field name="id">2</field>
-                <field name="name">Linux</field>
-                <field name="description">Linux server</field>
-                <field name="hash" xsi:type="xs:hexBinary">6532303661353465393736393063636535306363383732646437306565383936</field>
-            </row>
-            <row>
-                <field name="id">3</field>
-                <field name="name">SSH</field>
-                <field name="description">SSH access</field>
-                <field name="hash" xsi:type="xs:hexBinary">3137383764373634363330346335643938376366346536346133393733646337</field>
-            </row>
-        </table_data>
-        <table_data name="UserGroup">
-            <row>
-                <field name="id">1</field>
-                <field name="name">Admins</field>
-                <field name="description">sysPass Admins</field>
-            </row>
-            <row>
-                <field name="id">2</field>
-                <field name="name">Demo</field>
-                <field name="description"/>
-            </row>
-            <row>
-                <field name="id">3</field>
-                <field name="name">Usuarios</field>
-                <field name="description">Grupo Usuarios</field>
-            </row>
-        </table_data>
-        <table_data name="UserProfile">
-            <row>
-                <field name="id">1</field>
-                <field name="name">Admin</field>
-                <field name="profile" xsi:type="xs:hexBinary">4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A303B733A31343A22002A006163635669657750617373223B623A303B733A31373A22002A0061636356696577486973746F7279223B623A303B733A31303A22002A0061636345646974223B623A303B733A31343A22002A006163634564697450617373223B623A303B733A393A22002A00616363416464223B623A303B733A31323A22002A0061636344656C657465223B623A303B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A313B733A31383A22002A006163635072697661746547726F7570223B623A313B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D</field>
-            </row>
-            <row>
-                <field name="id">2</field>
-                <field name="name">Demo</field>
-                <field name="profile" xsi:type="xs:hexBinary">4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A313B733A31343A22002A006163635669657750617373223B623A313B733A31373A22002A0061636356696577486973746F7279223B623A313B733A31303A22002A0061636345646974223B623A313B733A31343A22002A006163634564697450617373223B623A313B733A393A22002A00616363416464223B623A313B733A31323A22002A0061636344656C657465223B623A313B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A303B733A31383A22002A006163635072697661746547726F7570223B623A303B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D</field>
-            </row>
-            <row>
-                <field name="id">3</field>
-                <field name="name">Usuarios</field>
-                <field name="profile" xsi:type="xs:hexBinary">4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A313B733A31343A22002A006163635669657750617373223B623A313B733A31373A22002A0061636356696577486973746F7279223B623A313B733A31303A22002A0061636345646974223B623A313B733A31343A22002A006163634564697450617373223B623A313B733A393A22002A00616363416464223B623A313B733A31323A22002A0061636344656C657465223B623A313B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A303B733A31383A22002A006163635072697661746547726F7570223B623A303B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D</field>
-            </row>
-        </table_data>
-        <table_data name="User">
-            <row>
-                <field name="id">1</field>
-                <field name="name">sysPass Admin</field>
-                <field name="userGroupId">1</field>
-                <field name="login">admin</field>
-                <field name="ssoLogin" xsi:nil="true" />
-                <field name="pass" xsi:type="xs:hexBinary">243279243130247635695230547A4933744E3036416A304C4A656B39755371496834356C70575539366E644A71444A704E6969713139306A444A486D</field>
-                <field name="mPass" xsi:type="xs:hexBinary">64656635303230306330383635633335373637316233366261353266333137346134356466333633626135656431613962323261356461353965376134373930356664656239373436356462373934613831373635316133316432626363636266663836626233353235643930333932393734323535663937316261616239656436346637383266363066646465386539336637363164356663633436393031356433363164333234643436633533633138313335613334663739633039</field>
-                <field name="mKey" xsi:type="xs:hexBinary">6465663130303030646566353032303062316163626161346361643036643237386562323533616462643433613966376463636439343063656265313962343061383436643464633035303636306466653630613561653139363433643636353936643733333764646236386536363930336562383031373764356463386430663963623661643361663565643766303936376262393964663530373936316330656132373462663830346333663966373563336538643539396336326231623738333730303963616263373836383637366433636337376162383365386338323335336335626164396534656535333532656132346632653434653663316336656131643162313264393332386335303539623437656235343534666138356435626437343637353333383132636662313230316634633635383733316465323934613664643035396332613362373333613765343462633539306338363337393032306662303263363262303565613030623234646235323566653863303263323138666561356661353139306563396266333461316637613937633733396637343534323333316466323932343965323138656338343233306161623038373336346463353236363935383630656638623232313439626262656636656266373030366638376434343661333535353863323062353462376336623330</field>
-                <field name="email" xsi:nil="true" />
-                <field name="notes" xsi:nil="true" />
-                <field name="loginCount">81</field>
-                <field name="userProfileId">1</field>
-                <field name="lastLogin">2018-04-19 23:46:48</field>
-                <field name="lastUpdate" xsi:nil="true" />
-                <field name="lastUpdateMPass">1521887152</field>
-                <field name="isAdminApp">1</field>
-                <field name="isAdminAcc">0</field>
-                <field name="isLdap">0</field>
-                <field name="isDisabled">0</field>
-                <field name="hashSalt"></field>
-                <field name="isMigrate">0</field>
-                <field name="isChangePass">0</field>
-                <field name="isChangedPass">0</field>
-                <field name="preferences" xsi:type="xs:hexBinary">4F3A33323A2253505C446174614D6F64656C5C55736572507265666572656E63657344617461223A31303A7B733A373A22757365725F6964223B693A313B733A363A22757365324661223B623A303B733A343A226C616E67223B733A353A22656E5F5553223B733A353A227468656D65223B733A31333A226D6174657269616C2D626C7565223B733A31343A22726573756C747350657250616765223B693A34383B733A31313A226163636F756E744C696E6B223B623A313B733A393A22736F72745669657773223B623A303B733A393A22746F704E6176626172223B623A303B733A31353A226F7074696F6E616C416374696F6E73223B623A303B733A31343A22726573756C747341734361726473223B623A303B7D</field>
-            </row>
-            <row>
-                <field name="id">2</field>
-                <field name="name">sysPass demo</field>
-                <field name="userGroupId">2</field>
-                <field name="login">demo</field>
-                <field name="ssoLogin">demo</field>
-                <field name="pass" xsi:type="xs:hexBinary">2432792431302454726E69756C5763754361433635346F76566F35392E766B4C5433414E31624A6D726A79553462696335325069436A6B5572396669</field>
-                <field name="mPass" xsi:type="xs:hexBinary">64656635303230303231616533353730373263373165626239393534353966366236636164373235336534316336633534353036336339326136653730616366333930393165373934613865376662386662326664333931383932363562396466303133333631623063323732323339653465373165343839313030646534326265633737623966343238396635633936613837646531343864313963653663643338613131343932623163313765653630326430623532343564346566</field>
-                <field name="mKey" xsi:type="xs:hexBinary">6465663130303030646566353032303035643534316262633462653032333563313338626561366561333536626436663037353365313035653030333563653166316235336534663364343565366262353335626163396639646538653131316262356334383865336535633637323333666632626365313837626335386135353839373535373034386564353634366361646638623736396132323164363032353435653034306264613135663138323638383665373536313236353361313037306530333261323365636364336339616438323162306363383962643130333035303931653965626332653935313465656631373462663339343664656132393661346262366264343463646333363361643335623032373561356633323430313936346531633131663937313764313139633130633561373161666332356365346534366661623234646663626362326237303964336335316532623834326464303933653230353965373265356638376363366236626239306231346265376264373637663163303937366231313362393630613265636565336633313131663538656131346139353736623332653163303962636435313366383733656664653062373333366238643464646637616237323333373038613264393965633738356139393036306135643262316366306262663739346262663765</field>
-                <field name="email">demo@syspass.org</field>
-                <field name="notes">aaaa</field>
-                <field name="loginCount">12</field>
-                <field name="userProfileId">2</field>
-                <field name="lastLogin">2018-04-01 21:29:47</field>
-                <field name="lastUpdate">2018-04-14 08:47:43</field>
-                <field name="lastUpdateMPass">1522582852</field>
-                <field name="isAdminApp">0</field>
-                <field name="isAdminAcc">0</field>
-                <field name="isLdap">0</field>
-                <field name="isDisabled">0</field>
-                <field name="hashSalt"></field>
-                <field name="isMigrate">0</field>
-                <field name="isChangePass">0</field>
-                <field name="isChangedPass">0</field>
-                <field name="preferences" xsi:nil="true" />
-            </row>
-            <row>
-                <field name="id">3</field>
-                <field name="name">User A</field>
-                <field name="userGroupId">2</field>
-                <field name="login">user_a</field>
-                <field name="ssoLogin">user_a</field>
-                <field name="pass" xsi:type="xs:hexBinary">2432792431302469444B442E2F4F624D79742E6F43594F5249514D5065624454783966744D636A703034365A435976662E765479597A594F6A4C472E</field>
-                <field name="mPass" xsi:nil="true" />
-                <field name="mKey" xsi:nil="true" />
-                <field name="email">user_a@syspass.org</field>
-                <field name="notes"></field>
-                <field name="loginCount">0</field>
-                <field name="userProfileId">1</field>
-                <field name="lastLogin" xsi:nil="true" />
-                <field name="lastUpdate">2018-04-14 08:48:08</field>
-                <field name="lastUpdateMPass">0</field>
-                <field name="isAdminApp">0</field>
-                <field name="isAdminAcc">0</field>
-                <field name="isLdap">0</field>
-                <field name="isDisabled">0</field>
-                <field name="hashSalt"></field>
-                <field name="isMigrate">0</field>
-                <field name="isChangePass">0</field>
-                <field name="isChangedPass">0</field>
-                <field name="preferences" xsi:nil="true" />
-            </row>
-            <row>
-                <field name="id">4</field>
-                <field name="name">User B</field>
-                <field name="userGroupId">2</field>
-                <field name="login">user_b</field>
-                <field name="ssoLogin" xsi:nil="true" />
-                <field name="pass" xsi:type="xs:hexBinary">243279243130244C37643658736A663955794F6E583662472E6F384E4F713961674B6F64536B4B5674485350462F6861414E657971517065372E6532</field>
-                <field name="mPass" xsi:nil="true" />
-                <field name="mKey" xsi:nil="true" />
-                <field name="email">user_b@syspass.org</field>
-                <field name="notes"></field>
-                <field name="loginCount">0</field>
-                <field name="userProfileId">1</field>
-                <field name="lastLogin" xsi:nil="true" />
-                <field name="lastUpdate">2018-03-30 18:38:32</field>
-                <field name="lastUpdateMPass">0</field>
-                <field name="isAdminApp">0</field>
-                <field name="isAdminAcc">0</field>
-                <field name="isLdap">0</field>
-                <field name="isDisabled">0</field>
-                <field name="hashSalt"></field>
-                <field name="isMigrate">0</field>
-                <field name="isChangePass">0</field>
-                <field name="isChangedPass">0</field>
-                <field name="preferences" xsi:nil="true" />
-            </row>
-        </table_data>
-        <table_data name="Account">
-            <row>
-                <field name="id">1</field>
-                <field name="userGroupId">1</field>
-                <field name="userId">1</field>
-                <field name="userEditId">1</field>
-                <field name="clientId">1</field>
-                <field name="name">Google</field>
-                <field name="categoryId">1</field>
-                <field name="login">admin</field>
-                <field name="url">http://google.com</field>
-                <field name="pass" xsi:type="xs:hexBinary">6465663530323030656135663361636362366237656462653536343938666234313231616635323237363539663162346532383963386361346565323732656530636238333632316436393736353665373631393435623033353236616164333730336662306531333535626437333638653033666137623565633364306365323634663863643436393436633365353234316534373338376130393133663935303736396364613365313234643432306636393834386434613262316231306138</field>
-                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303065646434636466636231333437613739616166313734343462343839626362643364353664376664356562373233363235653130316261666432323539343633336664626639326630613135373461653562613562323535353230393236353237623863633534313862653363376361376536366139356366353366356162663031623064343236613234336162643533643837643239636633643165326532663732626664396433366133653061343534656664373134633661366237616338363966636263366435303166613964316338386365623264303861333438626633656638653135356538633865353838623938636465653061306463313835646636366535393138393831653366303464323139386236383738333539616563653034376434643637663835313235636661313237633138373865643530616630393434613934616363356265316130323566623065633362663831613933626365366365343734336164363562656638353131343466343332323837356438323339303236656363613866643862376330396563356465373233666466313636656166386336356539666537353436333535333664393766383366316366663931396530386339373730636166633136376661656364306366656262323931666334343831333238333662366432</field>
-                <field name="notes">aaaa</field>
-                <field name="countView">341</field>
-                <field name="countDecrypt">35</field>
-                <field name="dateAdd">2018-03-25 09:54:07</field>
-                <field name="dateEdit">2018-04-02 21:38:25</field>
-                <field name="otherUserGroupEdit">0</field>
-                <field name="otherUserEdit">0</field>
-                <field name="isPrivate">0</field>
-                <field name="isPrivateGroup">0</field>
-                <field name="passDate">1522341709</field>
-                <field name="passDateChange">0</field>
-                <field name="parentId">0</field>
-            </row>
-            <row>
-                <field name="id">2</field>
-                <field name="userGroupId">1</field>
-                <field name="userId">1</field>
-                <field name="userEditId">1</field>
-                <field name="clientId">2</field>
-                <field name="name">Apple</field>
-                <field name="categoryId">2</field>
-                <field name="login">admin</field>
-                <field name="url">http://apple.com</field>
-                <field name="pass" xsi:type="xs:hexBinary">6465663530323030656135663361636362366237656462653536343938666234313231616635323237363539663162346532383963386361346565323732656530636238333632316436393736353665373631393435623033353236616164333730336662306531333535626437333638653033666137623565633364306365323634663863643436393436633365353234316534373338376130393133663935303736396364613365313234643432306636393834386434613262316231306138</field>
-                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303065646434636466636231333437613739616166313734343462343839626362643364353664376664356562373233363235653130316261666432323539343633336664626639326630613135373461653562613562323535353230393236353237623863633534313862653363376361376536366139356366353366356162663031623064343236613234336162643533643837643239636633643165326532663732626664396433366133653061343534656664373134633661366237616338363966636263366435303166613964316338386365623264303861333438626633656638653135356538633865353838623938636465653061306463313835646636366535393138393831653366303464323139386236383738333539616563653034376434643637663835313235636661313237633138373865643530616630393434613934616363356265316130323566623065633362663831613933626365366365343734336164363562656638353131343466343332323837356438323339303236656363613866643862376330396563356465373233666466313636656166386336356539666537353436333535333664393766383366316366663931396530386339373730636166633136376661656364306366656262323931666334343831333238333662366432</field>
-                <field name="notes">bbbb</field>
-                <field name="countView">341</field>
-                <field name="countDecrypt">35</field>
-                <field name="dateAdd">2018-03-25 09:54:07</field>
-                <field name="dateEdit">2018-04-02 21:38:25</field>
-                <field name="otherUserGroupEdit">0</field>
-                <field name="otherUserEdit">0</field>
-                <field name="isPrivate">0</field>
-                <field name="isPrivateGroup">0</field>
-                <field name="passDate">1522341709</field>
-                <field name="passDateChange">0</field>
-                <field name="parentId">0</field>
-            </row>
-        </table_data>
-        <table_data name="AccountHistory">
-            <row>
-                <field name="id">3</field>
-                <field name="accountId">2</field>
-                <field name="userGroupId">1</field>
-                <field name="userId">1</field>
-                <field name="userEditId">1</field>
-                <field name="clientId">1</field>
-                <field name="name">Google</field>
-                <field name="categoryId">1</field>
-                <field name="login">admin</field>
-                <field name="url">https://google.com</field>
-                <field name="pass" xsi:type="xs:hexBinary">646566353032303064396362643366376662646536326637663732663861383732623430613839386131643134333933663662623033316664343362366461643762626564643634386437363964346634616234386638336636653236396166623734636261383134313363626162326461393733343934613231653934666331616664633637313732316562356666396562646132613665313937626233333563613632383830393934333863643731333230383132316430366433303838</field>
-                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303032636635623034396437656539356531653838663166613438643061616132663133613163663766346238316165663837326134373665316461653661353865316666626438346130383166303062633138646136373265653935643234626564336565303063333262646262303433336633356534323263616337613238363532336233313666316137333462616337343839346631333632643863376430373861373862396135633064396239653061353537626562666336636566623766363166376330393734356461623536373762303436313865343936383434663932666364303634316330303935636239363938336361336631363161623134663339643536636233653938333833613062396464356365383736333334376364363933313563306436343362623937366139383831376632346431303364316533353133306262393862353034353262346334663934663162323531383632356530653331346438343430323362666334306264616265376437386238663632326535353338636537663431626261616461613138646333333662623762636565333030656565333734616537356365303131363731323239383132383964346634383661376635303136303835336138663335653366393230383632386162373332343335633037656432616234</field>
-                <field name="notes">blablacar</field>
-                <field name="countView">7</field>
-                <field name="countDecrypt">1</field>
-                <field name="dateAdd">2018-06-05 22:49:34</field>
-                <field name="dateEdit">2018-06-06 22:20:29</field>
-                <field name="isModify">1</field>
-                <field name="isDeleted">0</field>
-                <field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
-                <field name="otherUserEdit">0</field>
-                <field name="otherUserGroupEdit">0</field>
-                <field name="passDate" xsi:nil="true" />
-                <field name="passDateChange" xsi:nil="true" />
-                <field name="parentId" xsi:nil="true" />
-                <field name="isPrivate">0</field>
-                <field name="isPrivateGroup">0</field>
-            </row>
-            <row>
-                <field name="id">4</field>
-                <field name="accountId">1</field>
-                <field name="userGroupId">1</field>
-                <field name="userId">1</field>
-                <field name="userEditId">1</field>
-                <field name="clientId">1</field>
-                <field name="name">Google</field>
-                <field name="categoryId">1</field>
-                <field name="login">admin</field>
-                <field name="url">https://google.com</field>
-                <field name="pass" xsi:type="xs:hexBinary">64656635303230303864313263313434383662336363353938366164613564643563393465356664353138363635643062626362613938353236646336396662333833366537363635393931353336653262326533336339323232396663636336373139393662316631616432323839326539323332343633656164386262326234363033666565306630643666323364383337363661363363353139356334333330633139636634623664343131396362356136386232636332653465616232393561</field>
-                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303039326134383433323238376332636136626165313731363538316661316663393832356364653733316361623361316661343832646536626336663066646138623133323366396137626666643837386434623862633234653364363731626136613661393631343738633437653864626363656565333136343436346262623235623563633362663935363030653034346636326666636237303635343362333330616561363036336332383433383063303931383533653436616430396131393534653064393233643438313932393532646631353931623031333636356461373337646435653536623436653639396332613165363438653761623736653766383732653566376535623133303838666636663133313461376336353964373561386162323535346635653137626139626266396236363062613735306461313737626339303662316636633766343736383462346638353630356661663863323365646437393766333961303033666137653361366665383631373137613465333037366637393364356135326536646236363032663061373934373930383635336238616437333839646338653738383930303234633561623365336431373836396261626630363234326661306165663138396163376138616636313636323037313930333762666565</field>
-                <field name="notes"></field>
-                <field name="countView">11</field>
-                <field name="countDecrypt">0</field>
-                <field name="dateAdd">2018-06-05 22:11:40</field>
-                <field name="dateEdit" xsi:nil="true" />
-                <field name="isModify">1</field>
-                <field name="isDeleted">0</field>
-                <field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
-                <field name="otherUserEdit">0</field>
-                <field name="otherUserGroupEdit">0</field>
-                <field name="passDate" xsi:nil="true" />
-                <field name="passDateChange" xsi:nil="true" />
-                <field name="parentId" xsi:nil="true" />
-                <field name="isPrivate">0</field>
-                <field name="isPrivateGroup">0</field>
-            </row>
-            <row>
-                <field name="id">5</field>
-                <field name="accountId">1</field>
-                <field name="userGroupId">1</field>
-                <field name="userId">1</field>
-                <field name="userEditId">1</field>
-                <field name="clientId">1</field>
-                <field name="name">Google</field>
-                <field name="categoryId">1</field>
-                <field name="login">admin</field>
-                <field name="url">https://google.com</field>
-                <field name="pass" xsi:type="xs:hexBinary">64656635303230303864313263313434383662336363353938366164613564643563393465356664353138363635643062626362613938353236646336396662333833366537363635393931353336653262326533336339323232396663636336373139393662316631616432323839326539323332343633656164386262326234363033666565306630643666323364383337363661363363353139356334333330633139636634623664343131396362356136386232636332653465616232393561</field>
-                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303039326134383433323238376332636136626165313731363538316661316663393832356364653733316361623361316661343832646536626336663066646138623133323366396137626666643837386434623862633234653364363731626136613661393631343738633437653864626363656565333136343436346262623235623563633362663935363030653034346636326666636237303635343362333330616561363036336332383433383063303931383533653436616430396131393534653064393233643438313932393532646631353931623031333636356461373337646435653536623436653639396332613165363438653761623736653766383732653566376535623133303838666636663133313461376336353964373561386162323535346635653137626139626266396236363062613735306461313737626339303662316636633766343736383462346638353630356661663863323365646437393766333961303033666137653361366665383631373137613465333037366637393364356135326536646236363032663061373934373930383635336238616437333839646338653738383930303234633561623365336431373836396261626630363234326661306165663138396163376138616636313636323037313930333762666565</field>
-                <field name="notes"></field>
-                <field name="countView">11</field>
-                <field name="countDecrypt">0</field>
-                <field name="dateAdd">2018-06-05 22:11:40</field>
-                <field name="dateEdit">2018-06-13 20:13:53</field>
-                <field name="isModify">1</field>
-                <field name="isDeleted">0</field>
-                <field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
-                <field name="otherUserEdit">0</field>
-                <field name="otherUserGroupEdit">0</field>
-                <field name="passDate" xsi:nil="true" />
-                <field name="passDateChange" xsi:nil="true" />
-                <field name="parentId" xsi:nil="true" />
-                <field name="isPrivate">0</field>
-                <field name="isPrivateGroup">0</field>
-            </row>
-            <row>
-                <field name="id">6</field>
-                <field name="accountId">1</field>
-                <field name="userGroupId">1</field>
-                <field name="userId">1</field>
-                <field name="userEditId">1</field>
-                <field name="clientId">1</field>
-                <field name="name">Google</field>
-                <field name="categoryId">1</field>
-                <field name="login">admin</field>
-                <field name="url">https://google.com</field>
-                <field name="pass" xsi:type="xs:hexBinary">64656635303230303864313263313434383662336363353938366164613564643563393465356664353138363635643062626362613938353236646336396662333833366537363635393931353336653262326533336339323232396663636336373139393662316631616432323839326539323332343633656164386262326234363033666565306630643666323364383337363661363363353139356334333330633139636634623664343131396362356136386232636332653465616232393561</field>
-                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303039326134383433323238376332636136626165313731363538316661316663393832356364653733316361623361316661343832646536626336663066646138623133323366396137626666643837386434623862633234653364363731626136613661393631343738633437653864626363656565333136343436346262623235623563633362663935363030653034346636326666636237303635343362333330616561363036336332383433383063303931383533653436616430396131393534653064393233643438313932393532646631353931623031333636356461373337646435653536623436653639396332613165363438653761623736653766383732653566376535623133303838666636663133313461376336353964373561386162323535346635653137626139626266396236363062613735306461313737626339303662316636633766343736383462346638353630356661663863323365646437393766333961303033666137653361366665383631373137613465333037366637393364356135326536646236363032663061373934373930383635336238616437333839646338653738383930303234633561623365336431373836396261626630363234326661306165663138396163376138616636313636323037313930333762666565</field>
-                <field name="notes"></field>
-                <field name="countView">11</field>
-                <field name="countDecrypt">0</field>
-                <field name="dateAdd">2018-06-05 22:11:40</field>
-                <field name="dateEdit">2018-06-13 20:13:58</field>
-                <field name="isModify">1</field>
-                <field name="isDeleted">0</field>
-                <field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
-                <field name="otherUserEdit">0</field>
-                <field name="otherUserGroupEdit">0</field>
-                <field name="passDate" xsi:nil="true" />
-                <field name="passDateChange" xsi:nil="true" />
-                <field name="parentId" xsi:nil="true" />
-                <field name="isPrivate">0</field>
-                <field name="isPrivateGroup">0</field>
-            </row>
-            <row>
-                <field name="id">7</field>
-                <field name="accountId">1</field>
-                <field name="userGroupId">1</field>
-                <field name="userId">1</field>
-                <field name="userEditId">1</field>
-                <field name="clientId">1</field>
-                <field name="name">Google</field>
-                <field name="categoryId">1</field>
-                <field name="login">admin</field>
-                <field name="url">https://google.com</field>
-                <field name="pass" xsi:type="xs:hexBinary">64656635303230303864313263313434383662336363353938366164613564643563393465356664353138363635643062626362613938353236646336396662333833366537363635393931353336653262326533336339323232396663636336373139393662316631616432323839326539323332343633656164386262326234363033666565306630643666323364383337363661363363353139356334333330633139636634623664343131396362356136386232636332653465616232393561</field>
-                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303039326134383433323238376332636136626165313731363538316661316663393832356364653733316361623361316661343832646536626336663066646138623133323366396137626666643837386434623862633234653364363731626136613661393631343738633437653864626363656565333136343436346262623235623563633362663935363030653034346636326666636237303635343362333330616561363036336332383433383063303931383533653436616430396131393534653064393233643438313932393532646631353931623031333636356461373337646435653536623436653639396332613165363438653761623736653766383732653566376535623133303838666636663133313461376336353964373561386162323535346635653137626139626266396236363062613735306461313737626339303662316636633766343736383462346638353630356661663863323365646437393766333961303033666137653361366665383631373137613465333037366637393364356135326536646236363032663061373934373930383635336238616437333839646338653738383930303234633561623365336431373836396261626630363234326661306165663138396163376138616636313636323037313930333762666565</field>
-                <field name="notes"></field>
-                <field name="countView">11</field>
-                <field name="countDecrypt">0</field>
-                <field name="dateAdd">2018-06-05 22:11:40</field>
-                <field name="dateEdit">2018-06-13 20:14:23</field>
-                <field name="isModify">1</field>
-                <field name="isDeleted">0</field>
-                <field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
-                <field name="otherUserEdit">0</field>
-                <field name="otherUserGroupEdit">0</field>
-                <field name="passDate" xsi:nil="true" />
-                <field name="passDateChange" xsi:nil="true" />
-                <field name="parentId" xsi:nil="true" />
-                <field name="isPrivate">0</field>
-                <field name="isPrivateGroup">0</field>
-            </row>
-        </table_data>
-    </database>
-</mysqldump>

tests/res/datasets/syspass_accountSearch.xml

@@ -1,213 +0,0 @@
-<?xml version="1.0"?>
-<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-<database name="syspass">
-    <table_data name="Account">
-        <row>
-            <field name="id">1</field>
-            <field name="userGroupId">1</field>
-            <field name="userId">1</field>
-            <field name="userEditId">1</field>
-            <field name="clientId">1</field>
-            <field name="name">Google</field>
-            <field name="categoryId">1</field>
-            <field name="login">admin</field>
-            <field name="url">http://google.com</field>
-            <field name="pass" xsi:type="xs:hexBinary">a</field>
-            <field name="key" xsi:type="xs:hexBinary">a</field>
-            <field name="notes">aaaa</field>
-            <field name="countView">341</field>
-            <field name="countDecrypt">35</field>
-            <field name="dateAdd">2018-03-25 09:54:07</field>
-            <field name="dateEdit">2018-04-02 21:38:25</field>
-            <field name="otherUserGroupEdit">0</field>
-            <field name="otherUserEdit">0</field>
-            <field name="isPrivate">0</field>
-            <field name="isPrivateGroup">0</field>
-            <field name="passDate">1522341709</field>
-            <field name="passDateChange">0</field>
-            <field name="parentId">0</field>
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="userGroupId">1</field>
-            <field name="userId">1</field>
-            <field name="userEditId">1</field>
-            <field name="clientId">2</field>
-            <field name="name">Apple</field>
-            <field name="categoryId">2</field>
-            <field name="login">admin</field>
-            <field name="url">http://apple.com</field>
-            <field name="pass" xsi:type="xs:hexBinary">a</field>
-            <field name="key" xsi:type="xs:hexBinary">a</field>
-            <field name="notes">bbbb</field>
-            <field name="countView">341</field>
-            <field name="countDecrypt">35</field>
-            <field name="dateAdd">2018-03-25 09:54:07</field>
-            <field name="dateEdit">2018-04-02 21:38:25</field>
-            <field name="otherUserGroupEdit">0</field>
-            <field name="otherUserEdit">0</field>
-            <field name="isPrivate">0</field>
-            <field name="isPrivateGroup">0</field>
-            <field name="passDate">1522341709</field>
-            <field name="passDateChange">0</field>
-            <field name="parentId">0</field>
-        </row>
-        <row>
-            <field name="id">3</field>
-            <field name="userGroupId">3</field>
-            <field name="userId">3</field>
-            <field name="userEditId">3</field>
-            <field name="clientId">2</field>
-            <field name="name">Github</field>
-            <field name="categoryId">2</field>
-            <field name="login">admin</field>
-            <field name="url">http://github.com</field>
-            <field name="pass" xsi:type="xs:hexBinary">a</field>
-            <field name="key" xsi:type="xs:hexBinary">a</field>
-            <field name="notes">bbbb</field>
-            <field name="countView">341</field>
-            <field name="countDecrypt">35</field>
-            <field name="dateAdd">2018-03-25 09:54:07</field>
-            <field name="dateEdit">2018-04-02 21:38:25</field>
-            <field name="otherUserGroupEdit">0</field>
-            <field name="otherUserEdit">0</field>
-            <field name="isPrivate">1</field>
-            <field name="isPrivateGroup">0</field>
-            <field name="passDate">1522341709</field>
-            <field name="passDateChange">0</field>
-            <field name="parentId">0</field>
-        </row>
-        <row>
-            <field name="id">4</field>
-            <field name="userGroupId">3</field>
-            <field name="userId">3</field>
-            <field name="userEditId">3</field>
-            <field name="clientId">3</field>
-            <field name="name">Slack</field>
-            <field name="categoryId">2</field>
-            <field name="login">admin</field>
-            <field name="url">http://slack.com</field>
-            <field name="pass" xsi:type="xs:hexBinary">a</field>
-            <field name="key" xsi:type="xs:hexBinary">a</field>
-            <field name="notes">bbbb</field>
-            <field name="countView">341</field>
-            <field name="countDecrypt">35</field>
-            <field name="dateAdd">2018-03-25 09:54:07</field>
-            <field name="dateEdit">2018-04-02 21:38:25</field>
-            <field name="otherUserGroupEdit">0</field>
-            <field name="otherUserEdit">0</field>
-            <field name="isPrivate">0</field>
-            <field name="isPrivateGroup">1</field>
-            <field name="passDate">1522341709</field>
-            <field name="passDateChange">0</field>
-            <field name="parentId">0</field>
-        </row>
-    </table_data>
-    <table_data name="AccountFile">
-        <row>
-            <field name="id">1</field>
-            <field name="accountId">1</field>
-            <field name="name">sysPass.xml</field>
-            <field name="type">text/xml</field>
-            <field name="size">1312</field>
-            <field name="content" xsi:type="xs:hexBinary">a</field>
-            <field name="extension">XML</field>
-            <field name="thumb" xsi:type="xs:hexBinary">6E6F5F7468756D62</field>
-        </row>
-        <row>
-            <field name="id">3</field>
-            <field name="accountId">2</field>
-            <field name="name">Clock 3.jpg</field>
-            <field name="type">image/jpeg</field>
-            <field name="size">4273</field>
-            <field name="content" xsi:type="xs:hexBinary">a</field>
-            <field name="extension">JPG</field>
-            <field name="thumb" xsi:type="xs:hexBinary">a</field>
-        </row>
-        <row>
-            <field name="id">4</field>
-            <field name="accountId">1</field>
-            <field name="name">android.png</field>
-            <field name="type">image/png</field>
-            <field name="size">4295</field>
-            <field name="content" xsi:type="xs:hexBinary">a</field>
-            <field name="extension">PNG</field>
-            <field name="thumb" xsi:type="xs:hexBinary">a</field>
-        </row>
-    </table_data>
-    <table_data name="AccountToFavorite">
-        <row>
-            <field name="accountId">1</field>
-            <field name="userId">3</field>
-        </row>
-        <row>
-            <field name="accountId">2</field>
-            <field name="userId">3</field>
-        </row>
-        <row>
-            <field name="accountId">1</field>
-            <field name="userId">1</field>
-        </row>
-        <row>
-            <field name="accountId">2</field>
-            <field name="userId">2</field>
-        </row>
-    </table_data>
-	<table_data name="AccountToTag">
-        <row>
-            <field name="accountId">1</field>
-            <field name="tagId">1</field>
-        </row>
-        <row>
-            <field name="accountId">1</field>
-            <field name="tagId">2</field>
-        </row>
-        <row>
-            <field name="accountId">2</field>
-            <field name="tagId">3</field>
-        </row>
-        <row>
-            <field name="accountId">2</field>
-            <field name="tagId">1</field>
-        </row>
-	</table_data>
-	<table_data name="AccountToUser">
-        <row>
-            <field name="accountId">1</field>
-            <field name="userId">3</field>
-            <field name="isEdit">1</field>
-        </row>
-        <row>
-            <field name="accountId">2</field>
-            <field name="userId">3</field>
-            <field name="isEdit">0</field>
-        </row>
-	</table_data>
-	<table_data name="AccountToUserGroup">
-        <row>
-            <field name="accountId">1</field>
-            <field name="userGroupId">2</field>
-            <field name="isEdit">1</field>
-        </row>
-        <row>
-            <field name="accountId">2</field>
-            <field name="userGroupId">3</field>
-            <field name="isEdit">0</field>
-        </row>
-	</table_data>
-	<table_data name="UserToUserGroup">
-        <row>
-            <field name="userId">1</field>
-            <field name="userGroupId">2</field>
-        </row>
-        <row>
-            <field name="userId">3</field>
-            <field name="userGroupId">2</field>
-        </row>
-        <row>
-            <field name="userId">2</field>
-            <field name="userGroupId">1</field>
-        </row>
-	</table_data>
-</database>
-</mysqldump>

tests/res/datasets/syspass_authToken.xml

@@ -1,57 +0,0 @@
-<?xml version="1.0"?>
-<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-<database name="syspass">
-	<table_data name="AuthToken">
-	<row>
-		<field name="id">1</field>
-		<field name="userId">2</field>
-		<field name="token" xsi:type="xs:hexBinary">31326239303237643234656666663762666261636138626437373461346333346234356465333565303333643262313932613838663464666165653563323333</field>
-		<field name="actionId">2</field>
-		<field name="createdBy">1</field>
-		<field name="startDate">1530745272</field>
-		<field name="vault" xsi:nil="true" />
-		<field name="hash" xsi:nil="true" />
-	</row>
-	<row>
-		<field name="id">2</field>
-		<field name="userId">1</field>
-		<field name="token" xsi:type="xs:hexBinary">32636565386232323466343865303165663438616331373265383739636337383235383030613964376365336232333738333231326634373538663163313436</field>
-		<field name="actionId">7</field>
-		<field name="createdBy">1</field>
-		<field name="startDate">1530829026</field>
-		<field name="vault" xsi:type="xs:hexBinary">4F3A31393A2253505C436F72655C43727970745C5661756C74223A343A7B733A32353A220053505C436F72655C43727970745C5661756C740064617461223B733A3139303A2264656635303230303432636161656630303536346330653132343136383261366464643565383064643962656430393164393434383866383234623366333862663139383537633238393433373636653931346164336432396337393638613163376162353738663565306634396666646231653762616565306334383932303862343838393239323662656536376363653538323865376239363439326261383634306662613761626461656366363734643034646331613833373261223B733A32343A220053505C436F72655C43727970745C5661756C74006B6579223B733A3531323A226465663130303030646566353032303032303963343139663738326462383466316664653432623536303836383637653165323766613032663666663737306631343834613532343530653435613464343433383762323962323563313162663932666666633766346435336132326331353930383134623239313962613261363433393932306462666164643466323339373733326661326635353035376666626132373361613433363630383331626235346336616163356135633762383963636139313064356539316638613364616464633832393139323666316562623362343835653366316165353731623731636365383031343461393464666431333361366232346331616665636366616663316364306439366631383862623730613864326639356365616131373137346565323636353234363661313432633332373935343062346233343066633230373063373634383034313835343930363163303063313433323164356436306636396337376636326536366465383135396538336534643161653437653765366434663532633364623166663836633465306463313131393734323535336630313933646263323764373835346139363735646465613862303765663266363365383666343963323336373839323335396234303939626630303430643763643934623935616431616430613237223B733A32383A220053505C436F72655C43727970745C5661756C740074696D65536574223B693A313533303832393032363B733A33323A220053505C436F72655C43727970745C5661756C740074696D6555706461746564223B693A303B7D</field>
-		<field name="hash" xsi:type="xs:hexBinary">24327924313024434936705834636646516B56432E56426F3373784E652F6D7271486C6E584550546439625A2F7164454271584468472F634D416865</field>
-	</row>
-	<row>
-		<field name="id">3</field>
-		<field name="userId">1</field>
-		<field name="token" xsi:type="xs:hexBinary">32636565386232323466343865303165663438616331373265383739636337383235383030613964376365336232333738333231326634373538663163313436</field>
-		<field name="actionId">2</field>
-		<field name="createdBy">1</field>
-		<field name="startDate">1530824672</field>
-		<field name="vault" xsi:nil="true" />
-		<field name="hash" xsi:nil="true" />
-	</row>
-	<row>
-		<field name="id">4</field>
-		<field name="userId">1</field>
-		<field name="token" xsi:type="xs:hexBinary">32636565386232323466343865303165663438616331373265383739636337383235383030613964376365336232333738333231326634373538663163313436</field>
-		<field name="actionId">3</field>
-		<field name="createdBy">1</field>
-		<field name="startDate">1530824680</field>
-		<field name="vault" xsi:nil="true" />
-		<field name="hash" xsi:nil="true" />
-	</row>
-	<row>
-		<field name="id">5</field>
-		<field name="userId">1</field>
-		<field name="token" xsi:type="xs:hexBinary">32636565386232323466343865303165663438616331373265383739636337383235383030613964376365336232333738333231326634373538663163313436</field>
-		<field name="actionId">6</field>
-		<field name="createdBy">1</field>
-		<field name="startDate">1530824689</field>
-		<field name="vault" xsi:nil="true" />
-		<field name="hash" xsi:nil="true" />
-	</row>
-	</table_data>
-</database>
-</mysqldump>

tests/res/datasets/syspass_config.xml

@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<mysqldump>
-<database name="syspass">
-	<table_data name="Config">
-	<row>
-		<field name="parameter">config_backup</field>
-		<field name="VALUE">789ca558db6edb3810edb718c5be6c6b88ba4b45814de3a497a48d374e832cb0404191944d589654916a9216f9f71d5292633ba1a4621f628bf11cce68e6cc85bc886d2b9e2ce6ff1e1779ca97edd70c4b3c89c328fe2562c78e272f9e13785197cb0a5376c6ee276f440cdba82f273089d3625ddff2353fc97192313a79c3634b019c21c0d72afb2d0520ff0e0bb68b7107318255bf059863217601d110e00bde305162b2675768426514973396e23a93efaba22e95b710205c6b04625e1529cf588731bf4c591577f7a3e3a1a517acfab1ef2ad42b3f2f2aa9b60eadd01a963e0cc3c0de0731307ab3ac938ce76bf119df5d73762b94414e2f977610577ca35de95bd628c88e3ffbbd8f0929ea5c1eab0fada0d7fbadf439a818de9aac18597f2d29964c6c03db2f9d1792931d6963da13fdf8018bd5a42524b6701a440125a1635386b01721124436b27c9fb1d0775ddb4d9dc8f394bc6d0c124d3e14422a1904968a7b4816215ed3e435653f74788dd4a7c9a2206b2677b8d0a74665a29209b65a86101dd1901f4f2e681cf0facbf787e4e5d9fd59fc6b08db515a6145f9cd4b506061d7717c8cc9a0de36791cc752e4b0cda58f25f5724445659be230dd8dea550911475956dc327a7227c101384661fcabc5c593f9ec74cbc478f269fe5eadec66f5fee3e936c940f28bfecd6d5617b32bb5f2bad5624bfe7832bb3856ab40314baf6e74f1687ebc39d7a251bb5a9c6bf5ad35d78b995eb6e65cdd6825a8b5e77871ad97ad41ef8ecef4b2b5e87236d7cbd6a4b3937ff4b2b5e9f8b2d92a68f57e06bd0f633db7e03f9b426cd96e6f126ad0e8dab1cc8a04670b862bb2da86d2582d792e24ce7637ee6d235df7b481b294bc55ac41afe021ad18e325568f45b5ecef937a1f9ed38efe1e70b7e6f42da61b9ebf22f9db1a7e10eaa12d6ce2d5ff55d56529b4e205231593c87634d2eb43ce9feb3bc60c5288830cb28dad5f091f51311c1f25d8b6f9471b8c0558493fb6611b76054f4db5eba6addfa6a39ca6de1a4b598dd35a2c0fd9697e1f90fdc1f2a666d85dc900064054a0254dbb1d2030ca8e69934fc6eab6c13c3baae58a8d9d5414e0d05823e395f069556cba220d2d53fed53686ad1f7bd1dbf600cefbe3d3cbdbb5fc13fdbd621723906d81b755e5718dfe54a297ec7b0d9689c3fa6d8cb002411ed41597f7a322dc003a5e2957a8ff4c7fcb15bbddee5947fafdef4878c93be2a08e38cf6ff630f42e8f14dceeb44fb83efee412d8961336ec6765d16d51d105cef404e28383528a2c2f24d84a129c467e40ad10852ea3b6cd984d42eaf98107bf92089e228252db09e02f85f19da6fd6eaa9880095f1c89635ced9416a3bc6042f02257436c51cba6253683ac318e824b768e731d2f7030cbfb4771257eb562cd4c851cc51ac92a8eb3d74956b3fe02dccc92d7d009c0c62e851ccb9aa2d0f21c64a181131f7c24d0ac86363006fab9f3a891534af894677264ab684e894b56ef1f5f8dbe50f24d433f400c4ce2f0d84c18f0be8ee7f8be1a795c23a83ba67cdc806d8745d2f8320926ebbafcb6da99fa49845c3b0ac324a211c28e2274e83861905a5ee49000239be1d4c376bf97d85d0935707f633742294e08248b150528f1121b411e3976e0fbd8713d0b0784fa76d2dfe05652964f8aa5d1f95059f61b9cd55b901bf14b68b9928d2ec80de8e901da18aa06d0f5084f4fabe60b80768e52cde8aad0d11d6e940d8316b8b508dca3e7b3fe12c47252dd9772d15496edcdc4d039f7b4ce323de41c1138678a2de78c633486960fa32827072c758df5608b8069a1382f963c3f24f8307456a8ea3feac24988e2b93b1af35dd023e0e08ac69caeadf34eee4a5e3d4957a3a23d547781812cc70f2d28fe0fff0152be6bea</field>
-	</row>
-	<row>
-		<field name="parameter">config_backup_date</field>
-		<field name="VALUE">1531353681</field>
-	</row>
-	<row>
-		<field name="parameter">lastupdatempass</field>
-		<field name="VALUE">1528236611</field>
-	</row>
-	<row>
-		<field name="parameter">masterPwd</field>
-		<field name="VALUE">$2y$10$xtsuN2PUvgSH/0mrfBlsbOActVgCjYcqDqC6L3T9QraNxZC4RXGYa</field>
-	</row>
-	<row>
-		<field name="parameter">tempmaster_attempts</field>
-		<field name="VALUE">0</field>
-	</row>
-	<row>
-		<field name="parameter">tempmaster_maxtime</field>
-		<field name="VALUE">1531268994</field>
-	</row>
-	<row>
-		<field name="parameter">tempmaster_pass</field>
-		<field name="VALUE">def502004ade49f88af42e50363817fe90be2a5ebe3fc9a390510f2043ea23f231c5e3d31fbdd84ab93634b139a02ae1b005767317602ef093053ed8613bd7ca500c7398b4d600de088a9fa57ccff44480a263a0bb3a250f6430e62c004fbd</field>
-	</row>
-	<row>
-		<field name="parameter">tempmaster_passhash</field>
-		<field name="VALUE">$2y$10$34Kc7lFqwVdjaPCBGLlAC.ZpCL//IaHCodDeEX/fcSPNiOxx.nvhm</field>
-	</row>
-	<row>
-		<field name="parameter">tempmaster_passkey</field>
-		<field name="VALUE">def10000def50200b5b5061cc8abf3cfd7221c92833d0016e65d39c75ccae5410cbb2eaf55ff4c7de04de1754f38480e8f8eb305c552310468fea3d84752e649c867ca16b6ba078c2cc42fdbd0b2dfe1a362fc5cc20599326c9e194b24020b8bdad22940721c6f1e3c29e491057a8323aad9cd265962cca06499e2f59278322ed3f2f909553df0f13be17c2b1650bfbc81057b334caafca8c13d4811c7034737834bc1cad0e763c4bbc34b8af0baa47413971e9e553a8f9642a414d3e2245072b137448083823cf89130796c2ec7a5ecaa346538ed3cbb2112b6c1ca51d732ad8dada7b4a78eedc27748611f51b7edf763a4b21f0f4f5893b3b014f901269b0a</field>
-	</row>
-	<row>
-		<field name="parameter">tempmaster_passtime</field>
-		<field name="VALUE">1531265394</field>
-	</row>
-	<row>
-		<field name="parameter">version</field>
-		<field name="VALUE">300.18053101</field>
-	</row>
-	</table_data>
-</database>
-</mysqldump>