From 55a1abb8f5657115d69d8ee83bdee4585716a70d Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 26 Jun 2025 16:43:25 +0200 Subject: [PATCH 1/6] Move into folder --- .../persistence-it/README.md | 0 .../persistence-it/pom.xml | 6 +- .../tci/demo/persistence/base/BaseTest.java | 0 .../demo/persistence/base/DAOInjector.java | 0 .../persistence/base/InfraPerCaseTest.java | 0 .../persistence/base/InfraPerClassTest.java | 0 .../cases/ProductReadonlyTest.java | 0 .../demo/persistence/cases/ProductTest.java | 0 ...it.platform.launcher.TestExecutionListener | 0 ...tci.leakdetection.LeakDetectionAsyncReaper | 0 .../init/extended/V1.1.1_InitData.sql | 0 .../src/test/resources/log4j2-test.xml | 0 tci-advanced-demo/integration-tests/pom.xml | 111 ++++++++++++++++++ .../{ => integration-tests}/tci-db/Dockerfile | 0 .../{ => integration-tests}/tci-db/README.md | 0 .../{ => integration-tests}/tci-db/pom.xml | 6 +- .../software/xdev/tci/demo/tci/db/DBTCI.java | 0 .../demo/tci/db/containers/DBContainer.java | 0 .../tci/db/containers/DBContainerBuilder.java | 0 .../tci/db/containers/MariaDBContainer.java | 0 .../db/containers/WaitableJDBCContainer.java | 0 .../AbstractDBDataGenerator.java | 0 .../tci/db/datageneration/DataGenerator.java | 0 .../tci/demo/tci/db/factory/DBTCIFactory.java | 0 .../db/persistence/AnnotatedClassFinder.java | 0 .../persistence/EntityManagerController.java | 0 .../db/persistence/TransactionExecutor.java | 0 .../hibernate/CachingStandardScanner.java | 0 .../tci-oidc/README.md | 0 .../{ => integration-tests}/tci-oidc/pom.xml | 6 +- .../xdev/tci/demo/tci/oidc/OIDCTCI.java | 0 .../oidc/containers/OIDCServerContainer.java | 0 .../demo/tci/oidc/factory/OIDCTCIFactory.java | 0 .../tci-selenium/README.md | 0 .../tci-selenium/pom.xml | 6 +- .../tci/demo/tci/selenium/BrowserTCI.java | 0 .../tci/demo/tci/selenium/TestBrowser.java | 0 .../SeleniumBrowserWebDriverContainer.java | 0 .../selenium/factory/BrowserTCIFactory.java | 0 .../selenium/factory/BrowsersTCIFactory.java | 0 .../SeleniumIntegrationTestExtension.java | 0 .../tci-testcontainers/README.md | 0 .../tci-testcontainers/pom.xml | 4 +- .../demo/tci/util/ContainerLoggingUtil.java | 0 .../tci-webapp/Dockerfile | 0 .../tci-webapp/README.md | 0 .../tci-webapp/pom.xml | 6 +- .../xdev/tci/demo/tci/webapp/WebAppTCI.java | 0 .../webapp/containers/WebAppContainer.java | 0 .../containers/WebAppContainerBuilder.java | 0 .../tci/webapp/factory/WebAppTCIFactory.java | 0 .../webapp-it/README.md | 0 .../{ => integration-tests}/webapp-it/pom.xml | 12 +- .../xdev/tci/demo/webapp/base/BaseTest.java | 0 .../demo/webapp/base/InfraPerCaseTest.java | 0 .../demo/webapp/base/InfraPerClassTest.java | 0 .../webapp/base/IntegrationTestDefaults.java | 0 .../tci/demo/webapp/cases/LoginOIDCTest.java | 0 .../cases/LongButLittleResourceUsageTest.java | 0 .../tci/demo/webapp/cases/ProductTest.java | 0 .../demo/webapp/datageneration/ProductDG.java | 0 ...it.platform.launcher.TestExecutionListener | 0 ...tci.leakdetection.LeakDetectionAsyncReaper | 0 .../src/test/resources/log4j2-test.xml | 0 tci-advanced-demo/pom.xml | 84 +------------ 65 files changed, 135 insertions(+), 106 deletions(-) rename tci-advanced-demo/{ => integration-tests}/persistence-it/README.md (100%) rename tci-advanced-demo/{ => integration-tests}/persistence-it/pom.xml (91%) rename tci-advanced-demo/{ => integration-tests}/persistence-it/src/test/java/software/xdev/tci/demo/persistence/base/BaseTest.java (100%) rename tci-advanced-demo/{ => integration-tests}/persistence-it/src/test/java/software/xdev/tci/demo/persistence/base/DAOInjector.java (100%) rename tci-advanced-demo/{ => integration-tests}/persistence-it/src/test/java/software/xdev/tci/demo/persistence/base/InfraPerCaseTest.java (100%) rename tci-advanced-demo/{ => integration-tests}/persistence-it/src/test/java/software/xdev/tci/demo/persistence/base/InfraPerClassTest.java (100%) rename tci-advanced-demo/{ => integration-tests}/persistence-it/src/test/java/software/xdev/tci/demo/persistence/cases/ProductReadonlyTest.java (100%) rename tci-advanced-demo/{ => integration-tests}/persistence-it/src/test/java/software/xdev/tci/demo/persistence/cases/ProductTest.java (100%) rename tci-advanced-demo/{ => integration-tests}/persistence-it/src/test/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener (100%) rename tci-advanced-demo/{ => integration-tests}/persistence-it/src/test/resources/META-INF/services/software.xdev.tci.leakdetection.LeakDetectionAsyncReaper (100%) rename tci-advanced-demo/{ => integration-tests}/persistence-it/src/test/resources/init/extended/V1.1.1_InitData.sql (100%) rename tci-advanced-demo/{ => integration-tests}/persistence-it/src/test/resources/log4j2-test.xml (100%) create mode 100644 tci-advanced-demo/integration-tests/pom.xml rename tci-advanced-demo/{ => integration-tests}/tci-db/Dockerfile (100%) rename tci-advanced-demo/{ => integration-tests}/tci-db/README.md (100%) rename tci-advanced-demo/{ => integration-tests}/tci-db/pom.xml (89%) rename tci-advanced-demo/{ => integration-tests}/tci-db/src/main/java/software/xdev/tci/demo/tci/db/DBTCI.java (100%) rename tci-advanced-demo/{ => integration-tests}/tci-db/src/main/java/software/xdev/tci/demo/tci/db/containers/DBContainer.java (100%) rename tci-advanced-demo/{ => integration-tests}/tci-db/src/main/java/software/xdev/tci/demo/tci/db/containers/DBContainerBuilder.java (100%) rename tci-advanced-demo/{ => integration-tests}/tci-db/src/main/java/software/xdev/tci/demo/tci/db/containers/MariaDBContainer.java (100%) rename tci-advanced-demo/{ => integration-tests}/tci-db/src/main/java/software/xdev/tci/demo/tci/db/containers/WaitableJDBCContainer.java (100%) rename tci-advanced-demo/{ => integration-tests}/tci-db/src/main/java/software/xdev/tci/demo/tci/db/datageneration/AbstractDBDataGenerator.java (100%) rename tci-advanced-demo/{ => integration-tests}/tci-db/src/main/java/software/xdev/tci/demo/tci/db/datageneration/DataGenerator.java (100%) rename tci-advanced-demo/{ => integration-tests}/tci-db/src/main/java/software/xdev/tci/demo/tci/db/factory/DBTCIFactory.java (100%) rename tci-advanced-demo/{ => integration-tests}/tci-db/src/main/java/software/xdev/tci/demo/tci/db/persistence/AnnotatedClassFinder.java (100%) rename tci-advanced-demo/{ => integration-tests}/tci-db/src/main/java/software/xdev/tci/demo/tci/db/persistence/EntityManagerController.java (100%) rename tci-advanced-demo/{ => integration-tests}/tci-db/src/main/java/software/xdev/tci/demo/tci/db/persistence/TransactionExecutor.java (100%) rename tci-advanced-demo/{ => integration-tests}/tci-db/src/main/java/software/xdev/tci/demo/tci/db/persistence/hibernate/CachingStandardScanner.java (100%) rename tci-advanced-demo/{ => integration-tests}/tci-oidc/README.md (100%) rename tci-advanced-demo/{ => integration-tests}/tci-oidc/pom.xml (81%) rename tci-advanced-demo/{ => integration-tests}/tci-oidc/src/main/java/software/xdev/tci/demo/tci/oidc/OIDCTCI.java (100%) rename tci-advanced-demo/{ => integration-tests}/tci-oidc/src/main/java/software/xdev/tci/demo/tci/oidc/containers/OIDCServerContainer.java (100%) rename tci-advanced-demo/{ => integration-tests}/tci-oidc/src/main/java/software/xdev/tci/demo/tci/oidc/factory/OIDCTCIFactory.java (100%) rename tci-advanced-demo/{ => integration-tests}/tci-selenium/README.md (100%) rename tci-advanced-demo/{ => integration-tests}/tci-selenium/pom.xml (91%) rename tci-advanced-demo/{ => integration-tests}/tci-selenium/src/main/java/software/xdev/tci/demo/tci/selenium/BrowserTCI.java (100%) rename tci-advanced-demo/{ => integration-tests}/tci-selenium/src/main/java/software/xdev/tci/demo/tci/selenium/TestBrowser.java (100%) rename tci-advanced-demo/{ => integration-tests}/tci-selenium/src/main/java/software/xdev/tci/demo/tci/selenium/containers/SeleniumBrowserWebDriverContainer.java (100%) rename tci-advanced-demo/{ => integration-tests}/tci-selenium/src/main/java/software/xdev/tci/demo/tci/selenium/factory/BrowserTCIFactory.java (100%) rename tci-advanced-demo/{ => integration-tests}/tci-selenium/src/main/java/software/xdev/tci/demo/tci/selenium/factory/BrowsersTCIFactory.java (100%) rename tci-advanced-demo/{ => integration-tests}/tci-selenium/src/main/java/software/xdev/tci/demo/tci/selenium/testbase/SeleniumIntegrationTestExtension.java (100%) rename tci-advanced-demo/{ => integration-tests}/tci-testcontainers/README.md (100%) rename tci-advanced-demo/{ => integration-tests}/tci-testcontainers/pom.xml (87%) rename tci-advanced-demo/{ => integration-tests}/tci-testcontainers/src/main/java/software/xdev/tci/demo/tci/util/ContainerLoggingUtil.java (100%) rename tci-advanced-demo/{ => integration-tests}/tci-webapp/Dockerfile (100%) rename tci-advanced-demo/{ => integration-tests}/tci-webapp/README.md (100%) rename tci-advanced-demo/{ => integration-tests}/tci-webapp/pom.xml (81%) rename tci-advanced-demo/{ => integration-tests}/tci-webapp/src/main/java/software/xdev/tci/demo/tci/webapp/WebAppTCI.java (100%) rename tci-advanced-demo/{ => integration-tests}/tci-webapp/src/main/java/software/xdev/tci/demo/tci/webapp/containers/WebAppContainer.java (100%) rename tci-advanced-demo/{ => integration-tests}/tci-webapp/src/main/java/software/xdev/tci/demo/tci/webapp/containers/WebAppContainerBuilder.java (100%) rename tci-advanced-demo/{ => integration-tests}/tci-webapp/src/main/java/software/xdev/tci/demo/tci/webapp/factory/WebAppTCIFactory.java (100%) rename tci-advanced-demo/{ => integration-tests}/webapp-it/README.md (100%) rename tci-advanced-demo/{ => integration-tests}/webapp-it/pom.xml (85%) rename tci-advanced-demo/{ => integration-tests}/webapp-it/src/test/java/software/xdev/tci/demo/webapp/base/BaseTest.java (100%) rename tci-advanced-demo/{ => integration-tests}/webapp-it/src/test/java/software/xdev/tci/demo/webapp/base/InfraPerCaseTest.java (100%) rename tci-advanced-demo/{ => integration-tests}/webapp-it/src/test/java/software/xdev/tci/demo/webapp/base/InfraPerClassTest.java (100%) rename tci-advanced-demo/{ => integration-tests}/webapp-it/src/test/java/software/xdev/tci/demo/webapp/base/IntegrationTestDefaults.java (100%) rename tci-advanced-demo/{ => integration-tests}/webapp-it/src/test/java/software/xdev/tci/demo/webapp/cases/LoginOIDCTest.java (100%) rename tci-advanced-demo/{ => integration-tests}/webapp-it/src/test/java/software/xdev/tci/demo/webapp/cases/LongButLittleResourceUsageTest.java (100%) rename tci-advanced-demo/{ => integration-tests}/webapp-it/src/test/java/software/xdev/tci/demo/webapp/cases/ProductTest.java (100%) rename tci-advanced-demo/{ => integration-tests}/webapp-it/src/test/java/software/xdev/tci/demo/webapp/datageneration/ProductDG.java (100%) rename tci-advanced-demo/{ => integration-tests}/webapp-it/src/test/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener (100%) rename tci-advanced-demo/{ => integration-tests}/webapp-it/src/test/resources/META-INF/services/software.xdev.tci.leakdetection.LeakDetectionAsyncReaper (100%) rename tci-advanced-demo/{ => integration-tests}/webapp-it/src/test/resources/log4j2-test.xml (100%) diff --git a/tci-advanced-demo/persistence-it/README.md b/tci-advanced-demo/integration-tests/persistence-it/README.md similarity index 100% rename from tci-advanced-demo/persistence-it/README.md rename to tci-advanced-demo/integration-tests/persistence-it/README.md diff --git a/tci-advanced-demo/persistence-it/pom.xml b/tci-advanced-demo/integration-tests/persistence-it/pom.xml similarity index 91% rename from tci-advanced-demo/persistence-it/pom.xml rename to tci-advanced-demo/integration-tests/persistence-it/pom.xml index 0e31cd2d..8ef65392 100644 --- a/tci-advanced-demo/persistence-it/pom.xml +++ b/tci-advanced-demo/integration-tests/persistence-it/pom.xml @@ -5,8 +5,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - software.xdev.tci.demo - tci-advanced-demo + software.xdev.tci.demo.it + integration-tests 1.2.1-SNAPSHOT persistence-it @@ -24,7 +24,7 @@ - software.xdev.tci.demo + software.xdev.tci.demo.it tci-db test diff --git a/tci-advanced-demo/persistence-it/src/test/java/software/xdev/tci/demo/persistence/base/BaseTest.java b/tci-advanced-demo/integration-tests/persistence-it/src/test/java/software/xdev/tci/demo/persistence/base/BaseTest.java similarity index 100% rename from tci-advanced-demo/persistence-it/src/test/java/software/xdev/tci/demo/persistence/base/BaseTest.java rename to tci-advanced-demo/integration-tests/persistence-it/src/test/java/software/xdev/tci/demo/persistence/base/BaseTest.java diff --git a/tci-advanced-demo/persistence-it/src/test/java/software/xdev/tci/demo/persistence/base/DAOInjector.java b/tci-advanced-demo/integration-tests/persistence-it/src/test/java/software/xdev/tci/demo/persistence/base/DAOInjector.java similarity index 100% rename from tci-advanced-demo/persistence-it/src/test/java/software/xdev/tci/demo/persistence/base/DAOInjector.java rename to tci-advanced-demo/integration-tests/persistence-it/src/test/java/software/xdev/tci/demo/persistence/base/DAOInjector.java diff --git a/tci-advanced-demo/persistence-it/src/test/java/software/xdev/tci/demo/persistence/base/InfraPerCaseTest.java b/tci-advanced-demo/integration-tests/persistence-it/src/test/java/software/xdev/tci/demo/persistence/base/InfraPerCaseTest.java similarity index 100% rename from tci-advanced-demo/persistence-it/src/test/java/software/xdev/tci/demo/persistence/base/InfraPerCaseTest.java rename to tci-advanced-demo/integration-tests/persistence-it/src/test/java/software/xdev/tci/demo/persistence/base/InfraPerCaseTest.java diff --git a/tci-advanced-demo/persistence-it/src/test/java/software/xdev/tci/demo/persistence/base/InfraPerClassTest.java b/tci-advanced-demo/integration-tests/persistence-it/src/test/java/software/xdev/tci/demo/persistence/base/InfraPerClassTest.java similarity index 100% rename from tci-advanced-demo/persistence-it/src/test/java/software/xdev/tci/demo/persistence/base/InfraPerClassTest.java rename to tci-advanced-demo/integration-tests/persistence-it/src/test/java/software/xdev/tci/demo/persistence/base/InfraPerClassTest.java diff --git a/tci-advanced-demo/persistence-it/src/test/java/software/xdev/tci/demo/persistence/cases/ProductReadonlyTest.java b/tci-advanced-demo/integration-tests/persistence-it/src/test/java/software/xdev/tci/demo/persistence/cases/ProductReadonlyTest.java similarity index 100% rename from tci-advanced-demo/persistence-it/src/test/java/software/xdev/tci/demo/persistence/cases/ProductReadonlyTest.java rename to tci-advanced-demo/integration-tests/persistence-it/src/test/java/software/xdev/tci/demo/persistence/cases/ProductReadonlyTest.java diff --git a/tci-advanced-demo/persistence-it/src/test/java/software/xdev/tci/demo/persistence/cases/ProductTest.java b/tci-advanced-demo/integration-tests/persistence-it/src/test/java/software/xdev/tci/demo/persistence/cases/ProductTest.java similarity index 100% rename from tci-advanced-demo/persistence-it/src/test/java/software/xdev/tci/demo/persistence/cases/ProductTest.java rename to tci-advanced-demo/integration-tests/persistence-it/src/test/java/software/xdev/tci/demo/persistence/cases/ProductTest.java diff --git a/tci-advanced-demo/persistence-it/src/test/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener b/tci-advanced-demo/integration-tests/persistence-it/src/test/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener similarity index 100% rename from tci-advanced-demo/persistence-it/src/test/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener rename to tci-advanced-demo/integration-tests/persistence-it/src/test/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener diff --git a/tci-advanced-demo/persistence-it/src/test/resources/META-INF/services/software.xdev.tci.leakdetection.LeakDetectionAsyncReaper b/tci-advanced-demo/integration-tests/persistence-it/src/test/resources/META-INF/services/software.xdev.tci.leakdetection.LeakDetectionAsyncReaper similarity index 100% rename from tci-advanced-demo/persistence-it/src/test/resources/META-INF/services/software.xdev.tci.leakdetection.LeakDetectionAsyncReaper rename to tci-advanced-demo/integration-tests/persistence-it/src/test/resources/META-INF/services/software.xdev.tci.leakdetection.LeakDetectionAsyncReaper diff --git a/tci-advanced-demo/persistence-it/src/test/resources/init/extended/V1.1.1_InitData.sql b/tci-advanced-demo/integration-tests/persistence-it/src/test/resources/init/extended/V1.1.1_InitData.sql similarity index 100% rename from tci-advanced-demo/persistence-it/src/test/resources/init/extended/V1.1.1_InitData.sql rename to tci-advanced-demo/integration-tests/persistence-it/src/test/resources/init/extended/V1.1.1_InitData.sql diff --git a/tci-advanced-demo/persistence-it/src/test/resources/log4j2-test.xml b/tci-advanced-demo/integration-tests/persistence-it/src/test/resources/log4j2-test.xml similarity index 100% rename from tci-advanced-demo/persistence-it/src/test/resources/log4j2-test.xml rename to tci-advanced-demo/integration-tests/persistence-it/src/test/resources/log4j2-test.xml diff --git a/tci-advanced-demo/integration-tests/pom.xml b/tci-advanced-demo/integration-tests/pom.xml new file mode 100644 index 00000000..d2cf7e32 --- /dev/null +++ b/tci-advanced-demo/integration-tests/pom.xml @@ -0,0 +1,111 @@ + + + 4.0.0 + + + software.xdev.tci.demo + tci-advanced-demo + 1.2.1-SNAPSHOT + + + software.xdev.tci.demo.it + integration-tests + 1.2.1-SNAPSHOT + pom + + + persistence-it + tci-db + tci-oidc + tci-selenium + tci-testcontainers + tci-webapp + webapp-it + + + + + + + software.xdev.tci.demo.it + tci-db + 1.2.1-SNAPSHOT + + + + software.xdev.tci.demo.it + tci-oidc + 1.2.1-SNAPSHOT + + + + software.xdev.tci.demo.it + tci-selenium + 1.2.1-SNAPSHOT + + + + software.xdev.tci.demo.it + tci-webapp + 1.2.1-SNAPSHOT + + + + software.xdev.tci.demo.it + tci-testcontainers + 1.2.1-SNAPSHOT + + + + software.xdev + tci-base + ${project.version} + + + + + org.seleniumhq.selenium + selenium-dependencies-bom + 4.33.0 + pom + import + + + + + + org.junit + junit-bom + 5.13.1 + pom + import + + + + + software.xdev + testcontainers-selenium + 1.2.3 + + + software.xdev + testcontainers-junit4-mock + 1.0.2 + + + software.xdev + testcontainers-advanced-imagebuilder + 2.0.1 + + + + + org.javassist + javassist + 3.30.2-GA + + + + diff --git a/tci-advanced-demo/tci-db/Dockerfile b/tci-advanced-demo/integration-tests/tci-db/Dockerfile similarity index 100% rename from tci-advanced-demo/tci-db/Dockerfile rename to tci-advanced-demo/integration-tests/tci-db/Dockerfile diff --git a/tci-advanced-demo/tci-db/README.md b/tci-advanced-demo/integration-tests/tci-db/README.md similarity index 100% rename from tci-advanced-demo/tci-db/README.md rename to tci-advanced-demo/integration-tests/tci-db/README.md diff --git a/tci-advanced-demo/tci-db/pom.xml b/tci-advanced-demo/integration-tests/tci-db/pom.xml similarity index 89% rename from tci-advanced-demo/tci-db/pom.xml rename to tci-advanced-demo/integration-tests/tci-db/pom.xml index 0607eb57..24fd8c06 100644 --- a/tci-advanced-demo/tci-db/pom.xml +++ b/tci-advanced-demo/integration-tests/tci-db/pom.xml @@ -5,15 +5,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - software.xdev.tci.demo - tci-advanced-demo + software.xdev.tci.demo.it + integration-tests 1.2.1-SNAPSHOT tci-db - software.xdev.tci.demo + software.xdev.tci.demo.it tci-testcontainers diff --git a/tci-advanced-demo/tci-db/src/main/java/software/xdev/tci/demo/tci/db/DBTCI.java b/tci-advanced-demo/integration-tests/tci-db/src/main/java/software/xdev/tci/demo/tci/db/DBTCI.java similarity index 100% rename from tci-advanced-demo/tci-db/src/main/java/software/xdev/tci/demo/tci/db/DBTCI.java rename to tci-advanced-demo/integration-tests/tci-db/src/main/java/software/xdev/tci/demo/tci/db/DBTCI.java diff --git a/tci-advanced-demo/tci-db/src/main/java/software/xdev/tci/demo/tci/db/containers/DBContainer.java b/tci-advanced-demo/integration-tests/tci-db/src/main/java/software/xdev/tci/demo/tci/db/containers/DBContainer.java similarity index 100% rename from tci-advanced-demo/tci-db/src/main/java/software/xdev/tci/demo/tci/db/containers/DBContainer.java rename to tci-advanced-demo/integration-tests/tci-db/src/main/java/software/xdev/tci/demo/tci/db/containers/DBContainer.java diff --git a/tci-advanced-demo/tci-db/src/main/java/software/xdev/tci/demo/tci/db/containers/DBContainerBuilder.java b/tci-advanced-demo/integration-tests/tci-db/src/main/java/software/xdev/tci/demo/tci/db/containers/DBContainerBuilder.java similarity index 100% rename from tci-advanced-demo/tci-db/src/main/java/software/xdev/tci/demo/tci/db/containers/DBContainerBuilder.java rename to tci-advanced-demo/integration-tests/tci-db/src/main/java/software/xdev/tci/demo/tci/db/containers/DBContainerBuilder.java diff --git a/tci-advanced-demo/tci-db/src/main/java/software/xdev/tci/demo/tci/db/containers/MariaDBContainer.java b/tci-advanced-demo/integration-tests/tci-db/src/main/java/software/xdev/tci/demo/tci/db/containers/MariaDBContainer.java similarity index 100% rename from tci-advanced-demo/tci-db/src/main/java/software/xdev/tci/demo/tci/db/containers/MariaDBContainer.java rename to tci-advanced-demo/integration-tests/tci-db/src/main/java/software/xdev/tci/demo/tci/db/containers/MariaDBContainer.java diff --git a/tci-advanced-demo/tci-db/src/main/java/software/xdev/tci/demo/tci/db/containers/WaitableJDBCContainer.java b/tci-advanced-demo/integration-tests/tci-db/src/main/java/software/xdev/tci/demo/tci/db/containers/WaitableJDBCContainer.java similarity index 100% rename from tci-advanced-demo/tci-db/src/main/java/software/xdev/tci/demo/tci/db/containers/WaitableJDBCContainer.java rename to tci-advanced-demo/integration-tests/tci-db/src/main/java/software/xdev/tci/demo/tci/db/containers/WaitableJDBCContainer.java diff --git a/tci-advanced-demo/tci-db/src/main/java/software/xdev/tci/demo/tci/db/datageneration/AbstractDBDataGenerator.java b/tci-advanced-demo/integration-tests/tci-db/src/main/java/software/xdev/tci/demo/tci/db/datageneration/AbstractDBDataGenerator.java similarity index 100% rename from tci-advanced-demo/tci-db/src/main/java/software/xdev/tci/demo/tci/db/datageneration/AbstractDBDataGenerator.java rename to tci-advanced-demo/integration-tests/tci-db/src/main/java/software/xdev/tci/demo/tci/db/datageneration/AbstractDBDataGenerator.java diff --git a/tci-advanced-demo/tci-db/src/main/java/software/xdev/tci/demo/tci/db/datageneration/DataGenerator.java b/tci-advanced-demo/integration-tests/tci-db/src/main/java/software/xdev/tci/demo/tci/db/datageneration/DataGenerator.java similarity index 100% rename from tci-advanced-demo/tci-db/src/main/java/software/xdev/tci/demo/tci/db/datageneration/DataGenerator.java rename to tci-advanced-demo/integration-tests/tci-db/src/main/java/software/xdev/tci/demo/tci/db/datageneration/DataGenerator.java diff --git a/tci-advanced-demo/tci-db/src/main/java/software/xdev/tci/demo/tci/db/factory/DBTCIFactory.java b/tci-advanced-demo/integration-tests/tci-db/src/main/java/software/xdev/tci/demo/tci/db/factory/DBTCIFactory.java similarity index 100% rename from tci-advanced-demo/tci-db/src/main/java/software/xdev/tci/demo/tci/db/factory/DBTCIFactory.java rename to tci-advanced-demo/integration-tests/tci-db/src/main/java/software/xdev/tci/demo/tci/db/factory/DBTCIFactory.java diff --git a/tci-advanced-demo/tci-db/src/main/java/software/xdev/tci/demo/tci/db/persistence/AnnotatedClassFinder.java b/tci-advanced-demo/integration-tests/tci-db/src/main/java/software/xdev/tci/demo/tci/db/persistence/AnnotatedClassFinder.java similarity index 100% rename from tci-advanced-demo/tci-db/src/main/java/software/xdev/tci/demo/tci/db/persistence/AnnotatedClassFinder.java rename to tci-advanced-demo/integration-tests/tci-db/src/main/java/software/xdev/tci/demo/tci/db/persistence/AnnotatedClassFinder.java diff --git a/tci-advanced-demo/tci-db/src/main/java/software/xdev/tci/demo/tci/db/persistence/EntityManagerController.java b/tci-advanced-demo/integration-tests/tci-db/src/main/java/software/xdev/tci/demo/tci/db/persistence/EntityManagerController.java similarity index 100% rename from tci-advanced-demo/tci-db/src/main/java/software/xdev/tci/demo/tci/db/persistence/EntityManagerController.java rename to tci-advanced-demo/integration-tests/tci-db/src/main/java/software/xdev/tci/demo/tci/db/persistence/EntityManagerController.java diff --git a/tci-advanced-demo/tci-db/src/main/java/software/xdev/tci/demo/tci/db/persistence/TransactionExecutor.java b/tci-advanced-demo/integration-tests/tci-db/src/main/java/software/xdev/tci/demo/tci/db/persistence/TransactionExecutor.java similarity index 100% rename from tci-advanced-demo/tci-db/src/main/java/software/xdev/tci/demo/tci/db/persistence/TransactionExecutor.java rename to tci-advanced-demo/integration-tests/tci-db/src/main/java/software/xdev/tci/demo/tci/db/persistence/TransactionExecutor.java diff --git a/tci-advanced-demo/tci-db/src/main/java/software/xdev/tci/demo/tci/db/persistence/hibernate/CachingStandardScanner.java b/tci-advanced-demo/integration-tests/tci-db/src/main/java/software/xdev/tci/demo/tci/db/persistence/hibernate/CachingStandardScanner.java similarity index 100% rename from tci-advanced-demo/tci-db/src/main/java/software/xdev/tci/demo/tci/db/persistence/hibernate/CachingStandardScanner.java rename to tci-advanced-demo/integration-tests/tci-db/src/main/java/software/xdev/tci/demo/tci/db/persistence/hibernate/CachingStandardScanner.java diff --git a/tci-advanced-demo/tci-oidc/README.md b/tci-advanced-demo/integration-tests/tci-oidc/README.md similarity index 100% rename from tci-advanced-demo/tci-oidc/README.md rename to tci-advanced-demo/integration-tests/tci-oidc/README.md diff --git a/tci-advanced-demo/tci-oidc/pom.xml b/tci-advanced-demo/integration-tests/tci-oidc/pom.xml similarity index 81% rename from tci-advanced-demo/tci-oidc/pom.xml rename to tci-advanced-demo/integration-tests/tci-oidc/pom.xml index 113df563..7d196d3e 100644 --- a/tci-advanced-demo/tci-oidc/pom.xml +++ b/tci-advanced-demo/integration-tests/tci-oidc/pom.xml @@ -5,15 +5,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - software.xdev.tci.demo - tci-advanced-demo + software.xdev.tci.demo.it + integration-tests 1.2.1-SNAPSHOT tci-oidc - software.xdev.tci.demo + software.xdev.tci.demo.it tci-testcontainers diff --git a/tci-advanced-demo/tci-oidc/src/main/java/software/xdev/tci/demo/tci/oidc/OIDCTCI.java b/tci-advanced-demo/integration-tests/tci-oidc/src/main/java/software/xdev/tci/demo/tci/oidc/OIDCTCI.java similarity index 100% rename from tci-advanced-demo/tci-oidc/src/main/java/software/xdev/tci/demo/tci/oidc/OIDCTCI.java rename to tci-advanced-demo/integration-tests/tci-oidc/src/main/java/software/xdev/tci/demo/tci/oidc/OIDCTCI.java diff --git a/tci-advanced-demo/tci-oidc/src/main/java/software/xdev/tci/demo/tci/oidc/containers/OIDCServerContainer.java b/tci-advanced-demo/integration-tests/tci-oidc/src/main/java/software/xdev/tci/demo/tci/oidc/containers/OIDCServerContainer.java similarity index 100% rename from tci-advanced-demo/tci-oidc/src/main/java/software/xdev/tci/demo/tci/oidc/containers/OIDCServerContainer.java rename to tci-advanced-demo/integration-tests/tci-oidc/src/main/java/software/xdev/tci/demo/tci/oidc/containers/OIDCServerContainer.java diff --git a/tci-advanced-demo/tci-oidc/src/main/java/software/xdev/tci/demo/tci/oidc/factory/OIDCTCIFactory.java b/tci-advanced-demo/integration-tests/tci-oidc/src/main/java/software/xdev/tci/demo/tci/oidc/factory/OIDCTCIFactory.java similarity index 100% rename from tci-advanced-demo/tci-oidc/src/main/java/software/xdev/tci/demo/tci/oidc/factory/OIDCTCIFactory.java rename to tci-advanced-demo/integration-tests/tci-oidc/src/main/java/software/xdev/tci/demo/tci/oidc/factory/OIDCTCIFactory.java diff --git a/tci-advanced-demo/tci-selenium/README.md b/tci-advanced-demo/integration-tests/tci-selenium/README.md similarity index 100% rename from tci-advanced-demo/tci-selenium/README.md rename to tci-advanced-demo/integration-tests/tci-selenium/README.md diff --git a/tci-advanced-demo/tci-selenium/pom.xml b/tci-advanced-demo/integration-tests/tci-selenium/pom.xml similarity index 91% rename from tci-advanced-demo/tci-selenium/pom.xml rename to tci-advanced-demo/integration-tests/tci-selenium/pom.xml index 52a27cfa..91530617 100644 --- a/tci-advanced-demo/tci-selenium/pom.xml +++ b/tci-advanced-demo/integration-tests/tci-selenium/pom.xml @@ -5,15 +5,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - software.xdev.tci.demo - tci-advanced-demo + software.xdev.tci.demo.it + integration-tests 1.2.1-SNAPSHOT tci-selenium - software.xdev.tci.demo + software.xdev.tci.demo.it tci-testcontainers diff --git a/tci-advanced-demo/tci-selenium/src/main/java/software/xdev/tci/demo/tci/selenium/BrowserTCI.java b/tci-advanced-demo/integration-tests/tci-selenium/src/main/java/software/xdev/tci/demo/tci/selenium/BrowserTCI.java similarity index 100% rename from tci-advanced-demo/tci-selenium/src/main/java/software/xdev/tci/demo/tci/selenium/BrowserTCI.java rename to tci-advanced-demo/integration-tests/tci-selenium/src/main/java/software/xdev/tci/demo/tci/selenium/BrowserTCI.java diff --git a/tci-advanced-demo/tci-selenium/src/main/java/software/xdev/tci/demo/tci/selenium/TestBrowser.java b/tci-advanced-demo/integration-tests/tci-selenium/src/main/java/software/xdev/tci/demo/tci/selenium/TestBrowser.java similarity index 100% rename from tci-advanced-demo/tci-selenium/src/main/java/software/xdev/tci/demo/tci/selenium/TestBrowser.java rename to tci-advanced-demo/integration-tests/tci-selenium/src/main/java/software/xdev/tci/demo/tci/selenium/TestBrowser.java diff --git a/tci-advanced-demo/tci-selenium/src/main/java/software/xdev/tci/demo/tci/selenium/containers/SeleniumBrowserWebDriverContainer.java b/tci-advanced-demo/integration-tests/tci-selenium/src/main/java/software/xdev/tci/demo/tci/selenium/containers/SeleniumBrowserWebDriverContainer.java similarity index 100% rename from tci-advanced-demo/tci-selenium/src/main/java/software/xdev/tci/demo/tci/selenium/containers/SeleniumBrowserWebDriverContainer.java rename to tci-advanced-demo/integration-tests/tci-selenium/src/main/java/software/xdev/tci/demo/tci/selenium/containers/SeleniumBrowserWebDriverContainer.java diff --git a/tci-advanced-demo/tci-selenium/src/main/java/software/xdev/tci/demo/tci/selenium/factory/BrowserTCIFactory.java b/tci-advanced-demo/integration-tests/tci-selenium/src/main/java/software/xdev/tci/demo/tci/selenium/factory/BrowserTCIFactory.java similarity index 100% rename from tci-advanced-demo/tci-selenium/src/main/java/software/xdev/tci/demo/tci/selenium/factory/BrowserTCIFactory.java rename to tci-advanced-demo/integration-tests/tci-selenium/src/main/java/software/xdev/tci/demo/tci/selenium/factory/BrowserTCIFactory.java diff --git a/tci-advanced-demo/tci-selenium/src/main/java/software/xdev/tci/demo/tci/selenium/factory/BrowsersTCIFactory.java b/tci-advanced-demo/integration-tests/tci-selenium/src/main/java/software/xdev/tci/demo/tci/selenium/factory/BrowsersTCIFactory.java similarity index 100% rename from tci-advanced-demo/tci-selenium/src/main/java/software/xdev/tci/demo/tci/selenium/factory/BrowsersTCIFactory.java rename to tci-advanced-demo/integration-tests/tci-selenium/src/main/java/software/xdev/tci/demo/tci/selenium/factory/BrowsersTCIFactory.java diff --git a/tci-advanced-demo/tci-selenium/src/main/java/software/xdev/tci/demo/tci/selenium/testbase/SeleniumIntegrationTestExtension.java b/tci-advanced-demo/integration-tests/tci-selenium/src/main/java/software/xdev/tci/demo/tci/selenium/testbase/SeleniumIntegrationTestExtension.java similarity index 100% rename from tci-advanced-demo/tci-selenium/src/main/java/software/xdev/tci/demo/tci/selenium/testbase/SeleniumIntegrationTestExtension.java rename to tci-advanced-demo/integration-tests/tci-selenium/src/main/java/software/xdev/tci/demo/tci/selenium/testbase/SeleniumIntegrationTestExtension.java diff --git a/tci-advanced-demo/tci-testcontainers/README.md b/tci-advanced-demo/integration-tests/tci-testcontainers/README.md similarity index 100% rename from tci-advanced-demo/tci-testcontainers/README.md rename to tci-advanced-demo/integration-tests/tci-testcontainers/README.md diff --git a/tci-advanced-demo/tci-testcontainers/pom.xml b/tci-advanced-demo/integration-tests/tci-testcontainers/pom.xml similarity index 87% rename from tci-advanced-demo/tci-testcontainers/pom.xml rename to tci-advanced-demo/integration-tests/tci-testcontainers/pom.xml index 53f20783..71211f61 100644 --- a/tci-advanced-demo/tci-testcontainers/pom.xml +++ b/tci-advanced-demo/integration-tests/tci-testcontainers/pom.xml @@ -5,8 +5,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - software.xdev.tci.demo - tci-advanced-demo + software.xdev.tci.demo.it + integration-tests 1.2.1-SNAPSHOT tci-testcontainers diff --git a/tci-advanced-demo/tci-testcontainers/src/main/java/software/xdev/tci/demo/tci/util/ContainerLoggingUtil.java b/tci-advanced-demo/integration-tests/tci-testcontainers/src/main/java/software/xdev/tci/demo/tci/util/ContainerLoggingUtil.java similarity index 100% rename from tci-advanced-demo/tci-testcontainers/src/main/java/software/xdev/tci/demo/tci/util/ContainerLoggingUtil.java rename to tci-advanced-demo/integration-tests/tci-testcontainers/src/main/java/software/xdev/tci/demo/tci/util/ContainerLoggingUtil.java diff --git a/tci-advanced-demo/tci-webapp/Dockerfile b/tci-advanced-demo/integration-tests/tci-webapp/Dockerfile similarity index 100% rename from tci-advanced-demo/tci-webapp/Dockerfile rename to tci-advanced-demo/integration-tests/tci-webapp/Dockerfile diff --git a/tci-advanced-demo/tci-webapp/README.md b/tci-advanced-demo/integration-tests/tci-webapp/README.md similarity index 100% rename from tci-advanced-demo/tci-webapp/README.md rename to tci-advanced-demo/integration-tests/tci-webapp/README.md diff --git a/tci-advanced-demo/tci-webapp/pom.xml b/tci-advanced-demo/integration-tests/tci-webapp/pom.xml similarity index 81% rename from tci-advanced-demo/tci-webapp/pom.xml rename to tci-advanced-demo/integration-tests/tci-webapp/pom.xml index beae18ff..65a9c166 100644 --- a/tci-advanced-demo/tci-webapp/pom.xml +++ b/tci-advanced-demo/integration-tests/tci-webapp/pom.xml @@ -5,15 +5,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - software.xdev.tci.demo - tci-advanced-demo + software.xdev.tci.demo.it + integration-tests 1.2.1-SNAPSHOT tci-webapp - software.xdev.tci.demo + software.xdev.tci.demo.it tci-testcontainers diff --git a/tci-advanced-demo/tci-webapp/src/main/java/software/xdev/tci/demo/tci/webapp/WebAppTCI.java b/tci-advanced-demo/integration-tests/tci-webapp/src/main/java/software/xdev/tci/demo/tci/webapp/WebAppTCI.java similarity index 100% rename from tci-advanced-demo/tci-webapp/src/main/java/software/xdev/tci/demo/tci/webapp/WebAppTCI.java rename to tci-advanced-demo/integration-tests/tci-webapp/src/main/java/software/xdev/tci/demo/tci/webapp/WebAppTCI.java diff --git a/tci-advanced-demo/tci-webapp/src/main/java/software/xdev/tci/demo/tci/webapp/containers/WebAppContainer.java b/tci-advanced-demo/integration-tests/tci-webapp/src/main/java/software/xdev/tci/demo/tci/webapp/containers/WebAppContainer.java similarity index 100% rename from tci-advanced-demo/tci-webapp/src/main/java/software/xdev/tci/demo/tci/webapp/containers/WebAppContainer.java rename to tci-advanced-demo/integration-tests/tci-webapp/src/main/java/software/xdev/tci/demo/tci/webapp/containers/WebAppContainer.java diff --git a/tci-advanced-demo/tci-webapp/src/main/java/software/xdev/tci/demo/tci/webapp/containers/WebAppContainerBuilder.java b/tci-advanced-demo/integration-tests/tci-webapp/src/main/java/software/xdev/tci/demo/tci/webapp/containers/WebAppContainerBuilder.java similarity index 100% rename from tci-advanced-demo/tci-webapp/src/main/java/software/xdev/tci/demo/tci/webapp/containers/WebAppContainerBuilder.java rename to tci-advanced-demo/integration-tests/tci-webapp/src/main/java/software/xdev/tci/demo/tci/webapp/containers/WebAppContainerBuilder.java diff --git a/tci-advanced-demo/tci-webapp/src/main/java/software/xdev/tci/demo/tci/webapp/factory/WebAppTCIFactory.java b/tci-advanced-demo/integration-tests/tci-webapp/src/main/java/software/xdev/tci/demo/tci/webapp/factory/WebAppTCIFactory.java similarity index 100% rename from tci-advanced-demo/tci-webapp/src/main/java/software/xdev/tci/demo/tci/webapp/factory/WebAppTCIFactory.java rename to tci-advanced-demo/integration-tests/tci-webapp/src/main/java/software/xdev/tci/demo/tci/webapp/factory/WebAppTCIFactory.java diff --git a/tci-advanced-demo/webapp-it/README.md b/tci-advanced-demo/integration-tests/webapp-it/README.md similarity index 100% rename from tci-advanced-demo/webapp-it/README.md rename to tci-advanced-demo/integration-tests/webapp-it/README.md diff --git a/tci-advanced-demo/webapp-it/pom.xml b/tci-advanced-demo/integration-tests/webapp-it/pom.xml similarity index 85% rename from tci-advanced-demo/webapp-it/pom.xml rename to tci-advanced-demo/integration-tests/webapp-it/pom.xml index ad0eb566..2bbc9661 100644 --- a/tci-advanced-demo/webapp-it/pom.xml +++ b/tci-advanced-demo/integration-tests/webapp-it/pom.xml @@ -5,8 +5,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - software.xdev.tci.demo - tci-advanced-demo + software.xdev.tci.demo.it + integration-tests 1.2.1-SNAPSHOT webapp-it @@ -18,22 +18,22 @@ - software.xdev.tci.demo + software.xdev.tci.demo.it tci-db test - software.xdev.tci.demo + software.xdev.tci.demo.it tci-oidc test - software.xdev.tci.demo + software.xdev.tci.demo.it tci-selenium test - software.xdev.tci.demo + software.xdev.tci.demo.it tci-webapp test diff --git a/tci-advanced-demo/webapp-it/src/test/java/software/xdev/tci/demo/webapp/base/BaseTest.java b/tci-advanced-demo/integration-tests/webapp-it/src/test/java/software/xdev/tci/demo/webapp/base/BaseTest.java similarity index 100% rename from tci-advanced-demo/webapp-it/src/test/java/software/xdev/tci/demo/webapp/base/BaseTest.java rename to tci-advanced-demo/integration-tests/webapp-it/src/test/java/software/xdev/tci/demo/webapp/base/BaseTest.java diff --git a/tci-advanced-demo/webapp-it/src/test/java/software/xdev/tci/demo/webapp/base/InfraPerCaseTest.java b/tci-advanced-demo/integration-tests/webapp-it/src/test/java/software/xdev/tci/demo/webapp/base/InfraPerCaseTest.java similarity index 100% rename from tci-advanced-demo/webapp-it/src/test/java/software/xdev/tci/demo/webapp/base/InfraPerCaseTest.java rename to tci-advanced-demo/integration-tests/webapp-it/src/test/java/software/xdev/tci/demo/webapp/base/InfraPerCaseTest.java diff --git a/tci-advanced-demo/webapp-it/src/test/java/software/xdev/tci/demo/webapp/base/InfraPerClassTest.java b/tci-advanced-demo/integration-tests/webapp-it/src/test/java/software/xdev/tci/demo/webapp/base/InfraPerClassTest.java similarity index 100% rename from tci-advanced-demo/webapp-it/src/test/java/software/xdev/tci/demo/webapp/base/InfraPerClassTest.java rename to tci-advanced-demo/integration-tests/webapp-it/src/test/java/software/xdev/tci/demo/webapp/base/InfraPerClassTest.java diff --git a/tci-advanced-demo/webapp-it/src/test/java/software/xdev/tci/demo/webapp/base/IntegrationTestDefaults.java b/tci-advanced-demo/integration-tests/webapp-it/src/test/java/software/xdev/tci/demo/webapp/base/IntegrationTestDefaults.java similarity index 100% rename from tci-advanced-demo/webapp-it/src/test/java/software/xdev/tci/demo/webapp/base/IntegrationTestDefaults.java rename to tci-advanced-demo/integration-tests/webapp-it/src/test/java/software/xdev/tci/demo/webapp/base/IntegrationTestDefaults.java diff --git a/tci-advanced-demo/webapp-it/src/test/java/software/xdev/tci/demo/webapp/cases/LoginOIDCTest.java b/tci-advanced-demo/integration-tests/webapp-it/src/test/java/software/xdev/tci/demo/webapp/cases/LoginOIDCTest.java similarity index 100% rename from tci-advanced-demo/webapp-it/src/test/java/software/xdev/tci/demo/webapp/cases/LoginOIDCTest.java rename to tci-advanced-demo/integration-tests/webapp-it/src/test/java/software/xdev/tci/demo/webapp/cases/LoginOIDCTest.java diff --git a/tci-advanced-demo/webapp-it/src/test/java/software/xdev/tci/demo/webapp/cases/LongButLittleResourceUsageTest.java b/tci-advanced-demo/integration-tests/webapp-it/src/test/java/software/xdev/tci/demo/webapp/cases/LongButLittleResourceUsageTest.java similarity index 100% rename from tci-advanced-demo/webapp-it/src/test/java/software/xdev/tci/demo/webapp/cases/LongButLittleResourceUsageTest.java rename to tci-advanced-demo/integration-tests/webapp-it/src/test/java/software/xdev/tci/demo/webapp/cases/LongButLittleResourceUsageTest.java diff --git a/tci-advanced-demo/webapp-it/src/test/java/software/xdev/tci/demo/webapp/cases/ProductTest.java b/tci-advanced-demo/integration-tests/webapp-it/src/test/java/software/xdev/tci/demo/webapp/cases/ProductTest.java similarity index 100% rename from tci-advanced-demo/webapp-it/src/test/java/software/xdev/tci/demo/webapp/cases/ProductTest.java rename to tci-advanced-demo/integration-tests/webapp-it/src/test/java/software/xdev/tci/demo/webapp/cases/ProductTest.java diff --git a/tci-advanced-demo/webapp-it/src/test/java/software/xdev/tci/demo/webapp/datageneration/ProductDG.java b/tci-advanced-demo/integration-tests/webapp-it/src/test/java/software/xdev/tci/demo/webapp/datageneration/ProductDG.java similarity index 100% rename from tci-advanced-demo/webapp-it/src/test/java/software/xdev/tci/demo/webapp/datageneration/ProductDG.java rename to tci-advanced-demo/integration-tests/webapp-it/src/test/java/software/xdev/tci/demo/webapp/datageneration/ProductDG.java diff --git a/tci-advanced-demo/webapp-it/src/test/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener b/tci-advanced-demo/integration-tests/webapp-it/src/test/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener similarity index 100% rename from tci-advanced-demo/webapp-it/src/test/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener rename to tci-advanced-demo/integration-tests/webapp-it/src/test/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener diff --git a/tci-advanced-demo/webapp-it/src/test/resources/META-INF/services/software.xdev.tci.leakdetection.LeakDetectionAsyncReaper b/tci-advanced-demo/integration-tests/webapp-it/src/test/resources/META-INF/services/software.xdev.tci.leakdetection.LeakDetectionAsyncReaper similarity index 100% rename from tci-advanced-demo/webapp-it/src/test/resources/META-INF/services/software.xdev.tci.leakdetection.LeakDetectionAsyncReaper rename to tci-advanced-demo/integration-tests/webapp-it/src/test/resources/META-INF/services/software.xdev.tci.leakdetection.LeakDetectionAsyncReaper diff --git a/tci-advanced-demo/webapp-it/src/test/resources/log4j2-test.xml b/tci-advanced-demo/integration-tests/webapp-it/src/test/resources/log4j2-test.xml similarity index 100% rename from tci-advanced-demo/webapp-it/src/test/resources/log4j2-test.xml rename to tci-advanced-demo/integration-tests/webapp-it/src/test/resources/log4j2-test.xml diff --git a/tci-advanced-demo/pom.xml b/tci-advanced-demo/pom.xml index 8fa2d06c..852d402b 100644 --- a/tci-advanced-demo/pom.xml +++ b/tci-advanced-demo/pom.xml @@ -27,15 +27,9 @@ entities entities-metamodel + integration-tests persistence - persistence-it - tci-db - tci-oidc - tci-selenium - tci-testcontainers - tci-webapp webapp - webapp-it @@ -59,51 +53,6 @@ 1.2.1-SNAPSHOT - - software.xdev.tci.demo - tci-db - 1.2.1-SNAPSHOT - - - - software.xdev.tci.demo - tci-oidc - 1.2.1-SNAPSHOT - - - - software.xdev.tci.demo - tci-selenium - 1.2.1-SNAPSHOT - - - - software.xdev.tci.demo - tci-webapp - 1.2.1-SNAPSHOT - - - - software.xdev.tci.demo - tci-testcontainers - 1.2.1-SNAPSHOT - - - - software.xdev - tci-base - ${project.version} - - - - - org.seleniumhq.selenium - selenium-dependencies-bom - 4.33.0 - pom - import - - software.xdev spring-security-advanced-authentication-ui @@ -126,30 +75,6 @@ import - - - software.xdev - testcontainers-selenium - 1.2.3 - - - software.xdev - testcontainers-junit4-mock - 1.0.2 - - - software.xdev - testcontainers-advanced-imagebuilder - 2.0.1 - - - org.testcontainers - testcontainers-bom - 1.21.2 - pom - import - - org.mariadb.jdbc @@ -169,13 +94,6 @@ 1.1.0 - - - org.javassist - javassist - 3.30.2-GA - - From 0345581597ecc3531b663773e8b87d2d9a17c1ce Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 26 Jun 2025 16:56:31 +0200 Subject: [PATCH 2/6] Change paths accordingly --- .github/workflows/run-integration-tests.yml | 2 +- .../tci/webapp/containers/WebAppContainerBuilder.java | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/run-integration-tests.yml b/.github/workflows/run-integration-tests.yml index 6903755e..f5b18798 100644 --- a/.github/workflows/run-integration-tests.yml +++ b/.github/workflows/run-integration-tests.yml @@ -46,7 +46,7 @@ jobs: - name: Test run: | ./mvnw -B test \ - -pl "tci-advanced-demo/${{ matrix.project }}" -am \ + -pl "tci-advanced-demo/integration-tests/${{ matrix.project }}" -am \ -P run-it \ ${{ matrix.pre-start && '-Dinfra-pre-start.enabled=1 ' || '' }} \ ${{ matrix.parallel > 0 && format('-Djunit.jupiter.execution.parallel.enabled=true -Djunit.jupiter.execution.parallel.mode.default=concurrent -Djunit.jupiter.execution.parallel.mode.classes.default=concurrent -Djunit.jupiter.execution.parallel.config.strategy=fixed -Djunit.jupiter.execution.parallel.config.fixed.parallelism=2 -Djunit.jupiter.execution.parallel.config.fixed.max-pool-size={0} ', matrix.parallel) || '' }} diff --git a/tci-advanced-demo/integration-tests/tci-webapp/src/main/java/software/xdev/tci/demo/tci/webapp/containers/WebAppContainerBuilder.java b/tci-advanced-demo/integration-tests/tci-webapp/src/main/java/software/xdev/tci/demo/tci/webapp/containers/WebAppContainerBuilder.java index feafd044..78c6c094 100644 --- a/tci-advanced-demo/integration-tests/tci-webapp/src/main/java/software/xdev/tci/demo/tci/webapp/containers/WebAppContainerBuilder.java +++ b/tci-advanced-demo/integration-tests/tci-webapp/src/main/java/software/xdev/tci/demo/tci/webapp/containers/WebAppContainerBuilder.java @@ -43,24 +43,21 @@ public static synchronized String getBuiltImageName() "*.iml", "*.cmd", "*.md", - ".config/**", - ".idea/**", "_dev_infra/**", "_resource_metrics/**", // Ignore other Dockerfiles (our required file will always be transferred) "Dockerfile", // Ignore not required test-modules that may have changed // sources only - otherwise the parent pom doesn't find the resources - "tci-*/src/**", - "*-it/src/**", - "**/src/test", + "integration-tests/*/src/**", + "**/src/test/**", // Ignore resources that are just used for development "webapp/src/main/resources-dev/**", // Most files from these folders need to be ignored -> Down there for highest prio "node_modules", "target") - .withDockerFilePath(Paths.get("../tci-webapp/Dockerfile")) - .withBaseDir(Paths.get("../")) + .withDockerFilePath(Paths.get("../../integration-tests/tci-webapp/Dockerfile")) + .withBaseDir(Paths.get("../../")) // File is in root directory - we can't access it .withBaseDirRelativeIgnoreFile(null) .withDockerFileLinesModifier(new DockerfileCOPYParentsEmulator()); From a889c9db918b80cb9a875676039789771ffcfb5a Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 26 Jun 2025 17:00:42 +0200 Subject: [PATCH 3/6] Fix unused parameter --- .../tci/demo/tci/db/persistence/EntityManagerController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/tci-advanced-demo/integration-tests/tci-db/src/main/java/software/xdev/tci/demo/tci/db/persistence/EntityManagerController.java b/tci-advanced-demo/integration-tests/tci-db/src/main/java/software/xdev/tci/demo/tci/db/persistence/EntityManagerController.java index 626b3c03..c006958f 100644 --- a/tci-advanced-demo/integration-tests/tci-db/src/main/java/software/xdev/tci/demo/tci/db/persistence/EntityManagerController.java +++ b/tci-advanced-demo/integration-tests/tci-db/src/main/java/software/xdev/tci/demo/tci/db/persistence/EntityManagerController.java @@ -180,6 +180,7 @@ public ClassLoader getNewTempClassLoader() Optional.ofNullable(connectionProviderClassName) .ifPresent(p -> properties.put(JdbcSettings.CONNECTION_PROVIDER, connectionProviderClassName)); properties.putAll(DisableHibernateFormatMapper.properties()); + properties.putAll(additionalConfig); return new EntityManagerController( new HibernatePersistenceProvider() .createContainerEntityManagerFactory( From a41cbb9ec4b4464edde6400cb686053502eb4398 Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 26 Jun 2025 17:02:53 +0200 Subject: [PATCH 4/6] Fix some sonar problems --- .../hibernate/CachingStandardScanner.java | 1 + .../xdev/tci/demo/webapp/base/BaseTest.java | 22 +++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/tci-advanced-demo/integration-tests/tci-db/src/main/java/software/xdev/tci/demo/tci/db/persistence/hibernate/CachingStandardScanner.java b/tci-advanced-demo/integration-tests/tci-db/src/main/java/software/xdev/tci/demo/tci/db/persistence/hibernate/CachingStandardScanner.java index 3d6eb857..55bb3757 100644 --- a/tci-advanced-demo/integration-tests/tci-db/src/main/java/software/xdev/tci/demo/tci/db/persistence/hibernate/CachingStandardScanner.java +++ b/tci-advanced-demo/integration-tests/tci-db/src/main/java/software/xdev/tci/demo/tci/db/persistence/hibernate/CachingStandardScanner.java @@ -12,6 +12,7 @@ import org.hibernate.boot.archive.scan.spi.ScanResult; +@SuppressWarnings("java:S6548") public class CachingStandardScanner extends StandardScanner { private static CachingStandardScanner instance; diff --git a/tci-advanced-demo/integration-tests/webapp-it/src/test/java/software/xdev/tci/demo/webapp/base/BaseTest.java b/tci-advanced-demo/integration-tests/webapp-it/src/test/java/software/xdev/tci/demo/webapp/base/BaseTest.java index 9de074cb..96578730 100644 --- a/tci-advanced-demo/integration-tests/webapp-it/src/test/java/software/xdev/tci/demo/webapp/base/BaseTest.java +++ b/tci-advanced-demo/integration-tests/webapp-it/src/test/java/software/xdev/tci/demo/webapp/base/BaseTest.java @@ -194,19 +194,19 @@ protected void stopWebDriver() return; } - final RemoteWebDriver remoteWebDriver = this.remoteWebDriver; - final BrowserTCI browserInfra = this.browserInfra; + final RemoteWebDriver fRemoteWebDriver = this.remoteWebDriver; + final BrowserTCI fBrowserInfra = this.browserInfra; REAP_CFS.add(CompletableFuture.runAsync(() -> { try { - if(remoteWebDriver != null && remoteWebDriver.getSessionId() != null) + if(fRemoteWebDriver != null && fRemoteWebDriver.getSessionId() != null) { LOG.info("Quiting remoteWebDriver"); - remoteWebDriver.quit(); + fRemoteWebDriver.quit(); } - browserInfra.stop(); + fBrowserInfra.stop(); } catch(final Exception ex) { @@ -222,25 +222,25 @@ protected void stopEverything() { LOG.info("Shutting down"); - final WebAppTCI appInfra = this.appInfra; - final OIDCTCI oidcInfra = this.oidcInfra; - final DBTCI dbInfra = this.dbInfra; + final WebAppTCI fAppInfra = this.appInfra; + final OIDCTCI fOidcInfra = this.oidcInfra; + final DBTCI fDbInfra = this.dbInfra; - final Network network = this.network; + final Network fNetwork = this.network; REAP_CFS.add(CompletableFuture.runAsync(() -> { try { Stream.concat( Stream.of(this::stopWebDriver), - Stream.of(appInfra, oidcInfra, dbInfra) + Stream.of(fAppInfra, fOidcInfra, fDbInfra) .filter(Objects::nonNull) .map(tci -> tci::stop)) .map(CompletableFuture::runAsync) .toList() // collect so everything is getting executed async .forEach(CompletableFuture::join); - Optional.ofNullable(network).ifPresent(Network::close); + Optional.ofNullable(fNetwork).ifPresent(Network::close); } catch(final Exception ex) { From abe53b7a88474b51b816c4cdfb0b302989b255b1 Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 26 Jun 2025 17:03:23 +0200 Subject: [PATCH 5/6] Update BaseTest.java --- .../software/xdev/tci/demo/persistence/base/BaseTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tci-advanced-demo/integration-tests/persistence-it/src/test/java/software/xdev/tci/demo/persistence/base/BaseTest.java b/tci-advanced-demo/integration-tests/persistence-it/src/test/java/software/xdev/tci/demo/persistence/base/BaseTest.java index 34dd6931..2403111a 100644 --- a/tci-advanced-demo/integration-tests/persistence-it/src/test/java/software/xdev/tci/demo/persistence/base/BaseTest.java +++ b/tci-advanced-demo/integration-tests/persistence-it/src/test/java/software/xdev/tci/demo/persistence/base/BaseTest.java @@ -124,8 +124,8 @@ protected void stopInfra() { this.dbInfra.logDataBaseInfo(); - final DBTCI dbInfra = this.dbInfra; - REAP_CFS.add(CompletableFuture.runAsync(dbInfra::stop)); + final DBTCI fDbInfra = this.dbInfra; + REAP_CFS.add(CompletableFuture.runAsync(fDbInfra::stop)); this.dbInfra = null; } From 44f7ca2564f97e77be4234a0fd6cc33792be2cfa Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 26 Jun 2025 17:06:08 +0200 Subject: [PATCH 6/6] Suppress irrelevant --- .../xdev/tci/demo/webapp/base/IntegrationTestDefaults.java | 1 + 1 file changed, 1 insertion(+) diff --git a/tci-advanced-demo/integration-tests/webapp-it/src/test/java/software/xdev/tci/demo/webapp/base/IntegrationTestDefaults.java b/tci-advanced-demo/integration-tests/webapp-it/src/test/java/software/xdev/tci/demo/webapp/base/IntegrationTestDefaults.java index f83bd5ed..419cb5e1 100644 --- a/tci-advanced-demo/integration-tests/webapp-it/src/test/java/software/xdev/tci/demo/webapp/base/IntegrationTestDefaults.java +++ b/tci-advanced-demo/integration-tests/webapp-it/src/test/java/software/xdev/tci/demo/webapp/base/IntegrationTestDefaults.java @@ -11,6 +11,7 @@ import org.openqa.selenium.support.ui.WebDriverWait; +@SuppressWarnings("java:S119") public interface IntegrationTestDefaults { @SuppressWarnings("unchecked")