chore: consolidate test files into /tests directory

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

Author: susnux

.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

.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

autotest-external.sh

@@ -95,16 +95,16 @@ 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"
 	mkdir "$DATADIR"
 
 	# 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 ...."

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"

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"