SOLR-18067: Migrate tests from EmbeddedSolrServerTestBase to EmbeddedSolrServerTestRule #4041
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
There was a problem hiding this comment.
Pull request overview
This PR migrates test classes from the deprecated EmbeddedSolrServerTestBase base class to the modern EmbeddedSolrServerTestRule test rule pattern, modernizing the test infrastructure.
Changes:
- Removed the deprecated
EmbeddedSolrServerTestBaseclass - Migrated 8 test classes to use
EmbeddedSolrServerTestRulewith@ClassRule - Updated all references from
getSolrClient()tosolrTestRule.getSolrClient()
Reviewed changes
Copilot reviewed 9 out of 9 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
solr/test-framework/src/java/org/apache/solr/EmbeddedSolrServerTestBase.java |
Removed deprecated base class |
solr/solrj/src/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.java |
Migrated to use EmbeddedSolrServerTestRule |
solr/solrj/src/test/org/apache/solr/client/solrj/response/TermsResponseTest.java |
Migrated to use EmbeddedSolrServerTestRule |
solr/solrj/src/test/org/apache/solr/client/solrj/request/json/DirectJsonQueryRequestFacetingEmbeddedTest.java |
Migrated to use EmbeddedSolrServerTestRule |
solr/solrj/src/test/org/apache/solr/client/solrj/request/SolrPingTest.java |
Migrated to use EmbeddedSolrServerTestRule |
solr/solrj/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java |
Migrated to use EmbeddedSolrServerTestRule |
solr/solrj/src/test/org/apache/solr/client/solrj/GetByIdTest.java |
Migrated to use EmbeddedSolrServerTestRule |
solr/core/src/test/org/apache/solr/update/processor/AbstractAtomicUpdatesMultivalueTestBase.java |
Migrated to use EmbeddedSolrServerTestRule |
solr/core/src/test/org/apache/solr/update/RootFieldTest.java |
Migrated to use EmbeddedSolrServerTestRule |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
dsmiley
reviewed
Jan 10, 2026
| import org.junit.ClassRule; | ||
|
|
||
| @Deprecated // simply use EmbeddedSolrServerTestRule | ||
| public abstract class EmbeddedSolrServerTestBase extends SolrTestCase { |
Contributor
There was a problem hiding this comment.
Notice this extends SolrTestCase. I definitely like that; STC is the futre, not STCJ4. Thus the tests you changed should subclass STC, not STCJ4.
| @Before | ||
| public void before() throws SolrServerException, IOException { | ||
| getSolrClient().deleteByQuery("*:*"); | ||
| solrTestRule.getSolrClient().deleteByQuery("*:*"); |
Contributor
There was a problem hiding this comment.
I kinda wonder if STR.client() should exist to shorten our calls a bit more since everyone will want a client from STR; that's it's primary purpose in life.
Still have the STCj4 as an import due to various methods called there.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://issues.apache.org/jira/browse/SOLR-18067
Description
Migrate to modern test infrastructure.
Solution
Asked Claude using same prompt as I used for the SolrJettyTestRule, however this went much faster/much simpler.
Now I get a bit why we like embedded ;-)
Tests
Re-ran the tests.