Skip to content

Commit 7980863

Browse files
committed
Add compat test
1 parent bfd6410 commit 7980863

2 files changed

Lines changed: 24 additions & 1 deletion

File tree

remoting/src/test/java/org/apache/rocketmq/remoting/protocol/RemotingSerializableCompatTest.java

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
package org.apache.rocketmq.remoting.protocol;
1919

2020
import com.alibaba.fastjson.annotation.JSONField;
21+
import com.alibaba.fastjson2.JSON;
22+
import org.apache.rocketmq.remoting.protocol.body.BatchAck;
2123
import org.junit.Test;
2224
import org.objenesis.ObjenesisStd;
2325
import org.reflections.Reflections;
@@ -26,6 +28,7 @@
2628
import java.lang.reflect.Field;
2729
import java.lang.reflect.Modifier;
2830
import java.util.ArrayList;
31+
import java.util.BitSet;
2932
import java.util.HashMap;
3033
import java.util.HashSet;
3134
import java.util.List;
@@ -37,6 +40,7 @@
3740
import java.util.concurrent.ConcurrentMap;
3841
import java.util.concurrent.atomic.AtomicLong;
3942

43+
import static org.junit.Assert.assertEquals;
4044
import static org.junit.Assert.assertTrue;
4145

4246
public class RemotingSerializableCompatTest {
@@ -65,6 +69,25 @@ public void testCompatibilityCheck() {
6569
}
6670
}
6771
}
72+
73+
@Test
74+
public void testCompatibilityCheckWithBitSet() {
75+
BitSet bitSet = new BitSet();
76+
bitSet.set(1);
77+
bitSet.set(3);
78+
bitSet.set(5);
79+
String fastjson1Str = "{\"b\":\"Kg==\",\"c\":\"DEFAULT_CONSUMER\",\"it\":5000,\"pt\":1760694281326,\"q\":1,\"r\":\"0\",\"rq\":2,\"so\":100,\"t\":\"myTopic\"}";
80+
BatchAck batchAck = JSON.parseObject(fastjson1Str, BatchAck.class);
81+
assertEquals(bitSet, batchAck.getBitSet());
82+
assertEquals("DEFAULT_CONSUMER", batchAck.getConsumerGroup());
83+
assertEquals(5000, batchAck.getInvisibleTime());
84+
assertEquals(1760694281326L, batchAck.getPopTime());
85+
assertEquals(1, batchAck.getQueueId());
86+
assertEquals("0", batchAck.getRetry());
87+
assertEquals(2, batchAck.getReviveQueueId());
88+
assertEquals(100, batchAck.getStartOffset());
89+
assertEquals("myTopic", batchAck.getTopic());
90+
}
6891

6992
private void fillDefaultFields(final Object obj, final Class<?> clazz) throws Exception {
7093
if (null == clazz || clazz == Object.class) {

store/src/main/java/org/apache/rocketmq/store/queue/CombineConsumeQueueStore.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package org.apache.rocketmq.store.queue;
1919

20-
import com.alibaba.fastjson.JSON;
20+
import com.alibaba.fastjson2.JSON;
2121
import com.google.common.annotations.VisibleForTesting;
2222
import java.util.Arrays;
2323
import java.util.LinkedList;

0 commit comments

Comments
 (0)