Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ARTEMIS-2047 Compatible option for ActiveMQJMSClient
(cherry picked from commit 55b0d5b)
- Loading branch information
1 parent
e617f32
commit ca113c1
Showing
15 changed files
with
371 additions
and
140 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
...ibility-tests/src/main/resources/ActiveMQJMSClientCompatibilityTest/validateClient.groovy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient | ||
| import org.apache.activemq.artemis.jms.client.ActiveMQQueue | ||
| import org.apache.activemq.artemis.jms.client.ActiveMQTopic | ||
| import org.apache.activemq.artemis.tests.compatibility.GroovyRun | ||
|
|
||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| ActiveMQQueue queue = (ActiveMQQueue) ActiveMQJMSClient.createQueue("q1"); | ||
| GroovyRun.assertEquals("jms.queue.q1", queue.getAddress()); | ||
| GroovyRun.assertEquals("q1", queue.getQueueName()); | ||
| ActiveMQTopic topic = (ActiveMQTopic) ActiveMQJMSClient.createTopic("t1"); | ||
| GroovyRun.assertEquals("jms.topic.t1", topic.getAddress()); | ||
| GroovyRun.assertEquals("t1", topic.getTopicName()); |
92 changes: 92 additions & 0 deletions
92
...a/org/apache/activemq/artemis/tests/compatibility/ActiveMQJMSClientCompatibilityTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.activemq.artemis.tests.compatibility; | ||
|
|
||
| import java.io.File; | ||
| import java.io.FileOutputStream; | ||
| import java.io.PrintStream; | ||
|
|
||
| import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; | ||
| import org.apache.activemq.artemis.jms.client.ActiveMQQueue; | ||
| import org.junit.Assert; | ||
| import org.junit.Assume; | ||
| import org.junit.Test; | ||
| import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT; | ||
| import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FIVE; | ||
|
|
||
| public class ActiveMQJMSClientCompatibilityTest extends ClasspathBaseTest { | ||
|
|
||
| @Test | ||
| public void testActiveMQJMSCompatibility_1XPrefix_SNAPSHOT() throws Exception { | ||
|
|
||
| Assert.assertFalse(ActiveMQJMSClient.DEFAULT_ENABLE_1X_PREFIXES); | ||
| ActiveMQQueue queue = (ActiveMQQueue)ActiveMQJMSClient.createQueue("t1"); | ||
| // this step is to guarantee the class is not affected when there's no property in place | ||
| Assert.assertEquals("t1", queue.getAddress()); | ||
|
|
||
| ClassLoader loader = getClasspath(SNAPSHOT, true); | ||
|
|
||
| System.setProperty(ActiveMQJMSClient.class.getName() + ".enable1xPrefixes", "true"); | ||
|
|
||
| try { | ||
|
|
||
| evaluate(loader, "ActiveMQJMSClientCompatibilityTest/validateClient.groovy"); | ||
|
|
||
| } finally { | ||
| System.clearProperty(ActiveMQJMSClient.class.getName() + ".enable1xPrefixes"); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| @Test | ||
| public void testActiveMQJMSCompatibility_1XPrefix_SNAPSHOT_with_properties() throws Exception { | ||
|
|
||
| Assert.assertFalse(ActiveMQJMSClient.DEFAULT_ENABLE_1X_PREFIXES); | ||
| ActiveMQQueue queue = (ActiveMQQueue)ActiveMQJMSClient.createQueue("t1"); | ||
| // this step is to guarantee the class is not affected when there's no property in place | ||
| Assert.assertEquals("t1", queue.getAddress()); | ||
|
|
||
| File file = serverFolder.newFile(ActiveMQJMSClient.class.getName() + ".properties"); | ||
|
|
||
| FileOutputStream fileOutputStream = new FileOutputStream(file); | ||
| PrintStream stream = new PrintStream(fileOutputStream); | ||
| stream.println("enable1xPrefixes=true"); | ||
| stream.close(); | ||
|
|
||
| String snapshotPath = System.getProperty(SNAPSHOT); | ||
| Assume.assumeNotNull(snapshotPath); | ||
|
|
||
| String path = serverFolder.getRoot().getAbsolutePath() + File.pathSeparator + snapshotPath; | ||
|
|
||
|
|
||
| ClassLoader loader = defineClassLoader(path); | ||
|
|
||
| evaluate(loader, "ActiveMQJMSClientCompatibilityTest/validateClient.groovy"); | ||
|
|
||
| } | ||
|
|
||
| @Test | ||
|
|
||
| // The purpose here is just to validate the test itself. Nothing to be fixed here | ||
| public void testActiveMQJMSCompatibility_1XPrefix_ONE_FIVE() throws Exception { | ||
| ClassLoader loader = getClasspath(ONE_FIVE, false); | ||
|
|
||
| evaluate(loader, "ActiveMQJMSClientCompatibilityTest/validateClient.groovy"); | ||
|
|
||
| } | ||
| } |
Oops, something went wrong.