8166791: Fix module dependencies for networking component tests

Reviewed-by: chegar, alanb
This commit is contained in:
Sergei Kovalev 2016-10-03 18:33:34 +03:00
parent 4dbca869e0
commit bf41569209
6 changed files with 68 additions and 15 deletions

View File

@ -28,6 +28,7 @@
* @library /lib/testlibrary
* @build jdk.testlibrary.SimpleSSLContext
* @modules java.httpclient
* java.security.jgss
* @compile/module=java.httpclient java/net/http/BodyOutputStream.java
* @compile/module=java.httpclient java/net/http/BodyInputStream.java
* @compile/module=java.httpclient java/net/http/EchoHandler.java
@ -41,18 +42,21 @@
* @summary check exception thrown when bad TLS parameters selected
*/
import java.io.*;
import java.net.*;
import java.net.http.*;
import static java.net.http.HttpClient.Version.HTTP_2;
import javax.net.ssl.*;
import java.nio.file.*;
import java.util.concurrent.*;
import java.io.IOException;
import java.net.URI;
import java.net.http.EchoHandler;
import java.net.http.HttpClient;
import java.net.http.Http2TestServer;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.util.concurrent.ExecutorService;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLParameters;
import jdk.testlibrary.SimpleSSLContext;
import org.testng.annotations.Test;
import org.testng.annotations.Parameters;
import static java.net.http.HttpClient.Version.HTTP_2;
/**
* When selecting an unacceptable cipher suite the TLS handshake will fail.

View File

@ -33,7 +33,6 @@
* @run testng/othervm java.httpclient/sun.net.httpclient.hpack.CircularBufferTest
* @run testng/othervm java.httpclient/sun.net.httpclient.hpack.DecoderTest
* @run testng/othervm java.httpclient/sun.net.httpclient.hpack.EncoderTest
* @run testng/othervm java.httpclient/sun.net.httpclient.hpack.HeaderTableTest
* @run testng/othervm java.httpclient/sun.net.httpclient.hpack.HuffmanTest
* @run testng/othervm java.httpclient/sun.net.httpclient.hpack.TestHelper
*/

View File

@ -0,0 +1,35 @@
/*
* Copyright (c) 2016, 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
* @bug 8153353
* @modules java.httpclient/sun.net.httpclient.hpack
* jdk.localedata
* @key randomness
* @compile/module=java.httpclient sun/net/httpclient/hpack/SpecHelper.java
* @compile/module=java.httpclient sun/net/httpclient/hpack/TestHelper.java
* @compile/module=java.httpclient sun/net/httpclient/hpack/BuffersTestingKit.java
* @run testng/othervm java.httpclient/sun.net.httpclient.hpack.HeaderTableTest
*/
public class HpackDriverHeaderTable { }

View File

@ -23,10 +23,12 @@
* questions.
*/
/**
/*
* @test
* @bug 8087112
* @library /lib/testlibrary/
* @modules java.httpclient
* jdk.httpserver
* @build jdk.testlibrary.SimpleSSLContext jdk.testlibrary.Utils
* @compile ../../../../com/sun/net/httpserver/LogFilter.java
* @compile ../../../../com/sun/net/httpserver/FileServerHandler.java
@ -43,11 +45,14 @@
* The tests are in Security.java and port number supplied in -Dport.number
* and -Dport.number1 for tests that require a second free port
*/
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import java.io.*;
import java.net.*;
import jdk.testlibrary.OutputAnalyzer;
import jdk.testlibrary.Utils;

View File

@ -21,11 +21,19 @@
* questions.
*/
import java.io.*;
import java.io.File;
import java.io.FileWriter;
import java.io.Reader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.SequenceInputStream;
import java.io.StringWriter;
import java.io.Writer;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@ -46,6 +54,7 @@ import static java.util.Arrays.asList;
* @test
* @bug 8064924
* @modules java.compiler
* jdk.compiler
* @summary Basic test for URLStreamHandlerProvider
* @library /lib/testlibrary
* @build jdk.testlibrary.FileUtils jdk.testlibrary.JDKToolFinder

View File

@ -27,6 +27,7 @@
* @summary Test that URL connections to multi-release jars can be runtime versioned
* @library /lib/testlibrary/java/util/jar
* @modules java.compiler
* jdk.compiler
* jdk.httpserver
* jdk.jartool
* @build Compiler JarBuilder CreateMultiReleaseTestJars SimpleHttpServer