From 0dfbfaa833ac7ae5f0cd8e1a0a1f7a133e4542bd Mon Sep 17 00:00:00 2001
From: Clebert Suconic <clebertsuconic@apache.org>
Date: Mon, 13 Apr 2020 12:16:57 -0400
Subject: [PATCH] NO-JIRA Adding Serialization compatiblity for a recent 2.x
 release

---
 tests/compatibility-tests/pom.xml                          | 4 +---
 .../src/main/resources/serial/jbmserial.groovy             | 7 +++----
 .../src/main/resources/serial/serial.groovy                | 7 ++++---
 .../artemis/tests/compatibility/SerializationTest.java     | 3 +++
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/tests/compatibility-tests/pom.xml b/tests/compatibility-tests/pom.xml
index 1cf37eb043..4e1e6b4c22 100644
--- a/tests/compatibility-tests/pom.xml
+++ b/tests/compatibility-tests/pom.xml
@@ -387,9 +387,6 @@
                   </goals>
                   <id>2_10_0-check</id>
                   <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>
                      <libListWithDeps>
                         <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-hornetq-protocol:2.10.0</arg>
                         <arg>org.codehaus.groovy:groovy-all:${groovy.version}</arg>
+                        <arg>org.jboss.marshalling:jboss-marshalling-river:2.0.2.Final</arg>
                      </libListWithDeps>
                      <libList>
                         <arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
diff --git a/tests/compatibility-tests/src/main/resources/serial/jbmserial.groovy b/tests/compatibility-tests/src/main/resources/serial/jbmserial.groovy
index 93cceeb450..04cff138d3 100644
--- a/tests/compatibility-tests/src/main/resources/serial/jbmserial.groovy
+++ b/tests/compatibility-tests/src/main/resources/serial/jbmserial.groovy
@@ -47,12 +47,11 @@ if (method.equals("write")) {
     topic = new ActiveMQTopic("topic")
     temporary = ActiveMQDestination.createTemporaryQueue("whatever")
     temporaryTopic = ActiveMQDestination.createTemporaryTopic("whatever")
-    if (version.equals("ARTEMIS-SNAPSHOT")) {
-        destination = new ActiveMQDestination("address", "name", ActiveMQDestination.TYPE.DESTINATION, null)
-    } else if (version.equals("ARTEMIS-155")) {
+    if (version.equals("ARTEMIS-155")) {
         destination = new ActiveMQDestination("address", "name", false, true, null)
+    } else {
+        destination = new ActiveMQDestination("address", "name", ActiveMQDestination.TYPE.DESTINATION, null)
     }
-
     Marshaller marshaller = factory.createMarshaller(configuration)
     FileOutputStream fileOutputStream = new FileOutputStream(file)
     marshaller.start(Marshalling.createByteOutput(fileOutputStream));
diff --git a/tests/compatibility-tests/src/main/resources/serial/serial.groovy b/tests/compatibility-tests/src/main/resources/serial/serial.groovy
index d112c6c831..99fdbcdc9d 100644
--- a/tests/compatibility-tests/src/main/resources/serial/serial.groovy
+++ b/tests/compatibility-tests/src/main/resources/serial/serial.groovy
@@ -30,10 +30,11 @@ if (method.equals("write")) {
     cf = new ActiveMQConnectionFactory("tcp://localhost:61616?confirmationWindowSize=1048576&blockOnDurableSend=false");
     queue = new ActiveMQQueue("queue");
     topic = new ActiveMQTopic("topic")
-    if (version.equals("ARTEMIS-SNAPSHOT")) {
-        destination = new ActiveMQDestination("address", "name", ActiveMQDestination.TYPE.DESTINATION, null)
-    } else if (version.equals("ARTEMIS-155")) {
+
+    if (version.equals("ARTEMIS-155")) {
         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));
diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SerializationTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SerializationTest.java
index f7c6192684..3bd61b6d6f 100644
--- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SerializationTest.java
+++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SerializationTest.java
@@ -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.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:
@@ -65,6 +66,8 @@ public class SerializationTest extends VersionedBase {
       //      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.add(new Object[] {null, TWO_TEN_ZERO, SNAPSHOT});
+      combinations.add(new Object[] {null, SNAPSHOT, TWO_TEN_ZERO});
       return combinations;
    }