Refactor approach to working with STOMP headers

2013-06-11 01:52:32 -04:00
parent 547167e8b4
commit d26b9d60e5
21 changed files with 762 additions and 969 deletions
--- a/spring-websocket/src/test/java/org/springframework/web/messaging/stomp/support/StompMessageConverterTests.java
+++ b/spring-websocket/src/test/java/org/springframework/web/messaging/stomp/support/StompMessageConverterTests.java
@@ -0,0 +1,138 @@
+/*
+ * 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.web.messaging.stomp.support;
+
+import java.util.Collections;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.MessageHeaders;
+import org.springframework.web.messaging.MessageType;
+import org.springframework.web.messaging.stomp.StompHeaders;
+import org.springframework.web.messaging.stomp.StompCommand;
+
+import static org.junit.Assert.*;
+
+/**
+ * @author Gary Russell
+ * @author Rossen Stoyanchev
+ */
+public class StompMessageConverterTests {
+
+	private StompMessageConverter converter;
+
+
+	@Before
+	public void setup() {
+		this.converter = new StompMessageConverter();
+	}
+
+	@Test
+	public void connectFrame() throws Exception {
+
+		String accept = "accept-version:1.1\n";
+		String host = "host:github.org\n";
+		String frame = "\n\n\nCONNECT\n" + accept + host + "\n";
+		Message<byte[]> message = this.converter.toMessage(frame.getBytes("UTF-8"), "session-123");
+
+		assertEquals(0, message.getPayload().length);
+
+		MessageHeaders messageHeaders = message.getHeaders();
+		StompHeaders stompHeaders = new StompHeaders(messageHeaders, true);
+		assertEquals(6, stompHeaders.getMessageHeaders().size());
+		assertEquals(MessageType.CONNECT, stompHeaders.getMessageType());
+		assertEquals(StompCommand.CONNECT, stompHeaders.getStompCommand());
+		assertEquals("session-123", stompHeaders.getSessionId());
+		assertNotNull(messageHeaders.get(MessageHeaders.ID));
+		assertNotNull(messageHeaders.get(MessageHeaders.TIMESTAMP));
+		assertEquals(Collections.singleton("1.1"), stompHeaders.getAcceptVersion());
+		assertEquals("github.org", stompHeaders.getRawHeaders().get("host"));
+
+		String convertedBack = new String(this.converter.fromMessage(message), "UTF-8");
+
+		assertEquals("CONNECT\n", convertedBack.substring(0,8));
+		assertTrue(convertedBack.contains(accept));
+		assertTrue(convertedBack.contains(host));
+	}
+
+	@Test
+	public void connectWithEscapes() throws Exception {
+
+		String accept = "accept-version:1.1\n";
+		String host = "ho\\c\\ns\\rt:st\\nomp.gi\\cthu\\b.org\n";
+		String frame = "CONNECT\n" + accept + host + "\n";
+		Message<byte[]> message = this.converter.toMessage(frame.getBytes("UTF-8"), "session-123");
+
+		assertEquals(0, message.getPayload().length);
+
+		MessageHeaders messageHeaders = message.getHeaders();
+		StompHeaders stompHeaders = new StompHeaders(messageHeaders, true);
+		assertEquals(Collections.singleton("1.1"), stompHeaders.getAcceptVersion());
+		assertEquals("st\nomp.gi:thu\\b.org", stompHeaders.getRawHeaders().get("ho:\ns\rt"));
+
+		String convertedBack = new String(this.converter.fromMessage(message), "UTF-8");
+
+		assertEquals("CONNECT\n", convertedBack.substring(0,8));
+		assertTrue(convertedBack.contains(accept));
+		assertTrue(convertedBack.contains(host));
+	}
+
+	@Test
+	public void connectCR12() throws Exception {
+
+		String accept = "accept-version:1.2\n";
+		String host = "host:github.org\n";
+		String test = "CONNECT\r\n" + accept.replaceAll("\n", "\r\n") + host.replaceAll("\n", "\r\n") + "\r\n";
+		Message<byte[]> message = this.converter.toMessage(test.getBytes("UTF-8"), "session-123");
+
+		assertEquals(0, message.getPayload().length);
+
+		MessageHeaders messageHeaders = message.getHeaders();
+		StompHeaders stompHeaders = new StompHeaders(messageHeaders, true);
+		assertEquals(Collections.singleton("1.2"), stompHeaders.getAcceptVersion());
+		assertEquals("github.org", stompHeaders.getRawHeaders().get("host"));
+
+		String convertedBack = new String(this.converter.fromMessage(message), "UTF-8");
+
+		assertEquals("CONNECT\n", convertedBack.substring(0,8));
+		assertTrue(convertedBack.contains(accept));
+		assertTrue(convertedBack.contains(host));
+	}
+
+	@Test
+	public void connectWithEscapesAndCR12() throws Exception {
+
+		String accept = "accept-version:1.1\n";
+		String host = "ho\\c\\ns\\rt:st\\nomp.gi\\cthu\\b.org\n";
+		String test = "\n\n\nCONNECT\r\n" + accept.replaceAll("\n", "\r\n") + host.replaceAll("\n", "\r\n") + "\r\n";
+		Message<byte[]> message = this.converter.toMessage(test.getBytes("UTF-8"), "session-123");
+
+		assertEquals(0, message.getPayload().length);
+
+		MessageHeaders messageHeaders = message.getHeaders();
+		StompHeaders stompHeaders = new StompHeaders(messageHeaders, true);
+		assertEquals(Collections.singleton("1.1"), stompHeaders.getAcceptVersion());
+		assertEquals("st\nomp.gi:thu\\b.org", stompHeaders.getRawHeaders().get("ho:\ns\rt"));
+
+		String convertedBack = new String(this.converter.fromMessage(message), "UTF-8");
+
+		assertEquals("CONNECT\n", convertedBack.substring(0,8));
+		assertTrue(convertedBack.contains(accept));
+		assertTrue(convertedBack.contains(host));
+	}
+
+}