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 f45dd0d1508bba851ae1dfb8a3c902a2a2f6065e Author: Andy Seaborne <[email protected]> AuthorDate: Sat Jan 17 21:19:45 2026 +0000 Move back test shacl_no_data_graph --- .../org/apache/jena/fuseki/main/TS_FusekiMain.java | 2 + .../fuseki/main/TestFusekiShaclValidation.java | 127 ++++++++++----------- 2 files changed, 65 insertions(+), 64 deletions(-) diff --git a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TS_FusekiMain.java b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TS_FusekiMain.java index c70ae44fa1..443b8b9f81 100644 --- a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TS_FusekiMain.java +++ b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TS_FusekiMain.java @@ -63,6 +63,8 @@ import org.apache.jena.fuseki.main.sys.TestFusekiModules; , TS_PrefixesService.class , TestMetrics.class , TestFusekiShaclValidation.class + + // Temporary independent test due for tarcking failures. , TestFusekiShaclValidation2.class }) diff --git a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestFusekiShaclValidation.java b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestFusekiShaclValidation.java index e8e09ba17b..b0f76026cd 100644 --- a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestFusekiShaclValidation.java +++ b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestFusekiShaclValidation.java @@ -171,74 +171,73 @@ public class TestFusekiShaclValidation { }); } - @Test - public void shacl_named_graph() { - withServer((datasetURL)->{ - try ( RDFConnection conn = RDFConnection.connect(datasetURL)) { - conn.put("urn:abc:graph", DIR+"data1.ttl"); - ValidationReport report = validateReport(datasetURL+"/shacl?graph=urn:abc:graph", DIR+"shapes1.ttl"); - assertNotNull(report); - assertEquals(3, report.getEntries().size()); - clearAll(conn); - } - }); - } + @Test + public void shacl_named_graph() { + withServer((datasetURL)->{ + try ( RDFConnection conn = RDFConnection.connect(datasetURL)) { + conn.put("urn:abc:graph", DIR+"data1.ttl"); + ValidationReport report = validateReport(datasetURL+"/shacl?graph=urn:abc:graph", DIR+"shapes1.ttl"); + assertNotNull(report); + assertEquals(3, report.getEntries().size()); + clearAll(conn); + } + }); + } - @Test - public void shacl_targetNode_1() { - withServer((datasetURL)->{ - try ( RDFConnection conn = RDFConnection.connect(datasetURL)) { - conn.put("urn:abc:graph", DIR+"data1.ttl"); - ValidationReport report = validateReport(datasetURL+"/shacl?graph=urn:abc:graph&target=:s1", DIR+"shapes1.ttl"); - assertNotNull(report); - assertEquals(2, report.getEntries().size()); - clearAll(conn); - } - }); - } + @Test + public void shacl_targetNode_1() { + withServer((datasetURL)->{ + try ( RDFConnection conn = RDFConnection.connect(datasetURL)) { + conn.put("urn:abc:graph", DIR+"data1.ttl"); + ValidationReport report = validateReport(datasetURL+"/shacl?graph=urn:abc:graph&target=:s1", DIR+"shapes1.ttl"); + assertNotNull(report); + assertEquals(2, report.getEntries().size()); + clearAll(conn); + } + }); + } - @Test - public void shacl_targetNode_2() { - withServer((datasetURL)->{ - try ( RDFConnection conn = RDFConnection.connect(datasetURL)) { - conn.put("urn:abc:graph", DIR+"data1.ttl"); - ValidationReport report = validateReport(datasetURL+"/shacl?graph=urn:abc:graph&target=:s3", DIR+"shapes1.ttl"); - assertNotNull(report); - assertEquals(0, report.getEntries().size()); - clearAll(conn); - } - }); - } + @Test + public void shacl_targetNode_2() { + withServer((datasetURL)->{ + try ( RDFConnection conn = RDFConnection.connect(datasetURL)) { + conn.put("urn:abc:graph", DIR+"data1.ttl"); + ValidationReport report = validateReport(datasetURL+"/shacl?graph=urn:abc:graph&target=:s3", DIR+"shapes1.ttl"); + assertNotNull(report); + assertEquals(0, report.getEntries().size()); + clearAll(conn); + } + }); + } - @Test - public void shacl_targetNode_3() { - withServer((datasetURL)->{ - try ( RDFConnection conn = RDFConnection.connect(datasetURL)) { - conn.put("urn:abc:graph", DIR+"data1.ttl"); - ValidationReport report = validateReport(datasetURL+"/shacl?graph=urn:abc:graph&target=http://nosuch/node/";, DIR+"shapes1.ttl"); - assertNotNull(report); - assertEquals(0, report.getEntries().size()); - clearAll(conn); - } - }); - } + @Test + public void shacl_targetNode_3() { + withServer((datasetURL)->{ + try ( RDFConnection conn = RDFConnection.connect(datasetURL)) { + conn.put("urn:abc:graph", DIR+"data1.ttl"); + ValidationReport report = validateReport(datasetURL+"/shacl?graph=urn:abc:graph&target=http://nosuch/node/";, DIR+"shapes1.ttl"); + assertNotNull(report); + assertEquals(0, report.getEntries().size()); + clearAll(conn); + } + }); + } - //Moved to TestFusekiShalcValidation2 -// @Test -// public void shacl_no_data_graph() { -// withServer((datasetURL)->{ -// try ( RDFConnection conn = RDFConnection.connect(datasetURL)) { -// conn.put(DIR+"data1.ttl"); -// try { -// FusekiTestLib.expect404(()->{ -// ValidationReport report = validateReport(datasetURL+"/shacl?graph=urn:abc:noGraph", DIR+"shapes1.ttl"); -// }); -// } finally { -// conn.update("CLEAR ALL"); -// } -// } -// }); -// } + @Test + public void shacl_no_data_graph() { + withServer((datasetURL)->{ + try ( RDFConnection conn = RDFConnection.connect(datasetURL)) { + conn.put(DIR+"data1.ttl"); + try { + FusekiTestLib.expect404(()->{ + ValidationReport report = validateReport(datasetURL+"/shacl?graph=urn:abc:noGraph", DIR+"shapes1.ttl"); + }); + } finally { + conn.update("CLEAR ALL"); + } + } + }); + } private static ValidationReport validateReport(String url, String shapesFile) { Graph shapesGraph = RDFDataMgr.loadGraph(shapesFile);
