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 2ef2bb8a5cc763539dd4a17ccc828c2c69f925f4 Author: Andy Seaborne <[email protected]> AuthorDate: Sun Jul 20 20:48:31 2025 +0100 GH-3325: Use JUnit5 in jena-base --- jena-base/pom.xml | 23 +- .../test/java/org/apache/jena/atlas/TC_Atlas.java | 9 +- .../jena/atlas/io/AbstractTestPeekInputStream.java | 18 +- .../jena/atlas/io/AbstractTestPeekReader.java | 18 +- .../test/java/org/apache/jena/atlas/io/TS_IO.java | 8 +- .../org/apache/jena/atlas/io/TestBlockUTF8.java | 16 +- .../apache/jena/atlas/io/TestBufferingWriter.java | 4 +- .../jena/atlas/io/TestFilenameExtensions.java | 4 +- .../apache/jena/atlas/io/TestIndentedWriter.java | 4 +- .../jena/atlas/io/TestInputStreamBuffered.java | 4 +- .../org/apache/jena/atlas/io/TestPrintUtils.java | 4 +- .../org/apache/jena/atlas/io/TestStreamUTF8.java | 6 +- .../apache/jena/atlas/iterator/TS_Iterator.java | 9 +- .../org/apache/jena/atlas/iterator/TestIter.java | 8 +- .../jena/atlas/iterator/TestIteratorSlotted.java | 69 +-- .../jena/atlas/iterator/TestIteratorTruncate.java | 4 +- .../atlas/iterator/TestIteratorWithBuffer.java | 14 +- .../atlas/iterator/TestIteratorWithHistory.java | 101 ++-- .../jena/atlas/iterator/TestPeekIterator.java | 8 +- .../jena/atlas/iterator/TestPushbackIterator.java | 119 ++-- .../org/apache/jena/atlas/junit/AssertExtra.java | 12 +- .../java/org/apache/jena/atlas/lib/TS_Lib.java | 10 +- .../org/apache/jena/atlas/lib/TestAlarmClock.java | 4 +- .../java/org/apache/jena/atlas/lib/TestAlg.java | 4 +- .../org/apache/jena/atlas/lib/TestBaseLib.java | 4 +- .../org/apache/jena/atlas/lib/TestBitsInt.java | 641 ++++++++++----------- .../org/apache/jena/atlas/lib/TestBitsLong.java | 641 ++++++++++----------- .../java/org/apache/jena/atlas/lib/TestBytes.java | 8 +- .../apache/jena/atlas/lib/TestCollectionUtils.java | 10 +- .../apache/jena/atlas/lib/TestDateTimeUtils.java | 4 +- .../org/apache/jena/atlas/lib/TestEscapeStr.java | 2 +- .../org/apache/jena/atlas/lib/TestFileOps.java | 6 +- .../jena/atlas/lib/TestFilenameProcessing.java | 10 +- .../java/org/apache/jena/atlas/lib/TestHex.java | 6 +- .../java/org/apache/jena/atlas/lib/TestIRILib.java | 4 +- .../org/apache/jena/atlas/lib/TestListUtils.java | 4 +- .../org/apache/jena/atlas/lib/TestNumberUtils.java | 4 +- .../org/apache/jena/atlas/lib/TestPowerSet.java | 7 +- .../apache/jena/atlas/lib/TestRefCountingMap.java | 4 +- .../org/apache/jena/atlas/lib/TestSetUtils.java | 6 +- .../org/apache/jena/atlas/lib/TestStrUtils.java | 17 +- .../java/org/apache/jena/atlas/lib/TestTrie.java | 214 +++---- .../org/apache/jena/atlas/lib/TestVersion.java | 10 +- .../java/org/apache/jena/atlas/lib/TestXMLLib.java | 15 +- .../jena/atlas/lib/{ => cache}/TestCache.java | 58 +- .../jena/atlas/lib/{ => cache}/TestCache2.java | 11 +- .../jena/atlas/lib/cache/TestCacheSimple.java | 77 ++- .../jena/atlas/lib/persistent/TS_Persistent.java | 12 +- .../apache/jena/atlas/lib/persistent/TestPMap.java | 8 +- .../apache/jena/atlas/lib/persistent/TestPSet.java | 4 +- .../org/apache/jena/atlas/lib/tuple/TS_Tuple.java | 8 +- .../org/apache/jena/atlas/lib/tuple/TestTuple.java | 10 +- .../apache/jena/atlas/lib/tuple/TestTupleMap.java | 4 +- .../java/org/apache/jena/atlas/net/TS_Net.java | 11 +- .../java/org/apache/jena/atlas/net/TestHost.java | 6 +- 55 files changed, 1159 insertions(+), 1147 deletions(-) diff --git a/jena-base/pom.xml b/jena-base/pom.xml index 7aade65845..3c544e1131 100644 --- a/jena-base/pom.xml +++ b/jena-base/pom.xml @@ -101,11 +101,24 @@ <artifactId>collection</artifactId> </dependency> - <dependency> - <groupId>org.junit.vintage</groupId> - <artifactId>junit-vintage-engine</artifactId> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-params</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.junit.platform</groupId> + <artifactId>junit-platform-suite-engine</artifactId> + <scope>test</scope> + </dependency> + + <!-- Only used by the atlas.junit.package --> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.slf4j</groupId> diff --git a/jena-base/src/test/java/org/apache/jena/atlas/TC_Atlas.java b/jena-base/src/test/java/org/apache/jena/atlas/TC_Atlas.java index d2d0ae08f7..89c96b0857 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/TC_Atlas.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/TC_Atlas.java @@ -18,9 +18,6 @@ package org.apache.jena.atlas; -import org.junit.runner.RunWith ; -import org.junit.runners.Suite ; - import org.apache.jena.atlas.io.TS_IO ; import org.apache.jena.atlas.iterator.TS_Iterator ; import org.apache.jena.atlas.lib.TS_Lib ; @@ -28,8 +25,10 @@ import org.apache.jena.atlas.lib.persistent.TS_Persistent; import org.apache.jena.atlas.lib.tuple.TS_Tuple ; import org.apache.jena.atlas.net.TS_Net; -@RunWith(Suite.class) [email protected]( { +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; +@Suite +@SelectClasses({ // Library TS_Lib.class , TS_Tuple.class diff --git a/jena-base/src/test/java/org/apache/jena/atlas/io/AbstractTestPeekInputStream.java b/jena-base/src/test/java/org/apache/jena/atlas/io/AbstractTestPeekInputStream.java index f27f9a9aa4..c9b0e63b0c 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/io/AbstractTestPeekInputStream.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/io/AbstractTestPeekInputStream.java @@ -18,10 +18,10 @@ package org.apache.jena.atlas.io; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; public abstract class AbstractTestPeekInputStream { static int INIT_LINE = PeekInputStream.INIT_LINE; @@ -31,8 +31,8 @@ public abstract class AbstractTestPeekInputStream { @Test public void read0() { - assertEquals("Init line", 1, INIT_LINE); - assertEquals("Init col", 1, INIT_COL); + assertEquals(1, INIT_LINE, ()->"Init line"); + assertEquals(1, INIT_COL, ()->"Init col"); } @Test @@ -191,8 +191,8 @@ public abstract class AbstractTestPeekInputStream { } private static void checkLineCol(PeekInputStream in, long lineNum, long colNum) { - assertEquals("Line", lineNum, in.getLineNum()); - assertEquals("Column", colNum, in.getColNum()); + assertEquals(lineNum, in.getLineNum(), ()->"Line"); + assertEquals(colNum, in.getColNum(), ()->"Column"); } private void position(String contents) { @@ -222,8 +222,8 @@ public abstract class AbstractTestPeekInputStream { private static void contains(PeekInputStream in, String contents) { for ( int i = 0 ; i < contents.length() ; i++ ) { int x = in.readByte(); - assertEquals("\"" + contents + "\" -- Index " + i + " Expected:'" + contents.charAt(i) + "' Got: '" + (char)x + "'", - contents.charAt(i), x); + assertEquals(contents.charAt(i), x, + "\"" + contents + "\" -- Index " + i + " Expected:'" + contents.charAt(i) + "' Got: '" + (char)x + "'"); } assertTrue(in.eof()); } diff --git a/jena-base/src/test/java/org/apache/jena/atlas/io/AbstractTestPeekReader.java b/jena-base/src/test/java/org/apache/jena/atlas/io/AbstractTestPeekReader.java index 39f8197cec..ac7d12994a 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/io/AbstractTestPeekReader.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/io/AbstractTestPeekReader.java @@ -18,10 +18,10 @@ package org.apache.jena.atlas.io; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; public abstract class AbstractTestPeekReader { static int INIT_LINE = PeekReader.INIT_LINE; @@ -31,8 +31,8 @@ public abstract class AbstractTestPeekReader { @Test public void read0() { - assertEquals("Init line", 1, INIT_LINE); - assertEquals("Init col", 1, INIT_COL); + assertEquals(1, INIT_LINE, ()->"Init line"); + assertEquals(1, INIT_COL, ()->"Init col"); } @Test @@ -191,8 +191,8 @@ public abstract class AbstractTestPeekReader { } private static void checkLineCol(PeekReader r, long lineNum, long colNum) { - assertEquals("Line", lineNum, r.getLineNum()); - assertEquals("Column", colNum, r.getColNum()); + assertEquals(lineNum, r.getLineNum(), ()->"Line"); + assertEquals(colNum, r.getColNum(), ()->"Column"); } private void position(String contents) { @@ -222,8 +222,8 @@ public abstract class AbstractTestPeekReader { private static void contains(PeekReader r, String contents) { for ( int i = 0 ; i < contents.length() ; i++ ) { int x = r.readChar(); - assertEquals("\"" + contents + "\" -- Index " + i + " Expected:'" + contents.charAt(i) + "' Got: '" + (char)x + "'", - contents.charAt(i), x); + assertEquals(contents.charAt(i), x, + "\"" + contents + "\" -- Index " + i + " Expected:'" + contents.charAt(i) + "' Got: '" + (char)x + "'"); } assertTrue(r.eof()); } diff --git a/jena-base/src/test/java/org/apache/jena/atlas/io/TS_IO.java b/jena-base/src/test/java/org/apache/jena/atlas/io/TS_IO.java index 085cbf3176..a1cc381475 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/io/TS_IO.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/io/TS_IO.java @@ -18,11 +18,11 @@ package org.apache.jena.atlas.io; -import org.junit.runner.RunWith ; -import org.junit.runners.Suite ; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; -@RunWith(Suite.class) [email protected]( { +@Suite +@SelectClasses({ // Basic classes TestIndentedWriter.class , TestStreamUTF8.class diff --git a/jena-base/src/test/java/org/apache/jena/atlas/io/TestBlockUTF8.java b/jena-base/src/test/java/org/apache/jena/atlas/io/TestBlockUTF8.java index 6f709a63e6..80ade65deb 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/io/TestBlockUTF8.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/io/TestBlockUTF8.java @@ -18,9 +18,9 @@ package org.apache.jena.atlas.io; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -34,7 +34,7 @@ import java.nio.charset.CharsetDecoder; import java.nio.charset.CharsetEncoder; import org.apache.jena.atlas.lib.Chars; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestBlockUTF8 { @@ -120,7 +120,7 @@ public class TestBlockUTF8 BlockUTF8.fromChars(cb, bb); bb.flip(); - assertTrue("Bytes", sameBytes(bytes, bb)); + assertTrue(sameBytes(bytes, bb), ()->"Bytes"); // From bytes. CharBuffer cb2 = allocCB.allocate(N); BlockUTF8.toChars(bb, cb2); @@ -185,7 +185,7 @@ public class TestBlockUTF8 ByteBuffer bytes2 = allocBB.allocate(bytes.capacity()); BlockUTF8.fromChars(cb, bytes2); bytes2.flip(); - assertTrue("Chars", sameBytes(bytes, bytes2)); + assertTrue(sameBytes(bytes, bytes2), ()->"Chars"); } static void testBinary(byte[] binary, CharBuffer chars) { @@ -194,7 +194,7 @@ public class TestBlockUTF8 CharBuffer cb = CharBuffer.allocate(N); BlockUTF8.toChars(bytes, cb); cb.flip(); - assertTrue("Binary", sameChars(chars, cb)); + assertTrue(sameChars(chars, cb), ()->"Binary"); } static void testBinary(byte[] binary) { @@ -213,7 +213,7 @@ public class TestBlockUTF8 BlockUTF8.fromChars(cb, bytes2); bytes2.flip(); sameBytes(bytes, bytes2); - assertTrue("Binary", sameBytes(ByteBuffer.wrap(expected), bytes2)); + assertTrue(sameBytes(ByteBuffer.wrap(expected), bytes2), ()->"Binary"); } // Does not move position. diff --git a/jena-base/src/test/java/org/apache/jena/atlas/io/TestBufferingWriter.java b/jena-base/src/test/java/org/apache/jena/atlas/io/TestBufferingWriter.java index d4ccdf9603..6b1f158ef7 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/io/TestBufferingWriter.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/io/TestBufferingWriter.java @@ -18,11 +18,11 @@ package org.apache.jena.atlas.io; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.StringWriter; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestBufferingWriter { StringWriter sw = null; diff --git a/jena-base/src/test/java/org/apache/jena/atlas/io/TestFilenameExtensions.java b/jena-base/src/test/java/org/apache/jena/atlas/io/TestFilenameExtensions.java index edb6848ee2..df5c25662c 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/io/TestFilenameExtensions.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/io/TestFilenameExtensions.java @@ -18,9 +18,9 @@ package org.apache.jena.atlas.io; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestFilenameExtensions { diff --git a/jena-base/src/test/java/org/apache/jena/atlas/io/TestIndentedWriter.java b/jena-base/src/test/java/org/apache/jena/atlas/io/TestIndentedWriter.java index 669700d3ef..90af72e7b1 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/io/TestIndentedWriter.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/io/TestIndentedWriter.java @@ -18,8 +18,8 @@ package org.apache.jena.atlas.io; -import org.junit.Test; -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; public class TestIndentedWriter { diff --git a/jena-base/src/test/java/org/apache/jena/atlas/io/TestInputStreamBuffered.java b/jena-base/src/test/java/org/apache/jena/atlas/io/TestInputStreamBuffered.java index 6aa15919a5..a86273cd2a 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/io/TestInputStreamBuffered.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/io/TestInputStreamBuffered.java @@ -18,14 +18,14 @@ package org.apache.jena.atlas.io; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import org.apache.jena.atlas.lib.Bytes; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestInputStreamBuffered { @Test diff --git a/jena-base/src/test/java/org/apache/jena/atlas/io/TestPrintUtils.java b/jena-base/src/test/java/org/apache/jena/atlas/io/TestPrintUtils.java index f945b9de2b..0a298b8952 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/io/TestPrintUtils.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/io/TestPrintUtils.java @@ -18,14 +18,14 @@ package org.apache.jena.atlas.io; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStreamWriter; import java.io.Writer; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestPrintUtils { @Test diff --git a/jena-base/src/test/java/org/apache/jena/atlas/io/TestStreamUTF8.java b/jena-base/src/test/java/org/apache/jena/atlas/io/TestStreamUTF8.java index 5c57c8b4a8..02dbf6bd22 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/io/TestStreamUTF8.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/io/TestStreamUTF8.java @@ -18,8 +18,8 @@ package org.apache.jena.atlas.io; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -31,7 +31,7 @@ import java.nio.charset.CharsetDecoder; import java.nio.charset.CharsetEncoder; import org.apache.jena.atlas.lib.Chars; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestStreamUTF8 { static Charset utf8 = Chars.charsetUTF8; diff --git a/jena-base/src/test/java/org/apache/jena/atlas/iterator/TS_Iterator.java b/jena-base/src/test/java/org/apache/jena/atlas/iterator/TS_Iterator.java index e39097562d..a45476a16c 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/iterator/TS_Iterator.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/iterator/TS_Iterator.java @@ -18,11 +18,10 @@ package org.apache.jena.atlas.iterator; -import org.junit.runner.RunWith ; -import org.junit.runners.Suite ; - -@RunWith(Suite.class) [email protected]( { +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; +@Suite +@SelectClasses({ TestIter.class , TestPeekIterator.class , TestPushbackIterator.class diff --git a/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIter.java b/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIter.java index b90c1784ef..e755a715ba 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIter.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIter.java @@ -18,9 +18,9 @@ package org.apache.jena.atlas.iterator; -import static org.junit.Assert.assertEquals ; -import static org.junit.Assert.assertFalse ; -import static org.junit.Assert.assertTrue ; +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.util.* ; import java.util.concurrent.atomic.AtomicInteger; @@ -29,7 +29,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.junit.Test ; +import org.junit.jupiter.api.Test ; public class TestIter { diff --git a/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorSlotted.java b/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorSlotted.java index f756b34db8..563e08c4f6 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorSlotted.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorSlotted.java @@ -18,40 +18,36 @@ package org.apache.jena.atlas.iterator; -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 static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays ; -import java.util.Collection ; import java.util.Iterator ; import java.util.List ; +import java.util.stream.Stream; -import org.junit.Test ; -import org.junit.runner.RunWith ; -import org.junit.runners.Parameterized ; -import org.junit.runners.Parameterized.Parameters ; - -@RunWith(Parameterized.class) - -public class TestIteratorSlotted -{ - @Parameters(name = "{index}: {0}") - public static Collection<Object[]> implementations() { - IterFactory factory1 = new IterFactory() { - @Override - public IteratorSlotted<String> create(String... array) { - return new IterStr1(array) ; - }} ; - IterFactory factory2 = new IterFactory() { - @Override - public IteratorSlotted<String> create(String... array) { - return new IterStr2(array) ; - }} ; - return Arrays.asList(new Object[][] { {"hasMore accurate", factory1}, {"hasMore always true", factory2} }) ; +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; + +@ParameterizedClass(name="{index}: {0}") +@MethodSource("provideArgs") + +public class TestIteratorSlotted { + + private static Stream<Arguments> provideArgs() { + IterFactory factory1 = array->new IterStr1(array) ; + IterFactory factory2 = array->new IterStr2(array) ; + List<Arguments> x = List.of + ( Arguments.of("hasMore accurate", factory1) + , Arguments.of("hasMore always true", factory2) + ); + return x.stream(); } - + /** Accurate hasMore */ static class IterStr1 extends IteratorSlotted<String> { @@ -73,7 +69,7 @@ public class TestIteratorSlotted return iter.hasNext() ; } } - + /** hasMore is always true, returns null in moveToNext */ static class IterStr2 extends IteratorSlotted<String> { @@ -97,23 +93,22 @@ public class TestIteratorSlotted return true ; } } - interface IterFactory { IteratorSlotted<String> create(String...array) ; } - + private IterFactory factory ; - + public TestIteratorSlotted(String name, IterFactory factory) { this.factory = factory ; } - + @Test public void iter_01() { IteratorSlotted<String> iter = factory.create() ; assertFalse(iter.hasNext()) ; } - + @Test public void iter_02() { IteratorSlotted<String> iter = factory.create("A") ; @@ -124,7 +119,7 @@ public class TestIteratorSlotted assertFalse(iter.hasNext()) ; assertNull(iter.peek()) ; } - + @Test public void iter_03() { IteratorSlotted<String> iter = factory.create("A", "B") ; @@ -135,6 +130,6 @@ public class TestIteratorSlotted assertEquals("B", iter.next()) ; assertFalse(iter.hasNext()) ; } - - + + } diff --git a/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorTruncate.java b/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorTruncate.java index 8bb6bfe697..1faea94c01 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorTruncate.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorTruncate.java @@ -18,13 +18,13 @@ package org.apache.jena.atlas.iterator; -import static org.junit.Assert.assertEquals ; +import static org.junit.jupiter.api.Assertions.assertEquals ; import java.util.Arrays ; import java.util.Iterator ; import java.util.List ; -import org.junit.Test ; +import org.junit.jupiter.api.Test ; public class TestIteratorTruncate { @Test public void iter_truncate_00() { diff --git a/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorWithBuffer.java b/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorWithBuffer.java index 291d65a792..114f2dfa8b 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorWithBuffer.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorWithBuffer.java @@ -18,16 +18,16 @@ package org.apache.jena.atlas.iterator; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import java.util.Arrays ; import java.util.List ; -import org.junit.Test ; +import org.junit.jupiter.api.Test ; public class TestIteratorWithBuffer { - @Test public void iterBuffer_01() { IteratorWithBuffer<String> iter = createBuffered(1, "a", "b", "c") ; @@ -55,11 +55,11 @@ public class TestIteratorWithBuffer assertEquals("a", iter.peek(0)) ; assertEquals("b", iter.peek(1)) ; assertEquals("a", iter.next()) ; - + assertEquals("b", iter.peek(0)) ; assertEquals("c", iter.peek(1)) ; assertEquals("b", iter.next()) ; - + assertEquals("c", iter.peek(0)) ; assertEquals(null, iter.peek(1)) ; assertEquals("c", iter.next()) ; @@ -72,11 +72,11 @@ public class TestIteratorWithBuffer assertEquals(null, iter.peek(0)) ; } - @Test(expected=IndexOutOfBoundsException.class) + @Test public void iterBuffer_04() { IteratorWithBuffer<String> iter = createBuffered(0, "a") ; - assertEquals(null, iter.peek(0)) ; + assertThrows(IndexOutOfBoundsException.class, ()->iter.peek(0)) ; } @Test public void iterBuffer_05() diff --git a/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorWithHistory.java b/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorWithHistory.java index 5fb82edd75..4afb1a4b52 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorWithHistory.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorWithHistory.java @@ -18,70 +18,67 @@ package org.apache.jena.atlas.iterator; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; -import java.util.Arrays ; -import java.util.List ; +import java.util.Arrays; +import java.util.List; -import org.junit.Test ; +import org.junit.jupiter.api.Test; -public class TestIteratorWithHistory -{ - @Test public void iterHistory_01() - { - IteratorWithHistory<String> iter = createHistory(1, "a", "b", "c") ; - assertEquals(0, iter.currentSize()) ; - assertEquals(null, iter.getPrevious(0)) ; +public class TestIteratorWithHistory { + @Test + public void iterHistory_01() { + IteratorWithHistory<String> iter = createHistory(1, "a", "b", "c"); + assertEquals(0, iter.currentSize()); + assertEquals(null, iter.getPrevious(0)); } - - @Test public void iterHistory_02() - { - IteratorWithHistory<String> iter = createHistory(1, "a", "b", "c") ; - assertEquals("a", iter.next()) ; - assertEquals(1, iter.currentSize()) ; + + @Test + public void iterHistory_02() { + IteratorWithHistory<String> iter = createHistory(1, "a", "b", "c"); + assertEquals("a", iter.next()); + assertEquals(1, iter.currentSize()); } - @Test public void iterHistory_03() - { - IteratorWithHistory<String> iter = createHistory(2, "a", "b", "c") ; - assertEquals("a", iter.next()) ; - assertEquals("b", iter.next()) ; - assertEquals(2, iter.currentSize()) ; - assertEquals("b", iter.getPrevious(0)) ; - assertEquals("a", iter.getPrevious(1)) ; + @Test + public void iterHistory_03() { + IteratorWithHistory<String> iter = createHistory(2, "a", "b", "c"); + assertEquals("a", iter.next()); + assertEquals("b", iter.next()); + assertEquals(2, iter.currentSize()); + assertEquals("b", iter.getPrevious(0)); + assertEquals("a", iter.getPrevious(1)); } - @Test(expected=IndexOutOfBoundsException.class) - public void iterHistory_04() - { - IteratorWithHistory<String> iter = createHistory(2, "a", "b", "c") ; - iter.getPrevious(2) ; + @Test + public void iterHistory_04() { + IteratorWithHistory<String> iter = createHistory(2, "a", "b", "c"); + assertThrows(IndexOutOfBoundsException.class, () -> iter.getPrevious(2)); } - + @Test - public void iterHistory_05() - { - IteratorWithHistory<String> iter = createHistory(2, "a", "b", "c") ; - assertEquals("a", iter.next()) ; - assertEquals("a", iter.getPrevious(0)) ; - assertEquals(1, iter.currentSize()) ; - - assertEquals("b", iter.next()) ; - assertEquals("b", iter.getPrevious(0)) ; - assertEquals("a", iter.getPrevious(1)) ; - assertEquals(2, iter.currentSize()) ; - - assertEquals("c", iter.next()) ; - assertEquals(2, iter.currentSize()) ; - assertEquals("c", iter.getPrevious(0)) ; - assertEquals("b", iter.getPrevious(1)) ; + public void iterHistory_05() { + IteratorWithHistory<String> iter = createHistory(2, "a", "b", "c"); + assertEquals("a", iter.next()); + assertEquals("a", iter.getPrevious(0)); + assertEquals(1, iter.currentSize()); + + assertEquals("b", iter.next()); + assertEquals("b", iter.getPrevious(0)); + assertEquals("a", iter.getPrevious(1)); + assertEquals(2, iter.currentSize()); + + assertEquals("c", iter.next()); + assertEquals(2, iter.currentSize()); + assertEquals("c", iter.getPrevious(0)); + assertEquals("b", iter.getPrevious(1)); } - private static IteratorWithHistory<String> createHistory(int N, String... strings) - { - List<String> data = Arrays.asList(strings) ; - IteratorWithHistory<String> iter = new IteratorWithHistory<>(data.iterator(), N) ; - return iter ; + private static IteratorWithHistory<String> createHistory(int N, String...strings) { + List<String> data = Arrays.asList(strings); + IteratorWithHistory<String> iter = new IteratorWithHistory<>(data.iterator(), N); + return iter; } } diff --git a/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestPeekIterator.java b/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestPeekIterator.java index a33d4f58ee..eda281074c 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestPeekIterator.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestPeekIterator.java @@ -18,14 +18,14 @@ package org.apache.jena.atlas.iterator; -import static org.junit.Assert.*; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestPeekIterator { diff --git a/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestPushbackIterator.java b/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestPushbackIterator.java index c57aef54c1..13dd98d6a4 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestPushbackIterator.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestPushbackIterator.java @@ -18,76 +18,77 @@ package org.apache.jena.atlas.iterator; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +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 java.util.ArrayList ; -import java.util.List ; +import java.util.ArrayList; +import java.util.List; -import org.junit.Test ; +import org.junit.jupiter.api.Test; -public class TestPushbackIterator -{ +public class TestPushbackIterator { - static List<String> data = new ArrayList<>() ; + static List<String> data = new ArrayList<>(); static { - data.add("a") ; - data.add("b") ; - data.add("c") ; + data.add("a"); + data.add("b"); + data.add("c"); } - @Test(expected=IllegalArgumentException.class) - public void pushback01() { new PushbackIterator<String>(null) ; } - - @Test public void pushback02() - { - PushbackIterator<String> iter = new PushbackIterator<>(data.iterator()) ; - assertEquals("a", iter.next()) ; - assertEquals("b", iter.next()) ; - assertEquals("c", iter.next()) ; - assertFalse(iter.hasNext()) ; + @Test + public void pushback01() { + assertThrows(IllegalArgumentException.class, () -> new PushbackIterator<String>(null)); } - - @Test public void pushback03() - { - PushbackIterator<String> iter = new PushbackIterator<>(data.iterator()) ; - iter.pushback("x") ; - assertEquals("x", iter.next()) ; - assertEquals("a", iter.next()) ; - assertEquals(2, Iter.count(iter)) ; + + @Test + public void pushback02() { + PushbackIterator<String> iter = new PushbackIterator<>(data.iterator()); + assertEquals("a", iter.next()); + assertEquals("b", iter.next()); + assertEquals("c", iter.next()); + assertFalse(iter.hasNext()); } - - @Test public void pushback04() - { - PushbackIterator<String> iter = new PushbackIterator<>(data.iterator()) ; - assertEquals("a", iter.next()) ; - iter.pushback("x") ; - assertEquals("x", iter.next()) ; - assertEquals("b", iter.next()) ; - assertEquals(1, Iter.count(iter)) ; + + @Test + public void pushback03() { + PushbackIterator<String> iter = new PushbackIterator<>(data.iterator()); + iter.pushback("x"); + assertEquals("x", iter.next()); + assertEquals("a", iter.next()); + assertEquals(2, Iter.count(iter)); } - - @Test public void pushback05() - { - PushbackIterator<String> iter = new PushbackIterator<>(data.iterator()) ; - assertEquals("a", iter.next()) ; - iter.pushback("x") ; - iter.pushback("y") ; - assertEquals("y", iter.next()) ; - assertEquals("x", iter.next()) ; - assertEquals("b", iter.next()) ; - assertEquals(1, Iter.count(iter)) ; + + @Test + public void pushback04() { + PushbackIterator<String> iter = new PushbackIterator<>(data.iterator()); + assertEquals("a", iter.next()); + iter.pushback("x"); + assertEquals("x", iter.next()); + assertEquals("b", iter.next()); + assertEquals(1, Iter.count(iter)); } - - @Test public void pushback06() - { - PushbackIterator<String> iter = new PushbackIterator<>(data.iterator()) ; - assertEquals(3, Iter.count(iter)) ; - iter.pushback("x") ; - iter.pushback("y") ; - assertEquals("y", iter.next()) ; - assertEquals("x", iter.next()) ; - assertFalse(iter.hasNext()) ; + + @Test + public void pushback05() { + PushbackIterator<String> iter = new PushbackIterator<>(data.iterator()); + assertEquals("a", iter.next()); + iter.pushback("x"); + iter.pushback("y"); + assertEquals("y", iter.next()); + assertEquals("x", iter.next()); + assertEquals("b", iter.next()); + assertEquals(1, Iter.count(iter)); } + @Test + public void pushback06() { + PushbackIterator<String> iter = new PushbackIterator<>(data.iterator()); + assertEquals(3, Iter.count(iter)); + iter.pushback("x"); + iter.pushback("y"); + assertEquals("y", iter.next()); + assertEquals("x", iter.next()); + assertFalse(iter.hasNext()); + } } diff --git a/jena-base/src/test/java/org/apache/jena/atlas/junit/AssertExtra.java b/jena-base/src/test/java/org/apache/jena/atlas/junit/AssertExtra.java index 019bc85bfa..e4cc63a5cd 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/junit/AssertExtra.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/junit/AssertExtra.java @@ -18,18 +18,20 @@ package org.apache.jena.atlas.junit ; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + import java.util.List ; import org.apache.jena.atlas.lib.ListUtils ; -import org.junit.Assert ; public class AssertExtra { public static void assertEqualsIgnoreCase(String a, String b) { - Assert.assertTrue(a.equalsIgnoreCase(b)) ; + assertTrue(a.equalsIgnoreCase(b)) ; } - public static void assertEqualsIgnoreCase(String msg, String a, String b) { - Assert.assertTrue(msg, a.equalsIgnoreCase(b)); + public static void assertEqualsIgnoreCase(String a, String b, String msg) { + assertTrue(a.equalsIgnoreCase(b), ()->msg); } public static <T> void assertEqualsUnordered(List<T> list1, List<T> list2) { @@ -38,7 +40,7 @@ public class AssertExtra { public static <T> void assertEqualsUnordered(String msg, List<T> list1, List<T> list2) { if ( ! ListUtils.equalsUnordered(list1, list2) ) - Assert.fail(msg(msg, list1, list2)) ; + fail(msg(msg, list1, list2)) ; } private static <T> String msg(String msg, List<T> list1, List<T> list2) { diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TS_Lib.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TS_Lib.java index 6d92b0e321..4366de61bd 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TS_Lib.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TS_Lib.java @@ -19,15 +19,17 @@ package org.apache.jena.atlas.lib; +import org.apache.jena.atlas.lib.cache.TestCache; +import org.apache.jena.atlas.lib.cache.TestCache2; import org.apache.jena.atlas.lib.cache.TestCacheSimple; -import org.junit.runner.RunWith ; -import org.junit.runners.Suite ; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for the Atlas lib package */ -@RunWith(Suite.class) [email protected]( { +@Suite +@SelectClasses({ TestBaseLib.class , TestAlg.class , TestBitsLong.class diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestAlarmClock.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestAlarmClock.java index 5d3904bcbd..d56d5462c3 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestAlarmClock.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestAlarmClock.java @@ -19,14 +19,14 @@ package org.apache.jena.atlas.lib ; import static org.awaitility.Awaitility.await ; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.apache.jena.atlas.lib.Lib.sleep ; import java.util.concurrent.TimeUnit ; import static java.util.concurrent.TimeUnit.* ; import java.util.concurrent.atomic.AtomicInteger ; -import org.junit.Test ; +import org.junit.jupiter.api.Test ; public class TestAlarmClock { /* Issues with MS Windows. diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestAlg.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestAlg.java index 65b23a4e15..fff981139e 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestAlg.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestAlg.java @@ -18,13 +18,13 @@ package org.apache.jena.atlas.lib; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.nio.ByteBuffer ; import java.nio.ByteOrder ; import java.nio.IntBuffer ; -import org.junit.Test ; +import org.junit.jupiter.api.Test ; public class TestAlg { diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestBaseLib.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestBaseLib.java index a9aeeb50e9..4e4d3b2569 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestBaseLib.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestBaseLib.java @@ -18,9 +18,9 @@ package org.apache.jena.atlas.lib; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** Tests for operations in {@link Lib} */ public class TestBaseLib { diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestBitsInt.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestBitsInt.java index a1df2a3889..3f3e5506aa 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestBitsInt.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestBitsInt.java @@ -18,466 +18,463 @@ package org.apache.jena.atlas.lib; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test ; +import org.junit.jupiter.api.Test; - -public class TestBitsInt -{ - @Test public void testMask1() - { - int v = BitsInt.mask(0,1) ; - check(0x1, v) ; +public class TestBitsInt { + @Test + public void testMask1() { + int v = BitsInt.mask(0, 1); + check(0x1, v); } - @Test public void testMask2() - { - int v = BitsInt.mask(0,2) ; - check(0x3, v) ; + @Test + public void testMask2() { + int v = BitsInt.mask(0, 2); + check(0x3, v); } - @Test public void testMask3() - { - int v = BitsInt.mask(1,2) ; - check(0x2, v) ; + @Test + public void testMask3() { + int v = BitsInt.mask(1, 2); + check(0x2, v); } - @Test public void testMask4() - { - int v = BitsInt.mask(0,32) ; - check(-1, v) ; + @Test + public void testMask4() { + int v = BitsInt.mask(0, 32); + check(-1, v); } - @Test public void testMask5() - { - int v = BitsInt.mask(16,24) ; - check(0x00FF0000, v) ; + @Test + public void testMask5() { + int v = BitsInt.mask(16, 24); + check(0x00FF0000, v); } - @Test public void testMask6() - { - int v = BitsInt.mask(16,32) ; - check(0xFFFF0000, v) ; + @Test + public void testMask6() { + int v = BitsInt.mask(16, 32); + check(0xFFFF0000, v); } - @Test public void testMask7() - { - int v = BitsInt.mask(0, 0) ; - check(0, v) ; + @Test + public void testMask7() { + int v = BitsInt.mask(0, 0); + check(0, v); } - @Test public void testMaskZero1() - { - int v = BitsInt.maskZero(0,1) ; - check(~0x1, v) ; + @Test + public void testMaskZero1() { + int v = BitsInt.maskZero(0, 1); + check(~0x1, v); } - @Test public void testMaskZero2() - { - int v = BitsInt.maskZero(0,2) ; - check(~0x3, v) ; + @Test + public void testMaskZero2() { + int v = BitsInt.maskZero(0, 2); + check(~0x3, v); } - @Test public void testMaskZero3() - { - int v = BitsInt.maskZero(1,2) ; - check(0xFFFFFFFD, v) ; + @Test + public void testMaskZero3() { + int v = BitsInt.maskZero(1, 2); + check(0xFFFFFFFD, v); } - @Test public void testMaskZero4() - { - int v = BitsInt.maskZero(0,32) ; - check(0, v) ; + @Test + public void testMaskZero4() { + int v = BitsInt.maskZero(0, 32); + check(0, v); } - @Test public void testMaskZero5() - { - int v = BitsInt.maskZero(16,24) ; - check(0xFF00FFFF, v) ; + @Test + public void testMaskZero5() { + int v = BitsInt.maskZero(16, 24); + check(0xFF00FFFF, v); } - @Test public void testMaskZero6() - { - int v = BitsInt.maskZero(16,32) ; - check(0xFFFF, v) ; + @Test + public void testMaskZero6() { + int v = BitsInt.maskZero(16, 32); + check(0xFFFF, v); } - @Test public void testMaskZero7() - { - int v = BitsInt.maskZero(0, 0) ; - check(-1, v) ; + @Test + public void testMaskZero7() { + int v = BitsInt.maskZero(0, 0); + check(-1, v); } - @Test public void testClear1() - { - int v = 0xF0F0 ; - v = BitsInt.clear(v, 4, 8) ; - check(0xF000, v ) ; + @Test + public void testClear1() { + int v = 0xF0F0; + v = BitsInt.clear(v, 4, 8); + check(0xF000, v); } - @Test public void testClear2() - { + @Test + public void testClear2() { int v = 0x80000000; - v = BitsInt.clear(v, 31, 32) ; - check(0x0, v ) ; + v = BitsInt.clear(v, 31, 32); + check(0x0, v); } - @Test public void testClear3() - { + @Test + public void testClear3() { int v = 0xC0000000; - v = BitsInt.clear(v, 31, 32) ; - check(0x40000000, v ) ; + v = BitsInt.clear(v, 31, 32); + check(0x40000000, v); } - @Test public void testClear4() - { - int v = -1 ; - v = BitsInt.clear(v, 31, 32) ; - check(0x7FFFFFFF, v ) ; + @Test + public void testClear4() { + int v = -1; + v = BitsInt.clear(v, 31, 32); + check(0x7FFFFFFF, v); } - @Test public void testClear5() - { - int v = -1 ; - v = BitsInt.clear(v, 16, 32) ; - check(0x0000FFFF, v ) ; + @Test + public void testClear5() { + int v = -1; + v = BitsInt.clear(v, 16, 32); + check(0x0000FFFF, v); } - @Test public void testClear6() - { - int v = -1 ; - v = BitsInt.clear(v, 0, 16) ; - check(0xFFFF0000, v ) ; + @Test + public void testClear6() { + int v = -1; + v = BitsInt.clear(v, 0, 16); + check(0xFFFF0000, v); } - @Test public void testClear7() - { - int v = -1 ; - v = BitsInt.clear(v, 0, 0) ; - check(-1, v ) ; + @Test + public void testClear7() { + int v = -1; + v = BitsInt.clear(v, 0, 0); + check(-1, v); } - @Test public void testClear8() - { - int v = -1 ; - v = BitsInt.clear(v, 0) ; - check(0xFFFFFFFE, v ) ; + @Test + public void testClear8() { + int v = -1; + v = BitsInt.clear(v, 0); + check(0xFFFFFFFE, v); } - @Test public void testClear9() - { - int v = -1 ; - v = BitsInt.clear(v, 31) ; - check(0x7FFFFFFF, v ) ; + @Test + public void testClear9() { + int v = -1; + v = BitsInt.clear(v, 31); + check(0x7FFFFFFF, v); } - @Test public void testClear10() - { - int v = 0x0 ; - v = BitsInt.clear(v, 16) ; - check(v, v ) ; + @Test + public void testClear10() { + int v = 0x0; + v = BitsInt.clear(v, 16); + check(v, v); } - @Test public void testSet1() - { - int v = 0x0 ; - v = BitsInt.set(v, 0, 1) ; - check(1, v) ; + @Test + public void testSet1() { + int v = 0x0; + v = BitsInt.set(v, 0, 1); + check(1, v); } - @Test public void testSet2() - { - int v = 0x1 ; - v = BitsInt.set(v, 0, 1) ; - check(1, v) ; + @Test + public void testSet2() { + int v = 0x1; + v = BitsInt.set(v, 0, 1); + check(1, v); } - @Test public void testSet3() - { - int v = 0xF0 ; - v = BitsInt.set(v, 0, 1) ; - check(0xF1, v) ; + @Test + public void testSet3() { + int v = 0xF0; + v = BitsInt.set(v, 0, 1); + check(0xF1, v); } - @Test public void testSet4() - { - int v = 0xF0F0F0F0 ; - v = BitsInt.set(v, 0, 8) ; - check(0xF0F0F0FF, v) ; + @Test + public void testSet4() { + int v = 0xF0F0F0F0; + v = BitsInt.set(v, 0, 8); + check(0xF0F0F0FF, v); } - @Test public void testSet5() - { - int v = 0 ; - v = BitsInt.set(v, 16, 24) ; - check(0x00FF0000, v) ; + @Test + public void testSet5() { + int v = 0; + v = BitsInt.set(v, 16, 24); + check(0x00FF0000, v); } - @Test public void testSet6() - { - int v = 0 ; - v = BitsInt.set(v, 31, 32) ; - check(0x80000000, v) ; + @Test + public void testSet6() { + int v = 0; + v = BitsInt.set(v, 31, 32); + check(0x80000000, v); } - @Test public void testSet7() - { - int v = 0 ; - v = BitsInt.set(v, 30, 32) ; - check(0xC0000000, v) ; + @Test + public void testSet7() { + int v = 0; + v = BitsInt.set(v, 30, 32); + check(0xC0000000, v); } - @Test public void testSet8() - { - int v = 0 ; - v = BitsInt.set(v, 0, 32) ; - check(-1, v) ; + @Test + public void testSet8() { + int v = 0; + v = BitsInt.set(v, 0, 32); + check(-1, v); } - @Test public void testSet9() - { - int v = 0 ; - v = BitsInt.set(v, 10, 10) ; - check(0, v) ; + @Test + public void testSet9() { + int v = 0; + v = BitsInt.set(v, 10, 10); + check(0, v); } - @Test public void testSetBit1() - { - int v = 0 ; - v = BitsInt.set(v, 0) ; - check(1, v) ; + @Test + public void testSetBit1() { + int v = 0; + v = BitsInt.set(v, 0); + check(1, v); } - @Test public void testSetBit2() - { - int v = 0 ; - v = BitsInt.set(v, 1) ; - check(2, v) ; + @Test + public void testSetBit2() { + int v = 0; + v = BitsInt.set(v, 1); + check(2, v); } - @Test public void testSetBit3() - { - int v = 1 ; - v = BitsInt.set(v, 0) ; - check(1, v) ; + @Test + public void testSetBit3() { + int v = 1; + v = BitsInt.set(v, 0); + check(1, v); } - @Test public void testSetBit4() - { - int v = -1 ; - v = BitsInt.set(v, 0) ; - check(-1, v) ; + @Test + public void testSetBit4() { + int v = -1; + v = BitsInt.set(v, 0); + check(-1, v); } - @Test public void testSetBit5() - { - int v = 0 ; - v = BitsInt.set(v, 30) ; - check(0x40000000, v) ; + @Test + public void testSetBit5() { + int v = 0; + v = BitsInt.set(v, 30); + check(0x40000000, v); } - @Test public void testSetBit6() - { - int v = 0 ; - v = BitsInt.set(v, 31) ; - check(0x80000000, v) ; + @Test + public void testSetBit6() { + int v = 0; + v = BitsInt.set(v, 31); + check(0x80000000, v); } - @Test public void testBitTest1() - { - int v = 0 ; - assertTrue(BitsInt.test(v, false, 0)) ; + @Test + public void testBitTest1() { + int v = 0; + assertTrue(BitsInt.test(v, false, 0)); } - @Test public void testBitTest2() - { - int v = 1 ; - assertTrue(BitsInt.test(v, true, 0)) ; + @Test + public void testBitTest2() { + int v = 1; + assertTrue(BitsInt.test(v, true, 0)); } - @Test public void testBitTest3() - { - int v = -1 ; - assertTrue(BitsInt.test(v, true, 31)) ; + @Test + public void testBitTest3() { + int v = -1; + assertTrue(BitsInt.test(v, true, 31)); } - @Test public void testBitTest4() - { - int v = 0x7FFFFFFF ; - assertTrue(BitsInt.test(v, false, 31)) ; + @Test + public void testBitTest4() { + int v = 0x7FFFFFFF; + assertTrue(BitsInt.test(v, false, 31)); } - @Test public void testBitsTest1() - { - int v = 0x76543210 ; - assertTrue(BitsInt.test(v, 0x0, 0, 4)) ; + @Test + public void testBitsTest1() { + int v = 0x76543210; + assertTrue(BitsInt.test(v, 0x0, 0, 4)); } - @Test public void testBitsTest2() - { - int v = 0x76543210 ; - assertTrue(BitsInt.test(v, 0x10, 0, 8)) ; + @Test + public void testBitsTest2() { + int v = 0x76543210; + assertTrue(BitsInt.test(v, 0x10, 0, 8)); } - @Test public void testBitsTest3() - { - int v = 0x76543210 ; - assertTrue(BitsInt.test(v, v, 0, 32)) ; + @Test + public void testBitsTest3() { + int v = 0x76543210; + assertTrue(BitsInt.test(v, v, 0, 32)); } - @Test public void testBitsTest4() - { - int v = 0x76543210 ; - assertFalse(BitsInt.test(v, 0, 0, 32)) ; + @Test + public void testBitsTest4() { + int v = 0x76543210; + assertFalse(BitsInt.test(v, 0, 0, 32)); } - @Test public void testBitsTest5() - { - int v = 0x76543210 ; - assertTrue(BitsInt.test(v, 0x00543200, 8, 24)) ; + @Test + public void testBitsTest5() { + int v = 0x76543210; + assertTrue(BitsInt.test(v, 0x00543200, 8, 24)); } - @Test public void testIsSet1() - { - int v = 0x00000010 ; - BitsInt.isSet(v, 4) ; - assertTrue(BitsInt.isSet(v, 4)) ; - assertFalse(BitsInt.isSet(v, 3)) ; - assertFalse(BitsInt.isSet(v, 5)) ; + @Test + public void testIsSet1() { + int v = 0x00000010; + BitsInt.isSet(v, 4); + assertTrue(BitsInt.isSet(v, 4)); + assertFalse(BitsInt.isSet(v, 3)); + assertFalse(BitsInt.isSet(v, 5)); } - @Test public void testAccess1() - { - int v = -1 ; - v = BitsInt.access(v, 4, 8) ; - check(0xF0, v ) ; + @Test + public void testAccess1() { + int v = -1; + v = BitsInt.access(v, 4, 8); + check(0xF0, v); } - @Test public void testAccess2() - { - int v = 0x76543210 ; - v = BitsInt.access(v, 0, 8) ; - check(0x10, v ) ; + @Test + public void testAccess2() { + int v = 0x76543210; + v = BitsInt.access(v, 0, 8); + check(0x10, v); } - @Test public void testAccess3() - { - int v = 0x76543210 ; - v = BitsInt.access(v, 0, 32) ; - check(0x76543210, v ) ; + @Test + public void testAccess3() { + int v = 0x76543210; + v = BitsInt.access(v, 0, 32); + check(0x76543210, v); } - @Test public void testAccess4() - { - int v = 0xFEF43210 ; - v = BitsInt.access(v, 30, 32) ; - check(0xC0000000, v ) ; + @Test + public void testAccess4() { + int v = 0xFEF43210; + v = BitsInt.access(v, 30, 32); + check(0xC0000000, v); } - @Test public void testAccess5() - { - int v = 0x76543210 ; - v = BitsInt.access(v, 0, 2) ; - check(0, v ) ; + @Test + public void testAccess5() { + int v = 0x76543210; + v = BitsInt.access(v, 0, 2); + check(0, v); } - @Test public void testPack1() - { - int v = 0 ; - v = BitsInt.pack(v, 0xF, 0, 4) ; - check(0xF, v ) ; + @Test + public void testPack1() { + int v = 0; + v = BitsInt.pack(v, 0xF, 0, 4); + check(0xF, v); } - @Test public void testPack2() - { - int v = 0xF0 ; - v = BitsInt.pack(v, 0x2, 0, 4) ; - check(0xF2, v ) ; + @Test + public void testPack2() { + int v = 0xF0; + v = BitsInt.pack(v, 0x2, 0, 4); + check(0xF2, v); } - @Test public void testPack3() - { - int v = -1 ; - v = BitsInt.pack(v, 0x2, 0, 8) ; - check(0xFFFFFF02, v ) ; + @Test + public void testPack3() { + int v = -1; + v = BitsInt.pack(v, 0x2, 0, 8); + check(0xFFFFFF02, v); } - @Test public void testPack4() - { - int v = 0xFFFF0000 ; - v = BitsInt.pack(v, 0x2, 8, 16) ; - check(0xFFFF0200, v ) ; + @Test + public void testPack4() { + int v = 0xFFFF0000; + v = BitsInt.pack(v, 0x2, 8, 16); + check(0xFFFF0200, v); } - @Test public void testPack5() - { - int v = 0xFFFF0000 ; - v = BitsInt.pack(v, 0xFF, 8, 16) ; - check(0xFFFFFF00, v ) ; + @Test + public void testPack5() { + int v = 0xFFFF0000; + v = BitsInt.pack(v, 0xFF, 8, 16); + check(0xFFFFFF00, v); } - @Test public void testUnpack1() - { - int v = 0xABCDABCD ; - v = BitsInt.unpack(v, 0, 4) ; - check(0xD, v ) ; + @Test + public void testUnpack1() { + int v = 0xABCDABCD; + v = BitsInt.unpack(v, 0, 4); + check(0xD, v); } - @Test public void testUnpack2() - { - int v = 0xABCDABCD ; - v = BitsInt.unpack(v, 31, 32) ; - check(1, v ) ; + @Test + public void testUnpack2() { + int v = 0xABCDABCD; + v = BitsInt.unpack(v, 31, 32); + check(1, v); } - @Test public void testUnpack3() - { - int v = 0xABCDABCD ; - v = BitsInt.unpack(v, 24, 32) ; - check(0xAB, v ) ; + @Test + public void testUnpack3() { + int v = 0xABCDABCD; + v = BitsInt.unpack(v, 24, 32); + check(0xAB, v); } - @Test public void testUnpack4() - { - int v = 0xAB1234CD ; - v = BitsInt.unpack(v, 8, 24) ; - check(0x1234, v ) ; + @Test + public void testUnpack4() { + int v = 0xAB1234CD; + v = BitsInt.unpack(v, 8, 24); + check(0x1234, v); } - @Test public void testUnpackStr1() - { - String s = "ABCD" ; - int v = BitsInt.unpack(s, 0, 4) ; - check(0xABCD, v ) ; + @Test + public void testUnpackStr1() { + String s = "ABCD"; + int v = BitsInt.unpack(s, 0, 4); + check(0xABCD, v); } - @Test public void testUnpackStr2() - { - String s = "ABCD" ; - int v = BitsInt.unpack(s, 2, 4) ; - check(0xCD, v ) ; + @Test + public void testUnpackStr2() { + String s = "ABCD"; + int v = BitsInt.unpack(s, 2, 4); + check(0xCD, v); } - @Test public void testUnpackStr3() - { - String s = "ABCD" ; - int v = BitsInt.unpack(s, 0, 2) ; - check(0xAB, v ) ; + @Test + public void testUnpackStr3() { + String s = "ABCD"; + int v = BitsInt.unpack(s, 0, 2); + check(0xAB, v); } - private static void check(int expected, int actual) - { - check(null, expected, actual) ; + private static void check(int expected, int actual) { + check(null, expected, actual); } - private static void check(String msg, int expected, int actual) - { - if ( expected == actual ) return ; - String s = "Expected: "+Integer.toHexString(expected)+" : Got: "+Integer.toHexString(actual) ; + private static void check(String msg, int expected, int actual) { + if ( expected == actual ) + return; + String assertMsg = "Expected: " + Integer.toHexString(expected) + " : Got: " + Integer.toHexString(actual); if ( msg != null ) - s = msg+": "+s ; - assertFalse(s, true) ; + assertMsg = msg + ": " + assertMsg; + assertFalse(true, assertMsg); } } diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestBitsLong.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestBitsLong.java index bd46ca9131..1b5e7434bd 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestBitsLong.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestBitsLong.java @@ -18,466 +18,463 @@ package org.apache.jena.atlas.lib; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test ; +import org.junit.jupiter.api.Test; - -public class TestBitsLong -{ - @Test public void testMask1() - { - long v = BitsLong.mask(0,1) ; - check(0x1L, v) ; +public class TestBitsLong { + @Test + public void testMask1() { + long v = BitsLong.mask(0, 1); + check(0x1L, v); } - @Test public void testMask2() - { - long v = BitsLong.mask(0,2) ; - check(0x3L, v) ; + @Test + public void testMask2() { + long v = BitsLong.mask(0, 2); + check(0x3L, v); } - @Test public void testMask3() - { - long v = BitsLong.mask(1,2) ; - check(0x2L, v) ; + @Test + public void testMask3() { + long v = BitsLong.mask(1, 2); + check(0x2L, v); } - @Test public void testMask4() - { - long v = BitsLong.mask(0,64) ; - check(-1L, v) ; + @Test + public void testMask4() { + long v = BitsLong.mask(0, 64); + check(-1L, v); } - @Test public void testMask5() - { - long v = BitsLong.mask(16,48) ; - check(0x0000FFFFFFFF0000L, v) ; + @Test + public void testMask5() { + long v = BitsLong.mask(16, 48); + check(0x0000FFFFFFFF0000L, v); } - @Test public void testMask6() - { - long v = BitsLong.mask(16,64) ; - check(0xFFFFFFFFFFFF0000L, v) ; + @Test + public void testMask6() { + long v = BitsLong.mask(16, 64); + check(0xFFFFFFFFFFFF0000L, v); } - @Test public void testMask7() - { - long v = BitsLong.mask(0, 0) ; - check(0L, v) ; + @Test + public void testMask7() { + long v = BitsLong.mask(0, 0); + check(0L, v); } - @Test public void testMaskZero1() - { - long v = BitsLong.maskZero(0,1) ; - check(~0x1L, v) ; + @Test + public void testMaskZero1() { + long v = BitsLong.maskZero(0, 1); + check(~0x1L, v); } - @Test public void testMaskZero2() - { - long v = BitsLong.maskZero(0,2) ; - check(~0x3L, v) ; + @Test + public void testMaskZero2() { + long v = BitsLong.maskZero(0, 2); + check(~0x3L, v); } - @Test public void testMaskZero3() - { - long v = BitsLong.maskZero(1,2) ; - check(0xFFFFFFFFFFFFFFFDL, v) ; + @Test + public void testMaskZero3() { + long v = BitsLong.maskZero(1, 2); + check(0xFFFFFFFFFFFFFFFDL, v); } - @Test public void testMaskZero4() - { - long v = BitsLong.maskZero(0,64) ; - check(0, v) ; + @Test + public void testMaskZero4() { + long v = BitsLong.maskZero(0, 64); + check(0, v); } - @Test public void testMaskZero5() - { - long v = BitsLong.maskZero(16,48) ; - check(0xFFFF00000000FFFFL, v) ; + @Test + public void testMaskZero5() { + long v = BitsLong.maskZero(16, 48); + check(0xFFFF00000000FFFFL, v); } - @Test public void testMaskZero6() - { - long v = BitsLong.maskZero(16,64) ; - check(0xFFFFL, v) ; + @Test + public void testMaskZero6() { + long v = BitsLong.maskZero(16, 64); + check(0xFFFFL, v); } - @Test public void testMaskZero7() - { - long v = BitsLong.maskZero(0, 0) ; - check(-1L, v) ; + @Test + public void testMaskZero7() { + long v = BitsLong.maskZero(0, 0); + check(-1L, v); } - @Test public void testClear1() - { - long v = 0xF0F0 ; - v = BitsLong.clear(v, 4, 8) ; - check(0xF000L, v ) ; + @Test + public void testClear1() { + long v = 0xF0F0; + v = BitsLong.clear(v, 4, 8); + check(0xF000L, v); } - @Test public void testClear2() - { + @Test + public void testClear2() { long v = 0x8000000000000000L; - v = BitsLong.clear(v, 63, 64) ; - check(0x0L, v ) ; + v = BitsLong.clear(v, 63, 64); + check(0x0L, v); } - @Test public void testClear3() - { + @Test + public void testClear3() { long v = 0xC000000000000000L; - v = BitsLong.clear(v, 63, 64) ; - check(0x4000000000000000L, v ) ; + v = BitsLong.clear(v, 63, 64); + check(0x4000000000000000L, v); } - @Test public void testClear4() - { - long v = -1 ; - v = BitsLong.clear(v, 63, 64) ; - check(0x7FFFFFFFFFFFFFFFL, v ) ; + @Test + public void testClear4() { + long v = -1; + v = BitsLong.clear(v, 63, 64); + check(0x7FFFFFFFFFFFFFFFL, v); } - @Test public void testClear5() - { - long v = -1 ; - v = BitsLong.clear(v, 32, 64) ; - check(0x00000000FFFFFFFFL, v ) ; + @Test + public void testClear5() { + long v = -1; + v = BitsLong.clear(v, 32, 64); + check(0x00000000FFFFFFFFL, v); } - @Test public void testClear6() - { - long v = -1 ; - v = BitsLong.clear(v, 0, 32) ; - check(0xFFFFFFFF00000000L, v ) ; + @Test + public void testClear6() { + long v = -1; + v = BitsLong.clear(v, 0, 32); + check(0xFFFFFFFF00000000L, v); } - @Test public void testClear7() - { - long v = -1L ; - v = BitsLong.clear(v, 0, 0) ; - check(-1L, v ) ; + @Test + public void testClear7() { + long v = -1L; + v = BitsLong.clear(v, 0, 0); + check(-1L, v); } - @Test public void testClear8() - { - long v = -1L ; - v = BitsLong.clear(v, 0) ; - check(0xFFFFFFFFFFFFFFFEL, v ) ; + @Test + public void testClear8() { + long v = -1L; + v = BitsLong.clear(v, 0); + check(0xFFFFFFFFFFFFFFFEL, v); } - @Test public void testClear9() - { - long v = -1L ; - v = BitsLong.clear(v, 63) ; - check(0x7FFFFFFFFFFFFFFFL, v ) ; + @Test + public void testClear9() { + long v = -1L; + v = BitsLong.clear(v, 63); + check(0x7FFFFFFFFFFFFFFFL, v); } - @Test public void testClear10() - { - long v = 0x0L ; - v = BitsLong.clear(v, 16) ; - check(v, v) ; + @Test + public void testClear10() { + long v = 0x0L; + v = BitsLong.clear(v, 16); + check(v, v); } - @Test public void testSet1() - { - long v = 0x0 ; - v = BitsLong.set(v, 0, 1) ; - check(1, v) ; + @Test + public void testSet1() { + long v = 0x0; + v = BitsLong.set(v, 0, 1); + check(1, v); } - @Test public void testSet2() - { - long v = 0x1 ; - v = BitsLong.set(v, 0, 1) ; - check(1, v) ; + @Test + public void testSet2() { + long v = 0x1; + v = BitsLong.set(v, 0, 1); + check(1, v); } - @Test public void testSet3() - { - long v = 0xF0 ; - v = BitsLong.set(v, 0, 1) ; - check(0xF1, v) ; + @Test + public void testSet3() { + long v = 0xF0; + v = BitsLong.set(v, 0, 1); + check(0xF1, v); } - @Test public void testSet4() - { - long v = 0xF0F0F0F0F0F0F0F0L ; - v = BitsLong.set(v, 0, 8) ; - check(0xF0F0F0F0F0F0F0FFL, v) ; + @Test + public void testSet4() { + long v = 0xF0F0F0F0F0F0F0F0L; + v = BitsLong.set(v, 0, 8); + check(0xF0F0F0F0F0F0F0FFL, v); } - @Test public void testSet5() - { - long v = 0 ; - v = BitsLong.set(v, 16, 48) ; - check(0x0000FFFFFFFF0000L, v) ; + @Test + public void testSet5() { + long v = 0; + v = BitsLong.set(v, 16, 48); + check(0x0000FFFFFFFF0000L, v); } - @Test public void testSet6() - { - long v = 0 ; - v = BitsLong.set(v, 63, 64) ; - check(0x8000000000000000L, v) ; + @Test + public void testSet6() { + long v = 0; + v = BitsLong.set(v, 63, 64); + check(0x8000000000000000L, v); } - @Test public void testSet7() - { - long v = 0 ; - v = BitsLong.set(v, 62, 64) ; - check(0xC000000000000000L, v) ; + @Test + public void testSet7() { + long v = 0; + v = BitsLong.set(v, 62, 64); + check(0xC000000000000000L, v); } - @Test public void testSet8() - { - long v = 0 ; - v = BitsLong.set(v, 0, 64) ; - check(-1L, v) ; + @Test + public void testSet8() { + long v = 0; + v = BitsLong.set(v, 0, 64); + check(-1L, v); } - @Test public void testSet9() - { - long v = 0 ; - v = BitsLong.set(v, 10, 10) ; - check(0, v) ; + @Test + public void testSet9() { + long v = 0; + v = BitsLong.set(v, 10, 10); + check(0, v); } - @Test public void testSetBit1() - { - long v = 0 ; - v = BitsLong.set(v, 0) ; - check(1, v) ; + @Test + public void testSetBit1() { + long v = 0; + v = BitsLong.set(v, 0); + check(1, v); } - @Test public void testSetBit2() - { - long v = 0 ; - v = BitsLong.set(v, 1) ; - check(2, v) ; + @Test + public void testSetBit2() { + long v = 0; + v = BitsLong.set(v, 1); + check(2, v); } - @Test public void testSetBit3() - { - long v = 1 ; - v = BitsLong.set(v, 0) ; - check(1, v) ; + @Test + public void testSetBit3() { + long v = 1; + v = BitsLong.set(v, 0); + check(1, v); } - @Test public void testSetBit4() - { - long v = -1 ; - v = BitsLong.set(v, 0) ; - check(-1, v) ; + @Test + public void testSetBit4() { + long v = -1; + v = BitsLong.set(v, 0); + check(-1, v); } - @Test public void testSetBit5() - { - long v = 0 ; - v = BitsLong.set(v, 62) ; - check(0x4000000000000000L, v) ; + @Test + public void testSetBit5() { + long v = 0; + v = BitsLong.set(v, 62); + check(0x4000000000000000L, v); } - @Test public void testSetBit6() - { - long v = 0 ; - v = BitsLong.set(v, 63) ; - check(0x8000000000000000L, v) ; + @Test + public void testSetBit6() { + long v = 0; + v = BitsLong.set(v, 63); + check(0x8000000000000000L, v); } - @Test public void testBitTest1() - { - long v = 0 ; - assertTrue(BitsLong.test(v, false, 0)) ; + @Test + public void testBitTest1() { + long v = 0; + assertTrue(BitsLong.test(v, false, 0)); } - @Test public void testBitTest2() - { - long v = 1 ; - assertTrue(BitsLong.test(v, true, 0)) ; + @Test + public void testBitTest2() { + long v = 1; + assertTrue(BitsLong.test(v, true, 0)); } - @Test public void testBitTest3() - { - long v = -1 ; - assertTrue(BitsLong.test(v, true, 63)) ; + @Test + public void testBitTest3() { + long v = -1; + assertTrue(BitsLong.test(v, true, 63)); } - @Test public void testBitTest4() - { - long v = 0x7FFFFFFFFFFFFFFFL ; - assertTrue(BitsLong.test(v, false, 63)) ; + @Test + public void testBitTest4() { + long v = 0x7FFFFFFFFFFFFFFFL; + assertTrue(BitsLong.test(v, false, 63)); } - @Test public void testBitsTest1() - { - long v = 0xFEDCBA9876543210L ; - assertTrue(BitsLong.test(v, 0x0, 0, 4)) ; + @Test + public void testBitsTest1() { + long v = 0xFEDCBA9876543210L; + assertTrue(BitsLong.test(v, 0x0, 0, 4)); } - @Test public void testBitsTest2() - { - long v = 0xFEDCBA9876543210L ; - assertTrue(BitsLong.test(v, 0x10, 0, 8)) ; + @Test + public void testBitsTest2() { + long v = 0xFEDCBA9876543210L; + assertTrue(BitsLong.test(v, 0x10, 0, 8)); } - @Test public void testBitsTest3() - { - long v = 0xFEDCBA9876543210L ; - assertTrue(BitsLong.test(v, v, 0, 64)) ; + @Test + public void testBitsTest3() { + long v = 0xFEDCBA9876543210L; + assertTrue(BitsLong.test(v, v, 0, 64)); } - @Test public void testBitsTest4() - { - long v = 0xFEDCBA9876543210L ; - assertFalse(BitsLong.test(v, 0, 0, 64)) ; + @Test + public void testBitsTest4() { + long v = 0xFEDCBA9876543210L; + assertFalse(BitsLong.test(v, 0, 0, 64)); } - @Test public void testBitsTest5() - { - long v = 0xFEDCBA9876543210L ; - assertTrue(BitsLong.test(v, 0x0000BA9876540000L, 16, 48)) ; + @Test + public void testBitsTest5() { + long v = 0xFEDCBA9876543210L; + assertTrue(BitsLong.test(v, 0x0000BA9876540000L, 16, 48)); } - @Test public void testIsSet1() - { - long v = 0x0000000000000010L ; - BitsLong.isSet(v, 4) ; - assertTrue(BitsLong.isSet(v, 4)) ; - assertFalse(BitsLong.isSet(v, 3)) ; - assertFalse(BitsLong.isSet(v, 5)) ; + @Test + public void testIsSet1() { + long v = 0x0000000000000010L; + BitsLong.isSet(v, 4); + assertTrue(BitsLong.isSet(v, 4)); + assertFalse(BitsLong.isSet(v, 3)); + assertFalse(BitsLong.isSet(v, 5)); } - @Test public void testAccess1() - { - long v = -1 ; - v = BitsLong.access(v, 4, 8) ; - check(0xF0L, v ) ; + @Test + public void testAccess1() { + long v = -1; + v = BitsLong.access(v, 4, 8); + check(0xF0L, v); } - @Test public void testAccess2() - { - long v = 0xFEDCBA9876543210L ; - v = BitsLong.access(v, 0, 8) ; - check(0x10L, v ) ; + @Test + public void testAccess2() { + long v = 0xFEDCBA9876543210L; + v = BitsLong.access(v, 0, 8); + check(0x10L, v); } - @Test public void testAccess3() - { - long v = 0xFEDCBA9876543210L ; - v = BitsLong.access(v, 0, 64) ; - check(0xFEDCBA9876543210L, v ) ; + @Test + public void testAccess3() { + long v = 0xFEDCBA9876543210L; + v = BitsLong.access(v, 0, 64); + check(0xFEDCBA9876543210L, v); } - @Test public void testAccess4() - { - long v = 0xFEDCBA9876543210L ; - v = BitsLong.access(v, 62, 64) ; - check(0xC000000000000000L, v ) ; + @Test + public void testAccess4() { + long v = 0xFEDCBA9876543210L; + v = BitsLong.access(v, 62, 64); + check(0xC000000000000000L, v); } - @Test public void testAccess5() - { - long v = 0xFEDCBA9876543210L ; - v = BitsLong.access(v, 0, 2) ; - check(0L, v ) ; + @Test + public void testAccess5() { + long v = 0xFEDCBA9876543210L; + v = BitsLong.access(v, 0, 2); + check(0L, v); } - @Test public void testPack1() - { - long v = 0 ; - v = BitsLong.pack(v, 0xFL, 0, 4) ; - check(0xFL, v ) ; + @Test + public void testPack1() { + long v = 0; + v = BitsLong.pack(v, 0xFL, 0, 4); + check(0xFL, v); } - @Test public void testPack2() - { - long v = 0xF0 ; - v = BitsLong.pack(v, 0x2, 0, 4) ; - check(0xF2L, v ) ; + @Test + public void testPack2() { + long v = 0xF0; + v = BitsLong.pack(v, 0x2, 0, 4); + check(0xF2L, v); } - @Test public void testPack3() - { - long v = -1 ; - v = BitsLong.pack(v, 0x2, 0, 8) ; - check(0xFFFFFFFFFFFFFF02L, v ) ; + @Test + public void testPack3() { + long v = -1; + v = BitsLong.pack(v, 0x2, 0, 8); + check(0xFFFFFFFFFFFFFF02L, v); } - @Test public void testPack4() - { - long v = 0xFFFFFFFF00000000L ; - v = BitsLong.pack(v, 0x2, 16, 32) ; - check(0xFFFFFFFF00020000L, v ) ; + @Test + public void testPack4() { + long v = 0xFFFFFFFF00000000L; + v = BitsLong.pack(v, 0x2, 16, 32); + check(0xFFFFFFFF00020000L, v); } - @Test public void testPack5() - { - long v = 0xFFFFFFFF00000000L ; - v = BitsLong.pack(v, 0xFFFF, 16, 32) ; - check(0xFFFFFFFFFFFF0000L, v ) ; + @Test + public void testPack5() { + long v = 0xFFFFFFFF00000000L; + v = BitsLong.pack(v, 0xFFFF, 16, 32); + check(0xFFFFFFFFFFFF0000L, v); } - @Test public void testUnpack1() - { - long v = 0xABCDABCDABCDABCDL ; - v = BitsLong.unpack(v, 0, 4) ; - check(0xDL, v ) ; + @Test + public void testUnpack1() { + long v = 0xABCDABCDABCDABCDL; + v = BitsLong.unpack(v, 0, 4); + check(0xDL, v); } - @Test public void testUnpack2() - { - long v = 0xABCDABCDABCDABCDL ; - v = BitsLong.unpack(v, 63, 64) ; - check(1L, v ) ; + @Test + public void testUnpack2() { + long v = 0xABCDABCDABCDABCDL; + v = BitsLong.unpack(v, 63, 64); + check(1L, v); } - @Test public void testUnpack3() - { - long v = 0xABCDABCDABCDABCDL ; - v = BitsLong.unpack(v, 56, 64) ; - check(0xABL, v ) ; + @Test + public void testUnpack3() { + long v = 0xABCDABCDABCDABCDL; + v = BitsLong.unpack(v, 56, 64); + check(0xABL, v); } - @Test public void testUnpack4() - { - long v = 0xABCD12345678ABCDL ; - v = BitsLong.unpack(v, 32, 48) ; - check(0x1234L, v ) ; + @Test + public void testUnpack4() { + long v = 0xABCD12345678ABCDL; + v = BitsLong.unpack(v, 32, 48); + check(0x1234L, v); } - @Test public void testUnpackStr1() - { - String s = "ABCD" ; - long v = BitsLong.unpack(s, 0, 4) ; - check(0xABCDL, v ) ; + @Test + public void testUnpackStr1() { + String s = "ABCD"; + long v = BitsLong.unpack(s, 0, 4); + check(0xABCDL, v); } - @Test public void testUnpackStr2() - { - String s = "ABCD" ; - long v = BitsLong.unpack(s, 2, 4) ; - check(0xCDL, v ) ; + @Test + public void testUnpackStr2() { + String s = "ABCD"; + long v = BitsLong.unpack(s, 2, 4); + check(0xCDL, v); } - @Test public void testUnpackStr3() - { - String s = "ABCD" ; - long v = BitsLong.unpack(s, 0, 2) ; - check(0xABL, v ) ; + @Test + public void testUnpackStr3() { + String s = "ABCD"; + long v = BitsLong.unpack(s, 0, 2); + check(0xABL, v); } - private static void check(long expected, long actual) - { - check(null, expected, actual) ; + private static void check(long expected, long actual) { + check(null, expected, actual); } - private static void check(String msg, long expected, long actual) - { - if ( expected == actual ) return ; - String s = "Expected: "+Long.toHexString(expected)+" : Got: "+Long.toHexString(actual) ; + private static void check(String msg, long expected, long actual) { + if ( expected == actual ) + return; + String assertMsg = "Expected: " + Long.toHexString(expected) + " : Got: " + Long.toHexString(actual); if ( msg != null ) - s = msg+": "+s ; - assertFalse(s, true) ; + assertMsg = msg + ": " + assertMsg; + assertFalse(true, assertMsg); } } diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestBytes.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestBytes.java index 101429c1a0..0824ce7d82 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestBytes.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestBytes.java @@ -18,13 +18,13 @@ package org.apache.jena.atlas.lib; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; import java.nio.ByteBuffer; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestBytes { diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestCollectionUtils.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestCollectionUtils.java index 9e23c1d788..e818293c2d 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestCollectionUtils.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestCollectionUtils.java @@ -20,17 +20,17 @@ package org.apache.jena.atlas.lib; import static org.apache.jena.atlas.lib.CollectionUtils.oneElt; import static org.apache.jena.atlas.lib.CollectionUtils.sameElts; -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 static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays ; import java.util.HashSet ; import java.util.List ; import java.util.Set ; -import org.junit.Test ; +import org.junit.jupiter.api.Test ; public class TestCollectionUtils { @Test diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestDateTimeUtils.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestDateTimeUtils.java index feaa5f64e7..2cbf064b49 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestDateTimeUtils.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestDateTimeUtils.java @@ -17,13 +17,13 @@ */ package org.apache.jena.atlas.lib; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.Calendar; import java.util.GregorianCalendar; import java.util.TimeZone; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestDateTimeUtils { diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestEscapeStr.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestEscapeStr.java index 52bb50862c..cf29075406 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestEscapeStr.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestEscapeStr.java @@ -23,7 +23,7 @@ import java.io.StringWriter; import org.apache.jena.atlas.io.AWriter; import org.apache.jena.atlas.io.IO; import org.junit.Assert ; -import org.junit.Test ; +import org.junit.jupiter.api.Test ; // Testing is a bit light here but the RDF term output and // the language level output covers the ground as well. diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestFileOps.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestFileOps.java index 492c4cc3ca..9b2e5b41da 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestFileOps.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestFileOps.java @@ -18,14 +18,14 @@ package org.apache.jena.atlas.lib; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; import java.util.List; import org.apache.jena.atlas.lib.tuple.Tuple ; -import org.junit.Test ; +import org.junit.jupiter.api.Test ; public class TestFileOps { diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestFilenameProcessing.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestFilenameProcessing.java index 4476104ec1..e30a8a19e7 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestFilenameProcessing.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestFilenameProcessing.java @@ -18,16 +18,16 @@ package org.apache.jena.atlas.lib; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File ; import java.nio.file.Path; import org.apache.jena.base.Sys; -import org.junit.Test ; +import org.junit.jupiter.api.Test ; public class TestFilenameProcessing { diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestHex.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestHex.java index b6fbf2993b..b4a02ab82a 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestHex.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestHex.java @@ -19,10 +19,10 @@ package org.apache.jena.atlas.lib; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; -import org.junit.Test ; +import org.junit.jupiter.api.Test ; public class TestHex { diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestIRILib.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestIRILib.java index 6cef24f4da..4299f84036 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestIRILib.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestIRILib.java @@ -18,9 +18,9 @@ package org.apache.jena.atlas.lib; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /* * @see TestFilenameProcessing diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestListUtils.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestListUtils.java index 31c2d1130b..37646d38ba 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestListUtils.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestListUtils.java @@ -19,13 +19,13 @@ package org.apache.jena.atlas.lib; import static org.apache.jena.atlas.lib.ListUtils.unique ; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.ArrayList ; import java.util.Arrays ; import java.util.List ; -import org.junit.Test ; +import org.junit.jupiter.api.Test ; public class TestListUtils { diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestNumberUtils.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestNumberUtils.java index 39f8e8d2a6..c716913b9d 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestNumberUtils.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestNumberUtils.java @@ -18,9 +18,9 @@ package org.apache.jena.atlas.lib; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test ; +import org.junit.jupiter.api.Test ; public class TestNumberUtils { diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestPowerSet.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestPowerSet.java index 9c71e93866..298a3b9aa9 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestPowerSet.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestPowerSet.java @@ -18,10 +18,11 @@ package org.apache.jena.atlas.lib; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.Set; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestPowerSet { @Test @@ -59,6 +60,6 @@ public class TestPowerSet { private void test(Set<String> input, Set<Set<String>> expected) { Set<Set<String>> result = Lib.powerSet(input); - Assert.assertEquals(expected, result); + assertEquals(expected, result); } } diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestRefCountingMap.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestRefCountingMap.java index 28173c25b6..0ed7a604cd 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestRefCountingMap.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestRefCountingMap.java @@ -18,9 +18,9 @@ package org.apache.jena.atlas.lib; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestRefCountingMap { diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestSetUtils.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestSetUtils.java index 1ee3608bc5..fc9ac1dc14 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestSetUtils.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestSetUtils.java @@ -19,14 +19,14 @@ package org.apache.jena.atlas.lib; import static org.apache.jena.atlas.lib.ListUtils.asList ; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.HashSet ; import java.util.List ; import java.util.Set ; -import org.junit.Test ; +import org.junit.jupiter.api.Test ; public class TestSetUtils { diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestStrUtils.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestStrUtils.java index 0b561b8423..fe4ee10609 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestStrUtils.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestStrUtils.java @@ -18,12 +18,13 @@ package org.apache.jena.atlas.lib; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +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 org.apache.jena.atlas.AtlasException; -import org.junit.Test ; +import org.junit.jupiter.api.Test ; public class TestStrUtils { @@ -70,10 +71,10 @@ public class TestStrUtils @Test public void enc10() { testDecode("_EC_82_AC_EC_9A_A9_5F_EC_84_A4_EB_AA_85_EC_84_9C", "사용_설명서"); } @Test public void enc11() { testDecode("_41", "A"); } - @Test(expected=AtlasException.class) public void enc20() { testDecode("_4", null); } - @Test(expected=AtlasException.class) public void enc21() { testDecode("_", null); } - @Test(expected=AtlasException.class) public void enc22() { testDecode("_X1", null); } - @Test(expected=AtlasException.class) public void enc23() { testDecode("_1X", null); } + @Test public void enc20() { assertThrows(AtlasException.class, ()->testDecode("_4", null)); } + @Test public void enc21() { assertThrows(AtlasException.class, ()->testDecode("_", null)); } + @Test public void enc22() { assertThrows(AtlasException.class, ()->testDecode("_X1", null)); } + @Test public void enc23() { assertThrows(AtlasException.class, ()->testDecode("_1X", null)); } @Test public void lastChar01() { testLastChar("abc", 'c'); } @Test public void lastChar02() { testLastChar(".", '.'); } diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestTrie.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestTrie.java index 3a0c61f8e1..e48cdb34be 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestTrie.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestTrie.java @@ -18,14 +18,18 @@ package org.apache.jena.atlas.lib; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.List; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for the {@link Trie} class - * + * */ public class TestTrie { @@ -36,8 +40,8 @@ public class TestTrie { public void trie_add_01() { Trie<Integer> trie = new Trie<>(); trie.add("test", 123); - Assert.assertTrue(trie.contains("test")); - Assert.assertEquals((Integer) 123, trie.get("test")); + assertTrue(trie.contains("test")); + assertEquals((Integer) 123, trie.get("test")); } /** @@ -48,10 +52,10 @@ public class TestTrie { Trie<Integer> trie = new Trie<>(); trie.add("test", 123); trie.add("other", 456); - Assert.assertTrue(trie.contains("test")); - Assert.assertTrue(trie.contains("other")); - Assert.assertEquals((Integer) 123, trie.get("test")); - Assert.assertEquals((Integer) 456, trie.get("other")); + assertTrue(trie.contains("test")); + assertTrue(trie.contains("other")); + assertEquals((Integer) 123, trie.get("test")); + assertEquals((Integer) 456, trie.get("other")); } /** @@ -62,8 +66,8 @@ public class TestTrie { Trie<Integer> trie = new Trie<>(); trie.add("test", 123); trie.add("test", 456); - Assert.assertTrue(trie.contains("test")); - Assert.assertEquals((Integer) 456, trie.get("test")); + assertTrue(trie.contains("test")); + assertEquals((Integer) 456, trie.get("test")); } /** @@ -73,9 +77,9 @@ public class TestTrie { public void trie_add_04() { Trie<Integer> trie = new Trie<>(); trie.add("test", null); - Assert.assertFalse(trie.contains("test")); + assertFalse(trie.contains("test")); } - + /** * Adding a null key is permitted - provides access to root of Trie */ @@ -83,28 +87,28 @@ public class TestTrie { public void trie_add_05() { Trie<Integer> trie = new Trie<>(); trie.add(null, 123); - Assert.assertTrue(trie.contains(null)); - Assert.assertEquals((Integer)123, trie.get(null)); + assertTrue(trie.contains(null)); + assertEquals((Integer)123, trie.get(null)); } - + /** - * Adding an empty key is permitted - provides access to root of Trie + * Adding an empty key is permitted - provides access to root of Trie */ @Test public void trie_add_06() { Trie<Integer> trie = new Trie<>(); trie.add("", 123); - Assert.assertTrue(trie.contains("")); - Assert.assertEquals((Integer)123, trie.get("")); + assertTrue(trie.contains("")); + assertEquals((Integer)123, trie.get("")); } - + /** * Test for non-existent key */ @Test public void trie_contains_01() { Trie<Integer> trie = new Trie<>(); - Assert.assertFalse(trie.contains("test")); + assertFalse(trie.contains("test")); } /** @@ -114,34 +118,34 @@ public class TestTrie { public void trie_contains_02() { Trie<Integer> trie = new Trie<>(); trie.add("test", 123); - Assert.assertTrue(trie.contains("test")); - Assert.assertTrue(trie.contains("test", true)); - Assert.assertTrue(trie.contains("test", 123)); + assertTrue(trie.contains("test")); + assertTrue(trie.contains("test", true)); + assertTrue(trie.contains("test", 123)); // Any prefix of an added key exists if we don't require it to have a // value - Assert.assertFalse(trie.contains("t")); - Assert.assertTrue(trie.contains("t", false)); + assertFalse(trie.contains("t")); + assertTrue(trie.contains("t", false)); } - + /** * Test for non-existent null key */ @Test public void trie_contains_03() { Trie<Integer> trie = new Trie<>(); - Assert.assertFalse(trie.contains(null)); - Assert.assertTrue(trie.contains(null, false)); + assertFalse(trie.contains(null)); + assertTrue(trie.contains(null, false)); } - + /** * Test for empty key */ @Test public void trie_contains_04() { Trie<Integer> trie = new Trie<>(); - Assert.assertFalse(trie.contains("")); - Assert.assertTrue(trie.contains("", false)); + assertFalse(trie.contains("")); + assertTrue(trie.contains("", false)); } /** @@ -151,14 +155,14 @@ public class TestTrie { public void trie_remove_01() { Trie<Integer> trie = new Trie<>(); trie.add("test", 123); - Assert.assertTrue(trie.contains("test")); - Assert.assertEquals((Integer) 123, trie.get("test")); + assertTrue(trie.contains("test")); + assertEquals((Integer) 123, trie.get("test")); // Removing does not fully remove the key it merely nulls the value trie.remove("test"); - Assert.assertFalse(trie.contains("test")); - Assert.assertTrue(trie.contains("test", false)); - Assert.assertNull(trie.get("test")); + assertFalse(trie.contains("test")); + assertTrue(trie.contains("test", false)); + assertNull(trie.get("test")); } /** @@ -170,22 +174,22 @@ public class TestTrie { Trie<Integer> trie = new Trie<>(); trie.add("test", 123); trie.add("testing", 456); - Assert.assertTrue(trie.contains("test")); - Assert.assertEquals((Integer) 123, trie.get("test")); - Assert.assertTrue(trie.contains("testing")); - Assert.assertEquals((Integer) 456, trie.get("testing")); + assertTrue(trie.contains("test")); + assertEquals((Integer) 123, trie.get("test")); + assertTrue(trie.contains("testing")); + assertEquals((Integer) 456, trie.get("testing")); // Removing does not fully remove the key it merely nulls the value trie.remove("test"); - Assert.assertFalse(trie.contains("test")); - Assert.assertTrue(trie.contains("test", false)); - Assert.assertNull(trie.get("test")); + assertFalse(trie.contains("test")); + assertTrue(trie.contains("test", false)); + assertNull(trie.get("test")); // It also does not remove any keys who had the removed key as a prefix - Assert.assertTrue(trie.contains("testing")); - Assert.assertEquals((Integer) 456, trie.get("testing")); + assertTrue(trie.contains("testing")); + assertEquals((Integer) 456, trie.get("testing")); } - + /** * Test for removing null key - provides access to trie root */ @@ -193,13 +197,13 @@ public class TestTrie { public void trie_remove_03() { Trie<Integer> trie = new Trie<>(); trie.add(null, 123); - Assert.assertTrue(trie.contains(null)); - Assert.assertEquals((Integer)123, trie.get(null)); - + assertTrue(trie.contains(null)); + assertEquals((Integer)123, trie.get(null)); + trie.remove(null); - Assert.assertFalse(trie.contains(null)); + assertFalse(trie.contains(null)); } - + /** * Test for removing null key - provides access to trie root */ @@ -207,18 +211,18 @@ public class TestTrie { public void trie_remove_04() { Trie<Integer> trie = new Trie<>(); trie.add("", 123); - Assert.assertTrue(trie.contains("")); - Assert.assertEquals((Integer)123, trie.get("")); - + assertTrue(trie.contains("")); + assertEquals((Integer)123, trie.get("")); + trie.remove(""); - Assert.assertFalse(trie.contains("")); + assertFalse(trie.contains("")); } - + @Test public void trie_clear_01() { Trie<Integer> trie = new Trie<>(); trie.clear() ; - Assert.assertTrue(trie.isEmpty()) ; + assertTrue(trie.isEmpty()) ; } @Test @@ -226,35 +230,35 @@ public class TestTrie { Trie<Integer> trie = new Trie<>(); trie.add("", 123); trie.clear() ; - Assert.assertFalse(trie.contains("")); - Assert.assertTrue(trie.isEmpty()) ; + assertFalse(trie.contains("")); + assertTrue(trie.isEmpty()) ; } @Test public void trie_isEmpty_01() { Trie<Integer> trie = new Trie<>(); - Assert.assertTrue(trie.isEmpty()) ; + assertTrue(trie.isEmpty()) ; } - + @Test public void trie_isEmpty_02() { Trie<Integer> trie = new Trie<>(); trie.add("", 123); - Assert.assertFalse(trie.isEmpty()) ; + assertFalse(trie.isEmpty()) ; } @Test public void trie_isEmpty_03() { Trie<Integer> trie = new Trie<>(); trie.add("x", 123); - Assert.assertFalse(trie.isEmpty()) ; + assertFalse(trie.isEmpty()) ; } - + @Test public void trie_isEmpty_04() { Trie<Integer> trie = new Trie<>(); trie.add("xy", 123); - Assert.assertFalse(trie.isEmpty()) ; + assertFalse(trie.isEmpty()) ; } @@ -266,24 +270,24 @@ public class TestTrie { Trie<Integer> trie = new Trie<>(); trie.add("test", 123); trie.add("testing", 456); - + //Prefix search on "test" should return two values List<Integer> matches = trie.prefixSearch("test"); - Assert.assertEquals(2, matches.size()); - + assertEquals(2, matches.size()); + //Prefix search on "testi" should return one value matches = trie.prefixSearch("testi"); - Assert.assertEquals(1, matches.size()); - + assertEquals(1, matches.size()); + //Prefix search on "testingly" should return no values matches = trie.prefixSearch("testingly"); - Assert.assertEquals(0, matches.size()); - + assertEquals(0, matches.size()); + //Prefix search on null key should give two values matches = trie.prefixSearch(null); - Assert.assertEquals(2, matches.size()); + assertEquals(2, matches.size()); } - + /** * Test partial search */ @@ -292,24 +296,24 @@ public class TestTrie { Trie<Integer> trie = new Trie<>(); trie.add("test", 123); trie.add("testing", 456); - + //Partial search on "test" should return one values List<Integer> matches = trie.partialSearch("test"); - Assert.assertEquals(1, matches.size()); - + assertEquals(1, matches.size()); + //Prefix search on "testi" should return one values matches = trie.partialSearch("testi"); - Assert.assertEquals(1, matches.size()); - + assertEquals(1, matches.size()); + //Prefix search on "testingly" should return two values matches = trie.partialSearch("testingly"); - Assert.assertEquals(2, matches.size()); - + assertEquals(2, matches.size()); + //Prefix search on null key should give no values matches = trie.partialSearch(null); - Assert.assertEquals(0, matches.size()); + assertEquals(0, matches.size()); } - + /** * Test longest match */ @@ -318,12 +322,12 @@ public class TestTrie { Trie<Integer> trie = new Trie<>(); trie.add("test", 123); trie.add("testing", 456); - Assert.assertTrue(trie.contains("test")); - Assert.assertTrue(trie.contains("testing")); - - Assert.assertEquals((Integer)456, trie.longestMatch("testing")); + assertTrue(trie.contains("test")); + assertTrue(trie.contains("testing")); + + assertEquals((Integer)456, trie.longestMatch("testing")); } - + /** * Test longest match */ @@ -332,10 +336,10 @@ public class TestTrie { Trie<Integer> trie = new Trie<>(); trie.add("test", 123); trie.add("testing", 456); - - Assert.assertEquals((Integer)456, trie.longestMatch("testingly")); + + assertEquals((Integer)456, trie.longestMatch("testingly")); } - + /** * Test longest match */ @@ -345,10 +349,10 @@ public class TestTrie { trie.add("test", 123); trie.add("testing", 456); trie.remove("testing"); - - Assert.assertEquals((Integer)123, trie.longestMatch("testing")); + + assertEquals((Integer)123, trie.longestMatch("testing")); } - + /** * Test shortest match */ @@ -357,12 +361,12 @@ public class TestTrie { Trie<Integer> trie = new Trie<>(); trie.add("test", 123); trie.add("testing", 456); - Assert.assertTrue(trie.contains("test")); - Assert.assertTrue(trie.contains("testing")); - - Assert.assertEquals((Integer)123, trie.shortestMatch("testing")); + assertTrue(trie.contains("test")); + assertTrue(trie.contains("testing")); + + assertEquals((Integer)123, trie.shortestMatch("testing")); } - + /** * Test shortest match */ @@ -371,10 +375,10 @@ public class TestTrie { Trie<Integer> trie = new Trie<>(); trie.add("test", 123); trie.add("testing", 456); - - Assert.assertEquals((Integer)123, trie.shortestMatch("testingly")); + + assertEquals((Integer)123, trie.shortestMatch("testingly")); } - + /** * Test shortest match */ @@ -384,7 +388,7 @@ public class TestTrie { trie.add("test", 123); trie.add("testing", 456); trie.remove("test"); - - Assert.assertEquals((Integer)456, trie.shortestMatch("testing")); + + assertEquals((Integer)456, trie.shortestMatch("testing")); } } diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestVersion.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestVersion.java index a8e9b610a6..b5b8a9a9e5 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestVersion.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestVersion.java @@ -18,18 +18,18 @@ package org.apache.jena.atlas.lib; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Optional; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestVersion { @Test public void version_01() { // This can not be a Jena class (jar probably does not exist during tests) Optional<String> x = Version.versionForClass(org.slf4j.Logger.class); - assertNotNull("Optional<String> version info is null", x); - assertTrue("Version info is null", x.isPresent()); + assertNotNull(x, ()->"Optional<String> version info is null"); + assertTrue(x.isPresent(), ()->"Version info is null"); } } diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestXMLLib.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestXMLLib.java index 1271e3a4c5..8dc3a7c926 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestXMLLib.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestXMLLib.java @@ -18,8 +18,9 @@ package org.apache.jena.atlas.lib; -import org.junit.Assert ; -import org.junit.Test ; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test ; /** XML related functionality */ public class TestXMLLib @@ -32,15 +33,15 @@ public class TestXMLLib @Test public void ws_collapse_06() { test("", "") ; } @Test public void ws_collapse_07() { test(" ", "") ; } @Test public void ws_collapse_08() { test(" \t\t\t\t\t\t\t ", "") ; } - + // String.trim : "Returns a copy of the string, with leading and trailing whitespace omitted." - // but later says it trims anything <= 0x20. There are lots of control characters in x01-x1F. - // We only want to trim \n \r \t and space. - + // but later says it trims anything <= 0x20. There are lots of control characters in x01-x1F. + // We only want to trim \n \r \t and space. + private static void test(String str1, String str2) { String result = XMLLib.WScollapse(str1) ; - Assert.assertEquals(str2, result) ; + assertEquals(str2, result) ; } } diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestCache.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/cache/TestCache.java similarity index 70% rename from jena-base/src/test/java/org/apache/jena/atlas/lib/TestCache.java rename to jena-base/src/test/java/org/apache/jena/atlas/lib/cache/TestCache.java index 6458c74f18..cfe3f6043c 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestCache.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/cache/TestCache.java @@ -16,24 +16,27 @@ * limitations under the License. */ -package org.apache.jena.atlas.lib; +package org.apache.jena.atlas.lib.cache; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; -import java.util.Arrays ; -import java.util.Collection ; import java.util.List ; +import java.util.stream.Stream; + +import org.junit.jupiter.api.BeforeEach; +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.atlas.iterator.Iter ; -import org.junit.Before ; -import org.junit.Test ; -import org.junit.runner.RunWith ; -import org.junit.runners.Parameterized ; -import org.junit.runners.Parameterized.Parameters ; +import org.apache.jena.atlas.lib.Cache; +import org.apache.jena.atlas.lib.CacheFactory; -@RunWith(Parameterized.class) +@ParameterizedClass(name="{index}: {0}") +@MethodSource("provideArgs") public class TestCache { // Tests do not apply to cache1. @@ -44,21 +47,20 @@ public class TestCache private static CacheMaker<Integer, Integer> standard = (int size)->CacheFactory.createCache(size); private static CacheMaker<Integer, Integer> plainLRU = (int size)->CacheFactory.createCache(size); - @Parameters(name="{0}") - public static Collection<Object[]> cacheMakers() - { - return Arrays.asList(new Object[][] - { { "Simple(10)", simple , 10 } - , { "Simple(2)", simple , 2 } - , { "Simple(1)" , simple ,1 } - , { "Plain(10)", plainLRU , 10 } - , { "Plain(2)", plainLRU , 2 } - , { "Plain(1)" , plainLRU ,1 } - , { "Standard(10)" , standard, 10 } - , { "Standard(2)" , standard, 2 } - , { "Standard(1)" , standard, 1 } - , { "SingleSlot" , oneSlot, 1 } - } ) ; + private static Stream<Arguments> provideArgs() { + List<Arguments> x = List.of + (Arguments.of("Simple(10)", simple , 10) + , Arguments.of( "Simple(2)", simple , 2) + , Arguments.of( "Simple(1)" , simple ,1) + , Arguments.of( "Plain(10)", plainLRU , 10) + , Arguments.of( "Plain(2)", plainLRU , 2) + , Arguments.of( "Plain(1)" , plainLRU , 1) + , Arguments.of( "Standard(10)" , standard, 10) + , Arguments.of( "Standard(2)" , standard, 2) + , Arguments.of( "Standard(1)" , standard, 1) + , Arguments.of( "SingleSlot" , oneSlot, 1) + ); + return x.stream(); } Cache<Integer, Integer> cache; @@ -70,7 +72,7 @@ public class TestCache this.size = size; } - @Before + @BeforeEach public void before() { cache = cacheMaker.make(size); } diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestCache2.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/cache/TestCache2.java similarity index 90% rename from jena-base/src/test/java/org/apache/jena/atlas/lib/TestCache2.java rename to jena-base/src/test/java/org/apache/jena/atlas/lib/cache/TestCache2.java index cc333fad95..7c9d8eb395 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestCache2.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/cache/TestCache2.java @@ -16,12 +16,15 @@ * limitations under the License. */ -package org.apache.jena.atlas.lib; +package org.apache.jena.atlas.lib.cache; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import org.apache.jena.atlas.lib.Cache; +import org.apache.jena.atlas.lib.CacheFactory; // Non-parameterized tests public class TestCache2 { diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/cache/TestCacheSimple.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/cache/TestCacheSimple.java index a3db7546e0..8ea267a486 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/cache/TestCacheSimple.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/cache/TestCacheSimple.java @@ -20,10 +20,12 @@ package org.apache.jena.atlas.lib.cache; import static java.util.stream.Collectors.toMap; import static java.util.stream.IntStream.rangeClosed; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; + +import org.junit.jupiter.api.Test; import org.apache.jena.atlas.lib.Cache; -import org.junit.Test; + /** * Tests of CacheSimple @@ -43,7 +45,7 @@ public class TestCacheSimple { .boxed() .collect(toMap(k -> k, v -> 1)) .forEach(testCache::put); - assertEquals("Test cache failed to maintain fixed size!", maxSize, testCache.size()); + assertEquals(maxSize, testCache.size(), ()->"Test cache failed to maintain fixed size!"); } @Test @@ -55,10 +57,11 @@ public class TestCacheSimple { final Cache<Integer, Object> testCache = new CacheSimple<>(5); testCache.put(key, value1); testCache.put(key, value2); - assertEquals("Wrong size", 1, testCache.size()); - assertEquals("Wrong slot contents", value2, testCache.getIfPresent(key)); + assertEquals(1, testCache.size(), ()->"Wrong size"); + assertEquals(value2, testCache.getIfPresent(key), ()->"Wrong slot contents"); } + @Test public void testSameHash() { CompoundKey key1 = new CompoundKey(1, 1); @@ -67,8 +70,8 @@ public class TestCacheSimple { assertNotEquals(key1, key2); Cache<CompoundKey, Integer> cache = new CacheSimple<>(10); cache.put(key1, 1); - assertTrue("Same key, expected to be in cache", cache.containsKey(key1)); - assertFalse("Keys with same hash code should not be considered equal", cache.containsKey(key2)); + assertTrue(cache.containsKey(key1), ()->"Same key, expected to be in cache"); + assertFalse(cache.containsKey(key2), ()->"Keys with same hash code should not be considered equal"); } @Test @@ -79,7 +82,7 @@ public class TestCacheSimple { assertEquals(key1, key2); Cache<CompoundKey, Integer> cache = new CacheSimple<>(10); cache.put(key1, 1); - assertTrue("Equal key, expected to be found", cache.containsKey(key2)); + assertTrue(cache.containsKey(key2), ()->"Equal key, expected to be found"); } @Test @@ -159,23 +162,21 @@ public class TestCacheSimple { Cache<String, String> cache = new CacheSimple<>(10); assertEquals(0, cache.size()); - { - final var key = "key0"; - final var value = "value0"; + final var key = "key0"; + final var value = "value0"; - cache.put(key, value); + cache.put(key, value); - assertTrue(cache.containsKey(key)); - assertEquals(value, cache.getIfPresent(key)); - assertEquals(1, cache.size()); + assertTrue(cache.containsKey(key)); + assertEquals(value, cache.getIfPresent(key)); + assertEquals(1, cache.size()); - //removing entry by writing null value - cache.put(key, null); + //removing entry by writing null value + cache.put(key, null); - assertEquals(0, cache.size()); - assertFalse(cache.containsKey(key)); - assertNull(value, cache.getIfPresent(key)); - } + assertEquals(0, cache.size()); + assertFalse(cache.containsKey(key)); + assertNull(cache.getIfPresent(key), ()->value); } @Test @@ -183,29 +184,27 @@ public class TestCacheSimple { Cache<String, String> cache = new CacheSimple<>(10); assertEquals(0, cache.size()); - { - final var key = "key0"; - final var value = "value0"; + final var key = "key0"; + final var value = "value0"; - //trying to remove non-existing key - cache.remove(key); - assertEquals(0, cache.size()); - assertFalse(cache.containsKey(key)); - assertNull(value, cache.getIfPresent(key)); + //trying to remove non-existing key + cache.remove(key); + assertEquals(0, cache.size()); + assertFalse(cache.containsKey(key)); + assertNull(cache.getIfPresent(key), ()->value); - cache.put(key, value); + cache.put(key, value); - assertTrue(cache.containsKey(key)); - assertEquals(value, cache.getIfPresent(key)); - assertEquals(1, cache.size()); + assertTrue(cache.containsKey(key)); + assertEquals(value, cache.getIfPresent(key)); + assertEquals(1, cache.size()); - //removing entry by writing null value - cache.remove(key); + //removing entry by writing null value + cache.remove(key); - assertEquals(0, cache.size()); - assertFalse(cache.containsKey(key)); - assertNull(value, cache.getIfPresent(key)); - } + assertEquals(0, cache.size()); + assertFalse(cache.containsKey(key)); + assertNull(cache.getIfPresent(key), ()->value); } @Test diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/persistent/TS_Persistent.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/persistent/TS_Persistent.java index 88e27ba87c..687a4cb9f8 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/persistent/TS_Persistent.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/persistent/TS_Persistent.java @@ -18,9 +18,11 @@ package org.apache.jena.atlas.lib.persistent; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -@RunWith(Suite.class) [email protected]({ TestPSet.class, TestPMap.class }) +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; +@Suite +@SelectClasses({ + TestPSet.class, + TestPMap.class +}) public class TS_Persistent {} 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 aa39f8ab4d..f18643ef59 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,16 @@ 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 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.util.Map; import java.util.Map.Entry; import java.util.Optional; import java.util.stream.Stream; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestPMap { 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 ac604496c1..930b746245 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,11 +19,11 @@ package org.apache.jena.atlas.lib.persistent; import static java.util.stream.Collectors.toSet; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestPSet { diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/tuple/TS_Tuple.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/tuple/TS_Tuple.java index 30ba125269..fdb12b4594 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/tuple/TS_Tuple.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/tuple/TS_Tuple.java @@ -18,11 +18,11 @@ package org.apache.jena.atlas.lib.tuple; -import org.junit.runner.RunWith ; -import org.junit.runners.Suite ; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; -@RunWith(Suite.class) [email protected]( { +@Suite +@SelectClasses({ TestTuple.class , TestTupleMap.class }) diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/tuple/TestTuple.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/tuple/TestTuple.java index 6d1058a44f..21a021ce65 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/tuple/TestTuple.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/tuple/TestTuple.java @@ -18,15 +18,15 @@ package org.apache.jena.atlas.lib.tuple; -import static org.junit.Assert.assertArrayEquals ; -import static org.junit.Assert.assertEquals ; -import static org.junit.Assert.assertNotEquals ; -import static org.junit.Assert.fail ; +import static org.junit.jupiter.api.Assertions.assertArrayEquals ; +import static org.junit.jupiter.api.Assertions.assertEquals ; +import static org.junit.jupiter.api.Assertions.assertNotEquals ; +import static org.junit.jupiter.api.Assertions.fail ; import java.util.ArrayList ; import java.util.List ; -import org.junit.Test ; +import org.junit.jupiter.api.Test ; public class TestTuple { @Test public void tuple_0() { diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/tuple/TestTupleMap.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/tuple/TestTupleMap.java index 3b5d30f90b..7c031db697 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/tuple/TestTupleMap.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/tuple/TestTupleMap.java @@ -18,12 +18,12 @@ package org.apache.jena.atlas.lib.tuple; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.Arrays ; import java.util.List ; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestTupleMap { // Check coverage diff --git a/jena-base/src/test/java/org/apache/jena/atlas/net/TS_Net.java b/jena-base/src/test/java/org/apache/jena/atlas/net/TS_Net.java index 1f2a65d94a..fc566735cf 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/net/TS_Net.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/net/TS_Net.java @@ -18,13 +18,10 @@ package org.apache.jena.atlas.net; - -import org.junit.runner.RunWith ; -import org.junit.runners.Suite ; - - -@RunWith(Suite.class) [email protected]( { +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; +@Suite +@SelectClasses({ TestHost.class }) public class TS_Net {} diff --git a/jena-base/src/test/java/org/apache/jena/atlas/net/TestHost.java b/jena-base/src/test/java/org/apache/jena/atlas/net/TestHost.java index 95f1714fdb..9b03cdfd51 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/net/TestHost.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/net/TestHost.java @@ -18,13 +18,13 @@ package org.apache.jena.atlas.net; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.net.InetAddress; import java.net.UnknownHostException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.apache.jena.atlas.RuntimeIOException;
