jdk-sandbox: comparison test/jdk/java/net/httpclient/MockServer.java

equal deleted inserted replaced

-:f7fd051519ac
+:ee6f7a61f3a5
 /*
-* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2015, 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.
 *
 * 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.
 */
+import com.sun.net.httpserver.HttpServer;
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import javax.net.ServerSocketFactory;
 import javax.net.ssl.SSLServerSocket;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Iterator;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
+import static java.nio.charset.StandardCharsets.ISO_8859_1;
 /**
 * A cut-down Http/1 Server for testing various error situations
 *
 * use interrupt() to halt
 // (external) clients that might be lurking
 // on the test machine instead of answering
 // to the test client.
 final String root;
-// waits up to 20 seconds for something to happen
+// waits up to 2000 seconds for something to happen
 // dont use this unless certain activity coming.
 public Connection activity() {
 for (int i = 0; i < 80 * 100; i++) {
 doRemovalsAndAdditions();
 for (Connection c : sockets) {
 int n = is.read(buf);
 if (n == -1) {
 cleanup();
 return;
 }
-String s0 = new String(buf, 0, n, StandardCharsets.ISO_8859_1);
+String s0 = new String(buf, 0, n, ISO_8859_1);
 s = s + s0;
 int i;
 while ((i=s.indexOf(CRLF)) != -1) {
 String s1 = s.substring(0, i+2);
 System.out.println("Server got: " + s1.substring(0,i));
 {
 String r1 = "HTTP/1.1 " + Integer.toString(code) + " status" + CRLF;
 for (int i=0; i<headers.length; i+=2) {
 r1 += headers[i] + ": " + headers[i+1] + CRLF;
 }
-int clen = body == null ? 0 : body.length();
+int clen = body == null ? 0 : body.getBytes(ISO_8859_1).length;
 r1 += "Content-Length: " + Integer.toString(clen) + CRLF;
 r1 += CRLF;
 if (body != null) {
 r1 += body;
 }
 // content-length is 10 bytes too many
 public void sendIncompleteHttpResponseBody(int code) throws IOException {
 String body = "Hello World Helloworld Goodbye World";
 String r1 = "HTTP/1.1 " + Integer.toString(code) + " status" + CRLF;
-int clen = body.length() + 10;
+int clen = body.getBytes(ISO_8859_1).length + 10;
 r1 += "Content-Length: " + Integer.toString(clen) + CRLF;
 r1 += CRLF;
 if (body != null) {
 r1 += body;
 }
 String r1 = "HTTP/1.1 " + Integer.toString(code) + " status" + CRLF;
 send(r1);
 }
 public void send(String r) throws IOException {
-os.write(r.getBytes(StandardCharsets.ISO_8859_1));
+try {
+os.write(r.getBytes(ISO_8859_1));
+} catch (IOException x) {
+IOException suppressed =
+new IOException("MockServer["
++ ss.getLocalPort()
++"] Failed while writing bytes: "
++  x.getMessage());
+x.addSuppressed(suppressed);
+System.err.println("WARNING: " + suppressed);
+throw x;
+}
 }
 public synchronized void close() {
 cleanup();
 closed = true;
 }
 }
 }
 MockServer(int port, ServerSocketFactory factory, String root) throws IOException {
-ss = factory.createServerSocket(port);
+ss = factory.createServerSocket();
+ss.setReuseAddress(false);
+ss.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
 this.root = root; // if specified, any request which don't have this value
 // in their statusLine will be rejected.
 sockets = Collections.synchronizedList(new LinkedList<>());
 removals = new LinkedList<>();
 additions = new LinkedList<>();
 int port() {
 return ss.getLocalPort();
 }
+String serverAuthority() {
+return InetAddress.getLoopbackAddress().getHostName() + ":" + port();
+}
 public String getURL() {
 if (ss instanceof SSLServerSocket) {
-return "https://127.0.0.1:" + port() + "/foo/";
+return "https://" + serverAuthority() + "/foo/";
 } else {
-return "http://127.0.0.1:" + port() + "/foo/";
+return "http://" + serverAuthority() + "/foo/";
 }
 }
 private volatile boolean closed;

changeset 49765	ee6f7a61f3a5
parent 48083	b1c1b4ef4be2
child 50768	68fa3d4026ea
child 56451	9585061fdb04