From a78870b0c2635e249dee0e129146fc2d71cab34f Mon Sep 17 00:00:00 2001 From: Crystal Liang Date: Fri, 28 Apr 2023 19:11:42 -0700 Subject: [PATCH] test: prevent disabled tests from being run during hibernate tests --- wrapper/build.gradle.kts | 1 + .../integration/refactored/host/TestEnvironment.java | 2 +- .../refactored/host/TestEnvironmentProvider.java | 10 ++++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/wrapper/build.gradle.kts b/wrapper/build.gradle.kts index 4e1dfa433..cc234189b 100644 --- a/wrapper/build.gradle.kts +++ b/wrapper/build.gradle.kts @@ -281,6 +281,7 @@ tasks.register("test-hibernate-only") { systemProperty("test-no-performance", "true") systemProperty("test-no-mariadb-driver", "true") systemProperty("test-no-mariadb-engine", "true") + systemProperty("test-no-graalvm", "true") systemProperty("test-hibernate-only", "true") } } diff --git a/wrapper/src/test/java/integration/refactored/host/TestEnvironment.java b/wrapper/src/test/java/integration/refactored/host/TestEnvironment.java index f48149a76..c4751f980 100644 --- a/wrapper/src/test/java/integration/refactored/host/TestEnvironment.java +++ b/wrapper/src/test/java/integration/refactored/host/TestEnvironment.java @@ -585,7 +585,7 @@ private static String getContainerBaseImageName(TestEnvironmentRequest request) case OPENJDK8: return "openjdk:8-jdk-alpine"; case OPENJDK11: - return "adoptopenjdk/openjdk11:alpine"; + return "amazoncorretto:11.0.19-alpine3.17"; case GRAALVM: return "ghcr.io/graalvm/jdk:22.2.0"; default: diff --git a/wrapper/src/test/java/integration/refactored/host/TestEnvironmentProvider.java b/wrapper/src/test/java/integration/refactored/host/TestEnvironmentProvider.java index c2de54e15..4efdb0e68 100644 --- a/wrapper/src/test/java/integration/refactored/host/TestEnvironmentProvider.java +++ b/wrapper/src/test/java/integration/refactored/host/TestEnvironmentProvider.java @@ -178,12 +178,13 @@ public Stream provideTestTemplateInvocationContex DatabaseInstances.MULTI_INSTANCE, 2, DatabaseEngineDeployment.DOCKER, - TargetJvm.OPENJDK8, + testHibernateOnly ? TargetJvm.OPENJDK11 : TargetJvm.OPENJDK8, TestEnvironmentFeatures.NETWORK_OUTAGES_ENABLED, noHikari ? null : TestEnvironmentFeatures.HIKARI, noMysqlDriver ? TestEnvironmentFeatures.SKIP_MYSQL_DRIVER_TESTS : null, noPgDriver ? TestEnvironmentFeatures.SKIP_PG_DRIVER_TESTS : null, - noMariadbDriver ? TestEnvironmentFeatures.SKIP_MARIADB_DRIVER_TESTS : null))); + noMariadbDriver ? TestEnvironmentFeatures.SKIP_MARIADB_DRIVER_TESTS : null, + testHibernateOnly ? TestEnvironmentFeatures.RUN_HIBERNATE_TESTS_ONLY : null))); } if (!noPgEngine && !noOpenJdk) { resultContextList.add( @@ -193,12 +194,13 @@ public Stream provideTestTemplateInvocationContex DatabaseInstances.MULTI_INSTANCE, 2, DatabaseEngineDeployment.DOCKER, - TargetJvm.OPENJDK8, + testHibernateOnly ? TargetJvm.OPENJDK11 : TargetJvm.OPENJDK8, TestEnvironmentFeatures.NETWORK_OUTAGES_ENABLED, noHikari ? null : TestEnvironmentFeatures.HIKARI, noMysqlDriver ? TestEnvironmentFeatures.SKIP_MYSQL_DRIVER_TESTS : null, noPgDriver ? TestEnvironmentFeatures.SKIP_PG_DRIVER_TESTS : null, - noMariadbDriver ? TestEnvironmentFeatures.SKIP_MARIADB_DRIVER_TESTS : null))); + noMariadbDriver ? TestEnvironmentFeatures.SKIP_MARIADB_DRIVER_TESTS : null, + testHibernateOnly ? TestEnvironmentFeatures.RUN_HIBERNATE_TESTS_ONLY : null))); } if (!noMariadbEngine && !noOpenJdk) { resultContextList.add(