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 3300f1aa7c7d2ee4c54955f1eeefc2c77da73a64 Author: Andy Seaborne <[email protected]> AuthorDate: Sat Apr 27 13:59:13 2024 +0100 Make TestRDFParser tests run silently --- .../main/java/org/apache/jena/riot/RDFParser.java | 1 - .../java/org/apache/jena/riot/TS_RiotGeneral.java | 3 +-- .../java/org/apache/jena/riot/TestRDFParser.java | 27 +++++++++++++--------- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFParser.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFParser.java index f7bee9079f..35c451d004 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/RDFParser.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFParser.java @@ -55,7 +55,6 @@ import org.apache.jena.sparql.core.DatasetGraph; import org.apache.jena.sparql.core.DatasetGraphFactory; import org.apache.jena.sparql.graph.GraphFactory; import org.apache.jena.sparql.util.Context; -import org.apache.jena.system.Txn; /** * An {@link RDFParser} is a process that will generate triples and quads; diff --git a/jena-arq/src/test/java/org/apache/jena/riot/TS_RiotGeneral.java b/jena-arq/src/test/java/org/apache/jena/riot/TS_RiotGeneral.java index d9c0f4ac32..121ea73c8c 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/TS_RiotGeneral.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/TS_RiotGeneral.java @@ -31,10 +31,9 @@ import org.junit.runners.Suite.SuiteClasses ; , TestJenaReaderRIOT.class , TestReadData.class , TestRiotReader.class - , TestRDFParser.class , TestParserRegistry.class - , TestRDFWriter.class , TestRDFParser.class + , TestRDFWriter.class , TestParseURISchemeBases.class , TestTurtleTrigWriter.class diff --git a/jena-arq/src/test/java/org/apache/jena/riot/TestRDFParser.java b/jena-arq/src/test/java/org/apache/jena/riot/TestRDFParser.java index ec8adb61f0..b96923fb21 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/TestRDFParser.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/TestRDFParser.java @@ -26,6 +26,7 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Path; import java.util.Map; +import org.apache.jena.atlas.logging.LogCtl; import org.apache.jena.graph.Graph; import org.apache.jena.graph.Node; import org.apache.jena.graph.NodeFactory; @@ -313,7 +314,8 @@ public class TestRDFParser { RDFParserBuilder builder = RDFParserBuilder.create().lang(Lang.TRIG).fromString(testdata + "\njunk data goes here"); DatasetGraph dsg = DatasetGraphFactory.createTxnMem(); try { - Txn.executeWrite(dsg, () -> builder.parse(dsg)); + LogCtl.withLevel(SysRIOT.getLogger(), "FATAL", ()-> + Txn.executeWrite(dsg, () -> builder.parse(dsg))); Assert.fail("Parsing should have produced an error"); } catch (RiotException e) { // Size should be zero as failure to parse should abort the transaction and produce an empty dataset @@ -322,11 +324,12 @@ public class TestRDFParser { } @Test - public void parse_to_dataset_malformed_01a() { + public void parse_to_dataset_malformed_02() { RDFParserBuilder builder = RDFParserBuilder.create().lang(Lang.TRIG).fromString(testdata + "\njunk data goes here"); DatasetGraph dsg = DatasetGraphFactory.createTxnMem(); try { - builder.parse(dsg); + LogCtl.withLevel(SysRIOT.getLogger(), "FATAL", ()-> + builder.parse(dsg)); Assert.fail("Parsing should have produced an error"); } catch (RiotException e) { // Without a transaction the valid quad would have gone into the dataset prior to the error occurring @@ -335,14 +338,16 @@ public class TestRDFParser { } @Test - public void parse_to_dataset_malformed_02() { + public void parse_to_dataset_malformed_03() { RDFParserBuilder builder = RDFParserBuilder.create().lang(Lang.TRIG).fromString(testdata + "\njunk data goes here"); - DatasetGraph dsg = null; - try { - dsg = builder.toDatasetGraph(); - Assert.fail("Parsing should have produced an error"); - } catch (RiotException e) { - assertNull(dsg); - } + LogCtl.withLevel(SysRIOT.getLogger(), "FATAL", ()-> { + DatasetGraph dsg = null; + try { + dsg = builder.toDatasetGraph(); + Assert.fail("Parsing should have produced an error"); + } catch (RiotException e) { + assertNull(dsg); + } + }); } }
