(camel) branch main updated: CAMEL-22156: camel-management: Fix some tests running on windows

[davsclaus]

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

davsclaus 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 cf9404e5e79 CAMEL-22156: camel-management: Fix some tests running on 
windows
cf9404e5e79 is described below

commit cf9404e5e79a252b8552cfd0235d0b8fa29b3e0e
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Jun 11 08:15:23 2025 +0200

    CAMEL-22156: camel-management: Fix some tests running on windows
---
 .../ManagedBrowsableEndpointAsJSonFileTest.java          | 16 ++++++++++++++--
 .../ManagedBrowsableEndpointAsXmlFileTest.java           | 16 ++++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git 
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedBrowsableEndpointAsJSonFileTest.java
 
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedBrowsableEndpointAsJSonFileTest.java
index 79f2f20b935..3a3d90e13c6 100644
--- 
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedBrowsableEndpointAsJSonFileTest.java
+++ 
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedBrowsableEndpointAsJSonFileTest.java
@@ -16,29 +16,41 @@
  */
 package org.apache.camel.management;
 
+import java.util.Iterator;
+import java.util.Set;
+
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledOnOs;
 import org.junit.jupiter.api.condition.OS;
 
-import static 
org.apache.camel.management.DefaultManagementObjectNameStrategy.TYPE_ENDPOINT;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @DisabledOnOs(OS.AIX)
 public class ManagedBrowsableEndpointAsJSonFileTest extends 
ManagementTestSupport {
 
+    protected String domainName = DefaultManagementAgent.DEFAULT_DOMAIN;
+
     @Test
     public void testBrowseableEndpointAsJSonAllIncludeBody() throws Exception {
         template.sendBodyAndHeader("direct:start", "Hello World", 
Exchange.FILE_NAME, "hello.txt");
 
         MBeanServer mbeanServer = getMBeanServer();
 
-        ObjectName name = getCamelObjectName(TYPE_ENDPOINT, "file://" + 
testDirectory());
+        ObjectName objName = new ObjectName(domainName + ":type=endpoints,*");
+        Set<ObjectName> s = mbeanServer.queryNames(objName, null);
+        Assertions.assertEquals(2, s.size());
+        Iterator<ObjectName> it = s.iterator();
+        ObjectName name = it.next();
+        if (!name.toString().contains("file")) {
+            name = it.next();
+        }
 
         String out = (String) mbeanServer.invoke(name, 
"browseAllMessagesAsJSon", new Object[] { true },
                 new String[] { "java.lang.Boolean" });
diff --git 
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedBrowsableEndpointAsXmlFileTest.java
 
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedBrowsableEndpointAsXmlFileTest.java
index 03ab2031957..1855bef88a8 100644
--- 
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedBrowsableEndpointAsXmlFileTest.java
+++ 
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedBrowsableEndpointAsXmlFileTest.java
@@ -16,29 +16,41 @@
  */
 package org.apache.camel.management;
 
+import java.util.Iterator;
+import java.util.Set;
+
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledOnOs;
 import org.junit.jupiter.api.condition.OS;
 
-import static 
org.apache.camel.management.DefaultManagementObjectNameStrategy.TYPE_ENDPOINT;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @DisabledOnOs(OS.AIX)
 public class ManagedBrowsableEndpointAsXmlFileTest extends 
ManagementTestSupport {
 
+    protected String domainName = DefaultManagementAgent.DEFAULT_DOMAIN;
+
     @Test
     public void testBrowseableEndpointAsXmlAllIncludeBody() throws Exception {
         template.sendBodyAndHeader("direct:start", "Hello World", 
Exchange.FILE_NAME, "hello.txt");
 
         MBeanServer mbeanServer = getMBeanServer();
 
-        ObjectName name = getCamelObjectName(TYPE_ENDPOINT, "file://" + 
testDirectory());
+        ObjectName objName = new ObjectName(domainName + ":type=endpoints,*");
+        Set<ObjectName> s = mbeanServer.queryNames(objName, null);
+        Assertions.assertEquals(2, s.size());
+        Iterator<ObjectName> it = s.iterator();
+        ObjectName name = it.next();
+        if (!name.toString().contains("file")) {
+            name = it.next();
+        }
 
         String out = (String) mbeanServer.invoke(name, 
"browseAllMessagesAsXml", new Object[] { true },
                 new String[] { "java.lang.Boolean" });