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

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


The following commit(s) were added to refs/heads/main by this push:
     new d21d12ef8c  AMQ-9386: Remove legacy IBM JDK-specific test paths from 
MBeanTest and StompTest. (#1863)
d21d12ef8c is described below

commit d21d12ef8cc2c218b0ba49cb8767626163315955
Author: Anmol Saxena <[email protected]>
AuthorDate: Fri Apr 3 18:10:57 2026 +0530

     AMQ-9386: Remove legacy IBM JDK-specific test paths from MBeanTest and 
StompTest. (#1863)
---
 .../apache/activemq/transport/stomp/StompTest.java  | 21 ---------------------
 .../org/apache/activemq/broker/jmx/MBeanTest.java   |  4 ----
 2 files changed, 25 deletions(-)

diff --git 
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTest.java
 
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTest.java
index 70fa9ed4f8..a7ffeca65f 100644
--- 
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTest.java
+++ 
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTest.java
@@ -116,27 +116,6 @@ public class StompTest extends StompTestSupport {
 
     @Override
     public void setUp() throws Exception {
-        // The order of the entries is different when using ibm jdk 5.
-        if (System.getProperty("java.vendor").equals("IBM Corporation")
-            && System.getProperty("java.version").startsWith("1.5")) {
-            xmlMap = "<map>\n"
-                + "  <entry>\n"
-                + "    <string>city</string>\n"
-                + "    <string>Belgrade</string>\n"
-                + "  </entry>\n"
-                + "  <entry>\n"
-                + "    <string>name</string>\n"
-                + "    <string>Dejan</string>\n"
-                + "  </entry>\n"
-                + "</map>\n";
-            jsonMap = "{\"map\":{"
-                + "\"entry\":["
-                + "{\"string\":[\"city\",\"Belgrade\"]},"
-                + "{\"string\":[\"name\",\"Dejan\"]}"
-                + "]"
-                + "}}";
-        }
-
         queue = new ActiveMQQueue(getQueueName());
         super.setUp();
 
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
index d817c60ae7..289c62a507 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
@@ -664,10 +664,6 @@ public class MBeanTest extends EmbeddedBrokerTestSupport {
             assertComplexData(i, cdata, "JMSCorrelationID", "MyCorrId");
             assertComplexData(i, cdata, "JMSDeliveryMode", "NON-PERSISTENT");
             String expected = "{MyStringHeader=StringHeader" + i + ", 
MyHeader=" + i + "}";
-            // The order of the properties is different when using the ibm jdk.
-            if (System.getProperty("java.vendor").equals("IBM Corporation")) {
-                expected = "{MyHeader=" + i + ", MyStringHeader=StringHeader" 
+ i + "}";
-            }
             assertComplexData(i, cdata, "PropertiesText", expected);
 
             if (allStrings) {


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information, visit: https://activemq.apache.org/contact


Reply via email to