8343074: test/jdk/com/sun/net/httpserver/docs/test1/largefile.txt could be generated

test/jdk/com/sun/net/httpserver/SelCacheTest.java

@@ -25,8 +25,7 @@
  * @test
  * @bug 6270015
  * @library /test/lib
- * @build jdk.test.lib.Asserts
- *        jdk.test.lib.Utils
+ * @build jdk.test.lib.Utils
  *        jdk.test.lib.net.SimpleSSLContext
  *        jdk.test.lib.net.URIBuilder
  * @run main/othervm -Dsun.net.httpserver.selCacheTimeout=2 SelCacheTest
@@ -74,6 +73,8 @@ public static void main(String[] args) throws Exception {
                 throw new RuntimeException("should not be httpsserver");
             }
             s2 = HttpsServer.create(addr, 0);
+            // Assert that both files share the same parent and can be served from the same `FileServerHandler`
+            assert smallFilePath.getParent().equals(largeFilePath.getParent());
             HttpHandler h = new FileServerHandler(smallFilePath.getParent().toString());
             HttpContext c1 = s1.createContext("/", h);
             HttpContext c2 = s2.createContext("/", h);

test/jdk/com/sun/net/httpserver/Test1.java

@@ -25,8 +25,7 @@
  * @test
  * @bug 6270015
  * @library /test/lib
- * @build jdk.test.lib.Asserts
- *        jdk.test.lib.Utils
+ * @build jdk.test.lib.Utils
  *        jdk.test.lib.net.SimpleSSLContext
  *        jdk.test.lib.net.URIBuilder
  * @run main/othervm Test1
@@ -84,6 +83,8 @@ public static void main (String[] args) throws Exception {
                 throw new RuntimeException ("should not be httpsserver");
             }
             s2 = HttpsServer.create (addr, 0);
+            // Assert that both files share the same parent and can be served from the same `FileServerHandler`
+            assert smallFilePath.getParent().equals(largeFilePath.getParent());
             HttpHandler h = new FileServerHandler (smallFilePath.getParent().toString());
             HttpContext c1 = s1.createContext ("/", h);
             HttpContext c2 = s2.createContext ("/", h);

test/jdk/com/sun/net/httpserver/Test12.java

@@ -25,8 +25,7 @@
  * @test
  * @bug 6270015
  * @library /test/lib
- * @build jdk.test.lib.Asserts
- *        jdk.test.lib.Utils
+ * @build jdk.test.lib.Utils
  *        jdk.test.lib.net.SimpleSSLContext
  *        jdk.test.lib.net.URIBuilder
  * @run main/othervm Test12
@@ -73,6 +72,8 @@ public static void main (String[] args) throws Exception {
             InetSocketAddress addr = new InetSocketAddress(loopback, 0);
             s1 = HttpServer.create (addr, 0);
             s2 = HttpsServer.create (addr, 0);
+            // Assert that both files share the same parent and can be served from the same `FileServerHandler`
+            assert smallFilePath.getParent().equals(largeFilePath.getParent());
             HttpHandler h = new FileServerHandler(smallFilePath.getParent().toString());
             HttpContext c1 = s1.createContext ("/", h);
             HttpContext c2 = s2.createContext ("/", h);

test/jdk/com/sun/net/httpserver/Test13.java

@@ -25,8 +25,7 @@
  * @test
  * @bug 6270015
  * @library /test/lib
- * @build jdk.test.lib.Asserts
- *        jdk.test.lib.Utils
+ * @build jdk.test.lib.Utils
  *        jdk.test.lib.net.SimpleSSLContext
  *        jdk.test.lib.net.URIBuilder
  * @run main/othervm Test13

test/jdk/com/sun/net/httpserver/Test9.java

@@ -25,8 +25,7 @@
  * @test
  * @bug 6270015
  * @library /test/lib
- * @build jdk.test.lib.Asserts
- *        jdk.test.lib.Utils
+ * @build jdk.test.lib.Utils
  *        jdk.test.lib.net.SimpleSSLContext
  *        jdk.test.lib.net.URIBuilder
  * @run main/othervm Test9
@@ -70,6 +69,8 @@ public static void main (String[] args) throws Exception {
             InetSocketAddress addr = new InetSocketAddress(loopback, 0);
             s1 = HttpServer.create (addr, 0);
             s2 = HttpsServer.create (addr, 0);
+            // Assert that both files share the same parent and can be served from the same `FileServerHandler`
+            assert smallFilePath.getParent().equals(largeFilePath.getParent());
             HttpHandler h = new FileServerHandler (smallFilePath.getParent().toString());
             HttpContext c1 = s1.createContext ("/", h);
             HttpContext c2 = s2.createContext ("/", h);

test/jdk/com/sun/net/httpserver/Test9a.java

@@ -25,8 +25,7 @@
  * @test
  * @bug 6270015
  * @library /test/lib
- * @build jdk.test.lib.Asserts
- *        jdk.test.lib.Utils
+ * @build jdk.test.lib.Utils
  *        jdk.test.lib.net.SimpleSSLContext
  *        jdk.test.lib.net.URIBuilder
  * @run main/othervm Test9a
@@ -69,6 +68,8 @@ public static void main (String[] args) throws Exception {
             InetAddress loopback = InetAddress.getLoopbackAddress();
             InetSocketAddress addr = new InetSocketAddress(loopback, 0);
             server = HttpsServer.create (addr, 0);
+            // Assert that both files share the same parent and can be served from the same `FileServerHandler`
+            assert smallFilePath.getParent().equals(largeFilePath.getParent());
             HttpHandler h = new FileServerHandler (smallFilePath.getParent().toString());
             HttpContext c1 = server.createContext ("/", h);
             executor = Executors.newCachedThreadPool();

test/jdk/java/net/httpclient/http2/BasicTest.java

@@ -29,7 +29,6 @@
  * @build jdk.httpclient.test.lib.http2.Http2TestServer
  *        jdk.httpclient.test.lib.http2.Http2TestExchange
  *        jdk.httpclient.test.lib.http2.Http2EchoHandler
- *        jdk.test.lib.Asserts
  *        jdk.test.lib.Utils
  *        jdk.test.lib.net.SimpleSSLContext
  * @run testng/othervm -Djdk.httpclient.HttpClient.log=ssl,requests,responses,errors BasicTest