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 559f805f0a3245986d0ef15418112a15b98417a9 Author: Andy Seaborne <[email protected]> AuthorDate: Mon Mar 31 19:15:33 2025 +0100 Clean-up tests --- .../org/apache/jena/riot/lang/TestTriXBad.java | 3 +- .../core/assembler/TestInMemDatasetAssembler.java | 9 +- .../core/mem/AbstractTestTupleTableForms.java | 5 +- .../mem/TestDatasetGraphInMemoryThreading.java | 10 +- .../sparql/engine/join/AbstractTestInnerJoin.java | 5 +- .../jena/sparql/engine/join/AbstractTestJoin.java | 6 +- .../apache/jena/atlas/lib/persistent/TestPMap.java | 6 +- .../apache/jena/atlas/lib/persistent/TestPSet.java | 4 +- .../jena/dboe/base/block/AbstractTestBlockMgr.java | 4 +- .../jena/dboe/base/block/TestBlockMgrTracked.java | 4 +- .../jena/dboe/base/buffer/TestPtrBuffer.java | 5 +- .../jena/dboe/base/buffer/TestRecordBuffer.java | 4 +- .../file/AbstractTestBlockAccessFixedSize.java | 10 +- .../base/file/AbstractTestBlockAccessVarSize.java | 3 + .../jena/dboe/base/file/AbstractTestChannel.java | 4 +- .../apache/jena/dboe/base/file/TestMetaFile.java | 13 +- .../dboe/base/file/TestSegmentedMemBuffer.java | 8 +- .../apache/jena/dboe/base/record/TestRecord.java | 6 +- .../dboe/base/recordfile/TestRecordBufferPage.java | 12 +- .../dboe/index/testlib/AbstractTestRangeIndex.java | 7 +- .../trans/bplustree/TestBPTreeDistinctKeys.java | 1 + .../trans/bplustree/TestBPTreeRecordsNonTxn.java | 5 +- .../dboe/trans/bplustree/TestBPlusTreeNonTxn.java | 2 + .../dboe/trans/bplustree/TestBPlusTreeTxn.java | 10 +- .../rewriter/TestBPlusTreeRewriterNonTxn.java | 11 +- .../apache/jena/dboe/trans/data/TestTxnBlob.java | 16 +- .../dboe/trans/data/TestTxnBlobPersistent.java | 5 +- .../apache/jena/dboe/transaction/TestTxnLib2.java | 6 +- .../apache/jena/query/text/TestTextNonTxnTDB1.java | 199 ++++++++++----------- 29 files changed, 213 insertions(+), 170 deletions(-) diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTriXBad.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTriXBad.java index 04096991d1..7249b6cb53 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTriXBad.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTriXBad.java @@ -29,7 +29,6 @@ import org.apache.jena.riot.system.ErrorHandler ; import org.apache.jena.riot.system.ErrorHandlerFactory ; import org.apache.jena.riot.system.StreamRDF ; import org.apache.jena.riot.system.StreamRDFLib ; -import org.junit.Assert ; import org.junit.Test ; import org.junit.runner.RunWith ; import org.junit.runners.Parameterized ; @@ -38,7 +37,7 @@ import org.junit.runners.Parameterized.Parameters ; @RunWith(Parameterized.class) -public class TestTriXBad extends Assert /*BaseTest*/ { +public class TestTriXBad { static String DIR = "testing/RIOT/Lang/TriX" ; diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/core/assembler/TestInMemDatasetAssembler.java b/jena-arq/src/test/java/org/apache/jena/sparql/core/assembler/TestInMemDatasetAssembler.java index c1a3591877..2949ac0185 100644 --- a/jena-arq/src/test/java/org/apache/jena/sparql/core/assembler/TestInMemDatasetAssembler.java +++ b/jena-arq/src/test/java/org/apache/jena/sparql/core/assembler/TestInMemDatasetAssembler.java @@ -28,6 +28,9 @@ import static org.apache.jena.riot.RDFFormat.NTRIPLES; import static org.apache.jena.sparql.core.assembler.DatasetAssemblerVocab.pGraphName; import static org.apache.jena.sparql.core.assembler.DatasetAssemblerVocab.pNamedGraph; import static org.apache.jena.vocabulary.RDF.type; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import java.io.File; import java.io.FileOutputStream; @@ -37,6 +40,8 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.Iterator; +import org.junit.Test; + import org.apache.jena.assembler.JA ; import org.apache.jena.assembler.exceptions.CannotConstructException; import org.apache.jena.atlas.lib.IRILib; @@ -50,14 +55,12 @@ import org.apache.jena.sparql.core.DatasetGraphFactory; import org.apache.jena.sparql.core.Quad; import org.apache.jena.sparql.sse.SSE; import org.apache.jena.sparql.util.IsoMatcher; -import org.junit.Assert; -import org.junit.Test; /** * Tests for {@link InMemDatasetAssembler} * */ -public class TestInMemDatasetAssembler extends Assert { +public class TestInMemDatasetAssembler { private static File createTempFile(String prefix, String suffix) throws IOException { Path path = Files.createTempFile(prefix, suffix); diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/core/mem/AbstractTestTupleTableForms.java b/jena-arq/src/test/java/org/apache/jena/sparql/core/mem/AbstractTestTupleTableForms.java index 7139dfb991..bcab957a90 100644 --- a/jena-arq/src/test/java/org/apache/jena/sparql/core/mem/AbstractTestTupleTableForms.java +++ b/jena-arq/src/test/java/org/apache/jena/sparql/core/mem/AbstractTestTupleTableForms.java @@ -20,16 +20,17 @@ package org.apache.jena.sparql.core.mem; import static java.util.stream.Collectors.toSet; import static org.apache.jena.sparql.core.mem.AbstractTestTupleTable.allWildcardQuery; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.util.Map; import java.util.Set; import java.util.function.Predicate; import java.util.stream.Stream; -import org.junit.Assert; import org.junit.Test; -public abstract class AbstractTestTupleTableForms<TableForm extends Predicate<Set<TupleSlot>>> extends Assert { +public abstract class AbstractTestTupleTableForms<TableForm extends Predicate<Set<TupleSlot>>> { protected abstract Stream<TableForm> tableForms(); diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/core/mem/TestDatasetGraphInMemoryThreading.java b/jena-arq/src/test/java/org/apache/jena/sparql/core/mem/TestDatasetGraphInMemoryThreading.java index 83f43abf3d..f2b44381e9 100644 --- a/jena-arq/src/test/java/org/apache/jena/sparql/core/mem/TestDatasetGraphInMemoryThreading.java +++ b/jena-arq/src/test/java/org/apache/jena/sparql/core/mem/TestDatasetGraphInMemoryThreading.java @@ -18,20 +18,21 @@ package org.apache.jena.sparql.core.mem; -import static org.awaitility.Awaitility.await ; import static org.apache.jena.graph.NodeFactory.createBlankNode ; import static org.apache.jena.query.ReadWrite.READ ; import static org.apache.jena.query.ReadWrite.WRITE ; +import static org.awaitility.Awaitility.await ; +import static org.junit.Assert.*; import static org.slf4j.LoggerFactory.getLogger ; import java.util.concurrent.atomic.AtomicBoolean ; -import org.apache.jena.sparql.core.Quad ; -import org.junit.Assert ; import org.junit.Test ; + +import org.apache.jena.sparql.core.Quad ; import org.slf4j.Logger ; -public class TestDatasetGraphInMemoryThreading extends Assert { +public class TestDatasetGraphInMemoryThreading { Logger log = getLogger(TestDatasetGraphInMemoryThreading.class); @@ -51,7 +52,6 @@ public class TestDatasetGraphInMemoryThreading extends Assert { // we introduce a Writer thread new Thread() { - @Override public void run() { dsg.begin(WRITE); diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/engine/join/AbstractTestInnerJoin.java b/jena-arq/src/test/java/org/apache/jena/sparql/engine/join/AbstractTestInnerJoin.java index 84716b7777..2f15b80ce3 100644 --- a/jena-arq/src/test/java/org/apache/jena/sparql/engine/join/AbstractTestInnerJoin.java +++ b/jena-arq/src/test/java/org/apache/jena/sparql/engine/join/AbstractTestInnerJoin.java @@ -18,10 +18,13 @@ package org.apache.jena.sparql.engine.join; +import static org.junit.Assert.fail; + +import org.junit.Test ; + import org.apache.jena.sparql.algebra.Table ; import org.apache.jena.sparql.core.Var ; import org.apache.jena.sparql.expr.ExprList ; -import org.junit.Test ; /** Tests for inner/equi joins */ public abstract class AbstractTestInnerJoin extends AbstractTestJoin { diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/engine/join/AbstractTestJoin.java b/jena-arq/src/test/java/org/apache/jena/sparql/engine/join/AbstractTestJoin.java index 350332965d..02c84d39f3 100644 --- a/jena-arq/src/test/java/org/apache/jena/sparql/engine/join/AbstractTestJoin.java +++ b/jena-arq/src/test/java/org/apache/jena/sparql/engine/join/AbstractTestJoin.java @@ -18,6 +18,9 @@ package org.apache.jena.sparql.engine.join; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + import java.util.List ; import org.apache.jena.atlas.io.IndentedWriter ; @@ -33,10 +36,9 @@ import org.apache.jena.sparql.engine.binding.Binding ; import org.apache.jena.sparql.expr.ExprList ; import org.apache.jena.sparql.resultset.ResultSetCompare ; import org.apache.jena.sparql.sse.SSE ; -import org.junit.Assert ; /** Tests for inner/equi joins */ -public abstract class AbstractTestJoin extends Assert { +public abstract class AbstractTestJoin { protected static Table table0() { return parseTableInt("(table)") ; } diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/persistent/TestPMap.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/persistent/TestPMap.java index 6a02a9f667..aa39f8ab4d 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/persistent/TestPMap.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/persistent/TestPMap.java @@ -19,16 +19,18 @@ package org.apache.jena.atlas.lib.persistent; import static java.util.stream.Collectors.toMap; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import java.util.Map; import java.util.Map.Entry; import java.util.Optional; import java.util.stream.Stream; -import org.junit.Assert; import org.junit.Test; -public class TestPMap extends Assert { +public class TestPMap { @Test public void containsAddedElement() { diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/persistent/TestPSet.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/persistent/TestPSet.java index 3abfadd12e..ac604496c1 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/persistent/TestPSet.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/persistent/TestPSet.java @@ -19,13 +19,13 @@ package org.apache.jena.atlas.lib.persistent; import static java.util.stream.Collectors.toSet; +import static org.junit.Assert.*; import java.util.Set; -import org.junit.Assert; import org.junit.Test; -public class TestPSet extends Assert { +public class TestPSet { @Test public void plusAndMinusWorkCorrectly() { diff --git a/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/block/AbstractTestBlockMgr.java b/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/block/AbstractTestBlockMgr.java index 7d6d3b7744..5a88ce9fdf 100644 --- a/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/block/AbstractTestBlockMgr.java +++ b/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/block/AbstractTestBlockMgr.java @@ -21,12 +21,12 @@ package org.apache.jena.dboe.base.block; import java.nio.ByteBuffer; import static org.apache.jena.atlas.lib.ByteBufferLib.fill; -import org.junit.Assert; +import static org.junit.Assert.*; import org.junit.After; import org.junit.Before; import org.junit.Test; -public abstract class AbstractTestBlockMgr extends Assert { +public abstract class AbstractTestBlockMgr { static final public int BlkSize = 256; protected BlockMgr blockMgr = null; diff --git a/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/block/TestBlockMgrTracked.java b/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/block/TestBlockMgrTracked.java index 87cefbb51b..189b3ef0d6 100644 --- a/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/block/TestBlockMgrTracked.java +++ b/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/block/TestBlockMgrTracked.java @@ -21,11 +21,11 @@ package org.apache.jena.dboe.base.block; import java.nio.ByteBuffer; import org.junit.AfterClass; -import org.junit.Assert; +import static org.junit.Assert.*; import org.junit.BeforeClass; import org.junit.Test; -public class TestBlockMgrTracked extends Assert +public class TestBlockMgrTracked { // Mainly testing the tracking diff --git a/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/buffer/TestPtrBuffer.java b/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/buffer/TestPtrBuffer.java index 856315433b..f3c35919aa 100644 --- a/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/buffer/TestPtrBuffer.java +++ b/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/buffer/TestPtrBuffer.java @@ -18,15 +18,16 @@ package org.apache.jena.dboe.base.buffer; +import static org.junit.Assert.*; + import java.nio.ByteBuffer; import org.apache.jena.dboe.sys.SystemIndex; import org.junit.AfterClass; -import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -public class TestPtrBuffer extends Assert +public class TestPtrBuffer { static boolean originalNullOut; @BeforeClass static public void beforeClass() { diff --git a/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/buffer/TestRecordBuffer.java b/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/buffer/TestRecordBuffer.java index d076d659d2..9f2a2adbda 100644 --- a/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/buffer/TestRecordBuffer.java +++ b/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/buffer/TestRecordBuffer.java @@ -24,7 +24,7 @@ import static org.apache.jena.dboe.test.RecordLib.r; import java.util.Iterator; import java.util.List; -import org.junit.Assert; +import static org.junit.Assert.*; import org.apache.jena.dboe.base.record.Record; import org.apache.jena.dboe.base.record.RecordFactory; import org.apache.jena.dboe.sys.SystemIndex; @@ -33,7 +33,7 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -public class TestRecordBuffer extends Assert +public class TestRecordBuffer { static RecordFactory recordFactory = new RecordFactory(RecordLib.TestRecordLength, 0); diff --git a/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/file/AbstractTestBlockAccessFixedSize.java b/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/file/AbstractTestBlockAccessFixedSize.java index 78782c833c..a7ad9d67c7 100644 --- a/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/file/AbstractTestBlockAccessFixedSize.java +++ b/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/file/AbstractTestBlockAccessFixedSize.java @@ -18,17 +18,17 @@ package org.apache.jena.dboe.base.file; -import org.junit.Assert; - import static org.apache.jena.dboe.test.BufferTestLib.sameValue; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertTrue; -import org.apache.jena.dboe.base.block.Block; import org.junit.After; import org.junit.Before; import org.junit.Test; -public abstract class AbstractTestBlockAccessFixedSize extends Assert -{ +import org.apache.jena.dboe.base.block.Block; + +public abstract class AbstractTestBlockAccessFixedSize { // Fixed block tests. int blkSize; diff --git a/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/file/AbstractTestBlockAccessVarSize.java b/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/file/AbstractTestBlockAccessVarSize.java index 2b8fafa15f..b6dd8bdc38 100644 --- a/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/file/AbstractTestBlockAccessVarSize.java +++ b/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/file/AbstractTestBlockAccessVarSize.java @@ -21,6 +21,9 @@ package org.apache.jena.dboe.base.file; import static org.apache.jena.dboe.test.BufferTestLib.*; import org.apache.jena.dboe.base.block.Block; + +import static org.junit.Assert.assertNotSame; + import org.junit.Test; public abstract class AbstractTestBlockAccessVarSize extends AbstractTestBlockAccessFixedSize diff --git a/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/file/AbstractTestChannel.java b/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/file/AbstractTestChannel.java index d6ae9474aa..3a6cf67b5d 100644 --- a/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/file/AbstractTestChannel.java +++ b/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/file/AbstractTestChannel.java @@ -20,12 +20,12 @@ package org.apache.jena.dboe.base.file; import java.nio.ByteBuffer; -import org.junit.Assert; +import static org.junit.Assert.*; import org.junit.After; import org.junit.Before; import org.junit.Test; -public abstract class AbstractTestChannel extends Assert +public abstract class AbstractTestChannel { protected abstract BufferChannel open(); diff --git a/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/file/TestMetaFile.java b/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/file/TestMetaFile.java index 2e0ad3092d..19c3adf112 100644 --- a/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/file/TestMetaFile.java +++ b/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/file/TestMetaFile.java @@ -18,16 +18,21 @@ package org.apache.jena.dboe.base.file; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + import java.io.File; -import org.junit.Assert; -import org.apache.jena.dboe.ConfigTestDBOE; -import org.apache.jena.dboe.sys.Names; import org.junit.After; import org.junit.Before; import org.junit.Test; -public class TestMetaFile extends Assert +import org.apache.jena.dboe.ConfigTestDBOE; +import org.apache.jena.dboe.sys.Names; + +public class TestMetaFile { String testfile = null; String testfileMeta = null; diff --git a/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/file/TestSegmentedMemBuffer.java b/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/file/TestSegmentedMemBuffer.java index 56261372f5..b61757ff93 100644 --- a/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/file/TestSegmentedMemBuffer.java +++ b/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/file/TestSegmentedMemBuffer.java @@ -18,13 +18,17 @@ package org.apache.jena.dboe.base.file; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.nio.ByteBuffer; import java.util.Arrays; -import org.junit.Assert; import org.junit.Test; -public class TestSegmentedMemBuffer extends Assert { +public class TestSegmentedMemBuffer { private static byte[] data1 = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; private static byte[] data2 = { 10,11,12 }; diff --git a/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/record/TestRecord.java b/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/record/TestRecord.java index c991771f1c..d3337bd383 100644 --- a/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/record/TestRecord.java +++ b/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/record/TestRecord.java @@ -20,11 +20,13 @@ package org.apache.jena.dboe.base.record; import static org.apache.jena.dboe.test.RecordLib.intToRecord; import static org.apache.jena.dboe.test.RecordLib.recordToInt; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Assert; import org.junit.Test; -public class TestRecord extends Assert +public class TestRecord { static final public int RecLen = 4; diff --git a/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/recordfile/TestRecordBufferPage.java b/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/recordfile/TestRecordBufferPage.java index 76419a72a8..fd3aaf01a4 100644 --- a/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/recordfile/TestRecordBufferPage.java +++ b/jena-db/jena-dboe-base/src/test/java/org/apache/jena/dboe/base/recordfile/TestRecordBufferPage.java @@ -18,7 +18,12 @@ package org.apache.jena.dboe.base.recordfile; -import org.junit.Assert; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + import org.apache.jena.dboe.base.block.BlockMgr; import org.apache.jena.dboe.base.block.BlockMgrFactory; import org.apache.jena.dboe.base.buffer.RecordBuffer; @@ -27,11 +32,8 @@ import org.apache.jena.dboe.base.record.RecordFactory; import org.apache.jena.dboe.base.recordbuffer.RecordBufferPage; import org.apache.jena.dboe.base.recordbuffer.RecordBufferPageMgr; import org.apache.jena.dboe.sys.SystemIndex; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -public class TestRecordBufferPage extends Assert +public class TestRecordBufferPage { // Testing: records are 2 bytes, 3 records per block. diff --git a/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/testlib/AbstractTestRangeIndex.java b/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/testlib/AbstractTestRangeIndex.java index d379b353af..98ab45f318 100644 --- a/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/testlib/AbstractTestRangeIndex.java +++ b/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/testlib/AbstractTestRangeIndex.java @@ -25,16 +25,17 @@ import static org.apache.jena.dboe.index.testlib.IndexTestLib.testInsertDelete; import static org.apache.jena.dboe.test.RecordLib.intToRecord; import static org.apache.jena.dboe.test.RecordLib.r; import static org.apache.jena.dboe.test.RecordLib.toIntList; +import static org.junit.Assert.*; import java.util.Iterator; import java.util.List; +import org.junit.Test; + import org.apache.jena.dboe.base.record.Record; import org.apache.jena.dboe.index.RangeIndex; -import org.junit.Assert; -import org.junit.Test; -public abstract class AbstractTestRangeIndex extends Assert { +public abstract class AbstractTestRangeIndex { protected RangeIndex makeRangeIndex(int order) { return makeRangeIndex(order, order); diff --git a/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/TestBPTreeDistinctKeys.java b/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/TestBPTreeDistinctKeys.java index 364bcf25a5..6d92ddd64a 100644 --- a/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/TestBPTreeDistinctKeys.java +++ b/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/TestBPTreeDistinctKeys.java @@ -34,6 +34,7 @@ import java.util.*; import static org.apache.jena.dboe.index.testlib.IndexTestLib.testInsert; import static org.apache.jena.dboe.test.RecordLib.TestRecordLength; import static org.apache.jena.dboe.test.RecordLib.toIntList; +import static org.junit.Assert.*; @RunWith(Parameterized.class) public class TestBPTreeDistinctKeys extends TestBPTreeModes { diff --git a/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/TestBPTreeRecordsNonTxn.java b/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/TestBPTreeRecordsNonTxn.java index 72d047d44d..8f33959f1f 100644 --- a/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/TestBPTreeRecordsNonTxn.java +++ b/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/TestBPTreeRecordsNonTxn.java @@ -27,9 +27,12 @@ import org.apache.jena.dboe.base.recordbuffer.RecordBufferPage; import org.apache.jena.dboe.base.recordbuffer.RecordBufferPageMgr; import org.apache.jena.dboe.sys.SystemIndex; import org.apache.jena.dboe.test.RecordLib; + +import static org.junit.Assert.*; + import org.junit.*; -public class TestBPTreeRecordsNonTxn extends Assert { +public class TestBPTreeRecordsNonTxn { static private boolean oldNullOut; static private int blockSize; diff --git a/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/TestBPlusTreeNonTxn.java b/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/TestBPlusTreeNonTxn.java index c89628c076..5890d2e027 100644 --- a/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/TestBPlusTreeNonTxn.java +++ b/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/TestBPlusTreeNonTxn.java @@ -20,6 +20,8 @@ package org.apache.jena.dboe.trans.bplustree; import static org.apache.jena.dboe.index.testlib.IndexTestLib.add; import static org.apache.jena.dboe.test.RecordLib.intToRecord; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import java.util.List; diff --git a/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/TestBPlusTreeTxn.java b/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/TestBPlusTreeTxn.java index 85c6bcd67a..6ff1988c2d 100644 --- a/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/TestBPlusTreeTxn.java +++ b/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/TestBPlusTreeTxn.java @@ -18,19 +18,21 @@ package org.apache.jena.dboe.trans.bplustree; +import static org.junit.Assert.*; + +import org.junit.Test; + import org.apache.jena.dboe.base.file.Location; import org.apache.jena.dboe.index.testlib.IndexTestLib; -import org.apache.jena.system.Txn; import org.apache.jena.dboe.test.RecordLib; import org.apache.jena.dboe.transaction.Transactional; import org.apache.jena.dboe.transaction.TransactionalFactory; import org.apache.jena.dboe.transaction.txn.TransactionalComponent; import org.apache.jena.query.ReadWrite; -import org.junit.Assert; -import org.junit.Test; +import org.apache.jena.system.Txn; /** Tests of B+Tree and transactions */ -public class TestBPlusTreeTxn extends Assert { +public class TestBPlusTreeTxn { static BPlusTree createBPTree() { return BPlusTreeFactory.makeMem(2, 2, RecordLib.TestRecordLength, 0); diff --git a/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/rewriter/TestBPlusTreeRewriterNonTxn.java b/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/rewriter/TestBPlusTreeRewriterNonTxn.java index 3d82b09759..8679db152f 100644 --- a/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/rewriter/TestBPlusTreeRewriterNonTxn.java +++ b/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/rewriter/TestBPlusTreeRewriterNonTxn.java @@ -22,6 +22,10 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + import org.apache.jena.atlas.lib.Bytes; import org.apache.jena.dboe.base.block.BlockMgr; import org.apache.jena.dboe.base.block.BlockMgrFactory; @@ -34,13 +38,8 @@ import org.apache.jena.dboe.sys.Names; import org.apache.jena.dboe.trans.bplustree.BPTreeException; import org.apache.jena.dboe.trans.bplustree.BPlusTree; import org.apache.jena.dboe.trans.bplustree.BPlusTreeParams; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; -public class TestBPlusTreeRewriterNonTxn extends Assert -{ +public class TestBPlusTreeRewriterNonTxn { // See also CmdTestBlusTreeRewriter for randomized soak testing. static int KeySize = 4; diff --git a/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/data/TestTxnBlob.java b/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/data/TestTxnBlob.java index 62c394f470..69ae735b8e 100644 --- a/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/data/TestTxnBlob.java +++ b/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/data/TestTxnBlob.java @@ -18,12 +18,19 @@ package org.apache.jena.dboe.trans.data; + +import static org.junit.Assert.*; + import java.util.concurrent.atomic.AtomicReference; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + import org.apache.jena.dboe.base.file.BufferChannel; import org.apache.jena.dboe.base.file.BufferChannelMem; import org.apache.jena.dboe.base.file.Location; -import org.apache.jena.system.Txn; import org.apache.jena.dboe.transaction.Transactional; import org.apache.jena.dboe.transaction.TransactionalFactory; import org.apache.jena.dboe.transaction.txn.ComponentId; @@ -31,12 +38,9 @@ import org.apache.jena.dboe.transaction.txn.journal.Journal; import org.apache.jena.query.ReadWrite; import org.apache.jena.system.ThreadAction; import org.apache.jena.system.ThreadTxn; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.apache.jena.system.Txn; -public class TestTxnBlob extends Assert { +public class TestTxnBlob { private Journal journal; private TransBlob transBlob; private Transactional transactional; diff --git a/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/data/TestTxnBlobPersistent.java b/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/data/TestTxnBlobPersistent.java index d86eaea3e2..bc617af587 100644 --- a/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/data/TestTxnBlobPersistent.java +++ b/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/data/TestTxnBlobPersistent.java @@ -29,9 +29,12 @@ import org.apache.jena.dboe.transaction.Transactional; import org.apache.jena.dboe.transaction.TransactionalFactory; import org.apache.jena.dboe.transaction.txn.ComponentId; import org.apache.jena.dboe.transaction.txn.journal.Journal; + +import static org.junit.Assert.*; + import org.junit.*; -public class TestTxnBlobPersistent extends Assert { +public class TestTxnBlobPersistent { private final static String DIR = "target/blobtest"; private final static String JRNL = DIR+"/journal.jrnl"; private final static String DATA = DIR+"/blob.data"; diff --git a/jena-db/jena-dboe-transaction/src/test/java/org/apache/jena/dboe/transaction/TestTxnLib2.java b/jena-db/jena-dboe-transaction/src/test/java/org/apache/jena/dboe/transaction/TestTxnLib2.java index c1572bc153..30bd5e6dac 100644 --- a/jena-db/jena-dboe-transaction/src/test/java/org/apache/jena/dboe/transaction/TestTxnLib2.java +++ b/jena-db/jena-dboe-transaction/src/test/java/org/apache/jena/dboe/transaction/TestTxnLib2.java @@ -22,8 +22,10 @@ import org.apache.jena.atlas.lib.Pair; import org.apache.jena.dboe.base.file.Location; import org.apache.jena.system.Txn; import org.apache.jena.dboe.transaction.txn.TransactionCoordinator; + +import static org.junit.Assert.*; + import org.junit.After; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -31,7 +33,7 @@ import org.junit.Test; * Rather than a TransactionalComponent, * TransactionalInteger */ -public class TestTxnLib2 extends Assert { +public class TestTxnLib2 { // With setup/teardown / not from AbstractTestTxn private final long InitValue = 7; TransactionalInteger integer; diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestTextNonTxnTDB1.java b/jena-text/src/test/java/org/apache/jena/query/text/TestTextNonTxnTDB1.java index 1bb4b06749..51a17ae13d 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestTextNonTxnTDB1.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestTextNonTxnTDB1.java @@ -22,148 +22,147 @@ import static org.junit.Assert.assertEquals; import java.io.Reader; import java.io.StringReader; -import java.util.List ; +import java.util.List; -import org.apache.jena.atlas.iterator.Iter ; -import org.apache.jena.atlas.junit.AssertExtra ; -import org.apache.jena.atlas.lib.StrUtils ; -import org.apache.jena.query.* ; -import org.apache.jena.rdf.model.Model ; -import org.apache.jena.sparql.core.Quad ; -import org.apache.jena.sparql.sse.SSE ; +import org.junit.Test; + +import org.apache.jena.atlas.iterator.Iter; +import org.apache.jena.atlas.lib.StrUtils; +import org.apache.jena.query.*; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.sparql.core.Quad; +import org.apache.jena.sparql.sse.SSE; import org.apache.jena.tdb1.TDB1; import org.apache.jena.tdb1.TDB1Factory; -import org.apache.jena.vocabulary.RDFS ; +import org.apache.jena.vocabulary.RDFS; import org.apache.lucene.store.ByteBuffersDirectory; -import org.apache.lucene.store.Directory ; -import org.junit.Test ; +import org.apache.lucene.store.Directory; /** Text dataset tests using TDB1 non-transactionally, including context unionDefaultGraph */ -public class TestTextNonTxnTDB1 extends AssertExtra -{ +public class TestTextNonTxnTDB1 { private static Dataset create() { - Dataset ds1 = TDB1Factory.createDataset() ; - Directory dir = new ByteBuffersDirectory() ; + Dataset ds1 = TDB1Factory.createDataset(); + Directory dir = new ByteBuffersDirectory(); EntityDefinition eDef = new EntityDefinition("iri", "text"); eDef.setPrimaryPredicate(RDFS.label); - TextIndex tidx = new TextIndexLucene(dir, new TextIndexConfig(eDef)) ; - Dataset ds = TextDatasetFactory.create(ds1, tidx) ; - return ds ; + TextIndex tidx = new TextIndexLucene(dir, new TextIndexConfig(eDef)); + Dataset ds = TextDatasetFactory.create(ds1, tidx); + return ds; } @Test public void textTDB1_1() { // Check the union graph stil works - Dataset ds = create() ; - ds.getContext().set(TDB1.symUnionDefaultGraph, true) ; - Quad quad = SSE.parseQuad("(<g> <p> rdfs:label 'foo')") ; - ds.asDatasetGraph().add(quad) ; - Query q = QueryFactory.create("SELECT * { ?s ?p ?o }") ; - QueryExecution qexec = QueryExecutionFactory.create(q, ds) ; - ResultSet rs = qexec.execSelect() ; - List<QuerySolution> x = Iter.toList(rs) ; + Dataset ds = create(); + ds.getContext().set(TDB1.symUnionDefaultGraph, true); + Quad quad = SSE.parseQuad("(<g> <p> rdfs:label 'foo')"); + ds.asDatasetGraph().add(quad); + Query q = QueryFactory.create("SELECT * { ?s ?p ?o }"); + QueryExecution qexec = QueryExecutionFactory.create(q, ds); + ResultSet rs = qexec.execSelect(); + List<QuerySolution> x = Iter.toList(rs); assertEquals(1,x.size()); } @Test public void textTDB1_2() { // Check text query and union graph - Dataset ds = create() ; - ds.getContext().set(TDB1.symUnionDefaultGraph, true) ; - Quad quad = SSE.parseQuad("(<g> <s> rdfs:label 'foo')") ; - ds.asDatasetGraph().add(quad) ; + Dataset ds = create(); + ds.getContext().set(TDB1.symUnionDefaultGraph, true); + Quad quad = SSE.parseQuad("(<g> <s> rdfs:label 'foo')"); + ds.asDatasetGraph().add(quad); String qs = StrUtils.strjoinNL("PREFIX text: <http://jena.apache.org/text#>", "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>", "SELECT *", - "{ ?s text:query 'foo' ;", + "{ ?s text:query 'foo';", " rdfs:label 'foo'", "}" - ) ; - Query q = QueryFactory.create(qs) ; - QueryExecution qexec = QueryExecutionFactory.create(q, ds) ; - ResultSet rs = qexec.execSelect() ; - List<QuerySolution> x = Iter.toList(rs) ; + ); + Query q = QueryFactory.create(qs); + QueryExecution qexec = QueryExecutionFactory.create(q, ds); + ResultSet rs = qexec.execSelect(); + List<QuerySolution> x = Iter.toList(rs); assertEquals(1,x.size()); } @Test public void textTDB1_3() { - Dataset ds = create() ; - ds.getContext().set(TDB1.symUnionDefaultGraph, true) ; + Dataset ds = create(); + ds.getContext().set(TDB1.symUnionDefaultGraph, true); data(ds, "(<ex:g1> <s1> rdfs:label 'foo')", - "(<ex:g2> <s2> rdfs:label 'bar')") ; + "(<ex:g2> <s2> rdfs:label 'bar')"); - ds.begin(ReadWrite.READ) ; + ds.begin(ReadWrite.READ); String qs = StrUtils.strjoinNL( "PREFIX text: <http://jena.apache.org/text#>", "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>", "SELECT *", - "{ ?s text:query 'foo' ;", + "{ ?s text:query 'foo';", " rdfs:label 'foo'", "}" - ) ; + ); - Query q = QueryFactory.create(qs) ; - QueryExecution qexec = QueryExecutionFactory.create(q, ds) ; - ResultSet rs = qexec.execSelect() ; - List<QuerySolution> x = Iter.toList(rs) ; - ds.end() ; + Query q = QueryFactory.create(qs); + QueryExecution qexec = QueryExecutionFactory.create(q, ds); + ResultSet rs = qexec.execSelect(); + List<QuerySolution> x = Iter.toList(rs); + ds.end(); assertEquals(1,x.size()); } @Test public void textTDB1_4() { - Dataset ds = create() ; + Dataset ds = create(); data(ds, "(<ex:g1> <s1> rdfs:label 'foo')", "(<ex:g1> <s2> rdfs:label 'apple')", - "(<ex:g2> <s3> rdfs:label 'bar')") ; + "(<ex:g2> <s3> rdfs:label 'bar')"); - ds.begin(ReadWrite.READ) ; + ds.begin(ReadWrite.READ); String qs = StrUtils.strjoinNL( "PREFIX text: <http://jena.apache.org/text#>", "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>", "SELECT *", "FROM <ex:g1>", "{ ?s text:query 'foo' . ?s rdfs:label ?o }" - ) ; - Query q = QueryFactory.create(qs) ; - QueryExecution qexec = QueryExecutionFactory.create(q, ds) ; - ResultSet rs = qexec.execSelect() ; - List<QuerySolution> x = Iter.toList(rs) ; - ds.end() ; + ); + Query q = QueryFactory.create(qs); + QueryExecution qexec = QueryExecutionFactory.create(q, ds); + ResultSet rs = qexec.execSelect(); + List<QuerySolution> x = Iter.toList(rs); + ds.end(); assertEquals(1,x.size()); } @Test public void textTDB1_5() { - Dataset ds = create() ; + Dataset ds = create(); data(ds, "(<ex:g1> <s1> rdfs:label 'foo')", "(<ex:g1> <s2> rdfs:label 'apple')", - "(<ex:g2> <s3> rdfs:label 'food')") ; + "(<ex:g2> <s3> rdfs:label 'food')"); - ds.begin(ReadWrite.READ) ; + ds.begin(ReadWrite.READ); String qs = StrUtils.strjoinNL( "PREFIX text: <http://jena.apache.org/text#>", "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>", "SELECT *", "FROM <"+Quad.unionGraph.getURI()+">", "{ ?s text:query 'foo*' . ?s rdfs:label ?o }" - ) ; - Query q = QueryFactory.create(qs) ; - QueryExecution qexec = QueryExecutionFactory.create(q, ds) ; - ResultSet rs = qexec.execSelect() ; - List<QuerySolution> x = Iter.toList(rs) ; - ds.end() ; + ); + Query q = QueryFactory.create(qs); + QueryExecution qexec = QueryExecutionFactory.create(q, ds); + ResultSet rs = qexec.execSelect(); + List<QuerySolution> x = Iter.toList(rs); + ds.end(); assertEquals(2,x.size()); } @Test public void textTDB1_6() { - Dataset ds = create() ; + Dataset ds = create(); data(ds, "(<ex:g1> <s1> rdfs:label 'foo')", "(<ex:g1> <s2> rdfs:label 'apple')", - "(<ex:g2> <s3> rdfs:label 'food')") ; + "(<ex:g2> <s3> rdfs:label 'food')"); - ds.begin(ReadWrite.READ) ; + ds.begin(ReadWrite.READ); String qs = StrUtils.strjoinNL( "PREFIX text: <http://jena.apache.org/text#>", "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>", @@ -171,17 +170,17 @@ public class TestTextNonTxnTDB1 extends AssertExtra "{ GRAPH <"+Quad.unionGraph.getURI()+">", " { ?s text:query 'foo*' . ?s rdfs:label ?o }", "}" - ) ; - Query q = QueryFactory.create(qs) ; - QueryExecution qexec = QueryExecutionFactory.create(q, ds) ; - ResultSet rs = qexec.execSelect() ; - List<QuerySolution> x = Iter.toList(rs) ; - ds.end() ; + ); + Query q = QueryFactory.create(qs); + QueryExecution qexec = QueryExecutionFactory.create(q, ds); + ResultSet rs = qexec.execSelect(); + List<QuerySolution> x = Iter.toList(rs); + ds.end(); assertEquals(2,x.size()); } @Test public void textTDB1_7_subject_bound_first() { - Dataset ds = create() ; + Dataset ds = create(); data(ds, "(<ex:g1> <s1> rdfs:label 'foo')", "(<ex:g1> <s1> rdf:type <http://example.org/Entity>)", @@ -190,24 +189,24 @@ public class TestTextNonTxnTDB1 extends AssertExtra "(<ex:g2> <s3> rdfs:label 'food')", "(<ex:g2> <s3> rdf:type <http://example.org/Entity>)"); - ds.begin(ReadWrite.READ) ; + ds.begin(ReadWrite.READ); String qs = StrUtils.strjoinNL( "PREFIX text: <http://jena.apache.org/text#>", "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>", "SELECT *", "FROM <ex:g1>", "{ ?s a <http://example.org/Entity> . ?s text:query 'foo' }" - ) ; - Query q = QueryFactory.create(qs) ; - QueryExecution qexec = QueryExecutionFactory.create(q, ds) ; - ResultSet rs = qexec.execSelect() ; - List<QuerySolution> x = Iter.toList(rs) ; - ds.end() ; + ); + Query q = QueryFactory.create(qs); + QueryExecution qexec = QueryExecutionFactory.create(q, ds); + ResultSet rs = qexec.execSelect(); + List<QuerySolution> x = Iter.toList(rs); + ds.end(); assertEquals(1,x.size()); } @Test public void textTDB1_8_bnode_subject() { - Dataset ds = create() ; + Dataset ds = create(); dataTurtle(ds, StrUtils.strjoinNL( "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>", @@ -215,23 +214,23 @@ public class TestTextNonTxnTDB1 extends AssertExtra ) ); - ds.begin(ReadWrite.READ) ; + ds.begin(ReadWrite.READ); String qs = StrUtils.strjoinNL( "PREFIX text: <http://jena.apache.org/text#>", "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>", "SELECT *", "{ ?s text:query 'foo' . ?s a <http://example.org/Entity> }" - ) ; - Query q = QueryFactory.create(qs) ; - QueryExecution qexec = QueryExecutionFactory.create(q, ds) ; - ResultSet rs = qexec.execSelect() ; - List<QuerySolution> x = Iter.toList(rs) ; - ds.end() ; + ); + Query q = QueryFactory.create(qs); + QueryExecution qexec = QueryExecutionFactory.create(q, ds); + ResultSet rs = qexec.execSelect(); + List<QuerySolution> x = Iter.toList(rs); + ds.end(); assertEquals(1,x.size()); } @Test public void textTDB1_9_bnode_subject_bound_first() { - Dataset ds = create() ; + Dataset ds = create(); dataTurtle(ds, StrUtils.strjoinNL( "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>", @@ -239,25 +238,25 @@ public class TestTextNonTxnTDB1 extends AssertExtra ) ); - ds.begin(ReadWrite.READ) ; + ds.begin(ReadWrite.READ); String qs = StrUtils.strjoinNL( "PREFIX text: <http://jena.apache.org/text#>", "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>", "SELECT *", "{ ?s a <http://example.org/Entity> . ?s text:query 'foo' }" - ) ; - Query q = QueryFactory.create(qs) ; - QueryExecution qexec = QueryExecutionFactory.create(q, ds) ; - ResultSet rs = qexec.execSelect() ; - List<QuerySolution> x = Iter.toList(rs) ; - ds.end() ; + ); + Query q = QueryFactory.create(qs); + QueryExecution qexec = QueryExecutionFactory.create(q, ds); + ResultSet rs = qexec.execSelect(); + List<QuerySolution> x = Iter.toList(rs); + ds.end(); assertEquals(1,x.size()); } private static void data(Dataset ds, String... quadStrs) { for ( String qs : quadStrs ) { - Quad quad = SSE.parseQuad(qs) ; - ds.asDatasetGraph().add(quad) ; + Quad quad = SSE.parseQuad(qs); + ds.asDatasetGraph().add(quad); } }
