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

smp-docker/compose/tomcat-mysql-smp-sml/runCompose.sh → domismp-tests/domismp-docker/compose/domismp-tomcat-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"
-SMP_VERSION=
 # READ arguments
 while getopts i:v: option
 do
@@ -26,8 +18,6 @@ do
   esac
 done
 
-discoverApplicationVersion
-
 echo "*****************************************************************"
 echo "* Start SMP image for version: [$SMP_VERSION]"
 echo "* Plan prefix: [${PLAN_PREFIX}]"

domismp-tests/domismp-docker/compose/domismp-tomcat-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

smp-docker/compose/tomcat-mysql-smp-sml/runTests-UI.sh → domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/runTestsUI.sh

 #!/bin/bash
 
 WORKDIR="$(cd -P $(dirname ${BASH_SOURCE[0]} ) && pwd)"
-cd "${WORKDIR}" || exit 100
-echo "Working Directory: ${WORKDIR}"
-# project folder
-SMP_PROJECT_FOLDER=$(readlink -e "${WORKDIR}/../../..")
+source "${WORKDIR}/../../functions/run-test.functions"
+initializeVariables
+
+
 RESULT_FOLDER="${WORKDIR}/results"
 # clear old results
 rm -rf "${RESULT_FOLDER}"
 mkdir -p "${RESULT_FOLDER}"
-#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
-discoverApplicationVersion
 
 # define network to connect the tests
 DOCKER_NETWORK_NAME="${PLAN_PREFIX}_default"
@@ -22,4 +16,4 @@ export DOCKER_NETWORK_NAME
 
 # Starting Docker Compose TEST (in specific project to avoid orphan container warning)
 docker compose -f docker-compose.test-ui.yml -p "run-${PLAN_PREFIX}" up
-docker cp "run-${PLAN_PREFIX}-testui-1:/results/surefire-reports" ./results
+docker cp "run-${PLAN_PREFIX}-testui-1:/data/results/surefire-reports" ./results

domismp-tests/domismp-docker/compose/domismp-tomcat-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/weblogic-oracle/.env → domismp-tests/domismp-docker/compose/domismp-wls122-oradb/.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-wls122-oradb
+COMPOSE_PROJECT_NAME=domismp-wls122-oradb