This is an automated email from the ASF dual-hosted git repository. afs pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/jena.git
commit 5c667ba3f9ff84452821f3959ac52da84d318c4c Author: Andy Seaborne <[email protected]> AuthorDate: Sat Jun 13 15:46:15 2026 +0100 GH-3236: Convert jena-text to JUnit6 --- jena-text/pom.xml | 10 +- .../text/AbstractTestDatasetWithAnalyzer.java | 10 +- .../AbstractTestDatasetWithGraphTextIndex.java | 2 +- ...bstractTestDatasetWithLuceneGraphTextIndex.java | 10 +- ...tDatasetWithLuceneTextIndexDeletionSupport.java | 10 +- .../text/AbstractTestDatasetWithTextIndex.java | 4 +- .../text/AbstractTestDatasetWithTextIndexBase.java | 15 ++- .../java/org/apache/jena/query/text/TS_Text.java | 16 +-- .../jena/query/text/TestBuildTextDataset.java | 8 +- ...DatasetConcurrencyWithConfigurableAnalyzer.java | 15 ++- .../text/TestDatasetWithAnalyzingQueryParser.java | 15 +-- .../TestDatasetWithComplexPhraseQueryParser.java | 7 +- .../text/TestDatasetWithConfigurableAnalyzer.java | 7 +- .../query/text/TestDatasetWithKeywordAnalyzer.java | 7 +- .../text/TestDatasetWithLocalizedAnalyzer.java | 11 +- .../TestDatasetWithLowerCaseKeywordAnalyzer.java | 7 +- .../text/TestDatasetWithLuceneGraphTextIndex.java | 5 +- ...TestDatasetWithLuceneMultilingualTextIndex.java | 12 +- .../text/TestDatasetWithLuceneStoredLiterals.java | 18 ++- .../query/text/TestDatasetWithLuceneTextIndex.java | 12 +- ...tDatasetWithLuceneTextIndexDeletionSupport.java | 7 +- ...estDatasetWithLuceneTextIndexWithLangField.java | 12 +- .../query/text/TestDatasetWithSimpleAnalyzer.java | 11 +- .../text/TestDatasetWithStandardAnalyzer.java | 12 +- .../text/TestDatasetWithSurroundQueryParser.java | 7 +- .../query/text/TestLuceneWithMultipleThreads.java | 6 +- .../jena/query/text/TestTextDefineAnalyzers.java | 14 +- .../jena/query/text/TestTextGraphIndexExtra.java | 8 +- .../jena/query/text/TestTextGraphIndexExtra2.java | 18 ++- .../jena/query/text/TestTextHighlighting.java | 18 ++- .../text/TestTextMultilingualEnhancements.java | 18 ++- .../text/TestTextMultilingualEnhancements02.java | 18 ++- .../text/TestTextMultipleProplistNotWorking.java | 18 ++- .../org/apache/jena/query/text/TestTextNonTxn.java | 35 +++-- .../apache/jena/query/text/TestTextNonTxnTDB1.java | 4 +- .../apache/jena/query/text/TestTextPropLists.java | 12 +- .../jena/query/text/TestTextPropLists02.java | 12 +- .../org/apache/jena/query/text/TestTextTxn.java | 34 +++-- .../org/apache/jena/query/text/TestTextTxnTDB.java | 26 ++-- .../text/assembler/AbstractTestTextAssembler.java | 10 +- .../text/assembler/TestEntityMapAssembler.java | 143 ++++++++++----------- .../assembler/TestGenericAnalyzerAssembler.java | 4 +- .../text/assembler/TestPropListsAssembler.java | 6 +- .../text/assembler/TestTextDatasetAssembler.java | 22 ++-- .../assembler/TestTextIndexLuceneAssembler.java | 4 +- .../query/text/changes/TestDatasetMonitor.java | 17 +-- .../text/filter/TestSelectiveFoldingFilter.java | 17 +-- 47 files changed, 335 insertions(+), 379 deletions(-) diff --git a/jena-text/pom.xml b/jena-text/pom.xml index 07f7895f37..ed43b60369 100644 --- a/jena-text/pom.xml +++ b/jena-text/pom.xml @@ -101,8 +101,14 @@ </dependency> <dependency> - <groupId>org.junit.vintage</groupId> - <artifactId>junit-vintage-engine</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.junit.platform</groupId> + <artifactId>junit-platform-suite</artifactId> <scope>test</scope> </dependency> diff --git a/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithAnalyzer.java b/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithAnalyzer.java index 00295822de..314ec7b144 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithAnalyzer.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithAnalyzer.java @@ -31,8 +31,8 @@ import org.apache.jena.query.text.assembler.TextAssembler ; import org.apache.jena.rdf.model.Model ; import org.apache.jena.rdf.model.ModelFactory ; import org.apache.jena.rdf.model.Resource ; -import org.junit.After ; -import org.junit.Before ; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; /** * This abstract class defines a setup configuration for a dataset that uses a specific analyzer with a Lucene index. @@ -103,11 +103,9 @@ public abstract class AbstractTestDatasetWithAnalyzer extends AbstractTestDatase init(analyzer, "text:QueryParser"); } - @Before - abstract public void before(); + @BeforeEach abstract public void before(); - @After - public void after() { + @AfterEach public void after() { dataset.close(); } diff --git a/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithGraphTextIndex.java b/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithGraphTextIndex.java index a0e64d2234..111ee3bb56 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithGraphTextIndex.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithGraphTextIndex.java @@ -32,7 +32,7 @@ import org.apache.jena.query.ReadWrite ; import org.apache.jena.rdf.model.Model ; import org.apache.jena.riot.Lang ; import org.apache.jena.riot.RDFDataMgr ; -import org.junit.Test ; +import org.junit.jupiter.api.Test; /** * This abstract class defines tests of the graph-specific indexing. diff --git a/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithLuceneGraphTextIndex.java b/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithLuceneGraphTextIndex.java index dafded691a..3387bdb7fd 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithLuceneGraphTextIndex.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithLuceneGraphTextIndex.java @@ -26,8 +26,8 @@ import org.apache.jena.tdb1.TDB1Factory; import org.apache.jena.vocabulary.RDFS ; import org.apache.lucene.store.Directory ; import org.apache.lucene.store.ByteBuffersDirectory ; -import org.junit.After ; -import org.junit.Before ; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; /** @@ -36,8 +36,7 @@ import org.junit.Before ; @SuppressWarnings("removal") public class AbstractTestDatasetWithLuceneGraphTextIndex extends AbstractTestDatasetWithGraphTextIndex { - @Before - public void init() { + @BeforeEach public void init() { Dataset ds1 = TDB1Factory.createDataset() ; Directory dir = new ByteBuffersDirectory() ; EntityDefinition eDef = new EntityDefinition("iri", "text"); @@ -48,8 +47,7 @@ public class AbstractTestDatasetWithLuceneGraphTextIndex extends AbstractTestDat dataset = TextDatasetFactory.create(ds1, tidx) ; } - @After - public void teardown() { + @AfterEach public void teardown() { dataset.close(); } diff --git a/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithLuceneTextIndexDeletionSupport.java b/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithLuceneTextIndexDeletionSupport.java index c605663f46..d88def8dae 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithLuceneTextIndexDeletionSupport.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithLuceneTextIndexDeletionSupport.java @@ -26,8 +26,8 @@ import org.apache.jena.tdb1.TDB1Factory; import org.apache.jena.vocabulary.RDFS; import org.apache.lucene.store.Directory; import org.apache.lucene.store.ByteBuffersDirectory; -import org.junit.After; -import org.junit.Before; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; /** @@ -36,8 +36,7 @@ import org.junit.Before; @SuppressWarnings("removal") public class AbstractTestDatasetWithLuceneTextIndexDeletionSupport extends AbstractTestDatasetWithTextIndex { - @Before - public void init() { + @BeforeEach public void init() { Dataset ds1 = TDB1Factory.createDataset() ; Directory dir = new ByteBuffersDirectory() ; EntityDefinition eDef = new EntityDefinition("iri", "text"); @@ -49,8 +48,7 @@ public class AbstractTestDatasetWithLuceneTextIndexDeletionSupport extends Abstr dataset = TextDatasetFactory.create(ds1, tidx) ; } - @After - public void teardown() { + @AfterEach public void teardown() { dataset.close(); } diff --git a/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithTextIndex.java b/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithTextIndex.java index 0241ac5aef..351ca5b876 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithTextIndex.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithTextIndex.java @@ -21,7 +21,7 @@ package org.apache.jena.query.text; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays ; import java.util.HashSet ; @@ -29,7 +29,7 @@ import java.util.Map ; import java.util.Set ; import org.apache.jena.atlas.lib.StrUtils ; -import org.junit.Test ; +import org.junit.jupiter.api.Test; /* * This abstract class defines a collection of test methods for testing diff --git a/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithTextIndexBase.java b/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithTextIndexBase.java index 400b18c3b2..9ef46e197d 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithTextIndexBase.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithTextIndexBase.java @@ -21,9 +21,9 @@ package org.apache.jena.query.text; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; import java.io.Reader; import java.io.StringReader; @@ -104,13 +104,14 @@ public abstract class AbstractTestDatasetWithTextIndexBase { ResultSetRewindable results = rs.rewindable(); // ResultSetFormatter.out(results); // results.reset(); - assertEquals(label, expectedNumResults > 0, results.hasNext()); + assertEquals(expectedNumResults > 0, results.hasNext(), label); int count; for (count=0; results.hasNext(); count++) { String entityURI = results.next().getResource("s").getURI(); - assertTrue(label + ": unexpected result: " + entityURI, expectedEntityURIs.contains(entityURI)); + assertTrue(expectedEntityURIs.contains(entityURI), + label + ": unexpected result: " + entityURI); } - assertEquals(label, expectedNumResults, count); + assertEquals(expectedNumResults, count, label); } finally { dataset.end() ; @@ -147,7 +148,7 @@ public abstract class AbstractTestDatasetWithTextIndexBase { dataset.begin(ReadWrite.READ); try(QueryExecution qexec = QueryExecutionFactory.create(query, dataset)) { ResultSet results = qexec.execSelect() ; - assertFalse(label, results.hasNext()); + assertFalse(results.hasNext(), label); } finally { dataset.end() ; diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TS_Text.java b/jena-text/src/test/java/org/apache/jena/query/text/TS_Text.java index 519eeb305c..f8a445ed91 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TS_Text.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TS_Text.java @@ -21,18 +21,14 @@ package org.apache.jena.query.text; -import org.apache.jena.query.text.assembler.TestEntityMapAssembler; -import org.apache.jena.query.text.assembler.TestTextDatasetAssembler; -import org.apache.jena.query.text.assembler.TestTextIndexLuceneAssembler; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; + +import org.apache.jena.query.text.assembler.*; import org.apache.jena.query.text.changes.TestDatasetMonitor; -import org.apache.jena.query.text.assembler.TestGenericAnalyzerAssembler; -import org.apache.jena.query.text.assembler.TestPropListsAssembler; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ TestBuildTextDataset.class , TestDatasetMonitor.class diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestBuildTextDataset.java b/jena-text/src/test/java/org/apache/jena/query/text/TestBuildTextDataset.java index 9a1fb95d88..0ed4f4746d 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestBuildTextDataset.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestBuildTextDataset.java @@ -21,8 +21,8 @@ package org.apache.jena.query.text ; -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.apache.jena.atlas.lib.StrUtils ; import org.apache.jena.query.* ; @@ -32,7 +32,7 @@ import org.apache.jena.tdb1.TDB1; import org.apache.jena.vocabulary.RDFS ; import org.apache.lucene.store.ByteBuffersDirectory ; import org.apache.lucene.store.Directory ; -import org.junit.Test ; +import org.junit.jupiter.api.Test; /** Test the examples of building a test dataset */ public class TestBuildTextDataset @@ -101,7 +101,7 @@ public class TestBuildTextDataset finally { dataset.end() ; } - assertEquals("Unexpected result count", 2, x) ; + assertEquals(2, x, "Unexpected result count") ; } public static Dataset createCode() { diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetConcurrencyWithConfigurableAnalyzer.java b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetConcurrencyWithConfigurableAnalyzer.java index ff608fac63..e8c99df856 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetConcurrencyWithConfigurableAnalyzer.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetConcurrencyWithConfigurableAnalyzer.java @@ -21,6 +21,8 @@ package org.apache.jena.query.text; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -29,18 +31,17 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + import org.apache.jena.atlas.lib.StrUtils; import org.apache.jena.query.ReadWrite; import org.apache.jena.rdf.model.Model; import org.apache.jena.vocabulary.RDFS; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; public class TestDatasetConcurrencyWithConfigurableAnalyzer extends AbstractTestDatasetWithAnalyzer { @Override - @Before - public void before () { + @BeforeEach public void before () { init(StrUtils.strjoinNL( "text:ConfigurableAnalyzer ;", "text:tokenizer text:WhitespaceTokenizer ;", @@ -82,13 +83,13 @@ public class TestDatasetConcurrencyWithConfigurableAnalyzer extends AbstractTest results.add(executorService.submit(() -> testOneQuery(probe)));; } for (int j = 0; j < parallelism; j++) { - Assert.assertTrue("Probe " + i + " failed", results.get(j).get()); + assertTrue(results.get(j).get(), "Probe " + i + " failed"); } } } catch (InterruptedException e) { // exit silently on interrupt } catch (ExecutionException e) { - Assert.assertTrue("Concurrency exception: " + e.getMessage(), false); + assertTrue(false, "Concurrency exception: " + e.getMessage()); } } } diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithAnalyzingQueryParser.java b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithAnalyzingQueryParser.java index 69b2e055fd..7daf42a261 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithAnalyzingQueryParser.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithAnalyzingQueryParser.java @@ -25,10 +25,10 @@ import java.util.Set ; import org.apache.jena.atlas.lib.StrUtils ; import org.apache.jena.atlas.logging.LogCtl; -import org.junit.AfterClass; -import org.junit.Before ; -import org.junit.BeforeClass; -import org.junit.Test ; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; /** * This class defines a setup configuration for a dataset that uses an ASCII folding lowercase keyword analyzer with a Lucene index. @@ -38,17 +38,16 @@ public class TestDatasetWithAnalyzingQueryParser extends TestDatasetWithConfigur private static String loggerLevel; /** Suppress a warning message - see {@link TextIndexLucene#parseQuery} */ - @BeforeClass public static void beforeClass() { + @BeforeAll public static void beforeClass() { loggerLevel = LogCtl.getLevel(TextIndexLucene.class); LogCtl.setLevel(TextIndexLucene.class, "ERROR"); } - @AfterClass public static void afterClass() { + @AfterAll public static void afterClass() { LogCtl.setLevel(TextIndexLucene.class, loggerLevel); } @Override - @Before - public void before() { + @BeforeEach public void before() { init(StrUtils.strjoinNL( "text:ConfigurableAnalyzer ;", "text:tokenizer text:KeywordTokenizer ;", diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithComplexPhraseQueryParser.java b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithComplexPhraseQueryParser.java index 66bd1e9903..37d0834bce 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithComplexPhraseQueryParser.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithComplexPhraseQueryParser.java @@ -24,16 +24,15 @@ package org.apache.jena.query.text; import java.util.Set ; import org.apache.jena.atlas.lib.StrUtils ; -import org.junit.Before ; -import org.junit.Test ; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * This class defines a setup configuration for a dataset that uses a standard analyzer with a Lucene index. */ public class TestDatasetWithComplexPhraseQueryParser extends AbstractTestDatasetWithAnalyzer { @Override - @Before - public void before() { + @BeforeEach public void before() { init("text:StandardAnalyzer", "text:ComplexPhraseQueryParser"); } diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithConfigurableAnalyzer.java b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithConfigurableAnalyzer.java index c4d0dc8b60..a5d750fff3 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithConfigurableAnalyzer.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithConfigurableAnalyzer.java @@ -24,16 +24,15 @@ package org.apache.jena.query.text; import java.util.Set ; import org.apache.jena.atlas.lib.StrUtils ; -import org.junit.Before ; -import org.junit.Test ; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * This class defines a setup configuration for a dataset that uses an ASCII folding lowercase keyword analyzer with a Lucene index. */ public class TestDatasetWithConfigurableAnalyzer extends TestDatasetWithLowerCaseKeywordAnalyzer { @Override - @Before - public void before() { + @BeforeEach public void before() { init(StrUtils.strjoinNL( "text:ConfigurableAnalyzer ;", "text:tokenizer text:KeywordTokenizer ;", diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithKeywordAnalyzer.java b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithKeywordAnalyzer.java index b39abde2fa..a6e786f80d 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithKeywordAnalyzer.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithKeywordAnalyzer.java @@ -26,16 +26,15 @@ import java.util.HashSet ; import java.util.Set ; import org.apache.jena.atlas.lib.StrUtils ; -import org.junit.Before ; -import org.junit.Test ; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * This class defines a setup configuration for a dataset that uses a keyword analyzer with a Lucene index. */ public class TestDatasetWithKeywordAnalyzer extends AbstractTestDatasetWithAnalyzer { @Override - @Before - public void before() { + @BeforeEach public void before() { init("text:KeywordAnalyzer"); } diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLocalizedAnalyzer.java b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLocalizedAnalyzer.java index 0d243c9f58..740a514b2f 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLocalizedAnalyzer.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLocalizedAnalyzer.java @@ -28,9 +28,9 @@ import org.apache.jena.query.text.assembler.TextAssembler; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.Resource; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.File; import java.io.Reader; @@ -117,13 +117,12 @@ public class TestDatasetWithLocalizedAnalyzer extends AbstractTestDatasetWithTex if (indexDir.exists()) TextSearchUtil.emptyAndDeleteDirectory(indexDir); } - @Before + @BeforeEach public void beforeClass() { init(); } - @After - public void afterClass() { + @AfterEach public void afterClass() { deleteOldFiles(); } diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLowerCaseKeywordAnalyzer.java b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLowerCaseKeywordAnalyzer.java index 4da6a0a11d..4a3497c724 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLowerCaseKeywordAnalyzer.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLowerCaseKeywordAnalyzer.java @@ -26,16 +26,15 @@ import java.util.HashSet ; import java.util.Set ; import org.apache.jena.atlas.lib.StrUtils ; -import org.junit.Before ; -import org.junit.Test ; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * This class defines a setup configuration for a dataset that uses a lowercase keyword analyzer with a Lucene index. */ public class TestDatasetWithLowerCaseKeywordAnalyzer extends TestDatasetWithKeywordAnalyzer { @Override - @Before - public void before() { + @BeforeEach public void before() { init("text:LowerCaseKeywordAnalyzer"); } diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneGraphTextIndex.java b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneGraphTextIndex.java index f934546f7f..6cc9c972e0 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneGraphTextIndex.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneGraphTextIndex.java @@ -21,12 +21,11 @@ package org.apache.jena.query.text; -import org.junit.Before ; +import org.junit.jupiter.api.BeforeEach; public class TestDatasetWithLuceneGraphTextIndex extends AbstractTestDatasetWithLuceneGraphTextIndex { - @Before - public void before() { + @BeforeEach public void before() { init(); } diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneMultilingualTextIndex.java b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneMultilingualTextIndex.java index 54672c0d24..c36b6dbf71 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneMultilingualTextIndex.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneMultilingualTextIndex.java @@ -36,9 +36,9 @@ import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.Resource; import org.apache.jena.riot.Lang; import org.apache.jena.riot.RDFDataMgr; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class TestDatasetWithLuceneMultilingualTextIndex extends AbstractTestDatasetWithTextIndexBase { @@ -96,8 +96,7 @@ public class TestDatasetWithLuceneMultilingualTextIndex extends AbstractTestData ); } - @Before - public void before() { + @BeforeEach public void before() { Reader reader = new StringReader(SPEC); Model specModel = ModelFactory.createDefaultModel(); specModel.read(reader, "", "TURTLE"); @@ -106,8 +105,7 @@ public class TestDatasetWithLuceneMultilingualTextIndex extends AbstractTestData dataset = (Dataset) Assembler.general().open(root); } - @After - public void after() { + @AfterEach public void after() { dataset.close(); } diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneStoredLiterals.java b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneStoredLiterals.java index 3c3f070d29..080c9ee856 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneStoredLiterals.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneStoredLiterals.java @@ -21,9 +21,9 @@ package org.apache.jena.query.text; -import static org.junit.Assert.assertEquals; -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.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.Reader ; import java.io.StringReader ; @@ -53,9 +53,9 @@ import org.apache.jena.rdf.model.Literal ; import org.apache.jena.rdf.model.Model ; import org.apache.jena.rdf.model.ModelFactory ; import org.apache.jena.rdf.model.Resource ; -import org.junit.After ; -import org.junit.Before ; -import org.junit.Test ; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class TestDatasetWithLuceneStoredLiterals extends AbstractTestDatasetWithTextIndex { @@ -108,8 +108,7 @@ public class TestDatasetWithLuceneStoredLiterals extends AbstractTestDatasetWith ); } - @Before - public void before() { + @BeforeEach public void before() { Reader reader = new StringReader(SPEC); Model specModel = ModelFactory.createDefaultModel(); specModel.read(reader, "", "TURTLE"); @@ -118,8 +117,7 @@ public class TestDatasetWithLuceneStoredLiterals extends AbstractTestDatasetWith dataset = (Dataset) Assembler.general().open(root); } - @After - public void after() { + @AfterEach public void after() { dataset.close(); } diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneTextIndex.java b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneTextIndex.java index aee111b999..e7601a38aa 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneTextIndex.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneTextIndex.java @@ -32,9 +32,9 @@ import org.apache.jena.query.text.assembler.TextAssembler ; import org.apache.jena.rdf.model.Model ; import org.apache.jena.rdf.model.ModelFactory ; import org.apache.jena.rdf.model.Resource ; -import org.junit.After ; -import org.junit.Before ; -import org.junit.Test ; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class TestDatasetWithLuceneTextIndex extends AbstractTestDatasetWithTextIndex { @@ -85,8 +85,7 @@ public class TestDatasetWithLuceneTextIndex extends AbstractTestDatasetWithTextI ); } - @Before - public void before() { + @BeforeEach public void before() { Reader reader = new StringReader(SPEC); Model specModel = ModelFactory.createDefaultModel(); specModel.read(reader, "", "TURTLE"); @@ -95,8 +94,7 @@ public class TestDatasetWithLuceneTextIndex extends AbstractTestDatasetWithTextI dataset = (Dataset) Assembler.general().open(root); } - @After - public void after() { + @AfterEach public void after() { dataset.close(); } diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneTextIndexDeletionSupport.java b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneTextIndexDeletionSupport.java index dcc07c0bbd..3e3c30376f 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneTextIndexDeletionSupport.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneTextIndexDeletionSupport.java @@ -22,8 +22,8 @@ package org.apache.jena.query.text; import org.apache.jena.atlas.lib.StrUtils; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.HashSet; @@ -31,8 +31,7 @@ import java.util.Set; public class TestDatasetWithLuceneTextIndexDeletionSupport extends AbstractTestDatasetWithLuceneTextIndexDeletionSupport { - @Before - public void before() { + @BeforeEach public void before() { init(); } diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneTextIndexWithLangField.java b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneTextIndexWithLangField.java index 0a48cb3f33..4bacb48562 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneTextIndexWithLangField.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneTextIndexWithLangField.java @@ -28,9 +28,9 @@ import org.apache.jena.query.text.assembler.TextAssembler; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.Resource; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.Reader; import java.io.StringReader; @@ -88,8 +88,7 @@ public class TestDatasetWithLuceneTextIndexWithLangField extends AbstractTestDat ); } - @Before - public void before() { + @BeforeEach public void before() { Reader reader = new StringReader(SPEC); Model specModel = ModelFactory.createDefaultModel(); specModel.read(reader, "", "TURTLE"); @@ -98,8 +97,7 @@ public class TestDatasetWithLuceneTextIndexWithLangField extends AbstractTestDat dataset = (Dataset) Assembler.general().open(root); } - @After - public void after() { + @AfterEach public void after() { dataset.close(); } diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithSimpleAnalyzer.java b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithSimpleAnalyzer.java index 0cb55c9abc..0b00c2f35d 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithSimpleAnalyzer.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithSimpleAnalyzer.java @@ -35,9 +35,9 @@ import org.apache.jena.query.text.assembler.TextAssembler ; import org.apache.jena.rdf.model.Model ; import org.apache.jena.rdf.model.ModelFactory ; import org.apache.jena.rdf.model.Resource ; -import org.junit.After ; -import org.junit.Before ; -import org.junit.Test ; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * This class defines a setup configuration for a dataset that uses a simple analyzer with a Lucene index. @@ -113,13 +113,12 @@ public class TestDatasetWithSimpleAnalyzer extends AbstractTestDatasetWithTextIn if (indexDir.exists()) TextSearchUtil.emptyAndDeleteDirectory(indexDir); } - @Before + @BeforeEach public void beforeClass() { init(); } - @After - public void afterClass() { + @AfterEach public void afterClass() { deleteOldFiles(); } diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithStandardAnalyzer.java b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithStandardAnalyzer.java index ddfdd35a78..f73d831218 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithStandardAnalyzer.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithStandardAnalyzer.java @@ -35,9 +35,9 @@ import org.apache.jena.query.text.assembler.TextAssembler ; import org.apache.jena.rdf.model.Model ; import org.apache.jena.rdf.model.ModelFactory ; import org.apache.jena.rdf.model.Resource ; -import org.junit.After ; -import org.junit.Before ; -import org.junit.Test ; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * This class defines a setup configuration for a dataset that uses a standard analyzer with a Lucene index. @@ -113,13 +113,11 @@ public class TestDatasetWithStandardAnalyzer extends AbstractTestDatasetWithText if (indexDir.exists()) TextSearchUtil.emptyAndDeleteDirectory(indexDir); } - @Before - public void beforeClass() { + @BeforeEach public void beforeClass() { init(); } - @After - public void afterClass() { + @AfterEach public void afterClass() { deleteOldFiles(); } diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithSurroundQueryParser.java b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithSurroundQueryParser.java index 38b50bef3a..175ca30a44 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithSurroundQueryParser.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithSurroundQueryParser.java @@ -24,16 +24,15 @@ package org.apache.jena.query.text; import java.util.Set ; import org.apache.jena.atlas.lib.StrUtils ; -import org.junit.Before ; -import org.junit.Test ; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * This class defines a setup configuration for a dataset that uses a standard analyzer with a Lucene index. */ public class TestDatasetWithSurroundQueryParser extends AbstractTestDatasetWithAnalyzer { @Override - @Before - public void before() { + @BeforeEach public void before() { init("text:StandardAnalyzer", "text:SurroundQueryParser"); } diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestLuceneWithMultipleThreads.java b/jena-text/src/test/java/org/apache/jena/query/text/TestLuceneWithMultipleThreads.java index 6a5f57455a..e3a2b69b2d 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestLuceneWithMultipleThreads.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestLuceneWithMultipleThreads.java @@ -21,8 +21,8 @@ package org.apache.jena.query.text; -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 java.util.ArrayList ; import java.util.List ; @@ -41,7 +41,7 @@ import org.apache.jena.tdb2.DatabaseMgr; import org.apache.jena.vocabulary.RDFS ; import org.apache.lucene.analysis.standard.StandardAnalyzer ; import org.apache.lucene.store.ByteBuffersDirectory ; -import org.junit.Test ; +import org.junit.jupiter.api.Test; /** * Spin up multiple threads against a multiple-reader/single-writer Dataset to test that the Lucene index handles concurrency properly. diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestTextDefineAnalyzers.java b/jena-text/src/test/java/org/apache/jena/query/text/TestTextDefineAnalyzers.java index e18da7022c..0fe562e2e0 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestTextDefineAnalyzers.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestTextDefineAnalyzers.java @@ -21,7 +21,7 @@ package org.apache.jena.query.text; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.Reader ; import java.io.StringReader ; @@ -34,9 +34,9 @@ import org.apache.jena.query.text.assembler.TextAssembler ; import org.apache.jena.rdf.model.Model ; import org.apache.jena.rdf.model.ModelFactory ; import org.apache.jena.rdf.model.Resource ; -import org.junit.After ; -import org.junit.Before ; -import org.junit.Test ; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class TestTextDefineAnalyzers extends AbstractTestDatasetWithTextIndexBase { @@ -140,8 +140,7 @@ public class TestTextDefineAnalyzers extends AbstractTestDatasetWithTextIndexBas ); } - @Before - public void before() { + @BeforeEach public void before() { Reader reader = new StringReader(SPEC); Model specModel = ModelFactory.createDefaultModel(); specModel.read(reader, "", "TURTLE"); @@ -150,8 +149,7 @@ public class TestTextDefineAnalyzers extends AbstractTestDatasetWithTextIndexBas dataset = (Dataset) Assembler.general().open(root); } - @After - public void after() { + @AfterEach public void after() { dataset.close(); } diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestTextGraphIndexExtra.java b/jena-text/src/test/java/org/apache/jena/query/text/TestTextGraphIndexExtra.java index 2bb043475e..4afa2e1bb3 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestTextGraphIndexExtra.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestTextGraphIndexExtra.java @@ -21,6 +21,10 @@ package org.apache.jena.query.text; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; + import org.apache.jena.atlas.lib.StrUtils ; import org.apache.jena.graph.Node ; import org.apache.jena.query.* ; @@ -30,8 +34,6 @@ import org.apache.jena.system.Txn ; import org.apache.jena.tdb1.TDB1Factory; import org.apache.jena.vocabulary.RDFS ; import org.apache.lucene.store.ByteBuffersDirectory ; -import org.junit.Assert ; -import org.junit.Test ; @SuppressWarnings("removal") public class TestTextGraphIndexExtra { @@ -116,7 +118,7 @@ public class TestTextGraphIndexExtra { ds = textDataset(ds); populate(ds); int x = sparqlQuery(ds, queryStr); - Assert.assertEquals(expected, x); + assertEquals(expected, x); } } diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestTextGraphIndexExtra2.java b/jena-text/src/test/java/org/apache/jena/query/text/TestTextGraphIndexExtra2.java index ee0b20981f..30fad2938f 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestTextGraphIndexExtra2.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestTextGraphIndexExtra2.java @@ -21,9 +21,9 @@ package org.apache.jena.query.text; -import static org.junit.Assert.assertEquals; -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.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.Reader ; import java.io.StringReader ; @@ -47,9 +47,9 @@ import org.apache.jena.query.text.assembler.TextAssembler ; import org.apache.jena.rdf.model.Model ; import org.apache.jena.rdf.model.ModelFactory ; import org.apache.jena.rdf.model.Resource ; -import org.junit.After ; -import org.junit.Before ; -import org.junit.Test ; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class TestTextGraphIndexExtra2 extends AbstractTestDatasetWithTextIndexBase { @@ -101,8 +101,7 @@ public class TestTextGraphIndexExtra2 extends AbstractTestDatasetWithTextIndexBa ); } - @Before - public void before() { + @BeforeEach public void before() { Reader reader = new StringReader(SPEC); Model specModel = ModelFactory.createDefaultModel(); specModel.read(reader, "", "TURTLE"); @@ -111,8 +110,7 @@ public class TestTextGraphIndexExtra2 extends AbstractTestDatasetWithTextIndexBa dataset = (Dataset) Assembler.general().open(root); } - @After - public void after() { + @AfterEach public void after() { dataset.close(); } diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestTextHighlighting.java b/jena-text/src/test/java/org/apache/jena/query/text/TestTextHighlighting.java index c0592415d0..46d184ae1c 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestTextHighlighting.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestTextHighlighting.java @@ -21,9 +21,9 @@ package org.apache.jena.query.text; -import static org.junit.Assert.assertEquals; -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.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.Reader ; import java.io.StringReader ; @@ -49,9 +49,9 @@ import org.apache.jena.rdf.model.Literal; import org.apache.jena.rdf.model.Model ; import org.apache.jena.rdf.model.ModelFactory ; import org.apache.jena.rdf.model.Resource ; -import org.junit.After ; -import org.junit.Before ; -import org.junit.Test ; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class TestTextHighlighting extends AbstractTestDatasetWithTextIndexBase { @@ -106,8 +106,7 @@ public class TestTextHighlighting extends AbstractTestDatasetWithTextIndexBase { ); } - @Before - public void before() { + @BeforeEach public void before() { Reader reader = new StringReader(SPEC); Model specModel = ModelFactory.createDefaultModel(); specModel.read(reader, "", "TURTLE"); @@ -116,8 +115,7 @@ public class TestTextHighlighting extends AbstractTestDatasetWithTextIndexBase { dataset = (Dataset) Assembler.general().open(root); } - @After - public void after() { + @AfterEach public void after() { dataset.close(); } diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestTextMultilingualEnhancements.java b/jena-text/src/test/java/org/apache/jena/query/text/TestTextMultilingualEnhancements.java index 2683b23fda..cc901a4d8b 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestTextMultilingualEnhancements.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestTextMultilingualEnhancements.java @@ -21,9 +21,9 @@ package org.apache.jena.query.text; -import static org.junit.Assert.assertEquals; -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.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.Reader ; import java.io.StringReader ; @@ -48,9 +48,9 @@ import org.apache.jena.rdf.model.Literal; import org.apache.jena.rdf.model.Model ; import org.apache.jena.rdf.model.ModelFactory ; import org.apache.jena.rdf.model.Resource ; -import org.junit.After ; -import org.junit.Before ; -import org.junit.Test ; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class TestTextMultilingualEnhancements extends AbstractTestDatasetWithTextIndexBase { @@ -134,8 +134,7 @@ public class TestTextMultilingualEnhancements extends AbstractTestDatasetWithTex ); } - @Before - public void before() { + @BeforeEach public void before() { Reader reader = new StringReader(SPEC); Model specModel = ModelFactory.createDefaultModel(); specModel.read(reader, "", "TURTLE"); @@ -144,8 +143,7 @@ public class TestTextMultilingualEnhancements extends AbstractTestDatasetWithTex dataset = (Dataset) Assembler.general().open(root); } - @After - public void after() { + @AfterEach public void after() { dataset.close(); } diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestTextMultilingualEnhancements02.java b/jena-text/src/test/java/org/apache/jena/query/text/TestTextMultilingualEnhancements02.java index a07cf5b257..fa2c581158 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestTextMultilingualEnhancements02.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestTextMultilingualEnhancements02.java @@ -21,9 +21,9 @@ package org.apache.jena.query.text; -import static org.junit.Assert.assertEquals; -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.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.Reader ; import java.io.StringReader ; @@ -48,9 +48,9 @@ import org.apache.jena.rdf.model.Literal; import org.apache.jena.rdf.model.Model ; import org.apache.jena.rdf.model.ModelFactory ; import org.apache.jena.rdf.model.Resource ; -import org.junit.After ; -import org.junit.Before ; -import org.junit.Test ; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class TestTextMultilingualEnhancements02 extends AbstractTestDatasetWithTextIndexBase { @@ -176,8 +176,7 @@ public class TestTextMultilingualEnhancements02 extends AbstractTestDatasetWithT ); } - @Before - public void before() { + @BeforeEach public void before() { Reader reader = new StringReader(SPEC); Model specModel = ModelFactory.createDefaultModel(); specModel.read(reader, "", "TURTLE"); @@ -186,8 +185,7 @@ public class TestTextMultilingualEnhancements02 extends AbstractTestDatasetWithT dataset = (Dataset) Assembler.general().open(root); } - @After - public void after() { + @AfterEach public void after() { dataset.close(); } diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestTextMultipleProplistNotWorking.java b/jena-text/src/test/java/org/apache/jena/query/text/TestTextMultipleProplistNotWorking.java index fc25030b4d..3267de60de 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestTextMultipleProplistNotWorking.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestTextMultipleProplistNotWorking.java @@ -21,9 +21,9 @@ package org.apache.jena.query.text; -import static org.junit.Assert.assertEquals; -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.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.Reader; import java.io.StringReader; @@ -36,9 +36,9 @@ import org.apache.jena.rdf.model.Literal; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.Resource; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; // GH-2094 public class TestTextMultipleProplistNotWorking extends AbstractTestDatasetWithTextIndexBase { @@ -146,8 +146,7 @@ public class TestTextMultipleProplistNotWorking extends AbstractTestDatasetWithT """; } - @Before - public void before() { + @BeforeEach public void before() { Reader reader = new StringReader(SPEC); Model specModel = ModelFactory.createDefaultModel(); specModel.read(reader, "", "TURTLE"); @@ -156,8 +155,7 @@ public class TestTextMultipleProplistNotWorking extends AbstractTestDatasetWithT dataset = (Dataset) Assembler.general().open(root); } - @After - public void after() { + @AfterEach public void after() { dataset.close(); } diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestTextNonTxn.java b/jena-text/src/test/java/org/apache/jena/query/text/TestTextNonTxn.java index 9fc4ad6863..5a872b81b0 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestTextNonTxn.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestTextNonTxn.java @@ -21,14 +21,18 @@ package org.apache.jena.query.text; -import static org.junit.Assert.*; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assumptions.assumeTrue; import java.io.Reader; import java.io.StringReader; -import java.util.Arrays; -import java.util.Collection; import java.util.List ; +import java.util.stream.Stream; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.apache.jena.atlas.iterator.Iter ; import org.apache.jena.atlas.lib.Creator; @@ -39,32 +43,25 @@ import org.apache.jena.sparql.core.Quad ; import org.apache.jena.sparql.sse.SSE ; import org.apache.jena.tdb1.TDB1Factory; import org.apache.jena.vocabulary.RDFS ; -import org.apache.lucene.store.Directory ; import org.apache.lucene.store.ByteBuffersDirectory ; -import org.junit.Test ; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; +import org.apache.lucene.store.Directory ; /** Test using various dataset implmentations without transactions * No context-set union graph usage either. */ -@SuppressWarnings("removal") -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("provideArgs") public class TestTextNonTxn { - @Parameters(name = "{index}: {0}") - public static Collection<Object[]> data() { + @SuppressWarnings("removal") + public static Stream<Arguments> provideArgs() { Creator<Dataset> plainFactory = ()->DatasetFactory.create(); Creator<Dataset> timFactory = ()->DatasetFactory.createTxnMem(); Creator<Dataset> tdb1Factory = ()->TDB1Factory.createDataset(); // TDB2 does not work with these, non transactional, tests. - return Arrays.asList( new Object[][]{ - { "Plain", plainFactory , false } , - { "TIM", timFactory , false } , - { "TDB1", tdb1Factory , true } - // TDB2 requires transactions. - }); + return Stream.of(Arguments.of("Plain", plainFactory , true), + Arguments.of( "TIM", timFactory , true ) , + Arguments.of( "TDB1", tdb1Factory , true )); } private Dataset create() { Dataset ds1 = factory.create(); diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestTextNonTxnTDB1.java b/jena-text/src/test/java/org/apache/jena/query/text/TestTextNonTxnTDB1.java index 8eb28d57f5..2047fedfab 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestTextNonTxnTDB1.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestTextNonTxnTDB1.java @@ -21,13 +21,13 @@ package org.apache.jena.query.text; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.Reader; import java.io.StringReader; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.apache.jena.atlas.iterator.Iter; import org.apache.jena.atlas.lib.StrUtils; diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestTextPropLists.java b/jena-text/src/test/java/org/apache/jena/query/text/TestTextPropLists.java index 8e18dd7d92..36d8064f71 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestTextPropLists.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestTextPropLists.java @@ -36,9 +36,9 @@ import org.apache.jena.rdf.model.Model ; import org.apache.jena.rdf.model.ModelFactory ; import org.apache.jena.rdf.model.Resource ; import org.apache.jena.vocabulary.SKOS; -import org.junit.After ; -import org.junit.Before ; -import org.junit.Test ; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * This class defines a setup configuration for a dataset that uses a standard analyzer with a Lucene index. @@ -152,13 +152,11 @@ public class TestTextPropLists extends AbstractTestDatasetWithTextIndexBase { if (indexDir.exists()) TextSearchUtil.emptyAndDeleteDirectory(indexDir); } - @Before - public void beforeClass() { + @BeforeEach public void beforeClass() { init(); } - @After - public void afterClass() { + @AfterEach public void afterClass() { deleteOldFiles(); } diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestTextPropLists02.java b/jena-text/src/test/java/org/apache/jena/query/text/TestTextPropLists02.java index 1717844123..738eb53a80 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestTextPropLists02.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestTextPropLists02.java @@ -35,9 +35,9 @@ import org.apache.jena.query.text.assembler.TextAssembler ; import org.apache.jena.rdf.model.Model ; import org.apache.jena.rdf.model.ModelFactory ; import org.apache.jena.rdf.model.Resource ; -import org.junit.After ; -import org.junit.Before ; -import org.junit.Test ; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.apache.jena.vocabulary.RDFS; import org.apache.jena.vocabulary.SKOS; @@ -158,13 +158,11 @@ public class TestTextPropLists02 extends AbstractTestDatasetWithTextIndexBase { if (indexDir.exists()) TextSearchUtil.emptyAndDeleteDirectory(indexDir); } - @Before - public void beforeClass() { + @BeforeEach public void beforeClass() { init(); } - @After - public void afterClass() { + @AfterEach public void afterClass() { deleteOldFiles(); } diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestTextTxn.java b/jena-text/src/test/java/org/apache/jena/query/text/TestTextTxn.java index 813db9527e..8722b36396 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestTextTxn.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestTextTxn.java @@ -21,14 +21,18 @@ package org.apache.jena.query.text; -import static org.junit.Assert.assertEquals; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assumptions.assumeTrue; import java.io.Reader; import java.io.StringReader; -import java.util.Arrays; -import java.util.Collection; import java.util.List ; +import java.util.stream.Stream; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.apache.jena.atlas.iterator.Iter ; import org.apache.jena.atlas.lib.Creator; @@ -46,10 +50,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory ; -import org.junit.Test ; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; /** Text dataset tests using datasets transactionally, named unionDefaultGraph. * <p> @@ -63,22 +63,20 @@ import org.junit.runners.Parameterized.Parameters; * TDB2 is transactional only. * <p>Union graph support by context is required for these tests. */ -@SuppressWarnings("removal") -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("provideArgs") public class TestTextTxn { - @Parameters(name = "{index}: {0}") - public static Collection<Object[]> data() { + @SuppressWarnings("removal") + public static Stream<Arguments> provideArgs() { Creator<Dataset> plainFactory = ()->DatasetFactory.create(); Creator<Dataset> timFactory = ()->DatasetFactory.createTxnMem(); Creator<Dataset> tdb1Factory = ()->TDB1Factory.createDataset(); Creator<Dataset> tdb2Factory = ()->TDB2Factory.createDataset(); - return Arrays.asList( new Object[][]{ - { "Plain", plainFactory, false } , - { "TIM", timFactory, false } , - { "TDB1", tdb1Factory, true } , - { "TDB2", tdb2Factory, true } - }); + return Stream.of(Arguments.of( "Plain", plainFactory, true), + Arguments.of( "TIM", timFactory, true ) , + Arguments.of( "TDB1", tdb1Factory, true ) , + Arguments.of( "TDB2", tdb2Factory, true )); } private final Creator<Dataset> factory; diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestTextTxnTDB.java b/jena-text/src/test/java/org/apache/jena/query/text/TestTextTxnTDB.java index fcb40551ac..5f52230496 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestTextTxnTDB.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestTextTxnTDB.java @@ -21,13 +21,17 @@ package org.apache.jena.query.text; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.Reader; import java.io.StringReader; -import java.util.Arrays; -import java.util.Collection; import java.util.List ; +import java.util.stream.Stream; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.apache.jena.atlas.iterator.Iter ; import org.apache.jena.atlas.lib.Creator; @@ -47,10 +51,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory ; -import org.junit.Test ; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; /** Text dataset tests using TDB1 and TDB2 transactionally, including context unionDefaultGraph. * <p> @@ -65,17 +65,15 @@ import org.junit.runners.Parameterized.Parameters; * <p>Union graph support by context is required for these tests. */ @SuppressWarnings("removal") -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("provideArgs") public class TestTextTxnTDB { - @Parameters(name = "{index}: {0}") - public static Collection<Object[]> data() { + public static Stream<Arguments> provideArgs() { Creator<Dataset> tdb1Factory = ()->TDB1Factory.createDataset(); Creator<Dataset> tdb2Factory = ()->TDB2Factory.createDataset(); - return Arrays.asList( new Object[][]{ - { "TDB1", tdb1Factory } , - { "TDB2", tdb2Factory } - }); + return Stream.of(Arguments.of("TDB1", tdb1Factory), + Arguments.of("TDB2", tdb2Factory)); } private final Creator<Dataset> factory; diff --git a/jena-text/src/test/java/org/apache/jena/query/text/assembler/AbstractTestTextAssembler.java b/jena-text/src/test/java/org/apache/jena/query/text/assembler/AbstractTestTextAssembler.java index ce7f20cefd..ff639b71f8 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/assembler/AbstractTestTextAssembler.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/assembler/AbstractTestTextAssembler.java @@ -31,8 +31,8 @@ import org.apache.jena.rdf.model.Resource ; import org.apache.jena.tdb2.assembler.VocabTDB2; import org.apache.jena.vocabulary.RDF ; import org.apache.jena.vocabulary.RDFS ; -import org.junit.After ; -import org.junit.Before ; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; public abstract class AbstractTestTextAssembler { @@ -132,15 +132,13 @@ public abstract class AbstractTestTextAssembler { indexDir = new File("target/test/testasm/simpleIndexLiteralDir"); if (indexDir.exists()) TextSearchUtil.emptyAndDeleteDirectory(indexDir); } - @Before - public void before() { + @BeforeEach public void before() { deleteFiles(); TextSearchUtil.createEmptyIndex(new File("target/test/testasm/DB")); } - @After - public void after() { + @AfterEach public void after() { deleteFiles(); } diff --git a/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestEntityMapAssembler.java b/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestEntityMapAssembler.java index aef1b302e4..841a2a779c 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestEntityMapAssembler.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestEntityMapAssembler.java @@ -21,11 +21,16 @@ package org.apache.jena.query.text.assembler; -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.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue ; import java.util.Collection ; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + import org.apache.jena.assembler.Assembler ; import org.apache.jena.atlas.lib.InternalErrorException ; import org.apache.jena.atlas.logging.LogCtl ; @@ -41,19 +46,16 @@ import org.apache.jena.vocabulary.RDFS ; import org.apache.lucene.analysis.core.KeywordAnalyzer ; import org.apache.lucene.analysis.core.SimpleAnalyzer ; import org.apache.lucene.analysis.standard.StandardAnalyzer ; -import org.junit.AfterClass ; -import org.junit.BeforeClass ; -import org.junit.Test ; /** * Test assembler for EntityMap */ public class TestEntityMapAssembler { - + // Suppress warnings - @BeforeClass public static void beforeClass() { LogCtl.setError(EntityDefinitionAssembler.class); } - @AfterClass public static void afterClass() { LogCtl.setInfo(EntityDefinitionAssembler.class); } - + @BeforeAll public static void beforeClass() { LogCtl.setError(EntityDefinitionAssembler.class); } + @AfterAll public static void afterClass() { LogCtl.setInfo(EntityDefinitionAssembler.class); } + private static final String TESTBASE = "http://example.org/test/";; private static final Resource spec1; private static final Resource spec2; @@ -66,32 +68,32 @@ public class TestEntityMapAssembler { private static final Resource specNoDefaultField; private static final Resource specNoMapProperty; private static final Resource specNoPrimaryFieldDef; - + @Test public void EntityHasPrimaryField() { EntityDefinitionAssembler entDefAssem = new EntityDefinitionAssembler(); EntityDefinition entityDef = entDefAssem.open(null, spec1, null); assertEquals(SPEC1_DEFAULT_FIELD, entityDef.getPrimaryField()); } - + @Test public void EntityHasEntityField() { EntityDefinitionAssembler entDefAssem = new EntityDefinitionAssembler(); EntityDefinition entityDef = entDefAssem.open(null, spec1, null); - assertEquals(SPEC1_ENTITY_FIELD, entityDef.getEntityField()); + assertEquals(SPEC1_ENTITY_FIELD, entityDef.getEntityField()); } - + @Test public void EntityHasMapEntries() { EntityDefinitionAssembler entDefAssem = new EntityDefinitionAssembler(); EntityDefinition entityDef = entDefAssem.open(null, spec1, null); assertEquals(SPEC1_PREDICATE.asNode(), getOne(entityDef,SPEC1_DEFAULT_FIELD)); } - + private static Object getOne(EntityDefinition entityDef, String field) { Collection<Node> x = entityDef.getPredicates(field) ; if ( x == null || x.size() == 0 ) return null ; if ( x.size() != 1 ) throw new InternalErrorException("Not unique: "+field) ; - return x.iterator().next() ; + return x.iterator().next() ; } @Test public void EntityHasMultipleMapEntries() { @@ -100,67 +102,62 @@ public class TestEntityMapAssembler { assertEquals(SPEC2_PREDICATE1.asNode(), getOne(entityDef,SPEC2_DEFAULT_FIELD)); assertEquals(SPEC2_PREDICATE2.asNode(), getOne(entityDef, SPEC2_FIELD2)); } - + @Test public void EntityHasMapEntryWithSimpleAnalyzer() { EntityDefinitionAssembler entDefAssem = new EntityDefinitionAssembler(); EntityDefinition entityDef = entDefAssem.open(Assembler.general(), spec3, null); assertEquals(SimpleAnalyzer.class, entityDef.getAnalyzer(SPEC1_DEFAULT_FIELD).getClass()); } - + @Test public void EntityHasMapEntryWithStandardAnalyzerAndStopWords() { EntityDefinitionAssembler entDefAssem = new EntityDefinitionAssembler(); EntityDefinition entityDef = entDefAssem.open(Assembler.general(), spec4, null); assertEquals(StandardAnalyzer.class, entityDef.getAnalyzer(SPEC1_DEFAULT_FIELD).getClass()); } - + @Test public void EntityHasMapEntryWithKeywordAnalyzer() { EntityDefinitionAssembler entDefAssem = new EntityDefinitionAssembler(); EntityDefinition entityDef = entDefAssem.open(Assembler.general(), spec5, null); assertEquals(KeywordAnalyzer.class, entityDef.getAnalyzer(SPEC1_DEFAULT_FIELD).getClass()); - } - + } + @Test public void EntityHasMapEntryWithLowerCaseKeywordAnalyzer() { EntityDefinitionAssembler entDefAssem = new EntityDefinitionAssembler(); EntityDefinition entityDef = entDefAssem.open(Assembler.general(), spec6, null); assertEquals(LowerCaseKeywordAnalyzer.class, entityDef.getAnalyzer(SPEC1_DEFAULT_FIELD).getClass()); - } - + } + @Test public void EntityHasMapEntryWithConfigurableAnalyzer() { EntityDefinitionAssembler entDefAssem = new EntityDefinitionAssembler(); EntityDefinition entityDef = entDefAssem.open(Assembler.general(), spec7, null); assertEquals(ConfigurableAnalyzer.class, entityDef.getAnalyzer(SPEC1_DEFAULT_FIELD).getClass()); - } - - @Test(expected=TextIndexException.class) public void errorOnNoEntityField() { + } + + @Test public void errorOnNoEntityField() { EntityDefinitionAssembler entDefAssem = new EntityDefinitionAssembler(); - entDefAssem.open(null, specNoEntityField, null); + assertThrows(TextIndexException.class, ()->entDefAssem.open(null, specNoEntityField, null)); } - - @Test(expected=TextIndexException.class) public void errorOnNoDefaultField() { + + @Test public void errorOnNoDefaultField() { EntityDefinitionAssembler entDefAssem = new EntityDefinitionAssembler(); - entDefAssem.open(null, specNoDefaultField, null); + assertThrows(TextIndexException.class, ()->entDefAssem.open(null, specNoDefaultField, null)); } - - @Test(expected=TextIndexException.class) public void errorOnNoMapProperty() { + + @Test public void errorOnNoMapProperty() { EntityDefinitionAssembler entDefAssem = new EntityDefinitionAssembler(); - entDefAssem.open(null, specNoMapProperty, null); + assertThrows(TextIndexException.class, ()->entDefAssem.open(null, specNoMapProperty, null)); } - - @Test(expected=TextIndexException.class) public void errorOnNoPrimaryFieldDef() { + + @Test public void errorOnNoPrimaryFieldDef() { EntityDefinitionAssembler entDefAssem = new EntityDefinitionAssembler(); - try { - entDefAssem.open(null, specNoPrimaryFieldDef, null); - } catch (TextIndexException e) { + TextIndexException e = assertThrows(TextIndexException.class, ()->entDefAssem.open(null, specNoPrimaryFieldDef, null)); assertTrue(e.getMessage().contains(SPEC1_DEFAULT_FIELD)); - throw e ; - } - } - + private static final String SPEC1_ENTITY_FIELD = "spec1EntityField"; private static final String SPEC1_DEFAULT_FIELD = "spec1DefaultField"; private static final Property SPEC1_PREDICATE = RDFS.label; - + private static final String SPEC2_ENTITY_FIELD = "spec2EntityField"; private static final String SPEC2_DEFAULT_FIELD = "spec2DefaultField"; private static final String SPEC2_FIELD2 = "spec2Field2"; @@ -170,9 +167,9 @@ public class TestEntityMapAssembler { JenaSystem.init(); TextAssembler.init(); Model model = ModelFactory.createDefaultModel(); - + // create a simple entity map specification - + spec1 = model.createResource(TESTBASE + "spec1") .addProperty(TextVocab.pEntityField, SPEC1_ENTITY_FIELD) .addProperty(TextVocab.pDefaultField, SPEC1_DEFAULT_FIELD) @@ -184,9 +181,9 @@ public class TestEntityMapAssembler { .addProperty(TextVocab.pPredicate, SPEC1_PREDICATE) })) ; - + // create an entity map specification with multiple map entries - + spec2 = model.createResource(TESTBASE + "spec2") .addProperty(TextVocab.pEntityField, SPEC2_ENTITY_FIELD) .addProperty(TextVocab.pDefaultField, SPEC2_DEFAULT_FIELD) @@ -199,12 +196,12 @@ public class TestEntityMapAssembler { model.createResource() .addProperty(TextVocab.pField, SPEC2_FIELD2) .addProperty(TextVocab.pPredicate, SPEC2_PREDICATE2), - + })) ; - + // create a simple entity map specification using a keyword analyzer - + spec3 = model.createResource(TESTBASE + "spec3") .addProperty(TextVocab.pEntityField, SPEC1_ENTITY_FIELD) .addProperty(TextVocab.pDefaultField, SPEC1_DEFAULT_FIELD) @@ -214,13 +211,13 @@ public class TestEntityMapAssembler { model.createResource() .addProperty(TextVocab.pField, SPEC1_DEFAULT_FIELD) .addProperty(TextVocab.pPredicate, SPEC1_PREDICATE) - .addProperty(TextVocab.pAnalyzer, + .addProperty(TextVocab.pAnalyzer, model.createResource() .addProperty(RDF.type, TextVocab.simpleAnalyzer)) })) ; // create a simple entity map specification using a standard analyzer with stop words - + spec4 = model.createResource(TESTBASE + "spec4") .addProperty(TextVocab.pEntityField, SPEC1_ENTITY_FIELD) .addProperty(TextVocab.pDefaultField, SPEC1_DEFAULT_FIELD) @@ -230,13 +227,13 @@ public class TestEntityMapAssembler { model.createResource() .addProperty(TextVocab.pField, SPEC1_DEFAULT_FIELD) .addProperty(TextVocab.pPredicate, SPEC1_PREDICATE) - .addProperty(TextVocab.pAnalyzer, + .addProperty(TextVocab.pAnalyzer, model.createResource() .addProperty(RDF.type, TextVocab.standardAnalyzer)) .addProperty(TextVocab.pStopWords, toList(model, "and the but")) - })); + })); // create a simple entity map specification using a keyword analyzer - + spec5 = model.createResource(TESTBASE + "spec5") .addProperty(TextVocab.pEntityField, SPEC1_ENTITY_FIELD) .addProperty(TextVocab.pDefaultField, SPEC1_DEFAULT_FIELD) @@ -246,13 +243,13 @@ public class TestEntityMapAssembler { model.createResource() .addProperty(TextVocab.pField, SPEC1_DEFAULT_FIELD) .addProperty(TextVocab.pPredicate, SPEC1_PREDICATE) - .addProperty(TextVocab.pAnalyzer, + .addProperty(TextVocab.pAnalyzer, model.createResource() .addProperty(RDF.type, TextVocab.keywordAnalyzer)) })); - + // create a simple entity map specification using a lowercase keyword analyzer - + spec6 = model.createResource(TESTBASE + "spec6") .addProperty(TextVocab.pEntityField, SPEC1_ENTITY_FIELD) .addProperty(TextVocab.pDefaultField, SPEC1_DEFAULT_FIELD) @@ -262,14 +259,14 @@ public class TestEntityMapAssembler { model.createResource() .addProperty(TextVocab.pField, SPEC1_DEFAULT_FIELD) .addProperty(TextVocab.pPredicate, SPEC1_PREDICATE) - .addProperty(TextVocab.pAnalyzer, + .addProperty(TextVocab.pAnalyzer, model.createResource() .addProperty(RDF.type, TextVocab.lowerCaseKeywordAnalyzer)) })); - + // create an entity map specification using a configurable analyzer - + spec7 = model.createResource(TESTBASE + "spec7") .addProperty(TextVocab.pEntityField, SPEC1_ENTITY_FIELD) .addProperty(TextVocab.pDefaultField, SPEC1_DEFAULT_FIELD) @@ -279,15 +276,15 @@ public class TestEntityMapAssembler { model.createResource() .addProperty(TextVocab.pField, SPEC1_DEFAULT_FIELD) .addProperty(TextVocab.pPredicate, SPEC1_PREDICATE) - .addProperty(TextVocab.pAnalyzer, + .addProperty(TextVocab.pAnalyzer, model.createResource() .addProperty(RDF.type, TextVocab.configurableAnalyzer) .addProperty(TextVocab.pTokenizer, TextVocab.standardTokenizer)) })); - + // bad assembler spec - - specNoEntityField = + + specNoEntityField = model.createResource(TESTBASE + "specNoEntityField") .addProperty(TextVocab.pDefaultField, SPEC1_DEFAULT_FIELD) .addProperty(TextVocab.pMap, @@ -298,10 +295,10 @@ public class TestEntityMapAssembler { .addProperty(TextVocab.pPredicate, SPEC1_PREDICATE) })) ; - + // bad assembler spec - - specNoDefaultField = + + specNoDefaultField = model.createResource(TESTBASE + "specNoDefaultField") .addProperty(TextVocab.pDefaultField, SPEC1_DEFAULT_FIELD) .addProperty(TextVocab.pMap, @@ -313,13 +310,13 @@ public class TestEntityMapAssembler { })) ; // bad assembler spec - specNoMapProperty = + specNoMapProperty = model.createResource(TESTBASE + "specNoMapProperty") .addProperty(TextVocab.pEntityField, SPEC1_ENTITY_FIELD) .addProperty(TextVocab.pDefaultField, SPEC1_DEFAULT_FIELD) ; - - // bad assembler spec + + // bad assembler spec specNoPrimaryFieldDef = model.createResource(TESTBASE + "noPrimaryFieldDef") .addProperty(TextVocab.pEntityField, SPEC1_ENTITY_FIELD) @@ -333,7 +330,7 @@ public class TestEntityMapAssembler { })) ; } - + private static Resource toList(Model model, String string) { String[] members = string.split("\\s"); Resource current = RDF.nil; @@ -341,8 +338,8 @@ public class TestEntityMapAssembler { Resource previous = current; current = model.createResource(); current.addProperty(RDF.rest, previous); - current.addProperty(RDF.first, members[i]); + current.addProperty(RDF.first, members[i]); } - return current; + return current; } } diff --git a/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestGenericAnalyzerAssembler.java b/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestGenericAnalyzerAssembler.java index 474c7baff2..bc700e847f 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestGenericAnalyzerAssembler.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestGenericAnalyzerAssembler.java @@ -21,7 +21,7 @@ package org.apache.jena.query.text.assembler; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; @@ -34,7 +34,7 @@ import org.apache.lucene.analysis.core.SimpleAnalyzer; import org.apache.lucene.analysis.core.StopAnalyzer; import org.apache.lucene.analysis.fr.FrenchAnalyzer; import org.apache.lucene.analysis.shingle.ShingleAnalyzerWrapper; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestGenericAnalyzerAssembler { diff --git a/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestPropListsAssembler.java b/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestPropListsAssembler.java index 3ed178152d..fd191f48df 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestPropListsAssembler.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestPropListsAssembler.java @@ -21,8 +21,8 @@ package org.apache.jena.query.text.assembler; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.util.List; @@ -33,7 +33,7 @@ import org.apache.jena.rdf.model.RDFNode; import org.apache.jena.rdf.model.Resource; import org.apache.jena.rdf.model.ResourceFactory; import org.apache.jena.sys.JenaSystem; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.apache.jena.vocabulary.RDFS; import org.apache.jena.vocabulary.SKOS; diff --git a/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestTextDatasetAssembler.java b/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestTextDatasetAssembler.java index 9cc78ea958..1297153231 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestTextDatasetAssembler.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestTextDatasetAssembler.java @@ -21,7 +21,12 @@ package org.apache.jena.query.text.assembler; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.apache.jena.assembler.Assembler; import org.apache.jena.assembler.exceptions.AssemblerException; @@ -32,9 +37,6 @@ import org.apache.jena.query.text.changes.TextQuadAction; import org.apache.jena.rdf.model.Resource; import org.apache.jena.sys.JenaSystem; import org.apache.jena.vocabulary.RDF; -import org.junit.After; -import org.junit.BeforeClass; -import org.junit.Test; /** * Test the text dataset assembler. @@ -49,12 +51,12 @@ public class TestTextDatasetAssembler extends AbstractTestTextAssembler { private static final Resource noIndexPropertySpec; private static final Resource customTextDocProducerSpec; - @BeforeClass public static void clearBefore() { + @BeforeAll public static void clearBefore() { org.apache.jena.tdb1.sys.TDBInternal.reset(); org.apache.jena.tdb2.sys.TDBInternal.reset(); } - @After public void clearAfter() { + @AfterEach public void clearAfter() { org.apache.jena.tdb1.sys.TDBInternal.reset(); org.apache.jena.tdb2.sys.TDBInternal.reset(); } @@ -66,14 +68,14 @@ public class TestTextDatasetAssembler extends AbstractTestTextAssembler { dataset.close(); } - @Test(expected = AssemblerException.class) + @Test public void testErrorOnNoDataset() { - Assembler.general().open(noDatasetPropertySpec); + assertThrows(AssemblerException.class, ()->Assembler.general().open(noDatasetPropertySpec)); } - @Test(expected = AssemblerException.class) + @Test public void testErrorOnNoIndex() { - Assembler.general().open(noIndexPropertySpec); + assertThrows(AssemblerException.class, ()->Assembler.general().open(noIndexPropertySpec)); } @Test diff --git a/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestTextIndexLuceneAssembler.java b/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestTextIndexLuceneAssembler.java index c14204d7fd..b301645a99 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestTextIndexLuceneAssembler.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestTextIndexLuceneAssembler.java @@ -28,8 +28,8 @@ import org.apache.jena.sys.JenaSystem; import org.apache.jena.vocabulary.RDFS ; import org.apache.lucene.analysis.core.KeywordAnalyzer ; import org.apache.lucene.store.ByteBuffersDirectory ; -import org.junit.Test ; -import static org.junit.Assert.* ; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.* ; public class TestTextIndexLuceneAssembler extends AbstractTestTextAssembler { diff --git a/jena-text/src/test/java/org/apache/jena/query/text/changes/TestDatasetMonitor.java b/jena-text/src/test/java/org/apache/jena/query/text/changes/TestDatasetMonitor.java index 279c88e7f1..da50f66525 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/changes/TestDatasetMonitor.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/changes/TestDatasetMonitor.java @@ -25,8 +25,8 @@ import static org.apache.jena.query.text.changes.TextQuadAction.ADD; import static org.apache.jena.query.text.changes.TextQuadAction.DELETE; import static org.apache.jena.query.text.changes.TextQuadAction.NO_ADD; import static org.apache.jena.query.text.changes.TextQuadAction.NO_DELETE; -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.List ; @@ -37,7 +37,7 @@ import org.apache.jena.sparql.core.DatasetGraph; import org.apache.jena.sparql.core.DatasetGraphFactory; import org.apache.jena.sparql.core.Quad; import org.apache.jena.sparql.sse.SSE ; -import org.junit.Test ; +import org.junit.jupiter.api.Test; public class TestDatasetMonitor { @@ -185,15 +185,16 @@ public class TestDatasetMonitor private static void check(ChangesCounter changes, long adds, long deletes, long noAdds, long noDeletes) { - assertEquals("Adds", adds, changes.countAdd) ; - assertEquals("Deletes", deletes, changes.countDelete) ; - assertEquals("NoAdds", noAdds, changes.countNoAdd) ; - assertEquals("NoDeletes", noDeletes, changes.countNoDelete) ; + assertEquals(adds, changes.countAdd, "Adds") ; + assertEquals(deletes, changes.countDelete, "Deletes"); + assertEquals(noAdds, changes.countNoAdd, "NoAdds"); + assertEquals(noDeletes, changes.countNoDelete, "NoDeletes"); } private static void check(List<Pair<TextQuadAction, Quad>> record, int indx, TextQuadAction quadAction, Quad quad) { - assertTrue("Index "+indx+" out of range [0,"+record.size()+")", 0 <= indx && indx < record.size() ) ; + assertTrue(0 <= indx && indx < record.size(), + "Index "+indx+" out of range [0,"+record.size()+")"); Pair<TextQuadAction, Quad> pair = record.get(indx) ; assertEquals(quadAction, pair.getLeft()) ; assertEquals(quad, pair.getRight()) ; diff --git a/jena-text/src/test/java/org/apache/jena/query/text/filter/TestSelectiveFoldingFilter.java b/jena-text/src/test/java/org/apache/jena/query/text/filter/TestSelectiveFoldingFilter.java index 2ee821ea72..9b9e6c6daf 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/filter/TestSelectiveFoldingFilter.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/filter/TestSelectiveFoldingFilter.java @@ -21,7 +21,8 @@ package org.apache.jena.query.text.filter; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.io.StringReader; @@ -30,11 +31,12 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.standard.StandardTokenizer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; -import org.junit.Before; -import org.junit.Test; /** * Test {@link SelectiveFoldingFilter}. @@ -45,8 +47,7 @@ public class TestSelectiveFoldingFilter { private StringReader inputText; private CharArraySet whitelisted; - @Before - public void setUp() { + @BeforeEach public void setUp() { inputText = new StringReader("Señora Siobhán, look at that façade"); } @@ -96,9 +97,9 @@ public class TestSelectiveFoldingFilter { assertTrue(tokens.equals(expected)); } - @Test(expected = NullPointerException.class) - public void testNullWhiteListThrowsError() throws IOException { - collectTokens(inputText, null); + @Test + public void testNullWhiteListThrowsError() { + assertThrows(NullPointerException.class, ()->collectTokens(inputText, null)); } @Test
