Merge pull request TooTallNate#772 from marci4/CloseFrameToString

marci4 · web-flow · commit e59a0bb7e939 · 2018-09-10T19:29:29.000Z
Fix tests
diff --git a/src/test/java/org/java_websocket/autobahn/AutobahnServerResultsTest.java b/src/test/java/org/java_websocket/autobahn/AutobahnServerResultsTest.java
@@ -36,7 +36,7 @@
 
 import static org.junit.Assert.assertEquals;
 
-public class AutobahnServerResults {
+public class AutobahnServerResultsTest {
 
 	static JSONObject jsonObject = null;
 
diff --git a/src/test/java/org/java_websocket/framing/CloseFrameTest.java b/src/test/java/org/java_websocket/framing/CloseFrameTest.java
@@ -63,7 +63,9 @@ public void testExtends() {
     @Test
     public void testToString() {
         CloseFrame frame = new CloseFrame();
-        assertEquals("Frame toString must include a close code", "Framedata{ optcode:CLOSING, fin:true, rsv1:false, rsv2:false, rsv3:false, payloadlength:[pos:0, len:2], payload:\u0003è}code: 1000",frame.toString());
+        String frameString = frame.toString();
+        frameString = frameString.replaceAll("payload:(.*)}", "payload: *}");
+        assertEquals("Frame toString must include a close code", "Framedata{ optcode:CLOSING, fin:true, rsv1:false, rsv2:false, rsv3:false, payloadlength:[pos:0, len:2], payload: *}code: 1000", frameString);
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,9 @@ public void testExtends() {`
`63`	`63`	`@Test`
`64`	`64`	`public void testToString() {`
`65`	`65`	`CloseFrame frame = new CloseFrame();`
`66`		`- assertEquals("Frame toString must include a close code", "Framedata{ optcode:CLOSING, fin:true, rsv1:false, rsv2:false, rsv3:false, payloadlength:[pos:0, len:2], payload:\u0003è}code: 1000",frame.toString());`
	`66`	`+ String frameString = frame.toString();`
	`67`	`+ frameString = frameString.replaceAll("payload:(.)}", "payload: }");`
	`68`	`+ assertEquals("Frame toString must include a close code", "Framedata{ optcode:CLOSING, fin:true, rsv1:false, rsv2:false, rsv3:false, payloadlength:[pos:0, len:2], payload: *}code: 1000", frameString);`
`67`	`69`	`}`
`68`	`70`
`69`	`71`