This is an automated email from the ASF dual-hosted git repository.
dsmiley pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 73487d5ccd1 Tests: move ServletFixtures to a util package (#3896)
73487d5ccd1 is described below
commit 73487d5ccd17a112690ec96e73d23ce9eeebfe71
Author: David Smiley <[email protected]>
AuthorDate: Thu Nov 27 20:40:08 2025 -0500
Tests: move ServletFixtures to a util package (#3896)
-- of the test framework, avoiding split-package of where it's at now
---
.../apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java | 8 ++++----
.../solr/client/solrj/impl/Http2SolrClientCompatibilityTest.java | 2 +-
.../org/apache/solr/client/solrj/impl/Http2SolrClientTest.java | 3 ++-
.../org/apache/solr/client/solrj/impl/HttpJdkSolrClientTest.java | 2 +-
.../org/apache/solr/client/solrj/impl/HttpSolrClientTestBase.java | 8 ++++----
.../apache/solr/{client/solrj/impl => util}/ServletFixtures.java | 2 +-
6 files changed, 13 insertions(+), 12 deletions(-)
diff --git
a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java
b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java
index ef372e93e50..1542eb6e45f 100644
---
a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java
+++
b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java
@@ -55,10 +55,6 @@ import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.apache.HttpClientUtil;
import org.apache.solr.client.solrj.apache.HttpSolrClient;
import org.apache.solr.client.solrj.apache.SolrPortAwareCookieSpecFactory;
-import org.apache.solr.client.solrj.impl.ServletFixtures.DebugServlet;
-import org.apache.solr.client.solrj.impl.ServletFixtures.RedirectServlet;
-import org.apache.solr.client.solrj.impl.ServletFixtures.SlowServlet;
-import org.apache.solr.client.solrj.impl.ServletFixtures.SlowStreamServlet;
import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.client.solrj.request.UpdateRequest;
import org.apache.solr.client.solrj.response.QueryResponse;
@@ -69,6 +65,10 @@ import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.embedded.JettyConfig;
+import org.apache.solr.util.ServletFixtures.DebugServlet;
+import org.apache.solr.util.ServletFixtures.RedirectServlet;
+import org.apache.solr.util.ServletFixtures.SlowServlet;
+import org.apache.solr.util.ServletFixtures.SlowStreamServlet;
import org.eclipse.jetty.ee10.servlet.ServletHolder;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git
a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientCompatibilityTest.java
b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientCompatibilityTest.java
index e58a016f9b6..fbc3cb394cf 100644
---
a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientCompatibilityTest.java
+++
b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientCompatibilityTest.java
@@ -23,9 +23,9 @@ import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.impl.ServletFixtures.DebugServlet;
import org.apache.solr.embedded.JettyConfig;
import org.apache.solr.util.LogLevel;
+import org.apache.solr.util.ServletFixtures.DebugServlet;
import org.eclipse.jetty.client.transport.HttpClientTransportOverHTTP;
import org.eclipse.jetty.ee10.servlet.ServletHolder;
import org.eclipse.jetty.http2.client.transport.HttpClientTransportOverHTTP2;
diff --git
a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java
b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java
index a56f1bab1b0..d95ef9dfbfa 100644
---
a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java
+++
b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java
@@ -35,7 +35,6 @@ import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.impl.ServletFixtures.DebugServlet;
import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.client.solrj.request.SolrPing;
import org.apache.solr.common.SolrException;
@@ -44,6 +43,8 @@ import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
+import org.apache.solr.util.ServletFixtures;
+import org.apache.solr.util.ServletFixtures.DebugServlet;
import org.eclipse.jetty.client.WWWAuthenticationProtocolHandler;
import org.eclipse.jetty.http.HttpStatus;
import org.eclipse.jetty.util.ssl.SslContextFactory;
diff --git
a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpJdkSolrClientTest.java
b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpJdkSolrClientTest.java
index b29be52e5f2..875c5f39031 100644
---
a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpJdkSolrClientTest.java
+++
b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpJdkSolrClientTest.java
@@ -37,12 +37,12 @@ import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.impl.ServletFixtures.DebugServlet;
import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.client.solrj.response.SolrPingResponse;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.util.ExecutorUtil;
+import org.apache.solr.util.ServletFixtures.DebugServlet;
import org.junit.After;
import org.junit.Test;
diff --git
a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientTestBase.java
b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientTestBase.java
index 6a870b2b58e..b4432d56612 100644
---
a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientTestBase.java
+++
b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientTestBase.java
@@ -42,10 +42,6 @@ import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.apache.HttpClientUtil;
-import org.apache.solr.client.solrj.impl.ServletFixtures.DebugServlet;
-import org.apache.solr.client.solrj.impl.ServletFixtures.RedirectServlet;
-import org.apache.solr.client.solrj.impl.ServletFixtures.SlowServlet;
-import org.apache.solr.client.solrj.impl.ServletFixtures.SlowStreamServlet;
import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.client.solrj.request.UpdateRequest;
import org.apache.solr.client.solrj.response.QueryResponse;
@@ -56,6 +52,10 @@ import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.embedded.JettyConfig;
+import org.apache.solr.util.ServletFixtures.DebugServlet;
+import org.apache.solr.util.ServletFixtures.RedirectServlet;
+import org.apache.solr.util.ServletFixtures.SlowServlet;
+import org.apache.solr.util.ServletFixtures.SlowStreamServlet;
import org.eclipse.jetty.ee10.servlet.ServletHolder;
import org.junit.BeforeClass;
diff --git
a/solr/test-framework/src/java/org/apache/solr/client/solrj/impl/ServletFixtures.java
b/solr/test-framework/src/java/org/apache/solr/util/ServletFixtures.java
similarity index 99%
rename from
solr/test-framework/src/java/org/apache/solr/client/solrj/impl/ServletFixtures.java
rename to solr/test-framework/src/java/org/apache/solr/util/ServletFixtures.java
index c093cd673ca..3405f34b6a2 100644
---
a/solr/test-framework/src/java/org/apache/solr/client/solrj/impl/ServletFixtures.java
+++ b/solr/test-framework/src/java/org/apache/solr/util/ServletFixtures.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.solr.client.solrj.impl;
+package org.apache.solr.util;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.Cookie;
