diff -r 5178e4b58b17 -r 41fa3e6f2785 test/jdk/java/net/httpclient/websocket/Support.java --- a/test/jdk/java/net/httpclient/websocket/Support.java Mon Jan 28 09:56:00 2019 +0100 +++ b/test/jdk/java/net/httpclient/websocket/Support.java Mon Jan 28 13:51:16 2019 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, 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 @@ -79,16 +79,32 @@ } public static DummyWebSocketServer serverWithCannedData(int... data) { + return serverWithCannedDataAndAuthentication(null, null, data); + } + + public static DummyWebSocketServer serverWithCannedDataAndAuthentication( + String username, + String password, + int... data) + { byte[] copy = new byte[data.length]; for (int i = 0; i < data.length; i++) { copy[i] = (byte) data[i]; } - return serverWithCannedData(copy); + return serverWithCannedDataAndAuthentication(username, password, copy); } public static DummyWebSocketServer serverWithCannedData(byte... data) { + return serverWithCannedDataAndAuthentication(null, null, data); + } + + public static DummyWebSocketServer serverWithCannedDataAndAuthentication( + String username, + String password, + byte... data) + { byte[] copy = Arrays.copyOf(data, data.length); - return new DummyWebSocketServer() { + return new DummyWebSocketServer(username, password) { @Override protected void write(SocketChannel ch) throws IOException { int off = 0; int n = 1; // 1 byte at a time