diff --git a/.github/workflows/integration-s3-primary.yml b/.github/workflows/integration-s3-primary.yml index c30a2c2a0b3ef..08d34fba513f4 100644 --- a/.github/workflows/integration-s3-primary.yml +++ b/.github/workflows/integration-s3-primary.yml @@ -109,7 +109,7 @@ jobs: - name: Integration run: | - cd build/integration + cd tests/integration bash run.sh --tags "~@failure-s3" dav_features/webdav-related.feature - name: S3 logs diff --git a/.github/workflows/integration-sqlite.yml b/.github/workflows/integration-sqlite.yml index a93e8b48e2759..55544a9b98d94 100644 --- a/.github/workflows/integration-sqlite.yml +++ b/.github/workflows/integration-sqlite.yml @@ -26,17 +26,16 @@ jobs: with: filters: | src: - - '.github/workflows/**' + - '.github/workflows/integration-sqlite.yml' - '3rdparty/**' - - '**/*.php' - - '**/lib/**' - - '**/tests/**' - - '**/vendor-bin/**' - - 'build/integration/**' - - '.php-cs-fixer.dist.php' + - 'apps/*/lib/**' + - 'core/**.php' + - 'core/shipped.json' + - 'lib/**' + - 'tests/integration/**' + - '**/vendor*/**' - 'composer.json' - 'composer.lock' - - 'core/shipped.json' integration-sqlite: runs-on: ubuntu-latest @@ -163,7 +162,7 @@ jobs: ./occ config:system:set memcache.distributed --value='\OC\Memcache\Redis' - name: Run integration - working-directory: build/integration + working-directory: tests/integration env: LDAP_HOST: localhost run: bash run.sh ${{ matrix.test-suite }} no-tail-log diff --git a/.github/workflows/object-storage-azure.yml b/.github/workflows/object-storage-azure.yml index dcdca78c69893..7664c47119bec 100644 --- a/.github/workflows/object-storage-azure.yml +++ b/.github/workflows/object-storage-azure.yml @@ -102,7 +102,7 @@ jobs: run: | composer install cp tests/redis.config.php config/ - cp tests/preseed-config.php config/config.php + cp tests/fixtures/preseed-config.php config/config.php ./occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-host=127.0.0.1 --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password php -f tests/enable_all.php diff --git a/.github/workflows/object-storage-s3.yml b/.github/workflows/object-storage-s3.yml index ba2f6f2977232..125b103375713 100644 --- a/.github/workflows/object-storage-s3.yml +++ b/.github/workflows/object-storage-s3.yml @@ -103,7 +103,7 @@ jobs: run: | composer install cp tests/redis.config.php config/ - cp tests/preseed-config.php config/config.php + cp tests/fixtures/preseed-config.php config/config.php ./occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-host=127.0.0.1 --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password php -f tests/enable_all.php diff --git a/.github/workflows/object-storage-swift.yml b/.github/workflows/object-storage-swift.yml index 96f455f37c86d..1a5691500acb0 100644 --- a/.github/workflows/object-storage-swift.yml +++ b/.github/workflows/object-storage-swift.yml @@ -99,7 +99,7 @@ jobs: run: | composer install cp tests/redis.config.php config/ - cp tests/preseed-config.php config/config.php + cp tests/fixtures/preseed-config.php config/config.php ./occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-host=127.0.0.1 --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password php -f tests/enable_all.php diff --git a/.github/workflows/phpunit-mariadb.yml b/.github/workflows/phpunit-mariadb.yml index 5cf2f2c4ccb41..992685f7539d4 100644 --- a/.github/workflows/phpunit-mariadb.yml +++ b/.github/workflows/phpunit-mariadb.yml @@ -120,7 +120,7 @@ jobs: run: | mkdir data cp tests/redis.config.php config/ - cp tests/preseed-config.php config/config.php + cp tests/fixtures/preseed-config.php config/config.php ./occ maintenance:install --verbose --database=mysql --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin php -f tests/enable_all.php diff --git a/.github/workflows/phpunit-memcached.yml b/.github/workflows/phpunit-memcached.yml index 191df7d3b74cd..30c52ede931c9 100644 --- a/.github/workflows/phpunit-memcached.yml +++ b/.github/workflows/phpunit-memcached.yml @@ -94,7 +94,7 @@ jobs: - name: Set up Nextcloud run: | mkdir data - cp tests/preseed-config.php config/config.php + cp tests/fixtures/preseed-config.php config/config.php ./occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin php -f tests/enable_all.php diff --git a/.github/workflows/phpunit-mysql-sharding.yml b/.github/workflows/phpunit-mysql-sharding.yml index 9c02db9212654..368d1bf17188b 100644 --- a/.github/workflows/phpunit-mysql-sharding.yml +++ b/.github/workflows/phpunit-mysql-sharding.yml @@ -158,7 +158,7 @@ jobs: run: | mkdir data cp tests/redis.config.php config/ - cp tests/preseed-config.php config/config.php + cp tests/fixtures/preseed-config.php config/config.php ./occ maintenance:install --verbose --database=mysql --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin php -f tests/enable_all.php diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml index 55cf3b157133c..babafa503c666 100644 --- a/.github/workflows/phpunit-mysql.yml +++ b/.github/workflows/phpunit-mysql.yml @@ -120,7 +120,7 @@ jobs: run: | mkdir data cp tests/redis.config.php config/ - cp tests/preseed-config.php config/config.php + cp tests/fixtures/preseed-config.php config/config.php ./occ maintenance:install --verbose --database=mysql --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin php -f tests/enable_all.php diff --git a/.github/workflows/phpunit-nodb.yml b/.github/workflows/phpunit-nodb.yml index b4951d8597519..d4853e0e3d2f4 100644 --- a/.github/workflows/phpunit-nodb.yml +++ b/.github/workflows/phpunit-nodb.yml @@ -99,7 +99,7 @@ jobs: run: | mkdir data cp tests/redis.config.php config/ - cp tests/preseed-config.php config/config.php + cp tests/fixtures/preseed-config.php config/config.php ./occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin php -f tests/enable_all.php diff --git a/.github/workflows/phpunit-object-store-primary.yml b/.github/workflows/phpunit-object-store-primary.yml index 224816f952e64..8e8000cfc87da 100644 --- a/.github/workflows/phpunit-object-store-primary.yml +++ b/.github/workflows/phpunit-object-store-primary.yml @@ -95,7 +95,7 @@ jobs: run: | composer install cp tests/redis.config.php config/ - cp tests/preseed-config.php config/config.php + cp tests/fixtures/preseed-config.php config/config.php ./occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-host=127.0.0.1 --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password php -f tests/enable_all.php diff --git a/.github/workflows/phpunit-oci.yml b/.github/workflows/phpunit-oci.yml index fb3541e111106..03483a3a00f7c 100644 --- a/.github/workflows/phpunit-oci.yml +++ b/.github/workflows/phpunit-oci.yml @@ -120,7 +120,7 @@ jobs: run: | mkdir data cp tests/redis.config.php config/ - cp tests/preseed-config.php config/config.php + cp tests/fixtures/preseed-config.php config/config.php ./occ maintenance:install --verbose --database=oci --database-name=${{ matrix.oracle-versions < 23 && 'XE' || 'FREE' }} --database-host=127.0.0.1 --database-port=1521 --database-user=system --database-pass=oracle --admin-user admin --admin-pass admin php -f tests/enable_all.php diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml index 104597108f80d..a083dba87dec5 100644 --- a/.github/workflows/phpunit-pgsql.yml +++ b/.github/workflows/phpunit-pgsql.yml @@ -114,7 +114,7 @@ jobs: run: | mkdir data cp tests/redis.config.php config/ - cp tests/preseed-config.php config/config.php + cp tests/fixtures/preseed-config.php config/config.php ./occ maintenance:install --verbose --database=pgsql --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin php -f tests/enable_all.php diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml index 907fff0368829..6880884ea1608 100644 --- a/.github/workflows/phpunit-sqlite.yml +++ b/.github/workflows/phpunit-sqlite.yml @@ -101,7 +101,7 @@ jobs: run: | mkdir data cp tests/redis.config.php config/ - cp tests/preseed-config.php config/config.php + cp tests/fixtures/preseed-config.php config/config.php ./occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin php -f tests/enable_all.php diff --git a/autotest-external.sh b/autotest-external.sh index ba6354b26e12a..fd3a8d401c5bc 100755 --- a/autotest-external.sh +++ b/autotest-external.sh @@ -95,8 +95,8 @@ function execute_tests { # back to root folder cd "$BASEDIR" - # revert changes to tests/data - git checkout tests/data + # revert changes to tests/fixtures/data + git checkout tests/fixtures/data # reset data directory rm -rf "$DATADIR" @@ -104,7 +104,7 @@ function execute_tests { # remove the old config file #rm -rf config/config.php - cp tests/preseed-config.php config/config.php + cp tests/fixtures/preseed-config.php config/config.php # drop database if [ "$1" == "mysql" ] ; then @@ -141,7 +141,7 @@ EOF fi # copy autoconfig - cp "$BASEDIR/tests/autoconfig-$1.php" "$BASEDIR/config/autoconfig.php" + cp "$BASEDIR/tests/fixtures/autoconfig-$1.php" "$BASEDIR/config/autoconfig.php" # trigger installation echo "Installing ...." diff --git a/autotest.sh b/autotest.sh index cb3bc226b98c0..1dd55edf44c53 100755 --- a/autotest.sh +++ b/autotest.sh @@ -53,7 +53,7 @@ function print_syntax { echo -e "\t\"dbconfigname\" can be one of: $DBCONFIGS" >&2 echo -e "\t\"testfile\" is the name of a test file, for example lib/template.php" >&2 echo -e "\nExample: ./autotest.sh sqlite lib/template.php" >&2 - echo "will run the test suite from \"tests/lib/template.php\"" >&2 + echo "will run the test suite from \"tests/unit/lib/template.php\"" >&2 echo -e "\nIf no arguments are specified, all tests will be run with all database configs" >&2 } @@ -181,8 +181,8 @@ function execute_tests { # back to root folder cd "$BASEDIR" - # revert changes to tests/data - git checkout tests/data + # revert changes to tests/fixtures/data + git checkout tests/fixtures/data # reset data directory rm -rf "$DATADIR" @@ -192,12 +192,12 @@ function execute_tests { tests/objectstore/start-swift-ceph.sh cp tests/objectstore/swift.config.php config/autotest-storage-swift.config.php fi - cp tests/preseed-config.php config/config.php + cp tests/fixtures/preseed-config.php config/config.php if [ "$ENABLE_REDIS" == "true" ] ; then - cp tests/redis.config.php config/redis.config.php + cp tests/fixtures/redis.config.php config/redis.config.php elif [ "$ENABLE_REDIS_CLUSTER" == "true" ] ; then - cp tests/redis-cluster.config.php config/redis.config.php + cp tests/fixtures/redis-cluster.config.php config/redis.config.php fi _DB=$DB @@ -207,7 +207,7 @@ function execute_tests { if [ ! -z "$USEDOCKER" ] ; then echo "Fire up the mysql docker" DOCKER_CONTAINER_ID=$(docker run \ - -v $BASEDIR/tests/docker/mariadb:/etc/mysql/conf.d \ + -v $BASEDIR/tests/fixtures/docker/mariadb:/etc/mysql/conf.d \ -e MYSQL_ROOT_PASSWORD=owncloud \ -e MYSQL_USER="$DATABASEUSER" \ -e MYSQL_PASSWORD=owncloud \ @@ -233,7 +233,7 @@ function execute_tests { if [ ! -z "$USEDOCKER" ] ; then echo "Fire up the mysql docker" DOCKER_CONTAINER_ID=$(docker run \ - -v $BASEDIR/tests/docker/mysqlmb4:/etc/mysql/conf.d \ + -v $BASEDIR/tests/fixtures/docker/mysqlmb4:/etc/mysql/conf.d \ -e MYSQL_ROOT_PASSWORD=owncloud \ -e MYSQL_USER="$DATABASEUSER" \ -e MYSQL_PASSWORD=owncloud \ @@ -265,13 +265,13 @@ function execute_tests { echo "MySQL(utf8mb4) is up." _DB="mysql" - cp tests/docker/mysqlmb4.config.php config + cp tests/fixtures/docker/mysqlmb4.config.php config fi if [ "$DB" == "mariadb" ] ; then if [ ! -z "$USEDOCKER" ] ; then echo "Fire up the mariadb docker" DOCKER_CONTAINER_ID=$(docker run \ - -v $BASEDIR/tests/docker/mariadb:/etc/mysql/conf.d \ + -v $BASEDIR/tests/fixtures/docker/mariadb:/etc/mysql/conf.d \ -e MYSQL_ROOT_PASSWORD=owncloud \ -e MYSQL_USER="$DATABASEUSER" \ -e MYSQL_PASSWORD=owncloud \ @@ -420,7 +420,7 @@ if [ -z "$1" ] done else FILENAME="$2" - if [ ! -z "$2" ] && [ ! -f "tests/$FILENAME" ] && [ "${FILENAME:0:2}" != "--" ]; then + if [ ! -z "$2" ] && [ ! -f "tests/unit/$FILENAME" ] && [ "${FILENAME:0:2}" != "--" ]; then FILENAME="../$FILENAME" fi execute_tests "$1" "$FILENAME" "$3" diff --git a/composer.json b/composer.json index 4bbb3d65630b7..0216f7a14c627 100644 --- a/composer.json +++ b/composer.json @@ -78,10 +78,10 @@ ], "test": [ "Composer\\Config::disableProcessTimeout", - "phpunit --fail-on-warning --fail-on-risky --display-warnings --display-deprecations --display-phpunit-deprecations --display-skipped --colors=always --configuration tests/phpunit-autotest.xml" + "phpunit --fail-on-warning --fail-on-risky --display-warnings --display-deprecations --display-phpunit-deprecations --display-skipped --colors=always --configuration tests/unit/phpunit-autotest.xml" ], "test:db": "@composer run test -- --group DB --group SLOWDB --exclude-group S3 --exclude-group PRIMARY-swift --exclude-group PRIMARY-s3 --exclude-group PRIMARY-azure", - "test:files_external": "phpunit --fail-on-warning --fail-on-risky --display-warnings --display-deprecations --display-phpunit-deprecations --colors=always --configuration tests/phpunit-autotest-external.xml", + "test:files_external": "phpunit --fail-on-warning --fail-on-risky --display-warnings --display-deprecations --display-phpunit-deprecations --colors=always --configuration tests/unit/phpunit-autotest-external.xml", "rector": "rector --config=build/rector.php && composer cs:fix", "rector:strict": "rector --config=build/rector-strict.php && composer cs:fix", "openapi": "./build/openapi-checker.sh" diff --git a/tests/apps/testapp_dependency_missing/appinfo/info.xml b/tests/fixtures/apps/testapp_dependency_missing/appinfo/info.xml similarity index 100% rename from tests/apps/testapp_dependency_missing/appinfo/info.xml rename to tests/fixtures/apps/testapp_dependency_missing/appinfo/info.xml diff --git a/tests/apps/testapp_infoxml/appinfo/info.xml b/tests/fixtures/apps/testapp_infoxml/appinfo/info.xml similarity index 100% rename from tests/apps/testapp_infoxml/appinfo/info.xml rename to tests/fixtures/apps/testapp_infoxml/appinfo/info.xml diff --git a/tests/apps/testapp_name_missing/appinfo/info.xml b/tests/fixtures/apps/testapp_name_missing/appinfo/info.xml similarity index 100% rename from tests/apps/testapp_name_missing/appinfo/info.xml rename to tests/fixtures/apps/testapp_name_missing/appinfo/info.xml diff --git a/tests/apps/testapp_version/appinfo/info.xml b/tests/fixtures/apps/testapp_version/appinfo/info.xml similarity index 100% rename from tests/apps/testapp_version/appinfo/info.xml rename to tests/fixtures/apps/testapp_version/appinfo/info.xml diff --git a/tests/data/app/appinfo-attributes-once.json b/tests/fixtures/data/app/appinfo-attributes-once.json similarity index 100% rename from tests/data/app/appinfo-attributes-once.json rename to tests/fixtures/data/app/appinfo-attributes-once.json diff --git a/tests/data/app/appinfo-attributes-once.json.license b/tests/fixtures/data/app/appinfo-attributes-once.json.license similarity index 100% rename from tests/data/app/appinfo-attributes-once.json.license rename to tests/fixtures/data/app/appinfo-attributes-once.json.license diff --git a/tests/data/app/appinfo-attributes-once.xml b/tests/fixtures/data/app/appinfo-attributes-once.xml similarity index 100% rename from tests/data/app/appinfo-attributes-once.xml rename to tests/fixtures/data/app/appinfo-attributes-once.xml diff --git a/tests/data/app/appinfo-multi-once.json b/tests/fixtures/data/app/appinfo-multi-once.json similarity index 100% rename from tests/data/app/appinfo-multi-once.json rename to tests/fixtures/data/app/appinfo-multi-once.json diff --git a/tests/data/app/appinfo-multi-once.json.license b/tests/fixtures/data/app/appinfo-multi-once.json.license similarity index 100% rename from tests/data/app/appinfo-multi-once.json.license rename to tests/fixtures/data/app/appinfo-multi-once.json.license diff --git a/tests/data/app/appinfo-multi-once.xml b/tests/fixtures/data/app/appinfo-multi-once.xml similarity index 100% rename from tests/data/app/appinfo-multi-once.xml rename to tests/fixtures/data/app/appinfo-multi-once.xml diff --git a/tests/data/app/appinfo-multi-twice.json b/tests/fixtures/data/app/appinfo-multi-twice.json similarity index 100% rename from tests/data/app/appinfo-multi-twice.json rename to tests/fixtures/data/app/appinfo-multi-twice.json diff --git a/tests/data/app/appinfo-multi-twice.json.license b/tests/fixtures/data/app/appinfo-multi-twice.json.license similarity index 100% rename from tests/data/app/appinfo-multi-twice.json.license rename to tests/fixtures/data/app/appinfo-multi-twice.json.license diff --git a/tests/data/app/appinfo-multi-twice.xml b/tests/fixtures/data/app/appinfo-multi-twice.xml similarity index 100% rename from tests/data/app/appinfo-multi-twice.xml rename to tests/fixtures/data/app/appinfo-multi-twice.xml diff --git a/tests/data/app/expected-info.json b/tests/fixtures/data/app/expected-info.json similarity index 100% rename from tests/data/app/expected-info.json rename to tests/fixtures/data/app/expected-info.json diff --git a/tests/data/app/expected-info.json.license b/tests/fixtures/data/app/expected-info.json.license similarity index 100% rename from tests/data/app/expected-info.json.license rename to tests/fixtures/data/app/expected-info.json.license diff --git a/tests/data/app/invalid-info.xml b/tests/fixtures/data/app/invalid-info.xml similarity index 100% rename from tests/data/app/invalid-info.xml rename to tests/fixtures/data/app/invalid-info.xml diff --git a/tests/data/app/navigation-one-item.json b/tests/fixtures/data/app/navigation-one-item.json similarity index 100% rename from tests/data/app/navigation-one-item.json rename to tests/fixtures/data/app/navigation-one-item.json diff --git a/tests/data/app/navigation-one-item.json.license b/tests/fixtures/data/app/navigation-one-item.json.license similarity index 100% rename from tests/data/app/navigation-one-item.json.license rename to tests/fixtures/data/app/navigation-one-item.json.license diff --git a/tests/data/app/navigation-one-item.xml b/tests/fixtures/data/app/navigation-one-item.xml similarity index 100% rename from tests/data/app/navigation-one-item.xml rename to tests/fixtures/data/app/navigation-one-item.xml diff --git a/tests/data/app/navigation-two-items.json b/tests/fixtures/data/app/navigation-two-items.json similarity index 100% rename from tests/data/app/navigation-two-items.json rename to tests/fixtures/data/app/navigation-two-items.json diff --git a/tests/data/app/navigation-two-items.json.license b/tests/fixtures/data/app/navigation-two-items.json.license similarity index 100% rename from tests/data/app/navigation-two-items.json.license rename to tests/fixtures/data/app/navigation-two-items.json.license diff --git a/tests/data/app/navigation-two-items.xml b/tests/fixtures/data/app/navigation-two-items.xml similarity index 100% rename from tests/data/app/navigation-two-items.xml rename to tests/fixtures/data/app/navigation-two-items.xml diff --git a/tests/data/app/valid-info.xml b/tests/fixtures/data/app/valid-info.xml similarity index 100% rename from tests/data/app/valid-info.xml rename to tests/fixtures/data/app/valid-info.xml diff --git a/tests/data/app/various-single-item.json b/tests/fixtures/data/app/various-single-item.json similarity index 100% rename from tests/data/app/various-single-item.json rename to tests/fixtures/data/app/various-single-item.json diff --git a/tests/data/app/various-single-item.json.license b/tests/fixtures/data/app/various-single-item.json.license similarity index 100% rename from tests/data/app/various-single-item.json.license rename to tests/fixtures/data/app/various-single-item.json.license diff --git a/tests/data/app/various-single-item.xml b/tests/fixtures/data/app/various-single-item.xml similarity index 100% rename from tests/data/app/various-single-item.xml rename to tests/fixtures/data/app/various-single-item.xml diff --git a/tests/data/block-aligned-plus-one.txt b/tests/fixtures/data/block-aligned-plus-one.txt similarity index 100% rename from tests/data/block-aligned-plus-one.txt rename to tests/fixtures/data/block-aligned-plus-one.txt diff --git a/tests/data/block-aligned.txt b/tests/fixtures/data/block-aligned.txt similarity index 100% rename from tests/data/block-aligned.txt rename to tests/fixtures/data/block-aligned.txt diff --git a/tests/data/broken-video.webm b/tests/fixtures/data/broken-video.webm similarity index 100% rename from tests/data/broken-video.webm rename to tests/fixtures/data/broken-video.webm diff --git a/tests/data/certificates/Readme.md b/tests/fixtures/data/certificates/Readme.md similarity index 100% rename from tests/data/certificates/Readme.md rename to tests/fixtures/data/certificates/Readme.md diff --git a/tests/data/certificates/badCertificate.crt b/tests/fixtures/data/certificates/badCertificate.crt similarity index 100% rename from tests/data/certificates/badCertificate.crt rename to tests/fixtures/data/certificates/badCertificate.crt diff --git a/tests/data/certificates/expiredCertificate.crt b/tests/fixtures/data/certificates/expiredCertificate.crt similarity index 100% rename from tests/data/certificates/expiredCertificate.crt rename to tests/fixtures/data/certificates/expiredCertificate.crt diff --git a/tests/data/certificates/goodCertificate.crt b/tests/fixtures/data/certificates/goodCertificate.crt similarity index 100% rename from tests/data/certificates/goodCertificate.crt rename to tests/fixtures/data/certificates/goodCertificate.crt diff --git a/tests/data/certificates/openSslTrustedCertificate.crt b/tests/fixtures/data/certificates/openSslTrustedCertificate.crt similarity index 100% rename from tests/data/certificates/openSslTrustedCertificate.crt rename to tests/fixtures/data/certificates/openSslTrustedCertificate.crt diff --git a/tests/data/data.tar.gz b/tests/fixtures/data/data.tar.gz similarity index 100% rename from tests/data/data.tar.gz rename to tests/fixtures/data/data.tar.gz diff --git a/tests/data/data.zip b/tests/fixtures/data/data.zip similarity index 100% rename from tests/data/data.zip rename to tests/fixtures/data/data.zip diff --git a/tests/data/desktopapp.png b/tests/fixtures/data/desktopapp.png similarity index 100% rename from tests/data/desktopapp.png rename to tests/fixtures/data/desktopapp.png diff --git a/tests/data/desktopapp.svg b/tests/fixtures/data/desktopapp.svg similarity index 100% rename from tests/data/desktopapp.svg rename to tests/fixtures/data/desktopapp.svg diff --git a/tests/data/emails/new-account-email-custom-text-alternative.txt b/tests/fixtures/data/emails/new-account-email-custom-text-alternative.txt similarity index 100% rename from tests/data/emails/new-account-email-custom-text-alternative.txt rename to tests/fixtures/data/emails/new-account-email-custom-text-alternative.txt diff --git a/tests/data/emails/new-account-email-custom.html b/tests/fixtures/data/emails/new-account-email-custom.html similarity index 100% rename from tests/data/emails/new-account-email-custom.html rename to tests/fixtures/data/emails/new-account-email-custom.html diff --git a/tests/data/emails/new-account-email-custom.txt b/tests/fixtures/data/emails/new-account-email-custom.txt similarity index 100% rename from tests/data/emails/new-account-email-custom.txt rename to tests/fixtures/data/emails/new-account-email-custom.txt diff --git a/tests/data/emails/new-account-email-single-button.html b/tests/fixtures/data/emails/new-account-email-single-button.html similarity index 100% rename from tests/data/emails/new-account-email-single-button.html rename to tests/fixtures/data/emails/new-account-email-single-button.html diff --git a/tests/data/emails/new-account-email-single-button.txt b/tests/fixtures/data/emails/new-account-email-single-button.txt similarity index 100% rename from tests/data/emails/new-account-email-single-button.txt rename to tests/fixtures/data/emails/new-account-email-single-button.txt diff --git a/tests/data/emails/new-account-email.html b/tests/fixtures/data/emails/new-account-email.html similarity index 100% rename from tests/data/emails/new-account-email.html rename to tests/fixtures/data/emails/new-account-email.html diff --git a/tests/data/emails/new-account-email.txt b/tests/fixtures/data/emails/new-account-email.txt similarity index 100% rename from tests/data/emails/new-account-email.txt rename to tests/fixtures/data/emails/new-account-email.txt diff --git a/tests/data/guest_avatar_einstein_32.png b/tests/fixtures/data/guest_avatar_einstein_32.png similarity index 100% rename from tests/data/guest_avatar_einstein_32.png rename to tests/fixtures/data/guest_avatar_einstein_32.png diff --git a/tests/data/guest_avatar_einstein_32.svg b/tests/fixtures/data/guest_avatar_einstein_32.svg similarity index 100% rename from tests/data/guest_avatar_einstein_32.svg rename to tests/fixtures/data/guest_avatar_einstein_32.svg diff --git a/tests/data/ics/event-builder-complete.ics b/tests/fixtures/data/ics/event-builder-complete.ics similarity index 100% rename from tests/data/ics/event-builder-complete.ics rename to tests/fixtures/data/ics/event-builder-complete.ics diff --git a/tests/data/ics/event-builder-complete.ics.license b/tests/fixtures/data/ics/event-builder-complete.ics.license similarity index 100% rename from tests/data/ics/event-builder-complete.ics.license rename to tests/fixtures/data/ics/event-builder-complete.ics.license diff --git a/tests/data/ics/event-builder-without-attendees.ics b/tests/fixtures/data/ics/event-builder-without-attendees.ics similarity index 100% rename from tests/data/ics/event-builder-without-attendees.ics rename to tests/fixtures/data/ics/event-builder-without-attendees.ics diff --git a/tests/data/ics/event-builder-without-attendees.ics.license b/tests/fixtures/data/ics/event-builder-without-attendees.ics.license similarity index 100% rename from tests/data/ics/event-builder-without-attendees.ics.license rename to tests/fixtures/data/ics/event-builder-without-attendees.ics.license diff --git a/tests/data/ics/free-busy-request.ics b/tests/fixtures/data/ics/free-busy-request.ics similarity index 100% rename from tests/data/ics/free-busy-request.ics rename to tests/fixtures/data/ics/free-busy-request.ics diff --git a/tests/data/ics/free-busy-request.ics.license b/tests/fixtures/data/ics/free-busy-request.ics.license similarity index 100% rename from tests/data/ics/free-busy-request.ics.license rename to tests/fixtures/data/ics/free-busy-request.ics.license diff --git a/tests/data/integritycheck/SomeApp.crt b/tests/fixtures/data/integritycheck/SomeApp.crt similarity index 100% rename from tests/data/integritycheck/SomeApp.crt rename to tests/fixtures/data/integritycheck/SomeApp.crt diff --git a/tests/data/integritycheck/SomeApp.crt.license b/tests/fixtures/data/integritycheck/SomeApp.crt.license similarity index 100% rename from tests/data/integritycheck/SomeApp.crt.license rename to tests/fixtures/data/integritycheck/SomeApp.crt.license diff --git a/tests/data/integritycheck/SomeApp.key b/tests/fixtures/data/integritycheck/SomeApp.key similarity index 100% rename from tests/data/integritycheck/SomeApp.key rename to tests/fixtures/data/integritycheck/SomeApp.key diff --git a/tests/data/integritycheck/SomeApp.key.license b/tests/fixtures/data/integritycheck/SomeApp.key.license similarity index 100% rename from tests/data/integritycheck/SomeApp.key.license rename to tests/fixtures/data/integritycheck/SomeApp.key.license diff --git a/tests/data/integritycheck/app/AnotherFile.txt b/tests/fixtures/data/integritycheck/app/AnotherFile.txt similarity index 100% rename from tests/data/integritycheck/app/AnotherFile.txt rename to tests/fixtures/data/integritycheck/app/AnotherFile.txt diff --git a/tests/data/integritycheck/app/subfolder/file.txt b/tests/fixtures/data/integritycheck/app/subfolder/file.txt similarity index 100% rename from tests/data/integritycheck/app/subfolder/file.txt rename to tests/fixtures/data/integritycheck/app/subfolder/file.txt diff --git a/tests/data/integritycheck/appWithInvalidData/AnotherFile.txt b/tests/fixtures/data/integritycheck/appWithInvalidData/AnotherFile.txt similarity index 100% rename from tests/data/integritycheck/appWithInvalidData/AnotherFile.txt rename to tests/fixtures/data/integritycheck/appWithInvalidData/AnotherFile.txt diff --git a/tests/data/integritycheck/appWithInvalidData/UnecessaryFile b/tests/fixtures/data/integritycheck/appWithInvalidData/UnecessaryFile similarity index 100% rename from tests/data/integritycheck/appWithInvalidData/UnecessaryFile rename to tests/fixtures/data/integritycheck/appWithInvalidData/UnecessaryFile diff --git a/tests/data/integritycheck/core.crt b/tests/fixtures/data/integritycheck/core.crt similarity index 100% rename from tests/data/integritycheck/core.crt rename to tests/fixtures/data/integritycheck/core.crt diff --git a/tests/data/integritycheck/core.crt.license b/tests/fixtures/data/integritycheck/core.crt.license similarity index 100% rename from tests/data/integritycheck/core.crt.license rename to tests/fixtures/data/integritycheck/core.crt.license diff --git a/tests/data/integritycheck/core.key b/tests/fixtures/data/integritycheck/core.key similarity index 100% rename from tests/data/integritycheck/core.key rename to tests/fixtures/data/integritycheck/core.key diff --git a/tests/data/integritycheck/core.key.license b/tests/fixtures/data/integritycheck/core.key.license similarity index 100% rename from tests/data/integritycheck/core.key.license rename to tests/fixtures/data/integritycheck/core.key.license diff --git a/tests/data/integritycheck/htaccessUnmodified/.htaccess b/tests/fixtures/data/integritycheck/htaccessUnmodified/.htaccess similarity index 100% rename from tests/data/integritycheck/htaccessUnmodified/.htaccess rename to tests/fixtures/data/integritycheck/htaccessUnmodified/.htaccess diff --git a/tests/data/integritycheck/htaccessUnmodified/subfolder/.htaccess b/tests/fixtures/data/integritycheck/htaccessUnmodified/subfolder/.htaccess similarity index 100% rename from tests/data/integritycheck/htaccessUnmodified/subfolder/.htaccess rename to tests/fixtures/data/integritycheck/htaccessUnmodified/subfolder/.htaccess diff --git a/tests/data/integritycheck/htaccessWithInvalidModifiedContent/.htaccess b/tests/fixtures/data/integritycheck/htaccessWithInvalidModifiedContent/.htaccess similarity index 100% rename from tests/data/integritycheck/htaccessWithInvalidModifiedContent/.htaccess rename to tests/fixtures/data/integritycheck/htaccessWithInvalidModifiedContent/.htaccess diff --git a/tests/data/integritycheck/htaccessWithValidModifiedContent/.htaccess b/tests/fixtures/data/integritycheck/htaccessWithValidModifiedContent/.htaccess similarity index 100% rename from tests/data/integritycheck/htaccessWithValidModifiedContent/.htaccess rename to tests/fixtures/data/integritycheck/htaccessWithValidModifiedContent/.htaccess diff --git a/tests/data/integritycheck/htaccessWithValidModifiedContent/subfolder/.htaccess b/tests/fixtures/data/integritycheck/htaccessWithValidModifiedContent/subfolder/.htaccess similarity index 100% rename from tests/data/integritycheck/htaccessWithValidModifiedContent/subfolder/.htaccess rename to tests/fixtures/data/integritycheck/htaccessWithValidModifiedContent/subfolder/.htaccess diff --git a/tests/data/integritycheck/mimetypeListModified/core/js/mimetypelist.js b/tests/fixtures/data/integritycheck/mimetypeListModified/core/js/mimetypelist.js similarity index 100% rename from tests/data/integritycheck/mimetypeListModified/core/js/mimetypelist.js rename to tests/fixtures/data/integritycheck/mimetypeListModified/core/js/mimetypelist.js diff --git a/tests/data/integritycheck/mimetypeListModified/core/signature.json b/tests/fixtures/data/integritycheck/mimetypeListModified/core/signature.json similarity index 100% rename from tests/data/integritycheck/mimetypeListModified/core/signature.json rename to tests/fixtures/data/integritycheck/mimetypeListModified/core/signature.json diff --git a/tests/data/integritycheck/root.crt b/tests/fixtures/data/integritycheck/root.crt similarity index 100% rename from tests/data/integritycheck/root.crt rename to tests/fixtures/data/integritycheck/root.crt diff --git a/tests/data/integritycheck/root.crt.license b/tests/fixtures/data/integritycheck/root.crt.license similarity index 100% rename from tests/data/integritycheck/root.crt.license rename to tests/fixtures/data/integritycheck/root.crt.license diff --git a/tests/data/integritycheck/root.key b/tests/fixtures/data/integritycheck/root.key similarity index 100% rename from tests/data/integritycheck/root.key rename to tests/fixtures/data/integritycheck/root.key diff --git a/tests/data/integritycheck/root.key.license b/tests/fixtures/data/integritycheck/root.key.license similarity index 100% rename from tests/data/integritycheck/root.key.license rename to tests/fixtures/data/integritycheck/root.key.license diff --git a/tests/data/l10n/cs.json b/tests/fixtures/data/l10n/cs.json similarity index 100% rename from tests/data/l10n/cs.json rename to tests/fixtures/data/l10n/cs.json diff --git a/tests/data/l10n/de.json b/tests/fixtures/data/l10n/de.json similarity index 100% rename from tests/data/l10n/de.json rename to tests/fixtures/data/l10n/de.json diff --git a/tests/data/l10n/ru.json b/tests/fixtures/data/l10n/ru.json similarity index 100% rename from tests/data/l10n/ru.json rename to tests/fixtures/data/l10n/ru.json diff --git a/tests/data/lorem-big.txt b/tests/fixtures/data/lorem-big.txt similarity index 100% rename from tests/data/lorem-big.txt rename to tests/fixtures/data/lorem-big.txt diff --git a/tests/data/lorem.txt b/tests/fixtures/data/lorem-copy.txt similarity index 100% rename from tests/data/lorem.txt rename to tests/fixtures/data/lorem-copy.txt diff --git "a/tests/data/str\303\244ng\303\251 filename (duplicate #2).txt" b/tests/fixtures/data/lorem.txt similarity index 100% rename from "tests/data/str\303\244ng\303\251 filename (duplicate #2).txt" rename to tests/fixtures/data/lorem.txt diff --git a/tests/data/scss/styles-error.scss b/tests/fixtures/data/scss/styles-error.scss similarity index 100% rename from tests/data/scss/styles-error.scss rename to tests/fixtures/data/scss/styles-error.scss diff --git a/tests/data/scss/styles-success.scss b/tests/fixtures/data/scss/styles-success.scss similarity index 100% rename from tests/data/scss/styles-success.scss rename to tests/fixtures/data/scss/styles-success.scss diff --git a/tests/data/setUploadLimit/htaccess b/tests/fixtures/data/setUploadLimit/htaccess similarity index 100% rename from tests/data/setUploadLimit/htaccess rename to tests/fixtures/data/setUploadLimit/htaccess diff --git a/tests/data/setUploadLimit/user.ini b/tests/fixtures/data/setUploadLimit/user.ini similarity index 100% rename from tests/data/setUploadLimit/user.ini rename to tests/fixtures/data/setUploadLimit/user.ini diff --git "a/tests/fixtures/data/str\303\244ng\303\251 filename (duplicate #2).txt" "b/tests/fixtures/data/str\303\244ng\303\251 filename (duplicate #2).txt" new file mode 100644 index 0000000000000..b62c3fb2ffd39 --- /dev/null +++ "b/tests/fixtures/data/str\303\244ng\303\251 filename (duplicate #2).txt" @@ -0,0 +1,4 @@ +Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. +Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. +Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. +Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. \ No newline at end of file diff --git a/tests/data/svg/files-app-red.svg b/tests/fixtures/data/svg/files-app-red.svg similarity index 100% rename from tests/data/svg/files-app-red.svg rename to tests/fixtures/data/svg/files-app-red.svg diff --git a/tests/data/svg/mixed-red.svg b/tests/fixtures/data/svg/mixed-red.svg similarity index 100% rename from tests/data/svg/mixed-red.svg rename to tests/fixtures/data/svg/mixed-red.svg diff --git a/tests/data/svg/mixed-source.svg b/tests/fixtures/data/svg/mixed-source.svg similarity index 100% rename from tests/data/svg/mixed-source.svg rename to tests/fixtures/data/svg/mixed-source.svg diff --git a/tests/data/svg/rect-black.svg b/tests/fixtures/data/svg/rect-black.svg similarity index 100% rename from tests/data/svg/rect-black.svg rename to tests/fixtures/data/svg/rect-black.svg diff --git a/tests/data/svg/rect-red.svg b/tests/fixtures/data/svg/rect-red.svg similarity index 100% rename from tests/data/svg/rect-red.svg rename to tests/fixtures/data/svg/rect-red.svg diff --git a/tests/data/svg/settings-admin-red.svg b/tests/fixtures/data/svg/settings-admin-red.svg similarity index 100% rename from tests/data/svg/settings-admin-red.svg rename to tests/fixtures/data/svg/settings-admin-red.svg diff --git a/tests/data/test.pdf b/tests/fixtures/data/test.pdf similarity index 100% rename from tests/data/test.pdf rename to tests/fixtures/data/test.pdf diff --git a/tests/data/testapp.0.8.tar.gz b/tests/fixtures/data/testapp.0.8.tar.gz similarity index 100% rename from tests/data/testapp.0.8.tar.gz rename to tests/fixtures/data/testapp.0.8.tar.gz diff --git a/tests/data/testapp.tar.gz b/tests/fixtures/data/testapp.tar.gz similarity index 100% rename from tests/data/testapp.tar.gz rename to tests/fixtures/data/testapp.tar.gz diff --git a/tests/data/testapp.zip b/tests/fixtures/data/testapp.zip similarity index 100% rename from tests/data/testapp.zip rename to tests/fixtures/data/testapp.zip diff --git a/tests/data/testapp1.tar.gz b/tests/fixtures/data/testapp1.tar.gz similarity index 100% rename from tests/data/testapp1.tar.gz rename to tests/fixtures/data/testapp1.tar.gz diff --git a/tests/data/testapp2.zip b/tests/fixtures/data/testapp2.zip similarity index 100% rename from tests/data/testapp2.zip rename to tests/fixtures/data/testapp2.zip diff --git a/tests/data/testavatar.png b/tests/fixtures/data/testavatar.png similarity index 100% rename from tests/data/testavatar.png rename to tests/fixtures/data/testavatar.png diff --git a/tests/data/testimage-badheader.jpg b/tests/fixtures/data/testimage-badheader.jpg similarity index 100% rename from tests/data/testimage-badheader.jpg rename to tests/fixtures/data/testimage-badheader.jpg diff --git a/tests/data/testimage.png b/tests/fixtures/data/testimage-copy.png similarity index 100% rename from tests/data/testimage.png rename to tests/fixtures/data/testimage-copy.png diff --git a/tests/data/testimage-large.jpg b/tests/fixtures/data/testimage-large.jpg similarity index 100% rename from tests/data/testimage-large.jpg rename to tests/fixtures/data/testimage-large.jpg diff --git a/tests/data/testimage-wide.png b/tests/fixtures/data/testimage-wide.png similarity index 100% rename from tests/data/testimage-wide.png rename to tests/fixtures/data/testimage-wide.png diff --git a/tests/data/testimage.eps b/tests/fixtures/data/testimage.eps similarity index 100% rename from tests/data/testimage.eps rename to tests/fixtures/data/testimage.eps diff --git a/tests/data/testimage.gif b/tests/fixtures/data/testimage.gif similarity index 100% rename from tests/data/testimage.gif rename to tests/fixtures/data/testimage.gif diff --git a/tests/data/testimage.heic b/tests/fixtures/data/testimage.heic similarity index 100% rename from tests/data/testimage.heic rename to tests/fixtures/data/testimage.heic diff --git a/tests/data/testimage.jpg b/tests/fixtures/data/testimage.jpg similarity index 100% rename from tests/data/testimage.jpg rename to tests/fixtures/data/testimage.jpg diff --git a/tests/data/testimage.mp3 b/tests/fixtures/data/testimage.mp3 similarity index 100% rename from tests/data/testimage.mp3 rename to tests/fixtures/data/testimage.mp3 diff --git a/tests/data/testimage.mp4 b/tests/fixtures/data/testimage.mp4 similarity index 100% rename from tests/data/testimage.mp4 rename to tests/fixtures/data/testimage.mp4 diff --git a/tests/data/testimage.odt b/tests/fixtures/data/testimage.odt similarity index 100% rename from tests/data/testimage.odt rename to tests/fixtures/data/testimage.odt diff --git a/tests/fixtures/data/testimage.png b/tests/fixtures/data/testimage.png new file mode 100644 index 0000000000000..257598f04f5e8 Binary files /dev/null and b/tests/fixtures/data/testimage.png differ diff --git a/tests/data/testimage.webp b/tests/fixtures/data/testimage.webp similarity index 100% rename from tests/data/testimage.webp rename to tests/fixtures/data/testimage.webp diff --git a/tests/data/testimagelarge.svg b/tests/fixtures/data/testimagelarge.svg similarity index 100% rename from tests/data/testimagelarge.svg rename to tests/fixtures/data/testimagelarge.svg diff --git a/tests/data/testvideo-remote-file.mp4 b/tests/fixtures/data/testvideo-remote-file.mp4 similarity index 100% rename from tests/data/testvideo-remote-file.mp4 rename to tests/fixtures/data/testvideo-remote-file.mp4 diff --git a/tests/data/themes/abc/apps/files/l10n/zz.json b/tests/fixtures/data/themes/abc/apps/files/l10n/zz.json similarity index 100% rename from tests/data/themes/abc/apps/files/l10n/zz.json rename to tests/fixtures/data/themes/abc/apps/files/l10n/zz.json diff --git a/tests/databases-all-config.php b/tests/fixtures/databases-all-config.php similarity index 100% rename from tests/databases-all-config.php rename to tests/fixtures/databases-all-config.php diff --git a/tests/enable_all.php b/tests/fixtures/enable_all.php similarity index 100% rename from tests/enable_all.php rename to tests/fixtures/enable_all.php diff --git a/tests/preseed-config.php b/tests/fixtures/preseed-config.php similarity index 100% rename from tests/preseed-config.php rename to tests/fixtures/preseed-config.php diff --git a/tests/redis-cluster.config.php b/tests/fixtures/redis-cluster.config.php similarity index 100% rename from tests/redis-cluster.config.php rename to tests/fixtures/redis-cluster.config.php diff --git a/tests/redis.config.php b/tests/fixtures/redis.config.php similarity index 100% rename from tests/redis.config.php rename to tests/fixtures/redis.config.php diff --git a/tests/startsessionlistener.php b/tests/fixtures/startsessionlistener.php similarity index 100% rename from tests/startsessionlistener.php rename to tests/fixtures/startsessionlistener.php diff --git a/build/integration/.gitignore b/tests/integration/.gitignore similarity index 100% rename from build/integration/.gitignore rename to tests/integration/.gitignore diff --git a/build/integration/capabilities_features/capabilities.feature b/tests/integration/capabilities_features/capabilities.feature similarity index 100% rename from build/integration/capabilities_features/capabilities.feature rename to tests/integration/capabilities_features/capabilities.feature diff --git a/build/integration/collaboration_features/autocomplete.feature b/tests/integration/collaboration_features/autocomplete.feature similarity index 100% rename from build/integration/collaboration_features/autocomplete.feature rename to tests/integration/collaboration_features/autocomplete.feature diff --git a/build/integration/collaboration_features/user_status.feature b/tests/integration/collaboration_features/user_status.feature similarity index 100% rename from build/integration/collaboration_features/user_status.feature rename to tests/integration/collaboration_features/user_status.feature diff --git a/build/integration/comments_features/comments.feature b/tests/integration/comments_features/comments.feature similarity index 100% rename from build/integration/comments_features/comments.feature rename to tests/integration/comments_features/comments.feature diff --git a/build/integration/config/behat.yml b/tests/integration/config/behat.yml similarity index 100% rename from build/integration/config/behat.yml rename to tests/integration/config/behat.yml diff --git a/build/integration/data/bjoern.vcf b/tests/integration/data/bjoern.vcf similarity index 100% rename from build/integration/data/bjoern.vcf rename to tests/integration/data/bjoern.vcf diff --git a/build/integration/data/bjoern.vcf.license b/tests/integration/data/bjoern.vcf.license similarity index 100% rename from build/integration/data/bjoern.vcf.license rename to tests/integration/data/bjoern.vcf.license diff --git a/build/integration/data/clouds.jpg b/tests/integration/data/clouds.jpg similarity index 100% rename from build/integration/data/clouds.jpg rename to tests/integration/data/clouds.jpg diff --git a/build/integration/data/clouds.jpg.license b/tests/integration/data/clouds.jpg.license similarity index 100% rename from build/integration/data/clouds.jpg.license rename to tests/integration/data/clouds.jpg.license diff --git a/build/integration/data/coloured-pattern-non-square.png b/tests/integration/data/coloured-pattern-non-square.png similarity index 100% rename from build/integration/data/coloured-pattern-non-square.png rename to tests/integration/data/coloured-pattern-non-square.png diff --git a/build/integration/data/coloured-pattern-non-square.png.license b/tests/integration/data/coloured-pattern-non-square.png.license similarity index 100% rename from build/integration/data/coloured-pattern-non-square.png.license rename to tests/integration/data/coloured-pattern-non-square.png.license diff --git a/build/integration/data/green-square-256.png b/tests/integration/data/green-square-256.png similarity index 100% rename from build/integration/data/green-square-256.png rename to tests/integration/data/green-square-256.png diff --git a/build/integration/data/green-square-256.png.license b/tests/integration/data/green-square-256.png.license similarity index 100% rename from build/integration/data/green-square-256.png.license rename to tests/integration/data/green-square-256.png.license diff --git a/build/integration/data/textfile.txt b/tests/integration/data/textfile.txt similarity index 100% rename from build/integration/data/textfile.txt rename to tests/integration/data/textfile.txt diff --git a/build/integration/data/textfile.txt.license b/tests/integration/data/textfile.txt.license similarity index 100% rename from build/integration/data/textfile.txt.license rename to tests/integration/data/textfile.txt.license diff --git a/build/integration/dav_features/caldav-delegation.feature b/tests/integration/dav_features/caldav-delegation.feature similarity index 100% rename from build/integration/dav_features/caldav-delegation.feature rename to tests/integration/dav_features/caldav-delegation.feature diff --git a/build/integration/dav_features/caldav.feature b/tests/integration/dav_features/caldav.feature similarity index 100% rename from build/integration/dav_features/caldav.feature rename to tests/integration/dav_features/caldav.feature diff --git a/build/integration/dav_features/carddav.feature b/tests/integration/dav_features/carddav.feature similarity index 100% rename from build/integration/dav_features/carddav.feature rename to tests/integration/dav_features/carddav.feature diff --git a/build/integration/dav_features/dav-v2-public.feature b/tests/integration/dav_features/dav-v2-public.feature similarity index 100% rename from build/integration/dav_features/dav-v2-public.feature rename to tests/integration/dav_features/dav-v2-public.feature diff --git a/build/integration/dav_features/dav-v2.feature b/tests/integration/dav_features/dav-v2.feature similarity index 100% rename from build/integration/dav_features/dav-v2.feature rename to tests/integration/dav_features/dav-v2.feature diff --git a/build/integration/dav_features/principal-property-search.feature b/tests/integration/dav_features/principal-property-search.feature similarity index 100% rename from build/integration/dav_features/principal-property-search.feature rename to tests/integration/dav_features/principal-property-search.feature diff --git a/build/integration/dav_features/webdav-related.feature b/tests/integration/dav_features/webdav-related.feature similarity index 100% rename from build/integration/dav_features/webdav-related.feature rename to tests/integration/dav_features/webdav-related.feature diff --git a/build/integration/features/auth.feature b/tests/integration/features/auth.feature similarity index 100% rename from build/integration/features/auth.feature rename to tests/integration/features/auth.feature diff --git a/build/integration/features/avatar.feature b/tests/integration/features/avatar.feature similarity index 100% rename from build/integration/features/avatar.feature rename to tests/integration/features/avatar.feature diff --git a/build/integration/features/bootstrap/Activity.php b/tests/integration/features/bootstrap/Activity.php similarity index 100% rename from build/integration/features/bootstrap/Activity.php rename to tests/integration/features/bootstrap/Activity.php diff --git a/build/integration/features/bootstrap/AppConfiguration.php b/tests/integration/features/bootstrap/AppConfiguration.php similarity index 100% rename from build/integration/features/bootstrap/AppConfiguration.php rename to tests/integration/features/bootstrap/AppConfiguration.php diff --git a/build/integration/features/bootstrap/Auth.php b/tests/integration/features/bootstrap/Auth.php similarity index 100% rename from build/integration/features/bootstrap/Auth.php rename to tests/integration/features/bootstrap/Auth.php diff --git a/build/integration/features/bootstrap/Avatar.php b/tests/integration/features/bootstrap/Avatar.php similarity index 100% rename from build/integration/features/bootstrap/Avatar.php rename to tests/integration/features/bootstrap/Avatar.php diff --git a/build/integration/features/bootstrap/BasicStructure.php b/tests/integration/features/bootstrap/BasicStructure.php similarity index 100% rename from build/integration/features/bootstrap/BasicStructure.php rename to tests/integration/features/bootstrap/BasicStructure.php diff --git a/build/integration/features/bootstrap/CalDavContext.php b/tests/integration/features/bootstrap/CalDavContext.php similarity index 100% rename from build/integration/features/bootstrap/CalDavContext.php rename to tests/integration/features/bootstrap/CalDavContext.php diff --git a/build/integration/features/bootstrap/CapabilitiesContext.php b/tests/integration/features/bootstrap/CapabilitiesContext.php similarity index 100% rename from build/integration/features/bootstrap/CapabilitiesContext.php rename to tests/integration/features/bootstrap/CapabilitiesContext.php diff --git a/build/integration/features/bootstrap/CardDavContext.php b/tests/integration/features/bootstrap/CardDavContext.php similarity index 100% rename from build/integration/features/bootstrap/CardDavContext.php rename to tests/integration/features/bootstrap/CardDavContext.php diff --git a/build/integration/features/bootstrap/ChecksumsContext.php b/tests/integration/features/bootstrap/ChecksumsContext.php similarity index 100% rename from build/integration/features/bootstrap/ChecksumsContext.php rename to tests/integration/features/bootstrap/ChecksumsContext.php diff --git a/build/integration/features/bootstrap/CollaborationContext.php b/tests/integration/features/bootstrap/CollaborationContext.php similarity index 100% rename from build/integration/features/bootstrap/CollaborationContext.php rename to tests/integration/features/bootstrap/CollaborationContext.php diff --git a/build/integration/features/bootstrap/CommandLine.php b/tests/integration/features/bootstrap/CommandLine.php similarity index 100% rename from build/integration/features/bootstrap/CommandLine.php rename to tests/integration/features/bootstrap/CommandLine.php diff --git a/build/integration/features/bootstrap/CommandLineContext.php b/tests/integration/features/bootstrap/CommandLineContext.php similarity index 100% rename from build/integration/features/bootstrap/CommandLineContext.php rename to tests/integration/features/bootstrap/CommandLineContext.php diff --git a/build/integration/features/bootstrap/CommentsContext.php b/tests/integration/features/bootstrap/CommentsContext.php similarity index 100% rename from build/integration/features/bootstrap/CommentsContext.php rename to tests/integration/features/bootstrap/CommentsContext.php diff --git a/build/integration/features/bootstrap/ContactsMenu.php b/tests/integration/features/bootstrap/ContactsMenu.php similarity index 100% rename from build/integration/features/bootstrap/ContactsMenu.php rename to tests/integration/features/bootstrap/ContactsMenu.php diff --git a/build/integration/features/bootstrap/ConversionsContext.php b/tests/integration/features/bootstrap/ConversionsContext.php similarity index 100% rename from build/integration/features/bootstrap/ConversionsContext.php rename to tests/integration/features/bootstrap/ConversionsContext.php diff --git a/build/integration/features/bootstrap/DavFeatureContext.php b/tests/integration/features/bootstrap/DavFeatureContext.php similarity index 100% rename from build/integration/features/bootstrap/DavFeatureContext.php rename to tests/integration/features/bootstrap/DavFeatureContext.php diff --git a/build/integration/features/bootstrap/Download.php b/tests/integration/features/bootstrap/Download.php similarity index 100% rename from build/integration/features/bootstrap/Download.php rename to tests/integration/features/bootstrap/Download.php diff --git a/build/integration/features/bootstrap/ExternalStorage.php b/tests/integration/features/bootstrap/ExternalStorage.php similarity index 100% rename from build/integration/features/bootstrap/ExternalStorage.php rename to tests/integration/features/bootstrap/ExternalStorage.php diff --git a/build/integration/features/bootstrap/FakeSMTPHelper.php b/tests/integration/features/bootstrap/FakeSMTPHelper.php similarity index 100% rename from build/integration/features/bootstrap/FakeSMTPHelper.php rename to tests/integration/features/bootstrap/FakeSMTPHelper.php diff --git a/build/integration/features/bootstrap/FeatureContext.php b/tests/integration/features/bootstrap/FeatureContext.php similarity index 100% rename from build/integration/features/bootstrap/FeatureContext.php rename to tests/integration/features/bootstrap/FeatureContext.php diff --git a/build/integration/features/bootstrap/FederationContext.php b/tests/integration/features/bootstrap/FederationContext.php similarity index 100% rename from build/integration/features/bootstrap/FederationContext.php rename to tests/integration/features/bootstrap/FederationContext.php diff --git a/build/integration/features/bootstrap/FilesDropContext.php b/tests/integration/features/bootstrap/FilesDropContext.php similarity index 100% rename from build/integration/features/bootstrap/FilesDropContext.php rename to tests/integration/features/bootstrap/FilesDropContext.php diff --git a/build/integration/features/bootstrap/FilesRemindersContext.php b/tests/integration/features/bootstrap/FilesRemindersContext.php similarity index 100% rename from build/integration/features/bootstrap/FilesRemindersContext.php rename to tests/integration/features/bootstrap/FilesRemindersContext.php diff --git a/build/integration/features/bootstrap/GuestsContext.php b/tests/integration/features/bootstrap/GuestsContext.php similarity index 100% rename from build/integration/features/bootstrap/GuestsContext.php rename to tests/integration/features/bootstrap/GuestsContext.php diff --git a/build/integration/features/bootstrap/LDAPContext.php b/tests/integration/features/bootstrap/LDAPContext.php similarity index 100% rename from build/integration/features/bootstrap/LDAPContext.php rename to tests/integration/features/bootstrap/LDAPContext.php diff --git a/build/integration/features/bootstrap/Mail.php b/tests/integration/features/bootstrap/Mail.php similarity index 100% rename from build/integration/features/bootstrap/Mail.php rename to tests/integration/features/bootstrap/Mail.php diff --git a/build/integration/features/bootstrap/MetadataContext.php b/tests/integration/features/bootstrap/MetadataContext.php similarity index 100% rename from build/integration/features/bootstrap/MetadataContext.php rename to tests/integration/features/bootstrap/MetadataContext.php diff --git a/build/integration/features/bootstrap/PrincipalPropertySearchContext.php b/tests/integration/features/bootstrap/PrincipalPropertySearchContext.php similarity index 100% rename from build/integration/features/bootstrap/PrincipalPropertySearchContext.php rename to tests/integration/features/bootstrap/PrincipalPropertySearchContext.php diff --git a/build/integration/features/bootstrap/Provisioning.php b/tests/integration/features/bootstrap/Provisioning.php similarity index 100% rename from build/integration/features/bootstrap/Provisioning.php rename to tests/integration/features/bootstrap/Provisioning.php diff --git a/build/integration/features/bootstrap/RateLimitingContext.php b/tests/integration/features/bootstrap/RateLimitingContext.php similarity index 100% rename from build/integration/features/bootstrap/RateLimitingContext.php rename to tests/integration/features/bootstrap/RateLimitingContext.php diff --git a/build/integration/features/bootstrap/RoutingContext.php b/tests/integration/features/bootstrap/RoutingContext.php similarity index 100% rename from build/integration/features/bootstrap/RoutingContext.php rename to tests/integration/features/bootstrap/RoutingContext.php diff --git a/build/integration/features/bootstrap/Search.php b/tests/integration/features/bootstrap/Search.php similarity index 100% rename from build/integration/features/bootstrap/Search.php rename to tests/integration/features/bootstrap/Search.php diff --git a/build/integration/features/bootstrap/SetupContext.php b/tests/integration/features/bootstrap/SetupContext.php similarity index 100% rename from build/integration/features/bootstrap/SetupContext.php rename to tests/integration/features/bootstrap/SetupContext.php diff --git a/build/integration/features/bootstrap/ShareesContext.php b/tests/integration/features/bootstrap/ShareesContext.php similarity index 100% rename from build/integration/features/bootstrap/ShareesContext.php rename to tests/integration/features/bootstrap/ShareesContext.php diff --git a/build/integration/features/bootstrap/Sharing.php b/tests/integration/features/bootstrap/Sharing.php similarity index 100% rename from build/integration/features/bootstrap/Sharing.php rename to tests/integration/features/bootstrap/Sharing.php diff --git a/build/integration/features/bootstrap/SharingContext.php b/tests/integration/features/bootstrap/SharingContext.php similarity index 100% rename from build/integration/features/bootstrap/SharingContext.php rename to tests/integration/features/bootstrap/SharingContext.php diff --git a/build/integration/features/bootstrap/TagsContext.php b/tests/integration/features/bootstrap/TagsContext.php similarity index 100% rename from build/integration/features/bootstrap/TagsContext.php rename to tests/integration/features/bootstrap/TagsContext.php diff --git a/build/integration/features/bootstrap/TalkContext.php b/tests/integration/features/bootstrap/TalkContext.php similarity index 100% rename from build/integration/features/bootstrap/TalkContext.php rename to tests/integration/features/bootstrap/TalkContext.php diff --git a/build/integration/features/bootstrap/Theming.php b/tests/integration/features/bootstrap/Theming.php similarity index 100% rename from build/integration/features/bootstrap/Theming.php rename to tests/integration/features/bootstrap/Theming.php diff --git a/build/integration/features/bootstrap/Trashbin.php b/tests/integration/features/bootstrap/Trashbin.php similarity index 100% rename from build/integration/features/bootstrap/Trashbin.php rename to tests/integration/features/bootstrap/Trashbin.php diff --git a/build/integration/features/bootstrap/WebDav.php b/tests/integration/features/bootstrap/WebDav.php similarity index 100% rename from build/integration/features/bootstrap/WebDav.php rename to tests/integration/features/bootstrap/WebDav.php diff --git a/build/integration/features/bootstrap/autoload.php b/tests/integration/features/bootstrap/autoload.php similarity index 100% rename from build/integration/features/bootstrap/autoload.php rename to tests/integration/features/bootstrap/autoload.php diff --git a/build/integration/features/contacts-menu.feature b/tests/integration/features/contacts-menu.feature similarity index 100% rename from build/integration/features/contacts-menu.feature rename to tests/integration/features/contacts-menu.feature diff --git a/build/integration/features/log-condition.feature b/tests/integration/features/log-condition.feature similarity index 100% rename from build/integration/features/log-condition.feature rename to tests/integration/features/log-condition.feature diff --git a/build/integration/features/maintenance-mode.feature b/tests/integration/features/maintenance-mode.feature similarity index 100% rename from build/integration/features/maintenance-mode.feature rename to tests/integration/features/maintenance-mode.feature diff --git a/build/integration/features/ocs-v1.feature b/tests/integration/features/ocs-v1.feature similarity index 100% rename from build/integration/features/ocs-v1.feature rename to tests/integration/features/ocs-v1.feature diff --git a/build/integration/features/provisioning-v1.feature b/tests/integration/features/provisioning-v1.feature similarity index 100% rename from build/integration/features/provisioning-v1.feature rename to tests/integration/features/provisioning-v1.feature diff --git a/build/integration/features/provisioning-v2.feature b/tests/integration/features/provisioning-v2.feature similarity index 100% rename from build/integration/features/provisioning-v2.feature rename to tests/integration/features/provisioning-v2.feature diff --git a/build/integration/federation_features/cleanup-remote-storage.feature b/tests/integration/federation_features/cleanup-remote-storage.feature similarity index 100% rename from build/integration/federation_features/cleanup-remote-storage.feature rename to tests/integration/federation_features/cleanup-remote-storage.feature diff --git a/build/integration/federation_features/federated.feature b/tests/integration/federation_features/federated.feature similarity index 100% rename from build/integration/federation_features/federated.feature rename to tests/integration/federation_features/federated.feature diff --git a/build/integration/file_conversions/file_conversions.feature b/tests/integration/file_conversions/file_conversions.feature similarity index 100% rename from build/integration/file_conversions/file_conversions.feature rename to tests/integration/file_conversions/file_conversions.feature diff --git a/build/integration/files_features/checksums.feature b/tests/integration/files_features/checksums.feature similarity index 100% rename from build/integration/files_features/checksums.feature rename to tests/integration/files_features/checksums.feature diff --git a/build/integration/files_features/download.feature b/tests/integration/files_features/download.feature similarity index 100% rename from build/integration/files_features/download.feature rename to tests/integration/files_features/download.feature diff --git a/build/integration/files_features/encryption.feature b/tests/integration/files_features/encryption.feature similarity index 100% rename from build/integration/files_features/encryption.feature rename to tests/integration/files_features/encryption.feature diff --git a/build/integration/files_features/external-storage.feature b/tests/integration/files_features/external-storage.feature similarity index 100% rename from build/integration/files_features/external-storage.feature rename to tests/integration/files_features/external-storage.feature diff --git a/build/integration/files_features/favorites.feature b/tests/integration/files_features/favorites.feature similarity index 100% rename from build/integration/files_features/favorites.feature rename to tests/integration/files_features/favorites.feature diff --git a/build/integration/files_features/metadata.feature b/tests/integration/files_features/metadata.feature similarity index 100% rename from build/integration/files_features/metadata.feature rename to tests/integration/files_features/metadata.feature diff --git a/build/integration/files_features/tags.feature b/tests/integration/files_features/tags.feature similarity index 100% rename from build/integration/files_features/tags.feature rename to tests/integration/files_features/tags.feature diff --git a/build/integration/files_features/transfer-ownership.feature b/tests/integration/files_features/transfer-ownership.feature similarity index 100% rename from build/integration/files_features/transfer-ownership.feature rename to tests/integration/files_features/transfer-ownership.feature diff --git a/build/integration/files_features/trashbin.feature b/tests/integration/files_features/trashbin.feature similarity index 100% rename from build/integration/files_features/trashbin.feature rename to tests/integration/files_features/trashbin.feature diff --git a/build/integration/files_features/windows_compatibility.feature b/tests/integration/files_features/windows_compatibility.feature similarity index 100% rename from build/integration/files_features/windows_compatibility.feature rename to tests/integration/files_features/windows_compatibility.feature diff --git a/build/integration/files_reminders/files_reminders.feature b/tests/integration/files_reminders/files_reminders.feature similarity index 100% rename from build/integration/files_reminders/files_reminders.feature rename to tests/integration/files_reminders/files_reminders.feature diff --git a/build/integration/filesdrop_features/filesdrop.feature b/tests/integration/filesdrop_features/filesdrop.feature similarity index 100% rename from build/integration/filesdrop_features/filesdrop.feature rename to tests/integration/filesdrop_features/filesdrop.feature diff --git a/build/integration/guests_features/guest-filesystem.feature b/tests/integration/guests_features/guest-filesystem.feature similarity index 100% rename from build/integration/guests_features/guest-filesystem.feature rename to tests/integration/guests_features/guest-filesystem.feature diff --git a/build/integration/ldap_features/ldap-ocs.feature b/tests/integration/ldap_features/ldap-ocs.feature similarity index 100% rename from build/integration/ldap_features/ldap-ocs.feature rename to tests/integration/ldap_features/ldap-ocs.feature diff --git a/build/integration/ldap_features/ldap-openldap.feature b/tests/integration/ldap_features/ldap-openldap.feature similarity index 100% rename from build/integration/ldap_features/ldap-openldap.feature rename to tests/integration/ldap_features/ldap-openldap.feature diff --git a/build/integration/openldap_features/openldap-uid-username.feature b/tests/integration/openldap_features/openldap-uid-username.feature similarity index 100% rename from build/integration/openldap_features/openldap-uid-username.feature rename to tests/integration/openldap_features/openldap-uid-username.feature diff --git a/build/integration/openldap_numerical_features/openldap-numerical-id.feature b/tests/integration/openldap_numerical_features/openldap-numerical-id.feature similarity index 100% rename from build/integration/openldap_numerical_features/openldap-numerical-id.feature rename to tests/integration/openldap_numerical_features/openldap-numerical-id.feature diff --git a/build/integration/ratelimiting_features/ratelimiting.feature b/tests/integration/ratelimiting_features/ratelimiting.feature similarity index 100% rename from build/integration/ratelimiting_features/ratelimiting.feature rename to tests/integration/ratelimiting_features/ratelimiting.feature diff --git a/build/integration/routing_features/apps-and-routes.feature b/tests/integration/routing_features/apps-and-routes.feature similarity index 100% rename from build/integration/routing_features/apps-and-routes.feature rename to tests/integration/routing_features/apps-and-routes.feature diff --git a/build/integration/run-docker.sh b/tests/integration/run-docker.sh similarity index 100% rename from build/integration/run-docker.sh rename to tests/integration/run-docker.sh diff --git a/build/integration/run.sh b/tests/integration/run.sh similarity index 100% rename from build/integration/run.sh rename to tests/integration/run.sh diff --git a/build/integration/setup_features/setup.feature b/tests/integration/setup_features/setup.feature similarity index 100% rename from build/integration/setup_features/setup.feature rename to tests/integration/setup_features/setup.feature diff --git a/build/integration/sharees_features/sharees.feature b/tests/integration/sharees_features/sharees.feature similarity index 100% rename from build/integration/sharees_features/sharees.feature rename to tests/integration/sharees_features/sharees.feature diff --git a/build/integration/sharees_features/sharees_provisioningapiv2.feature b/tests/integration/sharees_features/sharees_provisioningapiv2.feature similarity index 100% rename from build/integration/sharees_features/sharees_provisioningapiv2.feature rename to tests/integration/sharees_features/sharees_provisioningapiv2.feature diff --git a/build/integration/sharees_features/sharees_user.feature b/tests/integration/sharees_features/sharees_user.feature similarity index 100% rename from build/integration/sharees_features/sharees_user.feature rename to tests/integration/sharees_features/sharees_user.feature diff --git a/build/integration/sharing_features/sharing-accept.feature b/tests/integration/sharing_features/sharing-accept.feature similarity index 100% rename from build/integration/sharing_features/sharing-accept.feature rename to tests/integration/sharing_features/sharing-accept.feature diff --git a/build/integration/sharing_features/sharing-activity.feature b/tests/integration/sharing_features/sharing-activity.feature similarity index 100% rename from build/integration/sharing_features/sharing-activity.feature rename to tests/integration/sharing_features/sharing-activity.feature diff --git a/build/integration/sharing_features/sharing-v1-part2.feature b/tests/integration/sharing_features/sharing-v1-part2.feature similarity index 100% rename from build/integration/sharing_features/sharing-v1-part2.feature rename to tests/integration/sharing_features/sharing-v1-part2.feature diff --git a/build/integration/sharing_features/sharing-v1-part3.feature b/tests/integration/sharing_features/sharing-v1-part3.feature similarity index 100% rename from build/integration/sharing_features/sharing-v1-part3.feature rename to tests/integration/sharing_features/sharing-v1-part3.feature diff --git a/build/integration/sharing_features/sharing-v1-part4.feature b/tests/integration/sharing_features/sharing-v1-part4.feature similarity index 100% rename from build/integration/sharing_features/sharing-v1-part4.feature rename to tests/integration/sharing_features/sharing-v1-part4.feature diff --git a/build/integration/sharing_features/sharing-v1.feature b/tests/integration/sharing_features/sharing-v1.feature similarity index 100% rename from build/integration/sharing_features/sharing-v1.feature rename to tests/integration/sharing_features/sharing-v1.feature diff --git a/build/integration/theming_features/theming.feature b/tests/integration/theming_features/theming.feature similarity index 100% rename from build/integration/theming_features/theming.feature rename to tests/integration/theming_features/theming.feature diff --git a/build/integration/videoverification_features/sharing-v1-video-verification.feature b/tests/integration/videoverification_features/sharing-v1-video-verification.feature similarity index 100% rename from build/integration/videoverification_features/sharing-v1-video-verification.feature rename to tests/integration/videoverification_features/sharing-v1-video-verification.feature diff --git a/tests/Core/Command/Apps/AppsDisableTest.php b/tests/unit/Core/Command/Apps/AppsDisableTest.php similarity index 100% rename from tests/Core/Command/Apps/AppsDisableTest.php rename to tests/unit/Core/Command/Apps/AppsDisableTest.php diff --git a/tests/Core/Command/Apps/AppsEnableTest.php b/tests/unit/Core/Command/Apps/AppsEnableTest.php similarity index 100% rename from tests/Core/Command/Apps/AppsEnableTest.php rename to tests/unit/Core/Command/Apps/AppsEnableTest.php diff --git a/tests/Core/Command/Config/App/DeleteConfigTest.php b/tests/unit/Core/Command/Config/App/DeleteConfigTest.php similarity index 100% rename from tests/Core/Command/Config/App/DeleteConfigTest.php rename to tests/unit/Core/Command/Config/App/DeleteConfigTest.php diff --git a/tests/Core/Command/Config/App/GetConfigTest.php b/tests/unit/Core/Command/Config/App/GetConfigTest.php similarity index 100% rename from tests/Core/Command/Config/App/GetConfigTest.php rename to tests/unit/Core/Command/Config/App/GetConfigTest.php diff --git a/tests/Core/Command/Config/App/SetConfigTest.php b/tests/unit/Core/Command/Config/App/SetConfigTest.php similarity index 100% rename from tests/Core/Command/Config/App/SetConfigTest.php rename to tests/unit/Core/Command/Config/App/SetConfigTest.php diff --git a/tests/Core/Command/Config/ImportTest.php b/tests/unit/Core/Command/Config/ImportTest.php similarity index 100% rename from tests/Core/Command/Config/ImportTest.php rename to tests/unit/Core/Command/Config/ImportTest.php diff --git a/tests/Core/Command/Config/ListConfigsTest.php b/tests/unit/Core/Command/Config/ListConfigsTest.php similarity index 100% rename from tests/Core/Command/Config/ListConfigsTest.php rename to tests/unit/Core/Command/Config/ListConfigsTest.php diff --git a/tests/Core/Command/Config/System/CastHelperTest.php b/tests/unit/Core/Command/Config/System/CastHelperTest.php similarity index 100% rename from tests/Core/Command/Config/System/CastHelperTest.php rename to tests/unit/Core/Command/Config/System/CastHelperTest.php diff --git a/tests/Core/Command/Config/System/DeleteConfigTest.php b/tests/unit/Core/Command/Config/System/DeleteConfigTest.php similarity index 100% rename from tests/Core/Command/Config/System/DeleteConfigTest.php rename to tests/unit/Core/Command/Config/System/DeleteConfigTest.php diff --git a/tests/Core/Command/Config/System/GetConfigTest.php b/tests/unit/Core/Command/Config/System/GetConfigTest.php similarity index 100% rename from tests/Core/Command/Config/System/GetConfigTest.php rename to tests/unit/Core/Command/Config/System/GetConfigTest.php diff --git a/tests/Core/Command/Config/System/SetConfigTest.php b/tests/unit/Core/Command/Config/System/SetConfigTest.php similarity index 100% rename from tests/Core/Command/Config/System/SetConfigTest.php rename to tests/unit/Core/Command/Config/System/SetConfigTest.php diff --git a/tests/Core/Command/Db/DbIndexUsageTest.php b/tests/unit/Core/Command/Db/DbIndexUsageTest.php similarity index 100% rename from tests/Core/Command/Db/DbIndexUsageTest.php rename to tests/unit/Core/Command/Db/DbIndexUsageTest.php diff --git a/tests/Core/Command/Db/DbInfoTest.php b/tests/unit/Core/Command/Db/DbInfoTest.php similarity index 100% rename from tests/Core/Command/Db/DbInfoTest.php rename to tests/unit/Core/Command/Db/DbInfoTest.php diff --git a/tests/Core/Command/Db/DbLocksTest.php b/tests/unit/Core/Command/Db/DbLocksTest.php similarity index 100% rename from tests/Core/Command/Db/DbLocksTest.php rename to tests/unit/Core/Command/Db/DbLocksTest.php diff --git a/tests/Core/Command/Db/DbSizeTest.php b/tests/unit/Core/Command/Db/DbSizeTest.php similarity index 100% rename from tests/Core/Command/Db/DbSizeTest.php rename to tests/unit/Core/Command/Db/DbSizeTest.php diff --git a/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php b/tests/unit/Core/Command/Encryption/ChangeKeyStorageRootTest.php similarity index 100% rename from tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php rename to tests/unit/Core/Command/Encryption/ChangeKeyStorageRootTest.php diff --git a/tests/Core/Command/Encryption/DecryptAllTest.php b/tests/unit/Core/Command/Encryption/DecryptAllTest.php similarity index 100% rename from tests/Core/Command/Encryption/DecryptAllTest.php rename to tests/unit/Core/Command/Encryption/DecryptAllTest.php diff --git a/tests/Core/Command/Encryption/DisableTest.php b/tests/unit/Core/Command/Encryption/DisableTest.php similarity index 100% rename from tests/Core/Command/Encryption/DisableTest.php rename to tests/unit/Core/Command/Encryption/DisableTest.php diff --git a/tests/Core/Command/Encryption/EnableTest.php b/tests/unit/Core/Command/Encryption/EnableTest.php similarity index 100% rename from tests/Core/Command/Encryption/EnableTest.php rename to tests/unit/Core/Command/Encryption/EnableTest.php diff --git a/tests/Core/Command/Encryption/EncryptAllTest.php b/tests/unit/Core/Command/Encryption/EncryptAllTest.php similarity index 100% rename from tests/Core/Command/Encryption/EncryptAllTest.php rename to tests/unit/Core/Command/Encryption/EncryptAllTest.php diff --git a/tests/Core/Command/Encryption/SetDefaultModuleTest.php b/tests/unit/Core/Command/Encryption/SetDefaultModuleTest.php similarity index 100% rename from tests/Core/Command/Encryption/SetDefaultModuleTest.php rename to tests/unit/Core/Command/Encryption/SetDefaultModuleTest.php diff --git a/tests/Core/Command/Group/AddTest.php b/tests/unit/Core/Command/Group/AddTest.php similarity index 100% rename from tests/Core/Command/Group/AddTest.php rename to tests/unit/Core/Command/Group/AddTest.php diff --git a/tests/Core/Command/Group/AddUserTest.php b/tests/unit/Core/Command/Group/AddUserTest.php similarity index 100% rename from tests/Core/Command/Group/AddUserTest.php rename to tests/unit/Core/Command/Group/AddUserTest.php diff --git a/tests/Core/Command/Group/DeleteTest.php b/tests/unit/Core/Command/Group/DeleteTest.php similarity index 100% rename from tests/Core/Command/Group/DeleteTest.php rename to tests/unit/Core/Command/Group/DeleteTest.php diff --git a/tests/Core/Command/Group/InfoTest.php b/tests/unit/Core/Command/Group/InfoTest.php similarity index 100% rename from tests/Core/Command/Group/InfoTest.php rename to tests/unit/Core/Command/Group/InfoTest.php diff --git a/tests/Core/Command/Group/ListCommandTest.php b/tests/unit/Core/Command/Group/ListCommandTest.php similarity index 100% rename from tests/Core/Command/Group/ListCommandTest.php rename to tests/unit/Core/Command/Group/ListCommandTest.php diff --git a/tests/Core/Command/Group/RemoveUserTest.php b/tests/unit/Core/Command/Group/RemoveUserTest.php similarity index 100% rename from tests/Core/Command/Group/RemoveUserTest.php rename to tests/unit/Core/Command/Group/RemoveUserTest.php diff --git a/tests/Core/Command/Log/FileTest.php b/tests/unit/Core/Command/Log/FileTest.php similarity index 100% rename from tests/Core/Command/Log/FileTest.php rename to tests/unit/Core/Command/Log/FileTest.php diff --git a/tests/Core/Command/Log/ManageTest.php b/tests/unit/Core/Command/Log/ManageTest.php similarity index 100% rename from tests/Core/Command/Log/ManageTest.php rename to tests/unit/Core/Command/Log/ManageTest.php diff --git a/tests/Core/Command/Maintenance/DataFingerprintTest.php b/tests/unit/Core/Command/Maintenance/DataFingerprintTest.php similarity index 100% rename from tests/Core/Command/Maintenance/DataFingerprintTest.php rename to tests/unit/Core/Command/Maintenance/DataFingerprintTest.php diff --git a/tests/Core/Command/Maintenance/Mimetype/UpdateDBTest.php b/tests/unit/Core/Command/Maintenance/Mimetype/UpdateDBTest.php similarity index 100% rename from tests/Core/Command/Maintenance/Mimetype/UpdateDBTest.php rename to tests/unit/Core/Command/Maintenance/Mimetype/UpdateDBTest.php diff --git a/tests/Core/Command/Maintenance/ModeTest.php b/tests/unit/Core/Command/Maintenance/ModeTest.php similarity index 100% rename from tests/Core/Command/Maintenance/ModeTest.php rename to tests/unit/Core/Command/Maintenance/ModeTest.php diff --git a/tests/Core/Command/Maintenance/UpdateTheme.php b/tests/unit/Core/Command/Maintenance/UpdateTheme.php similarity index 100% rename from tests/Core/Command/Maintenance/UpdateTheme.php rename to tests/unit/Core/Command/Maintenance/UpdateTheme.php diff --git a/tests/Core/Command/Preview/CleanupTest.php b/tests/unit/Core/Command/Preview/CleanupTest.php similarity index 100% rename from tests/Core/Command/Preview/CleanupTest.php rename to tests/unit/Core/Command/Preview/CleanupTest.php diff --git a/tests/Core/Command/SystemTag/AddTest.php b/tests/unit/Core/Command/SystemTag/AddTest.php similarity index 100% rename from tests/Core/Command/SystemTag/AddTest.php rename to tests/unit/Core/Command/SystemTag/AddTest.php diff --git a/tests/Core/Command/SystemTag/DeleteTest.php b/tests/unit/Core/Command/SystemTag/DeleteTest.php similarity index 100% rename from tests/Core/Command/SystemTag/DeleteTest.php rename to tests/unit/Core/Command/SystemTag/DeleteTest.php diff --git a/tests/Core/Command/SystemTag/EditTest.php b/tests/unit/Core/Command/SystemTag/EditTest.php similarity index 100% rename from tests/Core/Command/SystemTag/EditTest.php rename to tests/unit/Core/Command/SystemTag/EditTest.php diff --git a/tests/Core/Command/SystemTag/ListCommandTest.php b/tests/unit/Core/Command/SystemTag/ListCommandTest.php similarity index 100% rename from tests/Core/Command/SystemTag/ListCommandTest.php rename to tests/unit/Core/Command/SystemTag/ListCommandTest.php diff --git a/tests/Core/Command/TaskProcessing/WorkerCommandTest.php b/tests/unit/Core/Command/TaskProcessing/WorkerCommandTest.php similarity index 100% rename from tests/Core/Command/TaskProcessing/WorkerCommandTest.php rename to tests/unit/Core/Command/TaskProcessing/WorkerCommandTest.php diff --git a/tests/Core/Command/TwoFactorAuth/CleanupTest.php b/tests/unit/Core/Command/TwoFactorAuth/CleanupTest.php similarity index 100% rename from tests/Core/Command/TwoFactorAuth/CleanupTest.php rename to tests/unit/Core/Command/TwoFactorAuth/CleanupTest.php diff --git a/tests/Core/Command/TwoFactorAuth/DisableTest.php b/tests/unit/Core/Command/TwoFactorAuth/DisableTest.php similarity index 100% rename from tests/Core/Command/TwoFactorAuth/DisableTest.php rename to tests/unit/Core/Command/TwoFactorAuth/DisableTest.php diff --git a/tests/Core/Command/TwoFactorAuth/EnableTest.php b/tests/unit/Core/Command/TwoFactorAuth/EnableTest.php similarity index 100% rename from tests/Core/Command/TwoFactorAuth/EnableTest.php rename to tests/unit/Core/Command/TwoFactorAuth/EnableTest.php diff --git a/tests/Core/Command/TwoFactorAuth/EnforceTest.php b/tests/unit/Core/Command/TwoFactorAuth/EnforceTest.php similarity index 100% rename from tests/Core/Command/TwoFactorAuth/EnforceTest.php rename to tests/unit/Core/Command/TwoFactorAuth/EnforceTest.php diff --git a/tests/Core/Command/TwoFactorAuth/StateTest.php b/tests/unit/Core/Command/TwoFactorAuth/StateTest.php similarity index 100% rename from tests/Core/Command/TwoFactorAuth/StateTest.php rename to tests/unit/Core/Command/TwoFactorAuth/StateTest.php diff --git a/tests/Core/Command/User/AddTest.php b/tests/unit/Core/Command/User/AddTest.php similarity index 100% rename from tests/Core/Command/User/AddTest.php rename to tests/unit/Core/Command/User/AddTest.php diff --git a/tests/Core/Command/User/AuthTokens/DeleteTest.php b/tests/unit/Core/Command/User/AuthTokens/DeleteTest.php similarity index 100% rename from tests/Core/Command/User/AuthTokens/DeleteTest.php rename to tests/unit/Core/Command/User/AuthTokens/DeleteTest.php diff --git a/tests/Core/Command/User/DeleteTest.php b/tests/unit/Core/Command/User/DeleteTest.php similarity index 100% rename from tests/Core/Command/User/DeleteTest.php rename to tests/unit/Core/Command/User/DeleteTest.php diff --git a/tests/Core/Command/User/DisableTest.php b/tests/unit/Core/Command/User/DisableTest.php similarity index 100% rename from tests/Core/Command/User/DisableTest.php rename to tests/unit/Core/Command/User/DisableTest.php diff --git a/tests/Core/Command/User/EnableTest.php b/tests/unit/Core/Command/User/EnableTest.php similarity index 100% rename from tests/Core/Command/User/EnableTest.php rename to tests/unit/Core/Command/User/EnableTest.php diff --git a/tests/Core/Command/User/LastSeenTest.php b/tests/unit/Core/Command/User/LastSeenTest.php similarity index 100% rename from tests/Core/Command/User/LastSeenTest.php rename to tests/unit/Core/Command/User/LastSeenTest.php diff --git a/tests/Core/Command/User/ProfileTest.php b/tests/unit/Core/Command/User/ProfileTest.php similarity index 100% rename from tests/Core/Command/User/ProfileTest.php rename to tests/unit/Core/Command/User/ProfileTest.php diff --git a/tests/Core/Command/User/SettingTest.php b/tests/unit/Core/Command/User/SettingTest.php similarity index 100% rename from tests/Core/Command/User/SettingTest.php rename to tests/unit/Core/Command/User/SettingTest.php diff --git a/tests/Core/Controller/AppPasswordControllerTest.php b/tests/unit/Core/Controller/AppPasswordControllerTest.php similarity index 100% rename from tests/Core/Controller/AppPasswordControllerTest.php rename to tests/unit/Core/Controller/AppPasswordControllerTest.php diff --git a/tests/Core/Controller/AutoCompleteControllerTest.php b/tests/unit/Core/Controller/AutoCompleteControllerTest.php similarity index 100% rename from tests/Core/Controller/AutoCompleteControllerTest.php rename to tests/unit/Core/Controller/AutoCompleteControllerTest.php diff --git a/tests/Core/Controller/AvatarControllerTest.php b/tests/unit/Core/Controller/AvatarControllerTest.php similarity index 100% rename from tests/Core/Controller/AvatarControllerTest.php rename to tests/unit/Core/Controller/AvatarControllerTest.php diff --git a/tests/Core/Controller/CSRFTokenControllerTest.php b/tests/unit/Core/Controller/CSRFTokenControllerTest.php similarity index 100% rename from tests/Core/Controller/CSRFTokenControllerTest.php rename to tests/unit/Core/Controller/CSRFTokenControllerTest.php diff --git a/tests/Core/Controller/ChangePasswordControllerTest.php b/tests/unit/Core/Controller/ChangePasswordControllerTest.php similarity index 100% rename from tests/Core/Controller/ChangePasswordControllerTest.php rename to tests/unit/Core/Controller/ChangePasswordControllerTest.php diff --git a/tests/Core/Controller/ClientFlowLoginControllerTest.php b/tests/unit/Core/Controller/ClientFlowLoginControllerTest.php similarity index 100% rename from tests/Core/Controller/ClientFlowLoginControllerTest.php rename to tests/unit/Core/Controller/ClientFlowLoginControllerTest.php diff --git a/tests/Core/Controller/ClientFlowLoginV2ControllerTest.php b/tests/unit/Core/Controller/ClientFlowLoginV2ControllerTest.php similarity index 100% rename from tests/Core/Controller/ClientFlowLoginV2ControllerTest.php rename to tests/unit/Core/Controller/ClientFlowLoginV2ControllerTest.php diff --git a/tests/Core/Controller/ContactsMenuControllerTest.php b/tests/unit/Core/Controller/ContactsMenuControllerTest.php similarity index 100% rename from tests/Core/Controller/ContactsMenuControllerTest.php rename to tests/unit/Core/Controller/ContactsMenuControllerTest.php diff --git a/tests/Core/Controller/CssControllerTest.php b/tests/unit/Core/Controller/CssControllerTest.php similarity index 100% rename from tests/Core/Controller/CssControllerTest.php rename to tests/unit/Core/Controller/CssControllerTest.php diff --git a/tests/Core/Controller/GuestAvatarControllerTest.php b/tests/unit/Core/Controller/GuestAvatarControllerTest.php similarity index 100% rename from tests/Core/Controller/GuestAvatarControllerTest.php rename to tests/unit/Core/Controller/GuestAvatarControllerTest.php diff --git a/tests/Core/Controller/JsControllerTest.php b/tests/unit/Core/Controller/JsControllerTest.php similarity index 100% rename from tests/Core/Controller/JsControllerTest.php rename to tests/unit/Core/Controller/JsControllerTest.php diff --git a/tests/Core/Controller/LoginControllerTest.php b/tests/unit/Core/Controller/LoginControllerTest.php similarity index 100% rename from tests/Core/Controller/LoginControllerTest.php rename to tests/unit/Core/Controller/LoginControllerTest.php diff --git a/tests/Core/Controller/LostControllerTest.php b/tests/unit/Core/Controller/LostControllerTest.php similarity index 100% rename from tests/Core/Controller/LostControllerTest.php rename to tests/unit/Core/Controller/LostControllerTest.php diff --git a/tests/Core/Controller/NavigationControllerTest.php b/tests/unit/Core/Controller/NavigationControllerTest.php similarity index 100% rename from tests/Core/Controller/NavigationControllerTest.php rename to tests/unit/Core/Controller/NavigationControllerTest.php diff --git a/tests/Core/Controller/OCSControllerTest.php b/tests/unit/Core/Controller/OCSControllerTest.php similarity index 100% rename from tests/Core/Controller/OCSControllerTest.php rename to tests/unit/Core/Controller/OCSControllerTest.php diff --git a/tests/Core/Controller/OpenMetricsControllerTest.php b/tests/unit/Core/Controller/OpenMetricsControllerTest.php similarity index 100% rename from tests/Core/Controller/OpenMetricsControllerTest.php rename to tests/unit/Core/Controller/OpenMetricsControllerTest.php diff --git a/tests/Core/Controller/PreviewControllerTest.php b/tests/unit/Core/Controller/PreviewControllerTest.php similarity index 100% rename from tests/Core/Controller/PreviewControllerTest.php rename to tests/unit/Core/Controller/PreviewControllerTest.php diff --git a/tests/Core/Controller/TwoFactorChallengeControllerTest.php b/tests/unit/Core/Controller/TwoFactorChallengeControllerTest.php similarity index 100% rename from tests/Core/Controller/TwoFactorChallengeControllerTest.php rename to tests/unit/Core/Controller/TwoFactorChallengeControllerTest.php diff --git a/tests/Core/Controller/UserControllerTest.php b/tests/unit/Core/Controller/UserControllerTest.php similarity index 100% rename from tests/Core/Controller/UserControllerTest.php rename to tests/unit/Core/Controller/UserControllerTest.php diff --git a/tests/Core/Controller/WellKnownControllerTest.php b/tests/unit/Core/Controller/WellKnownControllerTest.php similarity index 100% rename from tests/Core/Controller/WellKnownControllerTest.php rename to tests/unit/Core/Controller/WellKnownControllerTest.php diff --git a/tests/Core/Controller/WipeControllerTest.php b/tests/unit/Core/Controller/WipeControllerTest.php similarity index 100% rename from tests/Core/Controller/WipeControllerTest.php rename to tests/unit/Core/Controller/WipeControllerTest.php diff --git a/tests/Core/Data/LoginFlowV2CredentialsTest.php b/tests/unit/Core/Data/LoginFlowV2CredentialsTest.php similarity index 100% rename from tests/Core/Data/LoginFlowV2CredentialsTest.php rename to tests/unit/Core/Data/LoginFlowV2CredentialsTest.php diff --git a/tests/Core/Middleware/TwoFactorMiddlewareTest.php b/tests/unit/Core/Middleware/TwoFactorMiddlewareTest.php similarity index 100% rename from tests/Core/Middleware/TwoFactorMiddlewareTest.php rename to tests/unit/Core/Middleware/TwoFactorMiddlewareTest.php diff --git a/tests/Core/Service/LoginFlowV2ServiceUnitTest.php b/tests/unit/Core/Service/LoginFlowV2ServiceUnitTest.php similarity index 100% rename from tests/Core/Service/LoginFlowV2ServiceUnitTest.php rename to tests/unit/Core/Service/LoginFlowV2ServiceUnitTest.php diff --git a/tests/autoload.php b/tests/unit/autoload.php similarity index 100% rename from tests/autoload.php rename to tests/unit/autoload.php diff --git a/tests/bootstrap.php b/tests/unit/bootstrap.php similarity index 100% rename from tests/bootstrap.php rename to tests/unit/bootstrap.php diff --git a/tests/lib/Accounts/AccountManagerTest.php b/tests/unit/lib/Accounts/AccountManagerTest.php similarity index 100% rename from tests/lib/Accounts/AccountManagerTest.php rename to tests/unit/lib/Accounts/AccountManagerTest.php diff --git a/tests/lib/Accounts/AccountPropertyCollectionTest.php b/tests/unit/lib/Accounts/AccountPropertyCollectionTest.php similarity index 100% rename from tests/lib/Accounts/AccountPropertyCollectionTest.php rename to tests/unit/lib/Accounts/AccountPropertyCollectionTest.php diff --git a/tests/lib/Accounts/AccountPropertyTest.php b/tests/unit/lib/Accounts/AccountPropertyTest.php similarity index 100% rename from tests/lib/Accounts/AccountPropertyTest.php rename to tests/unit/lib/Accounts/AccountPropertyTest.php diff --git a/tests/lib/Accounts/AccountTest.php b/tests/unit/lib/Accounts/AccountTest.php similarity index 100% rename from tests/lib/Accounts/AccountTest.php rename to tests/unit/lib/Accounts/AccountTest.php diff --git a/tests/lib/Accounts/HooksTest.php b/tests/unit/lib/Accounts/HooksTest.php similarity index 100% rename from tests/lib/Accounts/HooksTest.php rename to tests/unit/lib/Accounts/HooksTest.php diff --git a/tests/lib/Activity/ManagerTest.php b/tests/unit/lib/Activity/ManagerTest.php similarity index 100% rename from tests/lib/Activity/ManagerTest.php rename to tests/unit/lib/Activity/ManagerTest.php diff --git a/tests/lib/AllConfigTest.php b/tests/unit/lib/AllConfigTest.php similarity index 100% rename from tests/lib/AllConfigTest.php rename to tests/unit/lib/AllConfigTest.php diff --git a/tests/lib/App/AppManagerTest.php b/tests/unit/lib/App/AppManagerTest.php similarity index 100% rename from tests/lib/App/AppManagerTest.php rename to tests/unit/lib/App/AppManagerTest.php diff --git a/tests/lib/App/AppStore/Bundles/BundleBase.php b/tests/unit/lib/App/AppStore/Bundles/BundleBase.php similarity index 100% rename from tests/lib/App/AppStore/Bundles/BundleBase.php rename to tests/unit/lib/App/AppStore/Bundles/BundleBase.php diff --git a/tests/lib/App/AppStore/Bundles/BundleFetcherTest.php b/tests/unit/lib/App/AppStore/Bundles/BundleFetcherTest.php similarity index 100% rename from tests/lib/App/AppStore/Bundles/BundleFetcherTest.php rename to tests/unit/lib/App/AppStore/Bundles/BundleFetcherTest.php diff --git a/tests/lib/App/AppStore/Bundles/EducationBundleTest.php b/tests/unit/lib/App/AppStore/Bundles/EducationBundleTest.php similarity index 100% rename from tests/lib/App/AppStore/Bundles/EducationBundleTest.php rename to tests/unit/lib/App/AppStore/Bundles/EducationBundleTest.php diff --git a/tests/lib/App/AppStore/Bundles/EnterpriseBundleTest.php b/tests/unit/lib/App/AppStore/Bundles/EnterpriseBundleTest.php similarity index 100% rename from tests/lib/App/AppStore/Bundles/EnterpriseBundleTest.php rename to tests/unit/lib/App/AppStore/Bundles/EnterpriseBundleTest.php diff --git a/tests/lib/App/AppStore/Bundles/GroupwareBundleTest.php b/tests/unit/lib/App/AppStore/Bundles/GroupwareBundleTest.php similarity index 100% rename from tests/lib/App/AppStore/Bundles/GroupwareBundleTest.php rename to tests/unit/lib/App/AppStore/Bundles/GroupwareBundleTest.php diff --git a/tests/lib/App/AppStore/Bundles/SocialSharingBundleTest.php b/tests/unit/lib/App/AppStore/Bundles/SocialSharingBundleTest.php similarity index 100% rename from tests/lib/App/AppStore/Bundles/SocialSharingBundleTest.php rename to tests/unit/lib/App/AppStore/Bundles/SocialSharingBundleTest.php diff --git a/tests/lib/App/AppStore/Fetcher/AppDiscoverFetcherTest.php b/tests/unit/lib/App/AppStore/Fetcher/AppDiscoverFetcherTest.php similarity index 100% rename from tests/lib/App/AppStore/Fetcher/AppDiscoverFetcherTest.php rename to tests/unit/lib/App/AppStore/Fetcher/AppDiscoverFetcherTest.php diff --git a/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php b/tests/unit/lib/App/AppStore/Fetcher/AppFetcherTest.php similarity index 100% rename from tests/lib/App/AppStore/Fetcher/AppFetcherTest.php rename to tests/unit/lib/App/AppStore/Fetcher/AppFetcherTest.php diff --git a/tests/lib/App/AppStore/Fetcher/CategoryFetcherTest.php b/tests/unit/lib/App/AppStore/Fetcher/CategoryFetcherTest.php similarity index 100% rename from tests/lib/App/AppStore/Fetcher/CategoryFetcherTest.php rename to tests/unit/lib/App/AppStore/Fetcher/CategoryFetcherTest.php diff --git a/tests/lib/App/AppStore/Fetcher/FetcherBase.php b/tests/unit/lib/App/AppStore/Fetcher/FetcherBase.php similarity index 100% rename from tests/lib/App/AppStore/Fetcher/FetcherBase.php rename to tests/unit/lib/App/AppStore/Fetcher/FetcherBase.php diff --git a/tests/lib/App/AppStore/Version/VersionParserTest.php b/tests/unit/lib/App/AppStore/Version/VersionParserTest.php similarity index 100% rename from tests/lib/App/AppStore/Version/VersionParserTest.php rename to tests/unit/lib/App/AppStore/Version/VersionParserTest.php diff --git a/tests/lib/App/AppStore/Version/VersionTest.php b/tests/unit/lib/App/AppStore/Version/VersionTest.php similarity index 100% rename from tests/lib/App/AppStore/Version/VersionTest.php rename to tests/unit/lib/App/AppStore/Version/VersionTest.php diff --git a/tests/lib/App/CompareVersionTest.php b/tests/unit/lib/App/CompareVersionTest.php similarity index 100% rename from tests/lib/App/CompareVersionTest.php rename to tests/unit/lib/App/CompareVersionTest.php diff --git a/tests/lib/App/DependencyAnalyzerTest.php b/tests/unit/lib/App/DependencyAnalyzerTest.php similarity index 100% rename from tests/lib/App/DependencyAnalyzerTest.php rename to tests/unit/lib/App/DependencyAnalyzerTest.php diff --git a/tests/lib/App/InfoParserTest.php b/tests/unit/lib/App/InfoParserTest.php similarity index 100% rename from tests/lib/App/InfoParserTest.php rename to tests/unit/lib/App/InfoParserTest.php diff --git a/tests/lib/App/PlatformRepositoryTest.php b/tests/unit/lib/App/PlatformRepositoryTest.php similarity index 100% rename from tests/lib/App/PlatformRepositoryTest.php rename to tests/unit/lib/App/PlatformRepositoryTest.php diff --git a/tests/lib/AppConfigIntegrationTest.php b/tests/unit/lib/AppConfigIntegrationTest.php similarity index 100% rename from tests/lib/AppConfigIntegrationTest.php rename to tests/unit/lib/AppConfigIntegrationTest.php diff --git a/tests/lib/AppConfigMigrationFallbackTest.php b/tests/unit/lib/AppConfigMigrationFallbackTest.php similarity index 100% rename from tests/lib/AppConfigMigrationFallbackTest.php rename to tests/unit/lib/AppConfigMigrationFallbackTest.php diff --git a/tests/lib/AppConfigTest.php b/tests/unit/lib/AppConfigTest.php similarity index 100% rename from tests/lib/AppConfigTest.php rename to tests/unit/lib/AppConfigTest.php diff --git a/tests/lib/AppFramework/AppTest.php b/tests/unit/lib/AppFramework/AppTest.php similarity index 100% rename from tests/lib/AppFramework/AppTest.php rename to tests/unit/lib/AppFramework/AppTest.php diff --git a/tests/lib/AppFramework/Bootstrap/BootContextTest.php b/tests/unit/lib/AppFramework/Bootstrap/BootContextTest.php similarity index 100% rename from tests/lib/AppFramework/Bootstrap/BootContextTest.php rename to tests/unit/lib/AppFramework/Bootstrap/BootContextTest.php diff --git a/tests/lib/AppFramework/Bootstrap/CoordinatorTest.php b/tests/unit/lib/AppFramework/Bootstrap/CoordinatorTest.php similarity index 100% rename from tests/lib/AppFramework/Bootstrap/CoordinatorTest.php rename to tests/unit/lib/AppFramework/Bootstrap/CoordinatorTest.php diff --git a/tests/lib/AppFramework/Bootstrap/FunctionInjectorTest.php b/tests/unit/lib/AppFramework/Bootstrap/FunctionInjectorTest.php similarity index 100% rename from tests/lib/AppFramework/Bootstrap/FunctionInjectorTest.php rename to tests/unit/lib/AppFramework/Bootstrap/FunctionInjectorTest.php diff --git a/tests/lib/AppFramework/Bootstrap/RegistrationContextTest.php b/tests/unit/lib/AppFramework/Bootstrap/RegistrationContextTest.php similarity index 100% rename from tests/lib/AppFramework/Bootstrap/RegistrationContextTest.php rename to tests/unit/lib/AppFramework/Bootstrap/RegistrationContextTest.php diff --git a/tests/lib/AppFramework/Controller/ApiControllerTest.php b/tests/unit/lib/AppFramework/Controller/ApiControllerTest.php similarity index 100% rename from tests/lib/AppFramework/Controller/ApiControllerTest.php rename to tests/unit/lib/AppFramework/Controller/ApiControllerTest.php diff --git a/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php b/tests/unit/lib/AppFramework/Controller/AuthPublicShareControllerTest.php similarity index 100% rename from tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php rename to tests/unit/lib/AppFramework/Controller/AuthPublicShareControllerTest.php diff --git a/tests/lib/AppFramework/Controller/ControllerTest.php b/tests/unit/lib/AppFramework/Controller/ControllerTest.php similarity index 100% rename from tests/lib/AppFramework/Controller/ControllerTest.php rename to tests/unit/lib/AppFramework/Controller/ControllerTest.php diff --git a/tests/lib/AppFramework/Controller/OCSControllerTest.php b/tests/unit/lib/AppFramework/Controller/OCSControllerTest.php similarity index 100% rename from tests/lib/AppFramework/Controller/OCSControllerTest.php rename to tests/unit/lib/AppFramework/Controller/OCSControllerTest.php diff --git a/tests/lib/AppFramework/Controller/PublicShareControllerTest.php b/tests/unit/lib/AppFramework/Controller/PublicShareControllerTest.php similarity index 100% rename from tests/lib/AppFramework/Controller/PublicShareControllerTest.php rename to tests/unit/lib/AppFramework/Controller/PublicShareControllerTest.php diff --git a/tests/lib/AppFramework/Db/EntityTest.php b/tests/unit/lib/AppFramework/Db/EntityTest.php similarity index 100% rename from tests/lib/AppFramework/Db/EntityTest.php rename to tests/unit/lib/AppFramework/Db/EntityTest.php diff --git a/tests/lib/AppFramework/Db/QBMapperDBTest.php b/tests/unit/lib/AppFramework/Db/QBMapperDBTest.php similarity index 100% rename from tests/lib/AppFramework/Db/QBMapperDBTest.php rename to tests/unit/lib/AppFramework/Db/QBMapperDBTest.php diff --git a/tests/lib/AppFramework/Db/QBMapperTest.php b/tests/unit/lib/AppFramework/Db/QBMapperTest.php similarity index 100% rename from tests/lib/AppFramework/Db/QBMapperTest.php rename to tests/unit/lib/AppFramework/Db/QBMapperTest.php diff --git a/tests/lib/AppFramework/Db/TransactionalTest.php b/tests/unit/lib/AppFramework/Db/TransactionalTest.php similarity index 100% rename from tests/lib/AppFramework/Db/TransactionalTest.php rename to tests/unit/lib/AppFramework/Db/TransactionalTest.php diff --git a/tests/lib/AppFramework/DependencyInjection/DIContainerTest.php b/tests/unit/lib/AppFramework/DependencyInjection/DIContainerTest.php similarity index 100% rename from tests/lib/AppFramework/DependencyInjection/DIContainerTest.php rename to tests/unit/lib/AppFramework/DependencyInjection/DIContainerTest.php diff --git a/tests/lib/AppFramework/DependencyInjection/DIIntergrationTests.php b/tests/unit/lib/AppFramework/DependencyInjection/DIIntergrationTests.php similarity index 100% rename from tests/lib/AppFramework/DependencyInjection/DIIntergrationTests.php rename to tests/unit/lib/AppFramework/DependencyInjection/DIIntergrationTests.php diff --git a/tests/lib/AppFramework/Http/ContentSecurityPolicyTest.php b/tests/unit/lib/AppFramework/Http/ContentSecurityPolicyTest.php similarity index 100% rename from tests/lib/AppFramework/Http/ContentSecurityPolicyTest.php rename to tests/unit/lib/AppFramework/Http/ContentSecurityPolicyTest.php diff --git a/tests/lib/AppFramework/Http/DataResponseTest.php b/tests/unit/lib/AppFramework/Http/DataResponseTest.php similarity index 100% rename from tests/lib/AppFramework/Http/DataResponseTest.php rename to tests/unit/lib/AppFramework/Http/DataResponseTest.php diff --git a/tests/lib/AppFramework/Http/DispatcherTest.php b/tests/unit/lib/AppFramework/Http/DispatcherTest.php similarity index 100% rename from tests/lib/AppFramework/Http/DispatcherTest.php rename to tests/unit/lib/AppFramework/Http/DispatcherTest.php diff --git a/tests/lib/AppFramework/Http/DownloadResponseTest.php b/tests/unit/lib/AppFramework/Http/DownloadResponseTest.php similarity index 100% rename from tests/lib/AppFramework/Http/DownloadResponseTest.php rename to tests/unit/lib/AppFramework/Http/DownloadResponseTest.php diff --git a/tests/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php b/tests/unit/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php similarity index 100% rename from tests/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php rename to tests/unit/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php diff --git a/tests/lib/AppFramework/Http/EmptyFeaturePolicyTest.php b/tests/unit/lib/AppFramework/Http/EmptyFeaturePolicyTest.php similarity index 100% rename from tests/lib/AppFramework/Http/EmptyFeaturePolicyTest.php rename to tests/unit/lib/AppFramework/Http/EmptyFeaturePolicyTest.php diff --git a/tests/lib/AppFramework/Http/FeaturePolicyTest.php b/tests/unit/lib/AppFramework/Http/FeaturePolicyTest.php similarity index 100% rename from tests/lib/AppFramework/Http/FeaturePolicyTest.php rename to tests/unit/lib/AppFramework/Http/FeaturePolicyTest.php diff --git a/tests/lib/AppFramework/Http/FileDisplayResponseTest.php b/tests/unit/lib/AppFramework/Http/FileDisplayResponseTest.php similarity index 100% rename from tests/lib/AppFramework/Http/FileDisplayResponseTest.php rename to tests/unit/lib/AppFramework/Http/FileDisplayResponseTest.php diff --git a/tests/lib/AppFramework/Http/HttpTest.php b/tests/unit/lib/AppFramework/Http/HttpTest.php similarity index 100% rename from tests/lib/AppFramework/Http/HttpTest.php rename to tests/unit/lib/AppFramework/Http/HttpTest.php diff --git a/tests/lib/AppFramework/Http/JSONResponseTest.php b/tests/unit/lib/AppFramework/Http/JSONResponseTest.php similarity index 100% rename from tests/lib/AppFramework/Http/JSONResponseTest.php rename to tests/unit/lib/AppFramework/Http/JSONResponseTest.php diff --git a/tests/lib/AppFramework/Http/OutputTest.php b/tests/unit/lib/AppFramework/Http/OutputTest.php similarity index 100% rename from tests/lib/AppFramework/Http/OutputTest.php rename to tests/unit/lib/AppFramework/Http/OutputTest.php diff --git a/tests/lib/AppFramework/Http/PublicTemplateResponseTest.php b/tests/unit/lib/AppFramework/Http/PublicTemplateResponseTest.php similarity index 100% rename from tests/lib/AppFramework/Http/PublicTemplateResponseTest.php rename to tests/unit/lib/AppFramework/Http/PublicTemplateResponseTest.php diff --git a/tests/lib/AppFramework/Http/RedirectResponseTest.php b/tests/unit/lib/AppFramework/Http/RedirectResponseTest.php similarity index 100% rename from tests/lib/AppFramework/Http/RedirectResponseTest.php rename to tests/unit/lib/AppFramework/Http/RedirectResponseTest.php diff --git a/tests/lib/AppFramework/Http/RequestIdTest.php b/tests/unit/lib/AppFramework/Http/RequestIdTest.php similarity index 100% rename from tests/lib/AppFramework/Http/RequestIdTest.php rename to tests/unit/lib/AppFramework/Http/RequestIdTest.php diff --git a/tests/lib/AppFramework/Http/RequestStream.php b/tests/unit/lib/AppFramework/Http/RequestStream.php similarity index 100% rename from tests/lib/AppFramework/Http/RequestStream.php rename to tests/unit/lib/AppFramework/Http/RequestStream.php diff --git a/tests/lib/AppFramework/Http/RequestTest.php b/tests/unit/lib/AppFramework/Http/RequestTest.php similarity index 100% rename from tests/lib/AppFramework/Http/RequestTest.php rename to tests/unit/lib/AppFramework/Http/RequestTest.php diff --git a/tests/lib/AppFramework/Http/ResponseTest.php b/tests/unit/lib/AppFramework/Http/ResponseTest.php similarity index 100% rename from tests/lib/AppFramework/Http/ResponseTest.php rename to tests/unit/lib/AppFramework/Http/ResponseTest.php diff --git a/tests/lib/AppFramework/Http/StreamResponseTest.php b/tests/unit/lib/AppFramework/Http/StreamResponseTest.php similarity index 100% rename from tests/lib/AppFramework/Http/StreamResponseTest.php rename to tests/unit/lib/AppFramework/Http/StreamResponseTest.php diff --git a/tests/lib/AppFramework/Http/TemplateResponseTest.php b/tests/unit/lib/AppFramework/Http/TemplateResponseTest.php similarity index 100% rename from tests/lib/AppFramework/Http/TemplateResponseTest.php rename to tests/unit/lib/AppFramework/Http/TemplateResponseTest.php diff --git a/tests/lib/AppFramework/Middleware/AdditionalScriptsMiddlewareTest.php b/tests/unit/lib/AppFramework/Middleware/AdditionalScriptsMiddlewareTest.php similarity index 100% rename from tests/lib/AppFramework/Middleware/AdditionalScriptsMiddlewareTest.php rename to tests/unit/lib/AppFramework/Middleware/AdditionalScriptsMiddlewareTest.php diff --git a/tests/lib/AppFramework/Middleware/CompressionMiddlewareTest.php b/tests/unit/lib/AppFramework/Middleware/CompressionMiddlewareTest.php similarity index 100% rename from tests/lib/AppFramework/Middleware/CompressionMiddlewareTest.php rename to tests/unit/lib/AppFramework/Middleware/CompressionMiddlewareTest.php diff --git a/tests/lib/AppFramework/Middleware/MiddlewareDispatcherTest.php b/tests/unit/lib/AppFramework/Middleware/MiddlewareDispatcherTest.php similarity index 100% rename from tests/lib/AppFramework/Middleware/MiddlewareDispatcherTest.php rename to tests/unit/lib/AppFramework/Middleware/MiddlewareDispatcherTest.php diff --git a/tests/lib/AppFramework/Middleware/MiddlewareTest.php b/tests/unit/lib/AppFramework/Middleware/MiddlewareTest.php similarity index 100% rename from tests/lib/AppFramework/Middleware/MiddlewareTest.php rename to tests/unit/lib/AppFramework/Middleware/MiddlewareTest.php diff --git a/tests/lib/AppFramework/Middleware/Mock/UseSessionController.php b/tests/unit/lib/AppFramework/Middleware/Mock/UseSessionController.php similarity index 100% rename from tests/lib/AppFramework/Middleware/Mock/UseSessionController.php rename to tests/unit/lib/AppFramework/Middleware/Mock/UseSessionController.php diff --git a/tests/lib/AppFramework/Middleware/NotModifiedMiddlewareTest.php b/tests/unit/lib/AppFramework/Middleware/NotModifiedMiddlewareTest.php similarity index 100% rename from tests/lib/AppFramework/Middleware/NotModifiedMiddlewareTest.php rename to tests/unit/lib/AppFramework/Middleware/NotModifiedMiddlewareTest.php diff --git a/tests/lib/AppFramework/Middleware/OCSMiddlewareTest.php b/tests/unit/lib/AppFramework/Middleware/OCSMiddlewareTest.php similarity index 100% rename from tests/lib/AppFramework/Middleware/OCSMiddlewareTest.php rename to tests/unit/lib/AppFramework/Middleware/OCSMiddlewareTest.php diff --git a/tests/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php b/tests/unit/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php similarity index 100% rename from tests/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php rename to tests/unit/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php diff --git a/tests/lib/AppFramework/Middleware/Security/BruteForceMiddlewareTest.php b/tests/unit/lib/AppFramework/Middleware/Security/BruteForceMiddlewareTest.php similarity index 100% rename from tests/lib/AppFramework/Middleware/Security/BruteForceMiddlewareTest.php rename to tests/unit/lib/AppFramework/Middleware/Security/BruteForceMiddlewareTest.php diff --git a/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php b/tests/unit/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php similarity index 100% rename from tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php rename to tests/unit/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php diff --git a/tests/lib/AppFramework/Middleware/Security/CSPMiddlewareTest.php b/tests/unit/lib/AppFramework/Middleware/Security/CSPMiddlewareTest.php similarity index 100% rename from tests/lib/AppFramework/Middleware/Security/CSPMiddlewareTest.php rename to tests/unit/lib/AppFramework/Middleware/Security/CSPMiddlewareTest.php diff --git a/tests/lib/AppFramework/Middleware/Security/FeaturePolicyMiddlewareTest.php b/tests/unit/lib/AppFramework/Middleware/Security/FeaturePolicyMiddlewareTest.php similarity index 100% rename from tests/lib/AppFramework/Middleware/Security/FeaturePolicyMiddlewareTest.php rename to tests/unit/lib/AppFramework/Middleware/Security/FeaturePolicyMiddlewareTest.php diff --git a/tests/lib/AppFramework/Middleware/Security/Mock/BruteForceMiddlewareController.php b/tests/unit/lib/AppFramework/Middleware/Security/Mock/BruteForceMiddlewareController.php similarity index 100% rename from tests/lib/AppFramework/Middleware/Security/Mock/BruteForceMiddlewareController.php rename to tests/unit/lib/AppFramework/Middleware/Security/Mock/BruteForceMiddlewareController.php diff --git a/tests/lib/AppFramework/Middleware/Security/Mock/CORSMiddlewareController.php b/tests/unit/lib/AppFramework/Middleware/Security/Mock/CORSMiddlewareController.php similarity index 100% rename from tests/lib/AppFramework/Middleware/Security/Mock/CORSMiddlewareController.php rename to tests/unit/lib/AppFramework/Middleware/Security/Mock/CORSMiddlewareController.php diff --git a/tests/lib/AppFramework/Middleware/Security/Mock/NormalController.php b/tests/unit/lib/AppFramework/Middleware/Security/Mock/NormalController.php similarity index 100% rename from tests/lib/AppFramework/Middleware/Security/Mock/NormalController.php rename to tests/unit/lib/AppFramework/Middleware/Security/Mock/NormalController.php diff --git a/tests/lib/AppFramework/Middleware/Security/Mock/OCSController.php b/tests/unit/lib/AppFramework/Middleware/Security/Mock/OCSController.php similarity index 100% rename from tests/lib/AppFramework/Middleware/Security/Mock/OCSController.php rename to tests/unit/lib/AppFramework/Middleware/Security/Mock/OCSController.php diff --git a/tests/lib/AppFramework/Middleware/Security/Mock/PasswordConfirmationMiddlewareController.php b/tests/unit/lib/AppFramework/Middleware/Security/Mock/PasswordConfirmationMiddlewareController.php similarity index 100% rename from tests/lib/AppFramework/Middleware/Security/Mock/PasswordConfirmationMiddlewareController.php rename to tests/unit/lib/AppFramework/Middleware/Security/Mock/PasswordConfirmationMiddlewareController.php diff --git a/tests/lib/AppFramework/Middleware/Security/Mock/RateLimitingMiddlewareController.php b/tests/unit/lib/AppFramework/Middleware/Security/Mock/RateLimitingMiddlewareController.php similarity index 100% rename from tests/lib/AppFramework/Middleware/Security/Mock/RateLimitingMiddlewareController.php rename to tests/unit/lib/AppFramework/Middleware/Security/Mock/RateLimitingMiddlewareController.php diff --git a/tests/lib/AppFramework/Middleware/Security/Mock/SecurityMiddlewareController.php b/tests/unit/lib/AppFramework/Middleware/Security/Mock/SecurityMiddlewareController.php similarity index 100% rename from tests/lib/AppFramework/Middleware/Security/Mock/SecurityMiddlewareController.php rename to tests/unit/lib/AppFramework/Middleware/Security/Mock/SecurityMiddlewareController.php diff --git a/tests/lib/AppFramework/Middleware/Security/PasswordConfirmationMiddlewareTest.php b/tests/unit/lib/AppFramework/Middleware/Security/PasswordConfirmationMiddlewareTest.php similarity index 100% rename from tests/lib/AppFramework/Middleware/Security/PasswordConfirmationMiddlewareTest.php rename to tests/unit/lib/AppFramework/Middleware/Security/PasswordConfirmationMiddlewareTest.php diff --git a/tests/lib/AppFramework/Middleware/Security/RateLimitingMiddlewareTest.php b/tests/unit/lib/AppFramework/Middleware/Security/RateLimitingMiddlewareTest.php similarity index 100% rename from tests/lib/AppFramework/Middleware/Security/RateLimitingMiddlewareTest.php rename to tests/unit/lib/AppFramework/Middleware/Security/RateLimitingMiddlewareTest.php diff --git a/tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php b/tests/unit/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php similarity index 100% rename from tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php rename to tests/unit/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php diff --git a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php b/tests/unit/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php similarity index 100% rename from tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php rename to tests/unit/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php diff --git a/tests/lib/AppFramework/Middleware/SessionMiddlewareTest.php b/tests/unit/lib/AppFramework/Middleware/SessionMiddlewareTest.php similarity index 100% rename from tests/lib/AppFramework/Middleware/SessionMiddlewareTest.php rename to tests/unit/lib/AppFramework/Middleware/SessionMiddlewareTest.php diff --git a/tests/lib/AppFramework/OCS/BaseResponseTest.php b/tests/unit/lib/AppFramework/OCS/BaseResponseTest.php similarity index 100% rename from tests/lib/AppFramework/OCS/BaseResponseTest.php rename to tests/unit/lib/AppFramework/OCS/BaseResponseTest.php diff --git a/tests/lib/AppFramework/OCS/V2ResponseTest.php b/tests/unit/lib/AppFramework/OCS/V2ResponseTest.php similarity index 100% rename from tests/lib/AppFramework/OCS/V2ResponseTest.php rename to tests/unit/lib/AppFramework/OCS/V2ResponseTest.php diff --git a/tests/lib/AppFramework/Routing/RouteParserTest.php b/tests/unit/lib/AppFramework/Routing/RouteParserTest.php similarity index 100% rename from tests/lib/AppFramework/Routing/RouteParserTest.php rename to tests/unit/lib/AppFramework/Routing/RouteParserTest.php diff --git a/tests/lib/AppFramework/Services/AppConfigTest.php b/tests/unit/lib/AppFramework/Services/AppConfigTest.php similarity index 100% rename from tests/lib/AppFramework/Services/AppConfigTest.php rename to tests/unit/lib/AppFramework/Services/AppConfigTest.php diff --git a/tests/lib/AppFramework/Utility/ControllerMethodReflectorTest.php b/tests/unit/lib/AppFramework/Utility/ControllerMethodReflectorTest.php similarity index 100% rename from tests/lib/AppFramework/Utility/ControllerMethodReflectorTest.php rename to tests/unit/lib/AppFramework/Utility/ControllerMethodReflectorTest.php diff --git a/tests/lib/AppFramework/Utility/SimpleContainerTest.php b/tests/unit/lib/AppFramework/Utility/SimpleContainerTest.php similarity index 100% rename from tests/lib/AppFramework/Utility/SimpleContainerTest.php rename to tests/unit/lib/AppFramework/Utility/SimpleContainerTest.php diff --git a/tests/lib/AppFramework/Utility/TimeFactoryTest.php b/tests/unit/lib/AppFramework/Utility/TimeFactoryTest.php similarity index 100% rename from tests/lib/AppFramework/Utility/TimeFactoryTest.php rename to tests/unit/lib/AppFramework/Utility/TimeFactoryTest.php diff --git a/tests/lib/AppScriptSortTest.php b/tests/unit/lib/AppScriptSortTest.php similarity index 100% rename from tests/lib/AppScriptSortTest.php rename to tests/unit/lib/AppScriptSortTest.php diff --git a/tests/lib/AppTest.php b/tests/unit/lib/AppTest.php similarity index 100% rename from tests/lib/AppTest.php rename to tests/unit/lib/AppTest.php diff --git a/tests/lib/Archive/TARTest.php b/tests/unit/lib/Archive/TARTest.php similarity index 100% rename from tests/lib/Archive/TARTest.php rename to tests/unit/lib/Archive/TARTest.php diff --git a/tests/lib/Archive/TestBase.php b/tests/unit/lib/Archive/TestBase.php similarity index 100% rename from tests/lib/Archive/TestBase.php rename to tests/unit/lib/Archive/TestBase.php diff --git a/tests/lib/Archive/ZIPTest.php b/tests/unit/lib/Archive/ZIPTest.php similarity index 100% rename from tests/lib/Archive/ZIPTest.php rename to tests/unit/lib/Archive/ZIPTest.php diff --git a/tests/lib/Authentication/Events/RemoteWipeFinishedTest.php b/tests/unit/lib/Authentication/Events/RemoteWipeFinishedTest.php similarity index 100% rename from tests/lib/Authentication/Events/RemoteWipeFinishedTest.php rename to tests/unit/lib/Authentication/Events/RemoteWipeFinishedTest.php diff --git a/tests/lib/Authentication/Events/RemoteWipeStartedTest.php b/tests/unit/lib/Authentication/Events/RemoteWipeStartedTest.php similarity index 100% rename from tests/lib/Authentication/Events/RemoteWipeStartedTest.php rename to tests/unit/lib/Authentication/Events/RemoteWipeStartedTest.php diff --git a/tests/lib/Authentication/Listeners/RemoteWipeActivityListenerTest.php b/tests/unit/lib/Authentication/Listeners/RemoteWipeActivityListenerTest.php similarity index 100% rename from tests/lib/Authentication/Listeners/RemoteWipeActivityListenerTest.php rename to tests/unit/lib/Authentication/Listeners/RemoteWipeActivityListenerTest.php diff --git a/tests/lib/Authentication/Listeners/RemoteWipeEmailListenerTest.php b/tests/unit/lib/Authentication/Listeners/RemoteWipeEmailListenerTest.php similarity index 100% rename from tests/lib/Authentication/Listeners/RemoteWipeEmailListenerTest.php rename to tests/unit/lib/Authentication/Listeners/RemoteWipeEmailListenerTest.php diff --git a/tests/lib/Authentication/Listeners/RemoteWipeNotificationsListenerTest.php b/tests/unit/lib/Authentication/Listeners/RemoteWipeNotificationsListenerTest.php similarity index 100% rename from tests/lib/Authentication/Listeners/RemoteWipeNotificationsListenerTest.php rename to tests/unit/lib/Authentication/Listeners/RemoteWipeNotificationsListenerTest.php diff --git a/tests/lib/Authentication/Listeners/UserDeletedTokenCleanupListenerTest.php b/tests/unit/lib/Authentication/Listeners/UserDeletedTokenCleanupListenerTest.php similarity index 100% rename from tests/lib/Authentication/Listeners/UserDeletedTokenCleanupListenerTest.php rename to tests/unit/lib/Authentication/Listeners/UserDeletedTokenCleanupListenerTest.php diff --git a/tests/lib/Authentication/Login/ALoginTestCommand.php b/tests/unit/lib/Authentication/Login/ALoginTestCommand.php similarity index 100% rename from tests/lib/Authentication/Login/ALoginTestCommand.php rename to tests/unit/lib/Authentication/Login/ALoginTestCommand.php diff --git a/tests/lib/Authentication/Login/ClearLostPasswordTokensCommandTest.php b/tests/unit/lib/Authentication/Login/ClearLostPasswordTokensCommandTest.php similarity index 100% rename from tests/lib/Authentication/Login/ClearLostPasswordTokensCommandTest.php rename to tests/unit/lib/Authentication/Login/ClearLostPasswordTokensCommandTest.php diff --git a/tests/lib/Authentication/Login/CompleteLoginCommandTest.php b/tests/unit/lib/Authentication/Login/CompleteLoginCommandTest.php similarity index 100% rename from tests/lib/Authentication/Login/CompleteLoginCommandTest.php rename to tests/unit/lib/Authentication/Login/CompleteLoginCommandTest.php diff --git a/tests/lib/Authentication/Login/CreateSessionTokenCommandTest.php b/tests/unit/lib/Authentication/Login/CreateSessionTokenCommandTest.php similarity index 100% rename from tests/lib/Authentication/Login/CreateSessionTokenCommandTest.php rename to tests/unit/lib/Authentication/Login/CreateSessionTokenCommandTest.php diff --git a/tests/lib/Authentication/Login/FinishRememberedLoginCommandTest.php b/tests/unit/lib/Authentication/Login/FinishRememberedLoginCommandTest.php similarity index 100% rename from tests/lib/Authentication/Login/FinishRememberedLoginCommandTest.php rename to tests/unit/lib/Authentication/Login/FinishRememberedLoginCommandTest.php diff --git a/tests/lib/Authentication/Login/LoggedInCheckCommandTest.php b/tests/unit/lib/Authentication/Login/LoggedInCheckCommandTest.php similarity index 100% rename from tests/lib/Authentication/Login/LoggedInCheckCommandTest.php rename to tests/unit/lib/Authentication/Login/LoggedInCheckCommandTest.php diff --git a/tests/lib/Authentication/Login/PreLoginHookCommandTest.php b/tests/unit/lib/Authentication/Login/PreLoginHookCommandTest.php similarity index 100% rename from tests/lib/Authentication/Login/PreLoginHookCommandTest.php rename to tests/unit/lib/Authentication/Login/PreLoginHookCommandTest.php diff --git a/tests/lib/Authentication/Login/SetUserTimezoneCommandTest.php b/tests/unit/lib/Authentication/Login/SetUserTimezoneCommandTest.php similarity index 100% rename from tests/lib/Authentication/Login/SetUserTimezoneCommandTest.php rename to tests/unit/lib/Authentication/Login/SetUserTimezoneCommandTest.php diff --git a/tests/lib/Authentication/Login/TwoFactorCommandTest.php b/tests/unit/lib/Authentication/Login/TwoFactorCommandTest.php similarity index 100% rename from tests/lib/Authentication/Login/TwoFactorCommandTest.php rename to tests/unit/lib/Authentication/Login/TwoFactorCommandTest.php diff --git a/tests/lib/Authentication/Login/UidLoginCommandTest.php b/tests/unit/lib/Authentication/Login/UidLoginCommandTest.php similarity index 100% rename from tests/lib/Authentication/Login/UidLoginCommandTest.php rename to tests/unit/lib/Authentication/Login/UidLoginCommandTest.php diff --git a/tests/lib/Authentication/Login/UpdateLastPasswordConfirmCommandTest.php b/tests/unit/lib/Authentication/Login/UpdateLastPasswordConfirmCommandTest.php similarity index 100% rename from tests/lib/Authentication/Login/UpdateLastPasswordConfirmCommandTest.php rename to tests/unit/lib/Authentication/Login/UpdateLastPasswordConfirmCommandTest.php diff --git a/tests/lib/Authentication/Login/UserDisabledCheckCommandTest.php b/tests/unit/lib/Authentication/Login/UserDisabledCheckCommandTest.php similarity index 100% rename from tests/lib/Authentication/Login/UserDisabledCheckCommandTest.php rename to tests/unit/lib/Authentication/Login/UserDisabledCheckCommandTest.php diff --git a/tests/lib/Authentication/LoginCredentials/CredentialsTest.php b/tests/unit/lib/Authentication/LoginCredentials/CredentialsTest.php similarity index 100% rename from tests/lib/Authentication/LoginCredentials/CredentialsTest.php rename to tests/unit/lib/Authentication/LoginCredentials/CredentialsTest.php diff --git a/tests/lib/Authentication/LoginCredentials/StoreTest.php b/tests/unit/lib/Authentication/LoginCredentials/StoreTest.php similarity index 100% rename from tests/lib/Authentication/LoginCredentials/StoreTest.php rename to tests/unit/lib/Authentication/LoginCredentials/StoreTest.php diff --git a/tests/lib/Authentication/Token/ManagerTest.php b/tests/unit/lib/Authentication/Token/ManagerTest.php similarity index 100% rename from tests/lib/Authentication/Token/ManagerTest.php rename to tests/unit/lib/Authentication/Token/ManagerTest.php diff --git a/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php b/tests/unit/lib/Authentication/Token/PublicKeyTokenMapperTest.php similarity index 100% rename from tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php rename to tests/unit/lib/Authentication/Token/PublicKeyTokenMapperTest.php diff --git a/tests/lib/Authentication/Token/PublicKeyTokenProviderTest.php b/tests/unit/lib/Authentication/Token/PublicKeyTokenProviderTest.php similarity index 100% rename from tests/lib/Authentication/Token/PublicKeyTokenProviderTest.php rename to tests/unit/lib/Authentication/Token/PublicKeyTokenProviderTest.php diff --git a/tests/lib/Authentication/Token/PublicKeyTokenTest.php b/tests/unit/lib/Authentication/Token/PublicKeyTokenTest.php similarity index 100% rename from tests/lib/Authentication/Token/PublicKeyTokenTest.php rename to tests/unit/lib/Authentication/Token/PublicKeyTokenTest.php diff --git a/tests/lib/Authentication/Token/RemoteWipeTest.php b/tests/unit/lib/Authentication/Token/RemoteWipeTest.php similarity index 100% rename from tests/lib/Authentication/Token/RemoteWipeTest.php rename to tests/unit/lib/Authentication/Token/RemoteWipeTest.php diff --git a/tests/lib/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDaoTest.php b/tests/unit/lib/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDaoTest.php similarity index 100% rename from tests/lib/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDaoTest.php rename to tests/unit/lib/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDaoTest.php diff --git a/tests/lib/Authentication/TwoFactorAuth/EnforcementStateTest.php b/tests/unit/lib/Authentication/TwoFactorAuth/EnforcementStateTest.php similarity index 100% rename from tests/lib/Authentication/TwoFactorAuth/EnforcementStateTest.php rename to tests/unit/lib/Authentication/TwoFactorAuth/EnforcementStateTest.php diff --git a/tests/lib/Authentication/TwoFactorAuth/ManagerTest.php b/tests/unit/lib/Authentication/TwoFactorAuth/ManagerTest.php similarity index 100% rename from tests/lib/Authentication/TwoFactorAuth/ManagerTest.php rename to tests/unit/lib/Authentication/TwoFactorAuth/ManagerTest.php diff --git a/tests/lib/Authentication/TwoFactorAuth/MandatoryTwoFactorTest.php b/tests/unit/lib/Authentication/TwoFactorAuth/MandatoryTwoFactorTest.php similarity index 100% rename from tests/lib/Authentication/TwoFactorAuth/MandatoryTwoFactorTest.php rename to tests/unit/lib/Authentication/TwoFactorAuth/MandatoryTwoFactorTest.php diff --git a/tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php b/tests/unit/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php similarity index 100% rename from tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php rename to tests/unit/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php diff --git a/tests/lib/Authentication/TwoFactorAuth/ProviderManagerTest.php b/tests/unit/lib/Authentication/TwoFactorAuth/ProviderManagerTest.php similarity index 100% rename from tests/lib/Authentication/TwoFactorAuth/ProviderManagerTest.php rename to tests/unit/lib/Authentication/TwoFactorAuth/ProviderManagerTest.php diff --git a/tests/lib/Authentication/TwoFactorAuth/ProviderSetTest.php b/tests/unit/lib/Authentication/TwoFactorAuth/ProviderSetTest.php similarity index 100% rename from tests/lib/Authentication/TwoFactorAuth/ProviderSetTest.php rename to tests/unit/lib/Authentication/TwoFactorAuth/ProviderSetTest.php diff --git a/tests/lib/Authentication/TwoFactorAuth/RegistryTest.php b/tests/unit/lib/Authentication/TwoFactorAuth/RegistryTest.php similarity index 100% rename from tests/lib/Authentication/TwoFactorAuth/RegistryTest.php rename to tests/unit/lib/Authentication/TwoFactorAuth/RegistryTest.php diff --git a/tests/lib/Avatar/AvatarManagerTest.php b/tests/unit/lib/Avatar/AvatarManagerTest.php similarity index 100% rename from tests/lib/Avatar/AvatarManagerTest.php rename to tests/unit/lib/Avatar/AvatarManagerTest.php diff --git a/tests/lib/Avatar/GuestAvatarTest.php b/tests/unit/lib/Avatar/GuestAvatarTest.php similarity index 100% rename from tests/lib/Avatar/GuestAvatarTest.php rename to tests/unit/lib/Avatar/GuestAvatarTest.php diff --git a/tests/lib/Avatar/UserAvatarTest.php b/tests/unit/lib/Avatar/UserAvatarTest.php similarity index 100% rename from tests/lib/Avatar/UserAvatarTest.php rename to tests/unit/lib/Avatar/UserAvatarTest.php diff --git a/tests/lib/BackgroundJob/DummyJob.php b/tests/unit/lib/BackgroundJob/DummyJob.php similarity index 100% rename from tests/lib/BackgroundJob/DummyJob.php rename to tests/unit/lib/BackgroundJob/DummyJob.php diff --git a/tests/lib/BackgroundJob/DummyJobList.php b/tests/unit/lib/BackgroundJob/DummyJobList.php similarity index 100% rename from tests/lib/BackgroundJob/DummyJobList.php rename to tests/unit/lib/BackgroundJob/DummyJobList.php diff --git a/tests/lib/BackgroundJob/JobClassesRegistryTest.php b/tests/unit/lib/BackgroundJob/JobClassesRegistryTest.php similarity index 100% rename from tests/lib/BackgroundJob/JobClassesRegistryTest.php rename to tests/unit/lib/BackgroundJob/JobClassesRegistryTest.php diff --git a/tests/lib/BackgroundJob/JobListTest.php b/tests/unit/lib/BackgroundJob/JobListTest.php similarity index 100% rename from tests/lib/BackgroundJob/JobListTest.php rename to tests/unit/lib/BackgroundJob/JobListTest.php diff --git a/tests/lib/BackgroundJob/JobRunsTest.php b/tests/unit/lib/BackgroundJob/JobRunsTest.php similarity index 100% rename from tests/lib/BackgroundJob/JobRunsTest.php rename to tests/unit/lib/BackgroundJob/JobRunsTest.php diff --git a/tests/lib/BackgroundJob/JobTest.php b/tests/unit/lib/BackgroundJob/JobTest.php similarity index 100% rename from tests/lib/BackgroundJob/JobTest.php rename to tests/unit/lib/BackgroundJob/JobTest.php diff --git a/tests/lib/BackgroundJob/QueuedJobTest.php b/tests/unit/lib/BackgroundJob/QueuedJobTest.php similarity index 100% rename from tests/lib/BackgroundJob/QueuedJobTest.php rename to tests/unit/lib/BackgroundJob/QueuedJobTest.php diff --git a/tests/lib/BackgroundJob/TestJob.php b/tests/unit/lib/BackgroundJob/TestJob.php similarity index 100% rename from tests/lib/BackgroundJob/TestJob.php rename to tests/unit/lib/BackgroundJob/TestJob.php diff --git a/tests/lib/BackgroundJob/TestParallelAwareJob.php b/tests/unit/lib/BackgroundJob/TestParallelAwareJob.php similarity index 100% rename from tests/lib/BackgroundJob/TestParallelAwareJob.php rename to tests/unit/lib/BackgroundJob/TestParallelAwareJob.php diff --git a/tests/lib/BackgroundJob/TestTimedJobNew.php b/tests/unit/lib/BackgroundJob/TestTimedJobNew.php similarity index 100% rename from tests/lib/BackgroundJob/TestTimedJobNew.php rename to tests/unit/lib/BackgroundJob/TestTimedJobNew.php diff --git a/tests/lib/BackgroundJob/TimedJobTest.php b/tests/unit/lib/BackgroundJob/TimedJobTest.php similarity index 100% rename from tests/lib/BackgroundJob/TimedJobTest.php rename to tests/unit/lib/BackgroundJob/TimedJobTest.php diff --git a/tests/lib/BinaryFinderTest.php b/tests/unit/lib/BinaryFinderTest.php similarity index 100% rename from tests/lib/BinaryFinderTest.php rename to tests/unit/lib/BinaryFinderTest.php diff --git a/tests/lib/Cache/CappedMemoryCacheTest.php b/tests/unit/lib/Cache/CappedMemoryCacheTest.php similarity index 100% rename from tests/lib/Cache/CappedMemoryCacheTest.php rename to tests/unit/lib/Cache/CappedMemoryCacheTest.php diff --git a/tests/lib/Cache/FileCacheTest.php b/tests/unit/lib/Cache/FileCacheTest.php similarity index 100% rename from tests/lib/Cache/FileCacheTest.php rename to tests/unit/lib/Cache/FileCacheTest.php diff --git a/tests/lib/Cache/TestCache.php b/tests/unit/lib/Cache/TestCache.php similarity index 100% rename from tests/lib/Cache/TestCache.php rename to tests/unit/lib/Cache/TestCache.php diff --git a/tests/lib/Calendar/CalendarEventBuilderTest.php b/tests/unit/lib/Calendar/CalendarEventBuilderTest.php similarity index 100% rename from tests/lib/Calendar/CalendarEventBuilderTest.php rename to tests/unit/lib/Calendar/CalendarEventBuilderTest.php diff --git a/tests/lib/Calendar/ManagerTest.php b/tests/unit/lib/Calendar/ManagerTest.php similarity index 100% rename from tests/lib/Calendar/ManagerTest.php rename to tests/unit/lib/Calendar/ManagerTest.php diff --git a/tests/lib/Calendar/Resource/ManagerTest.php b/tests/unit/lib/Calendar/Resource/ManagerTest.php similarity index 100% rename from tests/lib/Calendar/Resource/ManagerTest.php rename to tests/unit/lib/Calendar/Resource/ManagerTest.php diff --git a/tests/lib/Calendar/ResourcesRoomsUpdaterTest.php b/tests/unit/lib/Calendar/ResourcesRoomsUpdaterTest.php similarity index 100% rename from tests/lib/Calendar/ResourcesRoomsUpdaterTest.php rename to tests/unit/lib/Calendar/ResourcesRoomsUpdaterTest.php diff --git a/tests/lib/Calendar/Room/ManagerTest.php b/tests/unit/lib/Calendar/Room/ManagerTest.php similarity index 100% rename from tests/lib/Calendar/Room/ManagerTest.php rename to tests/unit/lib/Calendar/Room/ManagerTest.php diff --git a/tests/lib/CapabilitiesManagerTest.php b/tests/unit/lib/CapabilitiesManagerTest.php similarity index 100% rename from tests/lib/CapabilitiesManagerTest.php rename to tests/unit/lib/CapabilitiesManagerTest.php diff --git a/tests/lib/Collaboration/Collaborators/GroupPluginTest.php b/tests/unit/lib/Collaboration/Collaborators/GroupPluginTest.php similarity index 100% rename from tests/lib/Collaboration/Collaborators/GroupPluginTest.php rename to tests/unit/lib/Collaboration/Collaborators/GroupPluginTest.php diff --git a/tests/lib/Collaboration/Collaborators/LookupPluginTest.php b/tests/unit/lib/Collaboration/Collaborators/LookupPluginTest.php similarity index 100% rename from tests/lib/Collaboration/Collaborators/LookupPluginTest.php rename to tests/unit/lib/Collaboration/Collaborators/LookupPluginTest.php diff --git a/tests/lib/Collaboration/Collaborators/MailPluginTest.php b/tests/unit/lib/Collaboration/Collaborators/MailPluginTest.php similarity index 100% rename from tests/lib/Collaboration/Collaborators/MailPluginTest.php rename to tests/unit/lib/Collaboration/Collaborators/MailPluginTest.php diff --git a/tests/lib/Collaboration/Collaborators/RemotePluginTest.php b/tests/unit/lib/Collaboration/Collaborators/RemotePluginTest.php similarity index 100% rename from tests/lib/Collaboration/Collaborators/RemotePluginTest.php rename to tests/unit/lib/Collaboration/Collaborators/RemotePluginTest.php diff --git a/tests/lib/Collaboration/Collaborators/SearchResultTest.php b/tests/unit/lib/Collaboration/Collaborators/SearchResultTest.php similarity index 100% rename from tests/lib/Collaboration/Collaborators/SearchResultTest.php rename to tests/unit/lib/Collaboration/Collaborators/SearchResultTest.php diff --git a/tests/lib/Collaboration/Collaborators/SearchTest.php b/tests/unit/lib/Collaboration/Collaborators/SearchTest.php similarity index 100% rename from tests/lib/Collaboration/Collaborators/SearchTest.php rename to tests/unit/lib/Collaboration/Collaborators/SearchTest.php diff --git a/tests/lib/Collaboration/Resources/ProviderManagerTest.php b/tests/unit/lib/Collaboration/Resources/ProviderManagerTest.php similarity index 100% rename from tests/lib/Collaboration/Resources/ProviderManagerTest.php rename to tests/unit/lib/Collaboration/Resources/ProviderManagerTest.php diff --git a/tests/lib/Command/AsyncBusTestCase.php b/tests/unit/lib/Command/AsyncBusTestCase.php similarity index 100% rename from tests/lib/Command/AsyncBusTestCase.php rename to tests/unit/lib/Command/AsyncBusTestCase.php diff --git a/tests/lib/Command/BackgroundModeTest.php b/tests/unit/lib/Command/BackgroundModeTest.php similarity index 100% rename from tests/lib/Command/BackgroundModeTest.php rename to tests/unit/lib/Command/BackgroundModeTest.php diff --git a/tests/lib/Command/CronBusTest.php b/tests/unit/lib/Command/CronBusTest.php similarity index 100% rename from tests/lib/Command/CronBusTest.php rename to tests/unit/lib/Command/CronBusTest.php diff --git a/tests/lib/Command/Integrity/SignAppTest.php b/tests/unit/lib/Command/Integrity/SignAppTest.php similarity index 100% rename from tests/lib/Command/Integrity/SignAppTest.php rename to tests/unit/lib/Command/Integrity/SignAppTest.php diff --git a/tests/lib/Command/Integrity/SignCoreTest.php b/tests/unit/lib/Command/Integrity/SignCoreTest.php similarity index 100% rename from tests/lib/Command/Integrity/SignCoreTest.php rename to tests/unit/lib/Command/Integrity/SignCoreTest.php diff --git a/tests/lib/Comments/CommentTest.php b/tests/unit/lib/Comments/CommentTest.php similarity index 100% rename from tests/lib/Comments/CommentTest.php rename to tests/unit/lib/Comments/CommentTest.php diff --git a/tests/lib/Comments/FakeFactory.php b/tests/unit/lib/Comments/FakeFactory.php similarity index 100% rename from tests/lib/Comments/FakeFactory.php rename to tests/unit/lib/Comments/FakeFactory.php diff --git a/tests/lib/Comments/FakeManager.php b/tests/unit/lib/Comments/FakeManager.php similarity index 100% rename from tests/lib/Comments/FakeManager.php rename to tests/unit/lib/Comments/FakeManager.php diff --git a/tests/lib/Comments/ManagerTest.php b/tests/unit/lib/Comments/ManagerTest.php similarity index 100% rename from tests/lib/Comments/ManagerTest.php rename to tests/unit/lib/Comments/ManagerTest.php diff --git a/tests/lib/Config/LexiconTest.php b/tests/unit/lib/Config/LexiconTest.php similarity index 100% rename from tests/lib/Config/LexiconTest.php rename to tests/unit/lib/Config/LexiconTest.php diff --git a/tests/lib/Config/TestConfigLexicon_I.php b/tests/unit/lib/Config/TestConfigLexicon_I.php similarity index 100% rename from tests/lib/Config/TestConfigLexicon_I.php rename to tests/unit/lib/Config/TestConfigLexicon_I.php diff --git a/tests/lib/Config/TestLexicon_E.php b/tests/unit/lib/Config/TestLexicon_E.php similarity index 100% rename from tests/lib/Config/TestLexicon_E.php rename to tests/unit/lib/Config/TestLexicon_E.php diff --git a/tests/lib/Config/TestLexicon_N.php b/tests/unit/lib/Config/TestLexicon_N.php similarity index 100% rename from tests/lib/Config/TestLexicon_N.php rename to tests/unit/lib/Config/TestLexicon_N.php diff --git a/tests/lib/Config/TestLexicon_UserIndexed.php b/tests/unit/lib/Config/TestLexicon_UserIndexed.php similarity index 100% rename from tests/lib/Config/TestLexicon_UserIndexed.php rename to tests/unit/lib/Config/TestLexicon_UserIndexed.php diff --git a/tests/lib/Config/TestLexicon_UserIndexedRemove.php b/tests/unit/lib/Config/TestLexicon_UserIndexedRemove.php similarity index 100% rename from tests/lib/Config/TestLexicon_UserIndexedRemove.php rename to tests/unit/lib/Config/TestLexicon_UserIndexedRemove.php diff --git a/tests/lib/Config/TestLexicon_W.php b/tests/unit/lib/Config/TestLexicon_W.php similarity index 100% rename from tests/lib/Config/TestLexicon_W.php rename to tests/unit/lib/Config/TestLexicon_W.php diff --git a/tests/lib/Config/UserConfigMigrationFallbackTest.php b/tests/unit/lib/Config/UserConfigMigrationFallbackTest.php similarity index 100% rename from tests/lib/Config/UserConfigMigrationFallbackTest.php rename to tests/unit/lib/Config/UserConfigMigrationFallbackTest.php diff --git a/tests/lib/Config/UserConfigTest.php b/tests/unit/lib/Config/UserConfigTest.php similarity index 100% rename from tests/lib/Config/UserConfigTest.php rename to tests/unit/lib/Config/UserConfigTest.php diff --git a/tests/lib/ConfigTest.php b/tests/unit/lib/ConfigTest.php similarity index 100% rename from tests/lib/ConfigTest.php rename to tests/unit/lib/ConfigTest.php diff --git a/tests/lib/Contacts/ContactsMenu/ActionFactoryTest.php b/tests/unit/lib/Contacts/ContactsMenu/ActionFactoryTest.php similarity index 100% rename from tests/lib/Contacts/ContactsMenu/ActionFactoryTest.php rename to tests/unit/lib/Contacts/ContactsMenu/ActionFactoryTest.php diff --git a/tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php b/tests/unit/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php similarity index 100% rename from tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php rename to tests/unit/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php diff --git a/tests/lib/Contacts/ContactsMenu/Actions/LinkActionTest.php b/tests/unit/lib/Contacts/ContactsMenu/Actions/LinkActionTest.php similarity index 100% rename from tests/lib/Contacts/ContactsMenu/Actions/LinkActionTest.php rename to tests/unit/lib/Contacts/ContactsMenu/Actions/LinkActionTest.php diff --git a/tests/lib/Contacts/ContactsMenu/ContactsStoreTest.php b/tests/unit/lib/Contacts/ContactsMenu/ContactsStoreTest.php similarity index 100% rename from tests/lib/Contacts/ContactsMenu/ContactsStoreTest.php rename to tests/unit/lib/Contacts/ContactsMenu/ContactsStoreTest.php diff --git a/tests/lib/Contacts/ContactsMenu/EntryTest.php b/tests/unit/lib/Contacts/ContactsMenu/EntryTest.php similarity index 100% rename from tests/lib/Contacts/ContactsMenu/EntryTest.php rename to tests/unit/lib/Contacts/ContactsMenu/EntryTest.php diff --git a/tests/lib/Contacts/ContactsMenu/ManagerTest.php b/tests/unit/lib/Contacts/ContactsMenu/ManagerTest.php similarity index 100% rename from tests/lib/Contacts/ContactsMenu/ManagerTest.php rename to tests/unit/lib/Contacts/ContactsMenu/ManagerTest.php diff --git a/tests/lib/Contacts/ContactsMenu/Providers/EMailproviderTest.php b/tests/unit/lib/Contacts/ContactsMenu/Providers/EMailproviderTest.php similarity index 100% rename from tests/lib/Contacts/ContactsMenu/Providers/EMailproviderTest.php rename to tests/unit/lib/Contacts/ContactsMenu/Providers/EMailproviderTest.php diff --git a/tests/lib/Contacts/ContactsMenu/Providers/LocalTimeProviderTest.php b/tests/unit/lib/Contacts/ContactsMenu/Providers/LocalTimeProviderTest.php similarity index 100% rename from tests/lib/Contacts/ContactsMenu/Providers/LocalTimeProviderTest.php rename to tests/unit/lib/Contacts/ContactsMenu/Providers/LocalTimeProviderTest.php diff --git a/tests/lib/ContactsManagerTest.php b/tests/unit/lib/ContactsManagerTest.php similarity index 100% rename from tests/lib/ContactsManagerTest.php rename to tests/unit/lib/ContactsManagerTest.php diff --git a/tests/lib/DB/AdapterTest.php b/tests/unit/lib/DB/AdapterTest.php similarity index 100% rename from tests/lib/DB/AdapterTest.php rename to tests/unit/lib/DB/AdapterTest.php diff --git a/tests/lib/DB/ConnectionFactoryTest.php b/tests/unit/lib/DB/ConnectionFactoryTest.php similarity index 100% rename from tests/lib/DB/ConnectionFactoryTest.php rename to tests/unit/lib/DB/ConnectionFactoryTest.php diff --git a/tests/lib/DB/ConnectionTest.php b/tests/unit/lib/DB/ConnectionTest.php similarity index 100% rename from tests/lib/DB/ConnectionTest.php rename to tests/unit/lib/DB/ConnectionTest.php diff --git a/tests/lib/DB/Exception/DbalExceptionTest.php b/tests/unit/lib/DB/Exception/DbalExceptionTest.php similarity index 100% rename from tests/lib/DB/Exception/DbalExceptionTest.php rename to tests/unit/lib/DB/Exception/DbalExceptionTest.php diff --git a/tests/lib/DB/Middleware/UtcTimezoneMiddlewareDriverTest.php b/tests/unit/lib/DB/Middleware/UtcTimezoneMiddlewareDriverTest.php similarity index 100% rename from tests/lib/DB/Middleware/UtcTimezoneMiddlewareDriverTest.php rename to tests/unit/lib/DB/Middleware/UtcTimezoneMiddlewareDriverTest.php diff --git a/tests/lib/DB/Middleware/UtcTimezoneMiddlewareTest.php b/tests/unit/lib/DB/Middleware/UtcTimezoneMiddlewareTest.php similarity index 100% rename from tests/lib/DB/Middleware/UtcTimezoneMiddlewareTest.php rename to tests/unit/lib/DB/Middleware/UtcTimezoneMiddlewareTest.php diff --git a/tests/lib/DB/MigrationServiceTest.php b/tests/unit/lib/DB/MigrationServiceTest.php similarity index 100% rename from tests/lib/DB/MigrationServiceTest.php rename to tests/unit/lib/DB/MigrationServiceTest.php diff --git a/tests/lib/DB/MigratorTest.php b/tests/unit/lib/DB/MigratorTest.php similarity index 100% rename from tests/lib/DB/MigratorTest.php rename to tests/unit/lib/DB/MigratorTest.php diff --git a/tests/lib/DB/OCPostgreSqlPlatformTest.php b/tests/unit/lib/DB/OCPostgreSqlPlatformTest.php similarity index 100% rename from tests/lib/DB/OCPostgreSqlPlatformTest.php rename to tests/unit/lib/DB/OCPostgreSqlPlatformTest.php diff --git a/tests/lib/DB/QueryBuilder/ExpressionBuilderDBTest.php b/tests/unit/lib/DB/QueryBuilder/ExpressionBuilderDBTest.php similarity index 100% rename from tests/lib/DB/QueryBuilder/ExpressionBuilderDBTest.php rename to tests/unit/lib/DB/QueryBuilder/ExpressionBuilderDBTest.php diff --git a/tests/lib/DB/QueryBuilder/ExpressionBuilderTest.php b/tests/unit/lib/DB/QueryBuilder/ExpressionBuilderTest.php similarity index 100% rename from tests/lib/DB/QueryBuilder/ExpressionBuilderTest.php rename to tests/unit/lib/DB/QueryBuilder/ExpressionBuilderTest.php diff --git a/tests/lib/DB/QueryBuilder/FunctionBuilderTest.php b/tests/unit/lib/DB/QueryBuilder/FunctionBuilderTest.php similarity index 100% rename from tests/lib/DB/QueryBuilder/FunctionBuilderTest.php rename to tests/unit/lib/DB/QueryBuilder/FunctionBuilderTest.php diff --git a/tests/lib/DB/QueryBuilder/Partitioned/JoinConditionTest.php b/tests/unit/lib/DB/QueryBuilder/Partitioned/JoinConditionTest.php similarity index 100% rename from tests/lib/DB/QueryBuilder/Partitioned/JoinConditionTest.php rename to tests/unit/lib/DB/QueryBuilder/Partitioned/JoinConditionTest.php diff --git a/tests/lib/DB/QueryBuilder/Partitioned/PartitionedQueryBuilderTest.php b/tests/unit/lib/DB/QueryBuilder/Partitioned/PartitionedQueryBuilderTest.php similarity index 100% rename from tests/lib/DB/QueryBuilder/Partitioned/PartitionedQueryBuilderTest.php rename to tests/unit/lib/DB/QueryBuilder/Partitioned/PartitionedQueryBuilderTest.php diff --git a/tests/lib/DB/QueryBuilder/QueryBuilderTest.php b/tests/unit/lib/DB/QueryBuilder/QueryBuilderTest.php similarity index 100% rename from tests/lib/DB/QueryBuilder/QueryBuilderTest.php rename to tests/unit/lib/DB/QueryBuilder/QueryBuilderTest.php diff --git a/tests/lib/DB/QueryBuilder/QuoteHelperTest.php b/tests/unit/lib/DB/QueryBuilder/QuoteHelperTest.php similarity index 100% rename from tests/lib/DB/QueryBuilder/QuoteHelperTest.php rename to tests/unit/lib/DB/QueryBuilder/QuoteHelperTest.php diff --git a/tests/lib/DB/QueryBuilder/Sharded/SharedQueryBuilderTest.php b/tests/unit/lib/DB/QueryBuilder/Sharded/SharedQueryBuilderTest.php similarity index 100% rename from tests/lib/DB/QueryBuilder/Sharded/SharedQueryBuilderTest.php rename to tests/unit/lib/DB/QueryBuilder/Sharded/SharedQueryBuilderTest.php diff --git a/tests/lib/DateTimeFormatterTest.php b/tests/unit/lib/DateTimeFormatterTest.php similarity index 100% rename from tests/lib/DateTimeFormatterTest.php rename to tests/unit/lib/DateTimeFormatterTest.php diff --git a/tests/lib/Diagnostics/EventLoggerTest.php b/tests/unit/lib/Diagnostics/EventLoggerTest.php similarity index 100% rename from tests/lib/Diagnostics/EventLoggerTest.php rename to tests/unit/lib/Diagnostics/EventLoggerTest.php diff --git a/tests/lib/Diagnostics/QueryLoggerTest.php b/tests/unit/lib/Diagnostics/QueryLoggerTest.php similarity index 100% rename from tests/lib/Diagnostics/QueryLoggerTest.php rename to tests/unit/lib/Diagnostics/QueryLoggerTest.php diff --git a/tests/lib/DirectEditing/ManagerTest.php b/tests/unit/lib/DirectEditing/ManagerTest.php similarity index 100% rename from tests/lib/DirectEditing/ManagerTest.php rename to tests/unit/lib/DirectEditing/ManagerTest.php diff --git a/tests/lib/EmojiHelperTest.php b/tests/unit/lib/EmojiHelperTest.php similarity index 100% rename from tests/lib/EmojiHelperTest.php rename to tests/unit/lib/EmojiHelperTest.php diff --git a/tests/lib/Encryption/DecryptAllTest.php b/tests/unit/lib/Encryption/DecryptAllTest.php similarity index 100% rename from tests/lib/Encryption/DecryptAllTest.php rename to tests/unit/lib/Encryption/DecryptAllTest.php diff --git a/tests/lib/Encryption/EncryptionWrapperTest.php b/tests/unit/lib/Encryption/EncryptionWrapperTest.php similarity index 100% rename from tests/lib/Encryption/EncryptionWrapperTest.php rename to tests/unit/lib/Encryption/EncryptionWrapperTest.php diff --git a/tests/lib/Encryption/Keys/StorageTest.php b/tests/unit/lib/Encryption/Keys/StorageTest.php similarity index 100% rename from tests/lib/Encryption/Keys/StorageTest.php rename to tests/unit/lib/Encryption/Keys/StorageTest.php diff --git a/tests/lib/Encryption/ManagerTest.php b/tests/unit/lib/Encryption/ManagerTest.php similarity index 100% rename from tests/lib/Encryption/ManagerTest.php rename to tests/unit/lib/Encryption/ManagerTest.php diff --git a/tests/lib/Encryption/UpdateTest.php b/tests/unit/lib/Encryption/UpdateTest.php similarity index 100% rename from tests/lib/Encryption/UpdateTest.php rename to tests/unit/lib/Encryption/UpdateTest.php diff --git a/tests/lib/Encryption/UtilTest.php b/tests/unit/lib/Encryption/UtilTest.php similarity index 100% rename from tests/lib/Encryption/UtilTest.php rename to tests/unit/lib/Encryption/UtilTest.php diff --git a/tests/lib/ErrorHandlerTest.php b/tests/unit/lib/ErrorHandlerTest.php similarity index 100% rename from tests/lib/ErrorHandlerTest.php rename to tests/unit/lib/ErrorHandlerTest.php diff --git a/tests/lib/EventSourceFactoryTest.php b/tests/unit/lib/EventSourceFactoryTest.php similarity index 100% rename from tests/lib/EventSourceFactoryTest.php rename to tests/unit/lib/EventSourceFactoryTest.php diff --git a/tests/lib/Federation/CloudIdManagerTest.php b/tests/unit/lib/Federation/CloudIdManagerTest.php similarity index 100% rename from tests/lib/Federation/CloudIdManagerTest.php rename to tests/unit/lib/Federation/CloudIdManagerTest.php diff --git a/tests/lib/Federation/CloudIdTest.php b/tests/unit/lib/Federation/CloudIdTest.php similarity index 100% rename from tests/lib/Federation/CloudIdTest.php rename to tests/unit/lib/Federation/CloudIdTest.php diff --git a/tests/lib/Files/AppData/AppDataTest.php b/tests/unit/lib/Files/AppData/AppDataTest.php similarity index 100% rename from tests/lib/Files/AppData/AppDataTest.php rename to tests/unit/lib/Files/AppData/AppDataTest.php diff --git a/tests/lib/Files/AppData/FactoryTest.php b/tests/unit/lib/Files/AppData/FactoryTest.php similarity index 100% rename from tests/lib/Files/AppData/FactoryTest.php rename to tests/unit/lib/Files/AppData/FactoryTest.php diff --git a/tests/lib/Files/Cache/CacheTest.php b/tests/unit/lib/Files/Cache/CacheTest.php similarity index 100% rename from tests/lib/Files/Cache/CacheTest.php rename to tests/unit/lib/Files/Cache/CacheTest.php diff --git a/tests/lib/Files/Cache/FileAccessTest.php b/tests/unit/lib/Files/Cache/FileAccessTest.php similarity index 100% rename from tests/lib/Files/Cache/FileAccessTest.php rename to tests/unit/lib/Files/Cache/FileAccessTest.php diff --git a/tests/lib/Files/Cache/HomeCacheTest.php b/tests/unit/lib/Files/Cache/HomeCacheTest.php similarity index 100% rename from tests/lib/Files/Cache/HomeCacheTest.php rename to tests/unit/lib/Files/Cache/HomeCacheTest.php diff --git a/tests/lib/Files/Cache/LocalRootScannerTest.php b/tests/unit/lib/Files/Cache/LocalRootScannerTest.php similarity index 100% rename from tests/lib/Files/Cache/LocalRootScannerTest.php rename to tests/unit/lib/Files/Cache/LocalRootScannerTest.php diff --git a/tests/lib/Files/Cache/MoveFromCacheTraitTest.php b/tests/unit/lib/Files/Cache/MoveFromCacheTraitTest.php similarity index 100% rename from tests/lib/Files/Cache/MoveFromCacheTraitTest.php rename to tests/unit/lib/Files/Cache/MoveFromCacheTraitTest.php diff --git a/tests/lib/Files/Cache/PropagatorTest.php b/tests/unit/lib/Files/Cache/PropagatorTest.php similarity index 100% rename from tests/lib/Files/Cache/PropagatorTest.php rename to tests/unit/lib/Files/Cache/PropagatorTest.php diff --git a/tests/lib/Files/Cache/ScannerTest.php b/tests/unit/lib/Files/Cache/ScannerTest.php similarity index 100% rename from tests/lib/Files/Cache/ScannerTest.php rename to tests/unit/lib/Files/Cache/ScannerTest.php diff --git a/tests/lib/Files/Cache/SearchBuilderTest.php b/tests/unit/lib/Files/Cache/SearchBuilderTest.php similarity index 100% rename from tests/lib/Files/Cache/SearchBuilderTest.php rename to tests/unit/lib/Files/Cache/SearchBuilderTest.php diff --git a/tests/lib/Files/Cache/UpdaterLegacyTest.php b/tests/unit/lib/Files/Cache/UpdaterLegacyTest.php similarity index 100% rename from tests/lib/Files/Cache/UpdaterLegacyTest.php rename to tests/unit/lib/Files/Cache/UpdaterLegacyTest.php diff --git a/tests/lib/Files/Cache/UpdaterTest.php b/tests/unit/lib/Files/Cache/UpdaterTest.php similarity index 100% rename from tests/lib/Files/Cache/UpdaterTest.php rename to tests/unit/lib/Files/Cache/UpdaterTest.php diff --git a/tests/lib/Files/Cache/WatcherTest.php b/tests/unit/lib/Files/Cache/WatcherTest.php similarity index 100% rename from tests/lib/Files/Cache/WatcherTest.php rename to tests/unit/lib/Files/Cache/WatcherTest.php diff --git a/tests/lib/Files/Cache/Wrapper/CacheJailTest.php b/tests/unit/lib/Files/Cache/Wrapper/CacheJailTest.php similarity index 100% rename from tests/lib/Files/Cache/Wrapper/CacheJailTest.php rename to tests/unit/lib/Files/Cache/Wrapper/CacheJailTest.php diff --git a/tests/lib/Files/Cache/Wrapper/CachePermissionsMaskTest.php b/tests/unit/lib/Files/Cache/Wrapper/CachePermissionsMaskTest.php similarity index 100% rename from tests/lib/Files/Cache/Wrapper/CachePermissionsMaskTest.php rename to tests/unit/lib/Files/Cache/Wrapper/CachePermissionsMaskTest.php diff --git a/tests/lib/Files/Config/UserMountCacheTest.php b/tests/unit/lib/Files/Config/UserMountCacheTest.php similarity index 100% rename from tests/lib/Files/Config/UserMountCacheTest.php rename to tests/unit/lib/Files/Config/UserMountCacheTest.php diff --git a/tests/lib/Files/EtagTest.php b/tests/unit/lib/Files/EtagTest.php similarity index 100% rename from tests/lib/Files/EtagTest.php rename to tests/unit/lib/Files/EtagTest.php diff --git a/tests/lib/Files/FileInfoTest.php b/tests/unit/lib/Files/FileInfoTest.php similarity index 100% rename from tests/lib/Files/FileInfoTest.php rename to tests/unit/lib/Files/FileInfoTest.php diff --git a/tests/lib/Files/FilenameValidatorTest.php b/tests/unit/lib/Files/FilenameValidatorTest.php similarity index 100% rename from tests/lib/Files/FilenameValidatorTest.php rename to tests/unit/lib/Files/FilenameValidatorTest.php diff --git a/tests/lib/Files/FilesystemTest.php b/tests/unit/lib/Files/FilesystemTest.php similarity index 100% rename from tests/lib/Files/FilesystemTest.php rename to tests/unit/lib/Files/FilesystemTest.php diff --git a/tests/lib/Files/Mount/CacheMountProviderTest.php b/tests/unit/lib/Files/Mount/CacheMountProviderTest.php similarity index 100% rename from tests/lib/Files/Mount/CacheMountProviderTest.php rename to tests/unit/lib/Files/Mount/CacheMountProviderTest.php diff --git a/tests/lib/Files/Mount/ManagerTest.php b/tests/unit/lib/Files/Mount/ManagerTest.php similarity index 100% rename from tests/lib/Files/Mount/ManagerTest.php rename to tests/unit/lib/Files/Mount/ManagerTest.php diff --git a/tests/lib/Files/Mount/MountPointTest.php b/tests/unit/lib/Files/Mount/MountPointTest.php similarity index 100% rename from tests/lib/Files/Mount/MountPointTest.php rename to tests/unit/lib/Files/Mount/MountPointTest.php diff --git a/tests/lib/Files/Mount/MountTest.php b/tests/unit/lib/Files/Mount/MountTest.php similarity index 100% rename from tests/lib/Files/Mount/MountTest.php rename to tests/unit/lib/Files/Mount/MountTest.php diff --git a/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php b/tests/unit/lib/Files/Mount/ObjectHomeMountProviderTest.php similarity index 100% rename from tests/lib/Files/Mount/ObjectHomeMountProviderTest.php rename to tests/unit/lib/Files/Mount/ObjectHomeMountProviderTest.php diff --git a/tests/lib/Files/Mount/RootMountProviderTest.php b/tests/unit/lib/Files/Mount/RootMountProviderTest.php similarity index 100% rename from tests/lib/Files/Mount/RootMountProviderTest.php rename to tests/unit/lib/Files/Mount/RootMountProviderTest.php diff --git a/tests/lib/Files/Node/FileTest.php b/tests/unit/lib/Files/Node/FileTest.php similarity index 100% rename from tests/lib/Files/Node/FileTest.php rename to tests/unit/lib/Files/Node/FileTest.php diff --git a/tests/lib/Files/Node/FolderTest.php b/tests/unit/lib/Files/Node/FolderTest.php similarity index 100% rename from tests/lib/Files/Node/FolderTest.php rename to tests/unit/lib/Files/Node/FolderTest.php diff --git a/tests/lib/Files/Node/HookConnectorTest.php b/tests/unit/lib/Files/Node/HookConnectorTest.php similarity index 100% rename from tests/lib/Files/Node/HookConnectorTest.php rename to tests/unit/lib/Files/Node/HookConnectorTest.php diff --git a/tests/lib/Files/Node/IntegrationTest.php b/tests/unit/lib/Files/Node/IntegrationTest.php similarity index 100% rename from tests/lib/Files/Node/IntegrationTest.php rename to tests/unit/lib/Files/Node/IntegrationTest.php diff --git a/tests/lib/Files/Node/NodeTestCase.php b/tests/unit/lib/Files/Node/NodeTestCase.php similarity index 100% rename from tests/lib/Files/Node/NodeTestCase.php rename to tests/unit/lib/Files/Node/NodeTestCase.php diff --git a/tests/lib/Files/Node/RootTest.php b/tests/unit/lib/Files/Node/RootTest.php similarity index 100% rename from tests/lib/Files/Node/RootTest.php rename to tests/unit/lib/Files/Node/RootTest.php diff --git a/tests/lib/Files/ObjectStore/AzureTest.php b/tests/unit/lib/Files/ObjectStore/AzureTest.php similarity index 100% rename from tests/lib/Files/ObjectStore/AzureTest.php rename to tests/unit/lib/Files/ObjectStore/AzureTest.php diff --git a/tests/lib/Files/ObjectStore/FailDeleteObjectStore.php b/tests/unit/lib/Files/ObjectStore/FailDeleteObjectStore.php similarity index 100% rename from tests/lib/Files/ObjectStore/FailDeleteObjectStore.php rename to tests/unit/lib/Files/ObjectStore/FailDeleteObjectStore.php diff --git a/tests/lib/Files/ObjectStore/FailWriteObjectStore.php b/tests/unit/lib/Files/ObjectStore/FailWriteObjectStore.php similarity index 100% rename from tests/lib/Files/ObjectStore/FailWriteObjectStore.php rename to tests/unit/lib/Files/ObjectStore/FailWriteObjectStore.php diff --git a/tests/lib/Files/ObjectStore/LocalTest.php b/tests/unit/lib/Files/ObjectStore/LocalTest.php similarity index 100% rename from tests/lib/Files/ObjectStore/LocalTest.php rename to tests/unit/lib/Files/ObjectStore/LocalTest.php diff --git a/tests/lib/Files/ObjectStore/MapperTest.php b/tests/unit/lib/Files/ObjectStore/MapperTest.php similarity index 100% rename from tests/lib/Files/ObjectStore/MapperTest.php rename to tests/unit/lib/Files/ObjectStore/MapperTest.php diff --git a/tests/lib/Files/ObjectStore/ObjectStoreScannerTest.php b/tests/unit/lib/Files/ObjectStore/ObjectStoreScannerTest.php similarity index 100% rename from tests/lib/Files/ObjectStore/ObjectStoreScannerTest.php rename to tests/unit/lib/Files/ObjectStore/ObjectStoreScannerTest.php diff --git a/tests/lib/Files/ObjectStore/ObjectStoreStorageOverwrite.php b/tests/unit/lib/Files/ObjectStore/ObjectStoreStorageOverwrite.php similarity index 100% rename from tests/lib/Files/ObjectStore/ObjectStoreStorageOverwrite.php rename to tests/unit/lib/Files/ObjectStore/ObjectStoreStorageOverwrite.php diff --git a/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php b/tests/unit/lib/Files/ObjectStore/ObjectStoreStorageTest.php similarity index 100% rename from tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php rename to tests/unit/lib/Files/ObjectStore/ObjectStoreStorageTest.php diff --git a/tests/lib/Files/ObjectStore/ObjectStoreStoragesDifferentBucketTest.php b/tests/unit/lib/Files/ObjectStore/ObjectStoreStoragesDifferentBucketTest.php similarity index 100% rename from tests/lib/Files/ObjectStore/ObjectStoreStoragesDifferentBucketTest.php rename to tests/unit/lib/Files/ObjectStore/ObjectStoreStoragesDifferentBucketTest.php diff --git a/tests/lib/Files/ObjectStore/ObjectStoreStoragesSameBucketTest.php b/tests/unit/lib/Files/ObjectStore/ObjectStoreStoragesSameBucketTest.php similarity index 100% rename from tests/lib/Files/ObjectStore/ObjectStoreStoragesSameBucketTest.php rename to tests/unit/lib/Files/ObjectStore/ObjectStoreStoragesSameBucketTest.php diff --git a/tests/lib/Files/ObjectStore/ObjectStoreTestCase.php b/tests/unit/lib/Files/ObjectStore/ObjectStoreTestCase.php similarity index 100% rename from tests/lib/Files/ObjectStore/ObjectStoreTestCase.php rename to tests/unit/lib/Files/ObjectStore/ObjectStoreTestCase.php diff --git a/tests/lib/Files/ObjectStore/PrimaryObjectStoreConfigTest.php b/tests/unit/lib/Files/ObjectStore/PrimaryObjectStoreConfigTest.php similarity index 100% rename from tests/lib/Files/ObjectStore/PrimaryObjectStoreConfigTest.php rename to tests/unit/lib/Files/ObjectStore/PrimaryObjectStoreConfigTest.php diff --git a/tests/lib/Files/ObjectStore/S3ContentMd5MiddlewareTest.php b/tests/unit/lib/Files/ObjectStore/S3ContentMd5MiddlewareTest.php similarity index 100% rename from tests/lib/Files/ObjectStore/S3ContentMd5MiddlewareTest.php rename to tests/unit/lib/Files/ObjectStore/S3ContentMd5MiddlewareTest.php diff --git a/tests/lib/Files/ObjectStore/S3SSEKMSTest.php b/tests/unit/lib/Files/ObjectStore/S3SSEKMSTest.php similarity index 100% rename from tests/lib/Files/ObjectStore/S3SSEKMSTest.php rename to tests/unit/lib/Files/ObjectStore/S3SSEKMSTest.php diff --git a/tests/lib/Files/ObjectStore/S3Test.php b/tests/unit/lib/Files/ObjectStore/S3Test.php similarity index 100% rename from tests/lib/Files/ObjectStore/S3Test.php rename to tests/unit/lib/Files/ObjectStore/S3Test.php diff --git a/tests/lib/Files/ObjectStore/SwiftTest.php b/tests/unit/lib/Files/ObjectStore/SwiftTest.php similarity index 100% rename from tests/lib/Files/ObjectStore/SwiftTest.php rename to tests/unit/lib/Files/ObjectStore/SwiftTest.php diff --git a/tests/lib/Files/PathVerificationTest.php b/tests/unit/lib/Files/PathVerificationTest.php similarity index 100% rename from tests/lib/Files/PathVerificationTest.php rename to tests/unit/lib/Files/PathVerificationTest.php diff --git a/tests/lib/Files/Search/QueryOptimizer/CombinedTests.php b/tests/unit/lib/Files/Search/QueryOptimizer/CombinedTests.php similarity index 100% rename from tests/lib/Files/Search/QueryOptimizer/CombinedTests.php rename to tests/unit/lib/Files/Search/QueryOptimizer/CombinedTests.php diff --git a/tests/lib/Files/Search/QueryOptimizer/FlattenNestedBoolTest.php b/tests/unit/lib/Files/Search/QueryOptimizer/FlattenNestedBoolTest.php similarity index 100% rename from tests/lib/Files/Search/QueryOptimizer/FlattenNestedBoolTest.php rename to tests/unit/lib/Files/Search/QueryOptimizer/FlattenNestedBoolTest.php diff --git a/tests/lib/Files/Search/QueryOptimizer/MergeDistributiveOperationsTest.php b/tests/unit/lib/Files/Search/QueryOptimizer/MergeDistributiveOperationsTest.php similarity index 100% rename from tests/lib/Files/Search/QueryOptimizer/MergeDistributiveOperationsTest.php rename to tests/unit/lib/Files/Search/QueryOptimizer/MergeDistributiveOperationsTest.php diff --git a/tests/lib/Files/Search/QueryOptimizer/OrEqualsToInTest.php b/tests/unit/lib/Files/Search/QueryOptimizer/OrEqualsToInTest.php similarity index 100% rename from tests/lib/Files/Search/QueryOptimizer/OrEqualsToInTest.php rename to tests/unit/lib/Files/Search/QueryOptimizer/OrEqualsToInTest.php diff --git a/tests/lib/Files/Search/SearchIntegrationTest.php b/tests/unit/lib/Files/Search/SearchIntegrationTest.php similarity index 100% rename from tests/lib/Files/Search/SearchIntegrationTest.php rename to tests/unit/lib/Files/Search/SearchIntegrationTest.php diff --git a/tests/lib/Files/SetupManagerTest.php b/tests/unit/lib/Files/SetupManagerTest.php similarity index 100% rename from tests/lib/Files/SetupManagerTest.php rename to tests/unit/lib/Files/SetupManagerTest.php diff --git a/tests/lib/Files/SimpleFS/InMemoryFileTest.php b/tests/unit/lib/Files/SimpleFS/InMemoryFileTest.php similarity index 100% rename from tests/lib/Files/SimpleFS/InMemoryFileTest.php rename to tests/unit/lib/Files/SimpleFS/InMemoryFileTest.php diff --git a/tests/lib/Files/SimpleFS/SimpleFileTest.php b/tests/unit/lib/Files/SimpleFS/SimpleFileTest.php similarity index 100% rename from tests/lib/Files/SimpleFS/SimpleFileTest.php rename to tests/unit/lib/Files/SimpleFS/SimpleFileTest.php diff --git a/tests/lib/Files/SimpleFS/SimpleFolderTest.php b/tests/unit/lib/Files/SimpleFS/SimpleFolderTest.php similarity index 100% rename from tests/lib/Files/SimpleFS/SimpleFolderTest.php rename to tests/unit/lib/Files/SimpleFS/SimpleFolderTest.php diff --git a/tests/lib/Files/Storage/CommonTest.php b/tests/unit/lib/Files/Storage/CommonTest.php similarity index 100% rename from tests/lib/Files/Storage/CommonTest.php rename to tests/unit/lib/Files/Storage/CommonTest.php diff --git a/tests/lib/Files/Storage/CopyDirectoryTest.php b/tests/unit/lib/Files/Storage/CopyDirectoryTest.php similarity index 100% rename from tests/lib/Files/Storage/CopyDirectoryTest.php rename to tests/unit/lib/Files/Storage/CopyDirectoryTest.php diff --git a/tests/lib/Files/Storage/HomeTest.php b/tests/unit/lib/Files/Storage/HomeTest.php similarity index 100% rename from tests/lib/Files/Storage/HomeTest.php rename to tests/unit/lib/Files/Storage/HomeTest.php diff --git a/tests/lib/Files/Storage/LocalTest.php b/tests/unit/lib/Files/Storage/LocalTest.php similarity index 100% rename from tests/lib/Files/Storage/LocalTest.php rename to tests/unit/lib/Files/Storage/LocalTest.php diff --git a/tests/lib/Files/Storage/Storage.php b/tests/unit/lib/Files/Storage/Storage.php similarity index 100% rename from tests/lib/Files/Storage/Storage.php rename to tests/unit/lib/Files/Storage/Storage.php diff --git a/tests/lib/Files/Storage/StorageFactoryTest.php b/tests/unit/lib/Files/Storage/StorageFactoryTest.php similarity index 100% rename from tests/lib/Files/Storage/StorageFactoryTest.php rename to tests/unit/lib/Files/Storage/StorageFactoryTest.php diff --git a/tests/lib/Files/Storage/StoragesTestCase.php b/tests/unit/lib/Files/Storage/StoragesTestCase.php similarity index 100% rename from tests/lib/Files/Storage/StoragesTestCase.php rename to tests/unit/lib/Files/Storage/StoragesTestCase.php diff --git a/tests/lib/Files/Storage/Wrapper/AvailabilityTest.php b/tests/unit/lib/Files/Storage/Wrapper/AvailabilityTest.php similarity index 100% rename from tests/lib/Files/Storage/Wrapper/AvailabilityTest.php rename to tests/unit/lib/Files/Storage/Wrapper/AvailabilityTest.php diff --git a/tests/lib/Files/Storage/Wrapper/EncodingTest.php b/tests/unit/lib/Files/Storage/Wrapper/EncodingTest.php similarity index 100% rename from tests/lib/Files/Storage/Wrapper/EncodingTest.php rename to tests/unit/lib/Files/Storage/Wrapper/EncodingTest.php diff --git a/tests/lib/Files/Storage/Wrapper/EncryptionTest.php b/tests/unit/lib/Files/Storage/Wrapper/EncryptionTest.php similarity index 100% rename from tests/lib/Files/Storage/Wrapper/EncryptionTest.php rename to tests/unit/lib/Files/Storage/Wrapper/EncryptionTest.php diff --git a/tests/lib/Files/Storage/Wrapper/JailTest.php b/tests/unit/lib/Files/Storage/Wrapper/JailTest.php similarity index 100% rename from tests/lib/Files/Storage/Wrapper/JailTest.php rename to tests/unit/lib/Files/Storage/Wrapper/JailTest.php diff --git a/tests/lib/Files/Storage/Wrapper/KnownMtimeTest.php b/tests/unit/lib/Files/Storage/Wrapper/KnownMtimeTest.php similarity index 100% rename from tests/lib/Files/Storage/Wrapper/KnownMtimeTest.php rename to tests/unit/lib/Files/Storage/Wrapper/KnownMtimeTest.php diff --git a/tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php b/tests/unit/lib/Files/Storage/Wrapper/PermissionsMaskTest.php similarity index 100% rename from tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php rename to tests/unit/lib/Files/Storage/Wrapper/PermissionsMaskTest.php diff --git a/tests/lib/Files/Storage/Wrapper/QuotaTest.php b/tests/unit/lib/Files/Storage/Wrapper/QuotaTest.php similarity index 100% rename from tests/lib/Files/Storage/Wrapper/QuotaTest.php rename to tests/unit/lib/Files/Storage/Wrapper/QuotaTest.php diff --git a/tests/lib/Files/Storage/Wrapper/WrapperTest.php b/tests/unit/lib/Files/Storage/Wrapper/WrapperTest.php similarity index 100% rename from tests/lib/Files/Storage/Wrapper/WrapperTest.php rename to tests/unit/lib/Files/Storage/Wrapper/WrapperTest.php diff --git a/tests/lib/Files/Stream/DummyEncryptionWrapper.php b/tests/unit/lib/Files/Stream/DummyEncryptionWrapper.php similarity index 100% rename from tests/lib/Files/Stream/DummyEncryptionWrapper.php rename to tests/unit/lib/Files/Stream/DummyEncryptionWrapper.php diff --git a/tests/lib/Files/Stream/EncryptionTest.php b/tests/unit/lib/Files/Stream/EncryptionTest.php similarity index 100% rename from tests/lib/Files/Stream/EncryptionTest.php rename to tests/unit/lib/Files/Stream/EncryptionTest.php diff --git a/tests/lib/Files/Stream/HashWrapperTest.php b/tests/unit/lib/Files/Stream/HashWrapperTest.php similarity index 100% rename from tests/lib/Files/Stream/HashWrapperTest.php rename to tests/unit/lib/Files/Stream/HashWrapperTest.php diff --git a/tests/lib/Files/Stream/QuotaTest.php b/tests/unit/lib/Files/Stream/QuotaTest.php similarity index 100% rename from tests/lib/Files/Stream/QuotaTest.php rename to tests/unit/lib/Files/Stream/QuotaTest.php diff --git a/tests/lib/Files/Template/TemplateManagerTest.php b/tests/unit/lib/Files/Template/TemplateManagerTest.php similarity index 100% rename from tests/lib/Files/Template/TemplateManagerTest.php rename to tests/unit/lib/Files/Template/TemplateManagerTest.php diff --git a/tests/lib/Files/Type/DetectionTest.php b/tests/unit/lib/Files/Type/DetectionTest.php similarity index 100% rename from tests/lib/Files/Type/DetectionTest.php rename to tests/unit/lib/Files/Type/DetectionTest.php diff --git a/tests/lib/Files/Type/LoaderTest.php b/tests/unit/lib/Files/Type/LoaderTest.php similarity index 100% rename from tests/lib/Files/Type/LoaderTest.php rename to tests/unit/lib/Files/Type/LoaderTest.php diff --git a/tests/lib/Files/Utils/ScannerTest.php b/tests/unit/lib/Files/Utils/ScannerTest.php similarity index 100% rename from tests/lib/Files/Utils/ScannerTest.php rename to tests/unit/lib/Files/Utils/ScannerTest.php diff --git a/tests/lib/Files/ViewTest.php b/tests/unit/lib/Files/ViewTest.php similarity index 100% rename from tests/lib/Files/ViewTest.php rename to tests/unit/lib/Files/ViewTest.php diff --git a/tests/lib/FilesMetadata/FilesMetadataManagerTest.php b/tests/unit/lib/FilesMetadata/FilesMetadataManagerTest.php similarity index 100% rename from tests/lib/FilesMetadata/FilesMetadataManagerTest.php rename to tests/unit/lib/FilesMetadata/FilesMetadataManagerTest.php diff --git a/tests/lib/FilesTest.php b/tests/unit/lib/FilesTest.php similarity index 100% rename from tests/lib/FilesTest.php rename to tests/unit/lib/FilesTest.php diff --git a/tests/lib/GlobalScale/ConfigTest.php b/tests/unit/lib/GlobalScale/ConfigTest.php similarity index 100% rename from tests/lib/GlobalScale/ConfigTest.php rename to tests/unit/lib/GlobalScale/ConfigTest.php diff --git a/tests/lib/Group/Backend.php b/tests/unit/lib/Group/Backend.php similarity index 100% rename from tests/lib/Group/Backend.php rename to tests/unit/lib/Group/Backend.php diff --git a/tests/lib/Group/DatabaseTest.php b/tests/unit/lib/Group/DatabaseTest.php similarity index 100% rename from tests/lib/Group/DatabaseTest.php rename to tests/unit/lib/Group/DatabaseTest.php diff --git a/tests/lib/Group/Dummy.php b/tests/unit/lib/Group/Dummy.php similarity index 100% rename from tests/lib/Group/Dummy.php rename to tests/unit/lib/Group/Dummy.php diff --git a/tests/lib/Group/GroupTest.php b/tests/unit/lib/Group/GroupTest.php similarity index 100% rename from tests/lib/Group/GroupTest.php rename to tests/unit/lib/Group/GroupTest.php diff --git a/tests/lib/Group/HideFromCollaborationTest.php b/tests/unit/lib/Group/HideFromCollaborationTest.php similarity index 100% rename from tests/lib/Group/HideFromCollaborationTest.php rename to tests/unit/lib/Group/HideFromCollaborationTest.php diff --git a/tests/lib/Group/ManagerTest.php b/tests/unit/lib/Group/ManagerTest.php similarity index 100% rename from tests/lib/Group/ManagerTest.php rename to tests/unit/lib/Group/ManagerTest.php diff --git a/tests/lib/Group/MetaDataTest.php b/tests/unit/lib/Group/MetaDataTest.php similarity index 100% rename from tests/lib/Group/MetaDataTest.php rename to tests/unit/lib/Group/MetaDataTest.php diff --git a/tests/lib/HelperStorageTest.php b/tests/unit/lib/HelperStorageTest.php similarity index 100% rename from tests/lib/HelperStorageTest.php rename to tests/unit/lib/HelperStorageTest.php diff --git a/tests/lib/HookHelper.php b/tests/unit/lib/HookHelper.php similarity index 100% rename from tests/lib/HookHelper.php rename to tests/unit/lib/HookHelper.php diff --git a/tests/lib/Hooks/BasicEmitterTest.php b/tests/unit/lib/Hooks/BasicEmitterTest.php similarity index 100% rename from tests/lib/Hooks/BasicEmitterTest.php rename to tests/unit/lib/Hooks/BasicEmitterTest.php diff --git a/tests/lib/Http/Client/ClientServiceTest.php b/tests/unit/lib/Http/Client/ClientServiceTest.php similarity index 100% rename from tests/lib/Http/Client/ClientServiceTest.php rename to tests/unit/lib/Http/Client/ClientServiceTest.php diff --git a/tests/lib/Http/Client/ClientTest.php b/tests/unit/lib/Http/Client/ClientTest.php similarity index 100% rename from tests/lib/Http/Client/ClientTest.php rename to tests/unit/lib/Http/Client/ClientTest.php diff --git a/tests/lib/Http/Client/DnsPinMiddlewareTest.php b/tests/unit/lib/Http/Client/DnsPinMiddlewareTest.php similarity index 100% rename from tests/lib/Http/Client/DnsPinMiddlewareTest.php rename to tests/unit/lib/Http/Client/DnsPinMiddlewareTest.php diff --git a/tests/lib/Http/Client/NegativeDnsCacheTest.php b/tests/unit/lib/Http/Client/NegativeDnsCacheTest.php similarity index 100% rename from tests/lib/Http/Client/NegativeDnsCacheTest.php rename to tests/unit/lib/Http/Client/NegativeDnsCacheTest.php diff --git a/tests/lib/Http/Client/ResponseTest.php b/tests/unit/lib/Http/Client/ResponseTest.php similarity index 100% rename from tests/lib/Http/Client/ResponseTest.php rename to tests/unit/lib/Http/Client/ResponseTest.php diff --git a/tests/lib/Http/WellKnown/GenericResponseTest.php b/tests/unit/lib/Http/WellKnown/GenericResponseTest.php similarity index 100% rename from tests/lib/Http/WellKnown/GenericResponseTest.php rename to tests/unit/lib/Http/WellKnown/GenericResponseTest.php diff --git a/tests/lib/Http/WellKnown/JrdResponseTest.php b/tests/unit/lib/Http/WellKnown/JrdResponseTest.php similarity index 100% rename from tests/lib/Http/WellKnown/JrdResponseTest.php rename to tests/unit/lib/Http/WellKnown/JrdResponseTest.php diff --git a/tests/lib/Http/WellKnown/RequestManagerTest.php b/tests/unit/lib/Http/WellKnown/RequestManagerTest.php similarity index 100% rename from tests/lib/Http/WellKnown/RequestManagerTest.php rename to tests/unit/lib/Http/WellKnown/RequestManagerTest.php diff --git a/tests/lib/ImageTest.php b/tests/unit/lib/ImageTest.php similarity index 100% rename from tests/lib/ImageTest.php rename to tests/unit/lib/ImageTest.php diff --git a/tests/lib/InfoXmlTest.php b/tests/unit/lib/InfoXmlTest.php similarity index 100% rename from tests/lib/InfoXmlTest.php rename to tests/unit/lib/InfoXmlTest.php diff --git a/tests/lib/InitialStateServiceTest.php b/tests/unit/lib/InitialStateServiceTest.php similarity index 100% rename from tests/lib/InitialStateServiceTest.php rename to tests/unit/lib/InitialStateServiceTest.php diff --git a/tests/lib/Install/Events/InstallationCompletedEventTest.php b/tests/unit/lib/Install/Events/InstallationCompletedEventTest.php similarity index 100% rename from tests/lib/Install/Events/InstallationCompletedEventTest.php rename to tests/unit/lib/Install/Events/InstallationCompletedEventTest.php diff --git a/tests/lib/InstallerTest.php b/tests/unit/lib/InstallerTest.php similarity index 100% rename from tests/lib/InstallerTest.php rename to tests/unit/lib/InstallerTest.php diff --git a/tests/lib/IntegrityCheck/CheckerTest.php b/tests/unit/lib/IntegrityCheck/CheckerTest.php similarity index 100% rename from tests/lib/IntegrityCheck/CheckerTest.php rename to tests/unit/lib/IntegrityCheck/CheckerTest.php diff --git a/tests/lib/IntegrityCheck/Helpers/EnvironmentHelperTest.php b/tests/unit/lib/IntegrityCheck/Helpers/EnvironmentHelperTest.php similarity index 100% rename from tests/lib/IntegrityCheck/Helpers/EnvironmentHelperTest.php rename to tests/unit/lib/IntegrityCheck/Helpers/EnvironmentHelperTest.php diff --git a/tests/lib/IntegrityCheck/Helpers/FileAccessHelperTest.php b/tests/unit/lib/IntegrityCheck/Helpers/FileAccessHelperTest.php similarity index 100% rename from tests/lib/IntegrityCheck/Helpers/FileAccessHelperTest.php rename to tests/unit/lib/IntegrityCheck/Helpers/FileAccessHelperTest.php diff --git a/tests/lib/IntegrityCheck/Iterator/ExcludeFileByNameFilterIteratorTest.php b/tests/unit/lib/IntegrityCheck/Iterator/ExcludeFileByNameFilterIteratorTest.php similarity index 100% rename from tests/lib/IntegrityCheck/Iterator/ExcludeFileByNameFilterIteratorTest.php rename to tests/unit/lib/IntegrityCheck/Iterator/ExcludeFileByNameFilterIteratorTest.php diff --git a/tests/lib/L10N/FactoryTest.php b/tests/unit/lib/L10N/FactoryTest.php similarity index 100% rename from tests/lib/L10N/FactoryTest.php rename to tests/unit/lib/L10N/FactoryTest.php diff --git a/tests/lib/L10N/L10nTest.php b/tests/unit/lib/L10N/L10nTest.php similarity index 100% rename from tests/lib/L10N/L10nTest.php rename to tests/unit/lib/L10N/L10nTest.php diff --git a/tests/lib/L10N/LanguageIteratorTest.php b/tests/unit/lib/L10N/LanguageIteratorTest.php similarity index 100% rename from tests/lib/L10N/LanguageIteratorTest.php rename to tests/unit/lib/L10N/LanguageIteratorTest.php diff --git a/tests/lib/LargeFileHelperGetFileSizeTest.php b/tests/unit/lib/LargeFileHelperGetFileSizeTest.php similarity index 100% rename from tests/lib/LargeFileHelperGetFileSizeTest.php rename to tests/unit/lib/LargeFileHelperGetFileSizeTest.php diff --git a/tests/lib/LargeFileHelperTest.php b/tests/unit/lib/LargeFileHelperTest.php similarity index 100% rename from tests/lib/LargeFileHelperTest.php rename to tests/unit/lib/LargeFileHelperTest.php diff --git a/tests/lib/Lock/DBLockingProviderTest.php b/tests/unit/lib/Lock/DBLockingProviderTest.php similarity index 100% rename from tests/lib/Lock/DBLockingProviderTest.php rename to tests/unit/lib/Lock/DBLockingProviderTest.php diff --git a/tests/lib/Lock/LockingProvider.php b/tests/unit/lib/Lock/LockingProvider.php similarity index 100% rename from tests/lib/Lock/LockingProvider.php rename to tests/unit/lib/Lock/LockingProvider.php diff --git a/tests/lib/Lock/MemcacheLockingProviderTest.php b/tests/unit/lib/Lock/MemcacheLockingProviderTest.php similarity index 100% rename from tests/lib/Lock/MemcacheLockingProviderTest.php rename to tests/unit/lib/Lock/MemcacheLockingProviderTest.php diff --git a/tests/lib/Lock/NonCachingDBLockingProviderTest.php b/tests/unit/lib/Lock/NonCachingDBLockingProviderTest.php similarity index 100% rename from tests/lib/Lock/NonCachingDBLockingProviderTest.php rename to tests/unit/lib/Lock/NonCachingDBLockingProviderTest.php diff --git a/tests/lib/Lockdown/Filesystem/NoFSTest.php b/tests/unit/lib/Lockdown/Filesystem/NoFSTest.php similarity index 100% rename from tests/lib/Lockdown/Filesystem/NoFSTest.php rename to tests/unit/lib/Lockdown/Filesystem/NoFSTest.php diff --git a/tests/lib/Lockdown/Filesystem/NullCacheTest.php b/tests/unit/lib/Lockdown/Filesystem/NullCacheTest.php similarity index 100% rename from tests/lib/Lockdown/Filesystem/NullCacheTest.php rename to tests/unit/lib/Lockdown/Filesystem/NullCacheTest.php diff --git a/tests/lib/Lockdown/Filesystem/NullStorageTest.php b/tests/unit/lib/Lockdown/Filesystem/NullStorageTest.php similarity index 100% rename from tests/lib/Lockdown/Filesystem/NullStorageTest.php rename to tests/unit/lib/Lockdown/Filesystem/NullStorageTest.php diff --git a/tests/lib/Lockdown/LockdownManagerTest.php b/tests/unit/lib/Lockdown/LockdownManagerTest.php similarity index 100% rename from tests/lib/Lockdown/LockdownManagerTest.php rename to tests/unit/lib/Lockdown/LockdownManagerTest.php diff --git a/tests/lib/Log/ExceptionSerializerTest.php b/tests/unit/lib/Log/ExceptionSerializerTest.php similarity index 100% rename from tests/lib/Log/ExceptionSerializerTest.php rename to tests/unit/lib/Log/ExceptionSerializerTest.php diff --git a/tests/lib/Log/FileTest.php b/tests/unit/lib/Log/FileTest.php similarity index 100% rename from tests/lib/Log/FileTest.php rename to tests/unit/lib/Log/FileTest.php diff --git a/tests/lib/Log/LogFactoryTest.php b/tests/unit/lib/Log/LogFactoryTest.php similarity index 100% rename from tests/lib/Log/LogFactoryTest.php rename to tests/unit/lib/Log/LogFactoryTest.php diff --git a/tests/lib/Log/PsrLoggerAdapterTest.php b/tests/unit/lib/Log/PsrLoggerAdapterTest.php similarity index 100% rename from tests/lib/Log/PsrLoggerAdapterTest.php rename to tests/unit/lib/Log/PsrLoggerAdapterTest.php diff --git a/tests/lib/LoggerTest.php b/tests/unit/lib/LoggerTest.php similarity index 100% rename from tests/lib/LoggerTest.php rename to tests/unit/lib/LoggerTest.php diff --git a/tests/lib/Mail/EMailTemplateTest.php b/tests/unit/lib/Mail/EMailTemplateTest.php similarity index 100% rename from tests/lib/Mail/EMailTemplateTest.php rename to tests/unit/lib/Mail/EMailTemplateTest.php diff --git a/tests/lib/Mail/EmailValidatorTest.php b/tests/unit/lib/Mail/EmailValidatorTest.php similarity index 100% rename from tests/lib/Mail/EmailValidatorTest.php rename to tests/unit/lib/Mail/EmailValidatorTest.php diff --git a/tests/lib/Mail/MailerTest.php b/tests/unit/lib/Mail/MailerTest.php similarity index 100% rename from tests/lib/Mail/MailerTest.php rename to tests/unit/lib/Mail/MailerTest.php diff --git a/tests/lib/Mail/MessageTest.php b/tests/unit/lib/Mail/MessageTest.php similarity index 100% rename from tests/lib/Mail/MessageTest.php rename to tests/unit/lib/Mail/MessageTest.php diff --git a/tests/lib/Mail/Provider/AddressTest.php b/tests/unit/lib/Mail/Provider/AddressTest.php similarity index 100% rename from tests/lib/Mail/Provider/AddressTest.php rename to tests/unit/lib/Mail/Provider/AddressTest.php diff --git a/tests/lib/Mail/Provider/AttachmentTest.php b/tests/unit/lib/Mail/Provider/AttachmentTest.php similarity index 100% rename from tests/lib/Mail/Provider/AttachmentTest.php rename to tests/unit/lib/Mail/Provider/AttachmentTest.php diff --git a/tests/lib/Mail/Provider/ManagerTest.php b/tests/unit/lib/Mail/Provider/ManagerTest.php similarity index 100% rename from tests/lib/Mail/Provider/ManagerTest.php rename to tests/unit/lib/Mail/Provider/ManagerTest.php diff --git a/tests/lib/Mail/Provider/MessageTest.php b/tests/unit/lib/Mail/Provider/MessageTest.php similarity index 100% rename from tests/lib/Mail/Provider/MessageTest.php rename to tests/unit/lib/Mail/Provider/MessageTest.php diff --git a/tests/lib/Memcache/APCuTest.php b/tests/unit/lib/Memcache/APCuTest.php similarity index 100% rename from tests/lib/Memcache/APCuTest.php rename to tests/unit/lib/Memcache/APCuTest.php diff --git a/tests/lib/Memcache/ArrayCacheTest.php b/tests/unit/lib/Memcache/ArrayCacheTest.php similarity index 100% rename from tests/lib/Memcache/ArrayCacheTest.php rename to tests/unit/lib/Memcache/ArrayCacheTest.php diff --git a/tests/lib/Memcache/Cache.php b/tests/unit/lib/Memcache/Cache.php similarity index 100% rename from tests/lib/Memcache/Cache.php rename to tests/unit/lib/Memcache/Cache.php diff --git a/tests/lib/Memcache/CasTraitTest.php b/tests/unit/lib/Memcache/CasTraitTest.php similarity index 100% rename from tests/lib/Memcache/CasTraitTest.php rename to tests/unit/lib/Memcache/CasTraitTest.php diff --git a/tests/lib/Memcache/CasTraitTestClass.php b/tests/unit/lib/Memcache/CasTraitTestClass.php similarity index 100% rename from tests/lib/Memcache/CasTraitTestClass.php rename to tests/unit/lib/Memcache/CasTraitTestClass.php diff --git a/tests/lib/Memcache/FactoryTest.php b/tests/unit/lib/Memcache/FactoryTest.php similarity index 100% rename from tests/lib/Memcache/FactoryTest.php rename to tests/unit/lib/Memcache/FactoryTest.php diff --git a/tests/lib/Memcache/MemcachedTest.php b/tests/unit/lib/Memcache/MemcachedTest.php similarity index 100% rename from tests/lib/Memcache/MemcachedTest.php rename to tests/unit/lib/Memcache/MemcachedTest.php diff --git a/tests/lib/Memcache/RedisTest.php b/tests/unit/lib/Memcache/RedisTest.php similarity index 100% rename from tests/lib/Memcache/RedisTest.php rename to tests/unit/lib/Memcache/RedisTest.php diff --git a/tests/lib/MemoryInfoTest.php b/tests/unit/lib/MemoryInfoTest.php similarity index 100% rename from tests/lib/MemoryInfoTest.php rename to tests/unit/lib/MemoryInfoTest.php diff --git a/tests/lib/Migration/BackgroundRepairTest.php b/tests/unit/lib/Migration/BackgroundRepairTest.php similarity index 100% rename from tests/lib/Migration/BackgroundRepairTest.php rename to tests/unit/lib/Migration/BackgroundRepairTest.php diff --git a/tests/lib/Migration/MetadataManagerTest.php b/tests/unit/lib/Migration/MetadataManagerTest.php similarity index 100% rename from tests/lib/Migration/MetadataManagerTest.php rename to tests/unit/lib/Migration/MetadataManagerTest.php diff --git a/tests/lib/Mock/Config/MockAppConfig.php b/tests/unit/lib/Mock/Config/MockAppConfig.php similarity index 100% rename from tests/lib/Mock/Config/MockAppConfig.php rename to tests/unit/lib/Mock/Config/MockAppConfig.php diff --git a/tests/lib/Mock/Config/MockUserConfig.php b/tests/unit/lib/Mock/Config/MockUserConfig.php similarity index 100% rename from tests/lib/Mock/Config/MockUserConfig.php rename to tests/unit/lib/Mock/Config/MockUserConfig.php diff --git a/tests/lib/NaturalSortTest.php b/tests/unit/lib/NaturalSortTest.php similarity index 100% rename from tests/lib/NaturalSortTest.php rename to tests/unit/lib/NaturalSortTest.php diff --git a/tests/lib/NavigationManagerTest.php b/tests/unit/lib/NavigationManagerTest.php similarity index 100% rename from tests/lib/NavigationManagerTest.php rename to tests/unit/lib/NavigationManagerTest.php diff --git a/tests/lib/Net/HostnameClassifierTest.php b/tests/unit/lib/Net/HostnameClassifierTest.php similarity index 100% rename from tests/lib/Net/HostnameClassifierTest.php rename to tests/unit/lib/Net/HostnameClassifierTest.php diff --git a/tests/lib/Net/IpAddressClassifierTest.php b/tests/unit/lib/Net/IpAddressClassifierTest.php similarity index 100% rename from tests/lib/Net/IpAddressClassifierTest.php rename to tests/unit/lib/Net/IpAddressClassifierTest.php diff --git a/tests/lib/Notification/ActionTest.php b/tests/unit/lib/Notification/ActionTest.php similarity index 100% rename from tests/lib/Notification/ActionTest.php rename to tests/unit/lib/Notification/ActionTest.php diff --git a/tests/lib/Notification/DummyApp.php b/tests/unit/lib/Notification/DummyApp.php similarity index 100% rename from tests/lib/Notification/DummyApp.php rename to tests/unit/lib/Notification/DummyApp.php diff --git a/tests/lib/Notification/DummyNotifier.php b/tests/unit/lib/Notification/DummyNotifier.php similarity index 100% rename from tests/lib/Notification/DummyNotifier.php rename to tests/unit/lib/Notification/DummyNotifier.php diff --git a/tests/lib/Notification/ManagerTest.php b/tests/unit/lib/Notification/ManagerTest.php similarity index 100% rename from tests/lib/Notification/ManagerTest.php rename to tests/unit/lib/Notification/ManagerTest.php diff --git a/tests/lib/Notification/NotificationTest.php b/tests/unit/lib/Notification/NotificationTest.php similarity index 100% rename from tests/lib/Notification/NotificationTest.php rename to tests/unit/lib/Notification/NotificationTest.php diff --git a/tests/lib/OCM/DiscoveryServiceTest.php b/tests/unit/lib/OCM/DiscoveryServiceTest.php similarity index 100% rename from tests/lib/OCM/DiscoveryServiceTest.php rename to tests/unit/lib/OCM/DiscoveryServiceTest.php diff --git a/tests/lib/OCM/Listeners/LocalOCMDiscoveryTestEvent.php b/tests/unit/lib/OCM/Listeners/LocalOCMDiscoveryTestEvent.php similarity index 100% rename from tests/lib/OCM/Listeners/LocalOCMDiscoveryTestEvent.php rename to tests/unit/lib/OCM/Listeners/LocalOCMDiscoveryTestEvent.php diff --git a/tests/lib/OCM/Listeners/OCMEndpointRequestTestEvent.php b/tests/unit/lib/OCM/Listeners/OCMEndpointRequestTestEvent.php similarity index 100% rename from tests/lib/OCM/Listeners/OCMEndpointRequestTestEvent.php rename to tests/unit/lib/OCM/Listeners/OCMEndpointRequestTestEvent.php diff --git a/tests/lib/OCM/OCMJwksHandlerTest.php b/tests/unit/lib/OCM/OCMJwksHandlerTest.php similarity index 100% rename from tests/lib/OCM/OCMJwksHandlerTest.php rename to tests/unit/lib/OCM/OCMJwksHandlerTest.php diff --git a/tests/lib/OCM/OCMSignatoryManagerJwksTest.php b/tests/unit/lib/OCM/OCMSignatoryManagerJwksTest.php similarity index 100% rename from tests/lib/OCM/OCMSignatoryManagerJwksTest.php rename to tests/unit/lib/OCM/OCMSignatoryManagerJwksTest.php diff --git a/tests/lib/OCM/OCMSignatoryManagerRotationTest.php b/tests/unit/lib/OCM/OCMSignatoryManagerRotationTest.php similarity index 100% rename from tests/lib/OCM/OCMSignatoryManagerRotationTest.php rename to tests/unit/lib/OCM/OCMSignatoryManagerRotationTest.php diff --git a/tests/lib/OCM/Rfc9421SignatoryManagerTest.php b/tests/unit/lib/OCM/Rfc9421SignatoryManagerTest.php similarity index 100% rename from tests/lib/OCM/Rfc9421SignatoryManagerTest.php rename to tests/unit/lib/OCM/Rfc9421SignatoryManagerTest.php diff --git a/tests/lib/OCS/ApiHelperTest.php b/tests/unit/lib/OCS/ApiHelperTest.php similarity index 100% rename from tests/lib/OCS/ApiHelperTest.php rename to tests/unit/lib/OCS/ApiHelperTest.php diff --git a/tests/lib/OCS/DiscoveryServiceTest.php b/tests/unit/lib/OCS/DiscoveryServiceTest.php similarity index 100% rename from tests/lib/OCS/DiscoveryServiceTest.php rename to tests/unit/lib/OCS/DiscoveryServiceTest.php diff --git a/tests/lib/OCS/ProviderTest.php b/tests/unit/lib/OCS/ProviderTest.php similarity index 100% rename from tests/lib/OCS/ProviderTest.php rename to tests/unit/lib/OCS/ProviderTest.php diff --git a/tests/lib/OpenMetrics/ExporterManagerTest.php b/tests/unit/lib/OpenMetrics/ExporterManagerTest.php similarity index 100% rename from tests/lib/OpenMetrics/ExporterManagerTest.php rename to tests/unit/lib/OpenMetrics/ExporterManagerTest.php diff --git a/tests/lib/OpenMetrics/Exporters/ActiveSessionsTest.php b/tests/unit/lib/OpenMetrics/Exporters/ActiveSessionsTest.php similarity index 100% rename from tests/lib/OpenMetrics/Exporters/ActiveSessionsTest.php rename to tests/unit/lib/OpenMetrics/Exporters/ActiveSessionsTest.php diff --git a/tests/lib/OpenMetrics/Exporters/ActiveUsersTest.php b/tests/unit/lib/OpenMetrics/Exporters/ActiveUsersTest.php similarity index 100% rename from tests/lib/OpenMetrics/Exporters/ActiveUsersTest.php rename to tests/unit/lib/OpenMetrics/Exporters/ActiveUsersTest.php diff --git a/tests/lib/OpenMetrics/Exporters/AppEnabledTest.php b/tests/unit/lib/OpenMetrics/Exporters/AppEnabledTest.php similarity index 100% rename from tests/lib/OpenMetrics/Exporters/AppEnabledTest.php rename to tests/unit/lib/OpenMetrics/Exporters/AppEnabledTest.php diff --git a/tests/lib/OpenMetrics/Exporters/ExporterTestCase.php b/tests/unit/lib/OpenMetrics/Exporters/ExporterTestCase.php similarity index 100% rename from tests/lib/OpenMetrics/Exporters/ExporterTestCase.php rename to tests/unit/lib/OpenMetrics/Exporters/ExporterTestCase.php diff --git a/tests/lib/OpenMetrics/Exporters/FilesByTypeTest.php b/tests/unit/lib/OpenMetrics/Exporters/FilesByTypeTest.php similarity index 100% rename from tests/lib/OpenMetrics/Exporters/FilesByTypeTest.php rename to tests/unit/lib/OpenMetrics/Exporters/FilesByTypeTest.php diff --git a/tests/lib/OpenMetrics/Exporters/InstanceInfoTest.php b/tests/unit/lib/OpenMetrics/Exporters/InstanceInfoTest.php similarity index 100% rename from tests/lib/OpenMetrics/Exporters/InstanceInfoTest.php rename to tests/unit/lib/OpenMetrics/Exporters/InstanceInfoTest.php diff --git a/tests/lib/OpenMetrics/Exporters/LogLevelTest.php b/tests/unit/lib/OpenMetrics/Exporters/LogLevelTest.php similarity index 100% rename from tests/lib/OpenMetrics/Exporters/LogLevelTest.php rename to tests/unit/lib/OpenMetrics/Exporters/LogLevelTest.php diff --git a/tests/lib/OpenMetrics/Exporters/MaintenanceTest.php b/tests/unit/lib/OpenMetrics/Exporters/MaintenanceTest.php similarity index 100% rename from tests/lib/OpenMetrics/Exporters/MaintenanceTest.php rename to tests/unit/lib/OpenMetrics/Exporters/MaintenanceTest.php diff --git a/tests/lib/OpenMetrics/Exporters/RunningJobsTest.php b/tests/unit/lib/OpenMetrics/Exporters/RunningJobsTest.php similarity index 100% rename from tests/lib/OpenMetrics/Exporters/RunningJobsTest.php rename to tests/unit/lib/OpenMetrics/Exporters/RunningJobsTest.php diff --git a/tests/lib/OpenMetrics/Exporters/UsersByBackendTest.php b/tests/unit/lib/OpenMetrics/Exporters/UsersByBackendTest.php similarity index 100% rename from tests/lib/OpenMetrics/Exporters/UsersByBackendTest.php rename to tests/unit/lib/OpenMetrics/Exporters/UsersByBackendTest.php diff --git a/tests/lib/Preview/BackgroundCleanupJobTest.php b/tests/unit/lib/Preview/BackgroundCleanupJobTest.php similarity index 100% rename from tests/lib/Preview/BackgroundCleanupJobTest.php rename to tests/unit/lib/Preview/BackgroundCleanupJobTest.php diff --git a/tests/lib/Preview/GeneratorTest.php b/tests/unit/lib/Preview/GeneratorTest.php similarity index 100% rename from tests/lib/Preview/GeneratorTest.php rename to tests/unit/lib/Preview/GeneratorTest.php diff --git a/tests/lib/Preview/HEICTest.php b/tests/unit/lib/Preview/HEICTest.php similarity index 100% rename from tests/lib/Preview/HEICTest.php rename to tests/unit/lib/Preview/HEICTest.php diff --git a/tests/lib/Preview/ImageTest.php b/tests/unit/lib/Preview/ImageTest.php similarity index 100% rename from tests/lib/Preview/ImageTest.php rename to tests/unit/lib/Preview/ImageTest.php diff --git a/tests/lib/Preview/MP3Test.php b/tests/unit/lib/Preview/MP3Test.php similarity index 100% rename from tests/lib/Preview/MP3Test.php rename to tests/unit/lib/Preview/MP3Test.php diff --git a/tests/lib/Preview/MovieBrokenStuckFfmpegTest.php b/tests/unit/lib/Preview/MovieBrokenStuckFfmpegTest.php similarity index 100% rename from tests/lib/Preview/MovieBrokenStuckFfmpegTest.php rename to tests/unit/lib/Preview/MovieBrokenStuckFfmpegTest.php diff --git a/tests/lib/Preview/MovieTest.php b/tests/unit/lib/Preview/MovieTest.php similarity index 100% rename from tests/lib/Preview/MovieTest.php rename to tests/unit/lib/Preview/MovieTest.php diff --git a/tests/lib/Preview/MovieTestRemoteFile.php b/tests/unit/lib/Preview/MovieTestRemoteFile.php similarity index 100% rename from tests/lib/Preview/MovieTestRemoteFile.php rename to tests/unit/lib/Preview/MovieTestRemoteFile.php diff --git a/tests/lib/Preview/OfficeTest.php b/tests/unit/lib/Preview/OfficeTest.php similarity index 100% rename from tests/lib/Preview/OfficeTest.php rename to tests/unit/lib/Preview/OfficeTest.php diff --git a/tests/lib/Preview/PostscriptTest.php b/tests/unit/lib/Preview/PostscriptTest.php similarity index 100% rename from tests/lib/Preview/PostscriptTest.php rename to tests/unit/lib/Preview/PostscriptTest.php diff --git a/tests/lib/Preview/PreviewMapperTest.php b/tests/unit/lib/Preview/PreviewMapperTest.php similarity index 100% rename from tests/lib/Preview/PreviewMapperTest.php rename to tests/unit/lib/Preview/PreviewMapperTest.php diff --git a/tests/lib/Preview/PreviewMigrationJobTest.php b/tests/unit/lib/Preview/PreviewMigrationJobTest.php similarity index 100% rename from tests/lib/Preview/PreviewMigrationJobTest.php rename to tests/unit/lib/Preview/PreviewMigrationJobTest.php diff --git a/tests/lib/Preview/PreviewServiceTest.php b/tests/unit/lib/Preview/PreviewServiceTest.php similarity index 100% rename from tests/lib/Preview/PreviewServiceTest.php rename to tests/unit/lib/Preview/PreviewServiceTest.php diff --git a/tests/lib/Preview/Provider.php b/tests/unit/lib/Preview/Provider.php similarity index 100% rename from tests/lib/Preview/Provider.php rename to tests/unit/lib/Preview/Provider.php diff --git a/tests/lib/Preview/SVGTest.php b/tests/unit/lib/Preview/SVGTest.php similarity index 100% rename from tests/lib/Preview/SVGTest.php rename to tests/unit/lib/Preview/SVGTest.php diff --git a/tests/lib/Preview/Storage/LocalPreviewStorageTest.php b/tests/unit/lib/Preview/Storage/LocalPreviewStorageTest.php similarity index 100% rename from tests/lib/Preview/Storage/LocalPreviewStorageTest.php rename to tests/unit/lib/Preview/Storage/LocalPreviewStorageTest.php diff --git a/tests/lib/Preview/TXTTest.php b/tests/unit/lib/Preview/TXTTest.php similarity index 100% rename from tests/lib/Preview/TXTTest.php rename to tests/unit/lib/Preview/TXTTest.php diff --git a/tests/lib/Profile/Actions/FediverseActionTest.php b/tests/unit/lib/Profile/Actions/FediverseActionTest.php similarity index 100% rename from tests/lib/Profile/Actions/FediverseActionTest.php rename to tests/unit/lib/Profile/Actions/FediverseActionTest.php diff --git a/tests/lib/Repair/CleanTagsTest.php b/tests/unit/lib/Repair/CleanTagsTest.php similarity index 100% rename from tests/lib/Repair/CleanTagsTest.php rename to tests/unit/lib/Repair/CleanTagsTest.php diff --git a/tests/lib/Repair/ClearFrontendCachesTest.php b/tests/unit/lib/Repair/ClearFrontendCachesTest.php similarity index 100% rename from tests/lib/Repair/ClearFrontendCachesTest.php rename to tests/unit/lib/Repair/ClearFrontendCachesTest.php diff --git a/tests/lib/Repair/ClearGeneratedAvatarCacheTest.php b/tests/unit/lib/Repair/ClearGeneratedAvatarCacheTest.php similarity index 100% rename from tests/lib/Repair/ClearGeneratedAvatarCacheTest.php rename to tests/unit/lib/Repair/ClearGeneratedAvatarCacheTest.php diff --git a/tests/lib/Repair/NC29/SanitizeAccountPropertiesJobTest.php b/tests/unit/lib/Repair/NC29/SanitizeAccountPropertiesJobTest.php similarity index 100% rename from tests/lib/Repair/NC29/SanitizeAccountPropertiesJobTest.php rename to tests/unit/lib/Repair/NC29/SanitizeAccountPropertiesJobTest.php diff --git a/tests/lib/Repair/NC29/SanitizeAccountPropertiesTest.php b/tests/unit/lib/Repair/NC29/SanitizeAccountPropertiesTest.php similarity index 100% rename from tests/lib/Repair/NC29/SanitizeAccountPropertiesTest.php rename to tests/unit/lib/Repair/NC29/SanitizeAccountPropertiesTest.php diff --git a/tests/lib/Repair/OldGroupMembershipSharesTest.php b/tests/unit/lib/Repair/OldGroupMembershipSharesTest.php similarity index 100% rename from tests/lib/Repair/OldGroupMembershipSharesTest.php rename to tests/unit/lib/Repair/OldGroupMembershipSharesTest.php diff --git a/tests/lib/Repair/Owncloud/CleanPreviewsBackgroundJobTest.php b/tests/unit/lib/Repair/Owncloud/CleanPreviewsBackgroundJobTest.php similarity index 100% rename from tests/lib/Repair/Owncloud/CleanPreviewsBackgroundJobTest.php rename to tests/unit/lib/Repair/Owncloud/CleanPreviewsBackgroundJobTest.php diff --git a/tests/lib/Repair/Owncloud/CleanPreviewsTest.php b/tests/unit/lib/Repair/Owncloud/CleanPreviewsTest.php similarity index 100% rename from tests/lib/Repair/Owncloud/CleanPreviewsTest.php rename to tests/unit/lib/Repair/Owncloud/CleanPreviewsTest.php diff --git a/tests/lib/Repair/Owncloud/UpdateLanguageCodesTest.php b/tests/unit/lib/Repair/Owncloud/UpdateLanguageCodesTest.php similarity index 100% rename from tests/lib/Repair/Owncloud/UpdateLanguageCodesTest.php rename to tests/unit/lib/Repair/Owncloud/UpdateLanguageCodesTest.php diff --git a/tests/lib/Repair/RepairCollationTest.php b/tests/unit/lib/Repair/RepairCollationTest.php similarity index 100% rename from tests/lib/Repair/RepairCollationTest.php rename to tests/unit/lib/Repair/RepairCollationTest.php diff --git a/tests/lib/Repair/RepairDavSharesTest.php b/tests/unit/lib/Repair/RepairDavSharesTest.php similarity index 100% rename from tests/lib/Repair/RepairDavSharesTest.php rename to tests/unit/lib/Repair/RepairDavSharesTest.php diff --git a/tests/lib/Repair/RepairInvalidSharesTest.php b/tests/unit/lib/Repair/RepairInvalidSharesTest.php similarity index 100% rename from tests/lib/Repair/RepairInvalidSharesTest.php rename to tests/unit/lib/Repair/RepairInvalidSharesTest.php diff --git a/tests/lib/Repair/RepairMimeTypesTest.php b/tests/unit/lib/Repair/RepairMimeTypesTest.php similarity index 100% rename from tests/lib/Repair/RepairMimeTypesTest.php rename to tests/unit/lib/Repair/RepairMimeTypesTest.php diff --git a/tests/lib/RepairTest.php b/tests/unit/lib/RepairTest.php similarity index 100% rename from tests/lib/RepairTest.php rename to tests/unit/lib/RepairTest.php diff --git a/tests/lib/RichObjectStrings/DefinitionsTest.php b/tests/unit/lib/RichObjectStrings/DefinitionsTest.php similarity index 100% rename from tests/lib/RichObjectStrings/DefinitionsTest.php rename to tests/unit/lib/RichObjectStrings/DefinitionsTest.php diff --git a/tests/lib/RichObjectStrings/ValidatorTest.php b/tests/unit/lib/RichObjectStrings/ValidatorTest.php similarity index 100% rename from tests/lib/RichObjectStrings/ValidatorTest.php rename to tests/unit/lib/RichObjectStrings/ValidatorTest.php diff --git a/tests/lib/Route/RouterTest.php b/tests/unit/lib/Route/RouterTest.php similarity index 100% rename from tests/lib/Route/RouterTest.php rename to tests/unit/lib/Route/RouterTest.php diff --git a/tests/lib/Search/SearchComposerTest.php b/tests/unit/lib/Search/SearchComposerTest.php similarity index 100% rename from tests/lib/Search/SearchComposerTest.php rename to tests/unit/lib/Search/SearchComposerTest.php diff --git a/tests/lib/Security/Bruteforce/Backend/MemoryCacheBackendTest.php b/tests/unit/lib/Security/Bruteforce/Backend/MemoryCacheBackendTest.php similarity index 100% rename from tests/lib/Security/Bruteforce/Backend/MemoryCacheBackendTest.php rename to tests/unit/lib/Security/Bruteforce/Backend/MemoryCacheBackendTest.php diff --git a/tests/lib/Security/Bruteforce/CapabilitiesTest.php b/tests/unit/lib/Security/Bruteforce/CapabilitiesTest.php similarity index 100% rename from tests/lib/Security/Bruteforce/CapabilitiesTest.php rename to tests/unit/lib/Security/Bruteforce/CapabilitiesTest.php diff --git a/tests/lib/Security/CSP/AddContentSecurityPolicyEventTest.php b/tests/unit/lib/Security/CSP/AddContentSecurityPolicyEventTest.php similarity index 100% rename from tests/lib/Security/CSP/AddContentSecurityPolicyEventTest.php rename to tests/unit/lib/Security/CSP/AddContentSecurityPolicyEventTest.php diff --git a/tests/lib/Security/CSP/ContentSecurityPolicyManagerTest.php b/tests/unit/lib/Security/CSP/ContentSecurityPolicyManagerTest.php similarity index 100% rename from tests/lib/Security/CSP/ContentSecurityPolicyManagerTest.php rename to tests/unit/lib/Security/CSP/ContentSecurityPolicyManagerTest.php diff --git a/tests/lib/Security/CSP/ContentSecurityPolicyNonceManagerTest.php b/tests/unit/lib/Security/CSP/ContentSecurityPolicyNonceManagerTest.php similarity index 100% rename from tests/lib/Security/CSP/ContentSecurityPolicyNonceManagerTest.php rename to tests/unit/lib/Security/CSP/ContentSecurityPolicyNonceManagerTest.php diff --git a/tests/lib/Security/CSRF/CsrfTokenGeneratorTest.php b/tests/unit/lib/Security/CSRF/CsrfTokenGeneratorTest.php similarity index 100% rename from tests/lib/Security/CSRF/CsrfTokenGeneratorTest.php rename to tests/unit/lib/Security/CSRF/CsrfTokenGeneratorTest.php diff --git a/tests/lib/Security/CSRF/CsrfTokenManagerTest.php b/tests/unit/lib/Security/CSRF/CsrfTokenManagerTest.php similarity index 100% rename from tests/lib/Security/CSRF/CsrfTokenManagerTest.php rename to tests/unit/lib/Security/CSRF/CsrfTokenManagerTest.php diff --git a/tests/lib/Security/CSRF/CsrfTokenTest.php b/tests/unit/lib/Security/CSRF/CsrfTokenTest.php similarity index 100% rename from tests/lib/Security/CSRF/CsrfTokenTest.php rename to tests/unit/lib/Security/CSRF/CsrfTokenTest.php diff --git a/tests/lib/Security/CSRF/TokenStorage/SessionStorageTest.php b/tests/unit/lib/Security/CSRF/TokenStorage/SessionStorageTest.php similarity index 100% rename from tests/lib/Security/CSRF/TokenStorage/SessionStorageTest.php rename to tests/unit/lib/Security/CSRF/TokenStorage/SessionStorageTest.php diff --git a/tests/lib/Security/CertificateManagerTest.php b/tests/unit/lib/Security/CertificateManagerTest.php similarity index 100% rename from tests/lib/Security/CertificateManagerTest.php rename to tests/unit/lib/Security/CertificateManagerTest.php diff --git a/tests/lib/Security/CertificateTest.php b/tests/unit/lib/Security/CertificateTest.php similarity index 100% rename from tests/lib/Security/CertificateTest.php rename to tests/unit/lib/Security/CertificateTest.php diff --git a/tests/lib/Security/CredentialsManagerTest.php b/tests/unit/lib/Security/CredentialsManagerTest.php similarity index 100% rename from tests/lib/Security/CredentialsManagerTest.php rename to tests/unit/lib/Security/CredentialsManagerTest.php diff --git a/tests/lib/Security/CryptoTest.php b/tests/unit/lib/Security/CryptoTest.php similarity index 100% rename from tests/lib/Security/CryptoTest.php rename to tests/unit/lib/Security/CryptoTest.php diff --git a/tests/lib/Security/Events/GenerateSecurePasswordEventTest.php b/tests/unit/lib/Security/Events/GenerateSecurePasswordEventTest.php similarity index 100% rename from tests/lib/Security/Events/GenerateSecurePasswordEventTest.php rename to tests/unit/lib/Security/Events/GenerateSecurePasswordEventTest.php diff --git a/tests/lib/Security/Events/ValidatePasswordPolicyEventTest.php b/tests/unit/lib/Security/Events/ValidatePasswordPolicyEventTest.php similarity index 100% rename from tests/lib/Security/Events/ValidatePasswordPolicyEventTest.php rename to tests/unit/lib/Security/Events/ValidatePasswordPolicyEventTest.php diff --git a/tests/lib/Security/FeaturePolicy/AddFeaturePolicyEventTest.php b/tests/unit/lib/Security/FeaturePolicy/AddFeaturePolicyEventTest.php similarity index 100% rename from tests/lib/Security/FeaturePolicy/AddFeaturePolicyEventTest.php rename to tests/unit/lib/Security/FeaturePolicy/AddFeaturePolicyEventTest.php diff --git a/tests/lib/Security/FeaturePolicy/FeaturePolicyManagerTest.php b/tests/unit/lib/Security/FeaturePolicy/FeaturePolicyManagerTest.php similarity index 100% rename from tests/lib/Security/FeaturePolicy/FeaturePolicyManagerTest.php rename to tests/unit/lib/Security/FeaturePolicy/FeaturePolicyManagerTest.php diff --git a/tests/lib/Security/HasherTest.php b/tests/unit/lib/Security/HasherTest.php similarity index 100% rename from tests/lib/Security/HasherTest.php rename to tests/unit/lib/Security/HasherTest.php diff --git a/tests/lib/Security/IdentityProof/KeyTest.php b/tests/unit/lib/Security/IdentityProof/KeyTest.php similarity index 100% rename from tests/lib/Security/IdentityProof/KeyTest.php rename to tests/unit/lib/Security/IdentityProof/KeyTest.php diff --git a/tests/lib/Security/IdentityProof/ManagerTest.php b/tests/unit/lib/Security/IdentityProof/ManagerTest.php similarity index 100% rename from tests/lib/Security/IdentityProof/ManagerTest.php rename to tests/unit/lib/Security/IdentityProof/ManagerTest.php diff --git a/tests/lib/Security/IdentityProof/SignerTest.php b/tests/unit/lib/Security/IdentityProof/SignerTest.php similarity index 100% rename from tests/lib/Security/IdentityProof/SignerTest.php rename to tests/unit/lib/Security/IdentityProof/SignerTest.php diff --git a/tests/lib/Security/Ip/BruteforceAllowListTest.php b/tests/unit/lib/Security/Ip/BruteforceAllowListTest.php similarity index 100% rename from tests/lib/Security/Ip/BruteforceAllowListTest.php rename to tests/unit/lib/Security/Ip/BruteforceAllowListTest.php diff --git a/tests/lib/Security/Ip/RemoteAddressTest.php b/tests/unit/lib/Security/Ip/RemoteAddressTest.php similarity index 100% rename from tests/lib/Security/Ip/RemoteAddressTest.php rename to tests/unit/lib/Security/Ip/RemoteAddressTest.php diff --git a/tests/lib/Security/Normalizer/IpAddressTest.php b/tests/unit/lib/Security/Normalizer/IpAddressTest.php similarity index 100% rename from tests/lib/Security/Normalizer/IpAddressTest.php rename to tests/unit/lib/Security/Normalizer/IpAddressTest.php diff --git a/tests/lib/Security/RateLimiting/Backend/MemoryCacheBackendTest.php b/tests/unit/lib/Security/RateLimiting/Backend/MemoryCacheBackendTest.php similarity index 100% rename from tests/lib/Security/RateLimiting/Backend/MemoryCacheBackendTest.php rename to tests/unit/lib/Security/RateLimiting/Backend/MemoryCacheBackendTest.php diff --git a/tests/lib/Security/RateLimiting/LimiterTest.php b/tests/unit/lib/Security/RateLimiting/LimiterTest.php similarity index 100% rename from tests/lib/Security/RateLimiting/LimiterTest.php rename to tests/unit/lib/Security/RateLimiting/LimiterTest.php diff --git a/tests/lib/Security/RemoteHostValidatorIntegrationTest.php b/tests/unit/lib/Security/RemoteHostValidatorIntegrationTest.php similarity index 100% rename from tests/lib/Security/RemoteHostValidatorIntegrationTest.php rename to tests/unit/lib/Security/RemoteHostValidatorIntegrationTest.php diff --git a/tests/lib/Security/RemoteHostValidatorTest.php b/tests/unit/lib/Security/RemoteHostValidatorTest.php similarity index 100% rename from tests/lib/Security/RemoteHostValidatorTest.php rename to tests/unit/lib/Security/RemoteHostValidatorTest.php diff --git a/tests/lib/Security/SecureRandomTest.php b/tests/unit/lib/Security/SecureRandomTest.php similarity index 100% rename from tests/lib/Security/SecureRandomTest.php rename to tests/unit/lib/Security/SecureRandomTest.php diff --git a/tests/lib/Security/Signature/Model/Rfc9421RoundTripTest.php b/tests/unit/lib/Security/Signature/Model/Rfc9421RoundTripTest.php similarity index 100% rename from tests/lib/Security/Signature/Model/Rfc9421RoundTripTest.php rename to tests/unit/lib/Security/Signature/Model/Rfc9421RoundTripTest.php diff --git a/tests/lib/Security/Signature/Rfc9421/AlgorithmTest.php b/tests/unit/lib/Security/Signature/Rfc9421/AlgorithmTest.php similarity index 100% rename from tests/lib/Security/Signature/Rfc9421/AlgorithmTest.php rename to tests/unit/lib/Security/Signature/Rfc9421/AlgorithmTest.php diff --git a/tests/lib/Security/Signature/Rfc9421/ContentDigestTest.php b/tests/unit/lib/Security/Signature/Rfc9421/ContentDigestTest.php similarity index 100% rename from tests/lib/Security/Signature/Rfc9421/ContentDigestTest.php rename to tests/unit/lib/Security/Signature/Rfc9421/ContentDigestTest.php diff --git a/tests/lib/Security/Signature/Rfc9421/SignatureBaseTest.php b/tests/unit/lib/Security/Signature/Rfc9421/SignatureBaseTest.php similarity index 100% rename from tests/lib/Security/Signature/Rfc9421/SignatureBaseTest.php rename to tests/unit/lib/Security/Signature/Rfc9421/SignatureBaseTest.php diff --git a/tests/lib/Security/Signature/SignatureManagerDispatchTest.php b/tests/unit/lib/Security/Signature/SignatureManagerDispatchTest.php similarity index 100% rename from tests/lib/Security/Signature/SignatureManagerDispatchTest.php rename to tests/unit/lib/Security/Signature/SignatureManagerDispatchTest.php diff --git a/tests/lib/Security/TrustedDomainHelperTest.php b/tests/unit/lib/Security/TrustedDomainHelperTest.php similarity index 100% rename from tests/lib/Security/TrustedDomainHelperTest.php rename to tests/unit/lib/Security/TrustedDomainHelperTest.php diff --git a/tests/lib/Security/VerificationToken/VerificationTokenTest.php b/tests/unit/lib/Security/VerificationToken/VerificationTokenTest.php similarity index 100% rename from tests/lib/Security/VerificationToken/VerificationTokenTest.php rename to tests/unit/lib/Security/VerificationToken/VerificationTokenTest.php diff --git a/tests/lib/ServerTest.php b/tests/unit/lib/ServerTest.php similarity index 100% rename from tests/lib/ServerTest.php rename to tests/unit/lib/ServerTest.php diff --git a/tests/lib/Session/CryptoSessionDataTest.php b/tests/unit/lib/Session/CryptoSessionDataTest.php similarity index 100% rename from tests/lib/Session/CryptoSessionDataTest.php rename to tests/unit/lib/Session/CryptoSessionDataTest.php diff --git a/tests/lib/Session/CryptoWrappingTest.php b/tests/unit/lib/Session/CryptoWrappingTest.php similarity index 100% rename from tests/lib/Session/CryptoWrappingTest.php rename to tests/unit/lib/Session/CryptoWrappingTest.php diff --git a/tests/lib/Session/MemoryTest.php b/tests/unit/lib/Session/MemoryTest.php similarity index 100% rename from tests/lib/Session/MemoryTest.php rename to tests/unit/lib/Session/MemoryTest.php diff --git a/tests/lib/Session/Session.php b/tests/unit/lib/Session/Session.php similarity index 100% rename from tests/lib/Session/Session.php rename to tests/unit/lib/Session/Session.php diff --git a/tests/lib/Settings/DeclarativeManagerTest.php b/tests/unit/lib/Settings/DeclarativeManagerTest.php similarity index 100% rename from tests/lib/Settings/DeclarativeManagerTest.php rename to tests/unit/lib/Settings/DeclarativeManagerTest.php diff --git a/tests/lib/Settings/ManagerTest.php b/tests/unit/lib/Settings/ManagerTest.php similarity index 100% rename from tests/lib/Settings/ManagerTest.php rename to tests/unit/lib/Settings/ManagerTest.php diff --git a/tests/lib/Settings/SectionTest.php b/tests/unit/lib/Settings/SectionTest.php similarity index 100% rename from tests/lib/Settings/SectionTest.php rename to tests/unit/lib/Settings/SectionTest.php diff --git a/tests/lib/SetupCheck/CheckServerResponseTraitImplementation.php b/tests/unit/lib/SetupCheck/CheckServerResponseTraitImplementation.php similarity index 100% rename from tests/lib/SetupCheck/CheckServerResponseTraitImplementation.php rename to tests/unit/lib/SetupCheck/CheckServerResponseTraitImplementation.php diff --git a/tests/lib/SetupCheck/CheckServerResponseTraitTest.php b/tests/unit/lib/SetupCheck/CheckServerResponseTraitTest.php similarity index 100% rename from tests/lib/SetupCheck/CheckServerResponseTraitTest.php rename to tests/unit/lib/SetupCheck/CheckServerResponseTraitTest.php diff --git a/tests/lib/SetupTest.php b/tests/unit/lib/SetupTest.php similarity index 100% rename from tests/lib/SetupTest.php rename to tests/unit/lib/SetupTest.php diff --git a/tests/lib/Share20/DefaultShareProviderTest.php b/tests/unit/lib/Share20/DefaultShareProviderTest.php similarity index 100% rename from tests/lib/Share20/DefaultShareProviderTest.php rename to tests/unit/lib/Share20/DefaultShareProviderTest.php diff --git a/tests/lib/Share20/LegacyHooksTest.php b/tests/unit/lib/Share20/LegacyHooksTest.php similarity index 100% rename from tests/lib/Share20/LegacyHooksTest.php rename to tests/unit/lib/Share20/LegacyHooksTest.php diff --git a/tests/lib/Share20/ManagerTest.php b/tests/unit/lib/Share20/ManagerTest.php similarity index 100% rename from tests/lib/Share20/ManagerTest.php rename to tests/unit/lib/Share20/ManagerTest.php diff --git a/tests/lib/Share20/ShareByMailProviderTest.php b/tests/unit/lib/Share20/ShareByMailProviderTest.php similarity index 100% rename from tests/lib/Share20/ShareByMailProviderTest.php rename to tests/unit/lib/Share20/ShareByMailProviderTest.php diff --git a/tests/lib/Share20/ShareHelperTest.php b/tests/unit/lib/Share20/ShareHelperTest.php similarity index 100% rename from tests/lib/Share20/ShareHelperTest.php rename to tests/unit/lib/Share20/ShareHelperTest.php diff --git a/tests/lib/Share20/ShareTest.php b/tests/unit/lib/Share20/ShareTest.php similarity index 100% rename from tests/lib/Share20/ShareTest.php rename to tests/unit/lib/Share20/ShareTest.php diff --git a/tests/lib/Snowflake/APCuTest.php b/tests/unit/lib/Snowflake/APCuTest.php similarity index 100% rename from tests/lib/Snowflake/APCuTest.php rename to tests/unit/lib/Snowflake/APCuTest.php diff --git a/tests/lib/Snowflake/DecoderTest.php b/tests/unit/lib/Snowflake/DecoderTest.php similarity index 100% rename from tests/lib/Snowflake/DecoderTest.php rename to tests/unit/lib/Snowflake/DecoderTest.php diff --git a/tests/lib/Snowflake/FileSequenceTest.php b/tests/unit/lib/Snowflake/FileSequenceTest.php similarity index 100% rename from tests/lib/Snowflake/FileSequenceTest.php rename to tests/unit/lib/Snowflake/FileSequenceTest.php diff --git a/tests/lib/Snowflake/GeneratorTest.php b/tests/unit/lib/Snowflake/GeneratorTest.php similarity index 100% rename from tests/lib/Snowflake/GeneratorTest.php rename to tests/unit/lib/Snowflake/GeneratorTest.php diff --git a/tests/lib/Snowflake/ISequenceBase.php b/tests/unit/lib/Snowflake/ISequenceBase.php similarity index 100% rename from tests/lib/Snowflake/ISequenceBase.php rename to tests/unit/lib/Snowflake/ISequenceBase.php diff --git a/tests/lib/SubAdminTest.php b/tests/unit/lib/SubAdminTest.php similarity index 100% rename from tests/lib/SubAdminTest.php rename to tests/unit/lib/SubAdminTest.php diff --git a/tests/lib/Support/CrashReport/RegistryTest.php b/tests/unit/lib/Support/CrashReport/RegistryTest.php similarity index 100% rename from tests/lib/Support/CrashReport/RegistryTest.php rename to tests/unit/lib/Support/CrashReport/RegistryTest.php diff --git a/tests/lib/Support/Subscription/DummySubscription.php b/tests/unit/lib/Support/Subscription/DummySubscription.php similarity index 100% rename from tests/lib/Support/Subscription/DummySubscription.php rename to tests/unit/lib/Support/Subscription/DummySubscription.php diff --git a/tests/lib/Support/Subscription/RegistryTest.php b/tests/unit/lib/Support/Subscription/RegistryTest.php similarity index 100% rename from tests/lib/Support/Subscription/RegistryTest.php rename to tests/unit/lib/Support/Subscription/RegistryTest.php diff --git a/tests/lib/SystemTag/SystemTagManagerTest.php b/tests/unit/lib/SystemTag/SystemTagManagerTest.php similarity index 100% rename from tests/lib/SystemTag/SystemTagManagerTest.php rename to tests/unit/lib/SystemTag/SystemTagManagerTest.php diff --git a/tests/lib/SystemTag/SystemTagObjectMapperTest.php b/tests/unit/lib/SystemTag/SystemTagObjectMapperTest.php similarity index 100% rename from tests/lib/SystemTag/SystemTagObjectMapperTest.php rename to tests/unit/lib/SystemTag/SystemTagObjectMapperTest.php diff --git a/tests/lib/TagsTest.php b/tests/unit/lib/TagsTest.php similarity index 100% rename from tests/lib/TagsTest.php rename to tests/unit/lib/TagsTest.php diff --git a/tests/lib/Talk/BrokerTest.php b/tests/unit/lib/Talk/BrokerTest.php similarity index 100% rename from tests/lib/Talk/BrokerTest.php rename to tests/unit/lib/Talk/BrokerTest.php diff --git a/tests/lib/Talk/ConversationOptionsTest.php b/tests/unit/lib/Talk/ConversationOptionsTest.php similarity index 100% rename from tests/lib/Talk/ConversationOptionsTest.php rename to tests/unit/lib/Talk/ConversationOptionsTest.php diff --git a/tests/lib/TaskProcessing/TaskProcessingTest.php b/tests/unit/lib/TaskProcessing/TaskProcessingTest.php similarity index 100% rename from tests/lib/TaskProcessing/TaskProcessingTest.php rename to tests/unit/lib/TaskProcessing/TaskProcessingTest.php diff --git a/tests/lib/TempManagerTest.php b/tests/unit/lib/TempManagerTest.php similarity index 100% rename from tests/lib/TempManagerTest.php rename to tests/unit/lib/TempManagerTest.php diff --git a/tests/lib/Template/CSSResourceLocatorTest.php b/tests/unit/lib/Template/CSSResourceLocatorTest.php similarity index 100% rename from tests/lib/Template/CSSResourceLocatorTest.php rename to tests/unit/lib/Template/CSSResourceLocatorTest.php diff --git a/tests/lib/Template/JSCombinerTest.php b/tests/unit/lib/Template/JSCombinerTest.php similarity index 100% rename from tests/lib/Template/JSCombinerTest.php rename to tests/unit/lib/Template/JSCombinerTest.php diff --git a/tests/lib/Template/JSResourceLocatorTest.php b/tests/unit/lib/Template/JSResourceLocatorTest.php similarity index 100% rename from tests/lib/Template/JSResourceLocatorTest.php rename to tests/unit/lib/Template/JSResourceLocatorTest.php diff --git a/tests/lib/Template/ResourceLocatorTest.php b/tests/unit/lib/Template/ResourceLocatorTest.php similarity index 100% rename from tests/lib/Template/ResourceLocatorTest.php rename to tests/unit/lib/Template/ResourceLocatorTest.php diff --git a/tests/lib/Template/data/1.js b/tests/unit/lib/Template/data/1.js similarity index 100% rename from tests/lib/Template/data/1.js rename to tests/unit/lib/Template/data/1.js diff --git a/tests/lib/Template/data/1.js.license b/tests/unit/lib/Template/data/1.js.license similarity index 100% rename from tests/lib/Template/data/1.js.license rename to tests/unit/lib/Template/data/1.js.license diff --git a/tests/lib/Template/data/2.js b/tests/unit/lib/Template/data/2.js similarity index 100% rename from tests/lib/Template/data/2.js rename to tests/unit/lib/Template/data/2.js diff --git a/tests/lib/Template/data/2.js.license b/tests/unit/lib/Template/data/2.js.license similarity index 100% rename from tests/lib/Template/data/2.js.license rename to tests/unit/lib/Template/data/2.js.license diff --git a/tests/lib/Template/data/combine.json b/tests/unit/lib/Template/data/combine.json similarity index 100% rename from tests/lib/Template/data/combine.json rename to tests/unit/lib/Template/data/combine.json diff --git a/tests/lib/Template/data/combine.json.license b/tests/unit/lib/Template/data/combine.json.license similarity index 100% rename from tests/lib/Template/data/combine.json.license rename to tests/unit/lib/Template/data/combine.json.license diff --git a/tests/lib/TemplateFunctionsTest.php b/tests/unit/lib/TemplateFunctionsTest.php similarity index 100% rename from tests/lib/TemplateFunctionsTest.php rename to tests/unit/lib/TemplateFunctionsTest.php diff --git a/tests/lib/TemplateLayoutTest.php b/tests/unit/lib/TemplateLayoutTest.php similarity index 100% rename from tests/lib/TemplateLayoutTest.php rename to tests/unit/lib/TemplateLayoutTest.php diff --git a/tests/lib/TestCase.php b/tests/unit/lib/TestCase.php similarity index 100% rename from tests/lib/TestCase.php rename to tests/unit/lib/TestCase.php diff --git a/tests/lib/TestMoveableMountPoint.php b/tests/unit/lib/TestMoveableMountPoint.php similarity index 100% rename from tests/lib/TestMoveableMountPoint.php rename to tests/unit/lib/TestMoveableMountPoint.php diff --git a/tests/lib/TextProcessing/TextProcessingTest.php b/tests/unit/lib/TextProcessing/TextProcessingTest.php similarity index 100% rename from tests/lib/TextProcessing/TextProcessingTest.php rename to tests/unit/lib/TextProcessing/TextProcessingTest.php diff --git a/tests/lib/Traits/ClientServiceTrait.php b/tests/unit/lib/Traits/ClientServiceTrait.php similarity index 100% rename from tests/lib/Traits/ClientServiceTrait.php rename to tests/unit/lib/Traits/ClientServiceTrait.php diff --git a/tests/lib/Traits/EmailValidatorTrait.php b/tests/unit/lib/Traits/EmailValidatorTrait.php similarity index 100% rename from tests/lib/Traits/EmailValidatorTrait.php rename to tests/unit/lib/Traits/EmailValidatorTrait.php diff --git a/tests/lib/Traits/EncryptionTrait.php b/tests/unit/lib/Traits/EncryptionTrait.php similarity index 100% rename from tests/lib/Traits/EncryptionTrait.php rename to tests/unit/lib/Traits/EncryptionTrait.php diff --git a/tests/lib/Traits/GroupTrait.php b/tests/unit/lib/Traits/GroupTrait.php similarity index 100% rename from tests/lib/Traits/GroupTrait.php rename to tests/unit/lib/Traits/GroupTrait.php diff --git a/tests/lib/Traits/MountProviderTrait.php b/tests/unit/lib/Traits/MountProviderTrait.php similarity index 100% rename from tests/lib/Traits/MountProviderTrait.php rename to tests/unit/lib/Traits/MountProviderTrait.php diff --git a/tests/lib/Traits/UserTrait.php b/tests/unit/lib/Traits/UserTrait.php similarity index 100% rename from tests/lib/Traits/UserTrait.php rename to tests/unit/lib/Traits/UserTrait.php diff --git a/tests/lib/Updater/ReleaseMetadataTest.php b/tests/unit/lib/Updater/ReleaseMetadataTest.php similarity index 100% rename from tests/lib/Updater/ReleaseMetadataTest.php rename to tests/unit/lib/Updater/ReleaseMetadataTest.php diff --git a/tests/lib/Updater/VersionCheckTest.php b/tests/unit/lib/Updater/VersionCheckTest.php similarity index 100% rename from tests/lib/Updater/VersionCheckTest.php rename to tests/unit/lib/Updater/VersionCheckTest.php diff --git a/tests/lib/UpdaterTest.php b/tests/unit/lib/UpdaterTest.php similarity index 100% rename from tests/lib/UpdaterTest.php rename to tests/unit/lib/UpdaterTest.php diff --git a/tests/lib/UrlGeneratorTest.php b/tests/unit/lib/UrlGeneratorTest.php similarity index 100% rename from tests/lib/UrlGeneratorTest.php rename to tests/unit/lib/UrlGeneratorTest.php diff --git a/tests/lib/User/AvailabilityCoordinatorTest.php b/tests/unit/lib/User/AvailabilityCoordinatorTest.php similarity index 100% rename from tests/lib/User/AvailabilityCoordinatorTest.php rename to tests/unit/lib/User/AvailabilityCoordinatorTest.php diff --git a/tests/lib/User/AvatarUserDummy.php b/tests/unit/lib/User/AvatarUserDummy.php similarity index 100% rename from tests/lib/User/AvatarUserDummy.php rename to tests/unit/lib/User/AvatarUserDummy.php diff --git a/tests/lib/User/Backend.php b/tests/unit/lib/User/Backend.php similarity index 100% rename from tests/lib/User/Backend.php rename to tests/unit/lib/User/Backend.php diff --git a/tests/lib/User/DatabaseTest.php b/tests/unit/lib/User/DatabaseTest.php similarity index 100% rename from tests/lib/User/DatabaseTest.php rename to tests/unit/lib/User/DatabaseTest.php diff --git a/tests/lib/User/Dummy.php b/tests/unit/lib/User/Dummy.php similarity index 100% rename from tests/lib/User/Dummy.php rename to tests/unit/lib/User/Dummy.php diff --git a/tests/lib/User/ManagerTest.php b/tests/unit/lib/User/ManagerTest.php similarity index 100% rename from tests/lib/User/ManagerTest.php rename to tests/unit/lib/User/ManagerTest.php diff --git a/tests/lib/User/SessionTest.php b/tests/unit/lib/User/SessionTest.php similarity index 100% rename from tests/lib/User/SessionTest.php rename to tests/unit/lib/User/SessionTest.php diff --git a/tests/lib/User/UserTest.php b/tests/unit/lib/User/UserTest.php similarity index 100% rename from tests/lib/User/UserTest.php rename to tests/unit/lib/User/UserTest.php diff --git a/tests/lib/Util/Group/Dummy.php b/tests/unit/lib/Util/Group/Dummy.php similarity index 100% rename from tests/lib/Util/Group/Dummy.php rename to tests/unit/lib/Util/Group/Dummy.php diff --git a/tests/lib/Util/User/Dummy.php b/tests/unit/lib/Util/User/Dummy.php similarity index 100% rename from tests/lib/Util/User/Dummy.php rename to tests/unit/lib/Util/User/Dummy.php diff --git a/tests/lib/UtilCheckServerTest.php b/tests/unit/lib/UtilCheckServerTest.php similarity index 100% rename from tests/lib/UtilCheckServerTest.php rename to tests/unit/lib/UtilCheckServerTest.php diff --git a/tests/lib/UtilTest.php b/tests/unit/lib/UtilTest.php similarity index 100% rename from tests/lib/UtilTest.php rename to tests/unit/lib/UtilTest.php diff --git a/tests/phpunit-autotest-external.xml b/tests/unit/phpunit-autotest-external.xml similarity index 65% rename from tests/phpunit-autotest-external.xml rename to tests/unit/phpunit-autotest-external.xml index c1d73af63523e..45aa78237ad2d 100644 --- a/tests/phpunit-autotest-external.xml +++ b/tests/unit/phpunit-autotest-external.xml @@ -14,19 +14,19 @@ cacheDirectory=".phpunit.cache" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"> - ../apps/files_external/tests + ../../apps/files_external/tests - ../apps/files_external/tests/Storage/ + ../../apps/files_external/tests/Storage/ - ../lib/private/Files/Storage/DAV.php - ../apps/files_external + ../../lib/private/Files/Storage/DAV.php + ../../apps/files_external - ../apps/files_external/l10n - ../apps/files_external/3rdparty - ../apps/files_external/tests + ../../apps/files_external/l10n + ../../apps/files_external/3rdparty + ../../apps/files_external/tests diff --git a/tests/phpunit-autotest.xml b/tests/unit/phpunit-autotest.xml similarity index 60% rename from tests/phpunit-autotest.xml rename to tests/unit/phpunit-autotest.xml index 94f8e0a978770..cd7c1991c8e1a 100644 --- a/tests/phpunit-autotest.xml +++ b/tests/unit/phpunit-autotest.xml @@ -16,24 +16,24 @@ lib/ Core/ - ../apps/ - ../apps/user_ldap/tests/Integration + ../../apps/ + ../../apps/user_ldap/tests/Integration - ../apps/files_external + ../../apps/files_external - .. + ../.. - ../3rdparty - ../apps/*/composer - ../apps/*/tests - ../apps/files_external - ../build - ../lib/composer - ../tests - ../vendor-bin + ../../3rdparty + ../../apps/*/composer + ../../apps/*/tests + ../../apps/files_external + ../../build + ../../lib/composer + ../../tests + ../../vendor-bin