Consistent formatting
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/fe268631 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/fe268631 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/fe268631 Branch: refs/heads/master Commit: fe26863150d859501f3107d6b3344936c09fa1cc Parents: 0d2f51b Author: Andy Seaborne <[email protected]> Authored: Thu Dec 21 13:11:39 2017 +0000 Committer: Andy Seaborne <[email protected]> Committed: Thu Dec 21 13:11:39 2017 +0000 ---------------------------------------------------------------------- .../jena/sparql/core/AbstractTestDataset.java | 137 +++++++++---------- 1 file changed, 65 insertions(+), 72 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/fe268631/jena-arq/src/test/java/org/apache/jena/sparql/core/AbstractTestDataset.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/core/AbstractTestDataset.java b/jena-arq/src/test/java/org/apache/jena/sparql/core/AbstractTestDataset.java index cd5fbc5..466a32a 100644 --- a/jena-arq/src/test/java/org/apache/jena/sparql/core/AbstractTestDataset.java +++ b/jena-arq/src/test/java/org/apache/jena/sparql/core/AbstractTestDataset.java @@ -18,110 +18,103 @@ package org.apache.jena.sparql.core; -import java.util.List ; +import java.util.List; -import org.apache.jena.atlas.iterator.Iter ; -import org.apache.jena.atlas.junit.BaseTest ; -import org.apache.jena.query.Dataset ; -import org.apache.jena.rdf.model.Model ; -import org.apache.jena.rdf.model.ModelFactory ; -import org.apache.jena.rdf.model.Property ; -import org.apache.jena.rdf.model.Resource ; -import org.junit.Test ; +import org.apache.jena.atlas.iterator.Iter; +import org.apache.jena.atlas.junit.BaseTest; +import org.apache.jena.query.Dataset; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.Resource; +import org.junit.Test; public abstract class AbstractTestDataset extends BaseTest { - protected abstract Dataset createDataset() ; + protected abstract Dataset createDataset(); - static Model model1 = ModelFactory.createDefaultModel() ; - static Model model2 = ModelFactory.createDefaultModel() ; + static Model model1 = ModelFactory.createDefaultModel(); + static Model model2 = ModelFactory.createDefaultModel(); - static Resource s1 = model1.createResource("s1") ; - static Resource s2 = model1.createResource("s2") ; + static Resource s1 = model1.createResource("s1"); + static Resource s2 = model1.createResource("s2"); - static Property p1 = model1.createProperty("p1") ; - static Property p2 = model1.createProperty("p2") ; + static Property p1 = model1.createProperty("p1"); + static Property p2 = model1.createProperty("p2"); - static Resource o1 = model1.createResource("o1") ; - static Resource o2 = model1.createResource("o2") ; + static Resource o1 = model1.createResource("o1"); + static Resource o2 = model1.createResource("o2"); static { - model1.add(s1, p1, o1) ; - model2.add(s2, p2, o2) ; + model1.add(s1, p1, o1); + model2.add(s2, p2, o2); } - @Test public void dataset_01() - { - Dataset ds = createDataset() ; - assertNotNull(ds.getDefaultModel()) ; - assertNotNull(ds.asDatasetGraph()) ; + @Test public void dataset_01() { + Dataset ds = createDataset(); + assertNotNull(ds.getDefaultModel()); + assertNotNull(ds.asDatasetGraph()); } - @Test public void dataset_02() - { - Dataset ds = createDataset() ; - ds.getDefaultModel().add(s1,p1,o1) ; - assertTrue(model1.isIsomorphicWith(ds.getDefaultModel())) ; + @Test public void dataset_02() { + Dataset ds = createDataset(); + ds.getDefaultModel().add(s1,p1,o1); + assertTrue(model1.isIsomorphicWith(ds.getDefaultModel())); } - @Test public void dataset_03() - { - Dataset ds = createDataset() ; - ds.setDefaultModel(model2) ; - assertTrue(model2.isIsomorphicWith(ds.getDefaultModel())) ; + @Test public void dataset_03() { + Dataset ds = createDataset(); + ds.setDefaultModel(model2); + assertTrue(model2.isIsomorphicWith(ds.getDefaultModel())); } - @Test public void dataset_04() - { - String graphName = "http://example/"; ; - Dataset ds = createDataset() ; - ds.addNamedModel(graphName, model1) ; - assertTrue(ds.containsNamedModel(graphName)) ; + @Test public void dataset_04() { + String graphName = "http://example/";; + Dataset ds = createDataset(); + ds.addNamedModel(graphName, model1); + assertTrue(ds.containsNamedModel(graphName)); - List<String> x = Iter.toList(ds.listNames()) ; - assertEquals(1, x.size()) ; - assertEquals(graphName, x.get(0)) ; + List<String> x = Iter.toList(ds.listNames()); + assertEquals(1, x.size()); + assertEquals(graphName, x.get(0)); - assertFalse(model1.isIsomorphicWith(ds.getDefaultModel())) ; - Model m = ds.getNamedModel(graphName) ; + assertFalse(model1.isIsomorphicWith(ds.getDefaultModel())); + Model m = ds.getNamedModel(graphName); - assertNotNull(m) ; - assertTrue(model1.isIsomorphicWith(m)) ; + assertNotNull(m); + assertTrue(model1.isIsomorphicWith(m)); - ds.removeNamedModel(graphName) ; + ds.removeNamedModel(graphName); // Not getNamedModel and test for null as some datasets are "auto graph creating" - assertFalse(ds.containsNamedModel(graphName)) ; + assertFalse(ds.containsNamedModel(graphName)); } - @Test public void dataset_05() - { - String graphName = "http://example/"; ; - Dataset ds = createDataset() ; - ds.addNamedModel(graphName, model1) ; - ds.replaceNamedModel(graphName, model2) ; - assertTrue(ds.containsNamedModel(graphName)) ; + @Test public void dataset_05() { + String graphName = "http://example/";; + Dataset ds = createDataset(); + ds.addNamedModel(graphName, model1); + ds.replaceNamedModel(graphName, model2); + assertTrue(ds.containsNamedModel(graphName)); - List<String> x = Iter.toList(ds.listNames()) ; - assertEquals(1, x.size()) ; - assertEquals(graphName, x.get(0)) ; + List<String> x = Iter.toList(ds.listNames()); + assertEquals(1, x.size()); + assertEquals(graphName, x.get(0)); - assertFalse(model1.isIsomorphicWith(ds.getNamedModel(graphName))) ; - assertTrue(model2.isIsomorphicWith(ds.getNamedModel(graphName))) ; + assertFalse(model1.isIsomorphicWith(ds.getNamedModel(graphName))); + assertTrue(model2.isIsomorphicWith(ds.getNamedModel(graphName))); } - @Test public void dataset_06() - { - String graphName = "http://example/"; ; - Dataset ds = createDataset() ; - ds.addNamedModel(graphName, model1) ; + @Test public void dataset_06() { + String graphName = "http://example/";; + Dataset ds = createDataset(); + ds.addNamedModel(graphName, model1); assertFalse("Dataset should not be empty after a named graph has been added!", ds.isEmpty()); } - @Test public void dataset_07() - { - String graphName = "http://example/"; ; - Dataset ds = createDataset() ; - ds.addNamedModel(graphName, model1) ; + @Test public void dataset_07() { + String graphName = "http://example/";; + Dataset ds = createDataset(); + ds.addNamedModel(graphName, model1); assertTrue("Named graph not found", ds.containsNamedModel(graphName)); }
