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 70fa9ed4f84..a7ffeca65f7 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 = "\n" - + " \n" - + " city\n" - + " Belgrade\n" - + " \n" - + " \n" - + " name\n" - + " Dejan\n" - + " \n" - + "\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 d817c60ae7b..289c62a507f 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 @@ 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) {