Skip to content

ci: add Testcontainers Docker checks and fix ATR release workflow #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adityamparikh wants to merge 8 commits into
base: main
Choose a base branch
from
Open

ci: add Testcontainers Docker checks and fix ATR release workflow #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ae8be74
chore: fix spotless checks to work with java 25
adityamparikh Dec 16, 2025
23b0168
test: disable tests requiring testcontainers when docker is not avail…
adityamparikh Dec 16, 2025
edc3981
Merge branch 'apache:main' into main
adityamparikh Dec 16, 2025
b9a84c6
docs: clarify ASF-compliant release process; fix nightly image naming…
adityamparikh Nov 9, 2025
29df187
docs: enhance GitHub workflows with detailed comments for release man…
adityamparikh Nov 9, 2025
e9b4663
feat: Create atr-release.yml for Apache Trusted Releases
adityamparikh Nov 13, 2025
e65f1df
fix(quality): resolve SonarQube violations
adityamparikh Mar 9, 2026
fc0d7f3
merge: sync with upstream/main (observability + docs)
adityamparikh Mar 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/workflows/atr-release-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,17 +220,18 @@ jobs:
echo "Total size: $(du -sh build/distributions | cut -f1)"

- name: Upload artifacts to ATR (Real)
if: ${{ !inputs.dry_run }}
if: ${{ !inputs.dry_run && secrets.ASF_USERNAME != '' }}
uses: apache/tooling-actions/upload-to-atr@main
with:
asf-uid: ${{ secrets.ASF_USERNAME }}
project: ${{ env.ATR_PROJECT_NAME }}
version: ${{ inputs.release_version }}-${{ inputs.release_candidate }}
src: build/distributions
atr-host: release-test.apache.org
ssh-port: 2222

- name: Upload artifacts for review
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # 6.0.0
uses: actions/upload-artifact@v3
with:
name: test-release-artifacts-${{ inputs.release_version }}-${{ inputs.release_candidate }}
path: build/distributions/
Expand Down Expand Up @@ -342,7 +343,7 @@ jobs:
echo "----------------------------------------"

- name: Resolve vote and announce on ATR (Real)
if: ${{ !inputs.dry_run }}
if: ${{ !inputs.dry_run && secrets.ASF_USERNAME != '' }}
uses: apache/tooling-actions/release-on-atr@main
with:
version: ${{ inputs.release_version }}
Expand All @@ -362,6 +363,7 @@ jobs:
echo "✅ Dry run completed successfully" >> $GITHUB_STEP_SUMMARY
echo "" >> $GITHUB_STEP_SUMMARY
echo "To test with real ATR (requires onboarding):" >> $GITHUB_STEP_SUMMARY
echo "1. Add ASF_USERNAME secret" >> $GITHUB_STEP_SUMMARY
echo "2. Run workflow with dry_run=false" >> $GITHUB_STEP_SUMMARY
else
echo "✅ ATR test completed" >> $GITHUB_STEP_SUMMARY
Expand Down
10 changes: 5 additions & 5 deletions src/test/java/org/apache/solr/mcp/server/config/SolrConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ void testUrlNormalization(String inputUrl, String expectedUrl) {
// Clean up
try {
client.close();
} catch (Exception e) {
} catch (Exception _) {
// Ignore close errors in test
}
}
Expand All @@ -109,7 +109,7 @@ void testUrlWithoutTrailingSlash() {

try {
client.close();
} catch (Exception e) {
} catch (Exception _) {
// Ignore close errors in test
}
}
Expand All @@ -128,7 +128,7 @@ void testUrlWithTrailingSlashButNoSolrPath() {

try {
client.close();
} catch (Exception e) {
} catch (Exception _) {
// Ignore close errors in test
}
}
Expand All @@ -147,7 +147,7 @@ void testUrlWithSolrPathButNoTrailingSlash() {

try {
client.close();
} catch (Exception e) {
} catch (Exception _) {
// Ignore close errors in test
}
}
Expand All @@ -166,7 +166,7 @@ void testUrlAlreadyProperlyFormatted() {

try {
client.close();
} catch (Exception e) {
} catch (Exception _) {
// Ignore close errors in test
}
}
Expand Down
24 changes: 9 additions & 15 deletions src/test/java/org/apache/solr/mcp/server/indexing/IndexingServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -802,9 +802,8 @@ void indexJsonDocuments_WhenDocumentCreatorThrowsException_ShouldPropagateExcept
when(indexingDocumentCreator.createSchemalessDocumentsFromJson(invalidJson)).thenThrow(
new org.apache.solr.mcp.server.indexing.documentcreator.DocumentProcessingException("Invalid JSON"));

assertThrows(org.apache.solr.mcp.server.indexing.documentcreator.DocumentProcessingException.class, () -> {
indexingService.indexJsonDocuments("test_collection", invalidJson);
});
assertThrows(org.apache.solr.mcp.server.indexing.documentcreator.DocumentProcessingException.class,
() -> indexingService.indexJsonDocuments("test_collection", invalidJson));
verify(solrClient, never()).add(anyString(), any(Collection.class));
verify(solrClient, never()).commit(anyString());
}
Expand All @@ -830,9 +829,8 @@ void indexCsvDocuments_WhenDocumentCreatorThrowsException_ShouldPropagateExcepti
when(indexingDocumentCreator.createSchemalessDocumentsFromCsv(invalidCsv)).thenThrow(
new org.apache.solr.mcp.server.indexing.documentcreator.DocumentProcessingException("Invalid CSV"));

assertThrows(org.apache.solr.mcp.server.indexing.documentcreator.DocumentProcessingException.class, () -> {
indexingService.indexCsvDocuments("test_collection", invalidCsv);
});
assertThrows(org.apache.solr.mcp.server.indexing.documentcreator.DocumentProcessingException.class,
() -> indexingService.indexCsvDocuments("test_collection", invalidCsv));
verify(solrClient, never()).add(anyString(), any(Collection.class));
verify(solrClient, never()).commit(anyString());
}
Expand All @@ -858,9 +856,8 @@ void indexXmlDocuments_WhenParserConfigurationFails_ShouldPropagateException() t
when(indexingDocumentCreator.createSchemalessDocumentsFromXml(xml)).thenThrow(
new org.apache.solr.mcp.server.indexing.documentcreator.DocumentProcessingException("Parser error"));

assertThrows(org.apache.solr.mcp.server.indexing.documentcreator.DocumentProcessingException.class, () -> {
indexingService.indexXmlDocuments("test_collection", xml);
});
assertThrows(org.apache.solr.mcp.server.indexing.documentcreator.DocumentProcessingException.class,
() -> indexingService.indexXmlDocuments("test_collection", xml));
verify(solrClient, never()).add(anyString(), any(Collection.class));
verify(solrClient, never()).commit(anyString());
}
Expand All @@ -872,9 +869,8 @@ void indexXmlDocuments_WhenSaxExceptionOccurs_ShouldPropagateException() throws
.thenThrow(new org.apache.solr.mcp.server.indexing.documentcreator.DocumentProcessingException(
"SAX parsing error"));

assertThrows(org.apache.solr.mcp.server.indexing.documentcreator.DocumentProcessingException.class, () -> {
indexingService.indexXmlDocuments("test_collection", xml);
});
assertThrows(org.apache.solr.mcp.server.indexing.documentcreator.DocumentProcessingException.class,
() -> indexingService.indexXmlDocuments("test_collection", xml));
verify(solrClient, never()).add(anyString(), any(Collection.class));
verify(solrClient, never()).commit(anyString());
}
Expand Down Expand Up @@ -959,9 +955,7 @@ void indexDocuments_WhenCommitFails_ShouldPropagateException() throws Exception
when(solrClient.add(eq("test_collection"), any(Collection.class))).thenReturn(null);
when(solrClient.commit("test_collection")).thenThrow(new IOException("Commit failed"));

assertThrows(IOException.class, () -> {
indexingService.indexDocuments("test_collection", docs);
});
assertThrows(IOException.class, () -> indexingService.indexDocuments("test_collection", docs));
verify(solrClient).add(eq("test_collection"), any(Collection.class));
verify(solrClient).commit("test_collection");
}
Expand Down
15 changes: 6 additions & 9 deletions src/test/java/org/apache/solr/mcp/server/metadata/SchemaServiceIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,25 +85,22 @@ void testGetSchema_ValidCollection() throws Exception {
@Test
void testGetSchema_InvalidCollection() {
// When/Then
assertThrows(Exception.class, () -> {
schemaService.getSchema("non_existent_collection_12345");
}, "Getting schema for non-existent collection should throw exception");
assertThrows(Exception.class, () -> schemaService.getSchema("non_existent_collection_12345"),
"Getting schema for non-existent collection should throw exception");
}

@Test
void testGetSchema_NullCollection() {
// When/Then
assertThrows(Exception.class, () -> {
schemaService.getSchema(null);
}, "Getting schema with null collection should throw exception");
assertThrows(Exception.class, () -> schemaService.getSchema(null),
"Getting schema with null collection should throw exception");
}

@Test
void testGetSchema_EmptyCollection() {
// When/Then
assertThrows(Exception.class, () -> {
schemaService.getSchema("");
}, "Getting schema with empty collection should throw exception");
assertThrows(Exception.class, () -> schemaService.getSchema(""),
"Getting schema with empty collection should throw exception");
}

@Test
Expand Down