Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NO-JIRA Adding Serialization compatiblity for a recent 2.x release

This commit is contained in:
Clebert Suconic 2020-04-13 12:16:57 -04:00
parent 0a4ec3cbff
commit 0dfbfaa833
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/compatibility-tests/pom.xml
View File

@ -387,9 +387,6 @@
</goals> </goals>
<id>2_10_0-check</id> <id>2_10_0-check</id>
<configuration> <configuration>
<!-- At the time I'm writing this 2.10.0 is not released yet
This could be removed the day 2.10.0 is released.
I am adding this now to make sure we will run tests on 2.10.0 when it is released -->
<optional>true</optional> <optional>true</optional>
<libListWithDeps> <libListWithDeps>
<arg>org.apache.activemq:artemis-jms-server:2.10.0</arg> <arg>org.apache.activemq:artemis-jms-server:2.10.0</arg>
@ -399,6 +396,7 @@
<arg>org.apache.activemq:artemis-amqp-protocol:2.10.0</arg> <arg>org.apache.activemq:artemis-amqp-protocol:2.10.0</arg>
<arg>org.apache.activemq:artemis-hornetq-protocol:2.10.0</arg> <arg>org.apache.activemq:artemis-hornetq-protocol:2.10.0</arg>
<arg>org.codehaus.groovy:groovy-all:${groovy.version}</arg> <arg>org.codehaus.groovy:groovy-all:${groovy.version}</arg>
<arg>org.jboss.marshalling:jboss-marshalling-river:2.0.2.Final</arg>
</libListWithDeps> </libListWithDeps>
<libList> <libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg> <arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>

7
tests/compatibility-tests/src/main/resources/serial/jbmserial.groovy
View File

@ -47,12 +47,11 @@ if (method.equals("write")) {
topic = new ActiveMQTopic("topic") topic = new ActiveMQTopic("topic")
temporary = ActiveMQDestination.createTemporaryQueue("whatever") temporary = ActiveMQDestination.createTemporaryQueue("whatever")
temporaryTopic = ActiveMQDestination.createTemporaryTopic("whatever") temporaryTopic = ActiveMQDestination.createTemporaryTopic("whatever")
if (version.equals("ARTEMIS-SNAPSHOT")) { if (version.equals("ARTEMIS-155")) {
destination = new ActiveMQDestination("address", "name", ActiveMQDestination.TYPE.DESTINATION, null)
} else if (version.equals("ARTEMIS-155")) {
destination = new ActiveMQDestination("address", "name", false, true, null) destination = new ActiveMQDestination("address", "name", false, true, null)
} else {
destination = new ActiveMQDestination("address", "name", ActiveMQDestination.TYPE.DESTINATION, null)
} }
Marshaller marshaller = factory.createMarshaller(configuration) Marshaller marshaller = factory.createMarshaller(configuration)
FileOutputStream fileOutputStream = new FileOutputStream(file) FileOutputStream fileOutputStream = new FileOutputStream(file)
marshaller.start(Marshalling.createByteOutput(fileOutputStream)); marshaller.start(Marshalling.createByteOutput(fileOutputStream));

7
tests/compatibility-tests/src/main/resources/serial/serial.groovy
View File

@ -30,10 +30,11 @@ if (method.equals("write")) {
cf = new ActiveMQConnectionFactory("tcp://localhost:61616?confirmationWindowSize=1048576&blockOnDurableSend=false"); cf = new ActiveMQConnectionFactory("tcp://localhost:61616?confirmationWindowSize=1048576&blockOnDurableSend=false");
queue = new ActiveMQQueue("queue"); queue = new ActiveMQQueue("queue");
topic = new ActiveMQTopic("topic") topic = new ActiveMQTopic("topic")
if (version.equals("ARTEMIS-SNAPSHOT")) {
destination = new ActiveMQDestination("address", "name", ActiveMQDestination.TYPE.DESTINATION, null) if (version.equals("ARTEMIS-155")) {
} else if (version.equals("ARTEMIS-155")) {
destination = new ActiveMQDestination("address", "name", false, true, null) destination = new ActiveMQDestination("address", "name", false, true, null)
} else {
destination = new ActiveMQDestination("address", "name", ActiveMQDestination.TYPE.DESTINATION, null)
} }
ObjectOutputStream objectOutputStream = new ObjectOutputStream(new FileOutputStream(file)); ObjectOutputStream objectOutputStream = new ObjectOutputStream(new FileOutputStream(file));

3
tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SerializationTest.java
View File

@ -32,6 +32,7 @@ import org.junit.runners.Parameterized;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FIVE; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FIVE;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_TEN_ZERO;
/** /**
* To run this test on the IDE and debug it, run the compatibility-tests through a command line once: * To run this test on the IDE and debug it, run the compatibility-tests through a command line once:
@ -65,6 +66,8 @@ public class SerializationTest extends VersionedBase {
// combinations.add(new Object[]{ONE_FIVE, ONE_FIVE, ONE_FIVE}); // combinations.add(new Object[]{ONE_FIVE, ONE_FIVE, ONE_FIVE});
combinations.addAll(combinatory(new Object[]{null}, new Object[]{ONE_FIVE, SNAPSHOT}, new Object[]{ONE_FIVE, SNAPSHOT})); combinations.addAll(combinatory(new Object[]{null}, new Object[]{ONE_FIVE, SNAPSHOT}, new Object[]{ONE_FIVE, SNAPSHOT}));
combinations.add(new Object[] {null, TWO_TEN_ZERO, SNAPSHOT});
combinations.add(new Object[] {null, SNAPSHOT, TWO_TEN_ZERO});
return combinations; return combinations;
} }