Skip to content

Commit 4c06b15

Browse files
lizhiminslizhimins
authored
[ISSUE #9739] Revert skipped test cases in macos environment (#9749)
1 parent 40ca80e commit 4c06b15

File tree

14 files changed

+0
-133
lines changed

14 files changed

+0
-133
lines changed

‎broker/src/test/java/org/apache/rocketmq/broker/config/v2/ConsumerOffsetManagerV2Test.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.apache.rocketmq.store.config.MessageStoreConfig;
2727
import org.junit.After;
2828
import org.junit.Assert;
29-
import org.junit.Assume;
3029
import org.junit.Before;
3130
import org.junit.Rule;
3231
import org.junit.Test;
@@ -60,7 +59,6 @@ public void cleanUp() {
6059

6160
@Before
6261
public void setUp() throws IOException {
63-
Assume.assumeFalse(MixAll.isMac());
6462
BrokerConfig brokerConfig = new BrokerConfig();
6563
Mockito.doReturn(brokerConfig).when(controller).getBrokerConfig();
6664

@@ -77,7 +75,6 @@ public void setUp() throws IOException {
7775
*/
7876
@Test
7977
public void testCommitOffset_Standard() {
80-
Assume.assumeFalse(MixAll.isMac());
8178
Assert.assertTrue(consumerOffsetManagerV2.load());
8279

8380
String clientHost = "localhost";
@@ -104,7 +101,6 @@ public void testCommitOffset_Standard() {
104101
*/
105102
@Test
106103
public void testCommitOffset_LMQ() {
107-
Assume.assumeFalse(MixAll.isMac());
108104
Assert.assertTrue(consumerOffsetManagerV2.load());
109105

110106
String clientHost = "localhost";
@@ -130,7 +126,6 @@ public void testCommitOffset_LMQ() {
130126
*/
131127
@Test
132128
public void testCommitPullOffset_LMQ() {
133-
Assume.assumeFalse(MixAll.isMac());
134129
Assert.assertTrue(consumerOffsetManagerV2.load());
135130

136131
String clientHost = "localhost";
@@ -155,7 +150,6 @@ public void testCommitPullOffset_LMQ() {
155150
*/
156151
@Test
157152
public void testRemoveByTopicAtGroup() {
158-
Assume.assumeFalse(MixAll.isMac());
159153
Assert.assertTrue(consumerOffsetManagerV2.load());
160154

161155
String clientHost = "localhost";
@@ -188,7 +182,6 @@ public void testRemoveByTopicAtGroup() {
188182
*/
189183
@Test
190184
public void testRemoveByGroup() {
191-
Assume.assumeFalse(MixAll.isMac());
192185
Assert.assertTrue(consumerOffsetManagerV2.load());
193186

194187
String clientHost = "localhost";

‎broker/src/test/java/org/apache/rocketmq/broker/config/v2/SubscriptionGroupManagerV2Test.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,13 @@
2121
import java.io.IOException;
2222
import org.apache.rocketmq.broker.BrokerController;
2323
import org.apache.rocketmq.common.BrokerConfig;
24-
import org.apache.rocketmq.common.MixAll;
2524
import org.apache.rocketmq.remoting.protocol.subscription.GroupRetryPolicy;
2625
import org.apache.rocketmq.remoting.protocol.subscription.GroupRetryPolicyType;
2726
import org.apache.rocketmq.remoting.protocol.subscription.SubscriptionGroupConfig;
2827
import org.apache.rocketmq.store.MessageStore;
2928
import org.apache.rocketmq.store.config.MessageStoreConfig;
3029
import org.junit.After;
3130
import org.junit.Assert;
32-
import org.junit.Assume;
3331
import org.junit.Before;
3432
import org.junit.Rule;
3533
import org.junit.Test;
@@ -66,7 +64,6 @@ public void cleanUp() {
6664

6765
@Before
6866
public void setUp() throws IOException {
69-
Assume.assumeFalse(MixAll.isMac());
7067
BrokerConfig brokerConfig = new BrokerConfig();
7168
brokerConfig.setAutoCreateSubscriptionGroup(false);
7269
Mockito.doReturn(brokerConfig).when(controller).getBrokerConfig();
@@ -85,7 +82,6 @@ public void setUp() throws IOException {
8582

8683
@Test
8784
public void testUpdateSubscriptionGroupConfig() {
88-
Assume.assumeFalse(MixAll.isMac());
8985
SubscriptionGroupConfig subscriptionGroupConfig = new SubscriptionGroupConfig();
9086
subscriptionGroupConfig.setGroupName("G1");
9187
subscriptionGroupConfig.setConsumeEnable(true);
@@ -120,7 +116,6 @@ public void testUpdateSubscriptionGroupConfig() {
120116

121117
@Test
122118
public void testDeleteSubscriptionGroupConfig() {
123-
Assume.assumeFalse(MixAll.isMac());
124119
SubscriptionGroupConfig subscriptionGroupConfig = new SubscriptionGroupConfig();
125120
subscriptionGroupConfig.setGroupName("G1");
126121
subscriptionGroupConfig.setConsumeEnable(true);

‎broker/src/test/java/org/apache/rocketmq/broker/config/v2/TopicConfigManagerV2Test.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,11 @@
2222

2323
import org.apache.rocketmq.broker.BrokerController;
2424
import org.apache.rocketmq.common.BrokerConfig;
25-
import org.apache.rocketmq.common.MixAll;
2625
import org.apache.rocketmq.common.TopicConfig;
2726
import org.apache.rocketmq.store.MessageStore;
2827
import org.apache.rocketmq.store.config.MessageStoreConfig;
2928
import org.junit.After;
3029
import org.junit.Assert;
31-
import org.junit.Assume;
3230
import org.junit.Before;
3331
import org.junit.Rule;
3432
import org.junit.Test;
@@ -63,7 +61,6 @@ public void cleanUp() {
6361

6462
@Before
6563
public void setUp() throws IOException {
66-
Assume.assumeFalse(MixAll.isMac());
6764
BrokerConfig brokerConfig = new BrokerConfig();
6865
Mockito.doReturn(brokerConfig).when(controller).getBrokerConfig();
6966

@@ -80,7 +77,6 @@ public void setUp() throws IOException {
8077

8178
@Test
8279
public void testUpdateTopicConfig() {
83-
Assume.assumeFalse(MixAll.isMac());
8480
TopicConfigManagerV2 topicConfigManagerV2 = new TopicConfigManagerV2(controller, configStorage);
8581
topicConfigManagerV2.load();
8682

@@ -117,7 +113,6 @@ public void testUpdateTopicConfig() {
117113

118114
@Test
119115
public void testRemoveTopicConfig() {
120-
Assume.assumeFalse(MixAll.isMac());
121116
TopicConfig topicConfig = new TopicConfig();
122117
String topicName = "T1";
123118
topicConfig.setTopicName(topicName);

‎broker/src/test/java/org/apache/rocketmq/broker/offset/RocksDBLmqConsumerOffsetManagerTest.java‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@ public class RocksDBLmqConsumerOffsetManagerTest {
4949

5050
@Before
5151
public void setUp() {
52-
if (MixAll.isMac()) {
53-
return;
54-
}
5552
brokerController = Mockito.mock(BrokerController.class);
5653
when(brokerController.getMessageStoreConfig()).thenReturn(Mockito.mock(MessageStoreConfig.class));
5754
when(brokerController.getBrokerConfig()).thenReturn(new BrokerConfig());
@@ -61,9 +58,6 @@ public void setUp() {
6158

6259
@Test
6360
public void testQueryOffsetForNonLmq() {
64-
if (MixAll.isMac()) {
65-
return;
66-
}
6761
long actualOffset = offsetManager.queryOffset(NON_LMQ_GROUP, NON_LMQ_TOPIC, QUEUE_ID);
6862
// Verify
6963
assertEquals("Offset should not be null.", -1, actualOffset);
@@ -72,9 +66,6 @@ public void testQueryOffsetForNonLmq() {
7266

7367
@Test
7468
public void testQueryOffsetForLmqGroupWithExistingOffset() {
75-
if (MixAll.isMac()) {
76-
return;
77-
}
7869
offsetManager.commitOffset("127.0.0.1",LMQ_GROUP, LMQ_TOPIC, QUEUE_ID, OFFSET);
7970

8071
// Act
@@ -88,9 +79,6 @@ public void testQueryOffsetForLmqGroupWithExistingOffset() {
8879

8980
@Test
9081
public void testQueryOffsetForLmqGroupWithoutExistingOffset() {
91-
if (MixAll.isMac()) {
92-
return;
93-
}
9482
// Act
9583
Map<Integer, Long> actualOffsets = offsetManager.queryOffset(LMQ_GROUP, "nonExistingTopic");
9684
// Assert
@@ -99,9 +87,6 @@ public void testQueryOffsetForLmqGroupWithoutExistingOffset() {
9987

10088
@Test
10189
public void testQueryOffsetForNonLmqGroup() {
102-
if (MixAll.isMac()) {
103-
return;
104-
}
10590
// Arrange
10691
Map<Integer, Long> mockOffsets = new HashMap<>();
10792
mockOffsets.put(QUEUE_ID, OFFSET);
@@ -118,9 +103,6 @@ public void testQueryOffsetForNonLmqGroup() {
118103

119104
@Test
120105
public void testCommitOffsetForLmq() {
121-
if (MixAll.isMac()) {
122-
return;
123-
}
124106
// Execute
125107
offsetManager.commitOffset("clientHost", LMQ_GROUP, LMQ_TOPIC, QUEUE_ID, OFFSET);
126108
// Verify

‎broker/src/test/java/org/apache/rocketmq/broker/offset/RocksDBOffsetSerializeWrapperTest.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import java.util.concurrent.ConcurrentMap;
2323

2424
import org.apache.rocketmq.broker.config.v1.RocksDBOffsetSerializeWrapper;
25-
import org.apache.rocketmq.common.MixAll;
2625
import org.junit.Before;
2726
import org.junit.Test;
2827

@@ -35,26 +34,17 @@ public class RocksDBOffsetSerializeWrapperTest {
3534

3635
@Before
3736
public void setUp() {
38-
if (MixAll.isMac()) {
39-
return;
40-
}
4137
wrapper = new RocksDBOffsetSerializeWrapper();
4238
}
4339

4440
@Test
4541
public void testGetOffsetTable_ShouldReturnConcurrentHashMap() {
46-
if (MixAll.isMac()) {
47-
return;
48-
}
4942
ConcurrentMap<Integer, Long> offsetTable = wrapper.getOffsetTable();
5043
assertNotNull("The offsetTable should not be null", offsetTable);
5144
}
5245

5346
@Test
5447
public void testSetOffsetTable_ShouldSetTheOffsetTableCorrectly() {
55-
if (MixAll.isMac()) {
56-
return;
57-
}
5848
ConcurrentMap<Integer, Long> newOffsetTable = new ConcurrentHashMap<>();
5949
wrapper.setOffsetTable(newOffsetTable);
6050
ConcurrentMap<Integer, Long> offsetTable = wrapper.getOffsetTable();

‎broker/src/test/java/org/apache/rocketmq/broker/pop/PopConsumerCacheTest.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,8 @@
2424
import org.apache.rocketmq.broker.BrokerController;
2525
import org.apache.rocketmq.broker.offset.ConsumerOffsetManager;
2626
import org.apache.rocketmq.common.BrokerConfig;
27-
import org.apache.rocketmq.common.MixAll;
2827
import org.awaitility.Awaitility;
2928
import org.junit.Assert;
30-
import org.junit.Assume;
3129
import org.junit.Test;
3230
import org.mockito.Mockito;
3331

@@ -42,7 +40,6 @@ public class PopConsumerCacheTest {
4240

4341
@Test
4442
public void consumerRecordsTest() {
45-
Assume.assumeFalse(MixAll.isMac());
4643
BrokerConfig brokerConfig = new BrokerConfig();
4744
brokerConfig.setPopConsumerKVServiceLog(true);
4845
PopConsumerCache.ConsumerRecords consumerRecords =
@@ -74,7 +71,6 @@ public void consumerRecordsTest() {
7471

7572
@Test
7673
public void consumerOffsetTest() throws IllegalAccessException {
77-
Assume.assumeFalse(MixAll.isMac());
7874
BrokerController brokerController = Mockito.mock(BrokerController.class);
7975
PopConsumerKVStore consumerKVStore = Mockito.mock(PopConsumerRocksdbStore.class);
8076
PopConsumerLockService consumerLockService = Mockito.mock(PopConsumerLockService.class);
@@ -98,7 +94,6 @@ public void consumerOffsetTest() throws IllegalAccessException {
9894

9995
@Test
10096
public void consumerCacheTest() {
101-
Assume.assumeFalse(MixAll.isMac());
10297
BrokerController brokerController = Mockito.mock(BrokerController.class);
10398
PopConsumerKVStore consumerKVStore = Mockito.mock(PopConsumerRocksdbStore.class);
10499
PopConsumerLockService consumerLockService = Mockito.mock(PopConsumerLockService.class);

‎broker/src/test/java/org/apache/rocketmq/broker/pop/PopConsumerRocksdbStoreTest.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,10 @@
2828
import java.util.stream.Collectors;
2929
import java.util.stream.IntStream;
3030
import org.apache.commons.io.FileUtils;
31-
import org.apache.rocketmq.common.MixAll;
3231
import org.apache.rocketmq.common.config.AbstractRocksDBStorage;
3332
import org.apache.rocketmq.common.constant.LoggerName;
3433
import org.apache.rocketmq.tieredstore.util.MessageStoreUtil;
3534
import org.junit.Assert;
36-
import org.junit.Assume;
3735
import org.junit.Ignore;
3836
import org.junit.Test;
3937
import org.rocksdb.RocksDB;
@@ -66,7 +64,6 @@ public static PopConsumerRecord getConsumerRecord() {
6664

6765
@Test
6866
public void rocksdbStoreWriteDeleteTest() {
69-
Assume.assumeFalse(MixAll.isMac());
7067
String filePath = getRandomStorePath();
7168
PopConsumerKVStore consumerStore = new PopConsumerRocksdbStore(filePath);
7269
Assert.assertEquals(filePath, consumerStore.getFilePath());
@@ -130,7 +127,6 @@ private long getDirectorySizeRecursive(File directory) {
130127
@Ignore
131128
@SuppressWarnings("ConstantValue")
132129
public void tombstoneDeletionTest() throws IllegalAccessException, NoSuchFieldException {
133-
Assume.assumeFalse(MixAll.isMac());
134130
PopConsumerRocksdbStore rocksdbStore = new PopConsumerRocksdbStore(getRandomStorePath());
135131
rocksdbStore.start();
136132

‎common/src/test/java/org/apache/rocketmq/common/attribute/CQTypeTest.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
*/
1717
package org.apache.rocketmq.common.attribute;
1818

19-
import org.apache.rocketmq.common.MixAll;
20-
import org.junit.Assume;
2119
import org.junit.Test;
2220

2321
import static org.junit.Assert.assertEquals;
@@ -26,7 +24,6 @@ public class CQTypeTest {
2624

2725
@Test
2826
public void testValues() {
29-
Assume.assumeFalse(MixAll.isMac());
3027
CQType[] values = CQType.values();
3128
assertEquals(3, values.length);
3229
assertEquals(CQType.SimpleCQ, values[0]);
@@ -36,15 +33,13 @@ public void testValues() {
3633

3734
@Test
3835
public void testValueOf() {
39-
Assume.assumeFalse(MixAll.isMac());
4036
assertEquals(CQType.SimpleCQ, CQType.valueOf("SimpleCQ"));
4137
assertEquals(CQType.BatchCQ, CQType.valueOf("BatchCQ"));
4238
assertEquals(CQType.RocksDBCQ, CQType.valueOf("RocksDBCQ"));
4339
}
4440

4541
@Test(expected = IllegalArgumentException.class)
4642
public void testValueOf_InvalidName() {
47-
Assume.assumeFalse(MixAll.isMac());
4843
CQType.valueOf("InvalidCQ");
4944
}
5045
}

‎remoting/src/test/java/org/apache/rocketmq/remoting/protocol/header/ExportRocksDBConfigToJsonRequestHeaderTest.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,12 @@
1818

1919
import java.util.ArrayList;
2020
import java.util.List;
21-
import org.apache.rocketmq.common.MixAll;
2221
import org.junit.Assert;
2322
import org.junit.Test;
2423

2524
public class ExportRocksDBConfigToJsonRequestHeaderTest {
2625
@Test
2726
public void configTypeTest() {
28-
if (MixAll.isMac()) {
29-
return;
30-
}
3127
List<ExportRocksDBConfigToJsonRequestHeader.ConfigType> configTypes = new ArrayList<>();
3228
configTypes.add(ExportRocksDBConfigToJsonRequestHeader.ConfigType.TOPICS);
3329
configTypes.add(ExportRocksDBConfigToJsonRequestHeader.ConfigType.SUBSCRIPTION_GROUPS);

0 commit comments

Comments
 (0)