(camel) branch main updated: (chores) camel-core: cleanup test setup process

[orpiske]

This is an automated email from the ASF dual-hosted git repository.

orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new 2413d626278 (chores) camel-core: cleanup test setup process
2413d626278 is described below

commit 2413d626278ead726900b5ff1ebfc50121c5a420
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Mon Nov 20 10:50:56 2023 +0100

    (chores) camel-core: cleanup test setup process
---
 .../management/ManagedAggregateControllerTest.java | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git 
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedAggregateControllerTest.java
 
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedAggregateControllerTest.java
index c84b956a289..0d3cff21af6 100644
--- 
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedAggregateControllerTest.java
+++ 
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedAggregateControllerTest.java
@@ -17,6 +17,7 @@
 package org.apache.camel.management;
 
 import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 
 import org.apache.camel.AggregationStrategy;
@@ -26,6 +27,8 @@ import 
org.apache.camel.api.management.mbean.ManagedAggregateProcessorMBean;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.processor.aggregate.AggregateController;
 import org.apache.camel.processor.aggregate.DefaultAggregateController;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
 import org.junit.jupiter.api.condition.DisabledOnOs;
@@ -34,20 +37,24 @@ import org.junit.jupiter.api.condition.OS;
 import static 
org.apache.camel.management.DefaultManagementObjectNameStrategy.TYPE_PROCESSOR;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @DisabledIfSystemProperty(named = "ci.env.name", matches = "github.com", 
disabledReason = "Flaky on Github CI")
 @DisabledOnOs(OS.AIX)
 public class ManagedAggregateControllerTest extends ManagementTestSupport {
 
     private AggregateController controller = new DefaultAggregateController();
+    private MBeanServer mbeanServer;
+    private ObjectName on;
+
+    @BeforeEach
+    void setUpTest() throws MalformedObjectNameException {
+        mbeanServer = getMBeanServer();
+        on = getCamelObjectName(TYPE_PROCESSOR, "myAggregator");
+    }
 
     @Test
     public void testForceCompletionOfAll() throws Exception {
-        MBeanServer mbeanServer = getMBeanServer();
-
-        ObjectName on = getCamelObjectName(TYPE_PROCESSOR, "myAggregator");
-        assertTrue(mbeanServer.isRegistered(on));
+        Assumptions.assumeTrue(mbeanServer.isRegistered(on), "Should be 
registered for this test to run");
 
         getMockEndpoint("mock:aggregated").expectedMessageCount(0);
 
@@ -101,10 +108,7 @@ public class ManagedAggregateControllerTest extends 
ManagementTestSupport {
 
     @Test
     public void testForceCompletionOfGroup() throws Exception {
-        MBeanServer mbeanServer = getMBeanServer();
-
-        ObjectName on = getCamelObjectName(TYPE_PROCESSOR, "myAggregator");
-        assertTrue(mbeanServer.isRegistered(on));
+        Assumptions.assumeTrue(mbeanServer.isRegistered(on), "Should be 
registered for this test to run");
 
         getMockEndpoint("mock:aggregated").expectedMessageCount(0);