split tests

Author: ldematte

libs/entitlement/qa/entitled-plugin/src/main/java/org/elasticsearch/entitlement/qa/entitled/EntitledActions.java

@@ -12,6 +12,9 @@
 import org.elasticsearch.core.SuppressForbidden;
 
 import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URLConnection;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -57,4 +60,8 @@ public static Path createTempDirectoryForWrite() throws IOException {
     public static Path createTempSymbolicLink() throws IOException {
         return Files.createSymbolicLink(readDir().resolve("entitlements-link-" + random.nextLong()), readWriteDir());
     }
+
+    public static URLConnection createHttpURLConnection() throws IOException {
+        return URI.create("http://127.0.0.1:12345/").toURL().openConnection();
+    }
 }

libs/entitlement/qa/entitlement-test-plugin/src/main/java/org/elasticsearch/entitlement/qa/test/URLConnectionNetworkActions.java

@@ -10,6 +10,7 @@
 package org.elasticsearch.entitlement.qa.test;
 
 import org.elasticsearch.core.CheckedConsumer;
+import org.elasticsearch.entitlement.qa.entitled.EntitledActions;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -64,7 +65,7 @@ public InputStream getInputStream() throws IOException {
     }
 
     private static void withJdkHttpConnection(CheckedConsumer<HttpURLConnection, Exception> connectionConsumer) throws Exception {
-        var conn = URI.create("http://127.0.0.1:12345/").toURL().openConnection();
+        var conn = EntitledActions.createHttpURLConnection();
         // Be sure we got the connection implementation we want
         assert HttpURLConnection.class.isAssignableFrom(conn.getClass());
         try {
@@ -75,62 +76,102 @@ private static void withJdkHttpConnection(CheckedConsumer<HttpURLConnection, Exc
     }
 
     @EntitlementTest(expectedAccess = PLUGINS)
-    static void urlConnectionGetContentLength() throws Exception {
+    static void baseUrlConnectionGetContentLength() throws Exception {
         withPlainNetworkConnection(URLConnection::getContentLength);
+    }
+
+    @EntitlementTest(expectedAccess = PLUGINS)
+    static void sunHttpConnectionGetContentLength() throws Exception {
         withJdkHttpConnection(URLConnection::getContentLength);
     }
 
     @EntitlementTest(expectedAccess = PLUGINS)
-    static void urlConnectionGetContentType() throws Exception {
+    static void baseUrlConnectionGetContentType() throws Exception {
         withPlainNetworkConnection(URLConnection::getContentType);
+    }
+
+    @EntitlementTest(expectedAccess = PLUGINS)
+    static void sunHttpConnectionGetContentType() throws Exception {
         withJdkHttpConnection(URLConnection::getContentType);
     }
 
     @EntitlementTest(expectedAccess = PLUGINS)
-    static void urlConnectionGetContentEncoding() throws Exception {
+    static void baseUrlConnectionGetContentEncoding() throws Exception {
         withPlainNetworkConnection(URLConnection::getContentEncoding);
+    }
+
+    @EntitlementTest(expectedAccess = PLUGINS)
+    static void sunHttpConnectionGetContentEncoding() throws Exception {
         withJdkHttpConnection(URLConnection::getContentEncoding);
     }
 
     @EntitlementTest(expectedAccess = PLUGINS)
-    static void urlConnectionGetExpiration() throws Exception {
+    static void baseUrlConnectionGetExpiration() throws Exception {
         withPlainNetworkConnection(URLConnection::getExpiration);
+    }
+
+    @EntitlementTest(expectedAccess = PLUGINS)
+    static void sunHttpConnectionGetExpiration() throws Exception {
         withJdkHttpConnection(URLConnection::getExpiration);
     }
 
     @EntitlementTest(expectedAccess = PLUGINS)
-    static void urlConnectionGetDate() throws Exception {
+    static void baseUrlConnectionGetDate() throws Exception {
         withPlainNetworkConnection(URLConnection::getDate);
+    }
+
+    @EntitlementTest(expectedAccess = PLUGINS)
+    static void sunHttpConnectionGetDate() throws Exception {
         withJdkHttpConnection(URLConnection::getDate);
     }
 
     @EntitlementTest(expectedAccess = PLUGINS)
-    static void urlConnectionGetLastModified() throws Exception {
+    static void baseUrlConnectionGetLastModified() throws Exception {
         withPlainNetworkConnection(URLConnection::getLastModified);
+    }
+
+    @EntitlementTest(expectedAccess = PLUGINS)
+    static void sunHttpConnectionGetLastModified() throws Exception {
         withJdkHttpConnection(URLConnection::getLastModified);
     }
 
     @EntitlementTest(expectedAccess = PLUGINS)
-    static void urlConnectionGetHeaderFieldInt() throws Exception {
+    static void baseUrlConnectionGetHeaderFieldInt() throws Exception {
         withPlainNetworkConnection(conn -> conn.getHeaderFieldInt("field", 0));
+    }
+
+    @EntitlementTest(expectedAccess = PLUGINS)
+    static void sunHttpConnectionGetHeaderFieldInt() throws Exception {
         withJdkHttpConnection(conn -> conn.getHeaderFieldInt("field", 0));
     }
 
     @EntitlementTest(expectedAccess = PLUGINS)
-    static void urlConnectionGetHeaderFieldLong() throws Exception {
+    static void baseUrlConnectionGetHeaderFieldLong() throws Exception {
         withPlainNetworkConnection(conn -> conn.getHeaderFieldLong("field", 0));
+    }
+
+    @EntitlementTest(expectedAccess = PLUGINS)
+    static void sunHttpConnectionGetHeaderFieldLong() throws Exception {
         withJdkHttpConnection(conn -> conn.getHeaderFieldLong("field", 0));
     }
 
     @EntitlementTest(expectedAccess = PLUGINS)
-    static void urlConnectionGetContent() throws Exception {
+    static void baseUrlConnectionGetContent() throws Exception {
         withPlainNetworkConnection(URLConnection::getContent);
+    }
+
+    @EntitlementTest(expectedAccess = PLUGINS)
+    static void sunHttpConnectionGetContent() throws Exception {
         withJdkHttpConnection(URLConnection::getContent);
     }
 
     @EntitlementTest(expectedAccess = PLUGINS)
-    static void urlConnectionGetContentWithClasses() throws Exception {
+    static void baseUrlConnectionGetContentWithClasses() throws Exception {
         withPlainNetworkConnection(conn -> conn.getContent(new Class<?>[] { String.class }));
+    }
+
+    @EntitlementTest(expectedAccess = PLUGINS)
+    static void sunHttpConnectionGetContentWithClasses() throws Exception {
         withJdkHttpConnection(conn -> conn.getContent(new Class<?>[] { String.class }));
     }
 }