Merge pull request TooTallNate#1057 from dota17/FixToString

marci4 · web-flow · commit 12bb2f52aead · 2020-08-03T13:10:24.000+02:00
[HotFix]Fix the failure of the CloseFrameTest.
diff --git a/src/main/java/org/java_websocket/framing/FramedataImpl1.java b/src/main/java/org/java_websocket/framing/FramedataImpl1.java
@@ -159,7 +159,7 @@ public void append(Framedata nextframe) {
 
     @Override
     public String toString() {
-        return "Framedata{ opcode:" + getOpcode() + ", fin:" + isFin() + ", rsv1:" + isRSV1() + ", rsv2:" + isRSV2() + ", rsv3:" + isRSV3() + ", payloadlength:[pos:" + unmaskedpayload.position() + ", len:" + unmaskedpayload.remaining() + "], payload:" + ( unmaskedpayload.remaining() > 1000 ? "(too big to display)" : new String( unmaskedpayload.array() ) ) + '}';
+        return "Framedata{ opcode:" + getOpcode() + ", fin:" + isFin() + ", rsv1:" + isRSV1() + ", rsv2:" + isRSV2() + ", rsv3:" + isRSV3() + ", payload length:[pos:" + unmaskedpayload.position() + ", len:" + unmaskedpayload.remaining() + "], payload:" + ( unmaskedpayload.remaining() > 1000 ? "(too big to display)" : new String( unmaskedpayload.array() ) ) + '}';
     }
 
     /**
diff --git a/src/test/java/org/java_websocket/framing/CloseFrameTest.java b/src/test/java/org/java_websocket/framing/CloseFrameTest.java
@@ -65,7 +65,7 @@ public void testToString() {
         CloseFrame frame = new CloseFrame();
         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);
+        assertEquals("Frame toString must include a close code", "Framedata{ opcode:CLOSING, fin:true, rsv1:false, rsv2:false, rsv3:false, payload length:[pos:0, len:2], payload: *}code: 1000", frameString);
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ public void append(Framedata nextframe) {`
`159`	`159`
`160`	`160`	`@Override`
`161`	`161`	`public String toString() {`
`162`		`- return "Framedata{ opcode:" + getOpcode() + ", fin:" + isFin() + ", rsv1:" + isRSV1() + ", rsv2:" + isRSV2() + ", rsv3:" + isRSV3() + ", payloadlength:[pos:" + unmaskedpayload.position() + ", len:" + unmaskedpayload.remaining() + "], payload:" + ( unmaskedpayload.remaining() > 1000 ? "(too big to display)" : new String( unmaskedpayload.array() ) ) + '}';`
	`162`	`+ return "Framedata{ opcode:" + getOpcode() + ", fin:" + isFin() + ", rsv1:" + isRSV1() + ", rsv2:" + isRSV2() + ", rsv3:" + isRSV3() + ", payload length:[pos:" + unmaskedpayload.position() + ", len:" + unmaskedpayload.remaining() + "], payload:" + ( unmaskedpayload.remaining() > 1000 ? "(too big to display)" : new String( unmaskedpayload.array() ) ) + '}';`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public void testToString() {`
`65`	`65`	`CloseFrame frame = new CloseFrame();`
`66`	`66`	`String frameString = frame.toString();`
`67`	`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);`
	`68`	`+ assertEquals("Frame toString must include a close code", "Framedata{ opcode:CLOSING, fin:true, rsv1:false, rsv2:false, rsv3:false, payload length:[pos:0, len:2], payload: *}code: 1000", frameString);`
`69`	`69`	`}`
`70`	`70`
`71`	`71`