diff --git a/pom.xml b/pom.xml index c7a0e64b3..dd53e27fb 100644 --- a/pom.xml +++ b/pom.xml @@ -46,9 +46,9 @@ 1.5.36 2.26.0 9.8.0-15 - 3.5.15 - 6.2.19 - 3.5.12 + 4.1.1 + 7.0.9 + 4.1.1 4.1.137.Final 3.9.5 2.18.9 @@ -57,8 +57,9 @@ gpl30 21 21 + 6.1.0 10.11.0 - 5.13.4 + 6.0.3 @@ -68,22 +69,33 @@ ${slf4j.version} - - junit - junit - 4.13.2 - test - - + + + org.junit + junit-bom + ${junit.version} + pom + import + org.junit.jupiter junit-jupiter ${junit.version} + + + junit + junit + 4.13.2 + test + org.junit.vintage junit-vintage-engine diff --git a/vlo-commons/pom.xml b/vlo-commons/pom.xml index 4c99d748f..ee9972fbd 100644 --- a/vlo-commons/pom.xml +++ b/vlo-commons/pom.xml @@ -194,7 +194,7 @@ jakarta.servlet jakarta.servlet-api - 5.0.0 + ${jakarta.servlet.version} provided @@ -245,7 +245,12 @@ - + + + org.junit.jupiter + junit-jupiter + test + org.hamcrest hamcrest-library diff --git a/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/PIDUtilsTest.java b/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/PIDUtilsTest.java index fb594a872..83a3c66d6 100644 --- a/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/PIDUtilsTest.java +++ b/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/PIDUtilsTest.java @@ -19,8 +19,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import java.util.List; -import org.junit.Test; -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; /** * @@ -122,13 +122,13 @@ public class PIDUtilsTest { */ @Test public void testIsPid() { - VALID_HANDLES.forEach(h -> assertTrue(h, PIDUtils.isPid(h))); - VALID_DOIS.forEach(h -> assertTrue(h, PIDUtils.isPid(h))); - VALID_URN_NBNS.forEach(h -> assertTrue(h, PIDUtils.isPid(h))); + VALID_HANDLES.forEach(h -> assertTrue(PIDUtils.isPid(h), h)); + VALID_DOIS.forEach(h -> assertTrue(PIDUtils.isPid(h), h)); + VALID_URN_NBNS.forEach(h -> assertTrue(PIDUtils.isPid(h), h)); //negatives - NOT_PIDS.forEach(h -> assertFalse(h, PIDUtils.isPid(h))); - assertFalse("null", PIDUtils.isPid(null)); + NOT_PIDS.forEach(h -> assertFalse(PIDUtils.isPid(h), h)); + assertFalse(PIDUtils.isPid(null), "null"); } /** @@ -136,12 +136,12 @@ public void testIsPid() { */ @Test public void testIsHandle() { - VALID_HANDLES.forEach(h -> assertTrue(h, PIDUtils.isHandle(h))); + VALID_HANDLES.forEach(h -> assertTrue(PIDUtils.isHandle(h), h)); //negatives - NOT_HANDLES.forEach(h -> assertFalse(h, PIDUtils.isHandle(h))); - NOT_PIDS.forEach(h -> assertFalse(h, PIDUtils.isHandle(h))); - assertFalse("null", PIDUtils.isHandle(null)); + NOT_HANDLES.forEach(h -> assertFalse(PIDUtils.isHandle(h), h)); + NOT_PIDS.forEach(h -> assertFalse(PIDUtils.isHandle(h), h)); + assertFalse(PIDUtils.isHandle(null), "null"); } /** @@ -149,12 +149,12 @@ public void testIsHandle() { */ @Test public void testIsDoi() { - VALID_DOIS.forEach(h -> assertTrue(h, PIDUtils.isDoi(h))); + VALID_DOIS.forEach(h -> assertTrue(PIDUtils.isDoi(h), h)); //negatives - NOT_DOIS.forEach(h -> assertFalse(h, PIDUtils.isDoi(h))); - NOT_PIDS.forEach(h -> assertFalse(h, PIDUtils.isDoi(h))); - assertFalse("null", PIDUtils.isDoi(null)); + NOT_DOIS.forEach(h -> assertFalse(PIDUtils.isDoi(h), h)); + NOT_PIDS.forEach(h -> assertFalse(PIDUtils.isDoi(h), h)); + assertFalse(PIDUtils.isDoi(null), "null"); } /** @@ -162,12 +162,12 @@ public void testIsDoi() { */ @Test public void testIsUrnNbn() { - VALID_URN_NBNS.forEach(h -> assertTrue(h, PIDUtils.isUrnNbn(h))); + VALID_URN_NBNS.forEach(h -> assertTrue(PIDUtils.isUrnNbn(h), h)); //negatives - NOT_URN_NBNS.forEach(h -> assertFalse(h, PIDUtils.isUrnNbn(h))); - NOT_PIDS.forEach(h -> assertFalse(h, PIDUtils.isUrnNbn(h))); - assertFalse("null", PIDUtils.isUrnNbn(null)); + NOT_URN_NBNS.forEach(h -> assertFalse(PIDUtils.isUrnNbn(h), h)); + NOT_PIDS.forEach(h -> assertFalse(PIDUtils.isUrnNbn(h), h)); + assertFalse(PIDUtils.isUrnNbn(null), "null"); } @Test @@ -197,15 +197,15 @@ public void testIsActionable() { ACTIONABLE.forEach(h -> assertTrue(PIDUtils.isActionableLink(h))); NON_ACTIONABLE_PIDS.forEach(h -> assertFalse(PIDUtils.isActionableLink(h))); INVALID.forEach(h -> assertFalse(PIDUtils.isActionableLink(h))); - ACTIONABLE.forEach(h -> assertFalse("input should be trimmed", PIDUtils.isActionableLink(" " + h + " "))); + ACTIONABLE.forEach(h -> assertFalse(PIDUtils.isActionableLink(" " + h + " "), "input should be trimmed")); } @Test public void testGetActionableLinkForPid() { - ACTIONABLE_PIDS.forEach(h -> assertEquals("actionable pids should not be changed", h, PIDUtils.getActionableLinkForPid(h))); - ACTIONABLE.forEach(h -> assertEquals("actionable links should not be changed", h, PIDUtils.getActionableLinkForPid(h))); + ACTIONABLE_PIDS.forEach(h -> assertEquals(h, PIDUtils.getActionableLinkForPid(h), "actionable pids should not be changed")); + ACTIONABLE.forEach(h -> assertEquals(h, PIDUtils.getActionableLinkForPid(h), "actionable links should not be changed")); NON_ACTIONABLE_PIDS.forEach(h -> assertNotEquals("non-actionable PIDs should be changed into links", h, PIDUtils.getActionableLinkForPid(h))); - INVALID.forEach(h -> assertEquals("invalid links should not be changed", h, PIDUtils.getActionableLinkForPid(h))); + INVALID.forEach(h -> assertEquals(h, PIDUtils.getActionableLinkForPid(h), "invalid links should not be changed")); } } diff --git a/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/ResourceInfoTest.java b/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/ResourceInfoTest.java index 530dd6bb8..8e0a38dc6 100644 --- a/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/ResourceInfoTest.java +++ b/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/ResourceInfoTest.java @@ -16,8 +16,8 @@ */ package eu.clarin.cmdi.vlo; -import org.junit.Test; -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; /** * diff --git a/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/StringUtilsTest.java b/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/StringUtilsTest.java index 863c27088..86f20ae34 100644 --- a/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/StringUtilsTest.java +++ b/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/StringUtilsTest.java @@ -16,8 +16,8 @@ */ package eu.clarin.cmdi.vlo; -import org.junit.Test; -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; /** * diff --git a/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/DefaultVloConfigFactoryTest.java b/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/DefaultVloConfigFactoryTest.java index 18938e406..012e0f533 100644 --- a/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/DefaultVloConfigFactoryTest.java +++ b/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/DefaultVloConfigFactoryTest.java @@ -4,9 +4,9 @@ import java.util.Arrays; import java.util.List; import java.util.Properties; -import static org.junit.Assert.*; -import org.junit.Before; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @@ -20,7 +20,7 @@ public class DefaultVloConfigFactoryTest { private VloConfig config; private Properties testProps; - @Before + @BeforeEach public void setUp() throws Exception { config = new DefaultVloConfigFactory().newConfig(); testProps = new Properties(); @@ -38,13 +38,13 @@ public void testGetDataRoots() { final List rootsReturned = config.getDataRoots(); assertNotNull(rootsReturned); - assertTrue("One or more data roots should be defined", rootsReturned.size() > 0); + assertTrue(rootsReturned.size() > 0, "One or more data roots should be defined"); assertNotNull(rootsReturned.get(0).getOriginName()); - assertTrue("Origin name cannot be empty", rootsReturned.get(0).getOriginName().length() > 0); + assertTrue(rootsReturned.get(0).getOriginName().length() > 0, "Origin name cannot be empty"); assertNotNull(rootsReturned.get(0).getPrefix()); - assertTrue("Prefix cannot be empty", rootsReturned.get(0).getPrefix().length() > 0); + assertTrue(rootsReturned.get(0).getPrefix().length() > 0, "Prefix cannot be empty"); assertNotNull(rootsReturned.get(0).getRootFile()); - assertTrue("Root file cannot be empty", rootsReturned.get(0).getRootFile().getName().length() > 0); + assertTrue(rootsReturned.get(0).getRootFile().getName().length() > 0, "Root file cannot be empty"); assertNotNull(rootsReturned.get(0).getToStrip()); } diff --git a/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/FieldNameServiceImplTest.java b/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/FieldNameServiceImplTest.java index 9379b46ed..d4fce3ddf 100644 --- a/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/FieldNameServiceImplTest.java +++ b/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/FieldNameServiceImplTest.java @@ -26,9 +26,9 @@ import java.util.stream.DoubleStream; import java.util.stream.IntStream; import java.util.stream.Stream; -import static org.junit.Assert.assertEquals; -import org.junit.Before; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @@ -39,7 +39,7 @@ public class FieldNameServiceImplTest { private VloConfig vloConfig; private HashMap fieldsMap; - @Before + @BeforeEach public void setUp() { vloConfig = new VloConfig(); fieldsMap = new HashMap<>(); diff --git a/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/VloConfigMarshallerTest.java b/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/VloConfigMarshallerTest.java index 62169a679..916ce4798 100644 --- a/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/VloConfigMarshallerTest.java +++ b/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/VloConfigMarshallerTest.java @@ -24,11 +24,11 @@ import jakarta.xml.bind.ValidationEventHandler; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; -import org.junit.Before; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.fail; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,7 +43,7 @@ public class VloConfigMarshallerTest { private VloConfigMarshaller instance; private Properties testProps; - @Before + @BeforeEach public void setUp() throws Exception { instance = new VloConfigMarshaller(); testProps = new Properties(); diff --git a/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/XmlVloConfigFactoryTest.java b/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/XmlVloConfigFactoryTest.java index 2ae8f0406..8bcdeacec 100644 --- a/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/XmlVloConfigFactoryTest.java +++ b/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/XmlVloConfigFactoryTest.java @@ -16,14 +16,8 @@ */ package eu.clarin.cmdi.vlo.config; -import java.io.InputStream; -import java.net.URI; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; /** * diff --git a/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/facets/FacetConceptsMarshallerTest.java b/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/facets/FacetConceptsMarshallerTest.java index 67631ac5b..bc7ac0eea 100644 --- a/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/facets/FacetConceptsMarshallerTest.java +++ b/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/facets/FacetConceptsMarshallerTest.java @@ -18,12 +18,12 @@ import javax.xml.transform.Source; import javax.xml.transform.stream.StreamSource; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import static org.junit.Assert.*; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; /** * @@ -34,19 +34,19 @@ public class FacetConceptsMarshallerTest { public FacetConceptsMarshallerTest() { } - @BeforeClass + @BeforeAll public static void setUpClass() { } - @AfterClass + @AfterAll public static void tearDownClass() { } - @Before + @BeforeEach public void setUp() { } - @After + @AfterEach public void tearDown() { } diff --git a/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/facets/FacetsConfigurationsMarshallerTest.java b/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/facets/FacetsConfigurationsMarshallerTest.java index ebd1fb276..d0f77ab57 100644 --- a/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/facets/FacetsConfigurationsMarshallerTest.java +++ b/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/facets/FacetsConfigurationsMarshallerTest.java @@ -30,15 +30,15 @@ import javax.xml.transform.stream.StreamSource; import org.hamcrest.Description; import org.hamcrest.Matcher; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; import org.hamcrest.TypeSafeMatcher; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * @@ -49,19 +49,19 @@ public class FacetsConfigurationsMarshallerTest { public FacetsConfigurationsMarshallerTest() { } - @BeforeClass + @BeforeAll public static void setUpClass() { } - @AfterClass + @AfterAll public static void tearDownClass() { } - @Before + @BeforeEach public void setUp() { } - @After + @AfterEach public void tearDown() { } diff --git a/vlo-importer/pom.xml b/vlo-importer/pom.xml index 3c239aa81..46e744e33 100644 --- a/vlo-importer/pom.xml +++ b/vlo-importer/pom.xml @@ -112,6 +112,17 @@ + + jakarta.servlet + jakarta.servlet-api + ${jakarta.servlet.version} + provided + + + org.junit.jupiter + junit-jupiter + test + ${project.groupId} vlo-commons @@ -154,12 +165,6 @@ org.apache.commons commons-lang3 - - jakarta.servlet - jakarta.servlet-api - 5.0.0 - provided - net.sf.saxon Saxon-HE @@ -201,7 +206,7 @@ eu.clarin linkchecker-persistence - 1.0.0 + 2.2.1 ${project.groupId} @@ -312,4 +317,18 @@ test + + + + + + org.springframework.boot + spring-boot-dependencies + ${spring.boot.version} + pom + import + + + diff --git a/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/linkcheck/LinkcheckerAvailabilityStatusCheckerFactory.java b/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/linkcheck/LinkcheckerAvailabilityStatusCheckerFactory.java index c0894ec4c..73793da43 100644 --- a/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/linkcheck/LinkcheckerAvailabilityStatusCheckerFactory.java +++ b/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/linkcheck/LinkcheckerAvailabilityStatusCheckerFactory.java @@ -27,7 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.domain.EntityScan; +import org.springframework.boot.persistence.autoconfigure.EntityScan; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/AvailabilityPostNormalizerTest.java b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/AvailabilityPostNormalizerTest.java index 4740370a0..7a642c0fd 100644 --- a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/AvailabilityPostNormalizerTest.java +++ b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/AvailabilityPostNormalizerTest.java @@ -1,6 +1,6 @@ package eu.clarin.cmdi.vlo.importer; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; @@ -8,7 +8,6 @@ import eu.clarin.cmdi.vlo.importer.normalizer.AvailabilityPostNormalizer; import org.junit.jupiter.api.Test; - public class AvailabilityPostNormalizerTest extends ImporterTestcase { diff --git a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/CMDIDataProcessorTest.java b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/CMDIDataProcessorTest.java index 1a6dc7ab6..5b678279c 100644 --- a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/CMDIDataProcessorTest.java +++ b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/CMDIDataProcessorTest.java @@ -12,14 +12,13 @@ import java.util.Iterator; import java.util.List; import org.apache.solr.common.SolrInputDocument; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -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.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; - public class CMDIDataProcessorTest extends ImporterTestcase { protected FacetMappingFactory facetMappingFactory; @@ -536,7 +535,7 @@ public void testEmptyFieldsShouldBeNull() throws Exception { assertEquals("Netherlands", doc.getFieldValue("country")); assertEquals("demo", doc.getFieldValue("genre")); assertEquals("{code:und}Test.", doc.getFieldValue("description")); - assertEquals("Should be null not empty string", null, doc.getFieldValue("organisation")); + assertEquals(null, doc.getFieldValue("organisation"), "Should be null not empty string"); assertEquals(null, doc.getFieldValue("language")); assertEquals(null, doc.getFieldValue("subject")); assertEquals(null, doc.getFieldValue("year")); @@ -900,7 +899,7 @@ public void testLrtCollection() throws Exception { assertEquals(null, doc.getFieldValue("genre")); assertEquals("{code:eng}written general; 95 mio words; TEI/SGML", doc.getFieldValue("description")); assertEquals("Written Corpus", doc.getFieldValue(fieldNameService.getFieldName(FieldKey.RESOURCE_CLASS))); - assertEquals(String.format("Expected field set different from %s", doc.getFieldNames()), 11, doc.getFieldNames().size()); + assertEquals(11, doc.getFieldNames().size(), String.format("Expected field set different from %s", doc.getFieldNames())); } @Test diff --git a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/CMDIParserVTDXMLTest.java b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/CMDIParserVTDXMLTest.java index af8a96a09..fc8fb735c 100644 --- a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/CMDIParserVTDXMLTest.java +++ b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/CMDIParserVTDXMLTest.java @@ -7,8 +7,8 @@ import eu.clarin.cmdi.vlo.importer.processor.CMDIParserVTDXML; import eu.clarin.cmdi.vlo.importer.processor.SchemaParsingUtil; -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.jupiter.api.Test; public class CMDIParserVTDXMLTest extends ImporterTestcase { diff --git a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/CountryNamePostNormalizerTest.java b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/CountryNamePostNormalizerTest.java index 744f3598e..4f19d4041 100644 --- a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/CountryNamePostNormalizerTest.java +++ b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/CountryNamePostNormalizerTest.java @@ -1,6 +1,6 @@ package eu.clarin.cmdi.vlo.importer; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; import eu.clarin.cmdi.vlo.importer.normalizer.CountryNamePostNormalizer; diff --git a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/CreatorPostNormalizerTest.java b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/CreatorPostNormalizerTest.java index b76ec4055..24d069799 100644 --- a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/CreatorPostNormalizerTest.java +++ b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/CreatorPostNormalizerTest.java @@ -4,9 +4,8 @@ import eu.clarin.cmdi.vlo.importer.normalizer.AbstractPostNormalizer; import eu.clarin.cmdi.vlo.importer.normalizer.CreatorPostNormalizer; -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; public class CreatorPostNormalizerTest extends ImporterTestcase { diff --git a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/FacetConceptMappingTest.java b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/FacetConceptMappingTest.java index 0f3681be8..f549e8855 100644 --- a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/FacetConceptMappingTest.java +++ b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/FacetConceptMappingTest.java @@ -1,8 +1,8 @@ package eu.clarin.cmdi.vlo.importer; -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.io.ByteArrayInputStream; import java.util.List; diff --git a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/FacetMappingFactoryTest.java b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/FacetMappingFactoryTest.java index 218cb7277..2c02dfe2c 100644 --- a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/FacetMappingFactoryTest.java +++ b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/FacetMappingFactoryTest.java @@ -1,7 +1,7 @@ package eu.clarin.cmdi.vlo.importer; -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.ArrayList; import java.util.List; @@ -193,7 +193,7 @@ public void testGetImdiMapping() { mapping.getPatterns().get(0).getPattern()); assertEquals(4, mapping.getPatterns().size()); - assertEquals("check to see we tested them all", facets.size(), index); + assertEquals(facets.size(), index, "check to see we tested them all"); } @Test @@ -329,7 +329,7 @@ public void testGetOlacMapping() { mapping.getPatterns().get(0).getPattern()); assertEquals(3, mapping.getPatterns().size()); - assertEquals("check to see we tested them all", facets.size(), index); + assertEquals(facets.size(), index, "check to see we tested them all"); } @Test @@ -475,7 +475,7 @@ public void testGetLrtMapping() { mapping.getPatterns().get(0).getPattern()); assertEquals(2, mapping.getPatterns().size()); - assertEquals("check to see we tested them all", facets.size(), index); + assertEquals(facets.size(), index, "check to see we tested them all"); } @Test diff --git a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/LanguageCodePostNormalizerTest.java b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/LanguageCodePostNormalizerTest.java index e314e7477..c859f340d 100644 --- a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/LanguageCodePostNormalizerTest.java +++ b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/LanguageCodePostNormalizerTest.java @@ -4,8 +4,7 @@ import eu.clarin.cmdi.vlo.importer.normalizer.AbstractPostNormalizer; import eu.clarin.cmdi.vlo.importer.normalizer.LanguageCodePostNormalizer; - -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/LicenseTypePostNormalizerTest.java b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/LicenseTypePostNormalizerTest.java index 5e91536d1..449282490 100644 --- a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/LicenseTypePostNormalizerTest.java +++ b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/LicenseTypePostNormalizerTest.java @@ -2,7 +2,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; import org.junit.jupiter.api.BeforeEach; diff --git a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/MetadataImporterMultiDatarootsTest.java b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/MetadataImporterMultiDatarootsTest.java index 466d05992..d01a36398 100644 --- a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/MetadataImporterMultiDatarootsTest.java +++ b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/MetadataImporterMultiDatarootsTest.java @@ -1,6 +1,6 @@ package eu.clarin.cmdi.vlo.importer; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; import java.net.MalformedURLException; diff --git a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/MetadataImporterTest.java b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/MetadataImporterTest.java index 805c3d93f..92954d5c5 100644 --- a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/MetadataImporterTest.java +++ b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/MetadataImporterTest.java @@ -23,13 +23,13 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.apache.solr.common.SolrInputDocument; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.collection.IsIterableContainingInOrder.contains; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class MetadataImporterTest extends ImporterTestcase { @@ -297,8 +297,8 @@ public void testDerivedFacetsWithPostProcessing() throws Exception { assertEquals(1, docs.size()); SolrInputDocument doc = docs.get(0); - assertEquals("ISO code mapping to langauge code", "code:nld", getValue(doc, FieldKey.LANGUAGE_CODE)); - assertEquals("Language code -> language name post processing", "Dutch", getValue(doc, FieldKey.LANGUAGE_NAME)); + assertEquals("code:nld", getValue(doc, FieldKey.LANGUAGE_CODE), "ISO code mapping to langauge code"); + assertEquals("Dutch", getValue(doc, FieldKey.LANGUAGE_NAME), "Language code -> language name post processing"); } @Test @@ -327,8 +327,8 @@ public void testDefaultValuePostProcessing() throws Exception { SolrInputDocument doc = docs.get(0); // 'reflective' postprocessing, i.e. we have a post processor that acts on 'null' values, uses value from an already populated field to populate its target field - assertEquals("PRECONDITION: Availability filled in from doc value", "PUB", getValue(doc, FieldKey.AVAILABILITY)); - assertEquals("Explicit license filled in from availability", "PUB", getValue(doc, FieldKey.LICENSE_TYPE)); + assertEquals("PUB", getValue(doc, FieldKey.AVAILABILITY), "PRECONDITION: Availability filled in from doc value"); + assertEquals("PUB", getValue(doc, FieldKey.LICENSE_TYPE), "Explicit license filled in from availability"); } @Test diff --git a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/OrganizationPostNormalizerTest.java b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/OrganizationPostNormalizerTest.java index 0ba868458..da8065f1e 100644 --- a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/OrganizationPostNormalizerTest.java +++ b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/OrganizationPostNormalizerTest.java @@ -1,16 +1,14 @@ package eu.clarin.cmdi.vlo.importer; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; import eu.clarin.cmdi.vlo.importer.normalizer.AbstractPostNormalizer; import eu.clarin.cmdi.vlo.importer.normalizer.OrganisationPostNormalizer; - public class OrganizationPostNormalizerTest extends ImporterTestcase { - @Test public void testLanguageCode() { AbstractPostNormalizer processor = new OrganisationPostNormalizer(config); diff --git a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/SelfLinkExtractorImplTest.java b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/SelfLinkExtractorImplTest.java index 948ddcd53..3dde5ac58 100644 --- a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/SelfLinkExtractorImplTest.java +++ b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/SelfLinkExtractorImplTest.java @@ -30,14 +30,10 @@ import java.io.IOException; import java.io.InputStream; import org.apache.commons.io.IOUtils; -import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.junit.After; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; -import org.junit.Ignore; +import static org.junit.jupiter.api.Assertions.*; /** * @@ -66,7 +62,7 @@ public void setUp() { instance = new SelfLinkExtractorImpl(); } - @After + @AfterEach public void cleanUp() { if (testFile.exists()) { testFile.delete(); @@ -96,7 +92,7 @@ public void testExtractMdSelfLinkNoLink() throws Exception { // final private int performanceTestIterations = 100000; // // @Test -// @Ignore("Ignoring performance test") +// @Disabled("Ignoring performance test") // public void testPerformance() throws Exception { // final Logger logger = LogManager.getLogger(SelfLinkExtractorImpl.class); // final Level level = logger.getLevel(); @@ -112,7 +108,7 @@ public void testExtractMdSelfLinkNoLink() throws Exception { // } // // @Test -// @Ignore("Ignoring performance test") +// @Disabled("Ignoring performance test") // public void testPerformanceOld() throws Exception { // final Logger logger = LogManager.getLogger(OldSelfLinkExtractor.class); // final Level level = logger.getLevel(); diff --git a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/TemporalCoveragePostNormalizerTest.java b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/TemporalCoveragePostNormalizerTest.java index 19138b3a7..55e0bfd67 100644 --- a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/TemporalCoveragePostNormalizerTest.java +++ b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/TemporalCoveragePostNormalizerTest.java @@ -1,6 +1,6 @@ package eu.clarin.cmdi.vlo.importer; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; import eu.clarin.cmdi.vlo.importer.normalizer.TemporalCoveragePostNormalizer; diff --git a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/ValueMappingFactoryTest.java b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/ValueMappingFactoryTest.java index f278c942d..bf66fab27 100644 --- a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/ValueMappingFactoryTest.java +++ b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/ValueMappingFactoryTest.java @@ -17,8 +17,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.junit.Assert.*; - +import static org.junit.jupiter.api.Assertions.*; public class ValueMappingFactoryTest { private FacetConceptMapping conceptMapping; diff --git a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/ValueMappingsTest.java b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/ValueMappingsTest.java index 857d6d0e4..3678deb13 100644 --- a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/ValueMappingsTest.java +++ b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/ValueMappingsTest.java @@ -20,7 +20,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.apache.solr.common.SolrInputDocument; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; import org.slf4j.LoggerFactory; diff --git a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/linkcheck/AvailabilityScoreAccumulatorTest.java b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/linkcheck/AvailabilityScoreAccumulatorTest.java index c91891f90..9c3020f92 100644 --- a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/linkcheck/AvailabilityScoreAccumulatorTest.java +++ b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/linkcheck/AvailabilityScoreAccumulatorTest.java @@ -21,8 +21,8 @@ import java.time.LocalDateTime; import java.util.HashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/linkcheck/LinkcheckerAvailabilityStatusCheckerTest.java b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/linkcheck/LinkcheckerAvailabilityStatusCheckerTest.java index 188cb8855..38f91e086 100644 --- a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/linkcheck/LinkcheckerAvailabilityStatusCheckerTest.java +++ b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/linkcheck/LinkcheckerAvailabilityStatusCheckerTest.java @@ -25,7 +25,7 @@ import java.time.LocalDateTime; import java.util.Map; import java.util.stream.Stream; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; import org.junit.jupiter.api.BeforeEach; @@ -33,7 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.domain.EntityScan; +import org.springframework.boot.persistence.autoconfigure.EntityScan; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.ComponentScan; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; diff --git a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/normalizer/FormatPostNormalizerTest.java b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/normalizer/FormatPostNormalizerTest.java index b7f8a2472..21a456e23 100644 --- a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/normalizer/FormatPostNormalizerTest.java +++ b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/normalizer/FormatPostNormalizerTest.java @@ -16,14 +16,10 @@ */ package eu.clarin.cmdi.vlo.importer.normalizer; -import eu.clarin.cmdi.vlo.importer.DocFieldContainer; import java.util.List; -import org.junit.After; -import org.junit.AfterClass; import org.junit.jupiter.api.BeforeEach; -import org.junit.BeforeClass; import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * diff --git a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/processor/AvailabilityPostFilterTest.java b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/processor/AvailabilityPostFilterTest.java index ad5b4cf2d..d5777f3e8 100644 --- a/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/processor/AvailabilityPostFilterTest.java +++ b/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/processor/AvailabilityPostFilterTest.java @@ -23,7 +23,7 @@ import org.apache.commons.lang3.tuple.Pair; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * diff --git a/vlo-monitor/pom.xml b/vlo-monitor/pom.xml index 38d828a4b..64af11a9c 100644 --- a/vlo-monitor/pom.xml +++ b/vlo-monitor/pom.xml @@ -17,6 +17,11 @@ + + org.junit.jupiter + junit-jupiter + test + org.springframework.boot spring-boot-starter-data-jpa diff --git a/vlo-solr/pom.xml b/vlo-solr/pom.xml index 72c0c9c56..b4539aa60 100644 --- a/vlo-solr/pom.xml +++ b/vlo-solr/pom.xml @@ -73,6 +73,12 @@ + + + junit + junit + test + org.apache.solr solr-solrj diff --git a/vlo-web-app/pom.xml b/vlo-web-app/pom.xml index ba7e50372..ff286b5f3 100644 --- a/vlo-web-app/pom.xml +++ b/vlo-web-app/pom.xml @@ -27,6 +27,17 @@ INFO + + + junit + junit + test + + + org.junit.jupiter + junit-jupiter + test + ${project.groupId} @@ -88,7 +99,7 @@ jakarta.servlet jakarta.servlet-api - 5.0.0 + ${jakarta.servlet.version} provided @@ -286,7 +297,12 @@ commons-text 1.15.0 - + + org.junit.vintage + junit-vintage-engine + test + + org.jmock @@ -372,7 +388,7 @@ 1.10.13 - tomcat10x + tomcat11x embedded diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/pojo/NameAndCountFieldValuesFilterTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/pojo/NameAndCountFieldValuesFilterTest.java index 55003c077..092e0e8e1 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/pojo/NameAndCountFieldValuesFilterTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/pojo/NameAndCountFieldValuesFilterTest.java @@ -18,9 +18,9 @@ import org.apache.solr.client.solrj.response.FacetField; import org.apache.solr.client.solrj.response.FacetField.Count; -import org.junit.Before; -import org.junit.Test; -import static org.junit.Assert.*; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; /** * @@ -31,7 +31,7 @@ public class NameAndCountFieldValuesFilterTest { private Count count; private NameAndCountFieldValuesFilter filter; - @Before + @BeforeEach public void setUp() { filter = new NameAndCountFieldValuesFilter(); count = new FacetField.Count(new FacetField("field"), "value", 0); @@ -49,19 +49,19 @@ public void testMatchesName() { assertTrue(filter.matches(count, null)); filter.setName("v"); - assertTrue("Partial left match", filter.matches(count, null)); + assertTrue(filter.matches(count, null), "Partial left match"); filter.setName("val"); - assertTrue("Partial left match", filter.matches(count, null)); + assertTrue(filter.matches(count, null), "Partial left match"); filter.setName("value"); - assertTrue("Complete match", filter.matches(count, null)); + assertTrue(filter.matches(count, null), "Complete match"); filter.setName("alue"); - assertTrue("Partial middle match", filter.matches(count, null)); + assertTrue(filter.matches(count, null), "Partial middle match"); filter.setName("values"); - assertFalse("Complete match", filter.matches(count, null)); + assertFalse(filter.matches(count, null), "Complete match"); } /** @@ -99,21 +99,21 @@ public void testMatchesCharacter() { assertTrue(filter.matches(count, null)); filter.setFirstCharacter('v'); - assertTrue("Lower case", filter.matches(count, null)); + assertTrue(filter.matches(count, null), "Lower case"); filter.setFirstCharacter('V'); - assertTrue("Upper case", filter.matches(count, null)); + assertTrue(filter.matches(count, null), "Upper case"); filter.setFirstCharacter('A'); - assertFalse("Mismatch (alphabetical)", filter.matches(count, null)); + assertFalse(filter.matches(count, null), "Mismatch (alphabetical)"); filter.setFirstCharacter('?'); - assertFalse("Mismatch (other char)", filter.matches(count, null)); + assertFalse(filter.matches(count, null), "Mismatch (other char)"); filter.setFirstCharacter(NameAndCountFieldValuesFilter.ANY_CHARACTER_SYMBOL); - assertTrue("Any character for non-empty string", filter.matches(count, null)); + assertTrue(filter.matches(count, null), "Any character for non-empty string"); count.setName(""); - assertFalse("Any character for empty string", filter.matches(count, null)); + assertFalse(filter.matches(count, null), "Any character for empty string"); } /** @@ -145,19 +145,19 @@ public void testIsEmpty() { assertTrue(filter.isEmpty()); filter.setName("value"); - assertFalse("Name filter", filter.isEmpty()); + assertFalse(filter.isEmpty(), "Name filter"); filter.setName(null); assertTrue(filter.isEmpty()); filter.setMinimalOccurence(10); - assertFalse("Count filter", filter.isEmpty()); + assertFalse(filter.isEmpty(), "Count filter"); filter.setMinimalOccurence(null); assertTrue(filter.isEmpty()); filter.setFirstCharacter('c'); - assertFalse("Character filter", filter.isEmpty()); + assertFalse(filter.isEmpty(), "Character filter"); filter.setFirstCharacter(null); assertTrue(filter.isEmpty()); diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/centreregistry/CentreRegistryProvidersServiceTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/centreregistry/CentreRegistryProvidersServiceTest.java index e31977200..f090bf1a5 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/centreregistry/CentreRegistryProvidersServiceTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/centreregistry/CentreRegistryProvidersServiceTest.java @@ -23,11 +23,11 @@ import java.net.URISyntaxException; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.Test; -import static org.junit.Assert.*; -import org.junit.BeforeClass; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.BeforeAll; /** * @@ -39,19 +39,19 @@ public class CentreRegistryProvidersServiceTest { private static File centreJsonFile; private static File endpointJsonFile; - @BeforeClass + @BeforeAll public static void setUpClass() throws IOException { centreJsonFile = getCentreJsonFile(); endpointJsonFile = getEndpointJsonFile(); } - @AfterClass + @AfterAll public static void tearDownClass() { centreJsonFile.delete(); endpointJsonFile.delete(); } - @Before + @BeforeEach public void setUp() throws IOException { instance = new CentreRegistryProvidersService(centreJsonFile.toURI().toString(), endpointJsonFile.toURI().toString()); } @@ -159,8 +159,8 @@ protected List parseEndpoints() throws IOException, URISyntaxE }; - assertNotNull("first attempt should pass", instance.retrieveCentreEndpoints()); - assertNotNull("second attempt should also pass", instance.retrieveCentreEndpoints()); + assertNotNull(instance.retrieveCentreEndpoints(), "first attempt should pass"); + assertNotNull(instance.retrieveCentreEndpoints(), "second attempt should also pass"); } @Test diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/DOIResolverTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/DOIResolverTest.java index ec4ea42a9..6a23816cb 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/DOIResolverTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/DOIResolverTest.java @@ -17,10 +17,10 @@ package eu.clarin.cmdi.vlo.service.impl; import java.net.URI; -import org.junit.Test; -import static org.junit.Assert.*; -import org.junit.Before; -import org.junit.Ignore; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; /** * @@ -30,7 +30,7 @@ public class DOIResolverTest { private DOIResolver instance; - @Before + @BeforeEach public void setUp() { instance = new DOIResolver(); } @@ -39,19 +39,19 @@ public void setUp() { * Test of resolve method, of class DOIResolver. */ @Test - @Ignore("Depends on live DOI resolver") + @Disabled("Depends on live DOI resolver") public void testResolve() { final URI input = URI.create("https://doi.org/10.5076/e-codices-csg-0961"); final URI expected = URI.create("https://www.e-codices.ch/en/list/one/csg/0961"); final URI result = instance.resolve(input); - assertEquals("DOI should resolve to expected target", expected, result); + assertEquals(expected, result, "DOI should resolve to expected target"); } @Test public void testResolveNonDoi() { final URI input = URI.create("https://www.google.com"); final URI result = instance.resolve(input); - assertNull("Non-DOI should not resolve", result); + assertNull(result, "Non-DOI should not resolve"); } } diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/ExclusiveFieldFilterTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/ExclusiveFieldFilterTest.java index 3b98c370f..1945140b7 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/ExclusiveFieldFilterTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/ExclusiveFieldFilterTest.java @@ -17,8 +17,8 @@ package eu.clarin.cmdi.vlo.service.impl; import java.util.Arrays; -import org.junit.Test; -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; /** * diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/FacetConditionEvaluationServiceImplTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/FacetConditionEvaluationServiceImplTest.java index a968734da..596b1cd9a 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/FacetConditionEvaluationServiceImplTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/FacetConditionEvaluationServiceImplTest.java @@ -30,10 +30,10 @@ import jakarta.xml.bind.JAXBException; import javax.xml.transform.stream.StreamSource; import org.apache.solr.client.solrj.response.FacetField; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.Matchers.*; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * @@ -127,7 +127,7 @@ public void testcreateConditionsMap() throws Exception { final QueryFacetsSelection selection = new QueryFacetsSelection(); final boolean evaluation = multilingualFacetCondition.evaluate(selection, facetFields); - assertFalse("Empty selection should not match conditions", evaluation); + assertFalse(evaluation, "Empty selection should not match conditions"); } { @@ -137,7 +137,7 @@ public void testcreateConditionsMap() throws Exception { selection.addSingleFacetValue("language", FacetSelectionType.AND, ImmutableList.of("test")); final boolean evaluation = multilingualFacetCondition.evaluate(selection, facetFields); - assertTrue("Any value for language facet should match conditions", evaluation); + assertTrue(evaluation, "Any value for language facet should match conditions"); } { @@ -145,16 +145,16 @@ public void testcreateConditionsMap() throws Exception { final List facetFields = Collections.emptyList(); final QueryFacetsSelection selection = new QueryFacetsSelection(); selection.addSingleFacetValue("testA", FacetSelectionType.AND, ImmutableList.of("test1")); - assertFalse("Accepted value for testA: only partial match", multilingualFacetCondition.evaluate(selection, facetFields)); + assertFalse(multilingualFacetCondition.evaluate(selection, facetFields), "Accepted value for testA: only partial match"); selection.addSingleFacetValue("testB", FacetSelectionType.AND, ImmutableList.of("test1")); - assertFalse("One out of two required values for testB: only partial match", multilingualFacetCondition.evaluate(selection, facetFields)); + assertFalse(multilingualFacetCondition.evaluate(selection, facetFields), "One out of two required values for testB: only partial match"); selection.addNewFacetValue("testB", FacetSelectionType.AND, ImmutableList.of("test2")); - assertTrue("Two out of two required values for testB: should match conditions", multilingualFacetCondition.evaluate(selection, facetFields)); + assertTrue(multilingualFacetCondition.evaluate(selection, facetFields), "Two out of two required values for testB: should match conditions"); selection.removeFacetSelection("testA"); - assertFalse("Missing accepted value for testA: only partial match", multilingualFacetCondition.evaluate(selection, facetFields)); + assertFalse(multilingualFacetCondition.evaluate(selection, facetFields), "Missing accepted value for testA: only partial match"); } } diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/HandleClientUriResolverImplTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/HandleClientUriResolverImplTest.java index 7841d12e7..80754a7c2 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/HandleClientUriResolverImplTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/HandleClientUriResolverImplTest.java @@ -19,14 +19,13 @@ import eu.clarin.cmdi.vlo.service.handle.HandleClient; import java.util.Optional; import org.jmock.Expectations; -import static org.jmock.Expectations.returnValue; import org.jmock.Mockery; import org.jmock.integration.junit4.JUnit4Mockery; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import org.junit.Before; -import org.junit.Test; +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 org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @@ -38,7 +37,7 @@ public class HandleClientUriResolverImplTest { private HandleClientUriResolverImpl instance; private HandleClient handleClient; - @Before + @BeforeEach public void setUp() { handleClient = context.mock(HandleClient.class); instance = new HandleClientUriResolverImpl(handleClient); diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/HandleResolverWrapperTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/HandleResolverWrapperTest.java index 3df815f8d..6b6e117c3 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/HandleResolverWrapperTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/HandleResolverWrapperTest.java @@ -22,17 +22,15 @@ import nl.mpi.archiving.corpusstructure.core.handle.HandleResolver; import nl.mpi.archiving.corpusstructure.core.handle.InvalidHandleException; import org.hamcrest.Description; -import static org.jmock.AbstractExpectations.doAll; -import static org.jmock.AbstractExpectations.returnValue; import org.jmock.Expectations; import org.jmock.Mockery; import org.jmock.api.Action; import org.jmock.api.Invocation; import org.jmock.integration.junit4.JUnit4Mockery; import org.jmock.lib.concurrent.Synchroniser; -import org.junit.Before; -import org.junit.Test; -import static org.junit.Assert.*; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; /** * @@ -50,7 +48,7 @@ public class HandleResolverWrapperTest { HandleResolver resolver; - @Before + @BeforeEach public void setUp() { resolver = context.mock(HandleResolver.class); } diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/PermalinkServiceImplTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/PermalinkServiceImplTest.java index 29be0ba6e..09081b14c 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/PermalinkServiceImplTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/PermalinkServiceImplTest.java @@ -16,12 +16,12 @@ */ package eu.clarin.cmdi.vlo.service.impl; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import static org.junit.Assert.*; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; /** * @@ -32,19 +32,19 @@ public class PermalinkServiceImplTest { public PermalinkServiceImplTest() { } - @BeforeClass + @BeforeAll public static void setUpClass() { } - @AfterClass + @AfterAll public static void tearDownClass() { } - @Before + @BeforeEach public void setUp() { } - @After + @AfterEach public void tearDown() { } diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/QueryFacetsSelectionParametersConverterTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/QueryFacetsSelectionParametersConverterTest.java index 069afc479..970c2237b 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/QueryFacetsSelectionParametersConverterTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/QueryFacetsSelectionParametersConverterTest.java @@ -45,9 +45,9 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasItem; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -56,17 +56,17 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.context.support.AnnotationConfigContextLoader; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * * @author twagoo */ -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(loader = AnnotationConfigContextLoader.class) @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) // gives us a fresh context for each test public class QueryFacetsSelectionParametersConverterTest { @@ -76,7 +76,7 @@ public class QueryFacetsSelectionParametersConverterTest { @Inject FieldNameService fieldNameService; - @Before + @BeforeEach public void setUp() { instance = new QueryFacetsSelectionParametersConverter(ImmutableSet.of("facet1", "facet2", "facet3", "facet4")); } diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/ResourceStringConverterImplTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/ResourceStringConverterImplTest.java index fcf929bbc..97c03b391 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/ResourceStringConverterImplTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/ResourceStringConverterImplTest.java @@ -16,12 +16,11 @@ */ package eu.clarin.cmdi.vlo.service.impl; -import eu.clarin.cmdi.vlo.FacetConstants; import eu.clarin.cmdi.vlo.pojo.ResourceInfo; import eu.clarin.cmdi.vlo.pojo.ResourceType; -import org.junit.Before; -import org.junit.Test; -import static org.junit.Assert.*; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; /** * @@ -31,7 +30,7 @@ public class ResourceStringConverterImplTest { private ResourceStringConverterImpl instance; - @Before + @BeforeEach public void setUp() { instance = new ResourceStringConverterImpl(); } diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/ResourceTypeCountingServiceImplTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/ResourceTypeCountingServiceImplTest.java index 3b1bc71e8..7741dd8ec 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/ResourceTypeCountingServiceImplTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/ResourceTypeCountingServiceImplTest.java @@ -22,7 +22,7 @@ import eu.clarin.cmdi.vlo.service.ResourceStringConverter; import java.util.Arrays; import java.util.Collection; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; import org.jmock.Expectations; diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/UriResolverImplTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/UriResolverImplTest.java index bfb9ff2ef..a96d96538 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/UriResolverImplTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/UriResolverImplTest.java @@ -22,15 +22,14 @@ import java.util.stream.Stream; import nl.mpi.archiving.corpusstructure.core.handle.InvalidHandleException; import org.jmock.Expectations; -import static org.jmock.Expectations.returnValue; import org.jmock.Mockery; import org.jmock.integration.junit4.JUnit4Mockery; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import org.junit.Before; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @@ -43,7 +42,7 @@ public class UriResolverImplTest { private PIDResolver handleClient; private PIDResolver doiClient; - @Before + @BeforeEach public void setUp() { handleClient = context.mock(PIDResolver.class, "handleResolver"); doiClient = context.mock(PIDResolver.class, "doiResolver"); @@ -52,9 +51,9 @@ public void setUp() { public void testCanResolve() { Stream.of("hdl:1234/5678", "http://hdl.handle.net/1234/5678", "doi:1234/5678", "https://doi.org/1234/5678") - .forEach(p -> assertTrue("can resolve " + p, instance.canResolve(p))); + .forEach(p -> assertTrue(instance.canResolve(p), "can resolve " + p)); Stream.of("http://www.clarin.eu", "/relative", "zzzz") - .forEach(p -> assertFalse("cannot resolve " + p, instance.canResolve(p))); + .forEach(p -> assertFalse(instance.canResolve(p), "cannot resolve " + p)); } /** diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/XmlTransformationServiceImplTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/XmlTransformationServiceImplTest.java index 045ff2bd7..b1e0d8edc 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/XmlTransformationServiceImplTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/XmlTransformationServiceImplTest.java @@ -16,19 +16,16 @@ */ package eu.clarin.cmdi.vlo.service.impl; -import java.net.URL; import java.util.Properties; import javax.xml.transform.OutputKeys; import javax.xml.transform.Source; import javax.xml.transform.Templates; import javax.xml.transform.Transformer; import javax.xml.transform.stream.StreamSource; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import static org.junit.Assert.*; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; /** * @@ -41,7 +38,7 @@ public class XmlTransformationServiceImplTest { public XmlTransformationServiceImplTest() { } - @Before + @BeforeEach public void setUp() { final Source xsltSource = new StreamSource(getClass().getResourceAsStream("/cmdi2xhtml.xsl")); final Properties transformationProperties = new Properties(); @@ -51,7 +48,7 @@ public void setUp() { this.instance = new XmlTransformationServiceImpl(xsltSource, transformationProperties); } - @After + @AfterEach public void tearDown() { instance = null; } diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/solr/impl/SearchResultsDaoImplTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/solr/impl/SearchResultsDaoImplTest.java index 25e45a8de..28b952a6c 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/solr/impl/SearchResultsDaoImplTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/solr/impl/SearchResultsDaoImplTest.java @@ -57,6 +57,8 @@ public class SearchResultsDaoImplTest extends SolrTestCaseJ4 { @BeforeClass public static void setUpClass() throws Exception { + useFactory("solr.NRTCachingDirectoryFactory"); + SolrTestCaseJ4.initCore( //config getResourcePath("/solr/vlo-index/solrconfig.xml"), diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrDocumentQueryFactoryImplTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrDocumentQueryFactoryImplTest.java index d19ddac0a..3d596e20b 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrDocumentQueryFactoryImplTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrDocumentQueryFactoryImplTest.java @@ -39,9 +39,9 @@ import org.hamcrest.Matchers; import org.jmock.Mockery; import org.jmock.integration.junit4.JUnit4Mockery; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -49,17 +49,17 @@ import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.context.support.AnnotationConfigContextLoader; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * * @author twagoo */ -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(loader = AnnotationConfigContextLoader.class) @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD) // gives us a fresh context for each test public class SolrDocumentQueryFactoryImplTest { @@ -70,7 +70,7 @@ public class SolrDocumentQueryFactoryImplTest { @Inject FieldNameService fieldNameService; - @Before + @BeforeEach public void setUp() { instance = new SolrDocumentQueryFactoryImpl(docFields, fieldNameService); } diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrDocumentServiceImplTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrDocumentServiceImplTest.java index e53a8cd3d..91d78c1c2 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrDocumentServiceImplTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrDocumentServiceImplTest.java @@ -31,11 +31,10 @@ import org.jmock.Mockery; import org.jmock.integration.junit4.JUnit4Mockery; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; - -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * @@ -49,7 +48,7 @@ public class SolrDocumentServiceImplTest { private SearchResultsDao dao; private SolrDocumentQueryFactory queryFactory; - @Before + @BeforeEach public void setUp() { dao = context.mock(SearchResultsDao.class); queryFactory = context.mock(SolrDocumentQueryFactory.class); diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrFacetFieldsServiceTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrFacetFieldsServiceTest.java index 9fe595af4..1b7b56d7d 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrFacetFieldsServiceTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrFacetFieldsServiceTest.java @@ -24,12 +24,11 @@ import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.client.solrj.response.FacetField; import org.jmock.Expectations; -import static org.jmock.Expectations.returnValue; import org.jmock.Mockery; import org.jmock.integration.junit4.JUnit4Mockery; -import static org.junit.Assert.*; -import org.junit.Before; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @@ -43,7 +42,7 @@ public class SolrFacetFieldsServiceTest { private SearchResultsDao dao; private SolrFacetFieldsService instance; - @Before + @BeforeEach public void setUp() { dao = context.mock(SearchResultsDao.class); queryFactory = context.mock(SolrFacetQueryFactory.class); diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrFacetQueryFactoryImplTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrFacetQueryFactoryImplTest.java index e21c8816d..6e8568481 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrFacetQueryFactoryImplTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrFacetQueryFactoryImplTest.java @@ -26,10 +26,10 @@ import java.util.Map; import org.apache.solr.client.solrj.SolrQuery; import org.hamcrest.Matchers; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * @@ -44,7 +44,7 @@ public class SolrFacetQueryFactoryImplTest { */ private static SolrFacetQueryFactoryImpl instance; - @BeforeClass + @BeforeAll public static void setUpClass() { instance = new SolrFacetQueryFactoryImpl(); } diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/AbstractWicketTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/AbstractWicketTest.java index 7f12078ab..06c988f4f 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/AbstractWicketTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/AbstractWicketTest.java @@ -26,15 +26,15 @@ import org.apache.wicket.util.tester.WicketTester; import org.jmock.Mockery; import org.jmock.integration.junit4.JUnit4Mockery; -import org.junit.Before; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.context.annotation.PropertySource; import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; /** * @@ -43,7 +43,7 @@ * * @author Twan Goosen */ -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD) // gives us a fresh context for each test public abstract class AbstractWicketTest { @@ -52,7 +52,7 @@ public abstract class AbstractWicketTest { private WicketTester tester; - @Before + @BeforeEach public void setUp() throws Exception { final Properties testProperties = new Properties(); try (InputStream is = getClass().getResourceAsStream("/vlo-test.properties")) { diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/CachingConverterTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/CachingConverterTest.java index 4cd1f2af1..5c2cea053 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/CachingConverterTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/CachingConverterTest.java @@ -19,11 +19,10 @@ import java.util.Locale; import org.apache.wicket.util.convert.IConverter; import org.jmock.Expectations; -import static org.jmock.Expectations.returnValue; import org.jmock.Mockery; import org.jmock.integration.junit4.JUnit4Mockery; -import org.junit.Test; -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; /** * @@ -39,7 +38,7 @@ public class CachingConverterTest { @Test public void testConvertToObject() { final IConverter inner = context.mock(IConverter.class, "Object"); - final CachingConverter instance = new CachingConverter<>(inner); + final CachingConverter instance = new CachingConverter<>(inner); final Object result = new Object(); context.checking(new Expectations() { { @@ -77,7 +76,7 @@ public void testConvertToObject() { @Test public void testConvertToString() { final IConverter inner = context.mock(IConverter.class, "Object"); - final CachingConverter instance = new CachingConverter<>(inner); + final CachingConverter instance = new CachingConverter<>(inner); final Object value = new Object(); final String result = "result"; context.checking(new Expectations() { diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/RecordStructuredMeatadataHeaderBehaviorTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/RecordStructuredMeatadataHeaderBehaviorTest.java index 304f8ce6f..bd4acf7ed 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/RecordStructuredMeatadataHeaderBehaviorTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/RecordStructuredMeatadataHeaderBehaviorTest.java @@ -38,9 +38,9 @@ import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.parser.ParseException; -import static org.junit.Assert.*; -import org.junit.Before; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Configuration; @@ -81,7 +81,7 @@ public class RecordStructuredMeatadataHeaderBehaviorTest extends JsonLdHeaderBeh @Inject private VloConfig vloConfig; - @Before + @BeforeEach @Override public void setUp() throws Exception { super.setUp(); @@ -218,9 +218,9 @@ public void testArrayLimit() throws Exception { final JSONObject json = startPage(page); - assertEquals("limit exceeded - should be capped", limit, ((JSONArray) json.get("creator")).size()); - assertEquals("limit exceeded - should be capped", limit, ((JSONArray) json.get("spatial")).size()); - assertEquals("below limit - should NOT be capped", belowLimit, ((JSONArray) json.get("distribution")).size()); + assertEquals(limit, ((JSONArray) json.get("creator")).size(), "limit exceeded - should be capped"); + assertEquals(limit, ((JSONArray) json.get("spatial")).size(), "limit exceeded - should be capped"); + assertEquals(belowLimit, ((JSONArray) json.get("distribution")).size(), "below limit - should NOT be capped"); } @Test diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/SitelinkSearchboxHeaderBehaviorTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/SitelinkSearchboxHeaderBehaviorTest.java index 75e6aedf4..fa7d4e19f 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/SitelinkSearchboxHeaderBehaviorTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/SitelinkSearchboxHeaderBehaviorTest.java @@ -26,10 +26,10 @@ import org.apache.wicket.util.tester.WicketTester; import org.jmock.Mockery; import org.json.simple.JSONObject; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import org.junit.Before; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.test.context.ContextConfiguration; @@ -44,7 +44,7 @@ public class SitelinkSearchboxHeaderBehaviorTest extends JsonLdHeaderBehaviorTes private WicketTester tester; private SitelinkSearchboxHeaderBehavior instance; - @Before + @BeforeEach @Override public void setUp() throws Exception { super.setUp(); diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/components/SmartLinkFieldValueLabelTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/components/SmartLinkFieldValueLabelTest.java index 5a7d90e31..7fe75df80 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/components/SmartLinkFieldValueLabelTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/components/SmartLinkFieldValueLabelTest.java @@ -20,9 +20,9 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import org.junit.jupiter.api.Test; /** * @@ -49,10 +49,10 @@ public void testRegex() { map.forEach((text, target) -> { final Matcher matcher = pattern.matcher(text); if (target.isEmpty()) { - assertFalse("Expected no match in '" + text + "'", matcher.find()); + assertFalse(matcher.find(), "Expected no match in '" + text + "'"); } else { matcher.find(); - assertEquals("Expected match in '" + text + "'", target, matcher.group()); + assertEquals(target, matcher.group(), "Expected match in '" + text + "'"); } }); } diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/ActionableLinkModelTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/ActionableLinkModelTest.java index 9a31327ed..b2faed9cb 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/ActionableLinkModelTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/ActionableLinkModelTest.java @@ -17,8 +17,8 @@ package eu.clarin.cmdi.vlo.wicket.model; import org.apache.wicket.model.Model; -import org.junit.Test; -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; /** * @@ -44,9 +44,9 @@ public void testURL() { @Test public void testPID() { ActionableLinkModel instance = new ActionableLinkModel(Model.of("hdl:123/456")); - assertEquals("Link for handle", "http://hdl.handle.net/123/456", instance.getObject()); + assertEquals("http://hdl.handle.net/123/456", instance.getObject(), "Link for handle"); instance = new ActionableLinkModel(Model.of("doi:123/456")); - assertEquals("Link for DOI", "https://doi.org/123/456", instance.getObject()); + assertEquals("https://doi.org/123/456", instance.getObject(), "Link for DOI"); } } diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/BridgeModelTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/BridgeModelTest.java index 947efc2dc..6e0578bcf 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/BridgeModelTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/BridgeModelTest.java @@ -18,10 +18,8 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; /** * @@ -39,7 +37,7 @@ public void testGetObject() { IModel state = Model.of(false); String falseValue = "false"; - BridgeModel instance = new BridgeModel(inner, outer, state, falseValue); + var instance = new BridgeModel<>(inner, outer, state, falseValue); assertFalse(instance.getObject()); instance.setObject(true); @@ -56,7 +54,7 @@ public void testSetObject() { IModel state = Model.of(false); String falseValue = "bridge closed"; - BridgeModel instance = new BridgeModel(inner, outer, state, falseValue); + var instance = new BridgeModel<>(inner, outer, state, falseValue); // initial values assertEquals("inner value", inner.getObject()); diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/BridgeOuterModelTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/BridgeOuterModelTest.java index 240e79c61..40bff0cce 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/BridgeOuterModelTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/BridgeOuterModelTest.java @@ -18,10 +18,8 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; /** * @@ -37,7 +35,7 @@ public void testGetObject() { IModel inner = Model.of("inner value"); IModel state = Model.of(false); - BridgeOuterModel instance = new BridgeOuterModel(inner, state, "initial outer"); + var instance = new BridgeOuterModel<>(inner, state, "initial outer"); assertEquals("initial outer", instance.getObject()); @@ -58,7 +56,7 @@ public void testSetObject() { IModel inner = Model.of("inner value"); IModel state = Model.of(false); - BridgeOuterModel instance = new BridgeOuterModel(inner, state, "initial outer"); + var instance = new BridgeOuterModel<>(inner, state, "initial outer"); // set while bridge closed instance.setObject("new outer"); diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/FacetFieldModelTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/FacetFieldModelTest.java index 857b334b3..aedccb3a6 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/FacetFieldModelTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/FacetFieldModelTest.java @@ -21,18 +21,16 @@ import eu.clarin.cmdi.vlo.service.solr.FacetFieldsService; import java.util.Arrays; import java.util.Collections; -import java.util.List; import org.apache.solr.client.solrj.response.FacetField; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.util.ListModel; import org.jmock.Expectations; -import static org.jmock.Expectations.returnValue; import org.jmock.Mockery; import org.jmock.integration.junit4.JUnit4Mockery; -import static org.junit.Assert.*; -import org.junit.Before; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @@ -46,7 +44,7 @@ public class FacetFieldModelTest { private QueryFacetsSelection selection; private FacetFieldsService service; - @Before + @BeforeEach public void setUp() { service = context.mock(FacetFieldsService.class); selection = new QueryFacetsSelection(); diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/FacetFieldsModelTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/FacetFieldsModelTest.java index e4b4cbb7b..e3217b38f 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/FacetFieldsModelTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/FacetFieldsModelTest.java @@ -29,10 +29,10 @@ import org.jmock.Expectations; import org.jmock.Mockery; import org.jmock.integration.junit4.JUnit4Mockery; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/HandleLinkModelTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/HandleLinkModelTest.java index e945b8a85..ad753dbea 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/HandleLinkModelTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/HandleLinkModelTest.java @@ -18,13 +18,12 @@ import org.apache.wicket.model.IModel; import org.jmock.Expectations; -import static org.jmock.Expectations.returnValue; import org.jmock.Mockery; import org.jmock.integration.junit4.JUnit4Mockery; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import static org.junit.Assert.*; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; /** * @@ -37,11 +36,11 @@ public class HandleLinkModelTest { public HandleLinkModelTest() { } - @Before + @BeforeEach public void setUp() { } - @After + @AfterEach public void tearDown() { } @@ -103,7 +102,7 @@ public void testGetObjectWithHandle() { final String result = instance.getObject(); // handle proxy should be prepended - assertEquals("Expecting unchanged URL", "http://hdl.handle.net/1234/5678-90", result); + assertEquals("http://hdl.handle.net/1234/5678-90", result, "Expecting unchanged URL"); } { // model holds a handle resolver URL @@ -116,7 +115,7 @@ public void testGetObjectWithHandle() { final String result = instance.getObject(); // handle proxy should be prepended - assertEquals("Expecting unchanged URL", "https://hdl.handle.net/1234/5678-90", result); + assertEquals("https://hdl.handle.net/1234/5678-90", result, "Expecting unchanged URL"); } } @@ -148,7 +147,7 @@ public void testGetObjectWithUrnNbn() { final String result = instance.getObject(); // handle proxy should be prepended - assertEquals("Expecting unchanged URL", "http://urn.fi/urn:nbn:fi:lb-2017021504", result); + assertEquals("http://urn.fi/urn:nbn:fi:lb-2017021504", result, "Expecting unchanged URL"); } } @@ -168,7 +167,7 @@ public void testGetObjectWithDoi() { final String result = instance.getObject(); // handle proxy should be prepended - assertEquals("Expecting resolver URL", "https://doi.org/123/456", result); + assertEquals("https://doi.org/123/456", result, "Expecting resolver URL"); } { // model holds a doi @@ -181,7 +180,7 @@ public void testGetObjectWithDoi() { final String result = instance.getObject(); // original value should be returned - assertEquals("Expecting unchanged URL", "https://doi.org/123/456", result); + assertEquals("https://doi.org/123/456", result, "Expecting unchanged URL"); } { // model holds a doi @@ -194,7 +193,7 @@ public void testGetObjectWithDoi() { final String result = instance.getObject(); // original value should be returned - assertEquals("Expecting unchanged URL", "http://dx.doi.org/123/456", result); + assertEquals("http://dx.doi.org/123/456", result, "Expecting unchanged URL"); } } diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/ResolvingLinkModelTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/ResolvingLinkModelTest.java index 0016861d2..4e50d98e8 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/ResolvingLinkModelTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/ResolvingLinkModelTest.java @@ -21,8 +21,8 @@ import org.jmock.Expectations; import org.jmock.Mockery; import org.jmock.integration.junit4.JUnit4Mockery; -import org.junit.Test; -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; /** * @@ -87,12 +87,12 @@ public void testGetObjectNotResolvableInvalidURI() { private static void testResolves(String target, String object, String subject) { ResolvingLinkModel model = new ResolvingLinkModel(Model.of(object), Model.of(subject)); - assertEquals(String.format("Expected [%1s] to resolve to [%2s] against [%3s]", subject, target, object), target, model.getObject()); + assertEquals(target, model.getObject(), String.format("Expected [%1s] to resolve to [%2s] against [%3s]", subject, target, object)); } private static void testResolvesNull(String object, String subject) { ResolvingLinkModel model = new ResolvingLinkModel(Model.of(object), Model.of(subject)); - assertNull(String.format("Expected [%1s] to NOT resolve against [%3s]", subject, object), model.getObject()); + assertNull(model.getObject(), String.format("Expected [%1s] to NOT resolve against [%3s]", subject, object)); } /** diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/SearchContextModelTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/SearchContextModelTest.java index 48330af46..e92e638d2 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/SearchContextModelTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/SearchContextModelTest.java @@ -23,9 +23,9 @@ import org.jmock.Expectations; import org.jmock.Mockery; import org.jmock.integration.junit4.JUnit4Mockery; -import org.junit.Before; -import org.junit.Test; -import static org.junit.Assert.*; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; /** * @@ -40,7 +40,7 @@ public class SearchContextModelTest { private final static Long index = 123L; private final static Long resultCount = 400L; - @Before + @BeforeEach public void setUp() { selection = new QueryFacetsSelection(); instance = new SearchContextModel(index, resultCount, Model.of(selection)); diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/SolrDocumentModelTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/SolrDocumentModelTest.java index 84625513c..9379aa2ad 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/SolrDocumentModelTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/SolrDocumentModelTest.java @@ -32,9 +32,9 @@ import org.jmock.Mockery; import org.jmock.integration.junit4.JUnit4Mockery; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -42,10 +42,10 @@ import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.context.support.AnnotationConfigContextLoader; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import jakarta.inject.Inject; @@ -53,7 +53,7 @@ * * @author twagoo */ -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(loader = AnnotationConfigContextLoader.class) @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD) // gives us a fresh context for each test public class SolrDocumentModelTest { @@ -65,7 +65,7 @@ public class SolrDocumentModelTest { @Inject private FieldNameService fieldNameService; - @Before + @BeforeEach public void setUp() { expected = new SolrDocument(); expected.setField(fieldNameService.getFieldName(FieldKey.ID), "id"); diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/TruncatingStringModelTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/TruncatingStringModelTest.java index 38a3e141d..52adee62b 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/TruncatingStringModelTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/TruncatingStringModelTest.java @@ -18,9 +18,9 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; -import static org.junit.Assert.*; -import org.junit.Before; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @@ -33,7 +33,7 @@ public class TruncatingStringModelTest { private IModel innerModel; private TruncatingStringModel instance; - @Before + @BeforeEach public void setUp() { innerModel = Model.of(""); instance = new TruncatingStringModel(innerModel, maxLength, truncatePoint); diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/UrlFromStringModelTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/UrlFromStringModelTest.java index 57f1cac35..ee3e07cd6 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/UrlFromStringModelTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/UrlFromStringModelTest.java @@ -23,8 +23,8 @@ import org.jmock.Expectations; import org.jmock.Mockery; import org.jmock.integration.junit4.JUnit4Mockery; -import org.junit.Test; -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; /** * diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/XsltModelTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/XsltModelTest.java index e952e7638..d7ede3fc7 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/XsltModelTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/XsltModelTest.java @@ -16,23 +16,20 @@ */ package eu.clarin.cmdi.vlo.wicket.model; -import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import eu.clarin.cmdi.vlo.service.XmlTransformationService; import java.net.URL; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; import javax.xml.transform.TransformerException; import org.apache.wicket.model.IModel; import org.apache.wicket.model.util.ListModel; import org.jmock.Expectations; -import static org.jmock.Expectations.returnValue; import org.jmock.Mockery; import org.jmock.integration.junit4.JUnit4Mockery; -import org.junit.Before; -import org.junit.Test; -import static org.junit.Assert.*; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; /** * @@ -45,7 +42,7 @@ public class XsltModelTest { private XsltModel instance; private XmlTransformationService service; - @Before + @BeforeEach public void setUp() { service = context.mock(XmlTransformationService.class); urlModel = new ListModel<>(); diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/pages/TestFacetedSearchPage.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/pages/TestFacetedSearchPage.java index 839070bba..9dfe861c5 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/pages/TestFacetedSearchPage.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/pages/TestFacetedSearchPage.java @@ -14,7 +14,7 @@ import org.apache.solr.client.solrj.response.FacetField; import org.jmock.Expectations; import org.jmock.Mockery; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.test.context.ContextConfiguration; diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/pages/TestRecordPage.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/pages/TestRecordPage.java index 7bbe0f233..e07c8e658 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/pages/TestRecordPage.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/pages/TestRecordPage.java @@ -13,8 +13,8 @@ import org.apache.wicket.request.mapper.parameter.PageParameters; import org.jmock.Expectations; import org.jmock.Mockery; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.test.context.ContextConfiguration; @@ -35,7 +35,7 @@ public class TestRecordPage extends AbstractWicketTest { private SolrDocument document; private PageParameters params; - @Before + @BeforeEach @Override public void setUp() throws Exception { super.setUp(); diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/panels/ContentSearchFormPanelTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/panels/ContentSearchFormPanelTest.java index c172e5ade..e9c15a8e9 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/panels/ContentSearchFormPanelTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/panels/ContentSearchFormPanelTest.java @@ -22,11 +22,10 @@ import eu.clarin.cmdi.vlo.config.VloSolrSpringConfig; import eu.clarin.cmdi.vlo.wicket.AbstractWicketTest; import jakarta.inject.Inject; -import java.io.IOException; -import java.util.regex.Pattern; import org.apache.solr.common.SolrDocument; import org.apache.wicket.model.Model; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.test.context.ContextConfiguration; @@ -40,6 +39,7 @@ public class ContentSearchFormPanelTest extends AbstractWicketTest { @Inject private VloConfig vloConfig; + @BeforeEach @Override public void setUp() throws Exception { vloConfig.setFederatedContentSearchUrl("http://fcs.org/aggregator"); diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/panels/search/LandingPageShortLinkLabelConverterTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/panels/search/LandingPageShortLinkLabelConverterTest.java index 8eb8ae99b..a7627e5d9 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/panels/search/LandingPageShortLinkLabelConverterTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/panels/search/LandingPageShortLinkLabelConverterTest.java @@ -17,9 +17,9 @@ package eu.clarin.cmdi.vlo.wicket.panels.search; import eu.clarin.cmdi.vlo.wicket.LandingPageShortLinkLabelConverter; -import org.junit.Before; -import org.junit.Test; -import static org.junit.Assert.*; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; /** * @@ -29,7 +29,7 @@ public class LandingPageShortLinkLabelConverterTest { private LandingPageShortLinkLabelConverter instance; - @Before + @BeforeEach public void setUp() { instance = new LandingPageShortLinkLabelConverter(); } diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/provider/DocumentFieldsProviderTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/provider/DocumentFieldsProviderTest.java index 92d1638d7..cc89045c5 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/provider/DocumentFieldsProviderTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/provider/DocumentFieldsProviderTest.java @@ -17,19 +17,16 @@ package eu.clarin.cmdi.vlo.wicket.provider; import com.google.common.collect.ImmutableList; -import eu.clarin.cmdi.vlo.pojo.DocumentField; import eu.clarin.cmdi.vlo.service.FieldFilter; -import java.util.Iterator; import java.util.List; import org.apache.solr.common.SolrDocument; import org.apache.wicket.model.Model; import org.jmock.Expectations; -import static org.jmock.Expectations.returnValue; import org.jmock.Mockery; import org.jmock.integration.junit4.JUnit4Mockery; -import org.junit.Before; -import org.junit.Test; -import static org.junit.Assert.*; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; /** * @@ -42,7 +39,7 @@ public class DocumentFieldsProviderTest { private SolrDocument document; private FieldFilter filter; - @Before + @BeforeEach public void setUp() { filter = context.mock(FieldFilter.class); @@ -97,16 +94,16 @@ public boolean allowField(String fieldName) { final long first = 0L; final long count = 100L; - final Iterator result = instance.iterator(first, count); - assertTrue(result.hasNext()); - assertEquals("field4", result.next().getFieldName()); - assertTrue(result.hasNext()); - assertEquals("field2", result.next().getFieldName()); - assertTrue(result.hasNext()); - assertEquals("field1", result.next().getFieldName()); - assertTrue(result.hasNext()); - assertEquals("field3", result.next().getFieldName()); - assertFalse(result.hasNext()); + final var resultIterator = instance.iterator(first, count); + assertTrue(resultIterator.hasNext()); + assertEquals("field4", resultIterator.next().getFieldName()); + assertTrue(resultIterator.hasNext()); + assertEquals("field2", resultIterator.next().getFieldName()); + assertTrue(resultIterator.hasNext()); + assertEquals("field1", resultIterator.next().getFieldName()); + assertTrue(resultIterator.hasNext()); + assertEquals("field3", resultIterator.next().getFieldName()); + assertFalse(resultIterator.hasNext()); } /** @@ -133,13 +130,13 @@ public void testIterator() { final long first = 0L; final long count = 100L; - final Iterator result = instance.iterator(first, count); - assertTrue(result.hasNext()); - assertEquals("field1", result.next().getFieldName()); - assertTrue(result.hasNext()); + final var resultIterator = instance.iterator(first, count); + assertTrue(resultIterator.hasNext()); + assertEquals("field1", resultIterator.next().getFieldName()); + assertTrue(resultIterator.hasNext()); // field 2 filtered out - assertEquals("field3", result.next().getFieldName()); - assertFalse(result.hasNext()); + assertEquals("field3", resultIterator.next().getFieldName()); + assertFalse(resultIterator.hasNext()); // field 4 filtered out } @@ -168,9 +165,9 @@ public void testIteratorOffset() { final long first = 1L; final long count = 1L; - final Iterator result = instance.iterator(first, count); - assertTrue(result.hasNext()); + final var resultIterator = instance.iterator(first, count); + assertTrue(resultIterator.hasNext()); // field 3 is the first field because of the offset of 1 - assertEquals("field3", result.next().getFieldName()); + assertEquals("field3", resultIterator.next().getFieldName()); } } diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/provider/FacetFieldValuesProviderTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/provider/FacetFieldValuesProviderTest.java index 0aca3cc01..6cbf20447 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/provider/FacetFieldValuesProviderTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/provider/FacetFieldValuesProviderTest.java @@ -32,10 +32,10 @@ import org.jmock.Expectations; import org.jmock.Mockery; import org.jmock.integration.junit4.JUnit4Mockery; -import org.junit.Assert; -import static org.junit.Assert.*; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @@ -49,7 +49,7 @@ public class FacetFieldValuesProviderTest { private FacetField facetField; private FieldValueConverterProvider valueConverterProvider; - @Before + @BeforeEach public void setUp() { facetField = new FacetField("field"); facetField.add("first value", 101); @@ -71,7 +71,7 @@ protected Class getTargetType() { @Override public String convertToObject(String value, Locale locale) throws ConversionException { - Assert.fail("convertToObject should not get called on the Field Value converter"); + Assertions.fail("convertToObject should not get called on the Field Value converter"); return null; } })); diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/provider/PartitionedDataProviderTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/provider/PartitionedDataProviderTest.java index 11d2d2e8a..80a54db41 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/provider/PartitionedDataProviderTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/provider/PartitionedDataProviderTest.java @@ -23,12 +23,11 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.ISortableDataProvider; import static org.hamcrest.Matchers.hasItems; import org.jmock.Expectations; -import static org.jmock.Expectations.returnValue; import org.jmock.Mockery; import org.jmock.integration.junit4.JUnit4Mockery; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.*; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.Test; /** * @@ -74,7 +73,7 @@ public void testSizePartitions() { } }); - assertEquals("ceil(9/2) = 5", 5, instance.size()); + assertEquals(5, instance.size(), "ceil(9/2) = 5"); } /** diff --git a/vlo-web-app/src/test/java/nl/mpi/archiving/corpusstructure/core/handle/HandleRestApiResolverTest.java b/vlo-web-app/src/test/java/nl/mpi/archiving/corpusstructure/core/handle/HandleRestApiResolverTest.java index 498046717..4ab254cf5 100644 --- a/vlo-web-app/src/test/java/nl/mpi/archiving/corpusstructure/core/handle/HandleRestApiResolverTest.java +++ b/vlo-web-app/src/test/java/nl/mpi/archiving/corpusstructure/core/handle/HandleRestApiResolverTest.java @@ -17,9 +17,9 @@ package nl.mpi.archiving.corpusstructure.core.handle; import java.net.URI; -import org.junit.Test; -import static org.junit.Assert.*; -import org.junit.Ignore; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.Disabled; /** * @@ -28,7 +28,7 @@ public class HandleRestApiResolverTest { @Test - @Ignore("Too brittle, relies on live handle. Can also be slow.") + @Disabled("Too brittle, relies on live handle. Can also be slow.") public void testResolve() throws Exception { final String uri = "hdl:11022/0000-0007-C9C6-7";