This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/main by this push:
new a57802b31f Exit on manifest parse error
a57802b31f is described below
commit a57802b31f1d32e9a43070e6ba7b39bcb1d1a090
Author: Andy Seaborne <[email protected]>
AuthorDate: Sun Oct 5 21:36:59 2025 +0100
Exit on manifest parse error
---
.../apache/jena/arq/junit/manifest/Manifest.java | 39 ++++++++++++----------
1 file changed, 22 insertions(+), 17 deletions(-)
diff --git
a/jena-arq/src/test/java/org/apache/jena/arq/junit/manifest/Manifest.java
b/jena-arq/src/test/java/org/apache/jena/arq/junit/manifest/Manifest.java
index fd2af3cec5..ad76bd0481 100644
--- a/jena-arq/src/test/java/org/apache/jena/arq/junit/manifest/Manifest.java
+++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/manifest/Manifest.java
@@ -50,32 +50,37 @@ public class Manifest
private List<String> includedFiles = new ArrayList<>();
private List<ManifestEntry> entries = new ArrayList<>();
- public static Manifest parse(String manifestFile) {
- Manifest manifest = new Manifest(manifestFile);
- return manifest;
- }
-
- private Manifest(String manifestFile) {
- filenameOrURI = manifestFile;
- manifestGraph = manifestGraph(filenameOrURI);
- manifest = getManifestNode(manifestGraph, filenameOrURI);
- parseManifest();
- parseIncludes();
- parseEntries();
- }
-
- private Graph manifestGraph(String filenameOrURI) {
+ public static Manifest parse(String filenameOrURI) {
+ Graph manifestRDF;
// Exceptions from @TestFactories are swallowed by JUnit5.
try {
- return RDFParser.source(filenameOrURI).toGraph();
+ manifestRDF = RDFParser.source(filenameOrURI).toGraph();
} catch (RiotNotFoundException ex) {
log.error("Not found: "+filenameOrURI);
- // Exceptions from @TestFactories are swallowed by JUnit5.
+ // Exit on error.
+ System.exit(1);
throw new RiotNotFoundException("Manifest "+filenameOrURI);
} catch (RiotException ex) {
+ // Exit on error.
log.error("Error reading manifest: "+filenameOrURI);
+ System.exit(1);
+ throw ex;
+ } catch (RuntimeException ex) {
+ // Exit on error.
+ log.error("Error reading manifest: "+filenameOrURI);
+ System.exit(1);
throw ex;
}
+ Manifest manifest = new Manifest(manifestRDF);
+ return manifest;
+ }
+
+ private Manifest(Graph manifestRDF) {
+ manifestGraph = manifestRDF;
+ manifest = getManifestNode(manifestGraph, filenameOrURI);
+ parseManifest();
+ parseIncludes();
+ parseEntries();
}
private static Node getManifestNode(Graph manifestGraph, String filename) {