AMQ-9386: Remove legacy IBM JDK-specific test paths from MBeanTest and StompTest. (#1863)

Author: anmol-saxena-14

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();
 

activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java

@@ -664,10 +664,6 @@ private void browseAndVerifyTypes(QueueViewMBean proxy, boolean allStrings) thro
             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) {