From 5f33ba0741285e74b3430c01da2778031ef25a86 Mon Sep 17 00:00:00 2001
From: Alain Mazy <alain@mazy.be>
Date: Fri, 6 Sep 2024 17:19:52 +0200
Subject: [PATCH] added DICOMWeb tests with PG

---
 .../docker-compose.postgres-dicomweb.yml      | 29 +++++++++++++++++++
 .../run-integration-tests.sh                  |  6 ++++
 2 files changed, 35 insertions(+)
 create mode 100644 docker/integration-tests/docker-compose.postgres-dicomweb.yml

diff --git a/docker/integration-tests/docker-compose.postgres-dicomweb.yml b/docker/integration-tests/docker-compose.postgres-dicomweb.yml
new file mode 100644
index 00000000..2ff12a26
--- /dev/null
+++ b/docker/integration-tests/docker-compose.postgres-dicomweb.yml
@@ -0,0 +1,29 @@
+version: "2"
+services:
+  orthanc-under-tests:
+    image: orthanc-under-tests
+    depends_on:
+      - pg
+    environment:
+      ORTHANC__POSTGRESQL__HOST: "pg"
+      ORTHANC__POSTGRESQL__DATABASE: "postgres"
+      ORTHANC__POSTGRESQL__USERNAME: "postgres"
+      ORTHANC__POSTGRESQL__PASSWORD: "postgres"
+      ORTHANC__POSTGRESQL__ENABLE_INDEX: "true"
+      ORTHANC__POSTGRESQL__ENABLE_STORAGE: "true"
+
+      ORTHANC__POSTGRESQL__TRANSACTION_MODE: "ReadCommitted"
+    
+      # VERBOSE_ENABLED: "true"
+      VERBOSE_STARTUP: "true"
+      GDCM_PLUGIN_ENABLED: "false"
+
+  orthanc-tests-dicomweb:
+    image: orthanc-tests-dicomweb
+    depends_on:
+      - orthanc-under-tests
+
+  pg:
+    image: postgres:16
+    environment:
+      POSTGRES_PASSWORD: "postgres"
diff --git a/docker/integration-tests/run-integration-tests.sh b/docker/integration-tests/run-integration-tests.sh
index fea8807c..e8d38452 100755
--- a/docker/integration-tests/run-integration-tests.sh
+++ b/docker/integration-tests/run-integration-tests.sh
@@ -159,6 +159,12 @@ if [[ $image == "normal" ]]; then
     COMPOSE_FILE=docker-compose.postgres-serializable.yml       docker compose down -v
     COMPOSE_FILE=docker-compose.postgres-serializable.yml       docker compose up --build --exit-code-from orthanc-tests --abort-on-container-exit
 
+    COMPOSE_FILE=docker-compose.postgres-dicomweb.yml             docker compose down -v
+    COMPOSE_FILE=docker-compose.postgres-dicomweb.yml             docker compose up --build --exit-code-from orthanc-tests-dicomweb --abort-on-container-exit
+
+    # TODO: add mysql-dicomweb tests
+    # TODO: add sqlserver-dicomweb tests
+
     COMPOSE_FILE=docker-compose.odbc-postgres.yml               docker compose down -v
     COMPOSE_FILE=docker-compose.odbc-postgres.yml               docker compose up --build --exit-code-from orthanc-tests --abort-on-container-exit