From e37739559fcab9af913b18c20a049079b88b5844 Mon Sep 17 00:00:00 2001 From: "emmanuel.duchastenier@bonitasoft.com" Date: Fri, 4 Oct 2024 15:01:10 +0200 Subject: [PATCH] chore(ADR): explain the decision regarding new DB test configurations (#3186) Closes https://bonitasoft.atlassian.net/browse/BPM-285 --- .../engine/gradle/docker/DatabaseExtraConfiguration.groovy | 4 ++-- .../docker/DockerDatabaseContainerTasksCreator.groovy | 6 +++--- .../engine/scheduler/impl/AbstractQuartzJobTest.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/buildSrc/src/main/groovy/org/bonitasoft/engine/gradle/docker/DatabaseExtraConfiguration.groovy b/buildSrc/src/main/groovy/org/bonitasoft/engine/gradle/docker/DatabaseExtraConfiguration.groovy index 04722c3a4fe..978fa97d9f5 100644 --- a/buildSrc/src/main/groovy/org/bonitasoft/engine/gradle/docker/DatabaseExtraConfiguration.groovy +++ b/buildSrc/src/main/groovy/org/bonitasoft/engine/gradle/docker/DatabaseExtraConfiguration.groovy @@ -6,9 +6,9 @@ import org.gradle.api.Project @Canonical class DatabaseExtraConfiguration { /** - * Include an additional module in the test classpath + * Include an additional project in the test classpath */ - Project includeTestModule + Project includeTestProject /** * Excludes test class patterns (e.g. '**/*Test.class') applied to this database vendor. * It can be combined with {@link #excludeTags}. diff --git a/buildSrc/src/main/groovy/org/bonitasoft/engine/gradle/docker/DockerDatabaseContainerTasksCreator.groovy b/buildSrc/src/main/groovy/org/bonitasoft/engine/gradle/docker/DockerDatabaseContainerTasksCreator.groovy index d5e59ab9d58..20c28fdac28 100644 --- a/buildSrc/src/main/groovy/org/bonitasoft/engine/gradle/docker/DockerDatabaseContainerTasksCreator.groovy +++ b/buildSrc/src/main/groovy/org/bonitasoft/engine/gradle/docker/DockerDatabaseContainerTasksCreator.groovy @@ -140,9 +140,9 @@ class DockerDatabaseContainerTasksCreator { description = "Runs slow integration test suite on $vendor.name database." systemProperty "bonita.version", project.version jvmArgs += ['--add-opens', 'java.base/java.util=ALL-UNNAMED', '--add-opens', 'java.base/java.lang=ALL-UNNAMED', '-Dfile.encoding=UTF-8'] - if (extension."${vendor.name}"?.includeTestModule) { - testClassesDirs += extension."${vendor.name}".includeTestModule.sourceSets.test.output.classesDirs - classpath += extension."${vendor.name}".includeTestModule.sourceSets.test.runtimeClasspath + if (extension."${vendor.name}"?.includeTestProject) { + testClassesDirs += extension."${vendor.name}".includeTestProject.sourceSets.test.output.classesDirs + classpath += extension."${vendor.name}".includeTestProject.sourceSets.test.runtimeClasspath } classpath += project.files(project.configurations.drivers) if (extension."${vendor.name}"?.excludes) { diff --git a/services/bonita-scheduler/src/test/java/org/bonitasoft/engine/scheduler/impl/AbstractQuartzJobTest.java b/services/bonita-scheduler/src/test/java/org/bonitasoft/engine/scheduler/impl/AbstractQuartzJobTest.java index 2362aa51ca8..ce6c591b947 100644 --- a/services/bonita-scheduler/src/test/java/org/bonitasoft/engine/scheduler/impl/AbstractQuartzJobTest.java +++ b/services/bonita-scheduler/src/test/java/org/bonitasoft/engine/scheduler/impl/AbstractQuartzJobTest.java @@ -52,7 +52,7 @@ public void before() { @Test public void should_not_unschedule_job_on_exception() throws Exception { // job should never throw an exception and be handled by the JobWrapper - // we do not unschedule the job in that case. we don't want to loose the job + // we do not unschedule the job in that case. we don't want to lose the job doReturn(jobThatFails()).when(schedulerService).getPersistedJob(any()); try {