From fdac95ca97082f2ba22a53f1c66ea6755cdf4ed6 Mon Sep 17 00:00:00 2001
From: nuxsmin <nuxsmin@syspass.org>
Date: Mon, 23 Jul 2018 13:43:52 +0200
Subject: [PATCH] * [MOD] Moved test files to avoid weird issues with
 permissions when performing unit tests

---
 composer.json                                      |  2 +-
 phpunit.xml                                        | 14 ++------------
 public/js/app-triggers.min.js                      |  2 +-
 test/{ => SP}/Config/ConfigTest.php                |  0
 test/{ => SP}/Core/Crypt/CryptTest.php             |  0
 test/{ => SP}/Core/Crypt/VaultTest.php             |  0
 test/{ => SP}/DatabaseTestCase.php                 |  0
 .../Repositories/AccountFileRepositoryTest.php     |  0
 .../Repositories/AccountHistoryRepositoryTest.php  |  0
 .../Repositories/AccountRepositoryTest.php         |  0
 .../AccountToFavoriteRepositoryTest.php            |  0
 .../Repositories/AccountToTagRepositoryTest.php    |  0
 .../AccountToUserGroupRepositoryTest.php           |  0
 .../Repositories/AccountToUserRepositoryTest.php   |  0
 .../Repositories/AuthTokenRepositoryTest.php       |  0
 .../Repositories/CategoryRepositoryTest.php        |  0
 .../{ => SP}/Repositories/ClientRepositoryTest.php |  0
 .../{ => SP}/Repositories/ConfigRepositoryTest.php |  0
 .../Repositories/CustomFieldDefRepositoryTest.php  |  0
 .../Repositories/CustomFieldRepositoryTest.php     |  0
 .../Repositories/CustomFieldTypeRepositoryTest.php |  0
 .../Repositories/EventlogRepositoryTest.php        |  0
 .../Repositories/NotificationRepositoryTest.php    |  0
 .../{ => SP}/Repositories/PluginRepositoryTest.php |  0
 .../Repositories/PublicLinkRepositoryTest.php      |  0
 test/{ => SP}/Repositories/TagRepositoryTest.php   |  0
 test/{ => SP}/Repositories/TrackRepositoryTest.php |  0
 .../Repositories/UserGroupRepositoryTest.php       |  0
 .../Repositories/UserPassRecoverRepositoryTest.php |  0
 .../Repositories/UserProfileRepositoryTest.php     |  0
 test/{ => SP}/Repositories/UserRepositoryTest.php  |  0
 .../Services/Account/AccountAclServiceTest.php     |  0
 .../Services/Account/AccountCryptServiceTest.php   |  0
 .../Services/Account/AccountFileServiceTest.php    |  0
 .../Services/Account/AccountHistoryServiceTest.php |  0
 .../Services/Account/AccountSearchServiceTest.php  |  0
 .../Services/Account/AccountServiceTest.php        |  0
 .../Account/AccountToFavoriteServiceTest.php       |  0
 .../Services/Account/AccountToTagServiceTest.php   |  0
 test/{ => SP}/Services/Api/ApiRequestTest.php      |  0
 test/{ => SP}/Services/Api/ApiServiceTest.php      |  0
 .../Services/AuthToken/AuthTokenServiceTest.php    |  0
 .../Services/Backup/FileBackupServiceTest.php      |  0
 .../Services/Category/CategoryServiceTest.php      |  0
 .../{ => SP}/Services/Client/ClientServiceTest.php |  0
 .../Services/Config/ConfigBackupServiceTest.php    |  0
 .../{ => SP}/Services/Config/ConfigServiceTest.php |  0
 .../Services/Crypt/MasterPassServiceTest.php       |  0
 .../Services/Crypt/SecureSessionServiceTest.php    |  0
 .../Crypt/TemporaryMasterPassServiceTest.php       |  0
 .../CustomField/CustomFieldCryptServiceTest.php    |  0
 .../CustomField/CustomFieldDefServiceTest.php      |  0
 .../CustomField/CustomFieldServiceTest.php         |  0
 .../Services/Eventlog/EventlogServiceTest.php      |  0
 .../Services/Export/XmlExportServiceTest.php       |  0
 test/{ => SP}/Services/Import/CsvImportTest.php    |  0
 .../{ => SP}/Services/Import/KeepassImportTest.php |  0
 .../{ => SP}/Services/Import/SyspassImportTest.php |  0
 .../{ => SP}/Services/Import/XmlFileImportTest.php |  0
 test/{ => SP}/Services/Import/XmlImportTest.php    |  0
 test/{ => SP}/Services/Install/DbTestUtilTrait.php |  0
 test/{ => SP}/Services/Install/InstallerTest.php   |  0
 test/{ => SP}/Services/Install/MySQLTest.php       |  0
 .../Notification/NotificationServiceTest.php       |  0
 .../{ => SP}/Services/Plugin/PluginServiceTest.php |  0
 .../Services/PublicLink/PublicLinkServiceTest.php  |  0
 test/{ => SP}/Services/Tag/TagServiceTest.php      |  0
 test/{ => SP}/Services/Track/TrackServiceTest.php  |  0
 .../{ => SP}/Services/User/UserPassServiceTest.php |  0
 test/{ => SP}/Storage/FileHandlerTest.php          |  0
 test/{ => SP}/Storage/XmlHandlerTest.php           |  0
 test/{ => SP}/bootstrap.php                        |  5 +++--
 72 files changed, 7 insertions(+), 16 deletions(-)
 rename test/{ => SP}/Config/ConfigTest.php (100%)
 rename test/{ => SP}/Core/Crypt/CryptTest.php (100%)
 rename test/{ => SP}/Core/Crypt/VaultTest.php (100%)
 rename test/{ => SP}/DatabaseTestCase.php (100%)
 rename test/{ => SP}/Repositories/AccountFileRepositoryTest.php (100%)
 rename test/{ => SP}/Repositories/AccountHistoryRepositoryTest.php (100%)
 rename test/{ => SP}/Repositories/AccountRepositoryTest.php (100%)
 rename test/{ => SP}/Repositories/AccountToFavoriteRepositoryTest.php (100%)
 rename test/{ => SP}/Repositories/AccountToTagRepositoryTest.php (100%)
 rename test/{ => SP}/Repositories/AccountToUserGroupRepositoryTest.php (100%)
 rename test/{ => SP}/Repositories/AccountToUserRepositoryTest.php (100%)
 rename test/{ => SP}/Repositories/AuthTokenRepositoryTest.php (100%)
 rename test/{ => SP}/Repositories/CategoryRepositoryTest.php (100%)
 rename test/{ => SP}/Repositories/ClientRepositoryTest.php (100%)
 rename test/{ => SP}/Repositories/ConfigRepositoryTest.php (100%)
 rename test/{ => SP}/Repositories/CustomFieldDefRepositoryTest.php (100%)
 rename test/{ => SP}/Repositories/CustomFieldRepositoryTest.php (100%)
 rename test/{ => SP}/Repositories/CustomFieldTypeRepositoryTest.php (100%)
 rename test/{ => SP}/Repositories/EventlogRepositoryTest.php (100%)
 rename test/{ => SP}/Repositories/NotificationRepositoryTest.php (100%)
 rename test/{ => SP}/Repositories/PluginRepositoryTest.php (100%)
 rename test/{ => SP}/Repositories/PublicLinkRepositoryTest.php (100%)
 rename test/{ => SP}/Repositories/TagRepositoryTest.php (100%)
 rename test/{ => SP}/Repositories/TrackRepositoryTest.php (100%)
 rename test/{ => SP}/Repositories/UserGroupRepositoryTest.php (100%)
 rename test/{ => SP}/Repositories/UserPassRecoverRepositoryTest.php (100%)
 rename test/{ => SP}/Repositories/UserProfileRepositoryTest.php (100%)
 rename test/{ => SP}/Repositories/UserRepositoryTest.php (100%)
 rename test/{ => SP}/Services/Account/AccountAclServiceTest.php (100%)
 rename test/{ => SP}/Services/Account/AccountCryptServiceTest.php (100%)
 rename test/{ => SP}/Services/Account/AccountFileServiceTest.php (100%)
 rename test/{ => SP}/Services/Account/AccountHistoryServiceTest.php (100%)
 rename test/{ => SP}/Services/Account/AccountSearchServiceTest.php (100%)
 rename test/{ => SP}/Services/Account/AccountServiceTest.php (100%)
 rename test/{ => SP}/Services/Account/AccountToFavoriteServiceTest.php (100%)
 rename test/{ => SP}/Services/Account/AccountToTagServiceTest.php (100%)
 rename test/{ => SP}/Services/Api/ApiRequestTest.php (100%)
 rename test/{ => SP}/Services/Api/ApiServiceTest.php (100%)
 rename test/{ => SP}/Services/AuthToken/AuthTokenServiceTest.php (100%)
 rename test/{ => SP}/Services/Backup/FileBackupServiceTest.php (100%)
 rename test/{ => SP}/Services/Category/CategoryServiceTest.php (100%)
 rename test/{ => SP}/Services/Client/ClientServiceTest.php (100%)
 rename test/{ => SP}/Services/Config/ConfigBackupServiceTest.php (100%)
 rename test/{ => SP}/Services/Config/ConfigServiceTest.php (100%)
 rename test/{ => SP}/Services/Crypt/MasterPassServiceTest.php (100%)
 rename test/{ => SP}/Services/Crypt/SecureSessionServiceTest.php (100%)
 rename test/{ => SP}/Services/Crypt/TemporaryMasterPassServiceTest.php (100%)
 rename test/{ => SP}/Services/CustomField/CustomFieldCryptServiceTest.php (100%)
 rename test/{ => SP}/Services/CustomField/CustomFieldDefServiceTest.php (100%)
 rename test/{ => SP}/Services/CustomField/CustomFieldServiceTest.php (100%)
 rename test/{ => SP}/Services/Eventlog/EventlogServiceTest.php (100%)
 rename test/{ => SP}/Services/Export/XmlExportServiceTest.php (100%)
 rename test/{ => SP}/Services/Import/CsvImportTest.php (100%)
 rename test/{ => SP}/Services/Import/KeepassImportTest.php (100%)
 rename test/{ => SP}/Services/Import/SyspassImportTest.php (100%)
 rename test/{ => SP}/Services/Import/XmlFileImportTest.php (100%)
 rename test/{ => SP}/Services/Import/XmlImportTest.php (100%)
 rename test/{ => SP}/Services/Install/DbTestUtilTrait.php (100%)
 rename test/{ => SP}/Services/Install/InstallerTest.php (100%)
 rename test/{ => SP}/Services/Install/MySQLTest.php (100%)
 rename test/{ => SP}/Services/Notification/NotificationServiceTest.php (100%)
 rename test/{ => SP}/Services/Plugin/PluginServiceTest.php (100%)
 rename test/{ => SP}/Services/PublicLink/PublicLinkServiceTest.php (100%)
 rename test/{ => SP}/Services/Tag/TagServiceTest.php (100%)
 rename test/{ => SP}/Services/Track/TrackServiceTest.php (100%)
 rename test/{ => SP}/Services/User/UserPassServiceTest.php (100%)
 rename test/{ => SP}/Storage/FileHandlerTest.php (100%)
 rename test/{ => SP}/Storage/XmlHandlerTest.php (100%)
 rename test/{ => SP}/bootstrap.php (97%)

diff --git a/composer.json b/composer.json
index 866cec61..60c8c068 100644
--- a/composer.json
+++ b/composer.json
@@ -42,7 +42,7 @@
       "SP\\": "lib/SP/",
       "SP\\Modules\\Web\\": "app/modules/web/",
       "SP\\Modules\\Api\\": "app/modules/api/",
-      "SP\\Test\\": "test"
+      "SP\\Test\\": "test/SP/"
     }
   },
   "config": {
diff --git a/phpunit.xml b/phpunit.xml
index 1a441bac..7a6619eb 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit backupGlobals="false"
          backupStaticAttributes="false"
-         bootstrap="./test/bootstrap.php"
+         bootstrap="./test/SP/bootstrap.php"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
@@ -10,9 +10,7 @@
          stopOnFailure="false">
     <testsuites>
         <testsuite name="Unit">
-            <directory suffix=".php">./test</directory>
-            <exclude>./test/res</exclude>
-            <exclude>./test/tmp</exclude>
+            <directory suffix=".php">./test/SP</directory>
         </testsuite>
     </testsuites>
     <filter>
@@ -20,12 +18,4 @@
             <directory suffix=".php">./lib</directory>
         </whitelist>
     </filter>
-    <!--<php>-->
-        <!--<env name="APP_ENV" value="testing"/>-->
-        <!--<env name="BCRYPT_ROUNDS" value="4"/>-->
-        <!--<env name="CACHE_DRIVER" value="array"/>-->
-        <!--<env name="SESSION_DRIVER" value="array"/>-->
-        <!--<env name="QUEUE_DRIVER" value="sync"/>-->
-        <!--<env name="MAIL_DRIVER" value="array"/>-->
-    <!--</php>-->
 </phpunit>
\ No newline at end of file
diff --git a/public/js/app-triggers.min.js b/public/js/app-triggers.min.js
index 2ca683a5..4d2495bc 100644
--- a/public/js/app-triggers.min.js
+++ b/public/js/app-triggers.min.js
@@ -1,5 +1,5 @@
 var $jscomp={scope:{},findInternal:function(b,d,f){b instanceof String&&(b=String(b));for(var g=b.length,a=0;a<g;a++){var c=b[a];if(d.call(f,c,a,b))return{i:a,v:c}}return{i:-1,v:void 0}}};$jscomp.defineProperty="function"==typeof Object.defineProperties?Object.defineProperty:function(b,d,f){if(f.get||f.set)throw new TypeError("ES3 does not support getters and setters.");b!=Array.prototype&&b!=Object.prototype&&(b[d]=f.value)};
-$jscomp.getGlobal=function(b){return"undefined"!=typeof window&&window===b?b:"undefined"!=typeof global?global:b};$jscomp.global=$jscomp.getGlobal(this);$jscomp.polyfill=function(b,d,f,g){if(d){f=$jscomp.global;b=b.split(".");for(g=0;g<b.length-1;g++){var a=b[g];a in f||(f[a]={});f=f[a]}b=b[b.length-1];g=f[b];d=d(g);d!=g&&null!=d&&$jscomp.defineProperty(f,b,{configurable:!0,writable:!0,value:d})}};
+$jscomp.getGlobal=function(b){return"undefined"!=typeof window&&window===b?b:"undefined"!=typeof global&&null!=global?global:b};$jscomp.global=$jscomp.getGlobal(this);$jscomp.polyfill=function(b,d,f,g){if(d){f=$jscomp.global;b=b.split(".");for(g=0;g<b.length-1;g++){var a=b[g];a in f||(f[a]={});f=f[a]}b=b[b.length-1];g=f[b];d=d(g);d!=g&&null!=d&&$jscomp.defineProperty(f,b,{configurable:!0,writable:!0,value:d})}};
 $jscomp.polyfill("Array.prototype.find",function(b){return b?b:function(b,f){return $jscomp.findInternal(this,b,f).v}},"es6-impl","es3");
 sysPass.Triggers=function(b){var d=b.log,f=function(a){var c={valueField:"id",labelField:"name",searchField:["name"]};a.find(".select-box").each(function(a){var d=$(this);a={};!0===d.data("create")&&(a.create=!0);c.plugins=d.hasClass("select-box-deselect")?{clear_selection:{title:b.config().LANG[51]}}:{};if(d.data("onchange")){var e=d.data("onchange").split("/");c.onChange=function(a){if(0<a)if(2===e.length)sysPassApp.actions()[e[0]][e[1]](d);else sysPassApp.actions()[e[0]](d)}}d.selectize($.extend(a,
 c))});a.find("#allowed_exts").selectize({create:function(a){return{value:a.toUpperCase(),text:a.toUpperCase()}},createFilter:/^[a-z0-9]{1,4}$/i,plugins:["remove_button"]});a.find("#wikifilter").selectize({create:!0,createFilter:/^[a-z0-9:._-]+$/i,plugins:["remove_button"]});a.find(".select-items-tag").selectize({create:function(a){return{value:a.toLowerCase(),text:a.toLowerCase()}},createFilter:/^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/,
diff --git a/test/Config/ConfigTest.php b/test/SP/Config/ConfigTest.php
similarity index 100%
rename from test/Config/ConfigTest.php
rename to test/SP/Config/ConfigTest.php
diff --git a/test/Core/Crypt/CryptTest.php b/test/SP/Core/Crypt/CryptTest.php
similarity index 100%
rename from test/Core/Crypt/CryptTest.php
rename to test/SP/Core/Crypt/CryptTest.php
diff --git a/test/Core/Crypt/VaultTest.php b/test/SP/Core/Crypt/VaultTest.php
similarity index 100%
rename from test/Core/Crypt/VaultTest.php
rename to test/SP/Core/Crypt/VaultTest.php
diff --git a/test/DatabaseTestCase.php b/test/SP/DatabaseTestCase.php
similarity index 100%
rename from test/DatabaseTestCase.php
rename to test/SP/DatabaseTestCase.php
diff --git a/test/Repositories/AccountFileRepositoryTest.php b/test/SP/Repositories/AccountFileRepositoryTest.php
similarity index 100%
rename from test/Repositories/AccountFileRepositoryTest.php
rename to test/SP/Repositories/AccountFileRepositoryTest.php
diff --git a/test/Repositories/AccountHistoryRepositoryTest.php b/test/SP/Repositories/AccountHistoryRepositoryTest.php
similarity index 100%
rename from test/Repositories/AccountHistoryRepositoryTest.php
rename to test/SP/Repositories/AccountHistoryRepositoryTest.php
diff --git a/test/Repositories/AccountRepositoryTest.php b/test/SP/Repositories/AccountRepositoryTest.php
similarity index 100%
rename from test/Repositories/AccountRepositoryTest.php
rename to test/SP/Repositories/AccountRepositoryTest.php
diff --git a/test/Repositories/AccountToFavoriteRepositoryTest.php b/test/SP/Repositories/AccountToFavoriteRepositoryTest.php
similarity index 100%
rename from test/Repositories/AccountToFavoriteRepositoryTest.php
rename to test/SP/Repositories/AccountToFavoriteRepositoryTest.php
diff --git a/test/Repositories/AccountToTagRepositoryTest.php b/test/SP/Repositories/AccountToTagRepositoryTest.php
similarity index 100%
rename from test/Repositories/AccountToTagRepositoryTest.php
rename to test/SP/Repositories/AccountToTagRepositoryTest.php
diff --git a/test/Repositories/AccountToUserGroupRepositoryTest.php b/test/SP/Repositories/AccountToUserGroupRepositoryTest.php
similarity index 100%
rename from test/Repositories/AccountToUserGroupRepositoryTest.php
rename to test/SP/Repositories/AccountToUserGroupRepositoryTest.php
diff --git a/test/Repositories/AccountToUserRepositoryTest.php b/test/SP/Repositories/AccountToUserRepositoryTest.php
similarity index 100%
rename from test/Repositories/AccountToUserRepositoryTest.php
rename to test/SP/Repositories/AccountToUserRepositoryTest.php
diff --git a/test/Repositories/AuthTokenRepositoryTest.php b/test/SP/Repositories/AuthTokenRepositoryTest.php
similarity index 100%
rename from test/Repositories/AuthTokenRepositoryTest.php
rename to test/SP/Repositories/AuthTokenRepositoryTest.php
diff --git a/test/Repositories/CategoryRepositoryTest.php b/test/SP/Repositories/CategoryRepositoryTest.php
similarity index 100%
rename from test/Repositories/CategoryRepositoryTest.php
rename to test/SP/Repositories/CategoryRepositoryTest.php
diff --git a/test/Repositories/ClientRepositoryTest.php b/test/SP/Repositories/ClientRepositoryTest.php
similarity index 100%
rename from test/Repositories/ClientRepositoryTest.php
rename to test/SP/Repositories/ClientRepositoryTest.php
diff --git a/test/Repositories/ConfigRepositoryTest.php b/test/SP/Repositories/ConfigRepositoryTest.php
similarity index 100%
rename from test/Repositories/ConfigRepositoryTest.php
rename to test/SP/Repositories/ConfigRepositoryTest.php
diff --git a/test/Repositories/CustomFieldDefRepositoryTest.php b/test/SP/Repositories/CustomFieldDefRepositoryTest.php
similarity index 100%
rename from test/Repositories/CustomFieldDefRepositoryTest.php
rename to test/SP/Repositories/CustomFieldDefRepositoryTest.php
diff --git a/test/Repositories/CustomFieldRepositoryTest.php b/test/SP/Repositories/CustomFieldRepositoryTest.php
similarity index 100%
rename from test/Repositories/CustomFieldRepositoryTest.php
rename to test/SP/Repositories/CustomFieldRepositoryTest.php
diff --git a/test/Repositories/CustomFieldTypeRepositoryTest.php b/test/SP/Repositories/CustomFieldTypeRepositoryTest.php
similarity index 100%
rename from test/Repositories/CustomFieldTypeRepositoryTest.php
rename to test/SP/Repositories/CustomFieldTypeRepositoryTest.php
diff --git a/test/Repositories/EventlogRepositoryTest.php b/test/SP/Repositories/EventlogRepositoryTest.php
similarity index 100%
rename from test/Repositories/EventlogRepositoryTest.php
rename to test/SP/Repositories/EventlogRepositoryTest.php
diff --git a/test/Repositories/NotificationRepositoryTest.php b/test/SP/Repositories/NotificationRepositoryTest.php
similarity index 100%
rename from test/Repositories/NotificationRepositoryTest.php
rename to test/SP/Repositories/NotificationRepositoryTest.php
diff --git a/test/Repositories/PluginRepositoryTest.php b/test/SP/Repositories/PluginRepositoryTest.php
similarity index 100%
rename from test/Repositories/PluginRepositoryTest.php
rename to test/SP/Repositories/PluginRepositoryTest.php
diff --git a/test/Repositories/PublicLinkRepositoryTest.php b/test/SP/Repositories/PublicLinkRepositoryTest.php
similarity index 100%
rename from test/Repositories/PublicLinkRepositoryTest.php
rename to test/SP/Repositories/PublicLinkRepositoryTest.php
diff --git a/test/Repositories/TagRepositoryTest.php b/test/SP/Repositories/TagRepositoryTest.php
similarity index 100%
rename from test/Repositories/TagRepositoryTest.php
rename to test/SP/Repositories/TagRepositoryTest.php
diff --git a/test/Repositories/TrackRepositoryTest.php b/test/SP/Repositories/TrackRepositoryTest.php
similarity index 100%
rename from test/Repositories/TrackRepositoryTest.php
rename to test/SP/Repositories/TrackRepositoryTest.php
diff --git a/test/Repositories/UserGroupRepositoryTest.php b/test/SP/Repositories/UserGroupRepositoryTest.php
similarity index 100%
rename from test/Repositories/UserGroupRepositoryTest.php
rename to test/SP/Repositories/UserGroupRepositoryTest.php
diff --git a/test/Repositories/UserPassRecoverRepositoryTest.php b/test/SP/Repositories/UserPassRecoverRepositoryTest.php
similarity index 100%
rename from test/Repositories/UserPassRecoverRepositoryTest.php
rename to test/SP/Repositories/UserPassRecoverRepositoryTest.php
diff --git a/test/Repositories/UserProfileRepositoryTest.php b/test/SP/Repositories/UserProfileRepositoryTest.php
similarity index 100%
rename from test/Repositories/UserProfileRepositoryTest.php
rename to test/SP/Repositories/UserProfileRepositoryTest.php
diff --git a/test/Repositories/UserRepositoryTest.php b/test/SP/Repositories/UserRepositoryTest.php
similarity index 100%
rename from test/Repositories/UserRepositoryTest.php
rename to test/SP/Repositories/UserRepositoryTest.php
diff --git a/test/Services/Account/AccountAclServiceTest.php b/test/SP/Services/Account/AccountAclServiceTest.php
similarity index 100%
rename from test/Services/Account/AccountAclServiceTest.php
rename to test/SP/Services/Account/AccountAclServiceTest.php
diff --git a/test/Services/Account/AccountCryptServiceTest.php b/test/SP/Services/Account/AccountCryptServiceTest.php
similarity index 100%
rename from test/Services/Account/AccountCryptServiceTest.php
rename to test/SP/Services/Account/AccountCryptServiceTest.php
diff --git a/test/Services/Account/AccountFileServiceTest.php b/test/SP/Services/Account/AccountFileServiceTest.php
similarity index 100%
rename from test/Services/Account/AccountFileServiceTest.php
rename to test/SP/Services/Account/AccountFileServiceTest.php
diff --git a/test/Services/Account/AccountHistoryServiceTest.php b/test/SP/Services/Account/AccountHistoryServiceTest.php
similarity index 100%
rename from test/Services/Account/AccountHistoryServiceTest.php
rename to test/SP/Services/Account/AccountHistoryServiceTest.php
diff --git a/test/Services/Account/AccountSearchServiceTest.php b/test/SP/Services/Account/AccountSearchServiceTest.php
similarity index 100%
rename from test/Services/Account/AccountSearchServiceTest.php
rename to test/SP/Services/Account/AccountSearchServiceTest.php
diff --git a/test/Services/Account/AccountServiceTest.php b/test/SP/Services/Account/AccountServiceTest.php
similarity index 100%
rename from test/Services/Account/AccountServiceTest.php
rename to test/SP/Services/Account/AccountServiceTest.php
diff --git a/test/Services/Account/AccountToFavoriteServiceTest.php b/test/SP/Services/Account/AccountToFavoriteServiceTest.php
similarity index 100%
rename from test/Services/Account/AccountToFavoriteServiceTest.php
rename to test/SP/Services/Account/AccountToFavoriteServiceTest.php
diff --git a/test/Services/Account/AccountToTagServiceTest.php b/test/SP/Services/Account/AccountToTagServiceTest.php
similarity index 100%
rename from test/Services/Account/AccountToTagServiceTest.php
rename to test/SP/Services/Account/AccountToTagServiceTest.php
diff --git a/test/Services/Api/ApiRequestTest.php b/test/SP/Services/Api/ApiRequestTest.php
similarity index 100%
rename from test/Services/Api/ApiRequestTest.php
rename to test/SP/Services/Api/ApiRequestTest.php
diff --git a/test/Services/Api/ApiServiceTest.php b/test/SP/Services/Api/ApiServiceTest.php
similarity index 100%
rename from test/Services/Api/ApiServiceTest.php
rename to test/SP/Services/Api/ApiServiceTest.php
diff --git a/test/Services/AuthToken/AuthTokenServiceTest.php b/test/SP/Services/AuthToken/AuthTokenServiceTest.php
similarity index 100%
rename from test/Services/AuthToken/AuthTokenServiceTest.php
rename to test/SP/Services/AuthToken/AuthTokenServiceTest.php
diff --git a/test/Services/Backup/FileBackupServiceTest.php b/test/SP/Services/Backup/FileBackupServiceTest.php
similarity index 100%
rename from test/Services/Backup/FileBackupServiceTest.php
rename to test/SP/Services/Backup/FileBackupServiceTest.php
diff --git a/test/Services/Category/CategoryServiceTest.php b/test/SP/Services/Category/CategoryServiceTest.php
similarity index 100%
rename from test/Services/Category/CategoryServiceTest.php
rename to test/SP/Services/Category/CategoryServiceTest.php
diff --git a/test/Services/Client/ClientServiceTest.php b/test/SP/Services/Client/ClientServiceTest.php
similarity index 100%
rename from test/Services/Client/ClientServiceTest.php
rename to test/SP/Services/Client/ClientServiceTest.php
diff --git a/test/Services/Config/ConfigBackupServiceTest.php b/test/SP/Services/Config/ConfigBackupServiceTest.php
similarity index 100%
rename from test/Services/Config/ConfigBackupServiceTest.php
rename to test/SP/Services/Config/ConfigBackupServiceTest.php
diff --git a/test/Services/Config/ConfigServiceTest.php b/test/SP/Services/Config/ConfigServiceTest.php
similarity index 100%
rename from test/Services/Config/ConfigServiceTest.php
rename to test/SP/Services/Config/ConfigServiceTest.php
diff --git a/test/Services/Crypt/MasterPassServiceTest.php b/test/SP/Services/Crypt/MasterPassServiceTest.php
similarity index 100%
rename from test/Services/Crypt/MasterPassServiceTest.php
rename to test/SP/Services/Crypt/MasterPassServiceTest.php
diff --git a/test/Services/Crypt/SecureSessionServiceTest.php b/test/SP/Services/Crypt/SecureSessionServiceTest.php
similarity index 100%
rename from test/Services/Crypt/SecureSessionServiceTest.php
rename to test/SP/Services/Crypt/SecureSessionServiceTest.php
diff --git a/test/Services/Crypt/TemporaryMasterPassServiceTest.php b/test/SP/Services/Crypt/TemporaryMasterPassServiceTest.php
similarity index 100%
rename from test/Services/Crypt/TemporaryMasterPassServiceTest.php
rename to test/SP/Services/Crypt/TemporaryMasterPassServiceTest.php
diff --git a/test/Services/CustomField/CustomFieldCryptServiceTest.php b/test/SP/Services/CustomField/CustomFieldCryptServiceTest.php
similarity index 100%
rename from test/Services/CustomField/CustomFieldCryptServiceTest.php
rename to test/SP/Services/CustomField/CustomFieldCryptServiceTest.php
diff --git a/test/Services/CustomField/CustomFieldDefServiceTest.php b/test/SP/Services/CustomField/CustomFieldDefServiceTest.php
similarity index 100%
rename from test/Services/CustomField/CustomFieldDefServiceTest.php
rename to test/SP/Services/CustomField/CustomFieldDefServiceTest.php
diff --git a/test/Services/CustomField/CustomFieldServiceTest.php b/test/SP/Services/CustomField/CustomFieldServiceTest.php
similarity index 100%
rename from test/Services/CustomField/CustomFieldServiceTest.php
rename to test/SP/Services/CustomField/CustomFieldServiceTest.php
diff --git a/test/Services/Eventlog/EventlogServiceTest.php b/test/SP/Services/Eventlog/EventlogServiceTest.php
similarity index 100%
rename from test/Services/Eventlog/EventlogServiceTest.php
rename to test/SP/Services/Eventlog/EventlogServiceTest.php
diff --git a/test/Services/Export/XmlExportServiceTest.php b/test/SP/Services/Export/XmlExportServiceTest.php
similarity index 100%
rename from test/Services/Export/XmlExportServiceTest.php
rename to test/SP/Services/Export/XmlExportServiceTest.php
diff --git a/test/Services/Import/CsvImportTest.php b/test/SP/Services/Import/CsvImportTest.php
similarity index 100%
rename from test/Services/Import/CsvImportTest.php
rename to test/SP/Services/Import/CsvImportTest.php
diff --git a/test/Services/Import/KeepassImportTest.php b/test/SP/Services/Import/KeepassImportTest.php
similarity index 100%
rename from test/Services/Import/KeepassImportTest.php
rename to test/SP/Services/Import/KeepassImportTest.php
diff --git a/test/Services/Import/SyspassImportTest.php b/test/SP/Services/Import/SyspassImportTest.php
similarity index 100%
rename from test/Services/Import/SyspassImportTest.php
rename to test/SP/Services/Import/SyspassImportTest.php
diff --git a/test/Services/Import/XmlFileImportTest.php b/test/SP/Services/Import/XmlFileImportTest.php
similarity index 100%
rename from test/Services/Import/XmlFileImportTest.php
rename to test/SP/Services/Import/XmlFileImportTest.php
diff --git a/test/Services/Import/XmlImportTest.php b/test/SP/Services/Import/XmlImportTest.php
similarity index 100%
rename from test/Services/Import/XmlImportTest.php
rename to test/SP/Services/Import/XmlImportTest.php
diff --git a/test/Services/Install/DbTestUtilTrait.php b/test/SP/Services/Install/DbTestUtilTrait.php
similarity index 100%
rename from test/Services/Install/DbTestUtilTrait.php
rename to test/SP/Services/Install/DbTestUtilTrait.php
diff --git a/test/Services/Install/InstallerTest.php b/test/SP/Services/Install/InstallerTest.php
similarity index 100%
rename from test/Services/Install/InstallerTest.php
rename to test/SP/Services/Install/InstallerTest.php
diff --git a/test/Services/Install/MySQLTest.php b/test/SP/Services/Install/MySQLTest.php
similarity index 100%
rename from test/Services/Install/MySQLTest.php
rename to test/SP/Services/Install/MySQLTest.php
diff --git a/test/Services/Notification/NotificationServiceTest.php b/test/SP/Services/Notification/NotificationServiceTest.php
similarity index 100%
rename from test/Services/Notification/NotificationServiceTest.php
rename to test/SP/Services/Notification/NotificationServiceTest.php
diff --git a/test/Services/Plugin/PluginServiceTest.php b/test/SP/Services/Plugin/PluginServiceTest.php
similarity index 100%
rename from test/Services/Plugin/PluginServiceTest.php
rename to test/SP/Services/Plugin/PluginServiceTest.php
diff --git a/test/Services/PublicLink/PublicLinkServiceTest.php b/test/SP/Services/PublicLink/PublicLinkServiceTest.php
similarity index 100%
rename from test/Services/PublicLink/PublicLinkServiceTest.php
rename to test/SP/Services/PublicLink/PublicLinkServiceTest.php
diff --git a/test/Services/Tag/TagServiceTest.php b/test/SP/Services/Tag/TagServiceTest.php
similarity index 100%
rename from test/Services/Tag/TagServiceTest.php
rename to test/SP/Services/Tag/TagServiceTest.php
diff --git a/test/Services/Track/TrackServiceTest.php b/test/SP/Services/Track/TrackServiceTest.php
similarity index 100%
rename from test/Services/Track/TrackServiceTest.php
rename to test/SP/Services/Track/TrackServiceTest.php
diff --git a/test/Services/User/UserPassServiceTest.php b/test/SP/Services/User/UserPassServiceTest.php
similarity index 100%
rename from test/Services/User/UserPassServiceTest.php
rename to test/SP/Services/User/UserPassServiceTest.php
diff --git a/test/Storage/FileHandlerTest.php b/test/SP/Storage/FileHandlerTest.php
similarity index 100%
rename from test/Storage/FileHandlerTest.php
rename to test/SP/Storage/FileHandlerTest.php
diff --git a/test/Storage/XmlHandlerTest.php b/test/SP/Storage/XmlHandlerTest.php
similarity index 100%
rename from test/Storage/XmlHandlerTest.php
rename to test/SP/Storage/XmlHandlerTest.php
diff --git a/test/bootstrap.php b/test/SP/bootstrap.php
similarity index 97%
rename from test/bootstrap.php
rename to test/SP/bootstrap.php
index d855fcad..347a9a66 100644
--- a/test/bootstrap.php
+++ b/test/SP/bootstrap.php
@@ -34,8 +34,8 @@ use SP\Storage\Database\DatabaseConnectionData;
 
 define('APP_MODULE', 'tests');
 
-define('APP_ROOT', dirname(__DIR__));
-define('TEST_ROOT', APP_ROOT . DIRECTORY_SEPARATOR . 'test');
+define('APP_ROOT', dirname(__DIR__, 2));
+define('TEST_ROOT', dirname(__DIR__));
 define('SQL_PATH', APP_ROOT . DIRECTORY_SEPARATOR . 'schemas');
 define('RESOURCE_DIR', TEST_ROOT . DIRECTORY_SEPARATOR . 'res');
 define('TMP_DIR', TEST_ROOT . DIRECTORY_SEPARATOR . 'tmp');
@@ -51,6 +51,7 @@ require APP_ROOT . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autol
 require APP_ROOT . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'BaseFunctions.php';
 
 print 'APP_ROOT=' . APP_ROOT . PHP_EOL;
+print 'TEST_ROOT=' . TEST_ROOT . PHP_EOL;
 
 // Setup directories
 if (!is_dir(TMP_DIR)) {