Fixed closeframe test

marci4 · marci4 · commit 249f6697be48 · 2018-08-14T22:13:10.000+02:00
diff --git a/src/main/java/org/java_websocket/framing/CloseFrame.java b/src/main/java/org/java_websocket/framing/CloseFrame.java
@@ -235,7 +235,7 @@ public String toString() {
     @Override
     public void isValid() throws InvalidDataException {
         super.isValid();
-        if (code == CloseFrame.NO_UTF8 && reason == null) {
+        if (code == CloseFrame.NO_UTF8 && reason.isEmpty()) {
         	throw new InvalidDataException( CloseFrame.NO_UTF8, "Received text is no valid utf8 string!");
 		}
         if (code == CloseFrame.NOCODE && 0 < reason.length()) {
diff --git a/src/test/java/org/java_websocket/framing/CloseFrameTest.java b/src/test/java/org/java_websocket/framing/CloseFrameTest.java
@@ -138,12 +138,6 @@ public void testIsValid() {
         } catch (InvalidDataException e) {
             //fine
         }
-        frame.setCode(CloseFrame.NO_UTF8);
-        try {
-            frame.isValid();
-        } catch (InvalidDataException e) {
-            fail("InvalidDataException should not be thrown");
-        }
         frame.setCode(CloseFrame.POLICY_VALIDATION);
         try {
             frame.isValid();

Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ public String toString() {`
`235`	`235`	`@Override`
`236`	`236`	`public void isValid() throws InvalidDataException {`
`237`	`237`	`super.isValid();`
`238`		`- if (code == CloseFrame.NO_UTF8 && reason == null) {`
	`238`	`+ if (code == CloseFrame.NO_UTF8 && reason.isEmpty()) {`
`239`	`239`	`throw new InvalidDataException( CloseFrame.NO_UTF8, "Received text is no valid utf8 string!");`
`240`	`240`	`}`
`241`	`241`	`if (code == CloseFrame.NOCODE && 0 < reason.length()) {`