Drop atoum

Author: cedric-anne

.github/actions/init_initialize-ldap-fixtures.sh

@@ -6,6 +6,6 @@ ROOT_DIR=$(readlink -f "$(dirname $0)/../..")
 # Recursively delete all LDAP entries
 docker compose exec -T openldap ldapdelete -x -r -H ldap://127.0.0.1:3890/ -D "cn=Manager,dc=glpi,dc=org" -w insecure -c "dc=glpi,dc=org" || true
 
-for f in `ls $ROOT_DIR/phpunit/LDAP/ldif/*.ldif`; do
+for f in `ls $ROOT_DIR/tests/LDAP/ldif/*.ldif`; do
   cat $f | docker compose exec -T openldap ldapadd -x -H ldap://127.0.0.1:3890/ -D "cn=Manager,dc=glpi,dc=org" -w insecure
 done

.github/actions/test_tests-functional.sh

@@ -1,35 +1,4 @@
 #!/bin/bash
 set -e -u -x -o pipefail
 
-# Get additional test arguments from -f, -d and -m options.
-SCOPE="-d tests/functional"
-METHODS=""
-while getopts ":d:f:m:" OPTNAME; do
-  case $OPTNAME in
-    d|f)
-      SCOPE="-${OPTNAME} ${OPTARG}"
-      ;;
-    m)
-      METHODS="-m ${OPTARG}"
-      ;;
-    \?)
-      echo "Invalid option: -$OPTARG" >&2
-      exit 1
-      ;;
-  esac
-done
-
-vendor/bin/atoum \
-  -p 'php -d memory_limit=512M' \
-  --debug \
-  --force-terminal \
-  --use-dot-report \
-  --bootstrap-file tests/bootstrap.php \
-  --fail-if-void-methods \
-  --fail-if-skipped-methods \
-  --no-code-coverage \
-  --max-children-number 1 \
-  $SCOPE \
-  $METHODS
-
-unset COVERAGE_DIR
+vendor/bin/phpunit $@

.github/actions/test_tests-imap.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 set -e -u -x -o pipefail
 
-vendor/bin/phpunit phpunit/imap $@
+vendor/bin/phpunit tests/imap $@

.github/actions/test_tests-ldap.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 set -e -u -x -o pipefail
 
-vendor/bin/phpunit phpunit/LDAP $@
+vendor/bin/phpunit tests/LDAP $@

.github/actions/test_tests-phpunit.sh

@@ -2,5 +2,5 @@
 set -e -u -x -o pipefail
 
 bin/console config:set --context=inventory enabled_inventory 1
-vendor/bin/phpunit phpunit/web $@
+vendor/bin/phpunit tests/web $@
 bin/console config:set --context=inventory enabled_inventory 0

.github/actions/test_tests-web.sh

@@ -206,10 +206,6 @@ jobs:
         run: |
           .github/actions/init_initialize-9.5-db.sh
           docker compose exec -T app .github/actions/test_update-from-9.5.sh
-      - name: "PHPUnit tests"
-        if: "${{ success() || failure() }}"
-        run: |
-          docker compose exec -T app .github/actions/test_tests-phpunit.sh
       - name: "Functional tests"
         if: "${{ success() || failure() }}"
         run: |

.github/workflows/ci.yml

@@ -16,11 +16,12 @@
 /vendor/*
 !/vendor/.htaccess
 phpunit.xml
+/tests/config/
+/tests/coverage/
 /tests/cypress/screenshots/
 /tests/cypress/downloads/
 /tests/cypress/videos/
 /tests/files/
-/tests/code-coverage/
 /tests/.env
 /nbproject
 .composer.hash
@@ -41,9 +42,6 @@ phpunit.xml
 /.devcontainer/docker-compose.override.yaml
 phpstan.neon
 /.phpunit.result.cache
-/phpunit/files/
-/phpunit/config
-/phpunit/coverage/
 *.phar
 .env
 /resources/.illustrations_translations.php

.gitignore

@@ -147,7 +147,7 @@ npm: ## Run a npm command, example: make npm c='install mypackage/package'
 .PHONY: npm
 
 ## —— Testing and static analysis ——————————————————————————————————————————————
-phpunit: ## Run phpunits tests, example: make phpunit c='phpunit/functional/Glpi/MySpecificTest.php'
+phpunit: ## Run phpunits tests, example: make phpunit c='tests/functional/Glpi/MySpecificTest.php'
 	@$(eval c ?=)
 	@$(PHP) php vendor/bin/phpunit $(c)
 .PHONY: phpunit

Makefile

@@ -125,7 +125,7 @@ test:  ## Run all our lints/tests/static analysis
 	@$(call run_if_exists, phpunit.xml, phpunit)
 .PHONY: test
 
-phpunit: ## Run phpunits tests, example: make phpunit c='phpunit/functional/Glpi/MySpecificTest.php'
+phpunit: ## Run phpunits tests, example: make phpunit c='tests/functional/Glpi/MySpecificTest.php'
 	@$(eval c ?=)
 	@$(PLUGIN) php $(PHPUNIT_BIN) $(c)
 .PHONY: phpunit