This is an automated email from the ASF dual-hosted git repository. afs pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/jena.git
commit 145dc91dd46012a6a5e24eda7a869a796f90a377 Author: Andy Seaborne <[email protected]> AuthorDate: Sat Sep 19 15:26:37 2026 +0100 jena-shex: Rename ShEx EARL report as 'ShexEarlReport' to avoid name clash --- .../jena/arq/junit4/{EarlReport.java => ShexEarlReport.java} | 4 ++-- .../java/org/apache/jena/arq/junit4/runners/RunnerOneTest.java | 6 +++--- .../java/org/apache/jena/arq/junit4/runners/SetupManifests.java | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/jena-shex/src/test/java/org/apache/jena/arq/junit4/EarlReport.java b/jena-shex/src/test/java/org/apache/jena/arq/junit4/ShexEarlReport.java similarity index 98% rename from jena-shex/src/test/java/org/apache/jena/arq/junit4/EarlReport.java rename to jena-shex/src/test/java/org/apache/jena/arq/junit4/ShexEarlReport.java index 24119bc5c8..e63a25aaf4 100644 --- a/jena-shex/src/test/java/org/apache/jena/arq/junit4/EarlReport.java +++ b/jena-shex/src/test/java/org/apache/jena/arq/junit4/ShexEarlReport.java @@ -32,7 +32,7 @@ import org.apache.jena.vocabulary.DCTerms; import org.apache.jena.vocabulary.RDF; import org.apache.jena.vocabulary.XSD; -public class EarlReport +public class ShexEarlReport { // Ref: http://www.w3.org/TR/EARL10-Schema/ // NB: This vocabulary has changed over time! @@ -51,7 +51,7 @@ public class EarlReport private Resource system; - public EarlReport(String systemURI) + public ShexEarlReport(String systemURI) { earl = ModelFactory.createDefaultModel(); diff --git a/jena-shex/src/test/java/org/apache/jena/arq/junit4/runners/RunnerOneTest.java b/jena-shex/src/test/java/org/apache/jena/arq/junit4/runners/RunnerOneTest.java index e39fce47ec..1fd681850a 100644 --- a/jena-shex/src/test/java/org/apache/jena/arq/junit4/runners/RunnerOneTest.java +++ b/jena-shex/src/test/java/org/apache/jena/arq/junit4/runners/RunnerOneTest.java @@ -21,7 +21,7 @@ package org.apache.jena.arq.junit4.runners; -import org.apache.jena.arq.junit4.EarlReport; +import org.apache.jena.arq.junit4.ShexEarlReport; import org.junit.AssumptionViolatedException; import org.junit.runner.Description; import org.junit.runner.Runner; @@ -35,7 +35,7 @@ public class RunnerOneTest extends Runner { private static int count = 1; private final Description description; - private final EarlReport report; // Optional. + private final ShexEarlReport report; // Optional. private final Runnable testCase; private final String testURI; private final String name; @@ -44,7 +44,7 @@ public class RunnerOneTest extends Runner this(name, test, null, null); } - public RunnerOneTest(String name, Runnable test, String testURI, EarlReport report) { + public RunnerOneTest(String name, Runnable test, String testURI, ShexEarlReport report) { this.name = name; int count$ = count; testCase = test; diff --git a/jena-shex/src/test/java/org/apache/jena/arq/junit4/runners/SetupManifests.java b/jena-shex/src/test/java/org/apache/jena/arq/junit4/runners/SetupManifests.java index 91e6ae35b9..5dd71d540c 100644 --- a/jena-shex/src/test/java/org/apache/jena/arq/junit4/runners/SetupManifests.java +++ b/jena-shex/src/test/java/org/apache/jena/arq/junit4/runners/SetupManifests.java @@ -29,7 +29,7 @@ import org.junit.runner.Description; import org.junit.runner.Runner; import org.junit.runners.model.InitializationError; -import org.apache.jena.arq.junit4.EarlReport; +import org.apache.jena.arq.junit4.ShexEarlReport; import org.apache.jena.arq.junit4.manifest.Manifest; import org.apache.jena.arq.junit4.manifest.ManifestEntry; import org.apache.jena.arq.junit4.manifest.Manifests; @@ -51,7 +51,7 @@ public class SetupManifests { /** * Do one level of tests. test are {@link Runnable Runnables} that each succeed or fail with an exception. */ - public static RunnerOneManifest build(EarlReport report, Manifest manifest, Function<ManifestEntry, Runnable> maker, String prefix) { + public static RunnerOneManifest build(ShexEarlReport report, Manifest manifest, Function<ManifestEntry, Runnable> maker, String prefix) { ManifestStructure mStruct = new ManifestStructure(); RunnerOneManifest top = buildForManifest(mStruct, report, manifest, maker, prefix); top.setManifestCount(mStruct.manifestCount); @@ -62,7 +62,7 @@ public class SetupManifests { * Do one level of tests, recurse into sub-levels. * A test is a {@link Runnable} that succeeds or fails with an exception. */ - private static RunnerOneManifest buildForManifest(ManifestStructure mStruct, EarlReport report, Manifest manifest, Function<ManifestEntry, Runnable> maker, String prefix) { + private static RunnerOneManifest buildForManifest(ManifestStructure mStruct, ShexEarlReport report, Manifest manifest, Function<ManifestEntry, Runnable> maker, String prefix) { Description description = Description.createSuiteDescription(manifest.getName()); if ( PrintManifests ) out.println(manifest.getFileName()+" :: "+manifest.getName()); @@ -98,7 +98,7 @@ public class SetupManifests { return thisLevel; } - public static void prepareTests(EarlReport report, RunnerOneManifest level, Manifest manifest, Function<ManifestEntry, Runnable> maker, String prefix) { + public static void prepareTests(ShexEarlReport report, RunnerOneManifest level, Manifest manifest, Function<ManifestEntry, Runnable> maker, String prefix) { manifest.entries().forEach(entry->{ String label = prepareTestLabel(entry, prefix); Runnable runnable = maker.apply(entry);
