Pull request #64: Reorganize test modules

Merge in EDELIVERY/smp from EDELIVERY-12701-reorganize-maven-testing-modulues to development

* commit 'f25f9e0f':
  Delete old smp-ui-tests module
  Reorganize test module

domiSMP-ui-tests/src/main/resources/docker-firefox.properties

-# docker parameters for the selenium.
-test.webdriver.path=/usr/bin/geckodriver
-test.webdriver.type=firefox
-
-test.webdriver.headless=true
-test.application.ui.url=http://eulogin.protected.smp.local:8080/smp/ui
-test.sml.url=http://eulogin.protected.smp.local:8080/edelivery-sml/listDNS
-test.timeout.long=15
-test.timeout.short=5
-test.reports.folder=./reports/
-
-# test specific properties
-test.user.SYSTEM_ADMIN.username=system
-test.user.SYSTEM_ADMIN.password=123456
-test.user.USER.username=user
-test.user.USER.password=123456
-test.data.password.default=QW!@QW!@qw12qw12
-test.data.password.new=Test1234!Test1234!

smp-docker/compose/weblogic-oracle14/.env → domismp-tests/domismp-docker/compose/domismp-springboot-mysql/.env

 # The .env file is the default method for setting environment variables in the containers. For more
 # information, see https://docs.docker.com/compose/environment-variables/env-file/
-COMPOSE_PROJECT_NAME=smp-wls141-oradb
+COMPOSE_PROJECT_NAME=domismp-springboot-mysql

domismp-tests/domismp-docker/compose/domismp-springboot-mysql/docker-compose.test-api.yml

+version: '3.8'
+services:
+  ##
+  ## UI Tests
+  ##
+  testui:
+    image: ${IMAGE_TAG:-edeliverytest}/${IMAGE_SMP_TESTS}:${SMP_VERSION}
+    environment:
+      - TEST_PLAN=api
+      - TEST_URL=http://smp-springboot-mysql.local:8084/smp/
+    networks:
+      - test-network
+networks:
+  test-network:
+    external:
+      name: ${DOCKER_NETWORK_NAME:-domismp-springboot-mysql_default}

smp-docker/compose/sprinboot-mysql-smp/docker-compose.yml → domismp-tests/domismp-docker/compose/domismp-springboot-mysql/docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.0"
 services:
   smp-springboot:
     image: ${IMAGE_TAG:-edeliverytest}/${IMAGE_SMP_SPRINGBOOT_MYSQL}:${SMP_VERSION}
-    container_name: smp-springboot-mysql
+    hostname: smp-springboot-mysql.local
     environment:
       - SMP_INIT_PROPERTIES=smp.passwordPolicy.expired.forceChange=false
         ||smp.automation.authentication.external.tls.SSLClientCert.enabled=true
@@ -24,12 +24,12 @@ services:
     volumes:
       - ./properties/db-scripts:/tmp/custom-data/
       - ./properties/keystores:/tmp/keystores/
-    ports:
-      - "8282:8084"
+#    ports:
+#      - "8282:8084"
 #      - "3208:3306"
 #      - "5005:5005"
   mail-service:
     image: inbucket/inbucket:3.0.0
     hostname: mail-server.smp.local
-    ports:
-      - "9205:9000"
+#    ports:
+#      - "9205:9000"

smp-docker/compose/sprinboot-mysql-smp/runCompose.sh → domismp-tests/domismp-docker/compose/domismp-springboot-mysql/runCompose.sh

 #!/bin/bash
 
-
+# init plan variables
 WORKDIR="$(cd -P $(dirname ${BASH_SOURCE[0]} ) && pwd)"
-cd "${WORKDIR}" || exit 100
-echo "Working Directory: ${WORKDIR}"
-# project folder
-SMP_PROJECT_FOLDER=$(readlink -e "${WORKDIR}/../../..")
-#load common functions
-source "${SMP_PROJECT_FOLDER}/smp-docker/functions/common.functions"
-source "${SMP_PROJECT_FOLDER}/smp-docker/functions/run-test.functions"
-[ -f "${WORKDIR}/.env" ] && source "${WORKDIR}/.env"
-initializeCommonVariables
+source "${WORKDIR}/../../functions/run-test.functions"
+initializeVariables
 
 SMP_INIT_DATABASE="${SMP_PROJECT_FOLDER}/smp-webapp/src/main/smp-setup/database-scripts/mysql5innodb.ddl"
 #SMP_INIT_DATABASE_DATA="${SMP_PROJECT_FOLDER}/smp-webapp/src/main/smp-setup/database-scripts/mysql5innodb-data.sql"
 SMP_INIT_DATABASE_DATA="${SMP_PROJECT_FOLDER}/smp-soapui-tests/groovy/mysql-4.1_integration_test_data.sql"
-# soap ui data
-SMP_VERSION=
-
 
 # READ arguments
 while getopts i:v: option
@@ -57,6 +47,4 @@ stopAndClearTestContainers
 echo "Start containers"
 startTestContainers
 
-# wait until service is up
-for i in `seq 100`; do timeout 1  bash -c 'curl --silent --fail http://localhost:8282/smp/'; if [ $? -eq 0  ] ; then break;fi; echo "$i. Wait for tomcat to start!";  sleep 5;  done;
 

domismp-tests/domismp-docker/compose/domismp-springboot-mysql/runTestsAPI.sh

+#!/bin/bash
+
+# init plan variables
+WORKDIR="$(cd -P $(dirname ${BASH_SOURCE[0]} ) && pwd)"
+source "${WORKDIR}/../../functions/run-test.functions"
+initializeVariables
+
+RESULT_FOLDER="${WORKDIR}/results"
+# clear old results
+rm -rf "${RESULT_FOLDER}"
+mkdir -p "${RESULT_FOLDER}"
+
+# define network to connect the tests
+DOCKER_NETWORK_NAME="${PLAN_PREFIX}_default"
+export DOCKER_NETWORK_NAME
+
+# Starting Docker Compose TEST (in specific project to avoid orphan container warning)
+docker compose -f docker-compose.test-api.yml -p "run-${PLAN_PREFIX}" up
+docker cp "run-${PLAN_PREFIX}-testapi-1:/data/results/soapui-reports" ./results

domismp-tests/domismp-docker/compose/domismp-springboot-mysql/stopClearCompose.sh

+#!/bin/bash
+
+# init plan variables
+WORKDIR="$(cd -P $(dirname ${BASH_SOURCE[0]} ) && pwd)"
+source "${WORKDIR}/../../functions/run-test.functions"
+initializeVariables
+
+echo "Clear old containers"
+stopAndClearTestContainers

smp-docker/compose/tomcat-mysql-smp-sml/.env → domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/.env

 # The .env file is the default method for setting environment variables in the containers. For more
 # information, see https://docs.docker.com/compose/environment-variables/env-file/
-COMPOSE_PROJECT_NAME=smp-tomcat-mysql
+COMPOSE_PROJECT_NAME=domismp-tomcat-mysql

smp-docker/compose/tomcat-mysql-smp-sml/docker-compose.test-ui.yml → domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/docker-compose.test-api.yml

@@ -4,14 +4,13 @@ services:
   ## UI Tests
   ##
   testui:
-    image: ${IMAGE_TAG:-edeliverytest}/${IMAGE_SMP_TEST_UI}:${SMP_VERSION}
+    image: ${IMAGE_TAG:-edeliverytest}/${IMAGE_SMP_TESTS}:${SMP_VERSION}
     environment:
-      - TZ=CEST
-      - SCREEN_WIDTH=1920
-      - SCREEN_HEIGHT=1080
+      - TEST_PLAN=api
+      - TEST_URL=http://eulogin.protected.smp.local:8080/smp/
     networks:
       - test-network
 networks:
   test-network:
     external:
-      name: ${DOCKER_NETWORK_NAME:-test-smp-tomcat-mysql_default}
+      name: ${DOCKER_NETWORK_NAME:-domismp-tomcat-mysql_default}

domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/docker-compose.test-ui.yml

+version: '3.8'
+services:
+  ##
+  ## UI Tests
+  ##
+  testui:
+    image: ${IMAGE_TAG:-edeliverytest}/${IMAGE_SMP_TESTS}:${SMP_VERSION}
+    environment:
+      - TEST_PLAN=ui
+      - TEST_APPLICATION_UI_URL=http://eulogin.protected.smp.local:8080/smp/ui/
+      - TEST_SML_URL=http://eulogin.protected.smp.local:8080/edelivery-sml/listDNS
+    networks:
+      - test-network
+networks:
+  test-network:
+    external:
+      name: ${DOCKER_NETWORK_NAME:-domismp-tomcat-mysql_default}

smp-docker/compose/tomcat-mysql-smp-sml/docker-compose.yml → domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/docker-compose.yml

@@ -29,10 +29,10 @@ services:
     volumes:
       - ./properties/db-scripts:/tmp/custom-data/
       - ./properties/keystores:/tmp/keystores/
-    ports:
-      - "3908:3306"
-      - "8982:8080"
-      - "6902:6901"
+#    ports:
+#      - "3908:3306"
+#      - "8982:8080"
+#      - "6902:6901"
 #      - "8953:53"
 #      - "5005:5005"
 
@@ -41,13 +41,13 @@ services:
     hostname: eulogin-mock-server
     volumes:
         - ./eulogin/init-data:/resources/ecas-mock-server
- # Map this folder to host to be able to change runtime data for manual testing!
- #       - ./eulogin/ecas-mock-server:/data/ecas-mock-server
-    ports:
-      - "7102:7102"
+# Map this folder to host to be able to change runtime data for manual testing!
+#       - ./eulogin/ecas-mock-server:/data/ecas-mock-server
+#    ports:
+#      - "7102:7102"
 
   mail-service:
     image: inbucket/inbucket:3.0.0
     hostname: mail-server.smp.local
-    ports:
-      - "9005:9000"
+#    ports:
+#      - "9005:9000"