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
commit c79f46bd3aa2c406100b64b55b806c4b2d706120 Author: Andy Seaborne <[email protected]> AuthorDate: Sat Mar 14 11:44:34 2026 +0000 Print error for missing manifest entry files --- .../java/org/apache/jena/arq/junit/riot/RiotEvalTest.java | 15 ++++++++++++++- .../org/apache/jena/arq/junit/riot/RiotSyntaxTest.java | 10 ++++++++++ .../apache/jena/arq/junit/textrunner/TextTestRunner.java | 4 ++-- .../jena/arq/junit4/runners/AbstractRunnerOfTests.java | 1 - 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit/riot/RiotEvalTest.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/riot/RiotEvalTest.java index cef9059640..53adcd3cc3 100644 --- a/jena-arq/src/test/java/org/apache/jena/arq/junit/riot/RiotEvalTest.java +++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/riot/RiotEvalTest.java @@ -29,6 +29,8 @@ import java.util.function.Consumer; import org.apache.jena.arq.junit.manifest.AbstractManifestTest; import org.apache.jena.arq.junit.manifest.ManifestEntry; +import org.apache.jena.atlas.lib.FileOps; +import org.apache.jena.atlas.lib.IRILib; import org.apache.jena.graph.Graph; import org.apache.jena.riot.*; import org.apache.jena.riot.system.ErrorHandlerFactory; @@ -58,17 +60,26 @@ public class RiotEvalTest extends AbstractManifestTest { input = entry.getAction().getURI(); output = positiveTest ? entry.getResult().getURI() : null; + checkFileExists(input); + if ( output != null ) + checkFileExists(output); + boolean silentWarnings = RiotTestsConfig.allowWarnings(manifestEntry); parser = ( baseIRI != null ) ? ParsingStepForTest.parse(input, baseIRI, lang, silentWarnings) : ParsingStepForTest.parse(input, lang, silentWarnings); } + private static void checkFileExists(String iriFilename) { + String inputFile = IRILib.IRIToFilename(iriFilename); + if ( ! FileOps.exists(inputFile) ) + System.out.println("Not found: "+iriFilename); + } + @Override public void runTest() { // Could generalise run4() to cover both cases. - // run3() predates dataset reading and is more tested. if ( RDFLanguages.isTriples(lang) ) run3(); else @@ -116,6 +127,8 @@ public class RiotEvalTest extends AbstractManifestTest { System.out.println("--------"); } assertTrue(b, "Graphs not isomorphic"); + } catch (RiotNotFoundException ex) { + throw ex; } catch (RiotException ex) { if ( positiveTest ) throw ex; diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit/riot/RiotSyntaxTest.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/riot/RiotSyntaxTest.java index bae28ee068..8e6713f53d 100644 --- a/jena-arq/src/test/java/org/apache/jena/arq/junit/riot/RiotSyntaxTest.java +++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/riot/RiotSyntaxTest.java @@ -57,12 +57,21 @@ public class RiotSyntaxTest extends AbstractManifestTest { this.baseIRI = ( baseIRI == null ) ? actionURI : baseIRI; this.expectLegalSyntax = positiveTest; this.lang = lang; + + checkFileExists(actionURI); + boolean silentWarnings = RiotTestsConfig.allowWarnings(manifestEntry); parser = ( baseIRI != null ) ? ParsingStepForTest.parse(actionURI, baseIRI, lang, silentWarnings) : ParsingStepForTest.parse(actionURI, lang, silentWarnings); } + private static void checkFileExists(String iriFilename) { + String inputFile = IRILib.IRIToFilename(iriFilename); + if ( ! FileOps.exists(inputFile) ) + System.out.println("Not found: "+iriFilename); + } + @Override public void runTest() { StreamRDF stream = StreamRDFLib.sinkNull(); @@ -89,6 +98,7 @@ public class RiotSyntaxTest extends AbstractManifestTest { fail(reason); } } catch(RiotNotFoundException ex) { + System.out.println(ex.getMessage()); throw ex; } catch(RiotException ex) { if ( expectLegalSyntax ) { diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit/textrunner/TextTestRunner.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/textrunner/TextTestRunner.java index 151cf31903..084ce7dee0 100644 --- a/jena-arq/src/test/java/org/apache/jena/arq/junit/textrunner/TextTestRunner.java +++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/textrunner/TextTestRunner.java @@ -116,14 +116,14 @@ public class TextTestRunner { // summary should be null only when producing EARL reports. //summary.printTo if ( summary.getTestsSkippedCount() > 0 ) { - out.println("Manifests: "+executionStats.getContainerCount()); out.println("Tests pass: "+executionStats.getTestPasses()); out.println("Tests fail: "+executionStats.getTestFailures()); out.println("Tests skipped: "+summary.getTestsSkippedCount()); + out.println("Manifests: "+executionStats.getContainerCount()); } else { - out.println("Manifests: "+executionStats.getContainerCount()); out.println("Tests pass: "+executionStats.getTestPasses()); out.println("Tests fail: "+executionStats.getTestFailures()); + out.println("Manifests: "+executionStats.getContainerCount()); } } } diff --git a/jena-shex/src/test/java/org/apache/jena/arq/junit4/runners/AbstractRunnerOfTests.java b/jena-shex/src/test/java/org/apache/jena/arq/junit4/runners/AbstractRunnerOfTests.java index 1f5056d979..41817f7610 100644 --- a/jena-shex/src/test/java/org/apache/jena/arq/junit4/runners/AbstractRunnerOfTests.java +++ b/jena-shex/src/test/java/org/apache/jena/arq/junit4/runners/AbstractRunnerOfTests.java @@ -69,7 +69,6 @@ public abstract class AbstractRunnerOfTests extends ParentRunner<Runner> { private void prepare(Class<? > klass, Function<ManifestEntry, Runnable> maker, String prefix) throws InitializationError { List<String> manifests = SetupManifests.getManifests(klass); if ( manifests.isEmpty() ) - //System.err.println("No manifests: "+label); throw new InitializationError("No manifests"); prepare(manifests, klass.getSimpleName(), maker, prefix); }
