1 files changed, 0 insertions, 1288 deletions
diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6.java
index 418a445720..6834d78acc 100644
--- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6.java
+++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6.java
@@ -37,53 +37,6 @@ import org.junit.runner.RunWith;
 @RunWith(AdvancedRunner.class)
 public class TestABCase6 extends AbstractABCase
 {
-    private void assertBadTextPayload(byte[] invalid) throws Exception
-    {
-        List<WebSocketFrame> send = new ArrayList<>();
-        send.add(new WebSocketFrame(OpCode.TEXT).setPayload(invalid));
-        send.add(new CloseInfo(StatusCode.NORMAL).asFrame());
-
-        List<WebSocketFrame> expect = new ArrayList<>();
-        expect.add(new CloseInfo(StatusCode.BAD_PAYLOAD).asFrame());
-
-        Fuzzer fuzzer = new Fuzzer(this);
-        try
-        {
-            fuzzer.connect();
-            fuzzer.setSendMode(Fuzzer.SendMode.BULK);
-            fuzzer.send(send);
-            fuzzer.expect(expect);
-        }
-        finally
-        {
-            fuzzer.close();
-        }
-    }
-
-    private void assertEchoTextMessage(byte[] msg) throws Exception
-    {
-        List<WebSocketFrame> send = new ArrayList<>();
-        send.add(new WebSocketFrame(OpCode.TEXT).setPayload(msg));
-        send.add(new CloseInfo(StatusCode.NORMAL).asFrame());
-
-        List<WebSocketFrame> expect = new ArrayList<>();
-        expect.add(new WebSocketFrame(OpCode.TEXT).setPayload(msg));
-        expect.add(new CloseInfo(StatusCode.NORMAL).asFrame());
-
-        Fuzzer fuzzer = new Fuzzer(this);
-        try
-        {
-            fuzzer.connect();
-            fuzzer.setSendMode(Fuzzer.SendMode.BULK);
-            fuzzer.send(send);
-            fuzzer.expect(expect);
-        }
-        finally
-        {
-            fuzzer.close();
-        }
-    }
-
     /**
      * Split a message byte array into a series of fragments (frames + continuations) of 1 byte message contents each.
      */
@@ -194,519 +147,6 @@ public class TestABCase6 extends AbstractABCase
     }
 
     /**
-     * invalid utf8 text message, 1 frame/fragment, 4 bytes
-     */
-    @Test
-    public void testCase6_10_1() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("F7BFBFBF");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment, 5 bytes
-     */
-    @Test
-    public void testCase6_10_2() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("FBBFBFBFBF");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment, 6 bytes
-     */
-    @Test
-    public void testCase6_10_3() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("FDBFBFBFBFBF");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. 3 bytes, 1 codepoint (other boundary conditions)
-     */
-    @Test
-    public void testCase6_11_1() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("ED9FBF");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. 3 bytes, 1 codepoint (other boundary conditions)
-     */
-    @Test
-    public void testCase6_11_2() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("EE8080");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. 3 bytes, 1 codepoint (other boundary conditions)
-     */
-    @Test
-    public void testCase6_11_3() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("EFBFBD");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. 4 bytes, 1 codepoint (other boundary conditions)
-     */
-    @Test
-    public void testCase6_11_4() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F48FBFBF");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. 4 bytes (other boundary conditions)
-     */
-    @Test
-    public void testCase6_11_5() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("F4908080");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. 1 byte (unexpected continuation bytes)
-     */
-    @Test
-    public void testCase6_12_1() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("80");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. 1 byte (unexpected continuation bytes)
-     */
-    @Test
-    public void testCase6_12_2() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("BF");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. 2 bytes (unexpected continuation bytes)
-     */
-    @Test
-    public void testCase6_12_3() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("80BF");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. 3 bytes (unexpected continuation bytes)
-     */
-    @Test
-    public void testCase6_12_4() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("80BF80");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. 4 bytes (unexpected continuation bytes)
-     */
-    @Test
-    public void testCase6_12_5() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("80BF80BF");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. 5 bytes (unexpected continuation bytes)
-     */
-    @Test
-    public void testCase6_12_6() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("80BF80BF80");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. 6 bytes (unexpected continuation bytes)
-     */
-    @Test
-    public void testCase6_12_7() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("80BF80BF80BF");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. many bytes (unexpected continuation bytes)
-     */
-    @Test
-    public void testCase6_12_8() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9"
-                + "FA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBE");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. many bytes (lonely start characters)
-     */
-    @Test
-    public void testCase6_13_1() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("C020C120C220C320C420C520C620C720C820C920CA20CB20CC20CD20CE20CF2"
-                + "0D020D120D220D320D420D520D620D720D820D920DA20DB20DC20DD20DE20");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. many bytes (lonely start characters)
-     */
-    @Test
-    public void testCase6_13_2() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("E020E120E220E320E420E520E620E720E820E920EA20EB20EC20ED20EE20");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. many bytes (lonely start characters)
-     */
-    @Test
-    public void testCase6_13_3() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("F020F120F220F320F420F520F620");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. 6 bytes (lonely start characters)
-     */
-    @Test
-    public void testCase6_13_4() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("F820F920FA20");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. 2 bytes (lonely start characters)
-     */
-    @Test
-    public void testCase6_13_5() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("FC20");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (last continuation byte missing)
-     */
-    @Test
-    public void testCase6_14_1() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("C0");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (last continuation byte missing)
-     */
-    @Test
-    public void testCase6_14_10() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("FDBFBFBFBF");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (last continuation byte missing)
-     */
-    @Test
-    public void testCase6_14_2() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("E080");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (last continuation byte missing)
-     */
-    @Test
-    public void testCase6_14_3() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("F08080");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (last continuation byte missing)
-     */
-    @Test
-    public void testCase6_14_4() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("F8808080");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (last continuation byte missing)
-     */
-    @Test
-    public void testCase6_14_5() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("FC80808080");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (last continuation byte missing)
-     */
-    @Test
-    public void testCase6_14_6() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("DF");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (last continuation byte missing)
-     */
-    @Test
-    public void testCase6_14_7() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("EFBF");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (last continuation byte missing)
-     */
-    @Test
-    public void testCase6_14_8() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("F7BFBF");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (last continuation byte missing)
-     */
-    @Test
-    public void testCase6_14_9() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("FBBFBFBF");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (incomplete sequences)
-     */
-    @Test
-    public void testCase6_15_1() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("C0E080F08080F8808080FC80808080DFEFBFF7BFBFFBBFBFBFFDBFBFBFBF");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (impossible bytes)
-     */
-    @Test
-    public void testCase6_16_1() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("FE");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (impossible bytes)
-     */
-    @Test
-    public void testCase6_16_2() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("FF");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (impossible bytes)
-     */
-    @Test
-    public void testCase6_16_3() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("FEFEFFFF");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (overlong ascii character)
-     */
-    @Test
-    public void testCase6_17_1() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("C0AF");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (overlong ascii character)
-     */
-    @Test
-    public void testCase6_17_2() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("E080AF");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (overlong ascii character)
-     */
-    @Test
-    public void testCase6_17_3() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("F08080AF");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (overlong ascii character)
-     */
-    @Test
-    public void testCase6_17_4() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("F8808080AF");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (overlong ascii character)
-     */
-    @Test
-    public void testCase6_17_5() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("FC80808080AF");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (maximum overlong sequences)
-     */
-    @Test
-    public void testCase6_18_1() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("C1BF");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (maximum overlong sequences)
-     */
-    @Test
-    public void testCase6_18_2() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("E09FBF");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (maximum overlong sequences)
-     */
-    @Test
-    public void testCase6_18_3() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("F08FBFBF");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (maximum overlong sequences)
-     */
-    @Test
-    public void testCase6_18_4() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("F887BFBFBF");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (maximum overlong sequences)
-     */
-    @Test
-    public void testCase6_18_5() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("FC83BFBFBFBF");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (overlong representation of the NUL character)
-     */
-    @Test
-    public void testCase6_19_1() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("C080");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (overlong representation of the NUL character)
-     */
-    @Test
-    public void testCase6_19_2() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("E08080");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (overlong representation of the NUL character)
-     */
-    @Test
-    public void testCase6_19_3() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("F0808080");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (overlong representation of the NUL character)
-     */
-    @Test
-    public void testCase6_19_4() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("F880808080");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (overlong representation of the NUL character)
-     */
-    @Test
-    public void testCase6_19_5() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("FC8080808080");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment.
-     */
-    @Test
-    public void testCase6_2_1() throws Exception
-    {
-        String utf8 = "Hello-\uC2B5@\uC39F\uC3A4\uC3BC\uC3A0\uC3A1-UTF-8!!";
-        byte msg[] = StringUtil.getUtf8Bytes(utf8);
-        assertEchoTextMessage(msg);
-    }
-
-    /**
      * valid utf8 text message, 2 fragments (on UTF8 code point boundary)
      */
     @Test
@@ -800,516 +240,6 @@ public class TestABCase6 extends AbstractABCase
     }
 
     /**
-     * invalid utf8 text message, 1 frame/fragment. (single UTF-16 surrogates)
-     */
-    @Test
-    public void testCase6_20_1() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("EDA080");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (single UTF-16 surrogates)
-     */
-    @Test
-    public void testCase6_20_2() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("EDADBF");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (single UTF-16 surrogates)
-     */
-    @Test
-    public void testCase6_20_3() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("EDAE80");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (single UTF-16 surrogates)
-     */
-    @Test
-    public void testCase6_20_4() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("EDAFBF");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (single UTF-16 surrogates)
-     */
-    @Test
-    public void testCase6_20_5() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("EDB080");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (single UTF-16 surrogates)
-     */
-    @Test
-    public void testCase6_20_6() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("EDBE80");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (single UTF-16 surrogates)
-     */
-    @Test
-    public void testCase6_20_7() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("EDBFBF");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (paired UTF-16 surrogates)
-     */
-    @Test
-    public void testCase6_21_1() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("EDA080EDB080");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (paired UTF-16 surrogates)
-     */
-    @Test
-    public void testCase6_21_2() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("EDA080EDBFBF");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (paired UTF-16 surrogates)
-     */
-    @Test
-    public void testCase6_21_3() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("EDADBFEDB080");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (paired UTF-16 surrogates)
-     */
-    @Test
-    public void testCase6_21_4() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("EDADBFEDBFBF");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (paired UTF-16 surrogates)
-     */
-    @Test
-    public void testCase6_21_5() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("EDAE80EDB080");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (paired UTF-16 surrogates)
-     */
-    @Test
-    public void testCase6_21_6() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("EDAE80EDBFBF");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (paired UTF-16 surrogates)
-     */
-    @Test
-    public void testCase6_21_7() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("EDAFBFEDB080");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment. (paired UTF-16 surrogates)
-     */
-    @Test
-    public void testCase6_21_8() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("EDAFBFEDBFBF");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (non character code points)
-     */
-    @Test
-    public void testCase6_22_1() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("EFBFBE");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (non character code points)
-     */
-    @Test
-    public void testCase6_22_10() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F18FBFBF");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (non character code points)
-     */
-    @Test
-    public void testCase6_22_11() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F19FBFBE");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (non character code points)
-     */
-    @Test
-    public void testCase6_22_12() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F19FBFBF");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (non character code points)
-     */
-    @Test
-    public void testCase6_22_13() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F1AFBFBE");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (non character code points)
-     */
-    @Test
-    public void testCase6_22_14() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F1AFBFBF");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (non character code points)
-     */
-    @Test
-    public void testCase6_22_15() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F1BFBFBE");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (non character code points)
-     */
-    @Test
-    public void testCase6_22_16() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F1BFBFBF");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (non character code points)
-     */
-    @Test
-    public void testCase6_22_17() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F28FBFBE");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (non character code points)
-     */
-    @Test
-    public void testCase6_22_18() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F28FBFBF");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (non character code points)
-     */
-    @Test
-    public void testCase6_22_19() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F29FBFBE");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (non character code points)
-     */
-    @Test
-    public void testCase6_22_2() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("EFBFBF");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (non character code points)
-     */
-    @Test
-    public void testCase6_22_20() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F29FBFBF");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (non character code points)
-     */
-    @Test
-    public void testCase6_22_21() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F2AFBFBE");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (non character code points)
-     */
-    @Test
-    public void testCase6_22_22() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F2AFBFBF");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (non character code points)
-     */
-    @Test
-    public void testCase6_22_23() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F2BFBFBE");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (non character code points)
-     */
-    @Test
-    public void testCase6_22_24() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F2BFBFBF");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (non character code points)
-     */
-    @Test
-    public void testCase6_22_25() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F38FBFBE");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (non character code points)
-     */
-    @Test
-    public void testCase6_22_26() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F38FBFBF");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (non character code points)
-     */
-    @Test
-    public void testCase6_22_27() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F39FBFBE");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (non character code points)
-     */
-    @Test
-    public void testCase6_22_28() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F39FBFBF");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (non character code points)
-     */
-    @Test
-    public void testCase6_22_29() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F3AFBFBE");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (non character code points)
-     */
-    @Test
-    public void testCase6_22_3() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F09FBFBE");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (non character code points)
-     */
-    @Test
-    public void testCase6_22_30() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F3AFBFBF");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (non character code points)
-     */
-    @Test
-    public void testCase6_22_31() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F3BFBFBE");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (non character code points)
-     */
-    @Test
-    public void testCase6_22_32() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F3BFBFBF");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (non character code points)
-     */
-    @Test
-    public void testCase6_22_33() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F48FBFBE");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (non character code points)
-     */
-    @Test
-    public void testCase6_22_34() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F48FBFBF");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (non character code points)
-     */
-    @Test
-    public void testCase6_22_4() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F09FBFBF");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (non character code points)
-     */
-    @Test
-    public void testCase6_22_5() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F0AFBFBE");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (non character code points)
-     */
-    @Test
-    public void testCase6_22_6() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F0AFBFBF");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (non character code points)
-     */
-    @Test
-    public void testCase6_22_7() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F0BFBFBE");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (non character code points)
-     */
-    @Test
-    public void testCase6_22_8() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F0BFBFBF");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (non character code points)
-     */
-    @Test
-    public void testCase6_22_9() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F18FBFBE");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment. (unicode replacement character)
-     */
-    @Test
-    public void testCase6_23_1() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("EFBFBD");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragments
-     */
-    @Test
-    public void testCase6_3_1() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("CEBAE1BDB9CF83CEBCCEB5EDA080656469746564");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
      * invalid utf8 text message, many fragments (1 byte each)
      */
     @Test
@@ -1487,222 +417,4 @@ public class TestABCase6 extends AbstractABCase
             fuzzer.close();
         }
     }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment.
-     */
-    @Test
-    public void testCase6_5_1() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("CEBAE1BDB9CF83CEBCCEB5");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * invalid utf8 (incomplete code point) text message, 1 frame/fragment.
-     */
-    @Test
-    public void testCase6_6_1() throws Exception
-    {
-        byte incomplete[] = Hex.asByteArray("CE");
-        assertBadTextPayload(incomplete);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment, 4 valid code points + 1 partial code point
-     */
-    @Test
-    public void testCase6_6_10() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("CEBAE1BDB9CF83CEBCCE");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment, 5 valid code points (preserved on echo).
-     */
-    @Test
-    public void testCase6_6_11() throws Exception
-    {
-        assertEchoTextMessage(Hex.asByteArray("CEBAE1BDB9CF83CEBCCEB5"));
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment, 1 valid code point (preserved on echo).
-     */
-    @Test
-    public void testCase6_6_2() throws Exception
-    {
-        assertEchoTextMessage(Hex.asByteArray("CEBA"));
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment, 1 valid code point + 1 partial code point
-     */
-    @Test
-    public void testCase6_6_3() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("CEBAE1");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment, 1 valid code point + 1 invalid code point
-     */
-    @Test
-    public void testCase6_6_4() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("CEBAE1BD");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment, 2 valid code points (preserved on echo).
-     */
-    @Test
-    public void testCase6_6_5() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("CEBAE1BDB9");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment, 2 valid code points + 1 partial code point
-     */
-    @Test
-    public void testCase6_6_6() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("CEBAE1BDB9CF");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment, 3 valid code points (preserved on echo).
-     */
-    @Test
-    public void testCase6_6_7() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("CEBAE1BDB9CF83");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment, 3 valid code points + 1 partial code point
-     */
-    @Test
-    public void testCase6_6_8() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("CEBAE1BDB9CF83CE");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment, 4 valid code points (preserved on echo).
-     */
-    @Test
-    public void testCase6_6_9() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("CEBAE1BDB9CF83CEBC");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment, 1 byte, 1 codepoint
-     */
-    @Test
-    public void testCase6_7_1() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("00");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment, 2 bytes, 1 codepoint
-     */
-    @Test
-    public void testCase6_7_2() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("C280");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment, 3 bytes, 1 codepoint
-     */
-    @Test
-    public void testCase6_7_3() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("E0A080");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment, 4 bytes, 1 codepoint
-     */
-    @Test
-    public void testCase6_7_4() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F0908080");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment, 5 bytes
-     */
-    @Test
-    public void testCase6_8_1() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("F888808080");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * invalid utf8 text message, 1 frame/fragment, 6 bytes
-     */
-    @Test
-    public void testCase6_8_2() throws Exception
-    {
-        byte invalid[] = Hex.asByteArray("FC8480808080");
-        assertBadTextPayload(invalid);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment, 1 byte, 1 codepoint
-     */
-    @Test
-    public void testCase6_9_1() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("7F");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment, 2 bytes, 1 codepoint
-     */
-    @Test
-    public void testCase6_9_2() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("DFBF");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment, 3 bytes, 1 codepoint
-     */
-    @Test
-    public void testCase6_9_3() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("EFBFBF");
-        assertEchoTextMessage(msg);
-    }
-
-    /**
-     * valid utf8 text message, 1 frame/fragment, 4 bytes, 1 codepoint
-     */
-    @Test
-    public void testCase6_9_4() throws Exception
-    {
-        byte msg[] = Hex.asByteArray("F48FBFBF");
-        assertEchoTextMessage(msg);
-    }
 }