This is an automated email from the ASF dual-hosted git repository. afs pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/jena.git
commit da0fb4e68144ace68ab0dd31130149c7f766c7a2 Author: Andy Seaborne <[email protected]> AuthorDate: Thu Jun 11 09:09:26 2026 +0100 GH-3236: Convert 'mem' tests to JUnit6 --- .../org/apache/jena/mem/AbstractGraphMemTest.java | 14 ++++--- .../java/org/apache/jena/mem/GraphMemFastTest.java | 10 ++--- .../apache/jena/mem/GraphMemIndexedSetTest.java | 42 +++++++++++--------- .../org/apache/jena/mem/GraphMemRoaringTest.java | 43 ++++++++++++--------- .../java/org/apache/jena/mem/GraphMemTest.java | 19 +++++---- .../org/apache/jena/mem/IndexingStrategyTest.java | 9 +++-- .../mem/{TS4_GraphMem.java => TS6_GraphMem.java} | 14 +++---- .../mem/collection/AbstractJenaMapNodeTest.java | 10 ++--- .../mem/collection/AbstractJenaSetTripleTest.java | 10 ++--- .../jena/mem/collection/FastHashMapTest2.java | 13 ++++--- .../jena/mem/collection/FastHashSetTest.java | 6 +-- .../jena/mem/collection/FastHashSetTest2.java | 9 +++-- .../jena/mem/collection/HashCommonMapTest.java | 4 +- .../jena/mem/collection/HashCommonSetTest.java | 4 +- .../jena/mem/iterator/IteratorOfJenaSetsTest.java | 19 +++++---- .../jena/mem/iterator/SparseArrayIteratorTest.java | 9 +++-- .../jena/mem/pattern/PatternClassifierTest.java | 9 +++-- .../jena/mem/spliterator/ArraySpliteratorTest.java | 18 +++++---- .../mem/spliterator/ArraySubSpliteratorTest.java | 18 +++++---- .../spliterator/SparseArraySpliteratorTest.java | 16 ++++---- .../spliterator/SparseArraySubSpliteratorTest.java | 16 ++++---- .../jena/mem/store/AbstractTripleStoreTest.java | 20 +++++----- .../jena/mem/store/fast/FastArrayBunchTest.java | 3 +- .../mem/store/fast/FastHashedBunchMapTest.java | 5 ++- .../mem/store/fast/FastHashedTripleBunchTest.java | 12 +++--- .../jena/mem/store/fast/FastTripleStoreTest.java | 16 ++++---- .../mem/store/indexed/IndexListIteratorTest.java | 21 +++++----- .../store/indexed/IndexListSpliteratorTest.java | 21 +++++----- .../jena/mem/store/indexed/IndexListTest.java | 7 ++-- .../mem/store/indexed/IndexListsIteratorTest.java | 17 ++++---- .../store/indexed/IndexListsSpliteratorTest.java | 22 +++++------ .../store/indexed/IndexedSetTripleStoreTest.java | 45 +++++++++++++--------- .../jena/mem/store/indexed/NodesToIndicesTest.java | 5 ++- .../jena/mem/store/indexed/TripleSetTest.java | 12 +++--- .../jena/mem/store/legacy/ArrayBunchTest.java | 3 +- .../jena/mem/store/legacy/FieldFilterTest.java | 7 ++-- .../mem/store/legacy/HashedTripleBunchTest.java | 12 +++--- .../mem/store/legacy/LegacyTripleStoreTest.java | 3 +- .../mem/store/legacy/NodeToTriplesMapMemTest.java | 4 +- .../roaring/RoaringBitmapTripleIteratorTest.java | 8 ++-- .../mem/store/roaring/RoaringTripleStoreTest.java | 45 +++++++++++++--------- .../org/apache/jena/test/JenaCoreTestAll_JU4.java | 3 +- .../org/apache/jena/test/JenaCoreTestAll_JU6.java | 3 ++ 43 files changed, 340 insertions(+), 266 deletions(-) diff --git a/jena-core/src/test/java/org/apache/jena/mem/AbstractGraphMemTest.java b/jena-core/src/test/java/org/apache/jena/mem/AbstractGraphMemTest.java index f8ca22888a..86badcf2fa 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/AbstractGraphMemTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/AbstractGraphMemTest.java @@ -23,13 +23,11 @@ package org.apache.jena.mem; import static org.apache.jena.junit.GraphHelper.node; import static org.apache.jena.junit.GraphHelper.triple; +import static org.junit.jupiter.api.Assertions.*; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.apache.jena.datatypes.xsd.impl.XSDDouble; import org.apache.jena.graph.NodeFactory; @@ -45,7 +43,7 @@ public abstract class AbstractGraphMemTest { protected abstract GraphMem createGraph(); - @Before + @BeforeEach public void setUp() { sut = createGraph(); } @@ -1048,6 +1046,10 @@ public abstract class AbstractGraphMemTest { @Test public void testDeleteAll() { + deleteAllWorker() ; + } + + protected void deleteAllWorker() { for(var subjects=1; subjects <= 8 ; subjects++) { for(var predicates=1; predicates <= 8 ; predicates++) { for(var objects=1; objects <= 8 ; objects++) { diff --git a/jena-core/src/test/java/org/apache/jena/mem/GraphMemFastTest.java b/jena-core/src/test/java/org/apache/jena/mem/GraphMemFastTest.java index dc94918737..dc25ae25f1 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/GraphMemFastTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/GraphMemFastTest.java @@ -21,11 +21,11 @@ package org.apache.jena.mem; -import org.junit.Test; - import static org.apache.jena.junit.GraphHelper.triple; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; /** * Concrete instantiation of {@link AbstractGraphMemTest} that exercises @@ -47,7 +47,7 @@ public class GraphMemFastTest extends AbstractGraphMemTest { final var copy = sut.copy(); // The override on GraphMemFast must preserve the runtime type so // callers don't lose subclass-specific functionality through copy(). - assertTrue("copy() must return a GraphMemFast", copy instanceof GraphMemFast); + assertTrue(copy instanceof GraphMemFast, "copy() must return a GraphMemFast"); assertNotSame(sut, copy); } } \ No newline at end of file diff --git a/jena-core/src/test/java/org/apache/jena/mem/GraphMemIndexedSetTest.java b/jena-core/src/test/java/org/apache/jena/mem/GraphMemIndexedSetTest.java index 8ce0233d39..008900f9ce 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/GraphMemIndexedSetTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/GraphMemIndexedSetTest.java @@ -20,40 +20,44 @@ */ package org.apache.jena.mem; +import static org.apache.jena.junit.GraphHelper.triple; +import static org.junit.jupiter.api.Assertions.*; + +import java.util.Arrays; +import java.util.List; +import java.util.stream.Stream; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + import org.apache.jena.graph.Node; import org.apache.jena.graph.Triple; import org.apache.jena.mem.pattern.PatternClassifier; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; import org.mockito.Mockito; -import java.util.Arrays; -import java.util.Collection; - -import static org.apache.jena.junit.GraphHelper.triple; -import static org.junit.Assert.*; - -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("provideArgs") public class GraphMemIndexedSetTest extends AbstractGraphMemTest { - @Parameterized.Parameter - public IndexingStrategy indexingStrategy; - - @Parameterized.Parameters(name = "{0}") - public static Collection<Object[]> data() { - return Arrays.stream(IndexingStrategy.values()) - .map(strategy -> new Object[]{strategy}) + public static Stream<Arguments> provideArgs() { + List<Arguments> args = Arrays.stream(IndexingStrategy.values()) + .map(strategy -> Arguments.of(strategy)) .toList(); + return args.stream(); } + public IndexingStrategy indexingStrategy; + + public GraphMemIndexedSetTest(IndexingStrategy indexingStrategy) { this.indexingStrategy = indexingStrategy; } + @Override public void testDeleteAll() { // the delete test takes almost a minute with MANUAL indexing if(indexingStrategy == IndexingStrategy.MANUAL) return; - - super.testDeleteAll(); + super.deleteAllWorker(); } @Override diff --git a/jena-core/src/test/java/org/apache/jena/mem/GraphMemRoaringTest.java b/jena-core/src/test/java/org/apache/jena/mem/GraphMemRoaringTest.java index 4ff7b5f91f..109e1bbb13 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/GraphMemRoaringTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/GraphMemRoaringTest.java @@ -20,34 +20,41 @@ */ package org.apache.jena.mem; +import static org.apache.jena.junit.GraphHelper.triple; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Arrays; +import java.util.List; +import java.util.stream.Stream; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + import org.apache.jena.graph.Node; import org.apache.jena.graph.Triple; import org.apache.jena.mem.pattern.PatternClassifier; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; import org.mockito.Mockito; -import java.util.Arrays; -import java.util.Collection; - -import static org.apache.jena.junit.GraphHelper.triple; -import static org.junit.Assert.*; - -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("provideArgs") public class GraphMemRoaringTest extends AbstractGraphMemTest { - @Parameterized.Parameter - public IndexingStrategy indexingStrategy; - - @Parameterized.Parameters(name = "{0}") - public static Collection<Object[]> data() { - return Arrays.stream(IndexingStrategy.values()) - .map(strategy -> new Object[]{strategy}) + public static Stream<Arguments> provideArgs() { + List<Arguments> args = Arrays.stream(IndexingStrategy.values()) + .map(strategy -> Arguments.of(strategy)) .toList(); + return args.stream(); } + public IndexingStrategy indexingStrategy; + + public GraphMemRoaringTest(IndexingStrategy indexingStrategy) { this.indexingStrategy = indexingStrategy; } + @Override protected GraphMem createGraph() { return switch (indexingStrategy) { diff --git a/jena-core/src/test/java/org/apache/jena/mem/GraphMemTest.java b/jena-core/src/test/java/org/apache/jena/mem/GraphMemTest.java index 095507ef24..1264ab5537 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/GraphMemTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/GraphMemTest.java @@ -20,18 +20,21 @@ */ package org.apache.jena.mem; -import org.apache.jena.graph.Triple; -import org.apache.jena.mem.store.TripleStore; -import org.apache.jena.util.iterator.NullIterator; -import org.junit.Test; - -import java.util.stream.Stream; - import static org.apache.jena.junit.GraphHelper.node; import static org.apache.jena.junit.GraphHelper.triple; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; +import java.util.stream.Stream; + +import org.junit.jupiter.api.Test; + +import org.apache.jena.graph.Triple; +import org.apache.jena.mem.store.TripleStore; +import org.apache.jena.util.iterator.NullIterator; + public class GraphMemTest { @Test diff --git a/jena-core/src/test/java/org/apache/jena/mem/IndexingStrategyTest.java b/jena-core/src/test/java/org/apache/jena/mem/IndexingStrategyTest.java index 0f2c9ceffd..4564d87350 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/IndexingStrategyTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/IndexingStrategyTest.java @@ -21,10 +21,11 @@ package org.apache.jena.mem; import org.apache.jena.mem.store.indexed.IndexedSetTripleStore; -import org.junit.Test; import static org.apache.jena.junit.GraphHelper.triple; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; + +import org.junit.jupiter.api.Test; /** * Unit tests for the {@link IndexingStrategy} enum: verifies the five @@ -52,9 +53,9 @@ public class IndexingStrategyTest { } } - @Test(expected = IllegalArgumentException.class) + @Test public void valueOfRejectsUnknownNames() { - IndexingStrategy.valueOf("NOT_A_STRATEGY"); + assertThrows(IllegalArgumentException.class, ()->IndexingStrategy.valueOf("NOT_A_STRATEGY")); } @Test diff --git a/jena-core/src/test/java/org/apache/jena/mem/TS4_GraphMem.java b/jena-core/src/test/java/org/apache/jena/mem/TS6_GraphMem.java similarity index 93% rename from jena-core/src/test/java/org/apache/jena/mem/TS4_GraphMem.java rename to jena-core/src/test/java/org/apache/jena/mem/TS6_GraphMem.java index 09aa5836a1..6ce5eae312 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/TS4_GraphMem.java +++ b/jena-core/src/test/java/org/apache/jena/mem/TS6_GraphMem.java @@ -21,6 +21,9 @@ package org.apache.jena.mem; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; + import org.apache.jena.mem.collection.*; import org.apache.jena.mem.iterator.IteratorOfJenaSetsTest; import org.apache.jena.mem.iterator.SparseArrayIteratorTest; @@ -38,11 +41,8 @@ import org.apache.jena.mem.store.legacy.*; import org.apache.jena.mem.store.roaring.RoaringBitmapTripleIteratorTest; import org.apache.jena.mem.store.roaring.RoaringTripleStoreTest; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -@RunWith(Suite.class) [email protected]( { +@Suite +@SelectClasses( { // spliterator/ SparseArraySubSpliteratorTest.class, ArraySubSpliteratorTest.class, @@ -94,9 +94,9 @@ import org.junit.runners.Suite; // -- GraphMemLegacyTest.class, GraphMemFastTest.class, - GraphMemIndexedSetTest.class, + GraphMemIndexedSetTest.class, //5 less - 5 indexing strategies. GraphMemRoaringTest.class, GraphMemTest.class, IndexingStrategyTest.class } ) -public class TS4_GraphMem {} +public class TS6_GraphMem {} diff --git a/jena-core/src/test/java/org/apache/jena/mem/collection/AbstractJenaMapNodeTest.java b/jena-core/src/test/java/org/apache/jena/mem/collection/AbstractJenaMapNodeTest.java index 998028ff38..48b8f5b98f 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/collection/AbstractJenaMapNodeTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/collection/AbstractJenaMapNodeTest.java @@ -24,8 +24,8 @@ package org.apache.jena.mem.collection; import org.apache.jena.graph.Node; import org.hamcrest.collection.IsEmptyCollection; import org.hamcrest.collection.IsIterableContainingInAnyOrder; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collections; @@ -35,7 +35,7 @@ import java.util.stream.StreamSupport; import static org.apache.jena.junit.GraphHelper.node; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public abstract class AbstractJenaMapNodeTest { @@ -43,7 +43,7 @@ public abstract class AbstractJenaMapNodeTest { protected abstract JenaMap<Node, Object> createNodeMap(); - @Before + @BeforeEach public void setUp() { sut = createNodeMap(); } @@ -613,4 +613,4 @@ public abstract class AbstractJenaMapNodeTest { } assertTrue(sut.isEmpty()); } -} \ No newline at end of file +} diff --git a/jena-core/src/test/java/org/apache/jena/mem/collection/AbstractJenaSetTripleTest.java b/jena-core/src/test/java/org/apache/jena/mem/collection/AbstractJenaSetTripleTest.java index fa6d7d329b..9c5e7f9350 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/collection/AbstractJenaSetTripleTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/collection/AbstractJenaSetTripleTest.java @@ -24,8 +24,8 @@ package org.apache.jena.mem.collection; import org.apache.jena.graph.Triple; import org.hamcrest.collection.IsEmptyCollection; import org.hamcrest.collection.IsIterableContainingInAnyOrder; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collections; @@ -35,7 +35,7 @@ import java.util.stream.StreamSupport; import static org.apache.jena.junit.GraphHelper.triple; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public abstract class AbstractJenaSetTripleTest { @@ -43,7 +43,7 @@ public abstract class AbstractJenaSetTripleTest { protected abstract JenaSet<Triple> createTripleSet(); - @Before + @BeforeEach public void setUp() { sut = createTripleSet(); } @@ -363,4 +363,4 @@ public abstract class AbstractJenaSetTripleTest { } assertTrue(sut.isEmpty()); } -} \ No newline at end of file +} diff --git a/jena-core/src/test/java/org/apache/jena/mem/collection/FastHashMapTest2.java b/jena-core/src/test/java/org/apache/jena/mem/collection/FastHashMapTest2.java index f1428e0826..d8bb11e5be 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/collection/FastHashMapTest2.java +++ b/jena-core/src/test/java/org/apache/jena/mem/collection/FastHashMapTest2.java @@ -20,15 +20,18 @@ */ package org.apache.jena.mem.collection; -import org.apache.jena.graph.Node; -import org.junit.Test; +import static org.apache.jena.junit.GraphHelper.node; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; -import java.util.function.UnaryOperator; import java.util.HashMap; import java.util.HashSet; +import java.util.function.UnaryOperator; -import static org.apache.jena.junit.GraphHelper.node; -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; + +import org.apache.jena.graph.Node; public class FastHashMapTest2 { diff --git a/jena-core/src/test/java/org/apache/jena/mem/collection/FastHashSetTest.java b/jena-core/src/test/java/org/apache/jena/mem/collection/FastHashSetTest.java index 7c4c1c7c1e..32f0ecbf9e 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/collection/FastHashSetTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/collection/FastHashSetTest.java @@ -18,13 +18,11 @@ * * SPDX-License-Identifier: Apache-2.0 */ + package org.apache.jena.mem.collection; import org.apache.jena.graph.Triple; -/** - * This test shall test only the parts of the {@link FastHashSet} which are not tested by the {@link AbstractJenaSetTripleTest}. - */ public class FastHashSetTest extends AbstractJenaSetTripleTest { @Override protected JenaSet<Triple> createTripleSet() { @@ -35,4 +33,4 @@ public class FastHashSetTest extends AbstractJenaSetTripleTest { } }; } -} \ No newline at end of file +} diff --git a/jena-core/src/test/java/org/apache/jena/mem/collection/FastHashSetTest2.java b/jena-core/src/test/java/org/apache/jena/mem/collection/FastHashSetTest2.java index f1c62115eb..40b4f63707 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/collection/FastHashSetTest2.java +++ b/jena-core/src/test/java/org/apache/jena/mem/collection/FastHashSetTest2.java @@ -20,13 +20,14 @@ */ package org.apache.jena.mem.collection; -import org.junit.Before; -import org.junit.Test; import java.util.List; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + import static org.apache.jena.junit.GraphHelper.node; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * This test shall test only the parts of the {@link FastHashSet} which are not tested by the {@link AbstractJenaSetTripleTest}. @@ -35,7 +36,7 @@ public class FastHashSetTest2 { private FastHashSet<String> sut; - @Before + @BeforeEach public void setUp() { sut = new FastStringHashSet(); } diff --git a/jena-core/src/test/java/org/apache/jena/mem/collection/HashCommonMapTest.java b/jena-core/src/test/java/org/apache/jena/mem/collection/HashCommonMapTest.java index fb5550d03e..91eb8e042c 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/collection/HashCommonMapTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/collection/HashCommonMapTest.java @@ -21,12 +21,12 @@ package org.apache.jena.mem.collection; import org.apache.jena.graph.Node; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.function.UnaryOperator; import static org.apache.jena.junit.GraphHelper.node; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HashCommonMapTest extends AbstractJenaMapNodeTest { diff --git a/jena-core/src/test/java/org/apache/jena/mem/collection/HashCommonSetTest.java b/jena-core/src/test/java/org/apache/jena/mem/collection/HashCommonSetTest.java index b8f7d1657c..67091bfea5 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/collection/HashCommonSetTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/collection/HashCommonSetTest.java @@ -21,10 +21,10 @@ package org.apache.jena.mem.collection; import org.apache.jena.graph.Triple; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.apache.jena.junit.GraphHelper.triple; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class HashCommonSetTest extends AbstractJenaSetTripleTest { diff --git a/jena-core/src/test/java/org/apache/jena/mem/iterator/IteratorOfJenaSetsTest.java b/jena-core/src/test/java/org/apache/jena/mem/iterator/IteratorOfJenaSetsTest.java index 02779ea8f6..cf1e88d4b7 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/iterator/IteratorOfJenaSetsTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/iterator/IteratorOfJenaSetsTest.java @@ -20,16 +20,19 @@ */ package org.apache.jena.mem.iterator; -import org.hamcrest.collection.IsIterableContainingInAnyOrder; -import org.junit.Before; -import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.apache.jena.mem.collection.FastHashSet; -import org.apache.jena.mem.collection.JenaSet; import java.util.*; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.*; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import org.apache.jena.mem.collection.FastHashSet; +import org.apache.jena.mem.collection.JenaSet; +import org.hamcrest.collection.IsIterableContainingInAnyOrder; public class IteratorOfJenaSetsTest { @@ -37,7 +40,7 @@ public class IteratorOfJenaSetsTest { private IteratorOfJenaSets<String> sut; private Iterator<JenaSet<String>> parentIterator; - @Before + @BeforeEach public void setUp() { parentIterator = Arrays.asList( new StringSet("1.1", "1.2"), diff --git a/jena-core/src/test/java/org/apache/jena/mem/iterator/SparseArrayIteratorTest.java b/jena-core/src/test/java/org/apache/jena/mem/iterator/SparseArrayIteratorTest.java index 3ff22e6d36..75fdf5a9ca 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/iterator/SparseArrayIteratorTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/iterator/SparseArrayIteratorTest.java @@ -20,13 +20,14 @@ */ package org.apache.jena.mem.iterator; -import org.apache.jena.mem.collection.FastHashSet; -import org.apache.jena.mem.collection.JenaSet; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.*; import java.util.NoSuchElementException; -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; + +import org.apache.jena.mem.collection.FastHashSet; +import org.apache.jena.mem.collection.JenaSet; public class SparseArrayIteratorTest { diff --git a/jena-core/src/test/java/org/apache/jena/mem/pattern/PatternClassifierTest.java b/jena-core/src/test/java/org/apache/jena/mem/pattern/PatternClassifierTest.java index fcc8457160..113e3f594b 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/pattern/PatternClassifierTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/pattern/PatternClassifierTest.java @@ -20,12 +20,13 @@ */ package org.apache.jena.mem.pattern; -import org.apache.jena.graph.Node; -import org.junit.Test; - import static org.apache.jena.junit.GraphHelper.node; import static org.apache.jena.junit.GraphHelper.triple; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; + +import org.apache.jena.graph.Node; /** * Unit tests for {@link PatternClassifier}: maps a triple match into one of diff --git a/jena-core/src/test/java/org/apache/jena/mem/spliterator/ArraySpliteratorTest.java b/jena-core/src/test/java/org/apache/jena/mem/spliterator/ArraySpliteratorTest.java index b71d43f2ca..2086cb099f 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/spliterator/ArraySpliteratorTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/spliterator/ArraySpliteratorTest.java @@ -21,15 +21,19 @@ package org.apache.jena.mem.spliterator; -import org.apache.jena.mem.collection.FastHashSet; -import org.apache.jena.mem.collection.JenaSet; -import org.junit.Test; +import static java.util.Spliterator.DISTINCT; +import static java.util.Spliterator.NONNULL; +import static java.util.Spliterator.SIZED; +import static java.util.Spliterator.SUBSIZED; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Spliterator; -import static java.util.Spliterator.*; -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; + +import org.apache.jena.mem.collection.FastHashSet; +import org.apache.jena.mem.collection.JenaSet; public class ArraySpliteratorTest { @@ -200,8 +204,8 @@ public class ArraySpliteratorTest { } private void assertBetween(long min, long max, long estimateSize) { - assertTrue("estimateSize=" + estimateSize + " min=" + min + " max=" + max, estimateSize >= min); - assertTrue("estimateSize=" + estimateSize + " min=" + min + " max=" + max, estimateSize <= max); + assertTrue(estimateSize >= min, "estimateSize=" + estimateSize + " min=" + min + " max=" + max); + assertTrue(estimateSize <= max, "estimateSize=" + estimateSize + " min=" + min + " max=" + max); } @Test diff --git a/jena-core/src/test/java/org/apache/jena/mem/spliterator/ArraySubSpliteratorTest.java b/jena-core/src/test/java/org/apache/jena/mem/spliterator/ArraySubSpliteratorTest.java index dd08a063c4..639feb6254 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/spliterator/ArraySubSpliteratorTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/spliterator/ArraySubSpliteratorTest.java @@ -20,15 +20,19 @@ */ package org.apache.jena.mem.spliterator; -import org.apache.jena.mem.collection.FastHashSet; -import org.apache.jena.mem.collection.JenaSet; -import org.junit.Test; +import static java.util.Spliterator.DISTINCT; +import static java.util.Spliterator.NONNULL; +import static java.util.Spliterator.SIZED; +import static java.util.Spliterator.SUBSIZED; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Spliterator; -import static java.util.Spliterator.*; -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; + +import org.apache.jena.mem.collection.FastHashSet; +import org.apache.jena.mem.collection.JenaSet; public class ArraySubSpliteratorTest { @@ -199,8 +203,8 @@ public class ArraySubSpliteratorTest { } private void assertBetween(long min, long max, long estimateSize) { - assertTrue("estimateSize=" + estimateSize + " min=" + min + " max=" + max, estimateSize >= min); - assertTrue("estimateSize=" + estimateSize + " min=" + min + " max=" + max, estimateSize <= max); + assertTrue(estimateSize >= min, "estimateSize=" + estimateSize + " min=" + min + " max=" + max); + assertTrue(estimateSize <= max, "estimateSize=" + estimateSize + " min=" + min + " max=" + max); } @Test diff --git a/jena-core/src/test/java/org/apache/jena/mem/spliterator/SparseArraySpliteratorTest.java b/jena-core/src/test/java/org/apache/jena/mem/spliterator/SparseArraySpliteratorTest.java index e90061e47a..0e37698071 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/spliterator/SparseArraySpliteratorTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/spliterator/SparseArraySpliteratorTest.java @@ -20,15 +20,17 @@ */ package org.apache.jena.mem.spliterator; -import org.apache.jena.mem.collection.FastHashSet; -import org.apache.jena.mem.collection.JenaSet; -import org.junit.Test; +import static java.util.Spliterator.DISTINCT; +import static java.util.Spliterator.NONNULL; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Spliterator; -import static java.util.Spliterator.*; -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; + +import org.apache.jena.mem.collection.FastHashSet; +import org.apache.jena.mem.collection.JenaSet; public class SparseArraySpliteratorTest { @@ -418,8 +420,8 @@ public class SparseArraySpliteratorTest { } private void assertBetween(long min, long max, long estimateSize) { - assertTrue("estimateSize=" + estimateSize + " min=" + min + " max=" + max, estimateSize >= min); - assertTrue("estimateSize=" + estimateSize + " min=" + min + " max=" + max, estimateSize <= max); + assertTrue(estimateSize >= min, "estimateSize=" + estimateSize + " min=" + min + " max=" + max); + assertTrue(estimateSize <= max, "estimateSize=" + estimateSize + " min=" + min + " max=" + max); } @Test diff --git a/jena-core/src/test/java/org/apache/jena/mem/spliterator/SparseArraySubSpliteratorTest.java b/jena-core/src/test/java/org/apache/jena/mem/spliterator/SparseArraySubSpliteratorTest.java index a750578e70..87b812ef03 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/spliterator/SparseArraySubSpliteratorTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/spliterator/SparseArraySubSpliteratorTest.java @@ -20,15 +20,17 @@ */ package org.apache.jena.mem.spliterator; -import org.apache.jena.mem.collection.FastHashSet; -import org.apache.jena.mem.collection.JenaSet; -import org.junit.Test; +import static java.util.Spliterator.DISTINCT; +import static java.util.Spliterator.NONNULL; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Spliterator; -import static java.util.Spliterator.*; -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; + +import org.apache.jena.mem.collection.FastHashSet; +import org.apache.jena.mem.collection.JenaSet; public class SparseArraySubSpliteratorTest { @@ -421,8 +423,8 @@ public class SparseArraySubSpliteratorTest { } private void assertBetween(long min, long max, long estimateSize) { - assertTrue("estimateSize=" + estimateSize + " min=" + min + " max=" + max, estimateSize >= min); - assertTrue("estimateSize=" + estimateSize + " min=" + min + " max=" + max, estimateSize <= max); + assertTrue(estimateSize >= min, "estimateSize=" + estimateSize + " min=" + min + " max=" + max); + assertTrue(estimateSize <= max, "estimateSize=" + estimateSize + " min=" + min + " max=" + max); } @Test diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/AbstractTripleStoreTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/AbstractTripleStoreTest.java index d0bdb2364b..e19ca45b0e 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/store/AbstractTripleStoreTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/store/AbstractTripleStoreTest.java @@ -21,18 +21,21 @@ package org.apache.jena.mem.store; +import static org.apache.jena.junit.GraphHelper.node; +import static org.apache.jena.junit.GraphHelper.triple; +import static org.hamcrest.MatcherAssert.assertThat; +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.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + import org.apache.jena.datatypes.xsd.impl.XSDDouble; import org.apache.jena.graph.NodeFactory; import org.apache.jena.graph.Triple; import org.hamcrest.collection.IsEmptyCollection; import org.hamcrest.collection.IsIterableContainingInAnyOrder; -import org.junit.Before; -import org.junit.Test; - -import static org.apache.jena.junit.GraphHelper.node; -import static org.apache.jena.junit.GraphHelper.triple; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.*; public abstract class AbstractTripleStoreTest { @@ -40,7 +43,7 @@ public abstract class AbstractTripleStoreTest { protected abstract TripleStore createTripleStore(); - @Before + @BeforeEach public void setUp() { sut = createTripleStore(); } @@ -54,7 +57,6 @@ public abstract class AbstractTripleStoreTest { assertTrue(sut.isEmpty()); } - @Test public void testDelete() { sut.add(triple("x R y")); diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastArrayBunchTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastArrayBunchTest.java index 70fa266499..513d6aa6ba 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastArrayBunchTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastArrayBunchTest.java @@ -18,6 +18,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ + package org.apache.jena.mem.store.fast; import org.apache.jena.graph.Triple; @@ -51,4 +52,4 @@ public class FastArrayBunchTest extends AbstractJenaSetTripleTest { return a.equals(b); } } -} \ No newline at end of file +} diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastHashedBunchMapTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastHashedBunchMapTest.java index de969decea..0a1fc594ac 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastHashedBunchMapTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastHashedBunchMapTest.java @@ -18,14 +18,15 @@ * * SPDX-License-Identifier: Apache-2.0 */ + package org.apache.jena.mem.store.fast; import org.apache.jena.graph.Node; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.apache.jena.junit.GraphHelper.node; import static org.apache.jena.junit.GraphHelper.triple; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * Unit tests for {@link FastHashedBunchMap}: a {@link Node}-keyed map of diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastHashedTripleBunchTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastHashedTripleBunchTest.java index da6f362174..de45034b0d 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastHashedTripleBunchTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastHashedTripleBunchTest.java @@ -18,15 +18,17 @@ * * SPDX-License-Identifier: Apache-2.0 */ + package org.apache.jena.mem.store.fast; +import static org.apache.jena.junit.GraphHelper.triple; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; + import org.apache.jena.graph.Triple; import org.apache.jena.mem.collection.AbstractJenaSetTripleTest; import org.apache.jena.mem.collection.JenaSet; -import org.junit.Test; - -import static org.apache.jena.junit.GraphHelper.triple; -import static org.junit.Assert.assertEquals; public class FastHashedTripleBunchTest extends AbstractJenaSetTripleTest { @@ -72,4 +74,4 @@ public class FastHashedTripleBunchTest extends AbstractJenaSetTripleTest { return a.equals(b); } } -} \ No newline at end of file +} diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastTripleStoreTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastTripleStoreTest.java index 2f31d5b132..154b251d08 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastTripleStoreTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastTripleStoreTest.java @@ -18,16 +18,18 @@ * * SPDX-License-Identifier: Apache-2.0 */ + package org.apache.jena.mem.store.fast; +import static org.apache.jena.junit.GraphHelper.triple; +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.jupiter.api.Test; + import org.apache.jena.mem.store.AbstractTripleStoreTest; import org.apache.jena.mem.store.TripleStore; -import org.junit.Test; - -import static junit.framework.TestCase.assertEquals; -import static org.apache.jena.junit.GraphHelper.triple; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; public class FastTripleStoreTest extends AbstractTripleStoreTest { @@ -100,4 +102,4 @@ public class FastTripleStoreTest extends AbstractTripleStoreTest { assertEquals(0, sut.stream(triple("?? P0 oX")).count()); assertFalse(sut.contains(triple("?? P0 oX"))); } -} \ No newline at end of file +} diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListIteratorTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListIteratorTest.java index 0e630a63d2..b29120f22f 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListIteratorTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListIteratorTest.java @@ -18,11 +18,12 @@ * * SPDX-License-Identifier: Apache-2.0 */ + package org.apache.jena.mem.store.indexed; import org.apache.jena.graph.Triple; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.ConcurrentModificationException; @@ -30,7 +31,7 @@ import java.util.HashSet; import java.util.NoSuchElementException; import static org.apache.jena.junit.GraphHelper.triple; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * Unit tests for {@link IndexListIterator}: iterates an {@link IndexList} of @@ -45,7 +46,7 @@ public class IndexListIteratorTest { private Triple t3; private int idx2; - @Before + @BeforeEach public void setUp() { triples = new TripleSet(); list = new IndexList(); @@ -80,11 +81,11 @@ public class IndexListIteratorTest { assertFalse(it.hasNext()); } - @Test(expected = NoSuchElementException.class) + @Test public void nextThrowsWhenExhausted() { final var emptyList = new IndexList(); final var it = new IndexListIterator(triples, emptyList); - it.next(); + assertThrows(NoSuchElementException.class, () -> it.next()); } @Test @@ -99,20 +100,20 @@ public class IndexListIteratorTest { assertEquals(expected, collected); } - @Test(expected = ConcurrentModificationException.class) + @Test public void nextDetectsConcurrentModification() { final var it = new IndexListIterator(triples, list); // Adding a new triple to the canonical set after constructing the // iterator must invalidate it. triples.addAndGetIndex(triple("s4 p4 o4")); - it.next(); + assertThrows(ConcurrentModificationException.class, () -> it.next()); } - @Test(expected = ConcurrentModificationException.class) + @Test public void forEachRemainingDetectsConcurrentModification() { final var it = new IndexListIterator(triples, list); triples.addAndGetIndex(triple("s5 p5 o5")); - it.forEachRemaining(t -> {}); + assertThrows(ConcurrentModificationException.class, () -> it.forEachRemaining(t -> {})); } @Test diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListSpliteratorTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListSpliteratorTest.java index 391bd98e5c..d0ae4ec82e 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListSpliteratorTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListSpliteratorTest.java @@ -18,17 +18,18 @@ * * SPDX-License-Identifier: Apache-2.0 */ + package org.apache.jena.mem.store.indexed; import org.apache.jena.graph.Triple; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.*; import java.util.stream.StreamSupport; import static org.apache.jena.junit.GraphHelper.triple; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * Unit tests for {@link IndexListSpliterator}: walks an {@link IndexList}, @@ -41,7 +42,7 @@ public class IndexListSpliteratorTest { private IndexList list; private List<Triple> expected; - @Before + @BeforeEach public void setUp() { triples = new TripleSet(); list = new IndexList(); @@ -89,7 +90,7 @@ public class IndexListSpliteratorTest { public void trySplitProducesNonOverlappingHalves() { final var sp = new IndexListSpliterator(triples, list); final var prefix = sp.trySplit(); - assertNotNull("a list of 8 must split", prefix); + assertNotNull(prefix, "a list of 8 must split"); final var firstHalf = new ArrayList<Triple>(); final var secondHalf = new ArrayList<Triple>(); @@ -105,7 +106,7 @@ public class IndexListSpliteratorTest { // The two halves are disjoint final var asSetA = new HashSet<>(firstHalf); for (final var t : secondHalf) { - assertFalse("split must be disjoint", asSetA.contains(t)); + assertFalse(asSetA.contains(t), "split must be disjoint"); } } @@ -140,17 +141,17 @@ public class IndexListSpliteratorTest { assertEquals(expected.size() - 1L, sp.getExactSizeIfKnown()); } - @Test(expected = ConcurrentModificationException.class) + @Test public void tryAdvanceDetectsConcurrentModification() { final var sp = new IndexListSpliterator(triples, list); triples.addAndGetIndex(triple("s99 p o")); - sp.tryAdvance(t -> {}); + assertThrows(ConcurrentModificationException.class, () -> sp.tryAdvance(t -> {})); } - @Test(expected = ConcurrentModificationException.class) + @Test public void forEachRemainingDetectsConcurrentModification() { final var sp = new IndexListSpliterator(triples, list); triples.addAndGetIndex(triple("s99 p o")); - sp.forEachRemaining(t -> {}); + assertThrows(ConcurrentModificationException.class, () -> sp.forEachRemaining(t -> {})); } } diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListTest.java index 7bb68b50e4..c30484817e 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListTest.java @@ -18,11 +18,12 @@ * * SPDX-License-Identifier: Apache-2.0 */ + package org.apache.jena.mem.store.indexed; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * Unit tests for {@link IndexList}: append-only int list with O(1) @@ -66,7 +67,7 @@ public class IndexListTest { for (int i = 0; i < 100; i++) { assertEquals(i * 7, list.getIndexAt(i)); } - assertTrue("backing array must have grown", list.getIndices().length >= 100); + assertTrue(list.getIndices().length >= 100, "backing array must have grown"); } @Test diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListsIteratorTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListsIteratorTest.java index a33728a4fc..3dac19707b 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListsIteratorTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListsIteratorTest.java @@ -18,16 +18,17 @@ * * SPDX-License-Identifier: Apache-2.0 */ + package org.apache.jena.mem.store.indexed; import org.apache.jena.graph.Triple; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.*; import static org.apache.jena.junit.GraphHelper.triple; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * Unit tests for {@link IndexListsIterator}: lazily walks the intersection @@ -39,7 +40,7 @@ public class IndexListsIteratorTest { private int[] reverseA; private int[] reverseB; - @Before + @BeforeEach public void setUp() { triples = new TripleSet(); // pre-size reverse arrays generously; the test triples will get @@ -106,7 +107,7 @@ public class IndexListsIteratorTest { assertFalse(it.hasNext()); } - @Test(expected = NoSuchElementException.class) + @Test public void nextThrowsWhenIntersectionExhausted() { final int idx1 = addTriple("a b c"); final int idx2 = addTriple("d e f"); @@ -118,7 +119,7 @@ public class IndexListsIteratorTest { final var it = new IndexListsIterator(triples, listA, reverseA, listB, reverseB); - it.next(); + assertThrows(NoSuchElementException.class, () -> it.next()); } @Test @@ -194,7 +195,7 @@ public class IndexListsIteratorTest { new HashSet<>(collected)); } - @Test(expected = ConcurrentModificationException.class) + @Test public void nextDetectsConcurrentModification() { final int idx1 = addTriple("a b c"); @@ -206,6 +207,6 @@ public class IndexListsIteratorTest { final var it = new IndexListsIterator(triples, listA, reverseA, listB, reverseB); triples.addAndGetIndex(triple("z z z")); - it.next(); + assertThrows(ConcurrentModificationException.class, () -> it.next()); } } diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListsSpliteratorTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListsSpliteratorTest.java index 0ec83b6a1d..8a3a303539 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListsSpliteratorTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListsSpliteratorTest.java @@ -18,17 +18,18 @@ * * SPDX-License-Identifier: Apache-2.0 */ + package org.apache.jena.mem.store.indexed; import org.apache.jena.graph.Triple; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.*; import java.util.stream.StreamSupport; import static org.apache.jena.junit.GraphHelper.triple; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * Unit tests for {@link IndexListsSpliterator}: walks the intersection of @@ -43,7 +44,7 @@ public class IndexListsSpliteratorTest { private IndexList listB; private List<Triple> commonTriples; - @Before + @BeforeEach public void setUp() { triples = new TripleSet(); reverseA = new int[64]; @@ -126,7 +127,7 @@ public class IndexListsSpliteratorTest { final var asSetA = new HashSet<>(firstHalf); for (final var t : secondHalf) { - assertFalse("split must be disjoint", asSetA.contains(t)); + assertFalse(asSetA.contains(t), "split must be disjoint"); } } @@ -167,21 +168,20 @@ public class IndexListsSpliteratorTest { // estimateSize is the remaining range of the smaller list, which is // an upper bound on the intersection. final long est = sp.estimateSize(); - assertTrue("estimate must bound actual intersection", - est >= commonTriples.size()); + assertTrue(est >= commonTriples.size(), "estimate must bound actual intersection"); } - @Test(expected = ConcurrentModificationException.class) + @Test public void tryAdvanceDetectsConcurrentModification() { final var sp = new IndexListsSpliterator(triples, listA, reverseA, listB, reverseB); triples.addAndGetIndex(triple("z z z")); - sp.tryAdvance(t -> {}); + assertThrows(ConcurrentModificationException.class, () -> sp.tryAdvance(t -> {})); } - @Test(expected = ConcurrentModificationException.class) + @Test public void forEachRemainingDetectsConcurrentModification() { final var sp = new IndexListsSpliterator(triples, listA, reverseA, listB, reverseB); triples.addAndGetIndex(triple("z z z")); - sp.forEachRemaining(t -> {}); + assertThrows(ConcurrentModificationException.class, () -> sp.forEachRemaining(t -> {})); } } diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexedSetTripleStoreTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexedSetTripleStoreTest.java index bec5daa6e7..bf204834bc 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexedSetTripleStoreTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexedSetTripleStoreTest.java @@ -18,37 +18,46 @@ * * SPDX-License-Identifier: Apache-2.0 */ + package org.apache.jena.mem.store.indexed; +import static org.apache.jena.junit.GraphHelper.triple; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Arrays; +import java.util.List; +import java.util.stream.Stream; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + import org.apache.jena.graph.Triple; import org.apache.jena.mem.IndexingStrategy; import org.apache.jena.mem.pattern.PatternClassifier; import org.apache.jena.mem.store.AbstractTripleStoreTest; import org.apache.jena.mem.store.TripleStore; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; import org.mockito.Mockito; -import java.util.Arrays; -import java.util.Collection; - -import static org.apache.jena.junit.GraphHelper.triple; -import static org.junit.Assert.*; - -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("provideArgs") public class IndexedSetTripleStoreTest extends AbstractTripleStoreTest { - @Parameterized.Parameter - public IndexingStrategy indexingStrategy; - - @Parameterized.Parameters(name = "{0}") - public static Collection<Object[]> data() { - return Arrays.stream(IndexingStrategy.values()) - .map(strategy -> new Object[]{strategy}) + public static Stream<Arguments> provideArgs() { + List<Arguments> args = Arrays.stream(IndexingStrategy.values()) + .map(strategy -> Arguments.of(strategy)) .toList(); + return args.stream(); } + public IndexingStrategy indexingStrategy; + + public IndexedSetTripleStoreTest(IndexingStrategy indexingStrategy) { this.indexingStrategy = indexingStrategy; } + @Override protected TripleStore createTripleStore() { return switch (indexingStrategy) { @@ -245,4 +254,4 @@ public class IndexedSetTripleStoreTest extends AbstractTripleStoreTest { throw new IllegalArgumentException("Unsupported indexing strategy: " + sut.getIndexingStrategy()); } } -} \ No newline at end of file +} diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/NodesToIndicesTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/NodesToIndicesTest.java index 950aaa13a6..2566dbee3e 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/NodesToIndicesTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/NodesToIndicesTest.java @@ -18,13 +18,14 @@ * * SPDX-License-Identifier: Apache-2.0 */ + package org.apache.jena.mem.store.indexed; import org.apache.jena.graph.Node; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.apache.jena.junit.GraphHelper.node; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * Unit tests for {@link NodesToIndices}: {@link Node}-keyed diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/TripleSetTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/TripleSetTest.java index 884d73c746..6fd9911c17 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/TripleSetTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/TripleSetTest.java @@ -18,14 +18,15 @@ * * SPDX-License-Identifier: Apache-2.0 */ + package org.apache.jena.mem.store.indexed; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.concurrent.atomic.AtomicInteger; import static org.apache.jena.junit.GraphHelper.triple; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * Unit tests for {@link TripleSet}: hash set of triples extended with a @@ -59,7 +60,7 @@ public class TripleSetTest { // Re-adding the same triple returns the bitwise-complement of the // existing index. final int reAdd = set.addAndGetIndex(t1); - assertTrue("re-add must return ~existingIndex", reAdd < 0); + assertTrue(reAdd < 0, "re-add must return ~existingIndex"); assertEquals(i1, ~reAdd); assertEquals(2, set.size()); } @@ -88,9 +89,8 @@ public class TripleSetTest { set.addAndGetIndex(triple("s" + i + " p o")); } - assertTrue("hook must fire at least once when growing", callCount.get() > 0); - assertTrue("reported size must be a positive integer (the new array length)", - lastReportedSize.get() > 0); + assertTrue(callCount.get() > 0, "hook must fire at least once when growing"); + assertTrue(lastReportedSize.get() > 0, "reported size must be a positive integer (the new array length)"); } @Test diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/legacy/ArrayBunchTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/legacy/ArrayBunchTest.java index 5df2cab4e6..cbc83499b0 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/store/legacy/ArrayBunchTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/store/legacy/ArrayBunchTest.java @@ -18,6 +18,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ + package org.apache.jena.mem.store.legacy; import org.apache.jena.graph.Triple; @@ -30,4 +31,4 @@ public class ArrayBunchTest extends AbstractJenaSetTripleTest { protected JenaSet<Triple> createTripleSet() { return new ArrayBunch(); } -} \ No newline at end of file +} diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/legacy/FieldFilterTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/legacy/FieldFilterTest.java index 52ad0e91f8..253c53b72d 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/store/legacy/FieldFilterTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/store/legacy/FieldFilterTest.java @@ -18,15 +18,16 @@ * * SPDX-License-Identifier: Apache-2.0 */ + package org.apache.jena.mem.store.legacy; import org.apache.jena.graph.Node; import org.apache.jena.graph.Triple; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.apache.jena.junit.GraphHelper.node; import static org.apache.jena.junit.GraphHelper.triple; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class FieldFilterTest { @@ -69,4 +70,4 @@ public class FieldFilterTest { assertFalse(sut.getFilter().test(triple("s P o2"))); assertFalse(sut.getFilter().test(triple("t P o"))); } -} \ No newline at end of file +} diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/legacy/HashedTripleBunchTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/legacy/HashedTripleBunchTest.java index 5626ea89c6..8b4774ff29 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/store/legacy/HashedTripleBunchTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/store/legacy/HashedTripleBunchTest.java @@ -18,15 +18,17 @@ * * SPDX-License-Identifier: Apache-2.0 */ + package org.apache.jena.mem.store.legacy; +import static org.apache.jena.junit.GraphHelper.triple; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; + import org.apache.jena.graph.Triple; import org.apache.jena.mem.collection.AbstractJenaSetTripleTest; import org.apache.jena.mem.collection.JenaSet; -import org.junit.Test; - -import static org.apache.jena.junit.GraphHelper.triple; -import static org.junit.Assert.assertEquals; public class HashedTripleBunchTest extends AbstractJenaSetTripleTest { @@ -51,4 +53,4 @@ public class HashedTripleBunchTest extends AbstractJenaSetTripleTest { final var sut = new HashedTripleBunch(arrayBunch); assertEquals(3, sut.size()); } -} \ No newline at end of file +} diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/legacy/LegacyTripleStoreTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/legacy/LegacyTripleStoreTest.java index bc05e55db2..f49d9d0ea8 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/store/legacy/LegacyTripleStoreTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/store/legacy/LegacyTripleStoreTest.java @@ -18,6 +18,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ + package org.apache.jena.mem.store.legacy; import org.apache.jena.mem.store.AbstractTripleStoreTest; @@ -29,4 +30,4 @@ public class LegacyTripleStoreTest extends AbstractTripleStoreTest { protected TripleStore createTripleStore() { return new LegacyTripleStore(); } -} \ No newline at end of file +} diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/legacy/NodeToTriplesMapMemTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/legacy/NodeToTriplesMapMemTest.java index 2e6405a1c1..2908c7a027 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/store/legacy/NodeToTriplesMapMemTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/store/legacy/NodeToTriplesMapMemTest.java @@ -18,13 +18,13 @@ * * SPDX-License-Identifier: Apache-2.0 */ + package org.apache.jena.mem.store.legacy; import org.apache.jena.graph.Triple; import org.apache.jena.mem.collection.AbstractJenaSetTripleTest; import org.apache.jena.mem.collection.JenaSet; - public class NodeToTriplesMapMemTest extends AbstractJenaSetTripleTest { @Override @@ -32,4 +32,4 @@ public class NodeToTriplesMapMemTest extends AbstractJenaSetTripleTest { return new NodeToTriplesMapMem( Triple.Field.fieldSubject, Triple.Field.fieldPredicate, Triple.Field.fieldObject); } -} \ No newline at end of file +} diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/roaring/RoaringBitmapTripleIteratorTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/roaring/RoaringBitmapTripleIteratorTest.java index 521020e0ac..cb9e263c55 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/store/roaring/RoaringBitmapTripleIteratorTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/store/roaring/RoaringBitmapTripleIteratorTest.java @@ -18,11 +18,12 @@ * * SPDX-License-Identifier: Apache-2.0 */ + package org.apache.jena.mem.store.roaring; import org.apache.jena.graph.Triple; import org.hamcrest.collection.IsIterableContainingInAnyOrder; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.roaringbitmap.RoaringBitmap; import java.util.ConcurrentModificationException; @@ -31,11 +32,10 @@ import java.util.NoSuchElementException; import static org.apache.jena.junit.GraphHelper.triple; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class RoaringBitmapTripleIteratorTest { - private static TripleSet createTripleSet() { return new TripleSet(); } @@ -135,4 +135,4 @@ public class RoaringBitmapTripleIteratorTest { } assertEquals(RoaringBitmapTripleIterator.BUFFER_SIZE + 1, counter); } -} \ No newline at end of file +} diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/roaring/RoaringTripleStoreTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/roaring/RoaringTripleStoreTest.java index 1770e45367..3a00b59c8f 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/store/roaring/RoaringTripleStoreTest.java +++ b/jena-core/src/test/java/org/apache/jena/mem/store/roaring/RoaringTripleStoreTest.java @@ -18,37 +18,46 @@ * * SPDX-License-Identifier: Apache-2.0 */ + package org.apache.jena.mem.store.roaring; +import static org.apache.jena.junit.GraphHelper.triple; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Arrays; +import java.util.List; +import java.util.stream.Stream; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + import org.apache.jena.graph.Triple; import org.apache.jena.mem.IndexingStrategy; import org.apache.jena.mem.pattern.PatternClassifier; import org.apache.jena.mem.store.AbstractTripleStoreTest; import org.apache.jena.mem.store.TripleStore; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; import org.mockito.Mockito; -import java.util.Arrays; -import java.util.Collection; - -import static org.apache.jena.junit.GraphHelper.triple; -import static org.junit.Assert.*; - -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("provideArgs") public class RoaringTripleStoreTest extends AbstractTripleStoreTest { - @Parameterized.Parameter - public IndexingStrategy indexingStrategy; - - @Parameterized.Parameters(name = "{0}") - public static Collection<Object[]> data() { - return Arrays.stream(IndexingStrategy.values()) - .map(strategy -> new Object[]{strategy}) + public static Stream<Arguments> provideArgs() { + List<Arguments> args = Arrays.stream(IndexingStrategy.values()) + .map(strategy -> Arguments.of(strategy)) .toList(); + return args.stream(); } + public IndexingStrategy indexingStrategy; + + public RoaringTripleStoreTest(IndexingStrategy indexingStrategy) { this.indexingStrategy = indexingStrategy; } + @Override protected TripleStore createTripleStore() { return switch (indexingStrategy) { @@ -245,4 +254,4 @@ public class RoaringTripleStoreTest extends AbstractTripleStoreTest { throw new IllegalArgumentException("Unsupported indexing strategy: " + sut.getIndexingStrategy()); } } -} \ No newline at end of file +} diff --git a/jena-core/src/test/java/org/apache/jena/test/JenaCoreTestAll_JU4.java b/jena-core/src/test/java/org/apache/jena/test/JenaCoreTestAll_JU4.java index 72fd24ab48..aebc0ed287 100644 --- a/jena-core/src/test/java/org/apache/jena/test/JenaCoreTestAll_JU4.java +++ b/jena-core/src/test/java/org/apache/jena/test/JenaCoreTestAll_JU4.java @@ -47,8 +47,7 @@ public class JenaCoreTestAll_JU4 extends TestCase { addTest(ts, "Enhanced", org.apache.jena.enhanced.TS3_enh.suite()); addTest(ts, "Graph", adaptJUnit4(org.apache.jena.graph.TS3_graph.class)); - addTest(ts, "Mem", adaptJUnit4(org.apache.jena.mem.TS4_GraphMem.class)); - +//JU6 addTest(ts, "Mem", adaptJUnit4(org.apache.jena.mem.TS4_GraphMem.class)); //JU6 addTest(ts, "MemValue", adaptJUnit4(org.apache.jena.memvalue.TS3_GraphMemValue.class)); // ** COMPLEX diff --git a/jena-core/src/test/java/org/apache/jena/test/JenaCoreTestAll_JU6.java b/jena-core/src/test/java/org/apache/jena/test/JenaCoreTestAll_JU6.java index b7ab5cd698..456f8fed16 100644 --- a/jena-core/src/test/java/org/apache/jena/test/JenaCoreTestAll_JU6.java +++ b/jena-core/src/test/java/org/apache/jena/test/JenaCoreTestAll_JU6.java @@ -28,6 +28,7 @@ import org.junit.platform.suite.api.Suite; import org.apache.jena.datatypes.TS6_dt; import org.apache.jena.irix.TS6_IRIx2; import org.apache.jena.langtagx.TS6_LangTagX; +import org.apache.jena.mem.TS6_GraphMem; import org.apache.jena.memvalue.TS6_GraphMemValue; import org.apache.jena.rdfxml.xmloutput.TS6_xmloutput; import org.apache.jena.shared.TS6_SharedPackage; @@ -40,10 +41,12 @@ import org.apache.jena.vocabulary.TS6_Vocabularies; TestSystemSetup.class, // Same order as JenaCoreTestAll_JU4 + // There should be a corresponding line commented out in JenaCoreTestAll_JU4 TS6_IRIx2.class, TS6_LangTagX.class, TS6_dt.class, + TS6_GraphMem.class, TS6_GraphMemValue.class, TS6_xmloutput.class,
