This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch SIS-457 in repository https://gitbox.apache.org/repos/asf/sis.git
commit ca0e3b710db06f6078ac0c1514ec3f5f9e2210e5 Author: Michiel Rop <[email protected]> AuthorDate: Wed Jun 12 21:50:54 2019 +0200 SIS-457 Replace @BeforeClass and @AfterClass Replace @BeforeClass by @BeforeAll and @AfterClass by @AfterAll. See https://junit.org/junit5/docs/current/user-guide/#migrating-from-junit4-tips --- .../test/java/org/apache/sis/test/suite/ConsoleTestSuite.java | 2 +- .../org/apache/sis/openoffice/ReferencingFunctionsTest.java | 4 ++-- .../test/java/org/apache/sis/openoffice/TransformerTest.java | 4 ++-- .../java/org/apache/sis/test/suite/OpenOfficeTestSuite.java | 2 +- .../test/java/org/apache/sis/image/DefaultIteratorTest.java | 2 +- .../src/test/java/org/apache/sis/image/ImageTestCase.java | 2 +- .../test/java/org/apache/sis/test/suite/FeatureTestSuite.java | 2 +- .../org/apache/sis/internal/jaxb/gco/MultiplicityTest.java | 3 ++- .../java/org/apache/sis/internal/jaxb/gml/TimePeriodTest.java | 6 ++++-- .../org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java | 7 +++++-- .../sis/metadata/iso/identification/DefaultResolutionTest.java | 4 +++- .../metadata/iso/maintenance/DefaultScopeDescriptionTest.java | 3 ++- .../sis/metadata/iso/spatial/DefaultGeorectifiedTest.java | 3 ++- .../test/java/org/apache/sis/test/suite/MetadataTestSuite.java | 3 ++- .../src/test/java/org/apache/sis/test/xml/TestCase.java | 3 ++- .../java/org/apache/sis/util/iso/DefaultNameFactoryTest.java | 6 ++++-- .../test/java/org/apache/sis/util/iso/DefaultRecordTest.java | 7 +++++-- .../test/java/org/apache/sis/util/iso/NameMarshallingTest.java | 4 +++- .../sis/test/suite/ReferencingByIdentifiersTestSuite.java | 2 +- .../jaxb/referencing/CC_GeneralOperationParameterTest.java | 4 +++- .../test/java/org/apache/sis/io/wkt/ComparisonWithEPSG.java | 6 ++++-- .../java/org/apache/sis/parameter/ParameterFormatTest.java | 7 +++++-- .../java/org/apache/sis/parameter/TensorParametersTest.java | 4 +++- .../org/apache/sis/referencing/AuthorityFactoriesTest.java | 4 +++- .../apache/sis/referencing/crs/DefaultProjectedCRSTest.java | 4 +++- .../sis/referencing/factory/MultiAuthoritiesFactoryTest.java | 4 +++- .../apache/sis/referencing/factory/sql/EPSGFactoryTest.java | 10 +++++++--- .../apache/sis/referencing/factory/sql/EPSGInstallerTest.java | 4 +++- .../referencing/operation/CoordinateOperationFinderTest.java | 7 +++++-- .../referencing/operation/CoordinateOperationRegistryTest.java | 7 +++++-- .../operation/DefaultCoordinateOperationFactoryTest.java | 7 +++++-- .../sis/referencing/operation/matrix/NonSquareMatrixTest.java | 3 ++- .../operation/transform/CoordinateSystemTransformTest.java | 6 ++++-- .../operation/transform/ProjectiveTransformTest.java | 3 ++- .../java/org/apache/sis/test/integration/MetadataTest.java | 3 ++- .../java/org/apache/sis/test/suite/ReferencingTestSuite.java | 3 ++- .../src/test/java/org/apache/sis/io/LeftMarginTest.java | 3 ++- .../src/test/java/org/apache/sis/io/LineAppenderTest.java | 3 ++- .../test/java/org/apache/sis/io/TabulationExpansionTest.java | 3 ++- .../src/test/java/org/apache/sis/io/WordWrapTest.java | 3 ++- .../java/org/apache/sis/io/WordWrapWithLineSeparatorTest.java | 3 ++- .../src/test/java/org/apache/sis/test/TestSuite.java | 6 ++++-- .../test/java/org/apache/sis/test/suite/UtilityTestSuite.java | 3 ++- .../apache/sis/util/resources/IndexedResourceBundleTest.java | 4 +++- .../java/org/apache/sis/test/suite/FrenchProfileTestSuite.java | 2 +- .../java/org/apache/sis/test/suite/JapanProfileTestSuite.java | 2 +- .../org/apache/sis/test/suite/EarthObservationTestSuite.java | 2 +- .../test/java/org/apache/sis/storage/gdal/IntegrationTest.java | 2 +- .../src/test/java/org/apache/sis/storage/gdal/PJTest.java | 2 +- .../java/org/apache/sis/storage/gdal/Proj4FactoryTest.java | 2 +- .../src/test/java/org/apache/sis/test/suite/GDALTestSuite.java | 2 +- .../test/java/org/apache/sis/test/suite/GeoTiffTestSuite.java | 2 +- .../src/test/java/org/apache/sis/internal/netcdf/TestCase.java | 2 +- .../test/java/org/apache/sis/test/suite/NetcdfTestSuite.java | 2 +- .../shapefile/jdbc/AbstractTestBaseForInternalJDBC.java | 2 +- .../java/org/apache/sis/test/suite/ShapefileTestSuite.java | 2 +- .../src/test/java/org/apache/sis/test/suite/SQLTestSuite.java | 2 +- .../test/java/org/apache/sis/test/suite/StorageTestSuite.java | 2 +- .../java/org/apache/sis/internal/storage/gpx/ReaderTest.java | 4 ++-- .../java/org/apache/sis/internal/storage/gpx/WriterTest.java | 4 ++-- .../src/test/java/org/apache/sis/test/suite/GPXTestSuite.java | 2 +- 61 files changed, 143 insertions(+), 78 deletions(-) diff --git a/application/sis-console/src/test/java/org/apache/sis/test/suite/ConsoleTestSuite.java b/application/sis-console/src/test/java/org/apache/sis/test/suite/ConsoleTestSuite.java index 5d37e98..e579e63 100644 --- a/application/sis-console/src/test/java/org/apache/sis/test/suite/ConsoleTestSuite.java +++ b/application/sis-console/src/test/java/org/apache/sis/test/suite/ConsoleTestSuite.java @@ -43,7 +43,7 @@ public final strictfp class ConsoleTestSuite extends TestSuite { * Verifies the list of tests before to run the suite. * See {@link TestSuite#verifyTestList(Class)} for more information. */ - @BeforeClass + @BeforeAll public static void verifyTestList() { assertNoMissingTest(ConsoleTestSuite.class); verifyTestList(ConsoleTestSuite.class); diff --git a/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/ReferencingFunctionsTest.java b/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/ReferencingFunctionsTest.java index 3d4c80e..d993cde 100644 --- a/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/ReferencingFunctionsTest.java +++ b/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/ReferencingFunctionsTest.java @@ -47,7 +47,7 @@ public final strictfp class ReferencingFunctionsTest extends TestCase { /** * Creates a {@link ReferencingFunctions} instance to use for all tests. */ - @BeforeClass + @BeforeAll public static void createReferencingInstance() { instance = new ReferencingFunctions(null); instance.setLocale(new com.sun.star.lang.Locale("en", "US", null)); @@ -56,7 +56,7 @@ public final strictfp class ReferencingFunctionsTest extends TestCase { /** * Disposes the {@link ReferencingFunctions} instance after all tests completed. */ - @AfterClass + @AfterAll public static void disposeReferencingInstance() { instance = null; } diff --git a/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/TransformerTest.java b/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/TransformerTest.java index fe6198a..22955ee 100644 --- a/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/TransformerTest.java +++ b/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/TransformerTest.java @@ -47,7 +47,7 @@ public final strictfp class TransformerTest extends TestCase { /** * Creates a {@link ReferencingFunctions} instance to use for all tests. */ - @BeforeClass + @BeforeAll public static void createReferencingInstance() { caller = new ReferencingFunctions(null); caller.setLocale(new com.sun.star.lang.Locale("en", "US", null)); @@ -56,7 +56,7 @@ public final strictfp class TransformerTest extends TestCase { /** * Disposes the {@link ReferencingFunctions} instance after all tests completed. */ - @AfterClass + @AfterAll public static void disposeReferencingInstance() { caller = null; } diff --git a/application/sis-openoffice/src/test/java/org/apache/sis/test/suite/OpenOfficeTestSuite.java b/application/sis-openoffice/src/test/java/org/apache/sis/test/suite/OpenOfficeTestSuite.java index db965ec..f53d42d 100644 --- a/application/sis-openoffice/src/test/java/org/apache/sis/test/suite/OpenOfficeTestSuite.java +++ b/application/sis-openoffice/src/test/java/org/apache/sis/test/suite/OpenOfficeTestSuite.java @@ -38,7 +38,7 @@ public final strictfp class OpenOfficeTestSuite extends TestSuite { * Verifies the list of tests before to run the suite. * See {@link TestSuite#verifyTestList(Class)} for more information. */ - @BeforeClass + @BeforeAll public static void verifyTestList() { assertNoMissingTest(OpenOfficeTestSuite.class); verifyTestList(OpenOfficeTestSuite.class); diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/DefaultIteratorTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/DefaultIteratorTest.java index e850985..1e0af71 100644 --- a/core/sis-feature/src/test/java/org/apache/sis/image/DefaultIteratorTest.java +++ b/core/sis-feature/src/test/java/org/apache/sis/image/DefaultIteratorTest.java @@ -362,7 +362,7 @@ public strictfp class DefaultIteratorTest extends TestCase { /** * Invoked after every tests for releasing resources. */ - @After + @AfterEach public void dispose() { iterator.close(); } diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/ImageTestCase.java b/core/sis-feature/src/test/java/org/apache/sis/image/ImageTestCase.java index 2216b2a..f24f78b 100644 --- a/core/sis-feature/src/test/java/org/apache/sis/image/ImageTestCase.java +++ b/core/sis-feature/src/test/java/org/apache/sis/image/ImageTestCase.java @@ -163,7 +163,7 @@ public abstract strictfp class ImageTestCase extends TestCase { * If a frame has been created by {@link #showCurrentImage(String)}, * waits for its disposal before to move to the next test class. */ - @AfterClass + @AfterAll public static void waitForFrameDisposal() { if (viewUsed) { TestViewer.waitForFrameDisposal(); diff --git a/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java b/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java index 1d567de..c291d5a 100644 --- a/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java +++ b/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java @@ -79,7 +79,7 @@ public final strictfp class FeatureTestSuite extends TestSuite { * Verifies the list of tests before to run the suite. * See {@link TestSuite#verifyTestList(Class)} for more information. */ - @BeforeClass + @BeforeAll public static void verifyTestList() { assertNoMissingTest(FeatureTestSuite.class); verifyTestList(FeatureTestSuite.class); diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gco/MultiplicityTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gco/MultiplicityTest.java index 604ee2f..ba752ab 100644 --- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gco/MultiplicityTest.java +++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gco/MultiplicityTest.java @@ -27,6 +27,7 @@ import org.apache.sis.test.mock.FeatureAttributeMock; import org.apache.sis.xml.MarshallerPool; import org.apache.sis.xml.XML; import org.junit.AfterClass; +import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; import static org.junit.Assert.*; @@ -72,7 +73,7 @@ public final strictfp class MultiplicityTest extends TestUsingFile { * Invoked by JUnit after the execution of every tests in order to dispose * the {@link MarshallerPool} instance used internally by this class. */ - @AfterClass + @AfterAll public static void disposeMarshallerPool() { pool = null; } diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/TimePeriodTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/TimePeriodTest.java index 47c44d2..0208d52 100644 --- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/TimePeriodTest.java +++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/TimePeriodTest.java @@ -31,6 +31,8 @@ import org.apache.sis.internal.xml.XmlUtilities; import org.apache.sis.test.xml.TestCase; import org.junit.BeforeClass; import org.junit.AfterClass; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import static org.apache.sis.test.MetadataAssert.*; @@ -69,7 +71,7 @@ public final strictfp class TimePeriodTest extends TestCase { * * @see #disposeMarshallerPool() */ - @BeforeClass + @BeforeAll public static void createMarshallerPool() throws JAXBException { final Map<String,Object> properties = new HashMap<>(4); assertNull(properties.put(XML.LOCALE, Locale.FRANCE)); @@ -81,7 +83,7 @@ public final strictfp class TimePeriodTest extends TestCase { * Invoked by JUnit after the execution of every tests in order to dispose * the {@link MarshallerPool} instance used internally by this class. */ - @AfterClass + @AfterAll public static void disposeMarshallerPool() { pool = null; } diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java index 739b605..598cabf 100644 --- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java +++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java @@ -23,6 +23,9 @@ import javax.xml.bind.Marshaller; import javax.xml.bind.Unmarshaller; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; + +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import org.opengis.metadata.Metadata; import org.apache.sis.xml.XML; import org.apache.sis.xml.MarshallerPool; @@ -86,7 +89,7 @@ public final strictfp class LanguageCodeTest extends TestCase { * * @see #disposeMarshallerPool() */ - @BeforeClass + @BeforeAll public static void createMarshallerPool() throws JAXBException { final Map<String,Object> properties = new HashMap<>(4); assertNull(properties.put(XML.LOCALE, Locale.UK)); @@ -99,7 +102,7 @@ public final strictfp class LanguageCodeTest extends TestCase { * Invoked by JUnit after the execution of every tests in order to dispose * the {@link MarshallerPool} instance used internally by this class. */ - @AfterClass + @AfterAll public static void disposeMarshallerPool() { pool = null; } diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java index dc87cc1..6daef69 100644 --- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java +++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java @@ -17,6 +17,8 @@ package org.apache.sis.metadata.iso.identification; import javax.xml.bind.JAXBException; + +import org.junit.jupiter.api.AfterEach; import org.opengis.metadata.identification.RepresentativeFraction; import org.apache.sis.xml.Namespaces; import org.apache.sis.internal.xml.LegacyNamespaces; @@ -53,7 +55,7 @@ public final strictfp class DefaultResolutionTest extends TestCase { /** * Verifies that no unexpected warning has been emitted in any test defined in this class. */ - @After + @AfterEach public void assertNoUnexpectedLog() { loggings.assertNoUnexpectedLog(); } diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescriptionTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescriptionTest.java index d854d59..12b1439 100644 --- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescriptionTest.java +++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescriptionTest.java @@ -21,6 +21,7 @@ import org.apache.sis.test.LoggingWatcher; import org.apache.sis.test.TestCase; import org.junit.After; import org.junit.Rule; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import static org.apache.sis.test.Assert.*; @@ -45,7 +46,7 @@ public final strictfp class DefaultScopeDescriptionTest extends TestCase { /** * Verifies that no unexpected warning has been emitted in any test defined in this class. */ - @After + @AfterEach public void assertNoUnexpectedLog() { loggings.assertNoUnexpectedLog(); } diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectifiedTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectifiedTest.java index 37985fb..3ecbdea 100644 --- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectifiedTest.java +++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectifiedTest.java @@ -16,6 +16,7 @@ */ package org.apache.sis.metadata.iso.spatial; +import org.junit.jupiter.api.AfterEach; import org.opengis.util.InternationalString; import org.apache.sis.util.iso.SimpleInternationalString; import org.apache.sis.internal.jaxb.Context; @@ -47,7 +48,7 @@ public final strictfp class DefaultGeorectifiedTest extends TestCase { /** * Verifies that no unexpected warning has been emitted in any test defined in this class. */ - @After + @AfterEach public void assertNoUnexpectedLog() { loggings.assertNoUnexpectedLog(); } diff --git a/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java b/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java index 7819489..ba0e074 100644 --- a/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java +++ b/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java @@ -17,6 +17,7 @@ package org.apache.sis.test.suite; import org.apache.sis.test.TestSuite; +import org.junit.jupiter.api.BeforeAll; import org.junit.platform.suite.api.SelectClasses; import org.junit.BeforeClass; @@ -140,7 +141,7 @@ public final strictfp class MetadataTestSuite extends TestSuite { * Verifies the list of tests before to run the suite. * See {@link TestSuite#verifyTestList(Class)} for more information. */ - @BeforeClass + @BeforeAll public static void verifyTestList() { assertNoMissingTest(MetadataTestSuite.class); verifyTestList(MetadataTestSuite.class); diff --git a/core/sis-metadata/src/test/java/org/apache/sis/test/xml/TestCase.java b/core/sis-metadata/src/test/java/org/apache/sis/test/xml/TestCase.java index dab8dd6..e8b8b6a 100644 --- a/core/sis-metadata/src/test/java/org/apache/sis/test/xml/TestCase.java +++ b/core/sis-metadata/src/test/java/org/apache/sis/test/xml/TestCase.java @@ -39,6 +39,7 @@ import org.apache.sis.xml.Namespaces; import org.apache.sis.xml.MarshallerPool; import org.apache.sis.xml.XML; import org.junit.After; +import org.junit.jupiter.api.AfterEach; import static org.apache.sis.test.MetadataAssert.*; @@ -166,7 +167,7 @@ public abstract strictfp class TestCase extends org.apache.sis.test.TestCase { * This method is automatically invoked by JUnit after each test, but can also be invoked explicitly before * to create a new context. It is safe to invoke this method more than once. */ - @After + @AfterEach public final void clearContext() { assertSame("Unexpected context. Is this method invoked from the right thread?", context, Context.current()); if (context != null) { diff --git a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultNameFactoryTest.java b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultNameFactoryTest.java index 450d76a..5b1b7bf 100644 --- a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultNameFactoryTest.java +++ b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultNameFactoryTest.java @@ -16,6 +16,8 @@ */ package org.apache.sis.util.iso; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import org.opengis.util.GenericName; import org.opengis.test.util.NameTest; import org.apache.sis.test.DependsOn; @@ -55,7 +57,7 @@ public final strictfp class DefaultNameFactoryTest extends NameTest { /** * Creates the singleton factory instance to be reused for all tests in this class. */ - @BeforeClass + @BeforeAll public static void createFactory() { factorySIS = new DefaultNameFactory(); } @@ -63,7 +65,7 @@ public final strictfp class DefaultNameFactoryTest extends NameTest { /** * Disposes the singleton factory instance after all tests have been executed. */ - @AfterClass + @AfterAll public static void disposeFactory() { factorySIS = null; } diff --git a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordTest.java b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordTest.java index 1aac8ee..7b7b019 100644 --- a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordTest.java +++ b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordTest.java @@ -18,6 +18,9 @@ package org.apache.sis.util.iso; import java.util.Map; import java.util.LinkedHashMap; + +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import org.opengis.util.MemberName; import org.opengis.util.RecordType; @@ -50,7 +53,7 @@ public final strictfp class DefaultRecordTest extends TestCase { /** * Creates the {@link DefaultRecordType} to be used by all tests in this class. */ - @BeforeClass + @BeforeAll public static void createRecordType() { final DefaultRecordSchema schema = new SerializableRecordSchema("MySchema"); final Map<CharSequence,Class<?>> members = new LinkedHashMap<>(8); @@ -65,7 +68,7 @@ public final strictfp class DefaultRecordTest extends TestCase { /** * Clears the {@link DefaultRecordType} used by the tests. */ - @AfterClass + @AfterAll public static void clearRecordType() { SerializableRecordSchema.INSTANCE = null; recordType = null; diff --git a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/NameMarshallingTest.java b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/NameMarshallingTest.java index 7ff3b65..9af673c 100644 --- a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/NameMarshallingTest.java +++ b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/NameMarshallingTest.java @@ -21,6 +21,8 @@ import javax.xml.bind.Marshaller; import javax.xml.bind.Unmarshaller; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; + +import org.junit.jupiter.api.AfterAll; import org.opengis.util.TypeName; import org.opengis.util.LocalName; import org.opengis.util.GenericName; @@ -206,7 +208,7 @@ public final strictfp class NameMarshallingTest extends TestCase { * Invoked by JUnit after the execution of every tests in order to dispose * the {@link MarshallerPool} instance used internally by this class. */ - @AfterClass + @AfterAll public static void disposeMarshallerPool() { pool = null; } diff --git a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/test/suite/ReferencingByIdentifiersTestSuite.java b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/test/suite/ReferencingByIdentifiersTestSuite.java index e27206b..0cf3d4e 100644 --- a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/test/suite/ReferencingByIdentifiersTestSuite.java +++ b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/test/suite/ReferencingByIdentifiersTestSuite.java @@ -41,7 +41,7 @@ public final strictfp class ReferencingByIdentifiersTestSuite extends TestSuite * Verifies the list of tests before to run the suite. * See {@link TestSuite#verifyTestList(Class)} for more information. */ - @BeforeClass + @BeforeAll public static void verifyTestList() { assertNoMissingTest(ReferencingByIdentifiersTestSuite.class); verifyTestList(ReferencingByIdentifiersTestSuite.class); diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CC_GeneralOperationParameterTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CC_GeneralOperationParameterTest.java index 6da9839..19d1595 100644 --- a/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CC_GeneralOperationParameterTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CC_GeneralOperationParameterTest.java @@ -20,6 +20,8 @@ import java.util.Map; import java.util.HashMap; import java.util.Iterator; import javax.xml.bind.JAXBException; + +import org.junit.jupiter.api.AfterEach; import org.opengis.parameter.ParameterDescriptor; import org.opengis.parameter.ParameterDescriptorGroup; import org.opengis.parameter.GeneralParameterDescriptor; @@ -65,7 +67,7 @@ public final strictfp class CC_GeneralOperationParameterTest extends TestCase { /** * Verifies that no unexpected warning has been emitted in any test defined in this class. */ - @After + @AfterEach public void assertNoUnexpectedLog() { loggings.assertNoUnexpectedLog(); } diff --git a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/ComparisonWithEPSG.java b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/ComparisonWithEPSG.java index 2a49643..9d9c781 100644 --- a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/ComparisonWithEPSG.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/ComparisonWithEPSG.java @@ -16,6 +16,8 @@ */ package org.apache.sis.io.wkt; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import org.opengis.util.FactoryException; import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.apache.sis.referencing.factory.TestFactorySource; @@ -44,7 +46,7 @@ public final strictfp class ComparisonWithEPSG extends TestCase { * * @throws FactoryException if an error occurred while creating the factory. */ - @BeforeClass + @BeforeAll public static void createFactory() throws FactoryException { TestFactorySource.createFactory(); } @@ -54,7 +56,7 @@ public final strictfp class ComparisonWithEPSG extends TestCase { * * @throws FactoryException if an error occurred while closing the connections. */ - @AfterClass + @AfterAll public static void close() throws FactoryException { TestFactorySource.close(); } diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterFormatTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterFormatTest.java index ac7d0fc..70c63ce 100644 --- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterFormatTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterFormatTest.java @@ -18,6 +18,9 @@ package org.apache.sis.parameter; import java.util.List; import java.util.Locale; + +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import org.opengis.referencing.IdentifiedObject; import org.opengis.parameter.ParameterDescriptor; import org.opengis.parameter.ParameterDescriptorGroup; @@ -60,7 +63,7 @@ public final strictfp class ParameterFormatTest extends TestCase { * <div class="note"><b>Note:</b> * the default values are not part of EPSG definitions. They are added here only for testing purpose.</div> */ - @BeforeClass + @BeforeAll public static void createParameterDescriptor() { descriptor = createMercatorParameters(); } @@ -93,7 +96,7 @@ public final strictfp class ParameterFormatTest extends TestCase { /** * Forgets the parameter descriptors after all tests are done. */ - @AfterClass + @AfterAll public static void clearParameterDescriptor() { descriptor = null; } diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorParametersTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorParametersTest.java index bb29519..6097ab3 100644 --- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorParametersTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorParametersTest.java @@ -18,6 +18,8 @@ package org.apache.sis.parameter; import java.util.Map; import java.util.Random; + +import org.junit.jupiter.api.AfterAll; import org.opengis.parameter.ParameterValueGroup; import org.opengis.parameter.ParameterDescriptor; import org.opengis.referencing.operation.Matrix; @@ -128,7 +130,7 @@ public strictfp class TensorParametersTest extends TestCase { * Discards the parameters used by the tests in this class. * This method is invoked by JUnit only after all tests completed. */ - @AfterClass + @AfterAll public static void clearTensorParameters() { WKT1 = null; } diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/AuthorityFactoriesTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/AuthorityFactoriesTest.java index 9ad5133..7f3fac5 100644 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/AuthorityFactoriesTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/AuthorityFactoriesTest.java @@ -18,6 +18,8 @@ package org.apache.sis.referencing; import java.util.Collection; import java.util.ServiceLoader; + +import org.junit.jupiter.api.AfterEach; import org.opengis.util.FactoryException; import org.opengis.referencing.NoSuchAuthorityCodeException; import org.opengis.referencing.IdentifiedObject; @@ -63,7 +65,7 @@ public final strictfp class AuthorityFactoriesTest extends TestCase { /** * Verifies that no unexpected warning has been emitted in any test defined in this class. */ - @After + @AfterEach public void assertNoUnexpectedLog() { loggings.assertNoUnexpectedLog(); } diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java index 58e5c4b..34c656f 100644 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java @@ -17,6 +17,8 @@ package org.apache.sis.referencing.crs; import javax.xml.bind.JAXBException; + +import org.junit.jupiter.api.AfterEach; import org.opengis.util.FactoryException; import org.opengis.referencing.crs.ProjectedCRS; import org.opengis.referencing.crs.GeographicCRS; @@ -76,7 +78,7 @@ public final strictfp class DefaultProjectedCRSTest extends TestCase { /** * Verifies that no unexpected warning has been emitted in any test defined in this class. */ - @After + @AfterEach public void assertNoUnexpectedLog() { loggings.assertNoUnexpectedLog(); } diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactoryTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactoryTest.java index 85a671a..cfab7ba 100644 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactoryTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactoryTest.java @@ -20,6 +20,8 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Set; + +import org.junit.jupiter.api.AfterEach; import org.opengis.referencing.IdentifiedObject; import org.opengis.referencing.NoSuchAuthorityCodeException; import org.opengis.referencing.crs.CRSAuthorityFactory; @@ -73,7 +75,7 @@ public final strictfp class MultiAuthoritiesFactoryTest extends TestCase { /** * Verifies that no unexpected warning has been emitted in any test defined in this class. */ - @After + @AfterEach public void assertNoUnexpectedLog() { loggings.assertNoUnexpectedLog(); } diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java index b3de93f..66ad09c 100644 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java @@ -23,6 +23,10 @@ import java.util.Locale; import java.util.Iterator; import java.util.Collections; import javax.measure.Unit; + +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; import org.opengis.metadata.extent.GeographicBoundingBox; import org.opengis.parameter.ParameterDescriptor; import org.opengis.parameter.ParameterValueGroup; @@ -93,7 +97,7 @@ public final strictfp class EPSGFactoryTest extends TestCase { * * @throws FactoryException if an error occurred while creating the factory. */ - @BeforeClass + @BeforeAll public static void createFactory() throws FactoryException { TestFactorySource.createFactory(); } @@ -103,7 +107,7 @@ public final strictfp class EPSGFactoryTest extends TestCase { * * @throws FactoryException if an error occurred while closing the connections. */ - @AfterClass + @AfterAll public static void close() throws FactoryException { TestFactorySource.close(); } @@ -118,7 +122,7 @@ public final strictfp class EPSGFactoryTest extends TestCase { /** * Verifies that no unexpected warning has been emitted in any test defined in this class. */ - @After + @AfterEach public void assertNoUnexpectedLog() { loggings.assertNoUnexpectedLog(); } diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGInstallerTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGInstallerTest.java index aeda133..89f3b7f 100644 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGInstallerTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGInstallerTest.java @@ -27,6 +27,8 @@ import java.sql.Connection; import java.sql.Statement; import java.sql.ResultSet; import java.sql.SQLException; + +import org.junit.jupiter.api.AfterEach; import org.opengis.util.FactoryException; import org.opengis.referencing.crs.GeographicCRS; import org.opengis.referencing.crs.ProjectedCRS; @@ -84,7 +86,7 @@ public final strictfp class EPSGInstallerTest extends TestCase { /** * Verifies that no unexpected warning has been emitted in any test defined in this class. */ - @After + @AfterEach public void assertNoUnexpectedLog() { loggings.assertNoUnexpectedLog(); } diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java index ba978fb..b3806ad 100644 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java @@ -21,6 +21,9 @@ import java.util.HashMap; import java.util.Arrays; import java.util.Collections; import java.text.ParseException; + +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import org.opengis.util.FactoryException; import org.opengis.parameter.ParameterValueGroup; import org.opengis.referencing.crs.GeographicCRS; @@ -121,7 +124,7 @@ public final strictfp class CoordinateOperationFinderTest extends MathTransformT * * @throws ParseException if an error occurred while preparing the WKT parser. */ - @BeforeClass + @BeforeAll public static void createFactory() throws ParseException { factory = new DefaultCoordinateOperationFactory(); parser = new WKTFormat(null, null); @@ -151,7 +154,7 @@ public final strictfp class CoordinateOperationFinderTest extends MathTransformT /** * Disposes the factory created by {@link #createFactory()} after all tests have been executed. */ - @AfterClass + @AfterAll public static void disposeFactory() { factory = null; parser = null; diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java index 94e46ee..a3f185b 100644 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java @@ -18,6 +18,9 @@ package org.apache.sis.referencing.operation; import java.util.List; import java.text.ParseException; + +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import org.opengis.util.FactoryException; import org.opengis.parameter.ParameterValueGroup; import org.opengis.referencing.IdentifiedObject; @@ -124,7 +127,7 @@ public final strictfp class CoordinateOperationRegistryTest extends MathTransfor * * @throws ParseException if an error occurred while preparing the WKT parser. */ - @BeforeClass + @BeforeAll public static void createFactory() throws ParseException { factory = new DefaultCoordinateOperationFactory(); parser = new WKTFormat(null, null); @@ -136,7 +139,7 @@ public final strictfp class CoordinateOperationRegistryTest extends MathTransfor /** * Disposes the factory created by {@link #createFactory()} after all tests have been executed. */ - @AfterClass + @AfterAll public static void disposeFactory() { factory = null; parser = null; diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactoryTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactoryTest.java index 1c08a4b..427df9d 100644 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactoryTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactoryTest.java @@ -18,6 +18,9 @@ package org.apache.sis.referencing.operation; import java.util.List; import java.text.ParseException; + +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import org.opengis.util.FactoryException; import org.opengis.parameter.ParameterValueGroup; import org.opengis.referencing.crs.CoordinateReferenceSystem; @@ -91,7 +94,7 @@ public final strictfp class DefaultCoordinateOperationFactoryTest extends MathTr * * @throws ParseException if an error occurred while preparing the WKT parser. */ - @BeforeClass + @BeforeAll public static void createFactory() throws ParseException { factory = new DefaultCoordinateOperationFactory(); parser = new WKTFormat(null, null); @@ -132,7 +135,7 @@ public final strictfp class DefaultCoordinateOperationFactoryTest extends MathTr /** * Disposes the factory created by {@link #createFactory()} after all tests have been executed. */ - @AfterClass + @AfterAll public static void disposeFactory() { factory = null; parser = null; diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java index 0978791..746092e 100644 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java @@ -20,6 +20,7 @@ import java.util.Random; import org.apache.sis.test.DependsOn; import org.apache.sis.test.TestUtilities; import org.junit.AfterClass; +import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; import static java.lang.Double.NaN; @@ -202,7 +203,7 @@ public final strictfp class NonSquareMatrixTest extends MatrixTestCase { * Prints the statistics about the differences between JAMA and SIS matrix elements. * Those statistics will be visible only if {@link #VERBOSE} is {@code true}. */ - @AfterClass + @AfterAll public static void printStatistics() { if (statistics != null) { TestUtilities.printSeparator("Overall statistics on agreement of matrix arithmetic"); diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateSystemTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateSystemTransformTest.java index 8344df8..750bc8b 100644 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateSystemTransformTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateSystemTransformTest.java @@ -16,6 +16,8 @@ */ package org.apache.sis.referencing.operation.transform; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import org.opengis.util.FactoryException; import org.opengis.referencing.cs.CoordinateSystem; import org.opengis.referencing.cs.SphericalCS; @@ -64,7 +66,7 @@ public final strictfp class CoordinateSystemTransformTest extends TransformTestC * Creates the {@link MathTransformFactory} to be used for the tests. * We do not use the system-wide factory in order to have better tests isolation. */ - @BeforeClass + @BeforeAll public static void createFactory() { factory = new DefaultMathTransformFactory(); spherical = (SphericalCS) DefaultGeocentricCRS.castOrCopy(CommonCRS.WGS84.spherical()) @@ -74,7 +76,7 @@ public final strictfp class CoordinateSystemTransformTest extends TransformTestC /** * Disposes the {@link MathTransformFactory} used for the tests. */ - @AfterClass + @AfterAll public static void disposeFactory() { spherical = null; factory = null; diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java index 4f1a71a..0d48a80 100644 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java @@ -16,6 +16,7 @@ */ package org.apache.sis.referencing.operation.transform; +import org.junit.jupiter.api.AfterEach; import org.opengis.referencing.operation.Matrix; import org.opengis.referencing.operation.MathTransform; import org.opengis.referencing.operation.MathTransform1D; @@ -220,7 +221,7 @@ public strictfp class ProjectiveTransformTest extends TransformTestCase { * In addition, all Apache SIS classes for linear transforms shall implement * {@link LinearTransform} and {@link Parameterized} interfaces. */ - @After + @AfterEach public final void ensureImplementRightInterface() { if (transform instanceof TransformResultComparator) { transform = ((TransformResultComparator) transform).tested; diff --git a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java index f1c6a1c..41ffc07 100644 --- a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java @@ -28,6 +28,7 @@ import javax.xml.bind.Marshaller; import javax.xml.bind.Unmarshaller; import javax.xml.bind.JAXBException; +import org.junit.jupiter.api.AfterEach; import org.opengis.metadata.*; import org.opengis.metadata.citation.*; import org.opengis.metadata.constraint.*; @@ -114,7 +115,7 @@ public final strictfp class MetadataTest extends TestCase { /** * Verifies that no unexpected warning has been emitted in any test defined in this class. */ - @After + @AfterEach public void assertNoUnexpectedLog() { loggings.skipNextLogIfContains("sis-temporal"); loggings.assertNoUnexpectedLog(); diff --git a/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java b/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java index bc7d5f5..847af14 100644 --- a/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java @@ -17,6 +17,7 @@ package org.apache.sis.test.suite; import org.apache.sis.test.TestSuite; +import org.junit.jupiter.api.BeforeAll; import org.junit.platform.suite.api.SelectClasses; import org.junit.BeforeClass; @@ -273,7 +274,7 @@ public final strictfp class ReferencingTestSuite extends TestSuite { * Verifies the list of tests before to run the suite. * See {@link TestSuite#verifyTestList(Class)} for more information. */ - @BeforeClass + @BeforeAll public static void verifyTestList() { assertNoMissingTest(ReferencingTestSuite.class); verifyTestList(ReferencingTestSuite.class); diff --git a/core/sis-utility/src/test/java/org/apache/sis/io/LeftMarginTest.java b/core/sis-utility/src/test/java/org/apache/sis/io/LeftMarginTest.java index 2ef23d0..daeddff 100644 --- a/core/sis-utility/src/test/java/org/apache/sis/io/LeftMarginTest.java +++ b/core/sis-utility/src/test/java/org/apache/sis/io/LeftMarginTest.java @@ -19,6 +19,7 @@ package org.apache.sis.io; import java.io.IOException; import org.apache.sis.test.DependsOn; import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; import static org.junit.Assert.*; @@ -39,7 +40,7 @@ public final strictfp class LeftMarginTest extends LineAppenderTest { /** * Creates and configure the {@link LineAppender} to test. */ - @Before + @BeforeEach @Override public void createLineAppender() { appender = new LineAppender(appender) { diff --git a/core/sis-utility/src/test/java/org/apache/sis/io/LineAppenderTest.java b/core/sis-utility/src/test/java/org/apache/sis/io/LineAppenderTest.java index 2c24566..c618931 100644 --- a/core/sis-utility/src/test/java/org/apache/sis/io/LineAppenderTest.java +++ b/core/sis-utility/src/test/java/org/apache/sis/io/LineAppenderTest.java @@ -19,6 +19,7 @@ package org.apache.sis.io; import java.io.IOException; import org.apache.sis.test.DependsOn; import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import static org.junit.Assert.*; @@ -49,7 +50,7 @@ public strictfp class LineAppenderTest extends AppenderTestCase { /** * Creates and configure the {@link LineAppender} to test. */ - @Before + @BeforeEach public void createLineAppender() { appender = new LineAppender(appender, " ", false); } diff --git a/core/sis-utility/src/test/java/org/apache/sis/io/TabulationExpansionTest.java b/core/sis-utility/src/test/java/org/apache/sis/io/TabulationExpansionTest.java index b3145aef..b521c42 100644 --- a/core/sis-utility/src/test/java/org/apache/sis/io/TabulationExpansionTest.java +++ b/core/sis-utility/src/test/java/org/apache/sis/io/TabulationExpansionTest.java @@ -19,6 +19,7 @@ package org.apache.sis.io; import java.io.IOException; import org.apache.sis.test.DependsOn; import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; import static org.junit.Assert.*; @@ -39,7 +40,7 @@ public final strictfp class TabulationExpansionTest extends LineAppenderTest { /** * Creates and configure the {@link LineAppender} to test. */ - @Before + @BeforeEach @Override public void createLineAppender() { appender = new LineAppender(appender, null, true); diff --git a/core/sis-utility/src/test/java/org/apache/sis/io/WordWrapTest.java b/core/sis-utility/src/test/java/org/apache/sis/io/WordWrapTest.java index 2d362cb..3f69a6b 100644 --- a/core/sis-utility/src/test/java/org/apache/sis/io/WordWrapTest.java +++ b/core/sis-utility/src/test/java/org/apache/sis/io/WordWrapTest.java @@ -20,6 +20,7 @@ import java.io.IOException; import org.apache.sis.test.DependsOn; import org.apache.sis.internal.util.X364; import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; import static org.junit.Assert.*; import static org.apache.sis.util.Characters.SOFT_HYPHEN; @@ -41,7 +42,7 @@ public strictfp class WordWrapTest extends LineAppenderTest { /** * Creates and configure the {@link LineAppender} to test. */ - @Before + @BeforeEach @Override public void createLineAppender() { appender = new LineAppender(appender, 10, false); diff --git a/core/sis-utility/src/test/java/org/apache/sis/io/WordWrapWithLineSeparatorTest.java b/core/sis-utility/src/test/java/org/apache/sis/io/WordWrapWithLineSeparatorTest.java index 6b0edaf..ed649e1 100644 --- a/core/sis-utility/src/test/java/org/apache/sis/io/WordWrapWithLineSeparatorTest.java +++ b/core/sis-utility/src/test/java/org/apache/sis/io/WordWrapWithLineSeparatorTest.java @@ -18,6 +18,7 @@ package org.apache.sis.io; import org.junit.Before; import org.apache.sis.test.DependsOn; +import org.junit.jupiter.api.BeforeEach; /** @@ -36,7 +37,7 @@ public final strictfp class WordWrapWithLineSeparatorTest extends WordWrapTest { /** * Creates and configure the {@link LineAppender} to test. */ - @Before + @BeforeEach @Override public void createLineAppender() { appender = new LineAppender(new LineAppender(appender, "\r", false), 10, false); diff --git a/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java b/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java index 62e6c99..805a04f 100644 --- a/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java +++ b/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java @@ -31,6 +31,8 @@ import org.apache.sis.util.logging.MonolineFormatter; import org.apache.sis.util.Classes; import org.junit.BeforeClass; import org.junit.AfterClass; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import org.junit.platform.runner.JUnitPlatform; import org.junit.platform.suite.api.SelectClasses; import org.junit.runner.RunWith; @@ -227,7 +229,7 @@ public abstract strictfp class TestSuite { * * @since 1.0 */ - @BeforeClass + @BeforeAll public static void configureLogging() { MonolineFormatter f = MonolineFormatter.install(); f.setHeader(null); @@ -246,7 +248,7 @@ public abstract strictfp class TestSuite { * * @throws Exception if an error occurred during unregistration of the supervisor MBean or resource disposal. */ - @AfterClass + @AfterAll @SuppressWarnings("UseOfSystemOutOrSystemErr") public static void shutdown() throws Exception { if (!skipShutdown) { diff --git a/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java b/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java index d6ddb47..19d1650 100644 --- a/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java +++ b/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java @@ -17,6 +17,7 @@ package org.apache.sis.test.suite; import org.apache.sis.test.TestSuite; +import org.junit.jupiter.api.BeforeAll; import org.junit.platform.suite.api.SelectClasses; import org.junit.BeforeClass; @@ -139,7 +140,7 @@ public final strictfp class UtilityTestSuite extends TestSuite { * Verifies the list of tests before to run the suite. * See {@link TestSuite#verifyTestList(Class)} for more information. */ - @BeforeClass + @BeforeAll public static void verifyTestList() { assertNoMissingTest(UtilityTestSuite.class); verifyTestList(UtilityTestSuite.class); diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/resources/IndexedResourceBundleTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/resources/IndexedResourceBundleTest.java index 4747a3e..63c0f43 100644 --- a/core/sis-utility/src/test/java/org/apache/sis/util/resources/IndexedResourceBundleTest.java +++ b/core/sis-utility/src/test/java/org/apache/sis/util/resources/IndexedResourceBundleTest.java @@ -22,6 +22,8 @@ import java.util.Enumeration; import java.util.logging.Level; import java.util.logging.LogRecord; import java.util.logging.SimpleFormatter; + +import org.junit.jupiter.api.AfterEach; import org.opengis.metadata.maintenance.ScopeCode; import org.opengis.util.InternationalString; import org.apache.sis.test.DependsOnMethod; @@ -212,7 +214,7 @@ public final strictfp class IndexedResourceBundleTest extends TestCase { * * @throws IOException should never happen since this test writes only in memory. */ - @After + @AfterEach public void dumpResourcesOnError() throws IOException { if (testing != null) { out.print("Error while testing "); diff --git a/profiles/sis-french-profile/src/test/java/org/apache/sis/test/suite/FrenchProfileTestSuite.java b/profiles/sis-french-profile/src/test/java/org/apache/sis/test/suite/FrenchProfileTestSuite.java index bc1f95d..0a89c4a 100644 --- a/profiles/sis-french-profile/src/test/java/org/apache/sis/test/suite/FrenchProfileTestSuite.java +++ b/profiles/sis-french-profile/src/test/java/org/apache/sis/test/suite/FrenchProfileTestSuite.java @@ -39,7 +39,7 @@ public final strictfp class FrenchProfileTestSuite extends TestSuite { * Verifies the list of tests before to run the suite. * See {@link TestSuite#verifyTestList(Class)} for more information. */ - @BeforeClass + @BeforeAll public static void verifyTestList() { assertNoMissingTest(FrenchProfileTestSuite.class); verifyTestList(FrenchProfileTestSuite.class); diff --git a/profiles/sis-japan-profile/src/test/java/org/apache/sis/test/suite/JapanProfileTestSuite.java b/profiles/sis-japan-profile/src/test/java/org/apache/sis/test/suite/JapanProfileTestSuite.java index ea2f71d..6d4bd7e 100644 --- a/profiles/sis-japan-profile/src/test/java/org/apache/sis/test/suite/JapanProfileTestSuite.java +++ b/profiles/sis-japan-profile/src/test/java/org/apache/sis/test/suite/JapanProfileTestSuite.java @@ -37,7 +37,7 @@ public final strictfp class JapanProfileTestSuite extends TestSuite { * Verifies the list of tests before to run the suite. * See {@link TestSuite#verifyTestList(Class)} for more information. */ - @BeforeClass + @BeforeAll public static void verifyTestList() { assertNoMissingTest(JapanProfileTestSuite.class); verifyTestList(JapanProfileTestSuite.class); diff --git a/storage/sis-earth-observation/src/test/java/org/apache/sis/test/suite/EarthObservationTestSuite.java b/storage/sis-earth-observation/src/test/java/org/apache/sis/test/suite/EarthObservationTestSuite.java index d061a3a..174e481 100644 --- a/storage/sis-earth-observation/src/test/java/org/apache/sis/test/suite/EarthObservationTestSuite.java +++ b/storage/sis-earth-observation/src/test/java/org/apache/sis/test/suite/EarthObservationTestSuite.java @@ -39,7 +39,7 @@ public final strictfp class EarthObservationTestSuite extends TestSuite { * Verifies the list of tests before to run the suite. * See {@link TestSuite#verifyTestList(Class)} for more information. */ - @BeforeClass + @BeforeAll public static void verifyTestList() { assertNoMissingTest(EarthObservationTestSuite.class); verifyTestList(EarthObservationTestSuite.class); diff --git a/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/IntegrationTest.java b/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/IntegrationTest.java index 2410706..c8d99bd 100644 --- a/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/IntegrationTest.java +++ b/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/IntegrationTest.java @@ -40,7 +40,7 @@ public final strictfp class IntegrationTest extends TestCase { /** * Verifies if the {@literal Proj.4} library is available. */ - @BeforeClass + @BeforeAll public static void verifyNativeLibraryAvailability() { PJTest.verifyNativeLibraryAvailability(); } diff --git a/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/PJTest.java b/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/PJTest.java index e2e3fbc..2d2eccf 100644 --- a/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/PJTest.java +++ b/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/PJTest.java @@ -45,7 +45,7 @@ public final strictfp class PJTest extends TestCase { /** * Verifies if the {@literal Proj.4} library is available. */ - @BeforeClass + @BeforeAll public static synchronized void verifyNativeLibraryAvailability() { if (status == null) try { out.println("Proj.4 version: " + PJ.getRelease()); diff --git a/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/Proj4FactoryTest.java b/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/Proj4FactoryTest.java index 3870dca..0603f6b 100644 --- a/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/Proj4FactoryTest.java +++ b/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/Proj4FactoryTest.java @@ -51,7 +51,7 @@ public final strictfp class Proj4FactoryTest extends TestCase { /** * Verifies if the {@literal Proj.4} library is available. */ - @BeforeClass + @BeforeAll public static void verifyNativeLibraryAvailability() { PJTest.verifyNativeLibraryAvailability(); } diff --git a/storage/sis-gdal/src/test/java/org/apache/sis/test/suite/GDALTestSuite.java b/storage/sis-gdal/src/test/java/org/apache/sis/test/suite/GDALTestSuite.java index 1215ac0..a8659ef 100644 --- a/storage/sis-gdal/src/test/java/org/apache/sis/test/suite/GDALTestSuite.java +++ b/storage/sis-gdal/src/test/java/org/apache/sis/test/suite/GDALTestSuite.java @@ -41,7 +41,7 @@ public final strictfp class GDALTestSuite extends TestSuite { * Verifies the list of tests before to run the suite. * See {@link TestSuite#verifyTestList(Class)} for more information. */ - @BeforeClass + @BeforeAll public static void verifyTestList() { assertNoMissingTest(GDALTestSuite.class); verifyTestList(GDALTestSuite.class); diff --git a/storage/sis-geotiff/src/test/java/org/apache/sis/test/suite/GeoTiffTestSuite.java b/storage/sis-geotiff/src/test/java/org/apache/sis/test/suite/GeoTiffTestSuite.java index cc08fd5..7ab9193 100644 --- a/storage/sis-geotiff/src/test/java/org/apache/sis/test/suite/GeoTiffTestSuite.java +++ b/storage/sis-geotiff/src/test/java/org/apache/sis/test/suite/GeoTiffTestSuite.java @@ -40,7 +40,7 @@ public final strictfp class GeoTiffTestSuite extends TestSuite { * Verifies the list of tests before to run the suite. * See {@link TestSuite#verifyTestList(Class)} for more information. */ - @BeforeClass + @BeforeAll public static void verifyTestList() { assertNoMissingTest(GeoTiffTestSuite.class); verifyTestList(GeoTiffTestSuite.class); diff --git a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/TestCase.java b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/TestCase.java index 2db1bb0..ca8dcf8 100644 --- a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/TestCase.java +++ b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/TestCase.java @@ -151,7 +151,7 @@ public abstract strictfp class TestCase extends org.apache.sis.test.TestCase { * * @throws IOException if an error occurred while closing a file. */ - @AfterClass + @AfterAll public static void closeAllDecoders() throws IOException { Throwable failure = null; synchronized (DECODERS) { // Paranoiac safety. diff --git a/storage/sis-netcdf/src/test/java/org/apache/sis/test/suite/NetcdfTestSuite.java b/storage/sis-netcdf/src/test/java/org/apache/sis/test/suite/NetcdfTestSuite.java index accc351..36e057f 100644 --- a/storage/sis-netcdf/src/test/java/org/apache/sis/test/suite/NetcdfTestSuite.java +++ b/storage/sis-netcdf/src/test/java/org/apache/sis/test/suite/NetcdfTestSuite.java @@ -48,7 +48,7 @@ public final strictfp class NetcdfTestSuite extends TestSuite { * Verifies the list of tests before to run the suite. * See {@link TestSuite#verifyTestList(Class)} for more information. */ - @BeforeClass + @BeforeAll public static void verifyTestList() { assertNoMissingTest(NetcdfTestSuite.class); verifyTestList(NetcdfTestSuite.class); diff --git a/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/AbstractTestBaseForInternalJDBC.java b/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/AbstractTestBaseForInternalJDBC.java index ffa2220..748a843 100644 --- a/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/AbstractTestBaseForInternalJDBC.java +++ b/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/AbstractTestBaseForInternalJDBC.java @@ -58,7 +58,7 @@ public abstract class AbstractTestBaseForInternalJDBC extends TestCase { * Test setup. * @throws URISyntaxException If an error occurred while getting the file to the test database. */ - @Before + @BeforeEach public void setup() throws URISyntaxException { final URL url = ShapeFileTest.class.getResource("SignedBikeRoute_4326_clipped.dbf"); assertNotNull("The database file used for testing doesn't exist.", url); diff --git a/storage/sis-shapefile/src/test/java/org/apache/sis/test/suite/ShapefileTestSuite.java b/storage/sis-shapefile/src/test/java/org/apache/sis/test/suite/ShapefileTestSuite.java index 77646fb..21d79eb 100644 --- a/storage/sis-shapefile/src/test/java/org/apache/sis/test/suite/ShapefileTestSuite.java +++ b/storage/sis-shapefile/src/test/java/org/apache/sis/test/suite/ShapefileTestSuite.java @@ -36,7 +36,7 @@ public final strictfp class ShapefileTestSuite extends TestSuite { * Verifies the list of tests before to run the suite. * See {@link TestSuite#verifyTestList(Class)} for more information. */ - @BeforeClass + @BeforeAll public static void verifyTestList() { assertNoMissingTest(ShapefileTestSuite.class); verifyTestList(ShapefileTestSuite.class); diff --git a/storage/sis-sqlstore/src/test/java/org/apache/sis/test/suite/SQLTestSuite.java b/storage/sis-sqlstore/src/test/java/org/apache/sis/test/suite/SQLTestSuite.java index 15e8c34..d56480c 100644 --- a/storage/sis-sqlstore/src/test/java/org/apache/sis/test/suite/SQLTestSuite.java +++ b/storage/sis-sqlstore/src/test/java/org/apache/sis/test/suite/SQLTestSuite.java @@ -32,7 +32,7 @@ public final strictfp class SQLTestSuite extends TestSuite { * Verifies the list of tests before to run the suite. * See {@link TestSuite#verifyTestList(Class)} for more information. */ - @BeforeClass + @BeforeAll public static void verifyTestList() { assertNoMissingTest(SQLTestSuite.class); verifyTestList(SQLTestSuite.class); diff --git a/storage/sis-storage/src/test/java/org/apache/sis/test/suite/StorageTestSuite.java b/storage/sis-storage/src/test/java/org/apache/sis/test/suite/StorageTestSuite.java index 4f8d79c..c8c3931 100644 --- a/storage/sis-storage/src/test/java/org/apache/sis/test/suite/StorageTestSuite.java +++ b/storage/sis-storage/src/test/java/org/apache/sis/test/suite/StorageTestSuite.java @@ -60,7 +60,7 @@ public final strictfp class StorageTestSuite extends TestSuite { * Verifies the list of tests before to run the suite. * See {@link TestSuite#verifyTestList(Class)} for more information. */ - @BeforeClass + @BeforeAll public static void verifyTestList() { assertNoMissingTest(StorageTestSuite.class); verifyTestList(StorageTestSuite.class); diff --git a/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/ReaderTest.java b/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/ReaderTest.java index c566822..55b7391 100644 --- a/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/ReaderTest.java +++ b/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/ReaderTest.java @@ -65,7 +65,7 @@ public final strictfp class ReaderTest extends TestCase { /** * Creates the provider to be shared by all data stores created in this test class. */ - @BeforeClass + @BeforeAll public static void createProvider() { provider = new StoreProvider(); } @@ -73,7 +73,7 @@ public final strictfp class ReaderTest extends TestCase { /** * Disposes the data store provider after all tests have been completed. */ - @AfterClass + @AfterAll public static void disposeProvider() { provider = null; } diff --git a/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/WriterTest.java b/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/WriterTest.java index 8efa514..944fe53 100644 --- a/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/WriterTest.java +++ b/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/WriterTest.java @@ -63,7 +63,7 @@ public final strictfp class WriterTest extends TestCase { /** * Creates the provider to be shared by all data stores created in this test class. */ - @BeforeClass + @BeforeAll public static void createProvider() { provider = new StoreProvider(); } @@ -71,7 +71,7 @@ public final strictfp class WriterTest extends TestCase { /** * Disposes the data store provider after all tests have been completed. */ - @AfterClass + @AfterAll public static void disposeProvider() { provider = null; } diff --git a/storage/sis-xmlstore/src/test/java/org/apache/sis/test/suite/GPXTestSuite.java b/storage/sis-xmlstore/src/test/java/org/apache/sis/test/suite/GPXTestSuite.java index 736a2b1..c1c72ed 100644 --- a/storage/sis-xmlstore/src/test/java/org/apache/sis/test/suite/GPXTestSuite.java +++ b/storage/sis-xmlstore/src/test/java/org/apache/sis/test/suite/GPXTestSuite.java @@ -35,7 +35,7 @@ public final strictfp class GPXTestSuite extends TestSuite { * Verifies the list of tests before to run the suite. * See {@link TestSuite#verifyTestList(Class)} for more information. */ - @BeforeClass + @BeforeAll public static void verifyTestList() { assertNoMissingTest(GPXTestSuite.class); verifyTestList(GPXTestSuite.class);
