Create spring-messaging module
Consolidates new, messaging-related classes from spring-context and spring-websocket into one module.
This commit is contained in:
Rossen Stoyanchev
@@ -1,148 +0,0 @@
|
||||
/*
|
||||
* Copyright 2002-2013 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.messaging.channel;
|
||||
|
||||
import java.util.concurrent.Executor;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.rules.ExpectedException;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.mockito.Captor;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.springframework.messaging.Message;
|
||||
import org.springframework.messaging.MessageHandler;
|
||||
import org.springframework.messaging.MessagingException;
|
||||
import org.springframework.messaging.channel.PublishSubscribeChannel;
|
||||
import org.springframework.messaging.support.MessageBuilder;
|
||||
|
||||
import static org.hamcrest.Matchers.*;
|
||||
import static org.junit.Assert.*;
|
||||
import static org.mockito.BDDMockito.*;
|
||||
|
||||
/**
|
||||
* Tests for {@link PublishSubscribeChannel}.
|
||||
*
|
||||
* @author Phillip Webb
|
||||
*/
|
||||
public class PublishSubscibeChannelTests {
|
||||
|
||||
@Rule
|
||||
public ExpectedException thrown = ExpectedException.none();
|
||||
|
||||
|
||||
private PublishSubscribeChannel channel = new PublishSubscribeChannel();
|
||||
|
||||
@Mock
|
||||
private MessageHandler handler;
|
||||
|
||||
private final Object payload = new Object();
|
||||
|
||||
private final Message<Object> message = MessageBuilder.withPayload(this.payload).build();
|
||||
|
||||
@Captor
|
||||
private ArgumentCaptor<Runnable> runnableCaptor;
|
||||
|
||||
|
||||
@Before
|
||||
public void setup() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void messageMustNotBeNull() throws Exception {
|
||||
thrown.expect(IllegalArgumentException.class);
|
||||
thrown.expectMessage("Message must not be null");
|
||||
this.channel.send(null);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void payloadMustNotBeNull() throws Exception {
|
||||
Message<?> message = mock(Message.class);
|
||||
thrown.expect(IllegalArgumentException.class);
|
||||
thrown.expectMessage("Message payload must not be null");
|
||||
this.channel.send(message);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void sendWithoutExecutor() {
|
||||
this.channel.subscribe(this.handler);
|
||||
this.channel.send(this.message);
|
||||
verify(this.handler).handleMessage(this.message);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void sendWithExecutor() throws Exception {
|
||||
Executor executor = mock(Executor.class);
|
||||
this.channel = new PublishSubscribeChannel(executor);
|
||||
this.channel.subscribe(this.handler);
|
||||
this.channel.send(this.message);
|
||||
verify(executor).execute(this.runnableCaptor.capture());
|
||||
verify(this.handler, never()).handleMessage(this.message);
|
||||
this.runnableCaptor.getValue().run();
|
||||
verify(this.handler).handleMessage(this.message);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void subscribeTwice() throws Exception {
|
||||
assertThat(this.channel.subscribe(this.handler), equalTo(true));
|
||||
assertThat(this.channel.subscribe(this.handler), equalTo(false));
|
||||
this.channel.send(this.message);
|
||||
verify(this.handler, times(1)).handleMessage(this.message);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void unsubscribeTwice() throws Exception {
|
||||
this.channel.subscribe(this.handler);
|
||||
assertThat(this.channel.unsubscribe(this.handler), equalTo(true));
|
||||
assertThat(this.channel.unsubscribe(this.handler), equalTo(false));
|
||||
this.channel.send(this.message);
|
||||
verify(this.handler, never()).handleMessage(this.message);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void failurePropagates() throws Exception {
|
||||
RuntimeException ex = new RuntimeException();
|
||||
willThrow(ex).given(this.handler).handleMessage(this.message);
|
||||
MessageHandler secondHandler = mock(MessageHandler.class);
|
||||
this.channel.subscribe(this.handler);
|
||||
this.channel.subscribe(secondHandler);
|
||||
try {
|
||||
this.channel.send(message);
|
||||
}
|
||||
catch(RuntimeException actualException) {
|
||||
assertThat(actualException, equalTo(ex));
|
||||
}
|
||||
verifyZeroInteractions(secondHandler);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void concurrentModification() throws Exception {
|
||||
this.channel.subscribe(new MessageHandler() {
|
||||
@Override
|
||||
public void handleMessage(Message<?> message) throws MessagingException {
|
||||
channel.unsubscribe(handler);
|
||||
}
|
||||
});
|
||||
this.channel.subscribe(this.handler);
|
||||
this.channel.send(this.message);
|
||||
verify(this.handler).handleMessage(this.message);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,169 +0,0 @@
|
||||
/*
|
||||
* Copyright 2002-2013 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.messaging.support;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.springframework.messaging.Message;
|
||||
import org.springframework.messaging.MessageHeaders;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
|
||||
/**
|
||||
* @author Mark Fisher
|
||||
*/
|
||||
public class MessageBuilderTests {
|
||||
|
||||
@Test
|
||||
public void testSimpleMessageCreation() {
|
||||
Message<String> message = MessageBuilder.withPayload("foo").build();
|
||||
assertEquals("foo", message.getPayload());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testHeaderValues() {
|
||||
Message<String> message = MessageBuilder.withPayload("test")
|
||||
.setHeader("foo", "bar")
|
||||
.setHeader("count", new Integer(123))
|
||||
.build();
|
||||
assertEquals("bar", message.getHeaders().get("foo", String.class));
|
||||
assertEquals(new Integer(123), message.getHeaders().get("count", Integer.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testCopiedHeaderValues() {
|
||||
Message<String> message1 = MessageBuilder.withPayload("test1")
|
||||
.setHeader("foo", "1")
|
||||
.setHeader("bar", "2")
|
||||
.build();
|
||||
Message<String> message2 = MessageBuilder.withPayload("test2")
|
||||
.copyHeaders(message1.getHeaders())
|
||||
.setHeader("foo", "42")
|
||||
.setHeaderIfAbsent("bar", "99")
|
||||
.build();
|
||||
assertEquals("test1", message1.getPayload());
|
||||
assertEquals("test2", message2.getPayload());
|
||||
assertEquals("1", message1.getHeaders().get("foo"));
|
||||
assertEquals("42", message2.getHeaders().get("foo"));
|
||||
assertEquals("2", message1.getHeaders().get("bar"));
|
||||
assertEquals("2", message2.getHeaders().get("bar"));
|
||||
}
|
||||
|
||||
@Test(expected = IllegalArgumentException.class)
|
||||
public void testIdHeaderValueReadOnly() {
|
||||
UUID id = UUID.randomUUID();
|
||||
MessageBuilder.withPayload("test").setHeader(MessageHeaders.ID, id);
|
||||
}
|
||||
|
||||
@Test(expected = IllegalArgumentException.class)
|
||||
public void testTimestampValueReadOnly() {
|
||||
Long timestamp = 12345L;
|
||||
MessageBuilder.withPayload("test").setHeader(MessageHeaders.TIMESTAMP, timestamp).build();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void copyHeadersIfAbsent() {
|
||||
Message<String> message1 = MessageBuilder.withPayload("test1")
|
||||
.setHeader("foo", "bar").build();
|
||||
Message<String> message2 = MessageBuilder.withPayload("test2")
|
||||
.setHeader("foo", 123)
|
||||
.copyHeadersIfAbsent(message1.getHeaders())
|
||||
.build();
|
||||
assertEquals("test2", message2.getPayload());
|
||||
assertEquals(123, message2.getHeaders().get("foo"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void createFromMessage() {
|
||||
Message<String> message1 = MessageBuilder.withPayload("test")
|
||||
.setHeader("foo", "bar").build();
|
||||
Message<String> message2 = MessageBuilder.fromMessage(message1).build();
|
||||
assertEquals("test", message2.getPayload());
|
||||
assertEquals("bar", message2.getHeaders().get("foo"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void createIdRegenerated() {
|
||||
Message<String> message1 = MessageBuilder.withPayload("test")
|
||||
.setHeader("foo", "bar").build();
|
||||
Message<String> message2 = MessageBuilder.fromMessage(message1).setHeader("another", 1).build();
|
||||
assertEquals("bar", message2.getHeaders().get("foo"));
|
||||
assertNotSame(message1.getHeaders().getId(), message2.getHeaders().getId());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRemove() {
|
||||
Message<Integer> message1 = MessageBuilder.withPayload(1)
|
||||
.setHeader("foo", "bar").build();
|
||||
Message<Integer> message2 = MessageBuilder.fromMessage(message1)
|
||||
.removeHeader("foo")
|
||||
.build();
|
||||
assertFalse(message2.getHeaders().containsKey("foo"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSettingToNullRemoves() {
|
||||
Message<Integer> message1 = MessageBuilder.withPayload(1)
|
||||
.setHeader("foo", "bar").build();
|
||||
Message<Integer> message2 = MessageBuilder.fromMessage(message1)
|
||||
.setHeader("foo", null)
|
||||
.build();
|
||||
assertFalse(message2.getHeaders().containsKey("foo"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNotModifiedSameMessage() throws Exception {
|
||||
Message<?> original = MessageBuilder.withPayload("foo").build();
|
||||
Message<?> result = MessageBuilder.fromMessage(original).build();
|
||||
assertEquals(original, result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testContainsHeaderNotModifiedSameMessage() throws Exception {
|
||||
Message<?> original = MessageBuilder.withPayload("foo").setHeader("bar", 42).build();
|
||||
Message<?> result = MessageBuilder.fromMessage(original).build();
|
||||
assertEquals(original, result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSameHeaderValueAddedNotModifiedSameMessage() throws Exception {
|
||||
Message<?> original = MessageBuilder.withPayload("foo").setHeader("bar", 42).build();
|
||||
Message<?> result = MessageBuilder.fromMessage(original).setHeader("bar", 42).build();
|
||||
assertEquals(original, result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testCopySameHeaderValuesNotModifiedSameMessage() throws Exception {
|
||||
Date current = new Date();
|
||||
Map<String, Object> originalHeaders = new HashMap<String, Object>();
|
||||
originalHeaders.put("b", "xyz");
|
||||
originalHeaders.put("c", current);
|
||||
Message<?> original = MessageBuilder.withPayload("foo").setHeader("a", 123).copyHeaders(originalHeaders).build();
|
||||
Map<String, Object> newHeaders = new HashMap<String, Object>();
|
||||
newHeaders.put("a", 123);
|
||||
newHeaders.put("b", "xyz");
|
||||
newHeaders.put("c", current);
|
||||
Message<?> result = MessageBuilder.fromMessage(original).copyHeaders(newHeaders).build();
|
||||
assertEquals(original, result);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user