Add SockJsFrameType enum

SPR-10797

spring-websocket/src/test/java/org/springframework/web/socket/sockjs/frame/SockJsFrameTests.java

@@ -0,0 +1,99 @@
+/*
+ * Copyright 2002-2014 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.socket.sockjs.frame;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+/**
+ * Unit tests for {@link org.springframework.web.socket.sockjs.frame.SockJsFrame}.
+ *
+ * @author Rossen Stoyanchev
+ * @since 4.1
+ */
+public class SockJsFrameTests {
+
+
+	@Test
+	public void openFrame() {
+		SockJsFrame frame = SockJsFrame.openFrame();
+
+		assertEquals("o", frame.getContent());
+		assertEquals(SockJsFrameType.OPEN, frame.getType());
+		assertNull(frame.getFrameData());
+	}
+
+	@Test
+	public void heartbeatFrame() {
+		SockJsFrame frame = SockJsFrame.heartbeatFrame();
+
+		assertEquals("h", frame.getContent());
+		assertEquals(SockJsFrameType.HEARTBEAT, frame.getType());
+		assertNull(frame.getFrameData());
+	}
+
+	@Test
+	public void messageArrayFrame() {
+		SockJsFrame frame = SockJsFrame.messageFrame(new Jackson2SockJsMessageCodec(), "m1", "m2");
+
+		assertEquals("a[\"m1\",\"m2\"]", frame.getContent());
+		assertEquals(SockJsFrameType.MESSAGE, frame.getType());
+		assertEquals("[\"m1\",\"m2\"]", frame.getFrameData());
+	}
+
+	@Test
+	public void messageArrayFrameEmpty() {
+		SockJsFrame frame = new SockJsFrame("a");
+
+		assertEquals("a[]", frame.getContent());
+		assertEquals(SockJsFrameType.MESSAGE, frame.getType());
+		assertEquals("[]", frame.getFrameData());
+
+		frame = new SockJsFrame("a[]");
+
+		assertEquals("a[]", frame.getContent());
+		assertEquals(SockJsFrameType.MESSAGE, frame.getType());
+		assertEquals("[]", frame.getFrameData());
+	}
+
+	@Test
+	public void closeFrame() {
+		SockJsFrame frame = SockJsFrame.closeFrame(3000, "Go Away!");
+
+		assertEquals("c[3000,\"Go Away!\"]", frame.getContent());
+		assertEquals(SockJsFrameType.CLOSE, frame.getType());
+		assertEquals("[3000,\"Go Away!\"]", frame.getFrameData());
+	}
+
+	@Test
+	public void closeFrameEmpty() {
+		SockJsFrame frame = new SockJsFrame("c");
+
+		assertEquals("c[]", frame.getContent());
+		assertEquals(SockJsFrameType.CLOSE, frame.getType());
+		assertEquals("[]", frame.getFrameData());
+
+		frame = new SockJsFrame("c[]");
+
+		assertEquals("c[]", frame.getContent());
+		assertEquals(SockJsFrameType.CLOSE, frame.getType());
+		assertEquals("[]", frame.getFrameData());
+	}
+
+}

spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/HttpSendingTransportHandlerTests.java

@@ -168,24 +168,24 @@ public class HttpSendingTransportHandlerTests  extends AbstractHttpRequestTests
 		SockJsFrame frame = SockJsFrame.openFrame();
 
 		SockJsFrameFormat format = new XhrPollingTransportHandler().getFrameFormat(this.request);
-		SockJsFrame formatted = format.format(frame);
-		assertEquals(frame.getContent() + "\n", formatted.getContent());
+		String formatted = format.format(frame);
+		assertEquals(frame.getContent() + "\n", formatted);
 
 		format = new XhrStreamingTransportHandler().getFrameFormat(this.request);
 		formatted = format.format(frame);
-		assertEquals(frame.getContent() + "\n", formatted.getContent());
+		assertEquals(frame.getContent() + "\n", formatted);
 
 		format = new HtmlFileTransportHandler().getFrameFormat(this.request);
 		formatted = format.format(frame);
-		assertEquals("<script>\np(\"" + frame.getContent() + "\");\n</script>\r\n", formatted.getContent());
+		assertEquals("<script>\np(\"" + frame.getContent() + "\");\n</script>\r\n", formatted);
 
 		format = new EventSourceTransportHandler().getFrameFormat(this.request);
 		formatted = format.format(frame);
-		assertEquals("data: " + frame.getContent() + "\r\n\r\n", formatted.getContent());
+		assertEquals("data: " + frame.getContent() + "\r\n\r\n", formatted);
 
 		format = new JsonpPollingTransportHandler().getFrameFormat(this.request);
 		formatted = format.format(frame);
-		assertEquals("callback(\"" + frame.getContent() + "\");\r\n", formatted.getContent());
+		assertEquals("callback(\"" + frame.getContent() + "\");\r\n", formatted);
 	}
 
 }