Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
anmol-saxena-14 wants to merge 1 commit into
base: main
Choose a base branch
from
+0 −25
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
4 changes: 0 additions & 4 deletions activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down