Skip to content

fix(jbpm-runtime-manager): stabilize flaky runtime-manager tests by enforcing deterministic DeploymentDescriptor generation and audit cache setup #2482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
XiaoyangCai360 wants to merge 4 commits into
base: main
Choose a base branch
from
+117 −32
Open

fix(jbpm-runtime-manager): stabilize flaky runtime-manager tests by enforcing deterministic DeploymentDescriptor generation and audit cache setup #2482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
03e0d1d
fix(jbpm-runtime-manager): fix flaky test testJmsAuditCacheInstance
Oct 30, 2025
229835f
fix(jbpm-runtime-manager): fix flaky test DeploymentDescriptorManager…
Oct 30, 2025
693b31f
fix(jbpm-runtime-manager): fix flaky test DeploymentDescriptorManager…
Oct 30, 2025
e2c73f7
fix(jbpm-runtime-manager): fix flaky test DeploymentDescriptorManager…
Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions ...ager/src/test/java/org/jbpm/runtime/manager/impl/DefaultRegisterableItemsFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,8 @@
import org.kie.api.runtime.manager.RuntimeEnvironment;
import org.kie.api.runtime.manager.RuntimeManager;
import org.kie.api.runtime.manager.RuntimeManagerFactory;
import org.kie.internal.runtime.conf.AuditMode;
import org.kie.internal.runtime.conf.DeploymentDescriptor;
import org.kie.internal.runtime.manager.context.ProcessInstanceIdContext;
import org.kie.internal.runtime.manager.deploy.DeploymentDescriptorImpl;
import org.kie.test.util.db.PoolingDataSourceWrapper;

import static org.junit.Assert.assertEquals;
Expand Down Expand Up @@ -68,12 +66,16 @@ public void teardown() {
public void testJmsAuditCacheInstance() throws Exception {
KieServices ks = KieServices.Factory.get();
ReleaseId releaseId = ks.newReleaseId("org.jbpm.test.jms", "kjar-jms-audit", "1.0.0");

DeploymentDescriptor customDescriptor = new DeploymentDescriptorImpl("org.jbpm.persistence.jpa");
customDescriptor.getBuilder()
.auditMode(AuditMode.JMS);

// Deterministic, schema-valid deployment descriptor XML.
String descriptorXml =
"<deployment-descriptor>" +
" <persistence-unit>org.jbpm.persistence.jpa</persistence-unit>" +
" <audit-mode>JMS</audit-mode>" +
"</deployment-descriptor>";

Map<String, String> resources = new HashMap<String, String>();
resources.put("src/main/resources/" + DeploymentDescriptor.META_INF_LOCATION, customDescriptor.toXml());
resources.put("src/main/resources/" + DeploymentDescriptor.META_INF_LOCATION, descriptorXml);

InternalKieModule kJar1 = createKieJar(ks, releaseId, resources);
installKjar(releaseId, kJar1);
Expand Down
133 changes: 108 additions & 25 deletions ...r/src/test/java/org/jbpm/runtime/manager/impl/deploy/DeploymentDescriptorManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@

import org.assertj.core.api.Assertions;
import org.drools.compiler.kie.builder.impl.InternalKieModule;
import org.drools.modelcompiler.dsl.pattern.D;
import org.junit.Test;
import org.kie.api.KieServices;
import org.kie.api.builder.ReleaseId;
Expand Down Expand Up @@ -172,13 +173,30 @@ public void testDeploymentDescriptorFromKieContainer() {
KieServices ks = KieServices.Factory.get();
ReleaseId releaseId = ks.newReleaseId(GROUP_ID, ARTIFACT_ID, VERSION);

DeploymentDescriptor descriptor = new DeploymentDescriptorImpl("org.jbpm.domain");
descriptor.getBuilder().runtimeStrategy(RuntimeStrategy.PER_PROCESS_INSTANCE);
// Deterministic, schema-valid deployment descriptor XML
final String descriptorXml =
"<deployment-descriptor>" +
" <persistence-unit>org.jbpm.domain</persistence-unit>" +
" <audit-persistence-unit>org.jbpm.domain</audit-persistence-unit>" +
" <audit-mode>JPA</audit-mode>" +
" <persistence-mode>JPA</persistence-mode>" +
" <runtime-strategy>PER_PROCESS_INSTANCE</runtime-strategy>" +
" <marshalling-strategies/>" +
" <event-listeners/>" +
" <task-event-listeners/>" +
" <globals/>" +
" <work-item-handlers/>" +
" <environment-entries/>" +
" <configurations/>" +
" <required-roles/>" +
" <remoteable-classes/>" +
" <limit-serialization-classes>false</limit-serialization-classes>" +
"</deployment-descriptor>";

Map<String, String> resources = new HashMap<String, String>();
resources.put("src/main/resources/simple.drl", SIMPLE_DRL);
resources.put("src/main/resources/META-INF/kie-deployment-descriptor.xml",
descriptor.toXml());
descriptorXml);

InternalKieModule kJar1 = createKieJar(ks, releaseId, resources);
installKjar(releaseId, kJar1);
Expand All @@ -190,7 +208,7 @@ public void testDeploymentDescriptorFromKieContainer() {
assertNotNull(descriptorHierarchy);
assertEquals(2, descriptorHierarchy.size());

descriptor = descriptorHierarchy.get(0);
DeploymentDescriptor descriptor = descriptorHierarchy.get(0);

assertNotNull(descriptor);
assertEquals("org.jbpm.domain", descriptor.getPersistenceUnit());
Expand Down Expand Up @@ -231,30 +249,61 @@ public void testDeploymentDescriptorFromKieContainerWithDependency() {
// create dependency kjar
ReleaseId releaseIdDep = ks.newReleaseId(GROUP_ID, "dependency-data", VERSION);

DeploymentDescriptor descriptorDep = new DeploymentDescriptorImpl("org.jbpm.domain");
descriptorDep.getBuilder()
.runtimeStrategy(RuntimeStrategy.PER_PROCESS_INSTANCE)
.auditPersistenceUnit("org.jbpm.audit");
// Deterministic deployment descriptor XML for the dependency module
final String dependencyDescriptorXml =
"<deployment-descriptor>" +
" <persistence-unit>org.jbpm.domain</persistence-unit>" +
" <audit-persistence-unit>org.jbpm.audit</audit-persistence-unit>" +
" <audit-mode>JPA</audit-mode>" +
" <persistence-mode>JPA</persistence-mode>" +
" <runtime-strategy>PER_PROCESS_INSTANCE</runtime-strategy>" +
" <marshalling-strategies/>" +
" <event-listeners/>" +
" <task-event-listeners/>" +
" <globals/>" +
" <work-item-handlers/>" +
" <environment-entries/>" +
" <configurations/>" +
" <required-roles/>" +
" <remoteable-classes/>" +
" <limit-serialization-classes>false</limit-serialization-classes>" +
"</deployment-descriptor>";

Map<String, String> resourcesDep = new HashMap<String, String>();
resourcesDep.put("src/main/resources/simple.drl", SIMPLE_DRL);
resourcesDep.put("src/main/resources/META-INF/kie-deployment-descriptor.xml",
descriptorDep.toXml());
dependencyDescriptorXml);

InternalKieModule kJarDep = createKieJar(ks, releaseIdDep, resourcesDep);
installKjar(releaseIdDep, kJarDep);

// create first kjar that will have dependency to another
ReleaseId releaseId = ks.newReleaseId(GROUP_ID, ARTIFACT_ID, VERSION);

DeploymentDescriptor descriptor = new DeploymentDescriptorImpl("org.jbpm.domain");
descriptor.getBuilder()
.runtimeStrategy(RuntimeStrategy.PER_PROCESS_INSTANCE);
// Deterministic deployment descriptor XML for the main module
final String mainDescriptorXml =
"<deployment-descriptor>" +
" <persistence-unit>org.jbpm.domain</persistence-unit>" +
" <audit-persistence-unit>org.jbpm.domain</audit-persistence-unit>" +
" <audit-mode>JPA</audit-mode>" +
" <persistence-mode>JPA</persistence-mode>" +
" <runtime-strategy>PER_PROCESS_INSTANCE</runtime-strategy>" +
" <marshalling-strategies/>" +
" <event-listeners/>" +
" <task-event-listeners/>" +
" <globals/>" +
" <work-item-handlers/>" +
" <environment-entries/>" +
" <configurations/>" +
" <required-roles/>" +
" <remoteable-classes/>" +
" <limit-serialization-classes>false</limit-serialization-classes>" +
"</deployment-descriptor>";

Map<String, String> resources = new HashMap<String, String>();
resources.put("src/main/resources/simple.drl", SIMPLE_DRL);
resources.put("src/main/resources/META-INF/kie-deployment-descriptor.xml",
descriptor.toXml());
mainDescriptorXml);

InternalKieModule kJar1 = createKieJar(ks, releaseId, resources, releaseIdDep);
installKjar(releaseId, kJar1);
Expand All @@ -266,7 +315,7 @@ public void testDeploymentDescriptorFromKieContainerWithDependency() {
assertNotNull(descriptorHierarchy);
assertEquals(3, descriptorHierarchy.size());

descriptor = descriptorHierarchy.get(0);
DeploymentDescriptor descriptor = descriptorHierarchy.get(0);

assertNotNull(descriptor);
assertEquals("org.jbpm.domain", descriptor.getPersistenceUnit());
Expand Down Expand Up @@ -323,31 +372,65 @@ public void testDeploymentDescriptorFromKieContainerWithDependencyMerged() {
// create dependency kjar
ReleaseId releaseIdDep = ks.newReleaseId(GROUP_ID, "dependency-data", VERSION);

DeploymentDescriptor descriptorDep = new DeploymentDescriptorImpl("org.jbpm.domain");
descriptorDep.getBuilder()
.runtimeStrategy(RuntimeStrategy.PER_PROCESS_INSTANCE)
.auditPersistenceUnit("org.jbpm.audit")
.addGlobal(new NamedObjectModel("service", "org.jbpm.global.Service"));
// Deterministic descriptor for the dependency module
final String dependencyDescriptorXml =
"<deployment-descriptor>" +
" <persistence-unit>org.jbpm.domain</persistence-unit>" +
" <audit-persistence-unit>org.jbpm.audit</audit-persistence-unit>" +
" <audit-mode>JPA</audit-mode>" +
" <persistence-mode>JPA</persistence-mode>" +
" <runtime-strategy>PER_PROCESS_INSTANCE</runtime-strategy>" +
" <marshalling-strategies/>" +
" <event-listeners/>" +
" <task-event-listeners/>" +
" <globals>" +
" <global>" +
" <name>service</name>" +
" </global>" +
" </globals>" +
" <work-item-handlers/>" +
" <environment-entries/>" +
" <configurations/>" +
" <required-roles/>" +
" <remoteable-classes/>" +
" <limit-serialization-classes>false</limit-serialization-classes>" +
"</deployment-descriptor>";

Map<String, String> resourcesDep = new HashMap<String, String>();
resourcesDep.put("src/main/resources/simple.drl", SIMPLE_DRL);
resourcesDep.put("src/main/resources/META-INF/kie-deployment-descriptor.xml",
descriptorDep.toXml());
dependencyDescriptorXml);

InternalKieModule kJarDep = createKieJar(ks, releaseIdDep, resourcesDep);
installKjar(releaseIdDep, kJarDep);

// create first kjar that will have dependency to another
ReleaseId releaseId = ks.newReleaseId(GROUP_ID, ARTIFACT_ID, VERSION);

DeploymentDescriptor descriptor = new DeploymentDescriptorImpl("org.jbpm.domain");
descriptor.getBuilder()
.runtimeStrategy(RuntimeStrategy.PER_PROCESS_INSTANCE);
// Deterministic descriptor for the main module
final String mainDescriptorXml =
"<deployment-descriptor>" +
" <persistence-unit>org.jbpm.domain</persistence-unit>" +
" <audit-persistence-unit>org.jbpm.domain</audit-persistence-unit>" +
" <audit-mode>JPA</audit-mode>" +
" <persistence-mode>JPA</persistence-mode>" +
" <runtime-strategy>PER_PROCESS_INSTANCE</runtime-strategy>" +
" <marshalling-strategies/>" +
" <event-listeners/>" +
" <task-event-listeners/>" +
" <globals/>" +
" <work-item-handlers/>" +
" <environment-entries/>" +
" <configurations/>" +
" <required-roles/>" +
" <remoteable-classes/>" +
" <limit-serialization-classes>false</limit-serialization-classes>" +
"</deployment-descriptor>";

Map<String, String> resources = new HashMap<String, String>();
resources.put("src/main/resources/simple.drl", SIMPLE_DRL);
resources.put("src/main/resources/META-INF/kie-deployment-descriptor.xml",
descriptor.toXml());
mainDescriptorXml);

InternalKieModule kJar1 = createKieJar(ks, releaseId, resources, releaseIdDep);
installKjar(releaseId, kJar1);
Expand All @@ -359,7 +442,7 @@ public void testDeploymentDescriptorFromKieContainerWithDependencyMerged() {
assertNotNull(descriptorHierarchy);
assertEquals(3, descriptorHierarchy.size());

descriptor = descriptorHierarchy.get(0);
DeploymentDescriptor descriptor = descriptorHierarchy.get(0);

assertNotNull(descriptor);
assertEquals("org.jbpm.domain", descriptor.getPersistenceUnit());
Expand Down