--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/net/httpclient/websocket/PendingPongTextClose.java	Tue Mar 20 10:19:00 2018 +0000
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @build DummyWebSocketServer
+ * @run testng/othervm
+ *      -Djdk.internal.httpclient.websocket.debug=true
+ *       PendingPongTextClose
+ */
+
+import org.testng.annotations.Test;
+
+import java.net.http.WebSocket;
+import java.nio.ByteBuffer;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import static java.net.http.HttpClient.newHttpClient;
+
+public class PendingPongTextClose extends PendingOperations {
+
+    @Test(dataProvider = "booleans")
+    public void pendingPongTextClose(boolean last) throws Exception {
+        server = Support.notReadingServer();
+        server.open();
+        webSocket = newHttpClient().newWebSocketBuilder()
+                .buildAsync(server.getURI(), new WebSocket.Listener() { })
+                .join();
+        ByteBuffer data = ByteBuffer.allocate(125);
+        CompletableFuture<WebSocket> cfPong;
+        for (int i = 0; ; i++) {  // fill up the send buffer
+            long start = System.currentTimeMillis();
+            System.out.printf("begin cycle #%s at %s%n", i, start);
+            cfPong = webSocket.sendPong(data);
+            try {
+                cfPong.get(5, TimeUnit.SECONDS);
+                data.clear();
+            } catch (TimeoutException e) {
+                break;
+            } finally {
+                long stop = System.currentTimeMillis();
+                System.out.printf("end cycle #%s at %s (%s ms)%n", i, stop, stop - start);
+            }
+        }
+        assertFails(ISE, webSocket.sendPing(ByteBuffer.allocate(125)));
+        assertFails(ISE, webSocket.sendPong(ByteBuffer.allocate(125)));
+        CompletableFuture<WebSocket> cfText = webSocket.sendText("hello", last);
+        assertHangs(cfText);
+        CompletableFuture<WebSocket> cfClose
+                = webSocket.sendClose(WebSocket.NORMAL_CLOSURE, "ok");
+        assertHangs(cfClose);
+        webSocket.abort();
+        assertFails(IOE, cfPong);
+        assertFails(IOE, cfText);
+        assertFails(IOE, cfClose);
+    }
+}