stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6354758: rename old test HttpServer classes

Browse Source 
Reviewed-by: chegar, michaelm, khazra
This commit is contained in:
John Zavgren 2012-09-07 15:30:17 +01:00 committed by Chris Hegarty
parent de965a866a
commit 8fbd047f8c
26 changed files with 98 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jdk/test/java/net/Authenticator/B4678055.java
View File

@ -25,7 +25,7 @@
* @test
* @bug 4678055
* @library ../../../sun/net/www/httptest/
* @build HttpCallback HttpServer ClosedChannelList HttpTransaction
* @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction
* @run main B4678055
* @summary Basic Authentication fails with multiple realms
*/
@ -119,13 +119,13 @@ public class B4678055 implements HttpCallback {
is.close();
}
static HttpServer server;
static TestHttpServer server;
public static void main (String[] args) throws Exception {
MyAuthenticator auth = new MyAuthenticator ();
Authenticator.setDefault (auth);
try {
server = new HttpServer (new B4678055(), 1, 10, 0);
server = new TestHttpServer (new B4678055(), 1, 10, 0);
System.out.println ("Server: listening on port: " + server.getLocalPort());
client ("http://localhost:"+server.getLocalPort()+"/d1/foo.html");
client ("http://localhost:"+server.getLocalPort()+"/d2/foo.html");

6
jdk/test/java/net/Authenticator/B4722333.java
View File

@ -25,7 +25,7 @@
* @test
* @bug 4722333
* @library ../../../sun/net/www/httptest/
* @build HttpCallback HttpServer ClosedChannelList HttpTransaction
* @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction
* @run main B4722333
* @summary JRE Proxy Authentication Not Working with ISA2000
*/
@ -114,13 +114,13 @@ public class B4722333 implements HttpCallback {
is.close();
}
static HttpServer server;
static TestHttpServer server;
public static void main (String[] args) throws Exception {
MyAuthenticator auth = new MyAuthenticator ();
Authenticator.setDefault (auth);
try {
server = new HttpServer (new B4722333(), 1, 10, 0);
server = new TestHttpServer (new B4722333(), 1, 10, 0);
System.out.println ("Server started: listening on port: " + server.getLocalPort());
client ("http://localhost:"+server.getLocalPort()+"/d1/d2/d3/foo.html");
client ("http://localhost:"+server.getLocalPort()+"/ASD/d3/x.html");

6
jdk/test/java/net/Authenticator/B4759514.java
View File

@ -25,7 +25,7 @@
* @test
* @bug 4759514
* @library ../../../sun/net/www/httptest/
* @build HttpCallback HttpServer ClosedChannelList HttpTransaction
* @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction
* @run main B4759514
* @summary Digest Authentication is erroniously quoting the nc value, contrary to RFC 2617
*/
@ -91,13 +91,13 @@ public class B4759514 implements HttpCallback {
is.close();
}
static HttpServer server;
static TestHttpServer server;
public static void main (String[] args) throws Exception {
MyAuthenticator auth = new MyAuthenticator ();
Authenticator.setDefault (auth);
try {
server = new HttpServer (new B4759514(), 1, 10, 0);
server = new TestHttpServer (new B4759514(), 1, 10, 0);
System.out.println ("Server: listening on port: " + server.getLocalPort());
client ("http://localhost:"+server.getLocalPort()+"/d1/foo.html");
} catch (Exception e) {

32
jdk/test/java/net/Authenticator/B4769350.java
View File

@ -25,7 +25,7 @@
* @test
* @bug 4769350
* @library ../../../sun/net/www/httptest/
* @build HttpCallback HttpServer ClosedChannelList HttpTransaction AbstractCallback
* @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction AbstractCallback
* @run main/othervm B4769350 server
* @run main/othervm B4769350 proxy
* @summary proxy authentication username and password caching only works in serial case
@ -142,10 +142,10 @@ public class B4769350 {
switch (count) {
case 0:
errorReply (req, "Basic realm=\"realm1\"");
HttpServer.rendezvous ("one", 2);
TestHttpServer.rendezvous ("one", 2);
break;
case 1:
HttpServer.waitForCondition ("cond2");
TestHttpServer.waitForCondition ("cond2");
okReply (req);
break;
default:
@ -158,11 +158,11 @@ public class B4769350 {
switch (count) {
case 0:
errorReply (req, "Basic realm=\"realm2\"");
HttpServer.rendezvous ("one", 2);
HttpServer.setCondition ("cond1");
TestHttpServer.rendezvous ("one", 2);
TestHttpServer.setCondition ("cond1");
break;
case 1:
HttpServer.waitForCondition ("cond2");
TestHttpServer.waitForCondition ("cond2");
okReply (req);
break;
default:
@ -174,7 +174,7 @@ public class B4769350 {
switch (count) {
case 0:
errorReply (req, "Basic realm=\"realm1\"");
HttpServer.rendezvous ("two", 2);
TestHttpServer.rendezvous ("two", 2);
break;
case 1:
okReply (req);
@ -188,8 +188,8 @@ public class B4769350 {
switch (count) {
case 0:
errorReply (req, "Basic realm=\"realm2\"");
HttpServer.rendezvous ("two", 2);
HttpServer.setCondition ("cond2");
TestHttpServer.rendezvous ("two", 2);
TestHttpServer.setCondition ("cond2");
break;
case 1:
okReply (req);
@ -207,7 +207,7 @@ public class B4769350 {
void doT2a (HttpTransaction req, int count) throws IOException {
/* This will be called several times */
if (count == 1) {
HttpServer.setCondition ("T2cond1");
TestHttpServer.setCondition ("T2cond1");
}
errorReply (req, "Basic realm=\"realm3\"");
}
@ -233,7 +233,7 @@ public class B4769350 {
switch (count) {
case 0:
proxyReply (req, "Basic realm=\"proxy\"");
HttpServer.setCondition ("T3cond1");
TestHttpServer.setCondition ("T3cond1");
break;
case 1:
errorReply (req, "Basic realm=\"realm4\"");
@ -260,7 +260,7 @@ public class B4769350 {
}
};
static HttpServer server;
static TestHttpServer server;
static MyAuthenticator auth = new MyAuthenticator ();
static int redirects = 4;
@ -276,7 +276,7 @@ public class B4769350 {
c4 = new Client (authority, "/test/realm2/t1d", false);
c1.start(); c2.start();
HttpServer.waitForCondition ("cond1");
TestHttpServer.waitForCondition ("cond1");
c3.start(); c4.start();
c1.join(); c2.join(); c3.join(); c4.join();
@ -294,7 +294,7 @@ public class B4769350 {
c5 = new Client (authority, "/test/realm3/t2a", true);
c6 = new Client (authority, "/test/realm3/t2b", false);
c5.start ();
HttpServer.waitForCondition ("T2cond1");
TestHttpServer.waitForCondition ("T2cond1");
c6.start ();
c5.join(); c6.join();
@ -313,7 +313,7 @@ public class B4769350 {
c8 = new Client (authority, "/test/realm4/t3b", false);
c9 = new Client (authority, "/test/realm4/t3c", false);
c7.start ();
HttpServer.waitForCondition ("T3cond1");
TestHttpServer.waitForCondition ("T3cond1");
c8.start ();
c9.start ();
c7.join(); c8.join(); c9.join();
@ -333,7 +333,7 @@ public class B4769350 {
Authenticator.setDefault (auth);
boolean proxy = args[0].equals ("proxy");
try {
server = new HttpServer (new CallBack(), 10, 1, 0);
server = new TestHttpServer (new CallBack(), 10, 1, 0);
System.out.println ("Server: listening on port: " + server.getLocalPort());
if (proxy) {
System.setProperty ("http.proxyHost", "localhost");

6
jdk/test/java/net/Authenticator/B4921848.java
View File

@ -25,7 +25,7 @@
* @test
* @bug 4921848
* @library ../../../sun/net/www/httptest/
* @build HttpCallback HttpServer ClosedChannelList HttpTransaction
* @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction
* @run main/othervm -Dhttp.auth.preference=basic B4921848
* @summary Allow user control over authentication schemes
*/
@ -82,13 +82,13 @@ public class B4921848 implements HttpCallback {
is.close();
}
static HttpServer server;
static TestHttpServer server;
public static void main (String[] args) throws Exception {
MyAuthenticator auth = new MyAuthenticator ();
Authenticator.setDefault (auth);
try {
server = new HttpServer (new B4921848(), 1, 10, 0);
server = new TestHttpServer (new B4921848(), 1, 10, 0);
System.out.println ("Server started: listening on port: " + server.getLocalPort());
client ("http://localhost:"+server.getLocalPort()+"/d1/d2/d3/foo.html");
} catch (Exception e) {

6
jdk/test/java/net/Authenticator/B4933582.java
View File

@ -119,7 +119,7 @@ public class B4933582 implements HttpCallback {
is.close();
}
static HttpServer server;
static TestHttpServer server;
public static void main (String[] args) throws Exception {
firstTime = args[0].equals ("first");
@ -128,11 +128,11 @@ public class B4933582 implements HttpCallback {
CacheImpl cache;
try {
if (firstTime) {
server = new HttpServer (new B4933582(), 1, 10, 0);
server = new TestHttpServer (new B4933582(), 1, 10, 0);
cache = new CacheImpl (server.getLocalPort());
} else {
cache = new CacheImpl ();
server = new HttpServer(new B4933582(), 1, 10, cache.getPort());
server = new TestHttpServer(new B4933582(), 1, 10, cache.getPort());
}
AuthCacheValue.setAuthCache (cache);
System.out.println ("Server: listening on port: " + server.getLocalPort());

6
jdk/test/java/net/Authenticator/B4962064.java
View File

@ -25,7 +25,7 @@
* @test
* @bug 4962064
* @library ../../../sun/net/www/httptest/
* @build HttpCallback HttpServer ClosedChannelList HttpTransaction
* @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction
* @run main/othervm B4962064
* @summary Extend Authenticator to provide access to request URI and server/proxy
*/
@ -85,12 +85,12 @@ public class B4962064 implements HttpCallback {
is.close();
}
static HttpServer server;
static TestHttpServer server;
static URL urlsave;
public static void main (String[] args) throws Exception {
try {
server = new HttpServer (new B4962064(), 1, 10, 0);
server = new TestHttpServer (new B4962064(), 1, 10, 0);
int port = server.getLocalPort();
System.setProperty ("http.proxyHost", "localhost");
System.setProperty ("http.proxyPort", Integer.toString (port));

6
jdk/test/java/net/CookieHandler/CookieManagerTest.java
View File

@ -26,7 +26,7 @@
* @summary Unit test for java.net.CookieManager
* @bug 6244040
* @library ../../../sun/net/www/httptest/
* @build HttpCallback HttpServer ClosedChannelList HttpTransaction
* @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction
* @run main/othervm -ea CookieManagerTest
* @author Edward Wang
*/
@ -38,7 +38,7 @@ import sun.net.www.MessageHeader;
public class CookieManagerTest {
static CookieHttpTransaction httpTrans;
static HttpServer server;
static TestHttpServer server;
public static void main(String[] args) throws Exception {
startHttpServer();
@ -52,7 +52,7 @@ public class CookieManagerTest {
public static void startHttpServer() {
try {
httpTrans = new CookieHttpTransaction();
server = new HttpServer(httpTrans, 1, 1, 0);
server = new TestHttpServer(httpTrans, 1, 1, 0);
} catch (IOException e) {
e.printStackTrace();
}

6
jdk/test/java/net/ProxySelector/LoopbackAddresses.java
View File

@ -25,7 +25,7 @@
* @bug 4924226
* @summary PIT: Can no launch jnlp application via 127.0.0.1 address on the web server
* @library ../../../sun/net/www/httptest/
* @build ClosedChannelList HttpServer HttpTransaction HttpCallback
* @build ClosedChannelList TestHttpServer HttpTransaction HttpCallback
* @compile LoopbackAddresses.java
* @run main/othervm LoopbackAddresses
*/
@ -39,7 +39,7 @@ import java.io.*;
*/
public class LoopbackAddresses implements HttpCallback {
static HttpServer server;
static TestHttpServer server;
public void request (HttpTransaction req) {
req.setResponseEntityBody ("Hello .");
@ -52,7 +52,7 @@ public class LoopbackAddresses implements HttpCallback {
public static void main(String[] args) {
try {
server = new HttpServer (new LoopbackAddresses(), 1, 10, 0);
server = new TestHttpServer (new LoopbackAddresses(), 1, 10, 0);
ProxyServer pserver = new ProxyServer(InetAddress.getByName("localhost"), server.getLocalPort());
// start proxy server
new Thread(pserver).start();

6
jdk/test/java/net/ProxySelector/ProxyTest.java
View File

@ -26,7 +26,7 @@
* @bug 4696512
* @summary HTTP client: Improve proxy server configuration and selection
* @library ../../../sun/net/www/httptest/
* @build ClosedChannelList HttpServer HttpTransaction HttpCallback
* @build ClosedChannelList TestHttpServer HttpTransaction HttpCallback
* @compile ProxyTest.java
* @run main/othervm -Dhttp.proxyHost=inexistant -Dhttp.proxyPort=8080 ProxyTest
*/
@ -36,7 +36,7 @@ import java.io.*;
import java.util.ArrayList;
public class ProxyTest implements HttpCallback {
static HttpServer server;
static TestHttpServer server;
public ProxyTest() {
}
@ -74,7 +74,7 @@ public class ProxyTest implements HttpCallback {
throw new RuntimeException("Default ProxySelector is null");
ProxySelector.setDefault(new MyProxySelector());
try {
server = new HttpServer (new ProxyTest(), 1, 10, 0);
server = new TestHttpServer (new ProxyTest(), 1, 10, 0);
URL url = new URL("http://localhost:"+server.getLocalPort());
System.out.println ("client opening connection to: " + url);
HttpURLConnection urlc = (HttpURLConnection)url.openConnection ();

6
jdk/test/java/net/URL/PerConnectionProxy.java
View File

@ -25,7 +25,7 @@
* @bug 4920526
* @summary Needs per connection proxy support for URLs
* @library ../../../sun/net/www/httptest/
* @build ClosedChannelList HttpServer HttpTransaction HttpCallback
* @build ClosedChannelList TestHttpServer HttpTransaction HttpCallback
* @compile PerConnectionProxy.java
* @run main/othervm -Dhttp.proxyHost=inexistant -Dhttp.proxyPort=8080 PerConnectionProxy
*/
@ -35,7 +35,7 @@ import java.io.*;
import sun.net.www.*;
public class PerConnectionProxy implements HttpCallback {
static HttpServer server;
static TestHttpServer server;
public void request (HttpTransaction req) {
req.setResponseEntityBody ("Hello .");
@ -48,7 +48,7 @@ public class PerConnectionProxy implements HttpCallback {
public static void main(String[] args) {
try {
server = new HttpServer (new PerConnectionProxy(), 1, 10, 0);
server = new TestHttpServer (new PerConnectionProxy(), 1, 10, 0);
ProxyServer pserver = new ProxyServer(InetAddress.getByName("localhost"), server.getLocalPort());
// start proxy server
new Thread(pserver).start();

6
jdk/test/java/net/URLConnection/B5052093.java
View File

@ -25,7 +25,7 @@
* @test
* @bug 5052093
* @library ../../../sun/net/www/httptest/
* @build HttpCallback HttpServer ClosedChannelList HttpTransaction
* @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction
* @run main B5052093
* @summary URLConnection doesn't support large files
*/
@ -34,7 +34,7 @@ import java.io.*;
import sun.net.www.protocol.file.FileURLConnection;
public class B5052093 implements HttpCallback {
private static HttpServer server;
private static TestHttpServer server;
private static long testSize = ((long) (Integer.MAX_VALUE)) + 2;
public static class LargeFile extends File {
@ -63,7 +63,7 @@ public class B5052093 implements HttpCallback {
}
public static void main(String[] args) throws Exception {
server = new HttpServer(new B5052093(), 1, 10, 0);
server = new TestHttpServer(new B5052093(), 1, 10, 0);
try {
URL url = new URL("http://localhost:"+server.getLocalPort()+"/foo");
URLConnection conn = url.openConnection();

6
jdk/test/sun/net/www/AuthHeaderTest.java
View File

@ -25,7 +25,7 @@
* @test
* @bug 4804309
* @library ../../../sun/net/www/httptest/
* @build HttpCallback HttpServer ClosedChannelList HttpTransaction
* @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction
* @run main AuthHeaderTest
* @summary AuthHeaderTest bug
*/
@ -90,13 +90,13 @@ public class AuthHeaderTest implements HttpCallback {
is.close();
}
static HttpServer server;
static TestHttpServer server;
public static void main (String[] args) throws Exception {
MyAuthenticator auth = new MyAuthenticator ();
Authenticator.setDefault (auth);
try {
server = new HttpServer (new AuthHeaderTest(), 1, 10, 0);
server = new TestHttpServer (new AuthHeaderTest(), 1, 10, 0);
System.out.println ("Server: listening on port: " + server.getLocalPort());
client ("http://localhost:"+server.getLocalPort()+"/d1/foo.html");
} catch (Exception e) {

2
jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedEncodingWithProgressMonitorTest.java
View File

@ -24,8 +24,6 @@
/**
* @test
* @bug 4333920 4994372
* @library ../../../../../sun/net/www/httptest/
* @build HttpCallback HttpServer ClosedChannelList HttpTransaction
* @run main ChunkedEncodingWithProgressMonitorTest
* @summary ChunkedEncoding unit test; MeteredStream/ProgressData problem
*/

6
jdk/test/sun/net/www/http/KeepAliveCache/B5045306.java
View File

@ -25,7 +25,7 @@
* @test
* @bug 5045306 6356004 6993490
* @library ../../httptest/
* @build HttpCallback HttpServer HttpTransaction
* @build HttpCallback TestHttpServer HttpTransaction
* @run main/othervm B5045306
* @summary Http keep-alive implementation is not efficient
*/
@ -50,7 +50,7 @@ import java.lang.management.*;
public class B5045306
{
static SimpleHttpTransaction httpTrans;
static HttpServer server;
static TestHttpServer server;
public static void main(String[] args) throws Exception {
startHttpServer();
@ -60,7 +60,7 @@ public class B5045306
public static void startHttpServer() {
try {
httpTrans = new SimpleHttpTransaction();
server = new HttpServer(httpTrans, 1, 10, 0);
server = new TestHttpServer(httpTrans, 1, 10, 0);
} catch (IOException e) {
e.printStackTrace();
}

8
jdk/test/sun/net/www/httptest/HttpTransaction.java
View File

@ -37,7 +37,7 @@ public class HttpTransaction {
String command;
URI requesturi;
HttpServer.Server server;
TestHttpServer.Server server;
MessageHeader reqheaders, reqtrailers;
String reqbody;
byte[] rspbody;
@ -46,7 +46,7 @@ public class HttpTransaction {
int rspbodylen;
boolean rspchunked;
HttpTransaction (HttpServer.Server server, String command,
HttpTransaction (TestHttpServer.Server server, String command,
URI requesturi, MessageHeader headers,
String body, MessageHeader trailers, SelectionKey key) {
this.command = command;
@ -290,7 +290,7 @@ public class HttpTransaction {
* @param rTag the response string to send with the response code
*/
public void sendResponse (int rCode, String rTag) throws IOException {
OutputStream os = new HttpServer.NioOutputStream(channel());
OutputStream os = new TestHttpServer.NioOutputStream(channel());
PrintStream ps = new PrintStream (os);
ps.print ("HTTP/1.1 " + rCode + " " + rTag + "\r\n");
if (rspheaders != null) {
@ -314,7 +314,7 @@ public class HttpTransaction {
/* sends one byte less than intended */
public void sendPartialResponse (int rCode, String rTag)throws IOException {
OutputStream os = new HttpServer.NioOutputStream(channel());
OutputStream os = new TestHttpServer.NioOutputStream(channel());
PrintStream ps = new PrintStream (os);
ps.print ("HTTP/1.1 " + rCode + " " + rTag + "\r\n");
ps.flush();

14
jdk/test/sun/net/www/httptest/HttpServer.java → jdk/test/sun/net/www/httptest/TestHttpServer.java
View File

@ -48,7 +48,7 @@ import java.util.*;
* NOTE NOTE NOTE NOTE NOTE NOTE NOTE
*/
public class HttpServer {
public class TestHttpServer {
ServerSocketChannel schan;
int threads;
@ -57,19 +57,19 @@ public class HttpServer {
Server[] servers;
/**
* Create a <code>HttpServer<code> instance with the specified callback object
* Create a <code>TestHttpServer<code> instance with the specified callback object
* for handling requests. One thread is created to handle requests,
* and up to ten TCP connections will be handled simultaneously.
* @param cb the callback object which is invoked to handle each
* incoming request
*/
public HttpServer (HttpCallback cb) throws IOException {
public TestHttpServer (HttpCallback cb) throws IOException {
this (cb, 1, 10, 0);
}
/**
* Create a <code>HttpServer<code> instance with the specified number of
* Create a <code>TestHttpServer<code> instance with the specified number of
* threads and maximum number of connections per thread. This functions
* the same as the 4 arg constructor, where the port argument is set to zero.
* @param cb the callback object which is invoked to handle each
@ -80,13 +80,13 @@ public class HttpServer {
* handle per thread
*/
public HttpServer (HttpCallback cb, int threads, int cperthread)
public TestHttpServer (HttpCallback cb, int threads, int cperthread)
throws IOException {
this (cb, threads, cperthread, 0);
}
/**
* Create a <code>HttpServer<code> instance with the specified number
* Create a <code>TestHttpServer<code> instance with the specified number
* of threads and maximum number of connections per thread and running on
* the specified port. The specified number of threads are created to
* handle incoming requests, and each thread is allowed
@ -101,7 +101,7 @@ public class HttpServer {
* means choose any free port.
*/
public HttpServer (HttpCallback cb, int threads, int cperthread, int port)
public TestHttpServer (HttpCallback cb, int threads, int cperthread, int port)
throws IOException {
schan = ServerSocketChannel.open ();
InetSocketAddress addr = new InetSocketAddress (port);

6
jdk/test/sun/net/www/protocol/http/B6296310.java
View File

@ -25,7 +25,7 @@
* @test
* @bug 6296310
* @library ../../httptest/
* @build HttpCallback HttpServer HttpTransaction
* @build HttpCallback TestHttpServer HttpTransaction
* @run main/othervm B6296310
* @summary REGRESSION: AppletClassLoader.getResourceAsStream() behaviour is wrong in some cases
*/
@ -42,7 +42,7 @@ import java.util.*;
public class B6296310
{
static SimpleHttpTransaction httpTrans;
static HttpServer server;
static TestHttpServer server;
public static void main(String[] args)
{
@ -55,7 +55,7 @@ public class B6296310
public static void startHttpServer() {
try {
httpTrans = new SimpleHttpTransaction();
server = new HttpServer(httpTrans, 1, 10, 0);
server = new TestHttpServer(httpTrans, 1, 10, 0);
} catch (IOException e) {
e.printStackTrace();
}

6
jdk/test/sun/net/www/protocol/http/B6299712.java
View File

@ -25,7 +25,7 @@
* @test
* @bug 6299712
* @library ../../httptest/
* @build HttpCallback HttpServer ClosedChannelList HttpTransaction
* @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction
* @run main/othervm B6299712
* @summary NullPointerException in sun.net.www.protocol.http.HttpURLConnection.followRedirect
*/
@ -49,7 +49,7 @@ import java.util.*;
*/
public class B6299712 {
static SimpleHttpTransaction httpTrans;
static HttpServer server;
static TestHttpServer server;
public static void main(String[] args) throws Exception {
ResponseCache.setDefault(new DeployCacheHandler());
@ -61,7 +61,7 @@ public class B6299712 {
public static void startHttpServer() {
try {
httpTrans = new SimpleHttpTransaction();
server = new HttpServer(httpTrans, 1, 10, 0);
server = new TestHttpServer(httpTrans, 1, 10, 0);
} catch (IOException e) {
e.printStackTrace();
}

6
jdk/test/sun/net/www/protocol/http/RelativeRedirect.java
View File

@ -25,7 +25,7 @@
* @test
* @bug 4726087
* @library ../../httptest/
* @build HttpCallback HttpServer ClosedChannelList HttpTransaction
* @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction
* @run main RelativeRedirect
* @summary URLConnection cannot handle redirects
*/
@ -35,7 +35,7 @@ import java.net.*;
public class RelativeRedirect implements HttpCallback {
static int count = 0;
static HttpServer server;
static TestHttpServer server;
static class MyAuthenticator extends Authenticator {
public MyAuthenticator () {
@ -89,7 +89,7 @@ public class RelativeRedirect implements HttpCallback {
MyAuthenticator auth = new MyAuthenticator ();
Authenticator.setDefault (auth);
try {
server = new HttpServer (new RelativeRedirect(), 1, 10, 0);
server = new TestHttpServer (new RelativeRedirect(), 1, 10, 0);
System.out.println ("Server: listening on port: " + server.getLocalPort());
URL url = new URL("http://localhost:"+server.getLocalPort());
System.out.println ("client opening connection to: " + url);

6
jdk/test/sun/net/www/protocol/http/ResponseCacheStream.java
View File

@ -25,7 +25,7 @@
* @test
* @bug 6262486
* @library ../../httptest/
* @build HttpCallback HttpServer ClosedChannelList HttpTransaction
* @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction
* @run main/othervm -Dhttp.keepAlive=false ResponseCacheStream
* @summary COMPATIBILITY: jagex_com - Monkey Puzzle applet fails to load
*/
@ -91,13 +91,13 @@ public class ResponseCacheStream implements HttpCallback {
}
}
static HttpServer server;
static TestHttpServer server;
public static void main(String[] args) throws Exception {
MyResponseCache cache = new MyResponseCache();
try {
ResponseCache.setDefault(cache);
server = new HttpServer (new ResponseCacheStream());
server = new TestHttpServer (new ResponseCacheStream());
System.out.println ("Server: listening on port: " + server.getLocalPort());
URL url = new URL ("http://127.0.0.1:"+server.getLocalPort()+"/");
System.out.println ("Client: connecting to " + url);

6
jdk/test/sun/net/www/protocol/http/SetChunkedStreamingMode.java
View File

@ -25,7 +25,7 @@
* @test
* @bug 5049976
* @library ../../httptest/
* @build HttpCallback HttpServer ClosedChannelList HttpTransaction
@build HttpCallback TestHttpServer ClosedChannelList HttpTransaction
* @run main SetChunkedStreamingMode
* @summary Unspecified NPE is thrown when streaming output mode is enabled
*/
@ -60,11 +60,11 @@ public class SetChunkedStreamingMode implements HttpCallback {
System.out.println ("finished reading");
}
static HttpServer server;
static TestHttpServer server;
public static void main (String[] args) throws Exception {
try {
server = new HttpServer (new SetChunkedStreamingMode(), 1, 10, 0);
server = new TestHttpServer (new SetChunkedStreamingMode(), 1, 10, 0);
System.out.println ("Server: listening on port: " + server.getLocalPort());
URL url = new URL ("http://127.0.0.1:"+server.getLocalPort()+"/");
System.out.println ("Client: connecting to " + url);

5
jdk/test/sun/security/ssl/sun/net/www/http/ChunkedOutputStream/Test.java
View File

@ -25,6 +25,7 @@
* @test
* @bug 5026745
* @library ../../httpstest/
* @build TestHttpsServer HttpCallback
* @run main/othervm Test
*
* SunJSSE does not support dynamic system properties, no way to re-use
@ -275,7 +276,7 @@ public class Test implements HttpCallback {
}
}
static HttpServer server;
static TestHttpsServer server;
public static void main (String[] args) throws Exception {
// setup properties to do ssl
@ -296,7 +297,7 @@ public class Test implements HttpCallback {
HttpsURLConnection.setDefaultHostnameVerifier(new NameVerifier());
try {
server = new HttpServer (new Test(), 1, 10, 0);
server = new TestHttpsServer (new Test(), 1, 10, 0);
System.out.println ("Server started: listening on port: " + server.getLocalPort());
// the test server doesn't support keep-alive yet
// test1("http://localhost:"+server.getLocalPort()+"/d0");

8
jdk/test/sun/security/ssl/sun/net/www/httpstest/HttpTransaction.java
View File

@ -37,7 +37,7 @@ public class HttpTransaction {
String command;
URI requesturi;
HttpServer.ServerWorker server;
TestHttpsServer.ServerWorker server;
MessageHeader reqheaders, reqtrailers;
String reqbody;
byte[] rspbody;
@ -46,7 +46,7 @@ public class HttpTransaction {
int rspbodylen;
boolean rspchunked;
HttpTransaction (HttpServer.ServerWorker server, String command,
HttpTransaction (TestHttpsServer.ServerWorker server, String command,
URI requesturi, MessageHeader headers,
String body, MessageHeader trailers, SocketChannel ch) {
this.command = command;
@ -290,7 +290,7 @@ public class HttpTransaction {
* @param rTag the response string to send with the response code
*/
public void sendResponse (int rCode, String rTag) throws IOException {
OutputStream os = new HttpServer.NioOutputStream(channel(), server.getSSLEngine(), server.outNetBB(), server.outAppBB());
OutputStream os = new TestHttpsServer.NioOutputStream(channel(), server.getSSLEngine(), server.outNetBB(), server.outAppBB());
PrintStream ps = new PrintStream (os);
ps.print ("HTTP/1.1 " + rCode + " " + rTag + "\r\n");
if (rspheaders != null) {
@ -314,7 +314,7 @@ public class HttpTransaction {
/* sends one byte less than intended */
public void sendPartialResponse (int rCode, String rTag)throws IOException {
OutputStream os = new HttpServer.NioOutputStream(channel(), server.getSSLEngine(), server.outNetBB(), server.outAppBB());
OutputStream os = new TestHttpsServer.NioOutputStream(channel(), server.getSSLEngine(), server.outNetBB(), server.outAppBB());
PrintStream ps = new PrintStream (os);
ps.print ("HTTP/1.1 " + rCode + " " + rTag + "\r\n");
ps.flush();

14
jdk/test/sun/security/ssl/sun/net/www/httpstest/HttpServer.java → jdk/test/sun/security/ssl/sun/net/www/httpstest/TestHttpsServer.java
View File

@ -51,7 +51,7 @@ import java.security.*;
* NOTE NOTE NOTE NOTE NOTE NOTE NOTE
*/
public class HttpServer {
public class TestHttpsServer {
ServerSocketChannel schan;
int threads;
@ -63,19 +63,19 @@ public class HttpServer {
static SSLContext sslCtx;
/**
* Create a <code>HttpServer<code> instance with the specified callback object
* Create a <code>TestHttpsServer<code> instance with the specified callback object
* for handling requests. One thread is created to handle requests,
* and up to ten TCP connections will be handled simultaneously.
* @param cb the callback object which is invoked to handle each
* incoming request
*/
public HttpServer (HttpCallback cb) throws IOException {
public TestHttpsServer (HttpCallback cb) throws IOException {
this (cb, 1, 10, 0);
}
/**
* Create a <code>HttpServer<code> instance with the specified number of
* Create a <code>TestHttpsServer<code> instance with the specified number of
* threads and maximum number of connections per thread. This functions
* the same as the 4 arg constructor, where the port argument is set to zero.
* @param cb the callback object which is invoked to handle each
@ -86,13 +86,13 @@ public class HttpServer {
* handle per thread
*/
public HttpServer (HttpCallback cb, int threads, int cperthread)
public TestHttpsServer (HttpCallback cb, int threads, int cperthread)
throws IOException {
this (cb, threads, cperthread, 0);
}
/**
* Create a <code>HttpServer<code> instance with the specified number
* Create a <code>TestHttpsServer<code> instance with the specified number
* of threads and maximum number of connections per thread and running on
* the specified port. The specified number of threads are created to
* handle incoming requests, and each thread is allowed
@ -107,7 +107,7 @@ public class HttpServer {
* means choose any free port.
*/
public HttpServer (HttpCallback cb, int threads, int cperthread, int port)
public TestHttpsServer (HttpCallback cb, int threads, int cperthread, int port)
throws IOException {
schan = ServerSocketChannel.open ();
InetSocketAddress addr = new InetSocketAddress (port);

6
jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/B6216082.java
View File

@ -25,7 +25,7 @@
* @test
* @bug 6216082
* @library ../../../httpstest/
* @build HttpCallback HttpServer ClosedChannelList HttpTransaction TunnelProxy
* @build HttpCallback TestHttpsServer ClosedChannelList HttpTransaction TunnelProxy
* @summary Redirect problem with HttpsURLConnection using a proxy
* SunJSSE does not support dynamic system properties, no way to re-use
* system properties in samevm/agentvm mode.
@ -39,7 +39,7 @@ import java.util.*;
public class B6216082 {
static SimpleHttpTransaction httpTrans;
static HttpServer server;
static TestHttpsServer server;
static TunnelProxy proxy;
// it seems there's no proxy ever if a url points to 'localhost',
@ -133,7 +133,7 @@ public class B6216082 {
// Both the https server and the proxy let the
// system pick up an ephemeral port.
httpTrans = new SimpleHttpTransaction();
server = new HttpServer(httpTrans, 1, 10, 0);
server = new TestHttpsServer(httpTrans, 1, 10, 0);
proxy = new TunnelProxy(1, 10, 0);
}