feat: add phpunits

2 types de tests: unitaire: tester une classe seule sans dépendance = github workflow phpunit.yml intégration: tester jeedom en fonctionnement, utilise docker pour démarrer la bdd et le container jeedom = github workflow docker-test.yml
jeedom · Dec 8, 2024 · cbcf7d3 · cbcf7d3
1 parent 4bea7ea
commit cbcf7d3
Show file tree

Hide file tree

Showing 66 changed files with 2,013 additions and 1,774 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,3 @@
+.git
+/vendor
+/docs
diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml
@@ -1,13 +1,17 @@
-# build docker image based on debian bullseye and bookworm
+# build docker image based on debian bullseye or bookworm
 # start both containers and run sick.php
+# install composer dev depedencies and run phpunits into running containers
 # stop & clean
-name: Docker Test Image
+name: Integrated PHPUnit
 
 on:
   # only trigger CI when pull request on following branches
   pull_request:
     branches:
       - 'alpha'
+  push:
+    branches:
+      - 'feat/run_phpunit'
   # this is to manually trigger the worklow
   workflow_dispatch:
     inputs:
@@ -30,21 +34,32 @@ jobs:
         run: |
           docker build -t jeedom:bullseye --build-arg DEBIAN=bullseye --build-arg DATABASE=1 .
       - name: run jeedom:bullseye and check
-        # build current image for bullseye and check it
+        # run current image for bullseye and check it
         run: |
           docker run -p 80:80 -d --rm --name jeedom_bullseye jeedom:bullseye
-          sleep 45
+          until [ "`docker inspect -f {{.State.Health.Status}} jeedom_bullseye`" == "healthy" ]; do
+            echo "waiting container to be healthy..."
+            sleep 5;
+          done;
           docker exec jeedom_bullseye php sick.php
+          docker exec jeedom_bullseye /bin/bash -c "COMPOSER_NO_DEV=0 && composer install"
+          docker exec jeedom_bullseye ./vendor/bin/phpunit --testsuite integration
+
       - name: Build jeedom:bookworm
         # build current image for bookworm
         run: |
           docker build -t jeedom:bookworm --build-arg DEBIAN=bookworm --build-arg DATABASE=1 .
       - name: run jeedom:bookworm and check
-        # build current image for bookworm and check it
+        # run current image for bookworm and check it
         run: |
           docker run -p 81:80 -d --rm --name jeedom_bookworm jeedom:bookworm
-          sleep 45
+          until [ "`docker inspect -f {{.State.Health.Status}} jeedom_bullseye`" == "healthy" ]; do
+            echo "waiting container to be healthy..."
+            sleep 5;
+          done;
           docker exec jeedom_bookworm php sick.php
+          docker exec jeedom_bookworm /bin/bash -c "COMPOSER_NO_DEV=0 && composer install"
+          docker exec jeedom_bookworm ./vendor/bin/phpunit --testsuite integration
     
       - name: Clean docker image
         continue-on-error: true

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -0,0 +1,35 @@
+# tests unitaires exécutés directement dans le contexte courant
+# Aucune bdd, Jeedom non démarré
+name: Standalone PHPUnit
+
+on:
+  push:
+    # only trigger CI when push on following branches
+    branches:
+    - feat/run_phpunit
+    - alpha
+  pull_request:
+    branches:
+    - alpha
+
+jobs:
+  build-test:
+    runs-on: ubuntu-latest
+
+    steps:
+    # checkout repo
+    # https://github.com/marketplace/actions/checkout
+    - uses: actions/checkout@v4
+    # composer installation
+    # https://github.com/marketplace/actions/composer-php-actions
+    - name: composer installation
+      uses: php-actions/composer@v6
+    # trigger phpunit using custom xml configuration
+    # https://github.com/marketplace/actions/phpunit-php-actions
+    - name: run standalone phpunit
+      uses: php-actions/phpunit@v4
+      with:
+        php_version: 7.4
+        testsuite: unit
+        php_extensions: xdebug pdo_mysql
+        coverage_clover: coverage/clover.xml
diff --git a/.gitignore b/.gitignore
@@ -46,3 +46,4 @@ tmp/*
 
 !.htaccess
 .env
+.phpunit.result.cache
diff --git a/Dockerfile b/Dockerfile
@@ -42,26 +42,43 @@ RUN apt -o Dpkg::Options::="--force-confdef" -y install software-properties-comm
   gettext libcurl3-gnutls chromium librsync-dev ssl-cert iputils-ping \
   apache2 apache2-utils libexpat1 ssl-cert \
   php libapache2-mod-php php-json php-mysql php-curl php-gd php-imap php-xml php-opcache php-soap php-xmlrpc \
-  php-common php-dev php-zip php-ssh2 php-mbstring php-ldap php-yaml php-snmp && apt -y remove brltty
+  php-common php-dev php-zip php-ssh2 php-mbstring php-ldap php-yaml php-snmp && apt -y remove brltty \
+  > /dev/null
 
-COPY install/install.sh /tmp/
-RUN sh /tmp/install.sh -s 1 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
-RUN sh /tmp/install.sh -s 2 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
-RUN sh /tmp/install.sh -s 3 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
-RUN sh /tmp/install.sh -s 4 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
-RUN sh /tmp/install.sh -s 5 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
+COPY --chown=root:root --chmod=550 install/install.sh /root/
+# install step by step : step_1_upgrade ... useless, using the LATEST debian
+RUN sh /root/install.sh -s 1 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
+# step_2_mainpackage ... useless, already installed before
+# RUN sh /root/install.sh -s 2 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
+# step_3_database ... only if $DATABASE
+RUN sh /root/install.sh -s 3 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
+# step_4_apache
+RUN sh /root/install.sh -s 4 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
+# step_5_php : install php with extensions
+RUN sh /root/install.sh -s 5 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
+# step 6 : copy jeedom source files from local
 COPY . ${WEBSERVER_HOME}
-RUN sh /tmp/install.sh -s 7 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
-RUN sh /tmp/install.sh -s 8 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
-RUN sh /tmp/install.sh -s 9 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
-RUN sh /tmp/install.sh -s 10 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
-RUN sh /tmp/install.sh -s 11 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
+# step_7_jeedom_customization_mariadb
+RUN sh /root/install.sh -s 7 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
+# step_8_jeedom_customization
+RUN sh /root/install.sh -s 8 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
+# step_9_jeedom_configuration
+RUN sh /root/install.sh -s 9 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
+# step_10_jeedom_installation
+RUN sh /root/install.sh -s 10 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
+# step_11_jeedom_post
+RUN sh /root/install.sh -s 11 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
+
 RUN apt-get clean && rm -rf /var/lib/apt/lists/* 
 RUN echo >${WEBSERVER_HOME}/initialisation
 
 WORKDIR ${WEBSERVER_HOME}
+# check apache is running
+HEALTHCHECK --interval=1m --timeout=3s --retries=5 --start-period=10s --start-interval=5s \
+  CMD curl -f http://localhost/ || exit 1
+
 EXPOSE 80
 EXPOSE 443
 COPY --chown=root:root --chmod=550 install/OS_specific/Docker/init.sh /root/
 COPY --chown=root:root --chmod=550 install/bashrc /root/.bashrc
-CMD ["bash", "/root/init.sh"]
+CMD ["/root/init.sh"]
diff --git a/composer.json b/composer.json
@@ -7,8 +7,11 @@
     "psr/log": "^1.1"
   },
   "config": {
-    "allow-plugins": {
-      "php-http/discovery": true
-    }
+      "allow-plugins": {
+          "php-http/discovery": true
+      }
+  },
+  "require-dev": {
+    "phpunit/phpunit": "^9.6"
   }
-}
+}
-Original file line number
+Diff line change
@@ -0,0 +1,3 @@
+    .git
+    /vendor
+    /docs
Original file line number	Diff line number	Diff line change
Expand Up		@@ -46,3 +46,4 @@ tmp/*

		!.htaccess
		.env
		.phpunit.result.cache