Skip to content

Commit bb3ffb5

Browse files
committed
fix: pass MessageBroker to rqueueMessageHandler in unit tests
rqueueMessageHandler now requires a MessageBroker argument (added to wire primary-handler-dispatch capability). Update both test classes to supply a mocked MessageBroker stubbed with REDIS_DEFAULTS capabilities. Assisted-By: Claude Code
1 parent a6ad31a commit bb3ffb5

2 files changed

Lines changed: 20 additions & 4 deletions

File tree

rqueue-spring-boot-starter/src/test/java/com/github/sonus21/rqueue/spring/boot/tests/unit/RqueueListenerAutoConfigTest.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static org.junit.jupiter.api.Assertions.assertNotNull;
2121
import static org.junit.jupiter.api.Assertions.assertTrue;
2222
import static org.mockito.Mockito.doReturn;
23+
import static org.mockito.Mockito.when;
2324

2425
import com.github.sonus21.TestBase;
2526
import com.github.sonus21.rqueue.config.SimpleRqueueListenerContainerFactory;
@@ -30,6 +31,8 @@
3031
import com.github.sonus21.rqueue.core.RqueueMessageEnqueuer;
3132
import com.github.sonus21.rqueue.core.RqueueMessageTemplate;
3233
import com.github.sonus21.rqueue.core.impl.UuidV4RqueueMessageIdGenerator;
34+
import com.github.sonus21.rqueue.core.spi.Capabilities;
35+
import com.github.sonus21.rqueue.core.spi.MessageBroker;
3336
import com.github.sonus21.rqueue.listener.RqueueMessageHandler;
3437
import com.github.sonus21.rqueue.spring.boot.RqueueListenerAutoConfig;
3538
import com.github.sonus21.rqueue.spring.boot.tests.SpringBootUnitTest;
@@ -58,6 +61,9 @@ class RqueueListenerAutoConfigTest extends TestBase {
5861
@Mock
5962
private RqueueMessageHandler rqueueMessageHandler;
6063

64+
@Mock
65+
private MessageBroker messageBroker;
66+
6167
@Mock
6268
private RedisConnectionFactory redisConnectionFactory;
6369

@@ -77,7 +83,8 @@ public void init() throws IllegalAccessException {
7783
@Test
7884
void rqueueMessageHandlerDefaultCreation()
7985
throws ClassNotFoundException, InstantiationException, IllegalAccessException {
80-
assertNotNull(rqueueMessageAutoConfig.rqueueMessageHandler());
86+
when(messageBroker.capabilities()).thenReturn(Capabilities.REDIS_DEFAULTS);
87+
assertNotNull(rqueueMessageAutoConfig.rqueueMessageHandler(messageBroker));
8188
}
8289

8390
@Test
@@ -92,9 +99,10 @@ void rqueueMessageHandlerReused()
9299
"com.github.sonus21.rqueue.converter.DefaultMessageConverterProvider",
93100
true);
94101
FieldUtils.writeField(messageAutoConfig, "simpleRqueueListenerContainerFactory", factory, true);
102+
when(messageBroker.capabilities()).thenReturn(Capabilities.REDIS_DEFAULTS);
95103
assertEquals(
96104
rqueueMessageHandler.hashCode(),
97-
messageAutoConfig.rqueueMessageHandler().hashCode());
105+
messageAutoConfig.rqueueMessageHandler(messageBroker).hashCode());
98106
}
99107

100108
@Test

rqueue-spring/src/test/java/com/github/sonus21/rqueue/spring/tests/unit/RqueueMessageConfigTest.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import static org.junit.jupiter.api.Assertions.assertEquals;
2020
import static org.junit.jupiter.api.Assertions.assertNotNull;
2121
import static org.mockito.Mockito.doReturn;
22+
import static org.mockito.Mockito.when;
2223

2324
import com.github.sonus21.TestBase;
2425
import com.github.sonus21.rqueue.config.SimpleRqueueListenerContainerFactory;
@@ -27,6 +28,8 @@
2728
import com.github.sonus21.rqueue.core.DefaultRqueueMessageConverter;
2829
import com.github.sonus21.rqueue.core.RqueueMessageTemplate;
2930
import com.github.sonus21.rqueue.core.impl.UuidV4RqueueMessageIdGenerator;
31+
import com.github.sonus21.rqueue.core.spi.Capabilities;
32+
import com.github.sonus21.rqueue.core.spi.MessageBroker;
3033
import com.github.sonus21.rqueue.listener.RqueueMessageHandler;
3134
import com.github.sonus21.rqueue.spring.RqueueListenerConfig;
3235
import com.github.sonus21.rqueue.spring.tests.SpringUnitTest;
@@ -50,6 +53,9 @@ class RqueueMessageConfigTest extends TestBase {
5053
@Mock
5154
RqueueMessageHandler rqueueMessageHandler;
5255

56+
@Mock
57+
private MessageBroker messageBroker;
58+
5359
@Mock
5460
private SimpleRqueueListenerContainerFactory simpleRqueueListenerContainerFactory;
5561

@@ -79,7 +85,8 @@ void rqueueMessageHandlerDefaultCreation() throws IllegalAccessException {
7985
"messageConverterProviderClass",
8086
"com.github.sonus21.rqueue.converter.DefaultMessageConverterProvider",
8187
true);
82-
assertNotNull(rqueueMessageConfig.rqueueMessageHandler());
88+
when(messageBroker.capabilities()).thenReturn(Capabilities.REDIS_DEFAULTS);
89+
assertNotNull(rqueueMessageConfig.rqueueMessageHandler(messageBroker));
8390
}
8491

8592
@Test
@@ -93,8 +100,9 @@ void rqueueMessageHandlerReused() throws IllegalAccessException {
93100
"com.github.sonus21.rqueue.converter.DefaultMessageConverterProvider",
94101
true);
95102
FieldUtils.writeField(messageConfig, "simpleRqueueListenerContainerFactory", factory, true);
103+
when(messageBroker.capabilities()).thenReturn(Capabilities.REDIS_DEFAULTS);
96104
assertEquals(
97-
rqueueMessageHandler.hashCode(), messageConfig.rqueueMessageHandler().hashCode());
105+
rqueueMessageHandler.hashCode(), messageConfig.rqueueMessageHandler(messageBroker).hashCode());
98106
}
99107

100108
@Test

0 commit comments

Comments
 (0)