This is an automated email from the ASF dual-hosted git repository.
lizhimin pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/develop by this push:
new 4c06b15b8b [ISSUE #9739] Revert skipped test cases in macos
environment (#9749)
4c06b15b8b is described below
commit 4c06b15b8b647bc18cc94611f2ce6a23c20cef75
Author: lizhimins <[email protected]>
AuthorDate: Mon Oct 13 20:58:33 2025 +0800
[ISSUE #9739] Revert skipped test cases in macos environment (#9749)
---
.../config/v2/ConsumerOffsetManagerV2Test.java | 7 ------
.../config/v2/SubscriptionGroupManagerV2Test.java | 5 ----
.../broker/config/v2/TopicConfigManagerV2Test.java | 5 ----
.../RocksDBLmqConsumerOffsetManagerTest.java | 18 --------------
.../offset/RocksDBOffsetSerializeWrapperTest.java | 10 --------
.../rocketmq/broker/pop/PopConsumerCacheTest.java | 5 ----
.../broker/pop/PopConsumerRocksdbStoreTest.java | 4 ----
.../rocketmq/common/attribute/CQTypeTest.java | 5 ----
...ExportRocksDBConfigToJsonRequestHeaderTest.java | 4 ----
.../org/apache/rocketmq/store/ha/HAServerTest.java | 28 ----------------------
.../store/queue/CombineConsumeQueueStoreTest.java | 21 ----------------
.../queue/RocksDBConsumeQueueOffsetTableTest.java | 13 ----------
.../store/rocksdb/RocksDBOptionsFactoryTest.java | 4 ----
.../ExportMetadataInRocksDBCommandTest.java | 4 ----
14 files changed, 133 deletions(-)
diff --git
a/broker/src/test/java/org/apache/rocketmq/broker/config/v2/ConsumerOffsetManagerV2Test.java
b/broker/src/test/java/org/apache/rocketmq/broker/config/v2/ConsumerOffsetManagerV2Test.java
index 6d4ed04ce3..132bd5c1a5 100644
---
a/broker/src/test/java/org/apache/rocketmq/broker/config/v2/ConsumerOffsetManagerV2Test.java
+++
b/broker/src/test/java/org/apache/rocketmq/broker/config/v2/ConsumerOffsetManagerV2Test.java
@@ -26,7 +26,6 @@ import org.apache.rocketmq.common.MixAll;
import org.apache.rocketmq.store.config.MessageStoreConfig;
import org.junit.After;
import org.junit.Assert;
-import org.junit.Assume;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -60,7 +59,6 @@ public class ConsumerOffsetManagerV2Test {
@Before
public void setUp() throws IOException {
- Assume.assumeFalse(MixAll.isMac());
BrokerConfig brokerConfig = new BrokerConfig();
Mockito.doReturn(brokerConfig).when(controller).getBrokerConfig();
@@ -77,7 +75,6 @@ public class ConsumerOffsetManagerV2Test {
*/
@Test
public void testCommitOffset_Standard() {
- Assume.assumeFalse(MixAll.isMac());
Assert.assertTrue(consumerOffsetManagerV2.load());
String clientHost = "localhost";
@@ -104,7 +101,6 @@ public class ConsumerOffsetManagerV2Test {
*/
@Test
public void testCommitOffset_LMQ() {
- Assume.assumeFalse(MixAll.isMac());
Assert.assertTrue(consumerOffsetManagerV2.load());
String clientHost = "localhost";
@@ -130,7 +126,6 @@ public class ConsumerOffsetManagerV2Test {
*/
@Test
public void testCommitPullOffset_LMQ() {
- Assume.assumeFalse(MixAll.isMac());
Assert.assertTrue(consumerOffsetManagerV2.load());
String clientHost = "localhost";
@@ -155,7 +150,6 @@ public class ConsumerOffsetManagerV2Test {
*/
@Test
public void testRemoveByTopicAtGroup() {
- Assume.assumeFalse(MixAll.isMac());
Assert.assertTrue(consumerOffsetManagerV2.load());
String clientHost = "localhost";
@@ -188,7 +182,6 @@ public class ConsumerOffsetManagerV2Test {
*/
@Test
public void testRemoveByGroup() {
- Assume.assumeFalse(MixAll.isMac());
Assert.assertTrue(consumerOffsetManagerV2.load());
String clientHost = "localhost";
diff --git
a/broker/src/test/java/org/apache/rocketmq/broker/config/v2/SubscriptionGroupManagerV2Test.java
b/broker/src/test/java/org/apache/rocketmq/broker/config/v2/SubscriptionGroupManagerV2Test.java
index 6f49cbe801..4ff8a81e60 100644
---
a/broker/src/test/java/org/apache/rocketmq/broker/config/v2/SubscriptionGroupManagerV2Test.java
+++
b/broker/src/test/java/org/apache/rocketmq/broker/config/v2/SubscriptionGroupManagerV2Test.java
@@ -21,7 +21,6 @@ import java.io.File;
import java.io.IOException;
import org.apache.rocketmq.broker.BrokerController;
import org.apache.rocketmq.common.BrokerConfig;
-import org.apache.rocketmq.common.MixAll;
import org.apache.rocketmq.remoting.protocol.subscription.GroupRetryPolicy;
import org.apache.rocketmq.remoting.protocol.subscription.GroupRetryPolicyType;
import
org.apache.rocketmq.remoting.protocol.subscription.SubscriptionGroupConfig;
@@ -29,7 +28,6 @@ import org.apache.rocketmq.store.MessageStore;
import org.apache.rocketmq.store.config.MessageStoreConfig;
import org.junit.After;
import org.junit.Assert;
-import org.junit.Assume;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -66,7 +64,6 @@ public class SubscriptionGroupManagerV2Test {
@Before
public void setUp() throws IOException {
- Assume.assumeFalse(MixAll.isMac());
BrokerConfig brokerConfig = new BrokerConfig();
brokerConfig.setAutoCreateSubscriptionGroup(false);
Mockito.doReturn(brokerConfig).when(controller).getBrokerConfig();
@@ -85,7 +82,6 @@ public class SubscriptionGroupManagerV2Test {
@Test
public void testUpdateSubscriptionGroupConfig() {
- Assume.assumeFalse(MixAll.isMac());
SubscriptionGroupConfig subscriptionGroupConfig = new
SubscriptionGroupConfig();
subscriptionGroupConfig.setGroupName("G1");
subscriptionGroupConfig.setConsumeEnable(true);
@@ -120,7 +116,6 @@ public class SubscriptionGroupManagerV2Test {
@Test
public void testDeleteSubscriptionGroupConfig() {
- Assume.assumeFalse(MixAll.isMac());
SubscriptionGroupConfig subscriptionGroupConfig = new
SubscriptionGroupConfig();
subscriptionGroupConfig.setGroupName("G1");
subscriptionGroupConfig.setConsumeEnable(true);
diff --git
a/broker/src/test/java/org/apache/rocketmq/broker/config/v2/TopicConfigManagerV2Test.java
b/broker/src/test/java/org/apache/rocketmq/broker/config/v2/TopicConfigManagerV2Test.java
index b0bb18776b..731a1f538f 100644
---
a/broker/src/test/java/org/apache/rocketmq/broker/config/v2/TopicConfigManagerV2Test.java
+++
b/broker/src/test/java/org/apache/rocketmq/broker/config/v2/TopicConfigManagerV2Test.java
@@ -22,13 +22,11 @@ import java.io.IOException;
import org.apache.rocketmq.broker.BrokerController;
import org.apache.rocketmq.common.BrokerConfig;
-import org.apache.rocketmq.common.MixAll;
import org.apache.rocketmq.common.TopicConfig;
import org.apache.rocketmq.store.MessageStore;
import org.apache.rocketmq.store.config.MessageStoreConfig;
import org.junit.After;
import org.junit.Assert;
-import org.junit.Assume;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -63,7 +61,6 @@ public class TopicConfigManagerV2Test {
@Before
public void setUp() throws IOException {
- Assume.assumeFalse(MixAll.isMac());
BrokerConfig brokerConfig = new BrokerConfig();
Mockito.doReturn(brokerConfig).when(controller).getBrokerConfig();
@@ -80,7 +77,6 @@ public class TopicConfigManagerV2Test {
@Test
public void testUpdateTopicConfig() {
- Assume.assumeFalse(MixAll.isMac());
TopicConfigManagerV2 topicConfigManagerV2 = new
TopicConfigManagerV2(controller, configStorage);
topicConfigManagerV2.load();
@@ -117,7 +113,6 @@ public class TopicConfigManagerV2Test {
@Test
public void testRemoveTopicConfig() {
- Assume.assumeFalse(MixAll.isMac());
TopicConfig topicConfig = new TopicConfig();
String topicName = "T1";
topicConfig.setTopicName(topicName);
diff --git
a/broker/src/test/java/org/apache/rocketmq/broker/offset/RocksDBLmqConsumerOffsetManagerTest.java
b/broker/src/test/java/org/apache/rocketmq/broker/offset/RocksDBLmqConsumerOffsetManagerTest.java
index 219ccfcd78..aa5003fc10 100644
---
a/broker/src/test/java/org/apache/rocketmq/broker/offset/RocksDBLmqConsumerOffsetManagerTest.java
+++
b/broker/src/test/java/org/apache/rocketmq/broker/offset/RocksDBLmqConsumerOffsetManagerTest.java
@@ -49,9 +49,6 @@ public class RocksDBLmqConsumerOffsetManagerTest {
@Before
public void setUp() {
- if (MixAll.isMac()) {
- return;
- }
brokerController = Mockito.mock(BrokerController.class);
when(brokerController.getMessageStoreConfig()).thenReturn(Mockito.mock(MessageStoreConfig.class));
when(brokerController.getBrokerConfig()).thenReturn(new
BrokerConfig());
@@ -61,9 +58,6 @@ public class RocksDBLmqConsumerOffsetManagerTest {
@Test
public void testQueryOffsetForNonLmq() {
- if (MixAll.isMac()) {
- return;
- }
long actualOffset = offsetManager.queryOffset(NON_LMQ_GROUP,
NON_LMQ_TOPIC, QUEUE_ID);
// Verify
assertEquals("Offset should not be null.", -1, actualOffset);
@@ -72,9 +66,6 @@ public class RocksDBLmqConsumerOffsetManagerTest {
@Test
public void testQueryOffsetForLmqGroupWithExistingOffset() {
- if (MixAll.isMac()) {
- return;
- }
offsetManager.commitOffset("127.0.0.1",LMQ_GROUP, LMQ_TOPIC, QUEUE_ID,
OFFSET);
// Act
@@ -88,9 +79,6 @@ public class RocksDBLmqConsumerOffsetManagerTest {
@Test
public void testQueryOffsetForLmqGroupWithoutExistingOffset() {
- if (MixAll.isMac()) {
- return;
- }
// Act
Map<Integer, Long> actualOffsets =
offsetManager.queryOffset(LMQ_GROUP, "nonExistingTopic");
// Assert
@@ -99,9 +87,6 @@ public class RocksDBLmqConsumerOffsetManagerTest {
@Test
public void testQueryOffsetForNonLmqGroup() {
- if (MixAll.isMac()) {
- return;
- }
// Arrange
Map<Integer, Long> mockOffsets = new HashMap<>();
mockOffsets.put(QUEUE_ID, OFFSET);
@@ -118,9 +103,6 @@ public class RocksDBLmqConsumerOffsetManagerTest {
@Test
public void testCommitOffsetForLmq() {
- if (MixAll.isMac()) {
- return;
- }
// Execute
offsetManager.commitOffset("clientHost", LMQ_GROUP, LMQ_TOPIC,
QUEUE_ID, OFFSET);
// Verify
diff --git
a/broker/src/test/java/org/apache/rocketmq/broker/offset/RocksDBOffsetSerializeWrapperTest.java
b/broker/src/test/java/org/apache/rocketmq/broker/offset/RocksDBOffsetSerializeWrapperTest.java
index 13d9e42b69..c01e63f31f 100644
---
a/broker/src/test/java/org/apache/rocketmq/broker/offset/RocksDBOffsetSerializeWrapperTest.java
+++
b/broker/src/test/java/org/apache/rocketmq/broker/offset/RocksDBOffsetSerializeWrapperTest.java
@@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import org.apache.rocketmq.broker.config.v1.RocksDBOffsetSerializeWrapper;
-import org.apache.rocketmq.common.MixAll;
import org.junit.Before;
import org.junit.Test;
@@ -35,26 +34,17 @@ public class RocksDBOffsetSerializeWrapperTest {
@Before
public void setUp() {
- if (MixAll.isMac()) {
- return;
- }
wrapper = new RocksDBOffsetSerializeWrapper();
}
@Test
public void testGetOffsetTable_ShouldReturnConcurrentHashMap() {
- if (MixAll.isMac()) {
- return;
- }
ConcurrentMap<Integer, Long> offsetTable = wrapper.getOffsetTable();
assertNotNull("The offsetTable should not be null", offsetTable);
}
@Test
public void testSetOffsetTable_ShouldSetTheOffsetTableCorrectly() {
- if (MixAll.isMac()) {
- return;
- }
ConcurrentMap<Integer, Long> newOffsetTable = new
ConcurrentHashMap<>();
wrapper.setOffsetTable(newOffsetTable);
ConcurrentMap<Integer, Long> offsetTable = wrapper.getOffsetTable();
diff --git
a/broker/src/test/java/org/apache/rocketmq/broker/pop/PopConsumerCacheTest.java
b/broker/src/test/java/org/apache/rocketmq/broker/pop/PopConsumerCacheTest.java
index 4e8f6235bd..28045ca26e 100644
---
a/broker/src/test/java/org/apache/rocketmq/broker/pop/PopConsumerCacheTest.java
+++
b/broker/src/test/java/org/apache/rocketmq/broker/pop/PopConsumerCacheTest.java
@@ -24,10 +24,8 @@ import org.apache.commons.lang3.reflect.FieldUtils;
import org.apache.rocketmq.broker.BrokerController;
import org.apache.rocketmq.broker.offset.ConsumerOffsetManager;
import org.apache.rocketmq.common.BrokerConfig;
-import org.apache.rocketmq.common.MixAll;
import org.awaitility.Awaitility;
import org.junit.Assert;
-import org.junit.Assume;
import org.junit.Test;
import org.mockito.Mockito;
@@ -42,7 +40,6 @@ public class PopConsumerCacheTest {
@Test
public void consumerRecordsTest() {
- Assume.assumeFalse(MixAll.isMac());
BrokerConfig brokerConfig = new BrokerConfig();
brokerConfig.setPopConsumerKVServiceLog(true);
PopConsumerCache.ConsumerRecords consumerRecords =
@@ -74,7 +71,6 @@ public class PopConsumerCacheTest {
@Test
public void consumerOffsetTest() throws IllegalAccessException {
- Assume.assumeFalse(MixAll.isMac());
BrokerController brokerController =
Mockito.mock(BrokerController.class);
PopConsumerKVStore consumerKVStore =
Mockito.mock(PopConsumerRocksdbStore.class);
PopConsumerLockService consumerLockService =
Mockito.mock(PopConsumerLockService.class);
@@ -98,7 +94,6 @@ public class PopConsumerCacheTest {
@Test
public void consumerCacheTest() {
- Assume.assumeFalse(MixAll.isMac());
BrokerController brokerController =
Mockito.mock(BrokerController.class);
PopConsumerKVStore consumerKVStore =
Mockito.mock(PopConsumerRocksdbStore.class);
PopConsumerLockService consumerLockService =
Mockito.mock(PopConsumerLockService.class);
diff --git
a/broker/src/test/java/org/apache/rocketmq/broker/pop/PopConsumerRocksdbStoreTest.java
b/broker/src/test/java/org/apache/rocketmq/broker/pop/PopConsumerRocksdbStoreTest.java
index 02626ae276..3c2b190d1c 100644
---
a/broker/src/test/java/org/apache/rocketmq/broker/pop/PopConsumerRocksdbStoreTest.java
+++
b/broker/src/test/java/org/apache/rocketmq/broker/pop/PopConsumerRocksdbStoreTest.java
@@ -28,12 +28,10 @@ import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import org.apache.commons.io.FileUtils;
-import org.apache.rocketmq.common.MixAll;
import org.apache.rocketmq.common.config.AbstractRocksDBStorage;
import org.apache.rocketmq.common.constant.LoggerName;
import org.apache.rocketmq.tieredstore.util.MessageStoreUtil;
import org.junit.Assert;
-import org.junit.Assume;
import org.junit.Ignore;
import org.junit.Test;
import org.rocksdb.RocksDB;
@@ -66,7 +64,6 @@ public class PopConsumerRocksdbStoreTest {
@Test
public void rocksdbStoreWriteDeleteTest() {
- Assume.assumeFalse(MixAll.isMac());
String filePath = getRandomStorePath();
PopConsumerKVStore consumerStore = new
PopConsumerRocksdbStore(filePath);
Assert.assertEquals(filePath, consumerStore.getFilePath());
@@ -130,7 +127,6 @@ public class PopConsumerRocksdbStoreTest {
@Ignore
@SuppressWarnings("ConstantValue")
public void tombstoneDeletionTest() throws IllegalAccessException,
NoSuchFieldException {
- Assume.assumeFalse(MixAll.isMac());
PopConsumerRocksdbStore rocksdbStore = new
PopConsumerRocksdbStore(getRandomStorePath());
rocksdbStore.start();
diff --git
a/common/src/test/java/org/apache/rocketmq/common/attribute/CQTypeTest.java
b/common/src/test/java/org/apache/rocketmq/common/attribute/CQTypeTest.java
index a9c4d9408f..41aa98ba86 100644
--- a/common/src/test/java/org/apache/rocketmq/common/attribute/CQTypeTest.java
+++ b/common/src/test/java/org/apache/rocketmq/common/attribute/CQTypeTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.rocketmq.common.attribute;
-import org.apache.rocketmq.common.MixAll;
-import org.junit.Assume;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -26,7 +24,6 @@ public class CQTypeTest {
@Test
public void testValues() {
- Assume.assumeFalse(MixAll.isMac());
CQType[] values = CQType.values();
assertEquals(3, values.length);
assertEquals(CQType.SimpleCQ, values[0]);
@@ -36,7 +33,6 @@ public class CQTypeTest {
@Test
public void testValueOf() {
- Assume.assumeFalse(MixAll.isMac());
assertEquals(CQType.SimpleCQ, CQType.valueOf("SimpleCQ"));
assertEquals(CQType.BatchCQ, CQType.valueOf("BatchCQ"));
assertEquals(CQType.RocksDBCQ, CQType.valueOf("RocksDBCQ"));
@@ -44,7 +40,6 @@ public class CQTypeTest {
@Test(expected = IllegalArgumentException.class)
public void testValueOf_InvalidName() {
- Assume.assumeFalse(MixAll.isMac());
CQType.valueOf("InvalidCQ");
}
}
diff --git
a/remoting/src/test/java/org/apache/rocketmq/remoting/protocol/header/ExportRocksDBConfigToJsonRequestHeaderTest.java
b/remoting/src/test/java/org/apache/rocketmq/remoting/protocol/header/ExportRocksDBConfigToJsonRequestHeaderTest.java
index 6d94caeb04..bbe625a42a 100644
---
a/remoting/src/test/java/org/apache/rocketmq/remoting/protocol/header/ExportRocksDBConfigToJsonRequestHeaderTest.java
+++
b/remoting/src/test/java/org/apache/rocketmq/remoting/protocol/header/ExportRocksDBConfigToJsonRequestHeaderTest.java
@@ -18,16 +18,12 @@ package org.apache.rocketmq.remoting.protocol.header;
import java.util.ArrayList;
import java.util.List;
-import org.apache.rocketmq.common.MixAll;
import org.junit.Assert;
import org.junit.Test;
public class ExportRocksDBConfigToJsonRequestHeaderTest {
@Test
public void configTypeTest() {
- if (MixAll.isMac()) {
- return;
- }
List<ExportRocksDBConfigToJsonRequestHeader.ConfigType> configTypes =
new ArrayList<>();
configTypes.add(ExportRocksDBConfigToJsonRequestHeader.ConfigType.TOPICS);
configTypes.add(ExportRocksDBConfigToJsonRequestHeader.ConfigType.SUBSCRIPTION_GROUPS);
diff --git a/store/src/test/java/org/apache/rocketmq/store/ha/HAServerTest.java
b/store/src/test/java/org/apache/rocketmq/store/ha/HAServerTest.java
index 6e1642eddc..fa8f41dbf8 100644
--- a/store/src/test/java/org/apache/rocketmq/store/ha/HAServerTest.java
+++ b/store/src/test/java/org/apache/rocketmq/store/ha/HAServerTest.java
@@ -26,7 +26,6 @@ import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
import org.apache.rocketmq.common.BrokerConfig;
-import org.apache.rocketmq.common.MixAll;
import org.apache.rocketmq.common.SystemClock;
import org.apache.rocketmq.store.CommitLog;
import org.apache.rocketmq.store.DefaultMessageStore;
@@ -55,9 +54,6 @@ public class HAServerTest {
@Before
public void setUp() throws Exception {
- if (MixAll.isMac()) {
- return;
- }
this.storeConfig = new MessageStoreConfig();
this.storeConfig.setHaListenPort(9000 + random.nextInt(1000));
this.storeConfig.setHaSendHeartbeatInterval(10);
@@ -70,9 +66,6 @@ public class HAServerTest {
@After
public void tearDown() {
- if (MixAll.isMac()) {
- return;
- }
tearDownAllHAClient();
await().atMost(Duration.ofMinutes(1)).until(new Callable<Boolean>() {
@@ -87,9 +80,6 @@ public class HAServerTest {
@Test
public void testConnectionList_OneHAClient() throws IOException {
- if (MixAll.isMac()) {
- return;
- }
setUpOneHAClient();
await().atMost(Duration.ofMinutes(1)).until(new Callable<Boolean>() {
@@ -102,9 +92,6 @@ public class HAServerTest {
@Test
public void testConnectionList_MultipleHAClient() throws IOException {
- if (MixAll.isMac()) {
- return;
- }
setUpOneHAClient();
setUpOneHAClient();
setUpOneHAClient();
@@ -128,9 +115,6 @@ public class HAServerTest {
@Test
public void inSyncReplicasNums() throws IOException, RocksDBException {
- if (MixAll.isMac()) {
- return;
- }
DefaultMessageStore messageStore = mockMessageStore();
doReturn(123L).when(messageStore).getMaxPhyOffset();
doReturn(123L).when(messageStore).getMasterFlushedOffset();
@@ -167,9 +151,6 @@ public class HAServerTest {
@Test
public void isSlaveOK() throws IOException, RocksDBException {
- if (MixAll.isMac()) {
- return;
- }
DefaultMessageStore messageStore = mockMessageStore();
doReturn(123L).when(messageStore).getMaxPhyOffset();
doReturn(123L).when(messageStore).getMasterFlushedOffset();
@@ -196,9 +177,6 @@ public class HAServerTest {
@Test
public void putRequest_SingleAck()
throws IOException, ExecutionException, InterruptedException,
TimeoutException, RocksDBException {
- if (MixAll.isMac()) {
- return;
- }
CommitLog.GroupCommitRequest request = new
CommitLog.GroupCommitRequest(124, 4000, 1);
this.haService.putRequest(request);
@@ -217,9 +195,6 @@ public class HAServerTest {
@Test
public void putRequest_MultipleAckAndRequests()
throws IOException, ExecutionException, InterruptedException,
RocksDBException {
- if (MixAll.isMac()) {
- return;
- }
CommitLog.GroupCommitRequest oneAck = new
CommitLog.GroupCommitRequest(124, 4000, 2);
this.haService.putRequest(oneAck);
@@ -246,9 +221,6 @@ public class HAServerTest {
@Test
public void getPush2SlaveMaxOffset() throws IOException, RocksDBException {
- if (MixAll.isMac()) {
- return;
- }
DefaultMessageStore messageStore = mockMessageStore();
doReturn(123L).when(messageStore).getMaxPhyOffset();
doReturn(123L).when(messageStore).getMasterFlushedOffset();
diff --git
a/store/src/test/java/org/apache/rocketmq/store/queue/CombineConsumeQueueStoreTest.java
b/store/src/test/java/org/apache/rocketmq/store/queue/CombineConsumeQueueStoreTest.java
index c261bb9882..2ca21b265e 100644
---
a/store/src/test/java/org/apache/rocketmq/store/queue/CombineConsumeQueueStoreTest.java
+++
b/store/src/test/java/org/apache/rocketmq/store/queue/CombineConsumeQueueStoreTest.java
@@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.TimeUnit;
import org.apache.commons.io.FileUtils;
-import org.apache.rocketmq.common.MixAll;
import org.apache.rocketmq.common.TopicConfig;
import org.apache.rocketmq.common.UtilAll;
import org.apache.rocketmq.common.attribute.CQType;
@@ -36,7 +35,6 @@ import org.apache.rocketmq.store.DispatchRequest;
import org.apache.rocketmq.store.config.MessageStoreConfig;
import org.junit.After;
import org.junit.Assert;
-import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -61,18 +59,12 @@ public class CombineConsumeQueueStoreTest extends
QueueTestBase {
@Before
public void init() throws Exception {
- if (MixAll.isMac()) {
- return;
- }
this.topicConfigTableMap = new ConcurrentHashMap<>();
messageStoreConfig = new MessageStoreConfig();
}
@After
public void destroy() {
- if (MixAll.isMac()) {
- return;
- }
if (!messageStore.isShutdown()) {
messageStore.shutdown();
}
@@ -84,7 +76,6 @@ public class CombineConsumeQueueStoreTest extends
QueueTestBase {
@Test(expected = IllegalArgumentException.class)
public void CombineConsumeQueueStore_EmptyLoadingCQTypes_ThrowsException()
throws Exception {
- Assume.assumeFalse(MixAll.isMac());
messageStore = (DefaultMessageStore) createMessageStore(null, false,
topicConfigTableMap, messageStoreConfig);
messageStoreConfig.setCombineCQLoadingCQTypes("");
@@ -93,9 +84,6 @@ public class CombineConsumeQueueStoreTest extends
QueueTestBase {
@Test
public void CombineConsumeQueueStore_InitializesConsumeQueueStore() throws
Exception {
- if (MixAll.isMac()) {
- return;
- }
messageStore = (DefaultMessageStore) createMessageStore(null, false,
topicConfigTableMap, messageStoreConfig);
{
messageStoreConfig.setCombineCQLoadingCQTypes("default");
@@ -135,9 +123,6 @@ public class CombineConsumeQueueStoreTest extends
QueueTestBase {
@Test
public void testIterator() throws Exception {
- if (MixAll.isMac()) {
- return;
- }
messageStoreConfig.setRocksdbCQDoubleWriteEnable(true);
messageStore = (DefaultMessageStore) createMessageStore(null, false,
topicConfigTableMap, messageStoreConfig);
messageStore.load();
@@ -218,9 +203,6 @@ public class CombineConsumeQueueStoreTest extends
QueueTestBase {
@Test
public void testInitializeWithOffset() throws Exception {
- if (MixAll.isMac()) {
- return;
- }
final String path = createBaseDir();
FileUtils.deleteDirectory(new File(path));
topicConfigTableMap.put(topic, new TopicConfig(topic, 1, 1,
PermName.PERM_WRITE | PermName.PERM_READ));
@@ -313,9 +295,6 @@ public class CombineConsumeQueueStoreTest extends
QueueTestBase {
@Test
public void testVerifyAndInitOffsetForAllStore() throws Exception {
- if (MixAll.isMac()) {
- return;
- }
final String path = createBaseDir();
topicConfigTableMap.put(topic, new TopicConfig(topic, 1, 1,
PermName.PERM_WRITE | PermName.PERM_READ));
diff --git
a/store/src/test/java/org/apache/rocketmq/store/queue/RocksDBConsumeQueueOffsetTableTest.java
b/store/src/test/java/org/apache/rocketmq/store/queue/RocksDBConsumeQueueOffsetTableTest.java
index 0693aec647..b1e12d4946 100644
---
a/store/src/test/java/org/apache/rocketmq/store/queue/RocksDBConsumeQueueOffsetTableTest.java
+++
b/store/src/test/java/org/apache/rocketmq/store/queue/RocksDBConsumeQueueOffsetTableTest.java
@@ -22,7 +22,6 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.rocketmq.common.MixAll;
import org.apache.rocketmq.store.DefaultMessageStore;
import org.apache.rocketmq.store.queue.offset.OffsetEntryType;
import org.apache.rocketmq.store.rocksdb.ConsumeQueueRocksDBStorage;
@@ -65,9 +64,6 @@ public class RocksDBConsumeQueueOffsetTableTest {
@BeforeClass
public static void initDB() throws IOException, RocksDBException {
- if (MixAll.isMac()) {
- return;
- }
TemporaryFolder tempFolder = new TemporaryFolder();
tempFolder.create();
dbPath = tempFolder.newFolder();
@@ -102,18 +98,12 @@ public class RocksDBConsumeQueueOffsetTableTest {
@AfterClass
public static void tearDownDB() throws RocksDBException {
- if (MixAll.isMac()) {
- return;
- }
db.closeE();
RocksDB.destroyDB(dbPath.getAbsolutePath(), new Options());
}
@Before
public void setUp() {
- if (MixAll.isMac()) {
- return;
- }
RocksIterator iterator = db.newIterator();
Mockito.doReturn(iterator).when(rocksDBStorage).seekOffsetCF();
offsetTable = new RocksDBConsumeQueueOffsetTable(consumeQueueTable,
rocksDBStorage, messageStore);
@@ -126,9 +116,6 @@ public class RocksDBConsumeQueueOffsetTableTest {
*/
@Test
public void testForEach() throws RocksDBException {
- if (MixAll.isMac()) {
- return;
- }
AtomicBoolean called = new AtomicBoolean(false);
offsetTable.forEach(entry -> true, entry -> {
called.set(true);
diff --git
a/store/src/test/java/org/apache/rocketmq/store/rocksdb/RocksDBOptionsFactoryTest.java
b/store/src/test/java/org/apache/rocketmq/store/rocksdb/RocksDBOptionsFactoryTest.java
index 46563077d1..1d7273968f 100644
---
a/store/src/test/java/org/apache/rocketmq/store/rocksdb/RocksDBOptionsFactoryTest.java
+++
b/store/src/test/java/org/apache/rocketmq/store/rocksdb/RocksDBOptionsFactoryTest.java
@@ -17,7 +17,6 @@
package org.apache.rocketmq.store.rocksdb;
-import org.apache.rocketmq.common.MixAll;
import org.apache.rocketmq.store.config.MessageStoreConfig;
import org.junit.Assert;
import org.junit.Test;
@@ -27,9 +26,6 @@ public class RocksDBOptionsFactoryTest {
@Test
public void testBottomMostCompressionType() {
- if (MixAll.isMac()) {
- return;
- }
MessageStoreConfig config = new MessageStoreConfig();
Assert.assertEquals(CompressionType.ZSTD_COMPRESSION,
CompressionType.getCompressionType(config.getBottomMostCompressionTypeForConsumeQueueStore()));
diff --git
a/tools/src/test/java/org/apache/rocketmq/tools/command/metadata/ExportMetadataInRocksDBCommandTest.java
b/tools/src/test/java/org/apache/rocketmq/tools/command/metadata/ExportMetadataInRocksDBCommandTest.java
index 52ede8a274..2b938c90fb 100644
---
a/tools/src/test/java/org/apache/rocketmq/tools/command/metadata/ExportMetadataInRocksDBCommandTest.java
+++
b/tools/src/test/java/org/apache/rocketmq/tools/command/metadata/ExportMetadataInRocksDBCommandTest.java
@@ -19,7 +19,6 @@ package org.apache.rocketmq.tools.command.metadata;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Options;
-import org.apache.rocketmq.common.MixAll;
import org.apache.rocketmq.srvutil.ServerUtil;
import org.apache.rocketmq.tools.command.SubCommandException;
import org.apache.rocketmq.tools.command.export.ExportMetadataInRocksDBCommand;
@@ -34,9 +33,6 @@ public class ExportMetadataInRocksDBCommandTest {
@Test
public void testExecute() throws SubCommandException {
- if (MixAll.isMac()) {
- return;
- }
{
String[][] cases = new String[][] {
{"topics", "false"},
