modulerized tests for apache connectors and grizzly

Signed-off-by: jansupol <jan.supol@oracle.com>
jansupol · Jan 26, 2024 · b4b0134 · b4b0134
1 parent 782f077
commit b4b0134
Show file tree

Hide file tree

Showing 58 changed files with 310 additions and 126 deletions.
diff --git a/connectors/apache-connector/src/test/java/module-info.java b/connectors/apache-connector/src/test/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -14,28 +14,31 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-module org.glassfish.jersey.apache.connector {
+module org.glassfish.jersey.apache.connector.test {
  requires java.logging;
 
  requires jakarta.inject;
  requires jakarta.ws.rs;
 
- requires org.apache.httpcomponents.httpcore;
  requires org.apache.httpcomponents.httpclient;
 
- requires org.glassfish.hk2.locator;
-
  requires org.glassfish.jersey.core.common;
  requires org.glassfish.jersey.core.client;
  requires org.glassfish.jersey.core.server;
 
+ requires org.glassfish.jersey.apache.connector;
  requires org.glassfish.jersey.tests.framework.core;
  requires org.glassfish.jersey.tests.framework.provider.grizzly;
 
  requires org.junit.jupiter.api;
  requires org.junit.jupiter.engine;
  requires org.junit.platform.commons;
-
- exports org.glassfish.jersey.apache.connector;
- opens org.glassfish.jersey.apache.connector;
+ requires org.hamcrest;
+
+ exports org.glassfish.jersey.apache.connector.test to
+ org.junit.platform.commons,
+ org.glassfish.jersey.core.server;
+ opens org.glassfish.jersey.apache.connector.test to
+ org.glassfish.hk2.locator,
+ org.glassfish.hk2.utilities;
 }
diff --git a/...sh/jersey/apache/connector/AsyncTest.java → ...rsey/apache/connector/test/AsyncTest.java b/...sh/jersey/apache/connector/AsyncTest.java → ...rsey/apache/connector/test/AsyncTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.jersey.apache.connector;
+package org.glassfish.jersey.apache.connector.test;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
@@ -34,6 +34,7 @@
 import jakarta.ws.rs.core.Application;
 import jakarta.ws.rs.core.Response;
 
+import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.logging.LoggingFeature;
 import org.glassfish.jersey.server.ResourceConfig;

diff --git a/...ish/jersey/apache/connector/AuthTest.java → ...ersey/apache/connector/test/AuthTest.java b/...ish/jersey/apache/connector/AuthTest.java → ...ersey/apache/connector/test/AuthTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.jersey.apache.connector;
+package org.glassfish.jersey.apache.connector.test;
 
 import jakarta.ws.rs.DELETE;
 import jakarta.ws.rs.GET;
@@ -34,6 +34,9 @@
 import jakarta.inject.Singleton;
 
 import org.apache.http.impl.client.HttpClientBuilder;
+import org.glassfish.jersey.apache.connector.ApacheClientProperties;
+import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
+import org.glassfish.jersey.apache.connector.ApacheHttpClientBuilderConfigurator;
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
 import org.glassfish.jersey.client.authentication.ResponseAuthenticationException;

diff --git a/...h/jersey/apache/connector/CookieTest.java → ...sey/apache/connector/test/CookieTest.java b/...h/jersey/apache/connector/CookieTest.java → ...sey/apache/connector/test/CookieTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.jersey.apache.connector;
+package org.glassfish.jersey.apache.connector.test;
 
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
@@ -28,13 +28,20 @@
 import jakarta.ws.rs.core.NewCookie;
 import jakarta.ws.rs.core.Response;
 
+import org.apache.http.client.CookieStore;
+import org.glassfish.jersey.apache.connector.ApacheClientProperties;
+import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.client.JerseyClient;
 import org.glassfish.jersey.client.JerseyClientBuilder;
+import org.glassfish.jersey.client.spi.Connector;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
 
 import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.Method;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -85,11 +92,11 @@ public void testDisabledCookies() {
  assertEquals("NO-COOKIE", r.request().get(String.class));
  assertEquals("NO-COOKIE", r.request().get(String.class));
 
- final ApacheConnector connector = (ApacheConnector) client.getConfiguration().getConnector();
- if (connector.getCookieStore() != null) {
- assertTrue(connector.getCookieStore().getCookies().isEmpty());
+ final CookieStore cookieStore = cookieStore(client);
+ if (cookieStore != null) {
+ assertTrue(cookieStore.getCookies().isEmpty());
  } else {
- assertNull(connector.getCookieStore());
+ assertNull(cookieStore);
  }
  }
 
@@ -103,9 +110,21 @@ public void testCookies() {
  assertEquals("NO-COOKIE", r.request().get(String.class));
  assertEquals("value", r.request().get(String.class));
 
- final ApacheConnector connector = (ApacheConnector) client.getConfiguration().getConnector();
- assertNotNull(connector.getCookieStore().getCookies());
- assertEquals(1, connector.getCookieStore().getCookies().size());
- assertEquals("value", connector.getCookieStore().getCookies().get(0).getValue());
+ final CookieStore cookieStore = cookieStore(client);
+ assertNotNull(cookieStore.getCookies());
+ assertEquals(1, cookieStore.getCookies().size());
+ assertEquals("value", cookieStore.getCookies().get(0).getValue());
+ }
+
+ private static CookieStore cookieStore(JerseyClient client) {
+ Connector connector = client.getConfiguration().getConnector();
+ Method method = null;
+ try {
+ method = connector.getClass().getDeclaredMethod("getCookieStore");
+ method.setAccessible(true);
+ return (CookieStore) method.invoke(connector);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
  }
 }
diff --git a/...apache/connector/CustomLoggingFilter.java → ...e/connector/test/CustomLoggingFilter.java b/...apache/connector/CustomLoggingFilter.java → ...e/connector/test/CustomLoggingFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.jersey.apache.connector;
+package org.glassfish.jersey.apache.connector.test;
 
 import java.io.IOException;
 

diff --git a/...connector/DisableContentEncodingTest.java → ...ctor/test/DisableContentEncodingTest.java b/...connector/DisableContentEncodingTest.java → ...ctor/test/DisableContentEncodingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.jersey.apache.connector;
+package org.glassfish.jersey.apache.connector.test;
 
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.HeaderParam;
@@ -24,6 +24,8 @@
 import jakarta.ws.rs.client.WebTarget;
 import jakarta.ws.rs.core.Application;
 
+import org.glassfish.jersey.apache.connector.ApacheClientProperties;
+import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.message.GZipEncoder;
 import org.glassfish.jersey.server.ResourceConfig;

diff --git a/...apache/connector/FollowRedirectsTest.java → ...e/connector/test/FollowRedirectsTest.java b/...apache/connector/FollowRedirectsTest.java → ...e/connector/test/FollowRedirectsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.jersey.apache.connector;
+package org.glassfish.jersey.apache.connector.test;
 
 import java.io.IOException;
 import java.util.logging.Logger;
@@ -29,6 +29,7 @@
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.UriBuilder;
 
+import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.client.ClientProperties;
 import org.glassfish.jersey.client.ClientResponse;

diff --git a/...he/connector/GZIPContentEncodingTest.java → ...nnector/test/GZIPContentEncodingTest.java b/...he/connector/GZIPContentEncodingTest.java → ...nnector/test/GZIPContentEncodingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.jersey.apache.connector;
+package org.glassfish.jersey.apache.connector.test;
 
 import java.util.Arrays;
 
@@ -28,6 +28,7 @@
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 
+import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.client.ClientProperties;
 import org.glassfish.jersey.message.GZipEncoder;

diff --git a/...rsey/apache/connector/HelloWorldTest.java → ...apache/connector/test/HelloWorldTest.java b/...rsey/apache/connector/HelloWorldTest.java → ...apache/connector/test/HelloWorldTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.jersey.apache.connector;
+package org.glassfish.jersey.apache.connector.test;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -41,6 +41,8 @@
 
 import javax.net.ssl.SSLSession;
 
+import org.glassfish.jersey.apache.connector.ApacheClientProperties;
+import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.logging.LoggingFeature;
 import org.glassfish.jersey.server.ResourceConfig;

diff --git a/...rsey/apache/connector/HttpEntityTest.java → ...apache/connector/test/HttpEntityTest.java b/...rsey/apache/connector/HttpEntityTest.java → ...apache/connector/test/HttpEntityTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -14,10 +14,11 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.jersey.apache.connector;
+package org.glassfish.jersey.apache.connector.test;
 
 import org.apache.http.entity.ByteArrayEntity;
 import org.apache.http.entity.InputStreamEntity;
+import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.logging.LoggingFeature;
 import org.glassfish.jersey.server.ResourceConfig;

diff --git a/...sey/apache/connector/HttpHeadersTest.java → ...pache/connector/test/HttpHeadersTest.java b/...sey/apache/connector/HttpHeadersTest.java → ...pache/connector/test/HttpHeadersTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.jersey.apache.connector;
+package org.glassfish.jersey.apache.connector.test;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -36,6 +36,7 @@
 import jakarta.ws.rs.ext.MessageBodyWriter;
 import jakarta.ws.rs.ext.Provider;
 
+import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.client.ClientProperties;
 import org.glassfish.jersey.logging.LoggingFeature;

diff --git a/...rsey/apache/connector/HttpMethodTest.java → ...apache/connector/test/HttpMethodTest.java b/...rsey/apache/connector/HttpMethodTest.java → ...apache/connector/test/HttpMethodTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.jersey.apache.connector;
+package org.glassfish.jersey.apache.connector.test;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -35,6 +35,8 @@
 import jakarta.ws.rs.core.Application;
 import jakarta.ws.rs.core.Response;
 
+import org.glassfish.jersey.apache.connector.ApacheClientProperties;
+import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.client.ClientProperties;
 import org.glassfish.jersey.server.ResourceConfig;

diff --git a/...ector/HttpMethodWithClientFilterTest.java → .../test/HttpMethodWithClientFilterTest.java b/...ector/HttpMethodWithClientFilterTest.java → .../test/HttpMethodWithClientFilterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -14,11 +14,12 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.jersey.apache.connector;
+package org.glassfish.jersey.apache.connector.test;
 
 import jakarta.ws.rs.client.Client;
 import jakarta.ws.rs.client.ClientBuilder;
 
+import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.logging.LoggingFeature;