More layout change -- introducing to reduce PR diffsize.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/652dd4a7 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/652dd4a7 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/652dd4a7 Branch: refs/heads/master Commit: 652dd4a7203988c44228a4576e42af2176f85bbc Parents: 6a017a9 Author: Chris Dollin <[email protected]> Authored: Tue Mar 17 13:48:54 2015 +0000 Committer: Chris Dollin <[email protected]> Committed: Tue Mar 17 13:48:54 2015 +0000 ---------------------------------------------------------------------- .../assembler/TestTextDatasetAssembler.java | 111 +++++++++---------- 1 file changed, 55 insertions(+), 56 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/652dd4a7/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestTextDatasetAssembler.java ---------------------------------------------------------------------- diff --git a/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestTextDatasetAssembler.java b/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestTextDatasetAssembler.java index e745d2e..abcf0a7 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestTextDatasetAssembler.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestTextDatasetAssembler.java @@ -60,83 +60,82 @@ public class TestTextDatasetAssembler extends AbstractTestTextAssembler { @Test(expected = AssemblerException.class) public void testErrorOnNoDataset() { - Assembler.general.open(noDatasetPropertySpec); + Assembler.general.open(noDatasetPropertySpec); } @Test(expected = AssemblerException.class) public void testErrorOnNoIndex() { - Assembler.general.open(noIndexPropertySpec); + Assembler.general.open(noIndexPropertySpec); } @Test public void testCustomTextDocProducer() { - Dataset dataset = (Dataset)Assembler.general.open(customTextDocProducerSpec) ; - DatasetGraphText dsgText = (DatasetGraphText)dataset.asDatasetGraph() ; - assertTrue(dsgText.getMonitor() instanceof CustomTextDocProducer) ; - dataset.close(); + Dataset dataset = (Dataset)Assembler.general.open(customTextDocProducerSpec) ; + DatasetGraphText dsgText = (DatasetGraphText)dataset.asDatasetGraph() ; + assertTrue(dsgText.getMonitor() instanceof CustomTextDocProducer) ; + dataset.close(); } @Test public void testCustomTextDocProducerDyadicConstructor() { - Dataset dataset = (Dataset)Assembler.general.open(customDyadicTextDocProducerSpec) ; - DatasetGraphText dsgText = (DatasetGraphText)dataset.asDatasetGraph() ; - assertTrue(dsgText.getMonitor() instanceof CustomDyadicTextDocProducer) ; + Dataset dataset = (Dataset)Assembler.general.open(customDyadicTextDocProducerSpec) ; + DatasetGraphText dsgText = (DatasetGraphText)dataset.asDatasetGraph() ; + assertTrue(dsgText.getMonitor() instanceof CustomDyadicTextDocProducer) ; - Node G= NodeFactory.createURI("http://example.com/G";); - Node S = NodeFactory.createURI("http://example.com/S";); - Node P = NodeFactory.createURI("http://example.com/P";); - Node O = NodeFactory.createLiteral("http://example.com/O";); + Node G= NodeFactory.createURI("http://example.com/G";); + Node S = NodeFactory.createURI("http://example.com/S";); + Node P = NodeFactory.createURI("http://example.com/P";); + Node O = NodeFactory.createLiteral("http://example.com/O";); - dsgText.begin(ReadWrite.WRITE); - dsgText.add(G, S, P, O); - dsgText.commit(); - dataset.close(); + dsgText.begin(ReadWrite.WRITE); + dsgText.add(G, S, P, O); + dsgText.commit(); + dataset.close(); } static { TextAssembler.init(); AssemblerTDB.init(); spec1 = - model.createResource(TESTBASE + "spec1") - .addProperty(RDF.type, TextVocab.textDataset) - .addProperty(TextVocab.pDataset, SIMPLE_DATASET_SPEC) - .addProperty(TextVocab.pIndex, SIMPLE_INDEX_SPEC3); + model.createResource(TESTBASE + "spec1") + .addProperty(RDF.type, TextVocab.textDataset) + .addProperty(TextVocab.pDataset, SIMPLE_DATASET_SPEC) + .addProperty(TextVocab.pIndex, SIMPLE_INDEX_SPEC3); noDatasetPropertySpec = - model.createResource(TESTBASE + "noDatasetPropertySpec") - .addProperty(RDF.type, TextVocab.textDataset) - .addProperty(TextVocab.pIndex, SIMPLE_INDEX_SPEC4); + model.createResource(TESTBASE + "noDatasetPropertySpec") + .addProperty(RDF.type, TextVocab.textDataset) + .addProperty(TextVocab.pIndex, SIMPLE_INDEX_SPEC4); noIndexPropertySpec = - model.createResource(TESTBASE + "noIndexPropertySpec") - .addProperty(RDF.type, TextVocab.textDataset) - .addProperty(TextVocab.pDataset, SIMPLE_DATASET_SPEC); + model.createResource(TESTBASE + "noIndexPropertySpec") + .addProperty(RDF.type, TextVocab.textDataset) + .addProperty(TextVocab.pDataset, SIMPLE_DATASET_SPEC); customTextDocProducerSpec = - model.createResource(TESTBASE + "customTextDocProducerSpec") - .addProperty(RDF.type, TextVocab.textDataset) - .addProperty(TextVocab.pDataset, SIMPLE_DATASET_SPEC) - .addProperty(TextVocab.pIndex, SIMPLE_INDEX_SPEC5) - .addProperty(TextVocab.pTextDocProducer, model.createResource("java:org.apache.jena.query.text.assembler.TestTextDatasetAssembler$CustomTextDocProducer")); + model.createResource(TESTBASE + "customTextDocProducerSpec") + .addProperty(RDF.type, TextVocab.textDataset) + .addProperty(TextVocab.pDataset, SIMPLE_DATASET_SPEC) + .addProperty(TextVocab.pIndex, SIMPLE_INDEX_SPEC5) + .addProperty(TextVocab.pTextDocProducer, model.createResource("java:org.apache.jena.query.text.assembler.TestTextDatasetAssembler$CustomTextDocProducer")); customDyadicTextDocProducerSpec = - model.createResource(TESTBASE + "customDyadicTextDocProducerSpec") - .addProperty(RDF.type, TextVocab.textDataset) - .addProperty(TextVocab.pDataset, SIMPLE_DATASET_SPEC) - .addProperty(TextVocab.pIndex, SIMPLE_INDEX_SPEC5) - .addProperty(TextVocab.pTextDocProducer, model.createResource("java:org.apache.jena.query.text.assembler.TestTextDatasetAssembler$CustomDyadicTextDocProducer")); - + model.createResource(TESTBASE + "customDyadicTextDocProducerSpec") + .addProperty(RDF.type, TextVocab.textDataset) + .addProperty(TextVocab.pDataset, SIMPLE_DATASET_SPEC) + .addProperty(TextVocab.pIndex, SIMPLE_INDEX_SPEC5) + .addProperty(TextVocab.pTextDocProducer, model.createResource("java:org.apache.jena.query.text.assembler.TestTextDatasetAssembler$CustomDyadicTextDocProducer")); } private static class CustomTextDocProducer implements TextDocProducer { - public CustomTextDocProducer(TextIndex textIndex) { } + public CustomTextDocProducer(TextIndex textIndex) { } - @Override - public void start() { } + @Override + public void start() { } - @Override - public void finish() { } + @Override + public void finish() { } - @Override - public void change(QuadAction qaction, Node g, Node s, Node p, Node o) { } + @Override + public void change(QuadAction qaction, Node g, Node s, Node p, Node o) { } } @@ -149,19 +148,19 @@ public class TestTextDatasetAssembler extends AbstractTestTextAssembler { this.dg = dg; } - @Override - public void start() { } + @Override + public void start() { } - @Override - public void finish() { - Iterator<Quad> qi = dg.find(null, lastSubject, Node.ANY, Node.ANY); - while (qi.hasNext()) qi.next(); - } + @Override + public void finish() { + Iterator<Quad> qi = dg.find(null, lastSubject, Node.ANY, Node.ANY); + while (qi.hasNext()) qi.next(); + } - @Override - public void change(QuadAction qaction, Node g, Node s, Node p, Node o) { - lastSubject = s; - } + @Override + public void change(QuadAction qaction, Node g, Node s, Node p, Node o) { + lastSubject = s; + } } }
