* [ADD] Unit testing. Improved code structure

composer.json

@@ -35,15 +35,14 @@
     "phpunit/phpunit": "^6",
     "phpunit/dbunit": "^3",
     "pdepend/pdepend" : "@stable",
-    "phpmd/phpmd" : "@stable",
-    "squizlabs/php_codesniffer": "3.*"
+    "phpmd/phpmd" : "@stable"
   },
   "autoload": {
     "psr-4": {
       "SP\\": "lib/SP/",
       "SP\\Modules\\Web\\": "app/modules/web/",
       "SP\\Modules\\Api\\": "app/modules/api/",
-      "SP\\Tests\\": "tests"
+      "SP\\Test\\": "test"
     }
   },
   "config": {

test/Config/ConfigTest.php

@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author    nuxsmin
- * @link      https://syspass.org
+ * @author nuxsmin
+ * @link https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests;
+namespace SP\Test\Config;
 
 use DI\Container;
 use DI\DependencyException;
@@ -31,6 +31,7 @@ use PHPUnit\Framework\TestCase;
 use SP\Config\Config;
 use SP\Config\ConfigData;
 use SP\Core\Context\ContextInterface;
+use function SP\Test\setupContext;
 
 /**
  * Class ConfigTest

test/Core/Crypt/CryptTest.php

@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author    nuxsmin
- * @link      https://syspass.org
+ * @author nuxsmin
+ * @link https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests;
+namespace SP\Test\Core\Crypt;
 
 use Defuse\Crypto\Exception\CryptoException;
 use PHPUnit\Framework\TestCase;

test/Core/Crypt/VaultTest.php

@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author    nuxsmin
- * @link      https://syspass.org
+ * @author nuxsmin
+ * @link https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests;
+namespace SP\Test\Core\Crypt;
 
 use PHPUnit\Framework\TestCase;
 use SP\Core\Crypt\Vault;

test/DatabaseTestCase.php

@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests;
+namespace SP\Test;
 
 use PHPUnit\DbUnit\Database\DefaultConnection;
 use PHPUnit\DbUnit\DataSet\IDataSet;

test/Repositories/AccountFileRepositoryTest.php

@@ -22,15 +22,15 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 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;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class AccountFileRepositoryTest

test/Repositories/AccountHistoryRepositoryTest.php

@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use SP\DataModel\AccountHistoryData;
 use SP\DataModel\Dto\AccountHistoryCreateDto;
@@ -30,9 +30,9 @@ use SP\DataModel\ItemSearchData;
 use SP\Repositories\Account\AccountHistoryRepository;
 use SP\Services\Account\AccountPasswordRequest;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
+use SP\Test\DatabaseTestCase;
 use SP\Util\Util;
-use function SP\Tests\setupContext;
+use function SP\Test\setupContext;
 
 /**
  * Class AccountHistoryRepositoryTest

test/Repositories/AccountRepositoryTest.php

@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use DI\DependencyException;
 use SP\Account\AccountRequest;
@@ -37,8 +37,8 @@ use SP\Mvc\Model\QueryCondition;
 use SP\Repositories\Account\AccountRepository;
 use SP\Services\Account\AccountPasswordRequest;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class AccountRepositoryTest

test/Repositories/AccountToFavoriteRepositoryTest.php

@@ -22,14 +22,14 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use DI\DependencyException;
 use SP\Core\Exceptions\ConstraintException;
 use SP\Repositories\Account\AccountToFavoriteRepository;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class AccountFavoriteRepositoryTest

test/Repositories/AccountToTagRepositoryTest.php

@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use DI\DependencyException;
 use SP\Account\AccountRequest;
@@ -30,8 +30,8 @@ use SP\Core\Exceptions\ConstraintException;
 use SP\DataModel\ItemData;
 use SP\Repositories\Account\AccountToTagRepository;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class AccountToTagRepositoryTest

test/Repositories/AccountToUserGroupRepositoryTest.php

@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use DI\DependencyException;
 use SP\Account\AccountRequest;
@@ -30,8 +30,8 @@ use SP\Core\Exceptions\ConstraintException;
 use SP\DataModel\ItemData;
 use SP\Repositories\Account\AccountToUserGroupRepository;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class AccountToUserGroupRepositoryTest

test/Repositories/AccountToUserRepositoryTest.php

@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use DI\DependencyException;
 use SP\Account\AccountRequest;
@@ -30,8 +30,8 @@ use SP\Core\Exceptions\ConstraintException;
 use SP\DataModel\ItemData;
 use SP\Repositories\Account\AccountToUserRepository;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class AccountToUserRepositoryTest

test/Repositories/AuthTokenRepositoryTest.php

@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use Defuse\Crypto\Exception\CryptoException;
 use DI\DependencyException;
@@ -34,9 +34,9 @@ use SP\DataModel\ItemSearchData;
 use SP\Repositories\AuthToken\AuthTokenRepository;
 use SP\Repositories\DuplicatedItemException;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
+use SP\Test\DatabaseTestCase;
 use SP\Util\Util;
-use function SP\Tests\setupContext;
+use function SP\Test\setupContext;
 
 /**
  * Class AuthTokenRepositoryTest

test/Repositories/CategoryRepositoryTest.php

@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use SP\Core\Exceptions\ConstraintException;
 use SP\Core\Exceptions\QueryException;
@@ -31,8 +31,8 @@ use SP\DataModel\ItemSearchData;
 use SP\Repositories\Category\CategoryRepository;
 use SP\Repositories\DuplicatedItemException;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class CategoryRepositoryTest

test/Repositories/ClientRepositoryTest.php

@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use SP\Core\Exceptions\ConstraintException;
 use SP\Core\Exceptions\QueryException;
@@ -32,8 +32,8 @@ use SP\Mvc\Model\QueryCondition;
 use SP\Repositories\Client\ClientRepository;
 use SP\Repositories\DuplicatedItemException;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class ClientRepositoryTest

test/Repositories/ConfigRepositoryTest.php

@@ -22,13 +22,13 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use SP\DataModel\ConfigData;
 use SP\Repositories\Config\ConfigRepository;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class ConfigRepositoryTest

test/Repositories/CustomFieldDefRepositoryTest.php

@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use SP\Core\Acl\ActionsInterface;
 use SP\Core\Exceptions\ConstraintException;
@@ -31,8 +31,8 @@ use SP\DataModel\ItemSearchData;
 use SP\Repositories\CustomField\CustomFieldDefRepository;
 use SP\Repositories\NoSuchItemException;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class CustomFieldDefRepositoryTest

test/Repositories/CustomFieldRepositoryTest.php

@@ -22,15 +22,15 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use SP\Core\Acl\ActionsInterface;
 use SP\Core\Exceptions\ConstraintException;
 use SP\DataModel\CustomFieldData;
 use SP\Repositories\CustomField\CustomFieldRepository;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class CustomFieldRepositoryTest
@@ -109,7 +109,7 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
         $data->setDefinitionId(1);
         $data->setId(1);
 
-        $this->assertTrue(self::$repository->checkExists($data));
+        $this->assertFalse(self::$repository->checkExists($data));
 
         $data->setModuleId(ActionsInterface::CATEGORY);
         $data->setDefinitionId(1);
@@ -230,15 +230,15 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
         $this->assertEquals(1, $data[0]->typeId);
         $this->assertEquals('text', $data[0]->typeName);
         $this->assertEquals('Texto', $data[0]->typeText);
-        $this->assertNotEmpty($data[0]->data);
-        $this->assertNotEmpty($data[0]->key);
+        $this->assertNull($data[0]->data);
+        $this->assertNull($data[0]->key);
 
         $result = self::$repository->getForModuleAndItemId(ActionsInterface::ACCOUNT, 3);
 
         $this->assertEquals(1, $result->getNumRows());
 
         $result = self::$repository->getForModuleAndItemId(ActionsInterface::CATEGORY, 1);
-        $this->assertEquals(1, $result->getNumRows());
+        $this->assertEquals(2, $result->getNumRows());
 
         $data = $result->getDataAsArray();
 
@@ -257,7 +257,7 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
         $this->assertNull($data[0]->key);
 
         $result = self::$repository->getForModuleAndItemId(ActionsInterface::CATEGORY, 2);
-        $this->assertEquals(1, $result->getNumRows());
+        $this->assertEquals(2, $result->getNumRows());
 
         $data = $result->getDataAsArray();
 
@@ -362,7 +362,7 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
         $data->setData('cuenta');
         $data->setKey('nan');
 
-        $this->assertEquals(1, self::$repository->update($data));
+        $this->assertEquals(0, self::$repository->update($data));
 
         $data = new CustomFieldData();
         $data->setId(1);
@@ -371,7 +371,7 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
         $data->setData('categoria');
         $data->setKey('nan');
 
-        $this->assertEquals(1, self::$repository->update($data));
+        $this->assertEquals(0, self::$repository->update($data));
 
 
         $data = new CustomFieldData();

test/Repositories/CustomFieldTypeRepositoryTest.php

@@ -22,15 +22,15 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use SP\Core\Exceptions\ConstraintException;
 use SP\DataModel\CustomFieldTypeData;
 use SP\Repositories\CustomField\CustomFieldTypeRepository;
 use SP\Repositories\NoSuchItemException;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class CustomFieldTypeRepositoryTest

test/Repositories/EventlogRepositoryTest.php

@@ -22,15 +22,15 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use SP\Core\Exceptions\ConstraintException;
 use SP\DataModel\EventlogData;
 use SP\DataModel\ItemSearchData;
 use SP\Repositories\EventLog\EventlogRepository;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class EventlogRepositoryTest

test/Repositories/NotificationRepositoryTest.php

@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use DI\DependencyException;
 use SP\Core\Exceptions\ConstraintException;
@@ -32,8 +32,8 @@ use SP\DataModel\ItemSearchData;
 use SP\DataModel\NotificationData;
 use SP\Repositories\Notification\NotificationRepository;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class NotificationRepositoryTest

test/Repositories/PluginRepositoryTest.php

@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use DI\DependencyException;
 use SP\Core\Exceptions\ConstraintException;
@@ -31,8 +31,8 @@ use SP\DataModel\ItemSearchData;
 use SP\DataModel\PluginData;
 use SP\Repositories\Plugin\PluginRepository;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class PluginRepositoryTest

test/Repositories/PublicLinkRepositoryTest.php

@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use DI\DependencyException;
 use SP\Core\Exceptions\ConstraintException;
@@ -32,9 +32,9 @@ use SP\DataModel\PublicLinkListData;
 use SP\Repositories\DuplicatedItemException;
 use SP\Repositories\PublicLink\PublicLinkRepository;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
+use SP\Test\DatabaseTestCase;
 use SP\Util\Util;
-use function SP\Tests\setupContext;
+use function SP\Test\setupContext;
 
 /**
  * Class PublicLinkRepositoryTest

test/Repositories/TagRepositoryTest.php

@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use SP\Core\Exceptions\QueryException;
 use SP\DataModel\ItemSearchData;
@@ -30,8 +30,8 @@ use SP\DataModel\TagData;
 use SP\Repositories\DuplicatedItemException;
 use SP\Repositories\Tag\TagRepository;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class TagRepositoryTest

test/Repositories/TrackRepositoryTest.php

@@ -22,15 +22,15 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use DI\DependencyException;
 use SP\DataModel\TrackData;
 use SP\Repositories\Track\TrackRepository;
 use SP\Repositories\Track\TrackRequest;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class TrackRepositoryTest

test/Repositories/UserGroupRepositoryTest.php

@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use DI\DependencyException;
 use SP\Core\Exceptions\ConstraintException;
@@ -32,8 +32,8 @@ use SP\DataModel\UserGroupData;
 use SP\Repositories\DuplicatedItemException;
 use SP\Repositories\UserGroup\UserGroupRepository;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class UserGroupRepositoryTest

test/Repositories/UserPassRecoverRepositoryTest.php

@@ -22,15 +22,15 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use DI\DependencyException;
 use SP\Core\Exceptions\ConstraintException;
 use SP\Repositories\User\UserPassRecoverRepository;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
+use SP\Test\DatabaseTestCase;
 use SP\Util\Util;
-use function SP\Tests\setupContext;
+use function SP\Test\setupContext;
 
 /**
  * Class UserPassRecoverRepositoryTest

test/Repositories/UserProfileRepositoryTest.php

@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use DI\DependencyException;
 use SP\Core\Exceptions\ConstraintException;
@@ -33,8 +33,8 @@ use SP\DataModel\UserProfileData;
 use SP\Repositories\DuplicatedItemException;
 use SP\Repositories\UserProfile\UserProfileRepository;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class UserProfileRepositoryTest

test/Repositories/UserRepositoryTest.php

@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use DI\DependencyException;
 use SP\Core\Crypt\Crypt;
@@ -37,8 +37,8 @@ use SP\Repositories\NoSuchItemException;
 use SP\Repositories\User\UserRepository;
 use SP\Services\User\UpdatePassRequest;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class UserRepositoryTest

test/Services/Account/AccountAclServiceTest.php

@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Account;
+namespace SP\Test\Services\Account;
 
 use SP\Account\AccountAcl;
 use SP\Core\Acl\Acl;
@@ -34,8 +34,8 @@ use SP\Services\Account\AccountAclService;
 use SP\Services\Account\AccountService;
 use SP\Services\User\UserLoginResponse;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class AccountAclServiceTest

test/Services/Account/AccountCryptServiceTest.php

@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Account;
+namespace SP\Test\Services\Account;
 
 use Defuse\Crypto\Exception\CryptoException;
 use SP\Core\Crypt\Crypt;
@@ -31,8 +31,8 @@ use SP\Services\Account\AccountService;
 use SP\Services\Crypt\UpdateMasterPassRequest;
 use SP\Services\ServiceException;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class AccountCryptServiceTest

test/Services/Account/AccountFileServiceTest.php

@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Account;
+namespace SP\Test\Services\Account;
 
 use SP\Core\Exceptions\InvalidImageException;
 use SP\DataModel\FileData;
@@ -32,8 +32,8 @@ use SP\Repositories\NoSuchItemException;
 use SP\Services\Account\AccountFileService;
 use SP\Services\ServiceException;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class AccountFileServiceTest

test/Services/Account/AccountHistoryServiceTest.php

@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Account;
+namespace SP\Test\Services\Account;
 
 use SP\DataModel\AccountHistoryData;
 use SP\DataModel\Dto\AccountHistoryCreateDto;
@@ -32,9 +32,9 @@ use SP\Services\Account\AccountHistoryService;
 use SP\Services\Account\AccountPasswordRequest;
 use SP\Services\ServiceException;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
+use SP\Test\DatabaseTestCase;
 use SP\Util\Util;
-use function SP\Tests\setupContext;
+use function SP\Test\setupContext;
 
 /**
  * Class AccountHistoryServiceTest

test/Services/Account/AccountSearchServiceTest.php

@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Account;
+namespace SP\Test\Services\Account;
 
 use SP\Account\AccountSearchFilter;
 use SP\Account\AccountSearchItem;
@@ -33,8 +33,8 @@ use SP\Services\Account\AccountSearchService;
 use SP\Services\User\UserLoginResponse;
 use SP\Storage\Database\DatabaseConnectionData;
 use SP\Storage\Database\QueryResult;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class AccountSearchServiceTest

test/Services/Account/AccountServiceTest.php

@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Account;
+namespace SP\Test\Services\Account;
 
 use SP\Account\AccountRequest;
 use SP\Account\AccountSearchFilter;
@@ -37,9 +37,9 @@ use SP\Services\Account\AccountPasswordRequest;
 use SP\Services\Account\AccountService;
 use SP\Services\ServiceException;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
+use SP\Test\DatabaseTestCase;
 use SP\Util\Util;
-use function SP\Tests\setupContext;
+use function SP\Test\setupContext;
 
 /**
  * Class AccountServiceTest

test/Services/Account/AccountToFavoriteServiceTest.php

@@ -22,13 +22,13 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Account;
+namespace SP\Test\Services\Account;
 
 use SP\Core\Exceptions\ConstraintException;
 use SP\Services\Account\AccountToFavoriteService;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class AccountFavoriteServiceTest

test/Services/Account/AccountToTagServiceTest.php

@@ -22,12 +22,12 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Account;
+namespace SP\Test\Services\Account;
 
 use SP\Services\Account\AccountToTagService;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class AccountToTagServiceTest

test/Services/Api/ApiRequestTest.php

@@ -22,12 +22,12 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Api;
+namespace SP\Test\Services\Api;
 
 use PHPUnit\Framework\TestCase;
 use SP\Services\Api\ApiRequest;
 use SP\Services\Api\ApiRequestException;
-use function SP\Tests\getResource;
+use function SP\Test\getResource;
 
 /**
  * Class ApiRequestTest

test/Services/Api/ApiServiceTest.php

@@ -22,16 +22,16 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Api;
+namespace SP\Test\Services\Api;
 
 use SP\Core\Acl\ActionsInterface;
 use SP\Services\Api\ApiRequest;
 use SP\Services\Api\ApiService;
 use SP\Services\ServiceException;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\getResource;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\getResource;
+use function SP\Test\setupContext;
 
 /**
  * Class ApiServiceTest

test/Services/AuthToken/AuthTokenServiceTest.php

@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\AuthToken;
+namespace SP\Test\Services\AuthToken;
 
 use Defuse\Crypto\Exception\CryptoException;
 use SP\Core\Acl\ActionsInterface;
@@ -35,9 +35,9 @@ use SP\Repositories\NoSuchItemException;
 use SP\Services\AuthToken\AuthTokenService;
 use SP\Services\ServiceException;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
+use SP\Test\DatabaseTestCase;
 use SP\Util\Util;
-use function SP\Tests\setupContext;
+use function SP\Test\setupContext;
 
 /**
  * Class AuthTokenServiceTest

test/Services/Backup/FileBackupServiceTest.php

@@ -22,11 +22,11 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Backup;
+namespace SP\Test\Services\Backup;
 
 use PHPUnit\Framework\TestCase;
 use SP\Services\Backup\FileBackupService;
-use function SP\Tests\setupContext;
+use function SP\Test\setupContext;
 
 /**
  * Class FileBackupServiceTest

test/Services/Category/CategoryServiceTest.php

@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Category;
+namespace SP\Test\Services\Category;
 
 use SP\Core\Exceptions\ConstraintException;
 use SP\DataModel\CategoryData;
@@ -31,8 +31,8 @@ use SP\Repositories\DuplicatedItemException;
 use SP\Repositories\NoSuchItemException;
 use SP\Services\Category\CategoryService;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class CategoryServiceTest

test/Services/Client/ClientServiceTest.php

@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Client;
+namespace SP\Test\Services\Client;
 
 use SP\Core\Context\ContextInterface;
 use SP\Core\Exceptions\ConstraintException;
@@ -34,8 +34,8 @@ use SP\Services\Client\ClientService;
 use SP\Services\ServiceException;
 use SP\Services\User\UserLoginResponse;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class ClientServiceTest

test/Services/Config/ConfigBackupServiceTest.php

@@ -22,13 +22,13 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Config;
+namespace SP\Test\Services\Config;
 
 use PHPUnit\Framework\TestCase;
 use SP\Config\Config;
 use SP\Config\ConfigData;
 use SP\Services\Config\ConfigBackupService;
-use function SP\Tests\setupContext;
+use function SP\Test\setupContext;
 
 /**
  * Class ConfigBackupServiceTest

test/Services/Config/ConfigServiceTest.php

@@ -22,15 +22,15 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Config;
+namespace SP\Test\Services\Config;
 
 use SP\DataModel\ConfigData;
 use SP\DataModel\Dto\ConfigRequest;
 use SP\Repositories\NoSuchItemException;
 use SP\Services\Config\ConfigService;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class ConfigServiceTest

test/Services/Crypt/MasterPassServiceTest.php

@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Crypt;
+namespace SP\Test\Services\Crypt;
 
 use SP\Core\Crypt\Crypt;
 use SP\Services\Account\AccountService;
@@ -30,9 +30,9 @@ use SP\Services\Crypt\MasterPassService;
 use SP\Services\Crypt\UpdateMasterPassRequest;
 use SP\Services\CustomField\CustomFieldService;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use SP\Tests\Services\Account\AccountCryptServiceTest;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use SP\Test\Services\Account\AccountCryptServiceTest;
+use function SP\Test\setupContext;
 
 /**
  * Class MasterPassServiceTest

test/Services/Crypt/SecureSessionServiceTest.php

@@ -22,13 +22,13 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Crypt;
+namespace SP\Test\Services\Crypt;
 
 use Defuse\Crypto\Key;
 use PHPUnit\Framework\TestCase;
 use SP\Core\Crypt\UUIDCookie;
 use SP\Services\Crypt\SecureSessionService;
-use function SP\Tests\setupContext;
+use function SP\Test\setupContext;
 
 /**
  * Class SecureSessionServiceTest

test/Services/Crypt/TemporaryMasterPassServiceTest.php

@@ -22,13 +22,13 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Crypt;
+namespace SP\Test\Services\Crypt;
 
 use Defuse\Crypto\Exception\CryptoException;
 use PHPUnit\Framework\TestCase;
 use SP\Core\Context\ContextInterface;
 use SP\Services\Crypt\TemporaryMasterPassService;
-use function SP\Tests\setupContext;
+use function SP\Test\setupContext;
 
 /**
  * Class TemporaryMasterPassServiceTest

test/Services/CustomField/CustomFieldCryptServiceTest.php

@@ -22,16 +22,16 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\CustomField;
+namespace SP\Test\Services\CustomField;
 
 use SP\Core\Crypt\Crypt;
 use SP\Services\Crypt\UpdateMasterPassRequest;
 use SP\Services\CustomField\CustomFieldCryptService;
 use SP\Services\CustomField\CustomFieldService;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use SP\Tests\Services\Account\AccountCryptServiceTest;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use SP\Test\Services\Account\AccountCryptServiceTest;
+use function SP\Test\setupContext;
 
 /**
  * Class CustomFieldCryptServiceTest

test/Services/CustomField/CustomFieldDefServiceTest.php

@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\CustomField;
+namespace SP\Test\Services\CustomField;
 
 use SP\Core\Acl\ActionsInterface;
 use SP\Core\Exceptions\ConstraintException;
@@ -32,8 +32,8 @@ use SP\Repositories\NoSuchItemException;
 use SP\Services\CustomField\CustomFieldDefService;
 use SP\Services\ServiceException;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class CustomFieldDefServiceTest

test/Services/CustomField/CustomFieldServiceTest.php

@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\CustomField;
+namespace SP\Test\Services\CustomField;
 
 use SP\Core\Acl\ActionsInterface;
 use SP\Core\Crypt\Crypt;
@@ -31,9 +31,9 @@ use SP\DataModel\CustomFieldData;
 use SP\Repositories\NoSuchItemException;
 use SP\Services\CustomField\CustomFieldService;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use SP\Tests\Services\Account\AccountCryptServiceTest;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use SP\Test\Services\Account\AccountCryptServiceTest;
+use function SP\Test\setupContext;
 
 /**
  * Class CustomFieldServiceTest

test/Services/Eventlog/EventlogServiceTest.php

@@ -22,15 +22,15 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Eventlog;
+namespace SP\Test\Services\Eventlog;
 
 use SP\Core\Exceptions\ConstraintException;
 use SP\DataModel\EventlogData;
 use SP\DataModel\ItemSearchData;
 use SP\Services\EventLog\EventlogService;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class EventlogServiceTest

test/Services/Export/XmlExportServiceTest.php

@@ -22,16 +22,16 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Export;
+namespace SP\Test\Services\Export;
 
 use SP\Services\Export\VerifyResult;
 use SP\Services\Export\XmlExportService;
 use SP\Services\Export\XmlVerifyService;
 use SP\Services\ServiceException;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
+use SP\Test\DatabaseTestCase;
 use SP\Util\Util;
-use function SP\Tests\setupContext;
+use function SP\Test\setupContext;
 
 /**
  * Class XmlExportServiceTest

test/Services/Import/CsvImportTest.php

@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Import;
+namespace SP\Test\Services\Import;
 
 use DI\Container;
 use SP\Core\Crypt\Crypt;
@@ -34,8 +34,8 @@ use SP\Services\Import\FileImport;
 use SP\Services\Import\ImportException;
 use SP\Services\Import\ImportParams;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class CsvImportTest

test/Services/Import/SyspassImportTest.php

@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Import;
+namespace SP\Test\Services\Import;
 
 use DI\Container;
 use SP\Core\Crypt\Crypt;
@@ -35,8 +35,8 @@ use SP\Services\Import\ImportParams;
 use SP\Services\Import\SyspassImport;
 use SP\Services\Import\XmlFileImport;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class SyspassImportTest

test/Storage/FileHandlerTest.php

@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author    nuxsmin
- * @link      https://syspass.org
+ * @author nuxsmin
+ * @link https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests;
+namespace SP\Test\Storage;
 
 use PHPUnit\Framework\TestCase;
 use SP\Storage\FileException;

test/Storage/XmlHandlerTest.php

@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author    nuxsmin
- * @link      https://syspass.org
+ * @author nuxsmin
+ * @link https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests;
+namespace SP\Test\Storage;
 
 use PHPUnit\Framework\TestCase;
 use SP\Storage\FileException;

test/bootstrap.php

@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests;
+namespace SP\Test;
 
 use DI\ContainerBuilder;
 use Doctrine\Common\Cache\ArrayCache;
@@ -35,7 +35,7 @@ use SP\Storage\Database\DatabaseConnectionData;
 define('APP_MODULE', 'tests');
 
 define('APP_ROOT', dirname(__DIR__));
-define('TEST_ROOT', dirname(__DIR__) . DIRECTORY_SEPARATOR . 'tests');
+define('TEST_ROOT', dirname(__DIR__) . DIRECTORY_SEPARATOR . 'test');
 define('RESOURCE_DIR', TEST_ROOT . DIRECTORY_SEPARATOR . 'res');
 define('TMP_DIR', TEST_ROOT . DIRECTORY_SEPARATOR . 'tmp');
 define('CONFIG_PATH', RESOURCE_DIR . DIRECTORY_SEPARATOR . 'config');