You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2019/06/03 21:01:23 UTC
[sis] branch SIS-457 created (now 26005cf)
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a change to branch SIS-457
in repository https://gitbox.apache.org/repos/asf/sis.git.
at 26005cf First patch from Michiel Rop for migrating to JUnit 5: https://issues.apache.org/jira/browse/SIS-457 The code compile but tests are not yet enabled.
This branch includes the following new commits:
new 26005cf First patch from Michiel Rop for migrating to JUnit 5: https://issues.apache.org/jira/browse/SIS-457 The code compile but tests are not yet enabled.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[sis] 01/01: First patch from Michiel Rop for migrating to JUnit 5:
https://issues.apache.org/jira/browse/SIS-457 The code compile but tests
are not yet enabled.
Posted by de...@apache.org.
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 26005cf90d854ec12402c2eb247a379774028102
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Mon Jun 3 22:48:13 2019 +0200
First patch from Michiel Rop for migrating to JUnit 5: https://issues.apache.org/jira/browse/SIS-457
The code compile but tests are not yet enabled.
---
.../org/apache/sis/console/AboutCommandTest.java | 2 +-
.../org/apache/sis/console/CRSCommandTest.java | 2 +-
.../org/apache/sis/console/CommandRunnerTest.java | 2 +-
.../org/apache/sis/console/HelpCommandTest.java | 2 +-
.../apache/sis/console/MetadataCommandTest.java | 2 +-
.../apache/sis/console/MimeTypeCommandTest.java | 2 +-
.../sis/openoffice/ReferencingFunctionsTest.java | 2 +-
.../org/apache/sis/openoffice/TransformerTest.java | 2 +-
.../util/resources/ResourceCompilerMojoTest.java | 4 +--
.../apache/sis/feature/AbstractOperationTest.java | 2 +-
.../apache/sis/feature/CharacteristicMapTest.java | 2 +-
.../sis/feature/CharacteristicTypeMapTest.java | 2 +-
.../sis/feature/DefaultAssociationRoleTest.java | 2 +-
.../sis/feature/DefaultAttributeTypeTest.java | 2 +-
.../apache/sis/feature/DefaultFeatureTypeTest.java | 2 +-
.../apache/sis/feature/EnvelopeOperationTest.java | 2 +-
.../org/apache/sis/feature/FeatureFormatTest.java | 2 +-
.../org/apache/sis/feature/FeatureTestCase.java | 2 +-
.../java/org/apache/sis/feature/FeaturesTest.java | 2 +-
.../org/apache/sis/feature/LinkOperationTest.java | 2 +-
.../sis/feature/MultiValuedAttributeTest.java | 2 +-
.../apache/sis/feature/PropertySingletonTest.java | 2 +-
.../sis/feature/SingletonAssociationTest.java | 2 +-
.../apache/sis/feature/SingletonAttributeTest.java | 2 +-
.../sis/feature/StringJoinOperationTest.java | 2 +-
.../builder/AssociationRoleBuilderTest.java | 2 +-
.../feature/builder/AttributeTypeBuilderTest.java | 2 +-
.../builder/CharacteristicTypeBuilderTest.java | 2 +-
.../feature/builder/FeatureTypeBuilderTest.java | 2 +-
.../internal/feature/AttributeConventionTest.java | 2 +-
.../org/apache/sis/internal/feature/ESRITest.java | 2 +-
.../sis/internal/feature/GeometriesTestCase.java | 2 +-
.../org/apache/sis/internal/feature/JTSTest.java | 2 +-
.../apache/sis/internal/feature/Java2DTest.java | 2 +-
.../internal/feature/j2d/ShapePropertiesTest.java | 2 +-
.../apache/sis/internal/feature/jts/JTSTest.java | 2 +-
.../internal/jaxb/IdentifierMapAdapterTest.java | 2 +-
.../internal/jaxb/ModifiableIdentifierMapTest.java | 2 +-
.../internal/jaxb/cat/CodeListMarshallingTest.java | 2 +-
.../sis/internal/jaxb/cat/EnumAdapterTest.java | 2 +-
.../sis/internal/jaxb/cat/EnumMarshallingTest.java | 2 +-
.../sis/internal/jaxb/gco/MultiplicityTest.java | 2 +-
.../sis/internal/jaxb/gco/PropertyTypeTest.java | 2 +-
.../sis/internal/jaxb/gco/StringAdapterTest.java | 2 +-
.../apache/sis/internal/jaxb/gml/MeasureTest.java | 2 +-
.../sis/internal/jaxb/gml/TimePeriodTest.java | 2 +-
.../internal/jaxb/lan/FreeTextMarshallingTest.java | 2 +-
.../sis/internal/jaxb/lan/LanguageCodeTest.java | 2 +-
.../sis/internal/jaxb/lan/OtherLocalesTest.java | 2 +-
.../sis/internal/jaxb/lan/PT_LocaleTest.java | 2 +-
.../metadata/replace/ServiceParameterTest.java | 2 +-
.../sis/internal/metadata/AxisNamesTest.java | 2 +-
.../apache/sis/internal/metadata/MergerTest.java | 2 +-
.../internal/metadata/MetadataUtilitiesTest.java | 2 +-
.../sis/internal/metadata/NameMeaningTest.java | 2 +-
.../internal/metadata/VerticalDatumTypesTest.java | 2 +-
.../sis/internal/metadata/WKTKeywordsTest.java | 2 +-
.../internal/metadata/sql/SQLUtilitiesTest.java | 2 +-
.../internal/metadata/sql/ScriptRunnerTest.java | 2 +-
.../sis/internal/metadata/sql/TypeMapperTest.java | 2 +-
.../sis/internal/simple/SimpleIdentifierTest.java | 2 +-
.../sis/internal/test/DocumentComparatorTest.java | 2 +-
.../apache/sis/internal/xml/XmlUtilitiesTest.java | 2 +-
.../java/org/apache/sis/io/wkt/ColorsTest.java | 2 +-
.../java/org/apache/sis/io/wkt/ConventionTest.java | 2 +-
.../java/org/apache/sis/io/wkt/ElementTest.java | 2 +-
.../java/org/apache/sis/io/wkt/FormatterTest.java | 2 +-
.../java/org/apache/sis/io/wkt/SymbolsTest.java | 2 +-
.../org/apache/sis/io/wkt/TransliteratorTest.java | 2 +-
.../apache/sis/metadata/AbstractMetadataTest.java | 2 +-
.../java/org/apache/sis/metadata/HashCodeTest.java | 2 +-
.../apache/sis/metadata/InformationMapTest.java | 2 +-
.../apache/sis/metadata/MetadataCopierTest.java | 2 +-
.../apache/sis/metadata/MetadataStandardTest.java | 2 +-
.../sis/metadata/ModifiableMetadataTest.java | 2 +-
.../java/org/apache/sis/metadata/NameMapTest.java | 2 +-
.../apache/sis/metadata/PropertyAccessorTest.java | 2 +-
.../sis/metadata/PropertyConsistencyCheck.java | 2 +-
.../sis/metadata/PropertyInformationTest.java | 2 +-
.../java/org/apache/sis/metadata/PrunerTest.java | 2 +-
.../org/apache/sis/metadata/SpecialCasesTest.java | 2 +-
.../apache/sis/metadata/TreeNodeChildrenTest.java | 2 +-
.../java/org/apache/sis/metadata/TreeNodeTest.java | 2 +-
.../apache/sis/metadata/TreeTableFormatTest.java | 2 +-
.../org/apache/sis/metadata/TreeTableViewTest.java | 2 +-
.../java/org/apache/sis/metadata/TypeMapTest.java | 2 +-
.../java/org/apache/sis/metadata/ValueMapTest.java | 2 +-
.../org/apache/sis/metadata/iso/APIVerifier.java | 2 +-
.../apache/sis/metadata/iso/AllMetadataTest.java | 2 +-
.../sis/metadata/iso/CustomMetadataTest.java | 2 +-
.../sis/metadata/iso/DefaultMetadataTest.java | 2 +-
.../sis/metadata/iso/ImmutableIdentifierTest.java | 2 +-
.../sis/metadata/iso/citation/CitationsTest.java | 2 +-
.../iso/citation/DefaultCitationDateTest.java | 2 +-
.../metadata/iso/citation/DefaultCitationTest.java | 2 +-
.../metadata/iso/citation/DefaultContactTest.java | 2 +-
.../iso/citation/DefaultResponsibilityTest.java | 2 +-
.../constraint/DefaultLegalConstraintsTest.java | 2 +-
.../sis/metadata/iso/extent/DefaultExtentTest.java | 2 +-
.../extent/DefaultGeographicBoundingBoxTest.java | 11 +++++--
.../sis/metadata/iso/extent/ExtentsTest.java | 2 +-
.../identification/DefaultBrowseGraphicTest.java | 2 +-
.../identification/DefaultCoupledResourceTest.java | 2 +-
.../DefaultDataIdentificationTest.java | 2 +-
.../iso/identification/DefaultKeywordsTest.java | 2 +-
.../DefaultRepresentativeFractionTest.java | 2 +-
.../iso/identification/DefaultResolutionTest.java | 2 +-
.../DefaultServiceIdentificationTest.java | 2 +-
.../metadata/iso/lineage/DefaultLineageTest.java | 2 +-
.../iso/lineage/DefaultProcessStepTest.java | 2 +-
.../maintenance/DefaultScopeDescriptionTest.java | 2 +-
.../metadata/iso/quality/AbstractElementTest.java | 2 +-
.../quality/AbstractPositionalAccuracyTest.java | 2 +-
.../iso/spatial/DefaultGeorectifiedTest.java | 2 +-
.../sis/metadata/sql/IdentifierGeneratorTest.java | 2 +-
.../sis/metadata/sql/MetadataFallbackVerifier.java | 2 +-
.../sis/metadata/sql/MetadataSourceTest.java | 2 +-
.../sis/metadata/sql/MetadataWriterTest.java | 2 +-
.../sis/test/xml/AnnotationConsistencyCheck.java | 2 +-
.../apache/sis/util/iso/DefaultLocalNameTest.java | 2 +-
.../sis/util/iso/DefaultNameFactoryTest.java | 2 +-
.../sis/util/iso/DefaultRecordSchemaTest.java | 2 +-
.../org/apache/sis/util/iso/DefaultRecordTest.java | 2 +-
.../apache/sis/util/iso/DefaultRecordTypeTest.java | 2 +-
.../apache/sis/util/iso/DefaultScopedNameTest.java | 2 +-
.../apache/sis/util/iso/NameMarshallingTest.java | 2 +-
.../java/org/apache/sis/util/iso/NamesTest.java | 2 +-
.../org/apache/sis/util/iso/TypeNamesTest.java | 2 +-
.../java/org/apache/sis/util/iso/TypesTest.java | 2 +-
.../sis/xml/CharSequenceSubstitutionTest.java | 2 +-
.../java/org/apache/sis/xml/LegacyCodesTest.java | 2 +-
.../org/apache/sis/xml/MarshallerPoolTest.java | 2 +-
.../java/org/apache/sis/xml/NamespacesTest.java | 2 +-
.../apache/sis/xml/NilReasonMarshallingTest.java | 2 +-
.../java/org/apache/sis/xml/NilReasonTest.java | 2 +-
.../sis/xml/OGCNamespacePrefixMapperTest.java | 2 +-
.../java/org/apache/sis/xml/TransformerTest.java | 2 +-
.../apache/sis/xml/TransformingNamespacesTest.java | 2 +-
.../org/apache/sis/xml/UUIDMarshallingTest.java | 2 +-
.../org/apache/sis/xml/ValueConverterTest.java | 2 +-
.../org/apache/sis/xml/XLinkMarshallingTest.java | 2 +-
.../test/java/org/apache/sis/xml/XLinkTest.java | 2 +-
.../org/apache/sis/coverage/CategoryListTest.java | 2 +-
.../java/org/apache/sis/coverage/CategoryTest.java | 2 +-
.../apache/sis/coverage/SampleDimensionTest.java | 2 +-
.../sis/coverage/grid/GridDerivationTest.java | 2 +-
.../apache/sis/coverage/grid/GridExtentTest.java | 2 +-
.../apache/sis/coverage/grid/GridGeometryTest.java | 2 +-
.../sis/coverage/grid/PixelTranslationTest.java | 2 +-
.../org/apache/sis/image/DefaultIteratorTest.java | 2 +-
.../coverage/BufferedGridCoverageTest.java | 2 +-
.../sis/internal/raster/ScaledColorSpaceTest.java | 2 +-
.../gazetteer/GeohashReferenceSystemTest.java | 2 +-
.../referencing/gazetteer/LocationFormatTest.java | 2 +-
.../referencing/gazetteer/LocationTypeTest.java | 2 +-
.../gazetteer/MilitaryGridReferenceSystemTest.java | 2 +-
.../gazetteer/ReferencingByIdentifiersTest.java | 2 +-
.../apache/sis/distance/LatLonPointRadiusTest.java | 2 +-
.../sis/geometry/AbstractDirectPositionTest.java | 2 +-
.../apache/sis/geometry/AbstractEnvelopeTest.java | 2 +-
.../org/apache/sis/geometry/ArrayEnvelopeTest.java | 10 ++++--
.../apache/sis/geometry/CoordinateFormatTest.java | 2 +-
.../org/apache/sis/geometry/CurveExtremumTest.java | 2 +-
.../apache/sis/geometry/DirectPosition1DTest.java | 2 +-
.../apache/sis/geometry/DirectPosition2DTest.java | 2 +-
.../org/apache/sis/geometry/Envelope2DTest.java | 2 +-
.../apache/sis/geometry/EnvelopeReducerTest.java | 2 +-
.../org/apache/sis/geometry/EnvelopesTest.java | 2 +-
.../sis/geometry/GeneralDirectPositionTest.java | 2 +-
.../apache/sis/geometry/GeneralEnvelopeTest.java | 2 +-
.../apache/sis/geometry/ImmutableEnvelopeTest.java | 2 +-
.../org/apache/sis/geometry/SubEnvelopeTest.java | 2 +-
.../org/apache/sis/geometry/TransformTestCase.java | 2 +-
.../CC_GeneralOperationParameterTest.java | 2 +-
.../CC_OperationParameterGroupTest.java | 2 +-
.../sis/internal/jaxb/referencing/CodeTest.java | 2 +-
.../referencing/SecondDefiningParameterTest.java | 2 +-
.../sis/internal/metadata/AxisDirectionsTest.java | 2 +-
.../metadata/EllipsoidalHeightCombinerTest.java | 2 +-
.../referencing/CoordinateOperationsTest.java | 2 +-
.../referencing/DefinitionVerifierTest.java | 2 +-
.../sis/internal/referencing/FormulasTest.java | 2 +-
.../sis/internal/referencing/LazySetTest.java | 2 +-
.../PositionalAccuracyConstantTest.java | 2 +-
.../referencing/ReferencingUtilitiesTest.java | 2 +-
.../referencing/ServicesForMetadataTest.java | 2 +-
.../sis/internal/referencing/WKTUtilitiesTest.java | 2 +-
.../referencing/WraparoundAdjustmentTest.java | 2 +-
.../referencing/j2d/ShapeUtilitiesTest.java | 2 +-
.../internal/referencing/provider/AffineTest.java | 2 +-
.../provider/CoordinateFrameRotationTest.java | 2 +-
.../provider/DatumShiftGridFileTest.java | 2 +-
.../FranceGeocentricInterpolationTest.java | 2 +-
.../provider/GeocentricTranslationTest.java | 2 +-
.../referencing/provider/Geographic3Dto2DTest.java | 2 +-
.../provider/GeographicOffsetsTest.java | 2 +-
.../provider/LongitudeRotationTest.java | 2 +-
.../referencing/provider/MapProjectionTest.java | 2 +-
.../referencing/provider/MolodenskyTest.java | 2 +-
.../internal/referencing/provider/NADCONTest.java | 2 +-
.../internal/referencing/provider/NTv2Test.java | 2 +-
.../provider/PositionVector7ParamTest.java | 2 +-
.../referencing/provider/ProvidersTest.java | 2 +-
.../provider/TransverseMercatorTest.java | 2 +-
.../org/apache/sis/io/wkt/ComparisonWithEPSG.java | 2 +-
.../sis/io/wkt/GeodeticObjectParserTest.java | 2 +-
.../apache/sis/io/wkt/MathTransformParserTest.java | 2 +-
.../java/org/apache/sis/io/wkt/WKTFormatTest.java | 2 +-
.../DefaultParameterDescriptorGroupTest.java | 2 +-
.../parameter/DefaultParameterDescriptorTest.java | 2 +-
.../parameter/DefaultParameterValueGroupTest.java | 2 +-
.../sis/parameter/DefaultParameterValueTest.java | 2 +-
.../sis/parameter/MapProjectionParametersTest.java | 2 +-
.../parameter/MatrixParametersAlphaNumTest.java | 2 +-
.../apache/sis/parameter/MatrixParametersTest.java | 2 +-
.../apache/sis/parameter/ParameterBuilderTest.java | 2 +-
.../apache/sis/parameter/ParameterFormatTest.java | 2 +-
.../sis/parameter/ParameterMarshallingTest.java | 2 +-
.../org/apache/sis/parameter/ParametersTest.java | 2 +-
.../apache/sis/parameter/TensorParametersTest.java | 2 +-
.../org/apache/sis/parameter/TensorValuesTest.java | 2 +-
.../UnmodifiableParameterValueGroupTest.java | 2 +-
.../parameter/UnmodifiableParameterValueTest.java | 2 +-
.../referencing/AbstractIdentifiedObjectTest.java | 2 +-
.../referencing/AbstractReferenceSystemTest.java | 2 +-
.../sis/referencing/AuthorityFactoriesTest.java | 2 +-
.../org/apache/sis/referencing/BuilderTest.java | 2 +-
.../java/org/apache/sis/referencing/CRSTest.java | 2 +-
.../org/apache/sis/referencing/CommonCRSTest.java | 2 +-
.../sis/referencing/EPSGFactoryFallbackTest.java | 2 +-
.../sis/referencing/GeodeticCalculatorTest.java | 2 +-
.../sis/referencing/IdentifiedObjectsTest.java | 2 +-
.../sis/referencing/NamedIdentifierTest.java | 2 +-
.../sis/referencing/StandardDefinitionsTest.java | 2 +-
.../sis/referencing/crs/AbstractCRSTest.java | 2 +-
.../referencing/crs/DefaultCompoundCRSTest.java | 2 +-
.../sis/referencing/crs/DefaultDerivedCRSTest.java | 2 +-
.../referencing/crs/DefaultEngineeringCRSTest.java | 2 +-
.../referencing/crs/DefaultGeocentricCRSTest.java | 2 +-
.../referencing/crs/DefaultGeodeticCRSTest.java | 2 +-
.../referencing/crs/DefaultGeographicCRSTest.java | 2 +-
.../sis/referencing/crs/DefaultImageCRSTest.java | 2 +-
.../referencing/crs/DefaultProjectedCRSTest.java | 2 +-
.../referencing/crs/DefaultTemporalCRSTest.java | 2 +-
.../referencing/crs/DefaultVerticalCRSTest.java | 2 +-
.../sis/referencing/crs/HardCodedCRSTest.java | 2 +-
.../apache/sis/referencing/crs/SubTypesTest.java | 2 +-
.../apache/sis/referencing/cs/AbstractCSTest.java | 2 +-
.../org/apache/sis/referencing/cs/CodesTest.java | 2 +-
.../sis/referencing/cs/CoordinateSystemsTest.java | 2 +-
.../sis/referencing/cs/DefaultCartesianCSTest.java | 2 +-
.../sis/referencing/cs/DefaultCompoundCSTest.java | 2 +-
.../cs/DefaultCoordinateSystemAxisTest.java | 2 +-
.../referencing/cs/DefaultCylindricalCSTest.java | 2 +-
.../referencing/cs/DefaultEllipsoidalCSTest.java | 2 +-
.../sis/referencing/cs/DefaultPolarCSTest.java | 2 +-
.../sis/referencing/cs/DefaultSphericalCSTest.java | 2 +-
.../referencing/cs/DirectionAlongMeridianTest.java | 2 +-
.../apache/sis/referencing/cs/HardCodedCSTest.java | 2 +-
.../apache/sis/referencing/cs/NormalizerTest.java | 2 +-
.../referencing/datum/BursaWolfParametersTest.java | 2 +-
.../referencing/datum/DefaultEllipsoidTest.java | 2 +-
.../datum/DefaultGeodeticDatumTest.java | 2 +-
.../datum/DefaultPrimeMeridianTest.java | 2 +-
.../datum/DefaultTemporalDatumTest.java | 2 +-
.../datum/DefaultVerticalDatumTest.java | 2 +-
.../referencing/datum/TimeDependentBWPTest.java | 2 +-
.../factory/AuthorityFactoryProxyTest.java | 2 +-
.../factory/CommonAuthorityFactoryTest.java | 2 +-
.../factory/ConcurrentAuthorityFactoryTest.java | 2 +-
.../factory/IdentifiedObjectFinderTest.java | 2 +-
.../factory/MultiAuthoritiesFactoryTest.java | 2 +-
.../referencing/factory/sql/EPSGFactoryTest.java | 2 +-
.../referencing/factory/sql/EPSGInstallerTest.java | 2 +-
.../sis/referencing/factory/sql/TableInfoTest.java | 2 +-
.../factory/sql/epsg/DataScriptFormatterTest.java | 2 +-
.../operation/AbstractSingleOperationTest.java | 2 +-
.../operation/CoordinateOperationFinderTest.java | 2 +-
.../operation/CoordinateOperationRegistryTest.java | 2 +-
.../DefaultConcatenatedOperationTest.java | 2 +-
.../operation/DefaultConversionTest.java | 2 +-
.../DefaultCoordinateOperationFactoryTest.java | 2 +-
.../referencing/operation/DefaultFormulaTest.java | 2 +-
.../operation/DefaultOperationMethodTest.java | 2 +-
.../operation/DefaultPassThroughOperationTest.java | 2 +-
.../operation/DefaultTransformationTest.java | 2 +-
.../operation/SingleOperationMarshallingTest.java | 2 +-
.../builder/LinearTransformBuilderTest.java | 2 +-
.../builder/LocalizationGridBuilderTest.java | 2 +-
.../operation/builder/ResidualGridTest.java | 2 +-
.../operation/matrix/AffineTransforms2DTest.java | 2 +-
.../operation/matrix/GeneralMatrixTest.java | 2 +-
.../referencing/operation/matrix/MatricesTest.java | 2 +-
.../referencing/operation/matrix/Matrix1Test.java | 2 +-
.../referencing/operation/matrix/Matrix2Test.java | 2 +-
.../referencing/operation/matrix/Matrix3Test.java | 2 +-
.../referencing/operation/matrix/Matrix4Test.java | 2 +-
.../operation/matrix/MatrixTestCase.java | 2 +-
.../operation/matrix/NonSquareMatrixTest.java | 2 +-
.../referencing/operation/matrix/SolverTest.java | 2 +-
.../operation/projection/AlbersEqualAreaTest.java | 2 +-
.../projection/ConformalProjectionTest.java | 2 +-
.../projection/CylindricalEqualAreaTest.java | 2 +-
.../projection/EqualAreaProjectionTest.java | 2 +-
.../operation/projection/EquirectangularTest.java | 2 +-
.../operation/projection/InitializerTest.java | 2 +-
.../projection/LambertConicConformalTest.java | 2 +-
.../operation/projection/MercatorTest.java | 2 +-
.../operation/projection/MeridianArcTest.java | 2 +-
.../operation/projection/MollweideTest.java | 2 +-
.../projection/NormalizedProjectionTest.java | 2 +-
.../projection/ObliqueStereographicTest.java | 2 +-
.../projection/PolarStereographicTest.java | 2 +-
.../operation/projection/PolyconicTest.java | 2 +-
.../operation/projection/SinusoidalTest.java | 2 +-
.../projection/TransverseMercatorTest.java | 2 +-
.../operation/projection/ZonedGridSystemTest.java | 2 +-
.../transform/AbridgedMolodenskyTransformTest.java | 2 +-
.../transform/AbstractMathTransformTest.java | 2 +-
.../operation/transform/CartesianToPolarTest.java | 2 +-
.../transform/CartesianToSphericalTest.java | 2 +-
.../transform/ConcatenatedTransformTest.java | 2 +-
.../transform/ContextualParametersTest.java | 2 +-
.../operation/transform/CoordinateDomainTest.java | 2 +-
.../transform/CoordinateSystemTransformTest.java | 2 +-
.../operation/transform/CopyTransformTest.java | 2 +-
.../transform/DefaultMathTransformFactoryTest.java | 2 +-
.../transform/EllipsoidToCentricTransformTest.java | 2 +-
.../transform/ExponentialTransform1DTest.java | 2 +-
.../InterpolatedGeocentricTransformTest.java | 2 +-
.../InterpolatedMolodenskyTransformTest.java | 2 +-
.../transform/InterpolatedTransformTest.java | 2 +-
.../operation/transform/IterationStrategyTest.java | 2 +-
.../transform/LinearInterpolator1DTest.java | 2 +-
.../operation/transform/LinearTransformTest.java | 2 +-
.../transform/LogarithmicTransform1DTest.java | 2 +-
.../operation/transform/MathTransformsTest.java | 2 +-
.../transform/MolodenskyTransformTest.java | 2 +-
.../transform/OperationMethodSetTest.java | 2 +-
.../transform/PassThroughTransformTest.java | 2 +-
.../operation/transform/PolarToCartesianTest.java | 2 +-
.../transform/ProjectiveTransformTest.java | 2 +-
.../operation/transform/ScaleTransformTest.java | 2 +-
.../transform/SpecializableTransformTest.java | 2 +-
.../transform/SphericalToCartesianTest.java | 2 +-
.../operation/transform/TransferFunctionTest.java | 2 +-
.../transform/TransformSeparatorTest.java | 2 +-
.../transform/TranslationTransformTest.java | 2 +-
.../sis/test/integration/ConsistencyTest.java | 2 +-
.../test/integration/CoordinateOperationTest.java | 2 +-
.../integration/CoordinateReferenceSystemTest.java | 2 +-
.../sis/test/integration/DatumShiftTest.java | 2 +-
.../apache/sis/test/integration/MetadataTest.java | 2 +-
.../sis/internal/converter/AngleConverterTest.java | 2 +-
.../sis/internal/converter/ArrayConverterTest.java | 2 +-
.../internal/converter/ConverterRegistryTest.java | 2 +-
.../internal/converter/FallbackConverterTest.java | 2 +-
.../internal/converter/NumberConverterTest.java | 2 +-
.../sis/internal/converter/PathConverterTest.java | 2 +-
.../internal/converter/StringConverterTest.java | 2 +-
.../sis/internal/converter/SystemRegistryTest.java | 2 +-
.../apache/sis/internal/system/LoggersTest.java | 2 +-
.../system/ReferenceQueueConsumerTest.java | 14 +++++---
.../org/apache/sis/internal/test/AssertTest.java | 2 +-
.../sis/internal/test/TestUtilitiesTest.java | 2 +-
.../apache/sis/internal/util/AbstractMapTest.java | 2 +-
.../java/org/apache/sis/internal/util/BagTest.java | 2 +-
.../sis/internal/util/CheckedArrayListTest.java | 2 +-
.../apache/sis/internal/util/CitationsTest.java | 2 +-
.../sis/internal/util/CollectionsExtTest.java | 2 +-
.../sis/internal/util/DefinitionURITest.java | 2 +-
.../apache/sis/internal/util/DoubleDoubleTest.java | 2 +-
.../sis/internal/util/ListOfUnknownSizeTest.java | 2 +-
.../internal/util/LocalizedParseExceptionTest.java | 2 +-
.../org/apache/sis/internal/util/NumericsTest.java | 2 +-
.../sis/internal/util/StandardDateFormatTest.java | 2 +-
.../org/apache/sis/internal/util/StringsTest.java | 2 +-
.../org/apache/sis/internal/util/X364Test.java | 2 +-
.../org/apache/sis/internal/util/XPathsTest.java | 2 +-
.../java/org/apache/sis/io/AppenderTestCase.java | 2 +-
.../java/org/apache/sis/io/LineAppenderTest.java | 2 +-
.../java/org/apache/sis/io/TableAppenderTest.java | 2 +-
.../org/apache/sis/math/DecimalFunctionsTest.java | 2 +-
.../java/org/apache/sis/math/FractionTest.java | 2 +-
.../apache/sis/math/LinearlyDerivedVectorTest.java | 2 +-
.../org/apache/sis/math/MathFunctionsTest.java | 2 +-
.../test/java/org/apache/sis/math/PlaneTest.java | 2 +-
.../org/apache/sis/math/RepeatedVectorTest.java | 2 +-
.../org/apache/sis/math/StatisticsFormatTest.java | 2 +-
.../java/org/apache/sis/math/StatisticsTest.java | 2 +-
.../test/java/org/apache/sis/math/VectorTest.java | 2 +-
.../org/apache/sis/measure/AngleFormatTest.java | 38 ++++++++++++++--------
.../java/org/apache/sis/measure/AngleTest.java | 2 +-
.../apache/sis/measure/ConventionalUnitTest.java | 2 +-
.../java/org/apache/sis/measure/DateRangeTest.java | 2 +-
.../measure/FormattedCharacterIteratorTest.java | 2 +-
.../apache/sis/measure/LinearConverterTest.java | 2 +-
.../apache/sis/measure/MeasurementRangeTest.java | 2 +-
.../org/apache/sis/measure/NumberRangeTest.java | 2 +-
.../java/org/apache/sis/measure/PrefixesTest.java | 2 +-
.../org/apache/sis/measure/QuantitiesTest.java | 2 +-
.../org/apache/sis/measure/RangeFormatTest.java | 2 +-
.../java/org/apache/sis/measure/RangeTest.java | 21 ++++++++----
.../java/org/apache/sis/measure/ScalarTest.java | 2 +-
.../sis/measure/SexagesimalConverterTest.java | 2 +-
.../org/apache/sis/measure/SystemUnitTest.java | 2 +-
.../org/apache/sis/measure/UnitDimensionTest.java | 2 +-
.../org/apache/sis/measure/UnitFormatTest.java | 2 +-
.../org/apache/sis/measure/UnitServicesTest.java | 2 +-
.../java/org/apache/sis/measure/UnitsTest.java | 2 +-
.../java/org/apache/sis/setup/OptionKeyTest.java | 2 +-
.../test/java/org/apache/sis/test/TestRunner.java | 2 +-
.../org/apache/sis/util/ArgumentChecksTest.java | 2 +-
.../java/org/apache/sis/util/ArraysExtTest.java | 2 +-
.../org/apache/sis/util/CharSequencesTest.java | 2 +-
.../java/org/apache/sis/util/CharactersTest.java | 2 +-
.../test/java/org/apache/sis/util/ClassesTest.java | 2 +-
.../java/org/apache/sis/util/ExceptionsTest.java | 2 +-
.../test/java/org/apache/sis/util/LocalesTest.java | 2 +-
.../test/java/org/apache/sis/util/NumbersTest.java | 2 +-
.../org/apache/sis/util/StringBuildersTest.java | 2 +-
.../test/java/org/apache/sis/util/VersionTest.java | 2 +-
.../org/apache/sis/util/collection/CacheTest.java | 2 +-
.../sis/util/collection/CodeListSetTest.java | 2 +-
.../sis/util/collection/DefaultTreeTableTest.java | 2 +-
.../apache/sis/util/collection/DerivedMapTest.java | 2 +-
.../apache/sis/util/collection/DerivedSetTest.java | 2 +-
.../util/collection/FrequencySortedSetTest.java | 2 +-
.../sis/util/collection/IntegerListTest.java | 2 +-
.../apache/sis/util/collection/RangeSetTest.java | 2 +-
.../sis/util/collection/TableColumnTest.java | 2 +-
.../sis/util/collection/TreeTableFormatTest.java | 2 +-
.../apache/sis/util/collection/TreeTablesTest.java | 2 +-
.../sis/util/collection/WeakHashSetTest.java | 2 +-
.../sis/util/collection/WeakValueHashMapTest.java | 2 +-
.../util/iso/DefaultInternationalStringTest.java | 2 +-
.../util/iso/SimpleInternationalStringTest.java | 2 +-
.../sis/util/logging/MonolineFormatterTest.java | 2 +-
.../sis/util/logging/PerformanceLevelTest.java | 2 +-
.../sis/util/logging/WarningListenersTest.java | 2 +-
.../util/resources/IndexedResourceBundleTest.java | 2 +-
.../org/apache/sis/util/resources/LoaderTest.java | 2 +-
pom.xml | 30 +++++++++++++++--
.../profile/fra/DataIdentificationTest.java | 2 +-
.../profile/fra/DirectReferenceSystemTest.java | 2 +-
.../sis/profile/france/FrenchProfileTest.java | 2 +-
.../earthobservation/LandsatReaderTest.java | 2 +-
.../earthobservation/LandsatStoreProviderTest.java | 2 +-
.../apache/sis/storage/gdal/IntegrationTest.java | 2 +-
.../java/org/apache/sis/storage/gdal/PJTest.java | 2 +-
.../apache/sis/storage/gdal/Proj4FactoryTest.java | 2 +-
.../apache/sis/storage/gdal/Proj4ParserTest.java | 2 +-
.../org/apache/sis/storage/gdal/Proj4Test.java | 2 +-
.../apache/sis/storage/geotiff/CRSBuilderTest.java | 2 +-
.../sis/storage/geotiff/CompressionTest.java | 2 +-
.../apache/sis/storage/geotiff/GeoKeysTest.java | 2 +-
.../org/apache/sis/storage/geotiff/TypeTest.java | 2 +-
.../apache/sis/internal/netcdf/DataTypeTest.java | 2 +-
.../apache/sis/internal/netcdf/DecoderTest.java | 2 +-
.../org/apache/sis/internal/netcdf/GridTest.java | 2 +-
.../internal/netcdf/SatelliteGroundTrackTest.java | 2 +-
.../apache/sis/internal/netcdf/VariableTest.java | 2 +-
.../sis/storage/netcdf/MetadataReaderTest.java | 2 +-
.../storage/netcdf/NetcdfStoreProviderTest.java | 2 +-
.../apache/sis/storage/netcdf/NetcdfStoreTest.java | 2 +-
.../internal/shapefile/jdbc/DBFConnectionTest.java | 28 +++++++++-------
.../internal/shapefile/jdbc/DBFResultSetTest.java | 2 +-
.../shapefile/jdbc/sql/WhereClauseTest.java | 2 +-
.../sis/storage/shapefile/ShapeFileTest.java | 2 +-
.../org/apache/sis/storage/sql/SQLStoreTest.java | 2 +-
.../internal/storage/AbstractGridResourceTest.java | 2 +-
.../apache/sis/internal/storage/CodeTypeTest.java | 2 +-
.../sis/internal/storage/MetadataBuilderTest.java | 2 +-
.../internal/storage/csv/StoreProviderTest.java | 2 +-
.../apache/sis/internal/storage/csv/StoreTest.java | 2 +-
.../sis/internal/storage/folder/StoreTest.java | 2 +-
.../internal/storage/io/ChannelDataInputTest.java | 2 +-
.../internal/storage/io/ChannelDataOutputTest.java | 2 +-
.../storage/io/ChannelImageInputStreamTest.java | 2 +-
.../storage/io/ChannelImageOutputStreamTest.java | 2 +-
.../storage/io/HyperRectangleReaderTest.java | 2 +-
.../sis/internal/storage/io/IOUtilitiesTest.java | 2 +-
.../storage/io/RewindableLineReaderTest.java | 2 +-
.../internal/storage/query/SimpleQueryTest.java | 2 +-
.../internal/storage/wkt/StoreProviderTest.java | 2 +-
.../apache/sis/internal/storage/wkt/StoreTest.java | 2 +-
.../internal/storage/xml/MimeTypeDetectorTest.java | 2 +-
.../internal/storage/xml/StoreProviderTest.java | 2 +-
.../apache/sis/internal/storage/xml/StoreTest.java | 2 +-
.../org/apache/sis/storage/DataStoresTest.java | 2 +-
.../org/apache/sis/storage/FeatureNamingTest.java | 2 +-
.../org/apache/sis/storage/ProbeResultTest.java | 2 +-
.../apache/sis/storage/StorageConnectorTest.java | 2 +-
.../sis/internal/storage/gpx/MetadataTest.java | 2 +-
.../sis/internal/storage/gpx/ReaderTest.java | 2 +-
.../apache/sis/internal/storage/gpx/TypesTest.java | 2 +-
.../sis/internal/storage/gpx/WriterTest.java | 2 +-
497 files changed, 598 insertions(+), 536 deletions(-)
diff --git a/application/sis-console/src/test/java/org/apache/sis/console/AboutCommandTest.java b/application/sis-console/src/test/java/org/apache/sis/console/AboutCommandTest.java
index 2678390..b9ad3de 100644
--- a/application/sis-console/src/test/java/org/apache/sis/console/AboutCommandTest.java
+++ b/application/sis-console/src/test/java/org/apache/sis/console/AboutCommandTest.java
@@ -20,7 +20,7 @@ import org.apache.sis.util.Version;
import org.apache.sis.util.CharSequences;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/application/sis-console/src/test/java/org/apache/sis/console/CRSCommandTest.java b/application/sis-console/src/test/java/org/apache/sis/console/CRSCommandTest.java
index 242e96d..284f7fd 100644
--- a/application/sis-console/src/test/java/org/apache/sis/console/CRSCommandTest.java
+++ b/application/sis-console/src/test/java/org/apache/sis/console/CRSCommandTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.console;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/application/sis-console/src/test/java/org/apache/sis/console/CommandRunnerTest.java b/application/sis-console/src/test/java/org/apache/sis/console/CommandRunnerTest.java
index ddc899e..6f70656 100644
--- a/application/sis-console/src/test/java/org/apache/sis/console/CommandRunnerTest.java
+++ b/application/sis-console/src/test/java/org/apache/sis/console/CommandRunnerTest.java
@@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit;
import java.nio.charset.StandardCharsets;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/application/sis-console/src/test/java/org/apache/sis/console/HelpCommandTest.java b/application/sis-console/src/test/java/org/apache/sis/console/HelpCommandTest.java
index 9b207f7..9d5f2f5 100644
--- a/application/sis-console/src/test/java/org/apache/sis/console/HelpCommandTest.java
+++ b/application/sis-console/src/test/java/org/apache/sis/console/HelpCommandTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.console;
import java.io.IOException;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/application/sis-console/src/test/java/org/apache/sis/console/MetadataCommandTest.java b/application/sis-console/src/test/java/org/apache/sis/console/MetadataCommandTest.java
index 8dcd9dd..8ba8abd 100644
--- a/application/sis-console/src/test/java/org/apache/sis/console/MetadataCommandTest.java
+++ b/application/sis-console/src/test/java/org/apache/sis/console/MetadataCommandTest.java
@@ -21,7 +21,7 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/application/sis-console/src/test/java/org/apache/sis/console/MimeTypeCommandTest.java b/application/sis-console/src/test/java/org/apache/sis/console/MimeTypeCommandTest.java
index 294c976..9aa0d1a 100644
--- a/application/sis-console/src/test/java/org/apache/sis/console/MimeTypeCommandTest.java
+++ b/application/sis-console/src/test/java/org/apache/sis/console/MimeTypeCommandTest.java
@@ -20,7 +20,7 @@ import java.net.URL;
import org.apache.sis.internal.storage.gpx.MetadataTest;
import org.apache.sis.metadata.xml.TestUsingFile;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static org.apache.sis.metadata.iso.extent.DefaultExtentTest.FILENAME;
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 ccb26f3..3d4c80e 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
@@ -23,7 +23,7 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.BeforeClass;
import org.junit.AfterClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static org.junit.Assume.assumeFalse;
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 5401e00..fe6198a 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
@@ -24,7 +24,7 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
import org.junit.BeforeClass;
import org.junit.AfterClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static org.junit.Assume.assumeTrue;
diff --git a/core/sis-build-helper/src/test/java/org/apache/sis/util/resources/ResourceCompilerMojoTest.java b/core/sis-build-helper/src/test/java/org/apache/sis/util/resources/ResourceCompilerMojoTest.java
index 1e355d3..9119ec2 100644
--- a/core/sis-build-helper/src/test/java/org/apache/sis/util/resources/ResourceCompilerMojoTest.java
+++ b/core/sis-build-helper/src/test/java/org/apache/sis/util/resources/ResourceCompilerMojoTest.java
@@ -17,9 +17,9 @@
package org.apache.sis.util.resources;
import java.io.File;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/AbstractOperationTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/AbstractOperationTest.java
index a4c3346..564faa8 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/AbstractOperationTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/AbstractOperationTest.java
@@ -20,7 +20,7 @@ import org.opengis.parameter.ParameterDescriptor;
import org.apache.sis.parameter.ParameterBuilder;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.util.Collections.singletonMap;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicMapTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicMapTest.java
index c40f504..7b799cb 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicMapTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicMapTest.java
@@ -22,7 +22,7 @@ import java.util.AbstractMap.SimpleEntry;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicTypeMapTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicTypeMapTest.java
index d7ae539..7933527 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicTypeMapTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicTypeMapTest.java
@@ -20,7 +20,7 @@ import java.util.Map;
import java.util.AbstractMap.SimpleEntry;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.util.Collections.singletonMap;
import static org.apache.sis.feature.DefaultAssociationRole.NAME_KEY;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java
index ab4c8a1..7a2a237 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java
@@ -23,7 +23,7 @@ import org.apache.sis.internal.system.DefaultFactories;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.util.Collections.singletonMap;
import static org.apache.sis.feature.DefaultAssociationRole.NAME_KEY;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAttributeTypeTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAttributeTypeTest.java
index 32e383c..6bfe16b 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAttributeTypeTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAttributeTypeTest.java
@@ -24,7 +24,7 @@ import org.opengis.util.GenericName;
import org.opengis.util.InternationalString;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.util.Collections.singletonMap;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultFeatureTypeTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultFeatureTypeTest.java
index 0cba383..921b846 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultFeatureTypeTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultFeatureTypeTest.java
@@ -26,7 +26,7 @@ import org.apache.sis.internal.system.DefaultFactories;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/EnvelopeOperationTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/EnvelopeOperationTest.java
index bcc21b7..87de1e6 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/EnvelopeOperationTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/EnvelopeOperationTest.java
@@ -32,7 +32,7 @@ import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.ReferencingAssert.*;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureFormatTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureFormatTest.java
index dff7027..1692859 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureFormatTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureFormatTest.java
@@ -26,7 +26,7 @@ import java.util.Random;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestUtilities;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureTestCase.java b/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureTestCase.java
index 760a14f..b0ed456 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureTestCase.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureTestCase.java
@@ -28,7 +28,7 @@ import org.apache.sis.util.iso.SimpleInternationalString;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/FeaturesTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/FeaturesTest.java
index 73b4721..055765e 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/FeaturesTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/FeaturesTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.feature;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/LinkOperationTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/LinkOperationTest.java
index 3e436da..cc10edb 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/LinkOperationTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/LinkOperationTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.feature;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static java.util.Collections.singletonMap;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/MultiValuedAttributeTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/MultiValuedAttributeTest.java
index e4c8f1e..52a7cf5 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/MultiValuedAttributeTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/MultiValuedAttributeTest.java
@@ -21,7 +21,7 @@ import java.util.HashMap;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/PropertySingletonTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/PropertySingletonTest.java
index fc6497e..e82466b 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/PropertySingletonTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/PropertySingletonTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.feature;
import java.util.Set;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static java.util.Collections.singleton;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAssociationTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAssociationTest.java
index 89e4c05..63fa738 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAssociationTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAssociationTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.feature;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.util.Collections.singletonMap;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAttributeTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAttributeTest.java
index 2c177f6..7df5c23 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAttributeTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAttributeTest.java
@@ -25,7 +25,7 @@ import org.opengis.metadata.maintenance.ScopeCode;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/StringJoinOperationTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/StringJoinOperationTest.java
index aa94159..184fb20 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/StringJoinOperationTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/StringJoinOperationTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.feature;
import java.util.Collections;
import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.sis.internal.feature.AttributeConvention;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/builder/AssociationRoleBuilderTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/builder/AssociationRoleBuilderTest.java
index 0f6ff88..c3c147e 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/builder/AssociationRoleBuilderTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/builder/AssociationRoleBuilderTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.feature.builder;
import org.apache.sis.referencing.NamedIdentifier;
import org.apache.sis.util.iso.SimpleInternationalString;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/builder/AttributeTypeBuilderTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/builder/AttributeTypeBuilderTest.java
index 52de49c..ca8befe 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/builder/AttributeTypeBuilderTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/builder/AttributeTypeBuilderTest.java
@@ -26,7 +26,7 @@ import org.apache.sis.internal.feature.AttributeConvention;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/builder/CharacteristicTypeBuilderTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/builder/CharacteristicTypeBuilderTest.java
index 2fe330f..e12c7d6 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/builder/CharacteristicTypeBuilderTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/builder/CharacteristicTypeBuilderTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.feature.builder;
import java.util.Collections;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/builder/FeatureTypeBuilderTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/builder/FeatureTypeBuilderTest.java
index fc3df72..6898b85 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/builder/FeatureTypeBuilderTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/builder/FeatureTypeBuilderTest.java
@@ -30,7 +30,7 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/AttributeConventionTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/AttributeConventionTest.java
index 231bd46..4041214 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/AttributeConventionTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/AttributeConventionTest.java
@@ -26,7 +26,7 @@ import org.apache.sis.feature.DefaultFeatureType;
import org.apache.sis.feature.FeatureOperations;
import org.apache.sis.util.iso.Names;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/ESRITest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/ESRITest.java
index 62ae691..a2c2177 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/ESRITest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/ESRITest.java
@@ -18,7 +18,7 @@ package org.apache.sis.internal.feature;
import com.esri.core.geometry.Polyline;
import org.apache.sis.util.StringBuilders;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/GeometriesTestCase.java b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/GeometriesTestCase.java
index cbef788..51125fe 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/GeometriesTestCase.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/GeometriesTestCase.java
@@ -22,7 +22,7 @@ import org.apache.sis.math.Vector;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.Double.NaN;
import static org.junit.Assert.*;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/JTSTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/JTSTest.java
index 8347c6b..06c2e66 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/JTSTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/JTSTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.internal.feature;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.MultiLineString;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/Java2DTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/Java2DTest.java
index 7df9a29..026e0c2 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/Java2DTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/Java2DTest.java
@@ -17,7 +17,7 @@
package org.apache.sis.internal.feature;
import java.awt.geom.Path2D;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.opengis.test.Assert.*;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/ShapePropertiesTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/ShapePropertiesTest.java
index 367b833..36e008f 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/ShapePropertiesTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/ShapePropertiesTest.java
@@ -20,7 +20,7 @@ import java.awt.geom.Line2D;
import java.awt.geom.Path2D;
import java.awt.geom.Rectangle2D;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/JTSTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/JTSTest.java
index 87d3d70..e41fe49 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/JTSTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/JTSTest.java
@@ -27,7 +27,7 @@ import org.locationtech.jts.geom.GeometryFactory;
import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.internal.referencing.j2d.AffineTransform2D;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/IdentifierMapAdapterTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/IdentifierMapAdapterTest.java
index 43b9d15..7e67516 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/IdentifierMapAdapterTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/IdentifierMapAdapterTest.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import org.opengis.metadata.Identifier;
import org.opengis.metadata.citation.Citation;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
import static org.apache.sis.xml.IdentifierSpace.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMapTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMapTest.java
index ea161da..a58eb53 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMapTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMapTest.java
@@ -28,7 +28,7 @@ import org.apache.sis.xml.IdentifierMap;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.apache.sis.xml.XLink;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.util.UUID.fromString;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/CodeListMarshallingTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/CodeListMarshallingTest.java
index 2a698b6..0877efb 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/CodeListMarshallingTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/CodeListMarshallingTest.java
@@ -34,7 +34,7 @@ import org.apache.sis.xml.Namespaces;
import org.apache.sis.xml.MarshallerPool;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.xml.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumAdapterTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumAdapterTest.java
index a099a1c..a5b4fe9 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumAdapterTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumAdapterTest.java
@@ -17,7 +17,7 @@
package org.apache.sis.internal.jaxb.cat;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumMarshallingTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumMarshallingTest.java
index 56e9725..687b64a 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumMarshallingTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumMarshallingTest.java
@@ -23,7 +23,7 @@ import org.opengis.metadata.identification.TopicCategory;
import org.apache.sis.metadata.iso.identification.DefaultDataIdentification;
import org.apache.sis.xml.Namespaces;
import org.apache.sis.test.xml.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
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 da28840..604ee2f 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,7 +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.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeTest.java
index e36e67d..3f0f476 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeTest.java
@@ -25,7 +25,7 @@ import org.apache.sis.xml.ReferenceResolverMock;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.xml.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gco/StringAdapterTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gco/StringAdapterTest.java
index d906b29..651f214 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gco/StringAdapterTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gco/StringAdapterTest.java
@@ -22,7 +22,7 @@ import org.apache.sis.util.iso.DefaultInternationalString;
import org.apache.sis.internal.jaxb.Context;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/MeasureTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/MeasureTest.java
index f34f616..73cb0ac 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/MeasureTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/MeasureTest.java
@@ -21,7 +21,7 @@ import org.apache.sis.measure.Units;
import org.apache.sis.internal.xml.Schemas;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
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 9fb6888..47c44d2 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,7 +31,7 @@ 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.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
import static org.apache.sis.test.TestUtilities.date;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/FreeTextMarshallingTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/FreeTextMarshallingTest.java
index db74439..4ba5263 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/FreeTextMarshallingTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/FreeTextMarshallingTest.java
@@ -23,7 +23,7 @@ import org.apache.sis.util.iso.DefaultInternationalString;
import org.apache.sis.internal.xml.LegacyNamespaces;
import org.apache.sis.xml.Namespaces;
import org.apache.sis.test.xml.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
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 e3b912b..739b605 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
@@ -33,7 +33,7 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.xml.TestCase;
import org.junit.BeforeClass;
import org.junit.AfterClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
import static org.apache.sis.internal.util.StandardDateFormat.UTC;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/OtherLocalesTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/OtherLocalesTest.java
index 4200b9a..107d489 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/OtherLocalesTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/OtherLocalesTest.java
@@ -21,7 +21,7 @@ import java.util.Set;
import java.util.LinkedHashMap;
import java.util.Locale;
import java.nio.charset.Charset;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.sis.test.TestCase;
import static java.util.Locale.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/PT_LocaleTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/PT_LocaleTest.java
index 8b6aa6c..c04dfbb 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/PT_LocaleTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/PT_LocaleTest.java
@@ -23,7 +23,7 @@ import javax.xml.bind.JAXBException;
import org.apache.sis.util.Version;
import org.apache.sis.metadata.iso.DefaultMetadata;
import org.apache.sis.metadata.xml.TestUsingFile;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameterTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameterTest.java
index d4e0633..ce45fad 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameterTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameterTest.java
@@ -21,7 +21,7 @@ import org.opengis.util.MemberName;
import org.apache.sis.xml.Namespaces;
import org.apache.sis.util.iso.Names;
import org.apache.sis.test.xml.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/AxisNamesTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/AxisNamesTest.java
index 4c094aa..08863e8 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/AxisNamesTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/AxisNamesTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.sis.internal.metadata;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.lang.reflect.Field;
import org.apache.sis.test.TestCase;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/MergerTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/MergerTest.java
index e1ffeea..15a2123 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/MergerTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/MergerTest.java
@@ -33,7 +33,7 @@ import org.apache.sis.metadata.iso.content.DefaultCoverageDescription;
import org.apache.sis.metadata.iso.content.DefaultFeatureCatalogueDescription;
import org.apache.sis.metadata.iso.content.DefaultImageDescription;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/MetadataUtilitiesTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/MetadataUtilitiesTest.java
index 593cf7b..8c14d24 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/MetadataUtilitiesTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/MetadataUtilitiesTest.java
@@ -22,7 +22,7 @@ import java.util.Collection;
import java.util.LinkedHashSet;
import java.util.Locale;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static java.util.Locale.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/NameMeaningTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/NameMeaningTest.java
index 8d68c63..d6bc472 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/NameMeaningTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/NameMeaningTest.java
@@ -26,7 +26,7 @@ import org.opengis.referencing.operation.CoordinateOperation;
import org.opengis.parameter.ParameterDescriptor;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/VerticalDatumTypesTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/VerticalDatumTypesTest.java
index c6e0cbe..e63ef42 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/VerticalDatumTypesTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/VerticalDatumTypesTest.java
@@ -20,7 +20,7 @@ import org.opengis.referencing.datum.VerticalDatumType;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/WKTKeywordsTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/WKTKeywordsTest.java
index 31a9420..3e6a9c6 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/WKTKeywordsTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/WKTKeywordsTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.internal.metadata;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/SQLUtilitiesTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/SQLUtilitiesTest.java
index 4a8da06..e6811e6 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/SQLUtilitiesTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/SQLUtilitiesTest.java
@@ -17,7 +17,7 @@
package org.apache.sis.internal.metadata.sql;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/ScriptRunnerTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/ScriptRunnerTest.java
index cd64463..a6f96d8 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/ScriptRunnerTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/ScriptRunnerTest.java
@@ -21,7 +21,7 @@ import java.sql.SQLException;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestStep;
import org.apache.sis.test.sql.TestDatabase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/TypeMapperTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/TypeMapperTest.java
index 8106e2d..2d751d9 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/TypeMapperTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/TypeMapperTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.internal.metadata.sql;
import java.sql.Types;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/simple/SimpleIdentifierTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/simple/SimpleIdentifierTest.java
index 4bddc29..39e219b 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/simple/SimpleIdentifierTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/simple/SimpleIdentifierTest.java
@@ -17,7 +17,7 @@
package org.apache.sis.internal.simple;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/test/DocumentComparatorTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/test/DocumentComparatorTest.java
index 6bbd55e..2a213ca 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/test/DocumentComparatorTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/test/DocumentComparatorTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.internal.test;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.xml.DocumentComparator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/xml/XmlUtilitiesTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/xml/XmlUtilitiesTest.java
index a94a99c..0a9610f 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/xml/XmlUtilitiesTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/xml/XmlUtilitiesTest.java
@@ -21,7 +21,7 @@ import java.util.Locale;
import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.datatype.DatatypeConfigurationException;
import org.apache.sis.test.xml.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static javax.xml.datatype.DatatypeConstants.FIELD_UNDEFINED;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/ColorsTest.java b/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/ColorsTest.java
index d8897a9..d94db94 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/ColorsTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/ColorsTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.io.wkt;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOnMethod;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/ConventionTest.java b/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/ConventionTest.java
index cb019a1..54f4c11 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/ConventionTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/ConventionTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.io.wkt;
import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/ElementTest.java b/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/ElementTest.java
index e8f9395..1cb756a 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/ElementTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/ElementTest.java
@@ -25,7 +25,7 @@ import org.apache.sis.util.CharSequences;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/FormatterTest.java b/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/FormatterTest.java
index 6ef6d30..c2da378 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/FormatterTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/FormatterTest.java
@@ -27,7 +27,7 @@ import org.apache.sis.internal.util.X364;
import org.apache.sis.test.mock.VerticalCRSMock;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/SymbolsTest.java b/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/SymbolsTest.java
index 4fed03d..423f40a 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/SymbolsTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/SymbolsTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.io.wkt;
import java.util.Locale;
import org.apache.sis.test.TestCase;
import org.apache.sis.util.StringBuilders;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/TransliteratorTest.java b/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/TransliteratorTest.java
index c1f35d7..e271edb 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/TransliteratorTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/TransliteratorTest.java
@@ -26,7 +26,7 @@ import org.apache.sis.internal.metadata.AxisNames;
import org.apache.sis.test.mock.CoordinateSystemAxisMock;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/AbstractMetadataTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/AbstractMetadataTest.java
index 899753e..cf8ccf9 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/AbstractMetadataTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/AbstractMetadataTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.metadata;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static org.apache.sis.test.TestUtilities.toTreeStructure;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/HashCodeTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/HashCodeTest.java
index a85ef32..4055e31 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/HashCodeTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/HashCodeTest.java
@@ -34,7 +34,7 @@ import org.apache.sis.metadata.iso.acquisition.DefaultPlatform;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.util.Collections.singleton;
import static org.junit.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/InformationMapTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/InformationMapTest.java
index 66cc785..1e4aebb 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/InformationMapTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/InformationMapTest.java
@@ -28,7 +28,7 @@ import org.opengis.metadata.content.CoverageDescription;
import org.opengis.metadata.content.ImageDescription;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataCopierTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataCopierTest.java
index c92cd28..4ef22bb 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataCopierTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataCopierTest.java
@@ -20,7 +20,7 @@ import org.apache.sis.metadata.iso.citation.DefaultCitation;
import org.apache.sis.metadata.iso.citation.HardCodedCitations;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataStandardTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataStandardTest.java
index ab16cf6..fd8a4b3 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataStandardTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataStandardTest.java
@@ -35,7 +35,7 @@ import org.apache.sis.util.ComparisonMode;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.util.Collections.singleton;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/ModifiableMetadataTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/ModifiableMetadataTest.java
index 1bc1cd2..aa37850 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/ModifiableMetadataTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/ModifiableMetadataTest.java
@@ -25,7 +25,7 @@ import org.apache.sis.util.iso.SimpleInternationalString;
import org.apache.sis.util.collection.CodeListSet;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/NameMapTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/NameMapTest.java
index f0ff093..d919c60 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/NameMapTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/NameMapTest.java
@@ -22,7 +22,7 @@ import org.opengis.metadata.citation.Citation;
import org.opengis.metadata.acquisition.EnvironmentalRecord;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static java.util.AbstractMap.SimpleEntry;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
index 6fce10a..a2096d3 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
@@ -62,7 +62,7 @@ import org.apache.sis.metadata.iso.identification.DefaultDataIdentification;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyConsistencyCheck.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyConsistencyCheck.java
index d415128..8bd1e90 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyConsistencyCheck.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyConsistencyCheck.java
@@ -31,7 +31,7 @@ import org.apache.sis.internal.metadata.Dependencies;
import org.apache.sis.test.xml.AnnotationConsistencyCheck;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyInformationTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyInformationTest.java
index 5c96d80..4227dbd 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyInformationTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyInformationTest.java
@@ -32,7 +32,7 @@ import org.apache.sis.measure.ValueRange;
import org.apache.sis.measure.Range;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOnMethod;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/PrunerTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/PrunerTest.java
index 8c34d86..1a86674 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/PrunerTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/PrunerTest.java
@@ -27,7 +27,7 @@ import org.apache.sis.internal.simple.SimpleIdentifier;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static java.util.Collections.singleton;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/SpecialCasesTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/SpecialCasesTest.java
index 441ff7d..3a55b78 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/SpecialCasesTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/SpecialCasesTest.java
@@ -27,7 +27,7 @@ import org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBox;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeChildrenTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeChildrenTest.java
index a903c83..8cfb343 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeChildrenTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeChildrenTest.java
@@ -34,7 +34,7 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeTest.java
index ad31dae..72e2406 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeTest.java
@@ -37,7 +37,7 @@ import org.apache.sis.util.collection.TreeTable;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
import static java.util.Collections.singleton;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableFormatTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableFormatTest.java
index ce84eef..f778fdc 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableFormatTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableFormatTest.java
@@ -33,7 +33,7 @@ import org.apache.sis.metadata.iso.lineage.DefaultProcessing;
import org.apache.sis.measure.Units;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.util.Arrays.asList;
import static java.util.Collections.singleton;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableViewTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableViewTest.java
index 090f719..2f01166 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableViewTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableViewTest.java
@@ -25,7 +25,7 @@ import org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBox;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
import static org.apache.sis.test.TestUtilities.toTreeStructure;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/TypeMapTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/TypeMapTest.java
index ac76716..d5b0200 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/TypeMapTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/TypeMapTest.java
@@ -35,7 +35,7 @@ import org.apache.sis.metadata.iso.extent.AbstractGeographicExtent;
import org.apache.sis.metadata.iso.extent.DefaultGeographicDescription;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static java.util.AbstractMap.SimpleEntry;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/ValueMapTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/ValueMapTest.java
index a7c6eb6..796569c 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/ValueMapTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/ValueMapTest.java
@@ -28,7 +28,7 @@ import org.apache.sis.metadata.iso.citation.DefaultResponsibleParty;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.opengis.test.Assert.*;
import static java.util.AbstractMap.SimpleEntry;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/APIVerifier.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/APIVerifier.java
index cf61d90..1b32de2 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/APIVerifier.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/APIVerifier.java
@@ -32,7 +32,7 @@ import org.apache.sis.metadata.MetadataStandard;
import org.apache.sis.test.TestCase;
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.Classes;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
index 99dbd13..170a246 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
@@ -25,7 +25,7 @@ import org.apache.sis.metadata.PropertyConsistencyCheck;
import org.apache.sis.test.LoggingWatcher;
import org.apache.sis.test.DependsOn;
import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/CustomMetadataTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/CustomMetadataTest.java
index ec05b41..413fff7 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/CustomMetadataTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/CustomMetadataTest.java
@@ -39,7 +39,7 @@ import org.apache.sis.metadata.iso.citation.DefaultCitation;
import org.apache.sis.internal.system.DefaultFactories;
import org.apache.sis.test.xml.TestCase;
import org.apache.sis.xml.XML;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.util.Collections.singleton;
import static org.junit.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java
index c3ddd2f..0859ed4 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java
@@ -32,7 +32,7 @@ import org.apache.sis.metadata.iso.citation.DefaultCitation;
import org.apache.sis.metadata.iso.citation.DefaultCitationDate;
import org.apache.sis.test.xml.TestCase;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
import static org.apache.sis.test.TestUtilities.date;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/ImmutableIdentifierTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/ImmutableIdentifierTest.java
index f448ba0..9a3ca47 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/ImmutableIdentifierTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/ImmutableIdentifierTest.java
@@ -31,7 +31,7 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.xml.TestCase;
import org.opengis.test.Validators;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
import static org.opengis.referencing.ReferenceIdentifier.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java
index e002c55..8f05941 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java
@@ -32,7 +32,7 @@ import org.apache.sis.xml.IdentifierSpace;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.metadata.iso.citation.Citations.*;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultCitationDateTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultCitationDateTest.java
index 99f0f6a..bdd6cda 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultCitationDateTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultCitationDateTest.java
@@ -21,7 +21,7 @@ import org.opengis.metadata.citation.DateType;
import org.opengis.metadata.citation.CitationDate;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
index 136b0ea..04e55eb 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
@@ -46,7 +46,7 @@ import org.apache.sis.util.iso.DefaultInternationalString;
import org.apache.sis.util.Version;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestUtilities;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.TestUtilities.getSingleton;
import static org.apache.sis.test.MetadataAssert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultContactTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultContactTest.java
index eb37c03..8c10480 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultContactTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultContactTest.java
@@ -25,7 +25,7 @@ import org.apache.sis.internal.geoapi.evolution.UnsupportedCodeList;
import org.apache.sis.util.logging.WarningListener;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.xml.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java
index 97881c0..905ef16 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java
@@ -20,7 +20,7 @@ import javax.xml.bind.JAXBException;
import org.opengis.metadata.citation.Role;
import org.apache.sis.test.xml.TestCase;
import org.apache.sis.internal.xml.LegacyNamespaces;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.util.Collections.singleton;
import static org.apache.sis.test.MetadataAssert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraintsTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraintsTest.java
index bd29b5e..b43fa99 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraintsTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraintsTest.java
@@ -21,7 +21,7 @@ import org.opengis.metadata.constraint.Restriction;
import org.apache.sis.xml.Namespaces;
import org.apache.sis.internal.xml.LegacyNamespaces;
import org.apache.sis.test.xml.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.util.Collections.singleton;
import static org.apache.sis.test.MetadataAssert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java
index be34363..543e416 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java
@@ -26,7 +26,7 @@ import org.apache.sis.xml.Namespaces;
import org.apache.sis.xml.NilObject;
import org.apache.sis.metadata.xml.TestUsingFile;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
import static org.apache.sis.test.TestUtilities.date;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBoxTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBoxTest.java
index 8362e93..d40a8f0 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBoxTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBoxTest.java
@@ -17,13 +17,15 @@
package org.apache.sis.metadata.iso.extent;
import java.util.Map;
+
+import org.junit.jupiter.api.Assertions;
import org.opengis.metadata.extent.GeographicBoundingBox;
import org.apache.sis.measure.Latitude;
import org.apache.sis.measure.Longitude;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.Double.NaN;
import static org.apache.sis.test.Assert.*;
@@ -64,9 +66,12 @@ public final strictfp class DefaultGeographicBoundingBoxTest extends TestCase {
* Tests construction with an invalid range of latitudes.
*/
@SuppressWarnings("ResultOfObjectAllocationIgnored")
- @Test(expected = IllegalArgumentException.class)
+ @Test()
public void testInvalidLatitudeRange() {
- new DefaultGeographicBoundingBox(-1, +1, 12, 10);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> {
+ new DefaultGeographicBoundingBox(-1, +1, 12, 10);
+ });
+
}
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/ExtentsTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/ExtentsTest.java
index 7e3d259..6ddddc5 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/ExtentsTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/ExtentsTest.java
@@ -33,7 +33,7 @@ import org.apache.sis.test.mock.VerticalCRSMock;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestUtilities;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.internal.metadata.ReferencingServices.NAUTICAL_MILE;
import static org.junit.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphicTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphicTest.java
index 3bc89df..ee1c03b 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphicTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphicTest.java
@@ -31,7 +31,7 @@ import org.apache.sis.xml.Namespaces;
import org.apache.sis.xml.XML;
import org.apache.sis.test.xml.TestCase;
import org.apache.sis.test.DependsOnMethod;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
import static java.util.Collections.singletonMap;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResourceTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResourceTest.java
index 6ebf23e..b538d43 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResourceTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResourceTest.java
@@ -26,7 +26,7 @@ import org.apache.sis.internal.system.DefaultFactories;
import org.apache.sis.xml.NilReason;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.util.Collections.singleton;
import static org.junit.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentificationTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentificationTest.java
index ed5ab1f..45649df 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentificationTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentificationTest.java
@@ -32,7 +32,7 @@ import org.apache.sis.metadata.iso.extent.Extents;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestUtilities;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.util.Collections.singleton;
import static org.apache.sis.test.MetadataAssert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultKeywordsTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultKeywordsTest.java
index 3344bf2..50f9f50 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultKeywordsTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultKeywordsTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.metadata.iso.identification;
import org.apache.sis.util.iso.SimpleInternationalString;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFractionTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFractionTest.java
index 700f075..3b223a2 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFractionTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFractionTest.java
@@ -23,7 +23,7 @@ import org.apache.sis.xml.IdentifierSpace;
import org.apache.sis.util.Version;
import org.apache.sis.test.xml.TestCase;
import org.apache.sis.test.DependsOnMethod;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
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 07d8f73..dc87cc1 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
@@ -27,7 +27,7 @@ import org.apache.sis.test.xml.TestCase;
import org.apache.sis.test.DependsOn;
import org.junit.After;
import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java
index b0c6b8c..1666cac 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java
@@ -26,7 +26,7 @@ import org.apache.sis.internal.system.DefaultFactories;
import org.apache.sis.metadata.xml.TestUsingFile;
import org.apache.sis.xml.NilReason;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.util.Collections.singleton;
import static org.apache.sis.test.MetadataAssert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultLineageTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultLineageTest.java
index 5ec2116..18a0d15 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultLineageTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultLineageTest.java
@@ -25,7 +25,7 @@ import org.apache.sis.metadata.iso.DefaultIdentifier;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.xml.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java
index f7d3501..ee0492f 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java
@@ -22,7 +22,7 @@ import org.apache.sis.internal.jaxb.gmi.LE_ProcessStep;
import org.apache.sis.metadata.iso.DefaultIdentifier;
import org.apache.sis.metadata.xml.TestUsingFile;
import org.apache.sis.util.Version;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.opengis.test.Assert.*;
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 5082ab5..d854d59 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,7 +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.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractElementTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractElementTest.java
index c394637..847e129 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractElementTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractElementTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.metadata.iso.quality;
import java.util.Date;
import java.util.List;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java
index 75e5841..e9f7a28 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java
@@ -25,7 +25,7 @@ import org.apache.sis.util.Version;
import org.apache.sis.metadata.xml.TestUsingFile;
import org.apache.sis.test.DependsOn;
import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.opengis.test.Assert.*;
import static org.apache.sis.test.TestUtilities.getSingleton;
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 8edd08a..37985fb 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
@@ -23,7 +23,7 @@ import org.apache.sis.test.LoggingWatcher;
import org.apache.sis.test.TestCase;
import org.junit.After;
import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/IdentifierGeneratorTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/IdentifierGeneratorTest.java
index cfe57b1..b287f9c 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/IdentifierGeneratorTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/IdentifierGeneratorTest.java
@@ -22,7 +22,7 @@ import org.apache.sis.internal.metadata.sql.SQLBuilder;
import org.apache.sis.test.sql.TestDatabase;
import org.apache.sis.metadata.MetadataStandard;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataFallbackVerifier.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataFallbackVerifier.java
index 8546863..2e49de8 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataFallbackVerifier.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataFallbackVerifier.java
@@ -27,7 +27,7 @@ import org.apache.sis.internal.simple.CitationConstant;
import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.metadata.MetadataStandard;
import org.apache.sis.test.sql.TestDatabase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static org.apache.sis.internal.util.CollectionsExt.first;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataSourceTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataSourceTest.java
index 9f551a4..6394ecd 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataSourceTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataSourceTest.java
@@ -29,7 +29,7 @@ import org.apache.sis.metadata.iso.distribution.DefaultFormat;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestStep;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataWriterTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataWriterTest.java
index 34bcecb..1a1ff38 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataWriterTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataWriterTest.java
@@ -30,7 +30,7 @@ import org.apache.sis.metadata.MetadataStandard;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/test/xml/AnnotationConsistencyCheck.java b/core/sis-metadata/src/test/java/org/apache/sis/test/xml/AnnotationConsistencyCheck.java
index c7965e0..5c9d7c7 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/test/xml/AnnotationConsistencyCheck.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/test/xml/AnnotationConsistencyCheck.java
@@ -41,7 +41,7 @@ import org.apache.sis.internal.xml.LegacyNamespaces;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import junit.framework.AssertionFailedError;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultLocalNameTest.java b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultLocalNameTest.java
index e224244..bc425f5 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultLocalNameTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultLocalNameTest.java
@@ -17,7 +17,7 @@
package org.apache.sis.util.iso;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.opengis.test.Validators.*;
import static org.apache.sis.test.Assert.*;
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 8bf0345..450d76a 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
@@ -23,7 +23,7 @@ import org.apache.sis.test.TestRunner;
import org.junit.runner.RunWith;
import org.junit.BeforeClass;
import org.junit.AfterClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordSchemaTest.java b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordSchemaTest.java
index 8f1117f..5e32770 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordSchemaTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordSchemaTest.java
@@ -24,7 +24,7 @@ import org.opengis.util.MemberName;
import org.apache.sis.internal.simple.SimpleAttributeType;
// Test imports
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
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 affb914..1aac8ee 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
@@ -22,7 +22,7 @@ import org.opengis.util.MemberName;
import org.opengis.util.RecordType;
// Test imports
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.apache.sis.test.TestCase;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordTypeTest.java b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordTypeTest.java
index f161dc5..2bab991 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordTypeTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordTypeTest.java
@@ -23,7 +23,7 @@ import org.opengis.util.NameSpace;
import org.apache.sis.internal.simple.SimpleAttributeType;
// Test imports
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultScopedNameTest.java b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultScopedNameTest.java
index 0d09aff..cc3ff28 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultScopedNameTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultScopedNameTest.java
@@ -20,7 +20,7 @@ import java.util.Arrays;
import org.opengis.util.GenericName;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.opengis.test.Validators.*;
import static org.apache.sis.test.Assert.*;
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 7db792d..7ff3b65 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
@@ -36,7 +36,7 @@ import org.apache.sis.test.xml.TestCase;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
import org.junit.AfterClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/NamesTest.java b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/NamesTest.java
index bd88fc9..53deee7 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/NamesTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/NamesTest.java
@@ -30,7 +30,7 @@ import org.apache.sis.internal.system.DefaultFactories;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java
index c217af0..ec63947 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java
@@ -27,7 +27,7 @@ import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.internal.system.DefaultFactories;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static org.apache.sis.internal.util.Constants.OGC;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/TypesTest.java b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/TypesTest.java
index dbbc34f..b37f79d 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/TypesTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/TypesTest.java
@@ -31,7 +31,7 @@ import org.opengis.referencing.datum.Datum;
import org.opengis.referencing.datum.PixelInCell;
import org.opengis.referencing.cs.AxisDirection;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.opengis.test.Assert.*;
import static org.apache.sis.test.Assert.PENDING_NEXT_GEOAPI_RELEASE;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/CharSequenceSubstitutionTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/CharSequenceSubstitutionTest.java
index a8c7923..54c180a 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/CharSequenceSubstitutionTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/CharSequenceSubstitutionTest.java
@@ -27,7 +27,7 @@ import org.apache.sis.internal.metadata.SensorType;
import org.apache.sis.util.iso.Types;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.xml.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/LegacyCodesTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/LegacyCodesTest.java
index 74c089d..bcbda8e 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/LegacyCodesTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/LegacyCodesTest.java
@@ -17,7 +17,7 @@
package org.apache.sis.xml;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static org.apache.sis.xml.LegacyCodes.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/MarshallerPoolTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/MarshallerPoolTest.java
index 54fc303..8011423 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/MarshallerPoolTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/MarshallerPoolTest.java
@@ -21,7 +21,7 @@ import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/NamespacesTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/NamespacesTest.java
index 5c7dfd4..b02a237 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/NamespacesTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/NamespacesTest.java
@@ -17,7 +17,7 @@
package org.apache.sis.xml;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/NilReasonMarshallingTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/NilReasonMarshallingTest.java
index 66d9b50..4b380e3 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/NilReasonMarshallingTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/NilReasonMarshallingTest.java
@@ -24,7 +24,7 @@ import org.opengis.metadata.spatial.Dimension;
import org.opengis.metadata.quality.ConformanceResult;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.xml.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/NilReasonTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/NilReasonTest.java
index 2dbcd22..d951b1f 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/NilReasonTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/NilReasonTest.java
@@ -24,7 +24,7 @@ import org.apache.sis.util.LenientComparable;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/OGCNamespacePrefixMapperTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/OGCNamespacePrefixMapperTest.java
index 0259046..08892c8 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/OGCNamespacePrefixMapperTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/OGCNamespacePrefixMapperTest.java
@@ -20,7 +20,7 @@ import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import org.apache.sis.util.Numbers;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static org.junit.Assume.assumeTrue;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/TransformerTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/TransformerTest.java
index e019043..0cd06d0 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/TransformerTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/TransformerTest.java
@@ -21,7 +21,7 @@ import java.util.HashSet;
import java.util.Map;
import org.apache.sis.internal.xml.LegacyNamespaces;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/TransformingNamespacesTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/TransformingNamespacesTest.java
index d433dab..85ec950 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/TransformingNamespacesTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/TransformingNamespacesTest.java
@@ -25,7 +25,7 @@ import java.util.Collections;
import javax.xml.namespace.NamespaceContext;
import org.apache.sis.internal.xml.LegacyNamespaces;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/UUIDMarshallingTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/UUIDMarshallingTest.java
index 14214bc..4c6198c 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/UUIDMarshallingTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/UUIDMarshallingTest.java
@@ -23,7 +23,7 @@ import org.opengis.metadata.citation.Citation;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.xml.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/ValueConverterTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/ValueConverterTest.java
index 0bbb05c..076b8c6 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/ValueConverterTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/ValueConverterTest.java
@@ -20,7 +20,7 @@ import java.util.Locale;
import java.nio.charset.StandardCharsets;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkMarshallingTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkMarshallingTest.java
index 4fb1c6c..3f3ff64 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkMarshallingTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkMarshallingTest.java
@@ -27,7 +27,7 @@ import org.apache.sis.util.iso.SimpleInternationalString;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.xml.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkTest.java
index 822febc..570114d 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkTest.java
@@ -20,7 +20,7 @@ import java.net.URI;
import java.net.URISyntaxException;
import org.apache.sis.util.iso.SimpleInternationalString;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-raster/src/test/java/org/apache/sis/coverage/CategoryListTest.java b/core/sis-raster/src/test/java/org/apache/sis/coverage/CategoryListTest.java
index 57fade5..2891614 100644
--- a/core/sis-raster/src/test/java/org/apache/sis/coverage/CategoryListTest.java
+++ b/core/sis-raster/src/test/java/org/apache/sis/coverage/CategoryListTest.java
@@ -28,7 +28,7 @@ import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-raster/src/test/java/org/apache/sis/coverage/CategoryTest.java b/core/sis-raster/src/test/java/org/apache/sis/coverage/CategoryTest.java
index 3e789e9..9f06b53 100644
--- a/core/sis-raster/src/test/java/org/apache/sis/coverage/CategoryTest.java
+++ b/core/sis-raster/src/test/java/org/apache/sis/coverage/CategoryTest.java
@@ -24,7 +24,7 @@ import org.apache.sis.measure.NumberRange;
import org.apache.sis.math.MathFunctions;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.opengis.test.Assert.*;
diff --git a/core/sis-raster/src/test/java/org/apache/sis/coverage/SampleDimensionTest.java b/core/sis-raster/src/test/java/org/apache/sis/coverage/SampleDimensionTest.java
index a2d9f50..ba44557 100644
--- a/core/sis-raster/src/test/java/org/apache/sis/coverage/SampleDimensionTest.java
+++ b/core/sis-raster/src/test/java/org/apache/sis/coverage/SampleDimensionTest.java
@@ -26,7 +26,7 @@ import org.apache.sis.math.MathFunctions;
import org.apache.sis.measure.NumberRange;
import org.apache.sis.measure.Units;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.opengis.test.Assert.*;
diff --git a/core/sis-raster/src/test/java/org/apache/sis/coverage/grid/GridDerivationTest.java b/core/sis-raster/src/test/java/org/apache/sis/coverage/grid/GridDerivationTest.java
index 58a197a..5c57308 100644
--- a/core/sis-raster/src/test/java/org/apache/sis/coverage/grid/GridDerivationTest.java
+++ b/core/sis-raster/src/test/java/org/apache/sis/coverage/grid/GridDerivationTest.java
@@ -39,7 +39,7 @@ import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.ReferencingAssert.*;
import static org.apache.sis.coverage.grid.GridGeometryTest.assertExtentEquals;
diff --git a/core/sis-raster/src/test/java/org/apache/sis/coverage/grid/GridExtentTest.java b/core/sis-raster/src/test/java/org/apache/sis/coverage/grid/GridExtentTest.java
index a470aa1..61cc6b2 100644
--- a/core/sis-raster/src/test/java/org/apache/sis/coverage/grid/GridExtentTest.java
+++ b/core/sis-raster/src/test/java/org/apache/sis/coverage/grid/GridExtentTest.java
@@ -26,7 +26,7 @@ import org.apache.sis.coverage.SubspaceNotSpecifiedException;
import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.util.resources.Vocabulary;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-raster/src/test/java/org/apache/sis/coverage/grid/GridGeometryTest.java b/core/sis-raster/src/test/java/org/apache/sis/coverage/grid/GridGeometryTest.java
index 0030616..39bd445 100644
--- a/core/sis-raster/src/test/java/org/apache/sis/coverage/grid/GridGeometryTest.java
+++ b/core/sis-raster/src/test/java/org/apache/sis/coverage/grid/GridGeometryTest.java
@@ -29,7 +29,7 @@ import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.ReferencingAssert.*;
diff --git a/core/sis-raster/src/test/java/org/apache/sis/coverage/grid/PixelTranslationTest.java b/core/sis-raster/src/test/java/org/apache/sis/coverage/grid/PixelTranslationTest.java
index f6f4f15..a4236df 100644
--- a/core/sis-raster/src/test/java/org/apache/sis/coverage/grid/PixelTranslationTest.java
+++ b/core/sis-raster/src/test/java/org/apache/sis/coverage/grid/PixelTranslationTest.java
@@ -24,7 +24,7 @@ import org.apache.sis.referencing.operation.transform.MathTransforms;
import org.apache.sis.referencing.operation.matrix.Matrix3;
import org.apache.sis.referencing.operation.matrix.Matrix4;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-raster/src/test/java/org/apache/sis/image/DefaultIteratorTest.java b/core/sis-raster/src/test/java/org/apache/sis/image/DefaultIteratorTest.java
index cf748af..d6bff16 100644
--- a/core/sis-raster/src/test/java/org/apache/sis/image/DefaultIteratorTest.java
+++ b/core/sis-raster/src/test/java/org/apache/sis/image/DefaultIteratorTest.java
@@ -29,7 +29,7 @@ import org.apache.sis.util.ArraysExt;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-raster/src/test/java/org/apache/sis/internal/coverage/BufferedGridCoverageTest.java b/core/sis-raster/src/test/java/org/apache/sis/internal/coverage/BufferedGridCoverageTest.java
index 786b803..8205ffd 100644
--- a/core/sis-raster/src/test/java/org/apache/sis/internal/coverage/BufferedGridCoverageTest.java
+++ b/core/sis-raster/src/test/java/org/apache/sis/internal/coverage/BufferedGridCoverageTest.java
@@ -33,7 +33,7 @@ import org.apache.sis.test.TestCase;
import org.opengis.referencing.datum.PixelInCell;
import org.opengis.referencing.operation.MathTransform1D;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
diff --git a/core/sis-raster/src/test/java/org/apache/sis/internal/raster/ScaledColorSpaceTest.java b/core/sis-raster/src/test/java/org/apache/sis/internal/raster/ScaledColorSpaceTest.java
index 66204ab..8efab4b 100644
--- a/core/sis-raster/src/test/java/org/apache/sis/internal/raster/ScaledColorSpaceTest.java
+++ b/core/sis-raster/src/test/java/org/apache/sis/internal/raster/ScaledColorSpaceTest.java
@@ -25,7 +25,7 @@ import java.awt.image.DataBuffer;
import java.awt.image.WritableRaster;
import org.apache.sis.image.ImageTestCase;
import org.apache.sis.test.TestUtilities;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static java.lang.StrictMath.*;
diff --git a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/GeohashReferenceSystemTest.java b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/GeohashReferenceSystemTest.java
index a39ebdf..766ce89 100644
--- a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/GeohashReferenceSystemTest.java
+++ b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/GeohashReferenceSystemTest.java
@@ -25,7 +25,7 @@ import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationFormatTest.java b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationFormatTest.java
index ef1687d..8548f03 100644
--- a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationFormatTest.java
+++ b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationFormatTest.java
@@ -22,7 +22,7 @@ import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationTypeTest.java b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationTypeTest.java
index d625e54..1b9c69c 100644
--- a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationTypeTest.java
+++ b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationTypeTest.java
@@ -21,7 +21,7 @@ import org.opengis.metadata.extent.GeographicDescription;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java
index 7429fed..b7105b6 100644
--- a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java
+++ b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java
@@ -39,7 +39,7 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestUtilities;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiersTest.java b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiersTest.java
index 7ab4c8f..0778317 100644
--- a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiersTest.java
+++ b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiersTest.java
@@ -23,7 +23,7 @@ import org.apache.sis.metadata.iso.extent.DefaultExtent;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/distance/LatLonPointRadiusTest.java b/core/sis-referencing/src/test/java/org/apache/sis/distance/LatLonPointRadiusTest.java
index 0958264..6faeff4 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/distance/LatLonPointRadiusTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/distance/LatLonPointRadiusTest.java
@@ -26,7 +26,7 @@ import org.apache.sis.test.TestCase;
import org.apache.sis.geometry.DirectPosition2D;
// JUnit imports
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractDirectPositionTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractDirectPositionTest.java
index e92de5d..2a64809 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractDirectPositionTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractDirectPositionTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.sis.geometry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.sis.test.TestCase;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.java
index ade12e3..a721713 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.java
@@ -24,7 +24,7 @@ import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.Double.NaN;
import static org.opengis.test.Validators.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/ArrayEnvelopeTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/ArrayEnvelopeTest.java
index ce2a886..6bb133c 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/ArrayEnvelopeTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/ArrayEnvelopeTest.java
@@ -19,7 +19,8 @@ package org.apache.sis.geometry;
import org.apache.sis.io.wkt.Formatter;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
@@ -97,9 +98,12 @@ public final strictfp class ArrayEnvelopeTest extends TestCase {
/**
* Verifies that attempt to create an envelope from an invalid WKT results in an exception.
*/
- @Test(expected = IllegalArgumentException.class)
+ @Test()
public void testCreatesFromInvalidWKT() {
- assertNotNull(new ArrayEnvelope("BBOX[\"invalid\"]").ordinates);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> {
+ assertNotNull(new ArrayEnvelope("BBOX[\"invalid\"]").ordinates);
+ });
+
}
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/CoordinateFormatTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/CoordinateFormatTest.java
index 7a30075..599ad0a 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/CoordinateFormatTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/CoordinateFormatTest.java
@@ -29,7 +29,7 @@ import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.test.mock.VerticalCRSMock;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/CurveExtremumTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/CurveExtremumTest.java
index b3f746d..7696d55 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/CurveExtremumTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/CurveExtremumTest.java
@@ -17,7 +17,7 @@
package org.apache.sis.geometry;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/DirectPosition1DTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/DirectPosition1DTest.java
index cb00f38..fad3273 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/DirectPosition1DTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/DirectPosition1DTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.geometry;
import org.opengis.geometry.DirectPosition;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
import static org.opengis.test.Validators.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/DirectPosition2DTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/DirectPosition2DTest.java
index d387171..f519e7f 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/DirectPosition2DTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/DirectPosition2DTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.geometry;
import org.opengis.geometry.DirectPosition;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
import static org.opengis.test.Validators.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/Envelope2DTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/Envelope2DTest.java
index 2373e63..dc2cb5a 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/Envelope2DTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/Envelope2DTest.java
@@ -20,7 +20,7 @@ import java.awt.geom.Rectangle2D;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.opengis.test.Validators.*;
import static org.apache.sis.test.ReferencingAssert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopeReducerTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopeReducerTest.java
index f32fd09..0c8c32d 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopeReducerTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopeReducerTest.java
@@ -20,7 +20,7 @@ import org.opengis.referencing.operation.TransformException;
import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.ReferencingAssert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopesTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopesTest.java
index a58cd29..36d57fa 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopesTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopesTest.java
@@ -34,7 +34,7 @@ import org.apache.sis.referencing.cs.AxesConvention;
import org.apache.sis.referencing.CRS;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.ReferencingAssert.*;
import static org.opengis.test.Validators.validate;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralDirectPositionTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralDirectPositionTest.java
index 91bdf4b..da7a6ea 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralDirectPositionTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralDirectPositionTest.java
@@ -20,7 +20,7 @@ import java.util.Arrays;
import org.apache.sis.io.wkt.Formatter;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
import static org.opengis.test.Validators.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java
index 713d8bf..fd7212f 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java
@@ -23,7 +23,7 @@ import org.apache.sis.math.MathFunctions;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOnMethod;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.Double.NaN;
import static org.opengis.test.Validators.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/ImmutableEnvelopeTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/ImmutableEnvelopeTest.java
index 46eb724..c896366 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/ImmutableEnvelopeTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/ImmutableEnvelopeTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.geometry;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.opengis.test.Validators.*;
import static org.apache.sis.test.ReferencingAssert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/SubEnvelopeTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/SubEnvelopeTest.java
index 18f8bc7..f0e1a2b 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/SubEnvelopeTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/SubEnvelopeTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.sis.geometry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.sis.test.DependsOn;
import static java.lang.Double.NaN;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/TransformTestCase.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/TransformTestCase.java
index d38fa26..d2b7f1c 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/TransformTestCase.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/TransformTestCase.java
@@ -35,7 +35,7 @@ import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.internal.referencing.Formulas.ANGULAR_TOLERANCE;
import static org.apache.sis.internal.referencing.Formulas.LINEAR_TOLERANCE;
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 0b0ddbc..6da9839 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
@@ -33,7 +33,7 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.LoggingWatcher;
import org.junit.After;
import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CC_OperationParameterGroupTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CC_OperationParameterGroupTest.java
index bbec651..712fd70 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CC_OperationParameterGroupTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CC_OperationParameterGroupTest.java
@@ -35,7 +35,7 @@ import org.apache.sis.test.xml.TestCase;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.xml.Namespaces;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.metadata.iso.citation.Citations.EPSG;
import static org.apache.sis.internal.jaxb.referencing.CC_GeneralOperationParameter.DEFAULT_OCCURRENCE;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CodeTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CodeTest.java
index 6da4d4f..7bc30df 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CodeTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CodeTest.java
@@ -26,7 +26,7 @@ import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.metadata.iso.citation.DefaultCitation;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameterTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameterTest.java
index 4406a32..10babe5 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameterTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameterTest.java
@@ -21,7 +21,7 @@ import javax.xml.bind.JAXBException;
import org.apache.sis.measure.Units;
import org.apache.sis.referencing.datum.DefaultEllipsoid;
import org.apache.sis.test.xml.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/metadata/AxisDirectionsTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/metadata/AxisDirectionsTest.java
index 911815b..b377b16 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/metadata/AxisDirectionsTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/metadata/AxisDirectionsTest.java
@@ -26,7 +26,7 @@ import org.apache.sis.referencing.cs.HardCodedCS;
import org.apache.sis.measure.Units;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static java.lang.StrictMath.abs;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/metadata/EllipsoidalHeightCombinerTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/metadata/EllipsoidalHeightCombinerTest.java
index 9cc0196..579f655 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/metadata/EllipsoidalHeightCombinerTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/metadata/EllipsoidalHeightCombinerTest.java
@@ -36,7 +36,7 @@ import org.apache.sis.metadata.iso.extent.Extents;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/CoordinateOperationsTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/CoordinateOperationsTest.java
index 29682b8..05f1819 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/CoordinateOperationsTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/CoordinateOperationsTest.java
@@ -27,7 +27,7 @@ import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.referencing.operation.HardCodedConversions;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/DefinitionVerifierTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/DefinitionVerifierTest.java
index e9daf68..5941714 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/DefinitionVerifierTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/DefinitionVerifierTest.java
@@ -29,7 +29,7 @@ import org.apache.sis.metadata.iso.citation.HardCodedCitations;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/FormulasTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/FormulasTest.java
index 9f0302a..556509d 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/FormulasTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/FormulasTest.java
@@ -20,7 +20,7 @@ import org.apache.sis.internal.metadata.ReferencingServices;
import org.apache.sis.measure.Longitude;
import org.apache.sis.referencing.datum.HardCodedDatum;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/LazySetTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/LazySetTest.java
index 793a028..0cd4ddb 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/LazySetTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/LazySetTest.java
@@ -20,7 +20,7 @@ import java.util.Arrays;
import java.util.Iterator;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/PositionalAccuracyConstantTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/PositionalAccuracyConstantTest.java
index f13e53d..4866b07 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/PositionalAccuracyConstantTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/PositionalAccuracyConstantTest.java
@@ -21,7 +21,7 @@ import org.opengis.metadata.quality.ConformanceResult;
import org.opengis.metadata.quality.Result;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ReferencingUtilitiesTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ReferencingUtilitiesTest.java
index e0cc2a9..1388f93 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ReferencingUtilitiesTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ReferencingUtilitiesTest.java
@@ -28,7 +28,7 @@ import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.util.Utilities;
import org.apache.sis.measure.Units;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static org.apache.sis.internal.referencing.ReferencingUtilities.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ServicesForMetadataTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ServicesForMetadataTest.java
index 610d382..750bd49 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ServicesForMetadataTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ServicesForMetadataTest.java
@@ -34,7 +34,7 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestUtilities;
import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/WKTUtilitiesTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/WKTUtilitiesTest.java
index 363c98a..f88eb84 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/WKTUtilitiesTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/WKTUtilitiesTest.java
@@ -23,7 +23,7 @@ import org.apache.sis.internal.metadata.WKTKeywords;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.apache.sis.math.Vector;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static org.apache.sis.internal.referencing.WKTUtilities.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/WraparoundAdjustmentTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/WraparoundAdjustmentTest.java
index 813ccdb..0028276 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/WraparoundAdjustmentTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/WraparoundAdjustmentTest.java
@@ -28,7 +28,7 @@ import org.apache.sis.referencing.operation.transform.MathTransforms;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.ReferencingAssert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/j2d/ShapeUtilitiesTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/j2d/ShapeUtilitiesTest.java
index 4d94f74..2b90607 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/j2d/ShapeUtilitiesTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/j2d/ShapeUtilitiesTest.java
@@ -23,7 +23,7 @@ import java.awt.geom.Line2D;
import java.awt.geom.QuadCurve2D;
import java.awt.geom.CubicCurve2D;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.opengis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/AffineTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/AffineTest.java
index bb3a334..10f2063 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/AffineTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/AffineTest.java
@@ -23,7 +23,7 @@ import org.apache.sis.referencing.operation.matrix.Matrices;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/CoordinateFrameRotationTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/CoordinateFrameRotationTest.java
index 7e79a1e..760ce87 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/CoordinateFrameRotationTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/CoordinateFrameRotationTest.java
@@ -23,7 +23,7 @@ import org.apache.sis.referencing.operation.transform.LinearTransform;
import org.apache.sis.referencing.operation.transform.MathTransformTestCase;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.StrictMath.toRadians;
import static org.junit.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFileTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFileTest.java
index 2c30927..f2fa572 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFileTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFileTest.java
@@ -27,7 +27,7 @@ import org.apache.sis.measure.Units;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.DependsOnMethod;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolationTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolationTest.java
index 145c6c5..20dc666 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolationTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolationTest.java
@@ -29,7 +29,7 @@ import org.opengis.util.FactoryException;
import org.opengis.referencing.operation.TransformException;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestStep;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.opengis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeocentricTranslationTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeocentricTranslationTest.java
index 3b9de1a..e94981c 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeocentricTranslationTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeocentricTranslationTest.java
@@ -34,7 +34,7 @@ import org.apache.sis.referencing.operation.transform.LinearTransform;
import org.apache.sis.referencing.operation.transform.MathTransformTestCase;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.StrictMath.toRadians;
import static org.opengis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/Geographic3Dto2DTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/Geographic3Dto2DTest.java
index 60c52b6..6b75b1c 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/Geographic3Dto2DTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/Geographic3Dto2DTest.java
@@ -25,7 +25,7 @@ import org.apache.sis.referencing.operation.matrix.Matrices;
import org.apache.sis.parameter.Parameters;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeographicOffsetsTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeographicOffsetsTest.java
index 4c9e57f..9a52f9d 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeographicOffsetsTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeographicOffsetsTest.java
@@ -29,7 +29,7 @@ import org.apache.sis.measure.Units;
import org.opengis.test.referencing.TransformTestCase;
import org.apache.sis.referencing.cs.HardCodedCS;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/LongitudeRotationTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/LongitudeRotationTest.java
index 3b11e2a..9a5a069 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/LongitudeRotationTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/LongitudeRotationTest.java
@@ -24,7 +24,7 @@ import org.apache.sis.measure.Units;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MapProjectionTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MapProjectionTest.java
index 24df893..a3d015a 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MapProjectionTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MapProjectionTest.java
@@ -24,7 +24,7 @@ import org.opengis.parameter.GeneralParameterDescriptor;
import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.ReferencingAssert.*;
import static org.apache.sis.internal.util.Constants.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MolodenskyTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MolodenskyTest.java
index 3e2ecd9..410c37f 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MolodenskyTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MolodenskyTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.internal.referencing.provider;
import org.opengis.referencing.operation.OperationMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NADCONTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NADCONTest.java
index 0bec535..c742fbc 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NADCONTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NADCONTest.java
@@ -30,7 +30,7 @@ import org.apache.sis.referencing.operation.matrix.Matrix3;
import org.apache.sis.geometry.Envelope2D;
import org.apache.sis.geometry.Envelopes;
import org.apache.sis.measure.Units;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NTv2Test.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NTv2Test.java
index 0d6c4b4..b7941ff 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NTv2Test.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NTv2Test.java
@@ -33,7 +33,7 @@ import org.apache.sis.referencing.operation.matrix.Matrix3;
import org.apache.sis.geometry.Envelope2D;
import org.apache.sis.geometry.Envelopes;
import org.apache.sis.measure.Units;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/PositionVector7ParamTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/PositionVector7ParamTest.java
index 4132c83..cb17421 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/PositionVector7ParamTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/PositionVector7ParamTest.java
@@ -28,7 +28,7 @@ import org.apache.sis.referencing.operation.transform.MathTransformTestCase;
import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.StrictMath.toRadians;
import static org.junit.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/ProvidersTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/ProvidersTest.java
index 8888882..52259e1 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/ProvidersTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/ProvidersTest.java
@@ -27,7 +27,7 @@ import org.opengis.referencing.operation.OperationMethod;
import org.apache.sis.referencing.operation.DefaultOperationMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/TransverseMercatorTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/TransverseMercatorTest.java
index bb84b16..f180992 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/TransverseMercatorTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/TransverseMercatorTest.java
@@ -20,7 +20,7 @@ import org.opengis.parameter.ParameterValueGroup;
import org.apache.sis.internal.util.Constants;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
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 b68d37e..2a49643 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
@@ -24,7 +24,7 @@ import org.apache.sis.referencing.CRS;
import org.apache.sis.test.TestCase;
import org.junit.BeforeClass;
import org.junit.AfterClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
import static org.junit.Assume.assumeNotNull;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
index 71669de..b4dbc05 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
@@ -45,7 +45,7 @@ import org.apache.sis.measure.Units;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.ReferencingAssert.*;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/MathTransformParserTest.java b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/MathTransformParserTest.java
index 0ff6960..34350a3 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/MathTransformParserTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/MathTransformParserTest.java
@@ -28,7 +28,7 @@ import org.apache.sis.referencing.operation.transform.DefaultMathTransformFactor
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTFormatTest.java b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTFormatTest.java
index 8af1cff..d8959e5 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTFormatTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTFormatTest.java
@@ -26,7 +26,7 @@ import org.apache.sis.referencing.datum.DefaultPrimeMeridian;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorGroupTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorGroupTest.java
index 9b43281..3e93c60 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorGroupTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorGroupTest.java
@@ -27,7 +27,7 @@ import org.apache.sis.io.wkt.Convention;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.opengis.test.Validators.*;
import static java.util.Collections.singletonMap;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorTest.java
index d97be2a..b674f92 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorTest.java
@@ -32,7 +32,7 @@ import org.apache.sis.measure.Units;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.opengis.test.Validators.*;
import static org.apache.sis.test.MetadataAssert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueGroupTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueGroupTest.java
index 7a053ce..c1502fc 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueGroupTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueGroupTest.java
@@ -32,7 +32,7 @@ import org.apache.sis.util.ComparisonMode;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
import static org.opengis.test.Validators.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueTest.java
index ba21073..52c58c1 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueTest.java
@@ -28,7 +28,7 @@ import org.apache.sis.measure.Units;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.StrictMath.*;
import static org.opengis.test.Validators.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/MapProjectionParametersTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/MapProjectionParametersTest.java
index 09b2657..a2b7dd1 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/MapProjectionParametersTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/MapProjectionParametersTest.java
@@ -23,7 +23,7 @@ import org.opengis.parameter.ParameterValue;
import org.opengis.parameter.ParameterValueGroup;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static org.apache.sis.internal.util.Constants.SEMI_MAJOR;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/MatrixParametersAlphaNumTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/MatrixParametersAlphaNumTest.java
index fdaa8a6..e69dec9 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/MatrixParametersAlphaNumTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/MatrixParametersAlphaNumTest.java
@@ -17,7 +17,7 @@
package org.apache.sis.parameter;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/MatrixParametersTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/MatrixParametersTest.java
index fba13ff..3702251 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/MatrixParametersTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/MatrixParametersTest.java
@@ -17,7 +17,7 @@
package org.apache.sis.parameter;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterBuilderTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterBuilderTest.java
index 8f72fd5..3b16a3c 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterBuilderTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterBuilderTest.java
@@ -23,7 +23,7 @@ import org.apache.sis.measure.Units;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
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 40b081f..ac7d0fc 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
@@ -30,7 +30,7 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.BeforeClass;
import org.junit.AfterClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
import static org.apache.sis.metadata.iso.citation.Citations.OGC;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterMarshallingTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterMarshallingTest.java
index c5a6480..6c986ae 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterMarshallingTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterMarshallingTest.java
@@ -37,7 +37,7 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.xml.TestCase;
import org.apache.sis.xml.Namespaces;
import org.apache.sis.xml.XML;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.ReferencingAssert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParametersTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParametersTest.java
index e39d6a4..f319dc6 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParametersTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParametersTest.java
@@ -33,7 +33,7 @@ import org.apache.sis.measure.Units;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestUtilities;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
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 a89901e..bb29519 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
@@ -27,7 +27,7 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.AfterClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.util.Collections.singletonMap;
import static org.apache.sis.test.ReferencingAssert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorValuesTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorValuesTest.java
index ae167d2..ff8930b 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorValuesTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorValuesTest.java
@@ -31,7 +31,7 @@ import org.apache.sis.internal.util.Constants;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.util.Collections.singletonMap;
import static org.opengis.test.Validators.validate;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/UnmodifiableParameterValueGroupTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/UnmodifiableParameterValueGroupTest.java
index 255f22c..2c4a5cd 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/UnmodifiableParameterValueGroupTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/UnmodifiableParameterValueGroupTest.java
@@ -21,7 +21,7 @@ import org.opengis.parameter.ParameterValue;
import org.opengis.parameter.ParameterValueGroup;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/UnmodifiableParameterValueTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/UnmodifiableParameterValueTest.java
index f0a736c..47c5ce0 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/UnmodifiableParameterValueTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/UnmodifiableParameterValueTest.java
@@ -22,7 +22,7 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.apache.sis.util.ComparisonMode;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.TestUtilities.date;
import static org.junit.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java
index 094df04..f71181b 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java
@@ -31,7 +31,7 @@ import org.apache.sis.internal.jaxb.Context;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractReferenceSystemTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractReferenceSystemTest.java
index 7cbcfa0..5f2c73b 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractReferenceSystemTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractReferenceSystemTest.java
@@ -31,7 +31,7 @@ import org.apache.sis.test.mock.VerticalCRSMock;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.opengis.referencing.ReferenceSystem.*;
import static org.apache.sis.test.Assert.*;
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 19408dc..9ad5133 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
@@ -39,7 +39,7 @@ import org.apache.sis.test.LoggingWatcher;
import org.apache.sis.test.TestCase;
import org.junit.After;
import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderTest.java
index 962c71a..b3405a8 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderTest.java
@@ -33,7 +33,7 @@ import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/CRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/CRSTest.java
index cd64b83..7392814 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/CRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/CRSTest.java
@@ -40,7 +40,7 @@ import org.apache.sis.referencing.cs.HardCodedCS;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/CommonCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/CommonCRSTest.java
index 292a0d3..0888041 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/CommonCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/CommonCRSTest.java
@@ -41,7 +41,7 @@ import org.opengis.test.Validators;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
import static org.apache.sis.test.TestUtilities.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/EPSGFactoryFallbackTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/EPSGFactoryFallbackTest.java
index 21a3666..b073f8e 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/EPSGFactoryFallbackTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/EPSGFactoryFallbackTest.java
@@ -43,7 +43,7 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestUtilities;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticCalculatorTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticCalculatorTest.java
index 637b98e..8f4e39d 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticCalculatorTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticCalculatorTest.java
@@ -42,7 +42,7 @@ import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
import net.sf.geographiclib.Geodesic;
import net.sf.geographiclib.GeodesicData;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.StrictMath.*;
import static org.opengis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/IdentifiedObjectsTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/IdentifiedObjectsTest.java
index e4a191d..99ff713 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/IdentifiedObjectsTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/IdentifiedObjectsTest.java
@@ -25,7 +25,7 @@ import org.apache.sis.internal.system.DefaultFactories;
import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.test.mock.IdentifiedObjectMock;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static org.apache.sis.referencing.IdentifiedObjects.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/NamedIdentifierTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/NamedIdentifierTest.java
index bd34cc2..4c19727 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/NamedIdentifierTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/NamedIdentifierTest.java
@@ -28,7 +28,7 @@ import org.apache.sis.internal.system.DefaultFactories;
import org.apache.sis.util.iso.DefaultInternationalString;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/StandardDefinitionsTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/StandardDefinitionsTest.java
index 842e8da..26474b6 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/StandardDefinitionsTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/StandardDefinitionsTest.java
@@ -43,7 +43,7 @@ import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.referencing.cs.HardCodedAxes;
import org.apache.sis.referencing.cs.HardCodedCS;
import org.apache.sis.referencing.datum.HardCodedDatum;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.opengis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/AbstractCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/AbstractCRSTest.java
index 2bfb1b8..bcf6f87 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/AbstractCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/AbstractCRSTest.java
@@ -21,7 +21,7 @@ import org.apache.sis.referencing.cs.HardCodedAxes;
import org.apache.sis.referencing.cs.AxesConvention;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.util.Collections.singletonMap;
import static org.opengis.referencing.cs.CoordinateSystem.NAME_KEY;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java
index 09733d0..bfd7dc9 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java
@@ -33,7 +33,7 @@ import org.apache.sis.io.wkt.Convention;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.xml.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.util.Collections.singletonMap;
import static org.opengis.referencing.crs.CompoundCRS.NAME_KEY;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java
index 6af70ba..c5bf1ce 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java
@@ -35,7 +35,7 @@ import org.apache.sis.measure.Units;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.xml.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.ReferencingAssert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultEngineeringCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultEngineeringCRSTest.java
index 8b75811..9230f31 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultEngineeringCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultEngineeringCRSTest.java
@@ -27,7 +27,7 @@ import org.apache.sis.referencing.datum.DefaultEngineeringDatum;
import org.apache.sis.io.wkt.Convention;
import org.apache.sis.test.xml.TestCase;
import org.apache.sis.xml.Namespaces;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeocentricCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeocentricCRSTest.java
index 9a50c1e..99a9989 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeocentricCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeocentricCRSTest.java
@@ -28,7 +28,7 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
import org.opengis.test.Validators;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java
index c513430..1746bd4 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java
@@ -21,7 +21,7 @@ import org.opengis.test.Validators;
import org.apache.sis.referencing.GeodeticObjectVerifier;
import org.apache.sis.test.xml.TestCase;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java
index 01533fd..4407474 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java
@@ -27,7 +27,7 @@ import org.apache.sis.io.wkt.Convention;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultImageCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultImageCRSTest.java
index 9cbee7f..9909384 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultImageCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultImageCRSTest.java
@@ -30,7 +30,7 @@ import org.apache.sis.referencing.cs.HardCodedAxes;
import org.apache.sis.io.wkt.Convention;
import org.apache.sis.test.xml.TestCase;
import org.apache.sis.xml.Namespaces;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
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 a69f2f7..dfb44be 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
@@ -42,7 +42,7 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.xml.TestCase;
import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.junit.Rule;
import static org.apache.sis.test.ReferencingAssert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultTemporalCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultTemporalCRSTest.java
index 9b07d48..8e42dba 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultTemporalCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultTemporalCRSTest.java
@@ -23,7 +23,7 @@ import org.apache.sis.referencing.datum.DefaultTemporalDatum;
import org.apache.sis.referencing.cs.HardCodedCS;
import org.apache.sis.io.wkt.Convention;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
import static org.apache.sis.internal.util.StandardDateFormat.MILLISECONDS_PER_DAY;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultVerticalCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultVerticalCRSTest.java
index e42bd87..163fdd0 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultVerticalCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultVerticalCRSTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.referencing.crs;
import org.apache.sis.io.wkt.Convention;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/HardCodedCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/HardCodedCRSTest.java
index 566067a..7fac3d0 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/HardCodedCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/HardCodedCRSTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.referencing.crs;
import org.opengis.test.ValidatorContainer;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
import static org.apache.sis.referencing.crs.HardCodedCRS.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/SubTypesTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/SubTypesTest.java
index 815b206..788f6c4 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/SubTypesTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/SubTypesTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.referencing.crs;
import java.util.Arrays;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/AbstractCSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/AbstractCSTest.java
index 364bb8a..015c6e9 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/AbstractCSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/AbstractCSTest.java
@@ -23,7 +23,7 @@ import org.apache.sis.util.resources.Vocabulary;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.util.Collections.singletonMap;
import static org.opengis.referencing.cs.CoordinateSystem.NAME_KEY;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CodesTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CodesTest.java
index b79ace6..5646d98 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CodesTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CodesTest.java
@@ -25,7 +25,7 @@ import org.opengis.referencing.cs.CSAuthorityFactory;
import org.apache.sis.referencing.factory.TestFactorySource;
import org.apache.sis.measure.Units;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CoordinateSystemsTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CoordinateSystemsTest.java
index 0efb380..c2d60cc 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CoordinateSystemsTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CoordinateSystemsTest.java
@@ -32,7 +32,7 @@ import org.apache.sis.measure.ElevationAngle;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.Double.NaN;
import static java.util.Collections.singletonMap;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCartesianCSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCartesianCSTest.java
index d918df8..8c74c0b 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCartesianCSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCartesianCSTest.java
@@ -26,7 +26,7 @@ import org.apache.sis.measure.Units;
import org.apache.sis.test.xml.TestCase;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.util.Collections.singletonMap;
import static org.opengis.referencing.IdentifiedObject.NAME_KEY;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCompoundCSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCompoundCSTest.java
index e198aba..8243c45 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCompoundCSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCompoundCSTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.referencing.cs;
import java.util.Collections;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxisTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxisTest.java
index 5ce1c2c..bde5fb7 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxisTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxisTest.java
@@ -25,7 +25,7 @@ import org.apache.sis.util.ComparisonMode;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.util.Collections.singletonMap;
import static org.apache.sis.test.MetadataAssert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCylindricalCSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCylindricalCSTest.java
index d666f89..d8367b5 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCylindricalCSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCylindricalCSTest.java
@@ -23,7 +23,7 @@ import org.apache.sis.internal.metadata.AxisDirections;
import org.apache.sis.measure.Units;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCSTest.java
index a3bc398..74c639b 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCSTest.java
@@ -26,7 +26,7 @@ import org.apache.sis.test.xml.TestCase;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.referencing.GeodeticObjectVerifier;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.ReferencingAssert.*;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultPolarCSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultPolarCSTest.java
index 844ee59..364cbc0 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultPolarCSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultPolarCSTest.java
@@ -23,7 +23,7 @@ import org.apache.sis.internal.metadata.AxisDirections;
import org.apache.sis.measure.Units;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultSphericalCSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultSphericalCSTest.java
index a2090db..c982120 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultSphericalCSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultSphericalCSTest.java
@@ -21,7 +21,7 @@ import org.opengis.referencing.cs.AxisDirection;
import org.apache.sis.internal.metadata.AxisDirections;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DirectionAlongMeridianTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DirectionAlongMeridianTest.java
index aef101e..d68874b 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DirectionAlongMeridianTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DirectionAlongMeridianTest.java
@@ -20,7 +20,7 @@ import org.opengis.referencing.cs.AxisDirection;
import org.apache.sis.io.wkt.Convention;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedCSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedCSTest.java
index 4fcbf41..0274878 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedCSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedCSTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.referencing.cs;
import org.opengis.test.Validators;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
import static org.apache.sis.referencing.cs.HardCodedCS.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/NormalizerTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/NormalizerTest.java
index ce3d249..841b0ad 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/NormalizerTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/NormalizerTest.java
@@ -28,7 +28,7 @@ import org.apache.sis.util.resources.Vocabulary;
import org.apache.sis.measure.Units;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.util.Collections.singletonMap;
import static org.opengis.referencing.cs.CoordinateSystem.NAME_KEY;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/BursaWolfParametersTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/BursaWolfParametersTest.java
index 6bad976..aa7ca92 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/BursaWolfParametersTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/BursaWolfParametersTest.java
@@ -27,7 +27,7 @@ import org.apache.sis.referencing.operation.matrix.Matrix4;
import org.apache.sis.referencing.operation.matrix.NoninvertibleMatrixException;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java
index b0303a5..42f05d5 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java
@@ -26,7 +26,7 @@ import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.xml.TestCase;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.StrictMath.*;
import static org.apache.sis.test.MetadataAssert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java
index c32647a..3d8550e 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java
@@ -33,7 +33,7 @@ import org.apache.sis.test.xml.TestCase;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestStep;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
import static org.apache.sis.referencing.GeodeticObjectVerifier.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java
index e5d5149..4f6daa2 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java
@@ -30,7 +30,7 @@ import org.apache.sis.io.wkt.Convention;
import org.apache.sis.test.xml.TestCase;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.util.Collections.singletonMap;
import static org.apache.sis.test.MetadataAssert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
index 714ab64..f27a6b6 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
@@ -24,7 +24,7 @@ import org.apache.sis.io.wkt.Convention;
import org.apache.sis.metadata.iso.ImmutableIdentifier;
import org.apache.sis.metadata.iso.citation.HardCodedCitations;
import org.apache.sis.test.xml.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.ReferencingAssert.*;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java
index ccce077..d22b4c6 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java
@@ -28,7 +28,7 @@ import org.apache.sis.util.Version;
import org.apache.sis.xml.XML;
import org.apache.sis.xml.MarshallerPool;
import org.apache.sis.test.xml.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.util.Collections.singletonMap;
import static org.apache.sis.test.MetadataAssert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/TimeDependentBWPTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/TimeDependentBWPTest.java
index 2da281d..0cd8fd0 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/TimeDependentBWPTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/TimeDependentBWPTest.java
@@ -24,7 +24,7 @@ import org.apache.sis.referencing.operation.matrix.NoninvertibleMatrixException;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
import static org.apache.sis.test.TestUtilities.date;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/AuthorityFactoryProxyTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/AuthorityFactoryProxyTest.java
index 6ea0c83..bbb37d1 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/AuthorityFactoryProxyTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/AuthorityFactoryProxyTest.java
@@ -34,7 +34,7 @@ import org.apache.sis.referencing.crs.AbstractCRS;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java
index def1fdf..1328949 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java
@@ -44,7 +44,7 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.ReferencingAssert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactoryTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactoryTest.java
index c5c5f27..47c6be8 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactoryTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactoryTest.java
@@ -26,7 +26,7 @@ import org.apache.sis.internal.system.Loggers;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static org.junit.Assume.assumeTrue;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/IdentifiedObjectFinderTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/IdentifiedObjectFinderTest.java
index 83e29ba..2953b0a 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/IdentifiedObjectFinderTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/IdentifiedObjectFinderTest.java
@@ -28,7 +28,7 @@ import org.apache.sis.referencing.crs.DefaultGeographicCRS;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
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 7cf697f..85a671a 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
@@ -48,7 +48,7 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.After;
import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
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 cf92857..b3de93f 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
@@ -57,7 +57,7 @@ import org.apache.sis.referencing.factory.IdentifiedObjectFinder;
// Test imports
import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.junit.Ignore;
import org.junit.After;
import org.junit.AfterClass;
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 0e71a33..0d9d495 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
@@ -44,7 +44,7 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.After;
import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static org.junit.Assume.assumeTrue;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/TableInfoTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/TableInfoTest.java
index 455f691..269c7b0 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/TableInfoTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/TableInfoTest.java
@@ -17,7 +17,7 @@
package org.apache.sis.referencing.factory.sql;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/epsg/DataScriptFormatterTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/epsg/DataScriptFormatterTest.java
index 26f404e..1b232c6 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/epsg/DataScriptFormatterTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/epsg/DataScriptFormatterTest.java
@@ -17,7 +17,7 @@
package org.apache.sis.referencing.factory.sql.epsg;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/AbstractSingleOperationTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/AbstractSingleOperationTest.java
index 94bcf44..b0da7e1 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/AbstractSingleOperationTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/AbstractSingleOperationTest.java
@@ -26,7 +26,7 @@ import org.apache.sis.parameter.DefaultParameterDescriptorGroup;
import org.apache.sis.referencing.operation.transform.MathTransformsTest;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.opengis.test.Assert.*;
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 67e515a..8d93776 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
@@ -60,7 +60,7 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.Assert;
import org.junit.BeforeClass;
import org.junit.AfterClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
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 c8954d4..94e46ee 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
@@ -42,7 +42,7 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.junit.BeforeClass;
import org.junit.AfterClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.ReferencingAssert.*;
import static org.junit.Assume.assumeTrue;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperationTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperationTest.java
index bf2477f..763d816 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperationTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperationTest.java
@@ -33,7 +33,7 @@ import org.apache.sis.io.wkt.Convention;
import org.opengis.test.Validators;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.xml.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConversionTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConversionTest.java
index 25fef9e..e128aa2 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConversionTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConversionTest.java
@@ -48,7 +48,7 @@ import org.apache.sis.parameter.DefaultParameterDescriptorTest;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
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 ec1f784..b4fb5cb 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
@@ -40,7 +40,7 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.junit.BeforeClass;
import org.junit.AfterClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.ReferencingAssert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultFormulaTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultFormulaTest.java
index 9a9e524..3093b94 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultFormulaTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultFormulaTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.referencing.operation;
import org.apache.sis.io.wkt.Convention;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java
index 02d604b..3c96a93 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java
@@ -32,7 +32,7 @@ import org.apache.sis.parameter.DefaultParameterDescriptorGroup;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.ReferencingAssert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultPassThroughOperationTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultPassThroughOperationTest.java
index 84c5141..e15ab9e 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultPassThroughOperationTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultPassThroughOperationTest.java
@@ -25,7 +25,7 @@ import org.opengis.referencing.operation.Transformation;
import org.opengis.test.Validators;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.xml.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.TestUtilities.getSingleton;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultTransformationTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultTransformationTest.java
index 55bb30e..5d14e9c 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultTransformationTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultTransformationTest.java
@@ -35,7 +35,7 @@ import org.apache.sis.io.wkt.Convention;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/SingleOperationMarshallingTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/SingleOperationMarshallingTest.java
index 2b3c617..2d65e13 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/SingleOperationMarshallingTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/SingleOperationMarshallingTest.java
@@ -43,7 +43,7 @@ import org.apache.sis.xml.XML;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.xml.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.metadata.iso.citation.Citations.EPSG;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LinearTransformBuilderTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LinearTransformBuilderTest.java
index 868ce37..c14aa10 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LinearTransformBuilderTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LinearTransformBuilderTest.java
@@ -30,7 +30,7 @@ import org.apache.sis.geometry.DirectPosition2D;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LocalizationGridBuilderTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LocalizationGridBuilderTest.java
index 803cefa..1b69b06 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LocalizationGridBuilderTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LocalizationGridBuilderTest.java
@@ -23,7 +23,7 @@ import org.opengis.referencing.operation.TransformException;
import org.opengis.test.referencing.TransformTestCase;
import org.apache.sis.geometry.Envelope2D;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.ReferencingAssert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/ResidualGridTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/ResidualGridTest.java
index 800e646..f2d2acd 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/ResidualGridTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/ResidualGridTest.java
@@ -22,7 +22,7 @@ import org.opengis.referencing.operation.TransformException;
import org.apache.sis.referencing.operation.transform.MathTransforms;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/AffineTransforms2DTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/AffineTransforms2DTest.java
index b103c38..742e125 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/AffineTransforms2DTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/AffineTransforms2DTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.referencing.operation.matrix;
import java.awt.geom.AffineTransform;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static java.lang.StrictMath.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/GeneralMatrixTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/GeneralMatrixTest.java
index 8d3d883..4019714 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/GeneralMatrixTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/GeneralMatrixTest.java
@@ -17,7 +17,7 @@
package org.apache.sis.referencing.operation.matrix;
import java.util.Random;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatricesTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatricesTest.java
index 13db25e..30b3027 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatricesTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatricesTest.java
@@ -27,7 +27,7 @@ import org.apache.sis.util.ComparisonMode;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.Double.NaN;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix1Test.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix1Test.java
index 3fc875f..7ed0979 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix1Test.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix1Test.java
@@ -16,7 +16,7 @@
*/
package org.apache.sis.referencing.operation.matrix;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.sis.test.DependsOn;
import static org.junit.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix2Test.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix2Test.java
index 974d3b0..2befdfb 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix2Test.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix2Test.java
@@ -17,7 +17,7 @@
package org.apache.sis.referencing.operation.matrix;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static org.apache.sis.referencing.operation.matrix.Matrix2.SIZE;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix3Test.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix3Test.java
index cb5b336..cbfc97c 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix3Test.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix3Test.java
@@ -17,7 +17,7 @@
package org.apache.sis.referencing.operation.matrix;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static org.apache.sis.referencing.operation.matrix.Matrix3.SIZE;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix4Test.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix4Test.java
index a8c6208..44112bd 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix4Test.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix4Test.java
@@ -17,7 +17,7 @@
package org.apache.sis.referencing.operation.matrix;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.Double.NaN;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java
index d2a270c..f9fc5d8 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java
@@ -24,7 +24,7 @@ import org.apache.sis.internal.util.DoubleDouble;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.DependsOnMethod;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
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 09710a6..0978791 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,7 +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.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.Double.NaN;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/SolverTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/SolverTest.java
index 08dce2b..b0493d5 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/SolverTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/SolverTest.java
@@ -22,7 +22,7 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.Double.NaN;
import static org.apache.sis.referencing.operation.matrix.MatrixTestCase.assertEqualsJAMA;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/AlbersEqualAreaTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/AlbersEqualAreaTest.java
index e340a3c..0c604b8 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/AlbersEqualAreaTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/AlbersEqualAreaTest.java
@@ -27,7 +27,7 @@ import static java.lang.Double.NaN;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestUtilities;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java
index adf1795..204bfc8 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java
@@ -24,7 +24,7 @@ import org.apache.sis.referencing.operation.transform.AbstractMathTransform1D;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestUtilities;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.Double.*;
import static java.lang.StrictMath.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/CylindricalEqualAreaTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/CylindricalEqualAreaTest.java
index 387a577..ac1ca51 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/CylindricalEqualAreaTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/CylindricalEqualAreaTest.java
@@ -23,7 +23,7 @@ import org.apache.sis.internal.referencing.provider.LambertCylindricalEqualArea;
import org.apache.sis.internal.referencing.provider.LambertCylindricalEqualAreaSpherical;
import org.apache.sis.referencing.operation.transform.CoordinateDomain;
import org.apache.sis.test.DependsOnMethod;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.StrictMath.*;
import static java.lang.Double.NaN;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/EqualAreaProjectionTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/EqualAreaProjectionTest.java
index 40953a4..22737ff 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/EqualAreaProjectionTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/EqualAreaProjectionTest.java
@@ -23,7 +23,7 @@ import org.apache.sis.referencing.operation.DefaultOperationMethod;
import org.apache.sis.internal.util.Constants;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.StrictMath.*;
import static org.apache.sis.math.MathFunctions.atanh;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/EquirectangularTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/EquirectangularTest.java
index 115ee84..c8c3964 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/EquirectangularTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/EquirectangularTest.java
@@ -25,7 +25,7 @@ import org.apache.sis.io.wkt.Convention;
import org.apache.sis.referencing.operation.transform.CoordinateDomain;
import org.apache.sis.referencing.operation.transform.MathTransformFactoryMock;
import org.apache.sis.test.ReferencingAssert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.Double.NaN;
import static java.lang.StrictMath.toRadians;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/InitializerTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/InitializerTest.java
index 0937d3f..afcf3ab 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/InitializerTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/InitializerTest.java
@@ -24,7 +24,7 @@ import org.apache.sis.internal.referencing.Formulas;
import org.apache.sis.internal.referencing.provider.ObliqueStereographic;
import org.apache.sis.parameter.Parameters;
import org.opengis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.StrictMath.*;
import static org.opengis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java
index f4b7ff9..606c33d 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java
@@ -32,7 +32,7 @@ import org.apache.sis.internal.util.DoubleDouble;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestUtilities;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.StrictMath.*;
import static java.lang.Double.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java
index bce22c9..d796d5f 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java
@@ -27,7 +27,7 @@ import org.apache.sis.internal.referencing.provider.MillerCylindrical;
import org.apache.sis.referencing.operation.transform.CoordinateDomain;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.Double.*;
import static java.lang.StrictMath.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MeridianArcTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MeridianArcTest.java
index 164d093..f4675eb 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MeridianArcTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MeridianArcTest.java
@@ -25,7 +25,7 @@ import org.apache.sis.internal.referencing.Resources;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.StrictMath.*;
import static org.junit.Assert.assertEquals;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MollweideTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MollweideTest.java
index 325554a..cbf5d8b 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MollweideTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MollweideTest.java
@@ -21,7 +21,7 @@ import org.opengis.util.FactoryException;
import org.apache.sis.internal.referencing.Formulas;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/NormalizedProjectionTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/NormalizedProjectionTest.java
index c3b2486..45c45bc 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/NormalizedProjectionTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/NormalizedProjectionTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.referencing.operation.projection;
import org.apache.sis.referencing.operation.transform.TransformTestCase;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.StrictMath.*;
import static org.apache.sis.internal.metadata.ReferencingServices.NAUTICAL_MILE;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java
index efeb540..69015b9 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java
@@ -29,7 +29,7 @@ import org.apache.sis.internal.system.DefaultFactories;
import org.apache.sis.measure.Units;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.StrictMath.*;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/PolarStereographicTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/PolarStereographicTest.java
index 2d6b588..678c1d4 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/PolarStereographicTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/PolarStereographicTest.java
@@ -30,7 +30,7 @@ import org.apache.sis.referencing.operation.transform.MathTransformFactoryMock;
import org.apache.sis.parameter.Parameters;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.Double.NaN;
import static java.lang.StrictMath.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/PolyconicTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/PolyconicTest.java
index 51a8849..55fa0cf 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/PolyconicTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/PolyconicTest.java
@@ -21,7 +21,7 @@ import org.opengis.referencing.operation.TransformException;
import org.apache.sis.internal.referencing.Formulas;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/SinusoidalTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/SinusoidalTest.java
index 2ce6ffc..0be3e14 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/SinusoidalTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/SinusoidalTest.java
@@ -21,7 +21,7 @@ import org.opengis.util.FactoryException;
import org.apache.sis.internal.referencing.Formulas;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java
index ddc4d1d..ae563a8 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java
@@ -30,7 +30,7 @@ import org.apache.sis.util.CharSequences;
import org.apache.sis.test.OptionalTestData;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.Double.NaN;
import static java.lang.StrictMath.min;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ZonedGridSystemTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ZonedGridSystemTest.java
index 1580b07..65d9551 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ZonedGridSystemTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ZonedGridSystemTest.java
@@ -27,7 +27,7 @@ import org.apache.sis.parameter.Parameterized;
import org.apache.sis.parameter.Parameters;
import org.apache.sis.measure.Units;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/AbridgedMolodenskyTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/AbridgedMolodenskyTransformTest.java
index 9b2cb66..662b87a 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/AbridgedMolodenskyTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/AbridgedMolodenskyTransformTest.java
@@ -25,7 +25,7 @@ import org.apache.sis.internal.system.DefaultFactories;
import org.apache.sis.internal.referencing.Formulas;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
import static java.lang.StrictMath.toRadians;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/AbstractMathTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/AbstractMathTransformTest.java
index 546305f..29a620d 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/AbstractMathTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/AbstractMathTransformTest.java
@@ -24,7 +24,7 @@ import static org.apache.sis.referencing.operation.transform.AbstractMathTransfo
import static org.apache.sis.referencing.operation.transform.AbstractMathTransform.MAXIMUM_BUFFER_SIZE;
// Test imports
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CartesianToPolarTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CartesianToPolarTest.java
index 533503d..d873902 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CartesianToPolarTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CartesianToPolarTest.java
@@ -23,7 +23,7 @@ import org.opengis.referencing.operation.TransformException;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestUtilities;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CartesianToSphericalTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CartesianToSphericalTest.java
index 21bcaaf..06448e0 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CartesianToSphericalTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CartesianToSphericalTest.java
@@ -23,7 +23,7 @@ import org.opengis.referencing.operation.TransformException;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestUtilities;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformTest.java
index bf29c78..4efa803 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformTest.java
@@ -23,7 +23,7 @@ import org.apache.sis.internal.referencing.j2d.AffineTransform2D;
import org.apache.sis.referencing.operation.matrix.Matrices;
import org.apache.sis.referencing.operation.matrix.Matrix4;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.opengis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ContextualParametersTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ContextualParametersTest.java
index a124c04..1689cfa 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ContextualParametersTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ContextualParametersTest.java
@@ -27,7 +27,7 @@ import org.apache.sis.referencing.operation.matrix.Matrix3;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.StrictMath.PI;
import static java.lang.StrictMath.toRadians;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateDomainTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateDomainTest.java
index 33eaf7d..9be675d 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateDomainTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateDomainTest.java
@@ -20,7 +20,7 @@ import java.util.Random;
// Test imports
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
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 8d9f435..8344df8 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
@@ -34,7 +34,7 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.util.ArraysExt;
import org.junit.BeforeClass;
import org.junit.AfterClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CopyTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CopyTransformTest.java
index 0e6c2eb..f02dbea 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CopyTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CopyTransformTest.java
@@ -21,7 +21,7 @@ import org.apache.sis.internal.referencing.provider.Affine;
import org.apache.sis.referencing.operation.matrix.Matrices;
// Test imports
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java
index 08067d3..60be1cb 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java
@@ -45,7 +45,7 @@ import org.apache.sis.referencing.cs.HardCodedCS;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java
index 65d5467..c7f2416 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java
@@ -36,7 +36,7 @@ import static java.lang.StrictMath.toRadians;
import org.apache.sis.internal.referencing.provider.GeocentricTranslationTest;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ExponentialTransform1DTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ExponentialTransform1DTest.java
index 2859fe5..db6b750 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ExponentialTransform1DTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ExponentialTransform1DTest.java
@@ -21,7 +21,7 @@ import org.opengis.referencing.operation.TransformException;
import static java.lang.StrictMath.*;
// Test imports
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
import static org.apache.sis.test.ReferencingAssert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransformTest.java
index b0b5960..60573d2 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransformTest.java
@@ -32,7 +32,7 @@ import org.apache.sis.internal.referencing.provider.GeocentricTranslationTest;
import org.apache.sis.referencing.datum.HardCodedDatum;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java
index 2ab9472..80b5a9c 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java
@@ -25,7 +25,7 @@ import org.apache.sis.internal.referencing.Formulas;
import org.apache.sis.internal.referencing.provider.GeocentricTranslationTest;
import org.apache.sis.internal.referencing.provider.MolodenskyInterpolation;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedTransformTest.java
index e673b04..b012fc6 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedTransformTest.java
@@ -33,7 +33,7 @@ import org.apache.sis.internal.referencing.provider.NADCONTest;
import org.apache.sis.internal.referencing.provider.NTv2Test;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/IterationStrategyTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/IterationStrategyTest.java
index e73518f..39db91b 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/IterationStrategyTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/IterationStrategyTest.java
@@ -23,7 +23,7 @@ import static java.lang.StrictMath.*;
import static org.apache.sis.referencing.operation.transform.IterationStrategy.*;
// Test imports
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOnMethod;
import static org.junit.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1DTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1DTest.java
index a6e509c..5501a6e 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1DTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1DTest.java
@@ -21,7 +21,7 @@ import org.opengis.referencing.operation.MathTransform1D;
import org.opengis.referencing.operation.NoninvertibleTransformException;
import org.opengis.referencing.operation.TransformException;
import org.apache.sis.test.DependsOnMethod;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.opengis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearTransformTest.java
index 0168262..4e58d2a 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearTransformTest.java
@@ -22,7 +22,7 @@ import org.opengis.referencing.operation.Matrix;
import org.opengis.referencing.operation.TransformException;
// Test imports
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestRunner;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LogarithmicTransform1DTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LogarithmicTransform1DTest.java
index b1fcdd8..4c0cc25 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LogarithmicTransform1DTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LogarithmicTransform1DTest.java
@@ -21,7 +21,7 @@ import org.opengis.referencing.operation.TransformException;
import static java.lang.StrictMath.*;
// Test imports
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
import static org.apache.sis.test.ReferencingAssert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformsTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformsTest.java
index db41461..d26c779 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformsTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformsTest.java
@@ -30,7 +30,7 @@ import org.apache.sis.referencing.operation.matrix.Matrix4;
import org.apache.sis.geometry.GeneralDirectPosition;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
index 157db04..d5a40db 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
@@ -37,7 +37,7 @@ import org.apache.sis.referencing.datum.HardCodedDatum;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestUtilities;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/OperationMethodSetTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/OperationMethodSetTest.java
index c6a181b..ef42ff1 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/OperationMethodSetTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/OperationMethodSetTest.java
@@ -32,7 +32,7 @@ import org.apache.sis.internal.util.UnmodifiableArrayList;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PassThroughTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PassThroughTransformTest.java
index 053d7fd..cd24194 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PassThroughTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PassThroughTransformTest.java
@@ -29,7 +29,7 @@ import org.apache.sis.referencing.operation.matrix.Matrix3;
import org.apache.sis.util.ArraysExt;
// Test imports
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.DependsOn;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PolarToCartesianTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PolarToCartesianTest.java
index 223b523..1a46db5 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PolarToCartesianTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PolarToCartesianTest.java
@@ -26,7 +26,7 @@ import static java.lang.StrictMath.*;
// Test dependencies
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestUtilities;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
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 52e468d..4f1a71a 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
@@ -35,7 +35,7 @@ import org.junit.After;
import static org.opengis.test.Assert.*;
// Branch-dependent imports
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.junit.Ignore;
import org.opengis.util.FactoryException;
import org.opengis.referencing.operation.TransformException;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java
index 3212123..3162a09 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java
@@ -26,7 +26,7 @@ import org.apache.sis.internal.util.DoubleDouble;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.opengis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/SpecializableTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/SpecializableTransformTest.java
index f2e1a14..69add21 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/SpecializableTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/SpecializableTransformTest.java
@@ -24,7 +24,7 @@ import org.opengis.referencing.operation.TransformException;
import org.apache.sis.internal.referencing.j2d.AffineTransform2D;
import org.apache.sis.geometry.Envelope2D;
import org.apache.sis.test.DependsOnMethod;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/SphericalToCartesianTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/SphericalToCartesianTest.java
index b014e95..d8b8a65 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/SphericalToCartesianTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/SphericalToCartesianTest.java
@@ -26,7 +26,7 @@ import static java.lang.StrictMath.*;
// Test dependencies
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestUtilities;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransferFunctionTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransferFunctionTest.java
index 127ff60..4b2ff55 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransferFunctionTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransferFunctionTest.java
@@ -26,7 +26,7 @@ import org.apache.sis.internal.system.DefaultFactories;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformSeparatorTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformSeparatorTest.java
index 14fe237..c17cba4 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformSeparatorTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformSeparatorTest.java
@@ -35,7 +35,7 @@ import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.Double.NaN;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TranslationTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TranslationTransformTest.java
index 00381b5..69ff1c9 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TranslationTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TranslationTransformTest.java
@@ -25,7 +25,7 @@ import org.apache.sis.internal.util.DoubleDouble;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/ConsistencyTest.java b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/ConsistencyTest.java
index 2d2ad1e..2963fde 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/ConsistencyTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/ConsistencyTest.java
@@ -41,7 +41,7 @@ import org.apache.sis.util.CharSequences;
import org.apache.sis.util.Utilities;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static org.junit.Assume.assumeTrue;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/CoordinateOperationTest.java b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/CoordinateOperationTest.java
index aab1218..4386e3e 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/CoordinateOperationTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/CoordinateOperationTest.java
@@ -32,7 +32,7 @@ import org.apache.sis.referencing.datum.DefaultEllipsoid;
import org.apache.sis.referencing.operation.transform.MathTransformTestCase;
import org.apache.sis.internal.referencing.CoordinateOperations;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static java.lang.StrictMath.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/CoordinateReferenceSystemTest.java b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/CoordinateReferenceSystemTest.java
index f600d68..411fa6d 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/CoordinateReferenceSystemTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/CoordinateReferenceSystemTest.java
@@ -22,7 +22,7 @@ import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.factory.TestFactorySource;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static org.junit.Assume.assumeNotNull;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/DatumShiftTest.java b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/DatumShiftTest.java
index 439e590..ac1ac4d 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/DatumShiftTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/DatumShiftTest.java
@@ -26,7 +26,7 @@ import org.apache.sis.internal.referencing.provider.FranceGeocentricInterpolatio
import org.apache.sis.internal.system.DataDirectory;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assume.*;
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 8ed26a8..5e44d45 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
@@ -84,7 +84,7 @@ import org.apache.sis.test.xml.TestCase;
import org.apache.sis.test.DependsOn;
import org.junit.After;
import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/AngleConverterTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/AngleConverterTest.java
index 4878194..78f13fe 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/AngleConverterTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/AngleConverterTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.internal.converter;
import org.apache.sis.measure.Angle;
import org.apache.sis.util.ObjectConverter;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ArrayConverterTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ArrayConverterTest.java
index 1e2edec..cbc4e5b 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ArrayConverterTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ArrayConverterTest.java
@@ -17,7 +17,7 @@
package org.apache.sis.internal.converter;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
import org.apache.sis.test.DependsOnMethod;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ConverterRegistryTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ConverterRegistryTest.java
index 4bbc19b..fe8407e 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ConverterRegistryTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ConverterRegistryTest.java
@@ -25,7 +25,7 @@ import org.apache.sis.util.UnconvertibleObjectException;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/FallbackConverterTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/FallbackConverterTest.java
index 2bbe6cd..a9ee8fe 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/FallbackConverterTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/FallbackConverterTest.java
@@ -22,7 +22,7 @@ import org.apache.sis.util.UnconvertibleObjectException;
import org.apache.sis.math.FunctionProperty;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/NumberConverterTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/NumberConverterTest.java
index bea29f4..ede3da9 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/NumberConverterTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/NumberConverterTest.java
@@ -23,7 +23,7 @@ import org.apache.sis.util.ObjectConverter;
import org.apache.sis.util.UnconvertibleObjectException;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java
index 9d5a80b..fc48b79 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java
@@ -28,7 +28,7 @@ import org.apache.sis.util.UnconvertibleObjectException;
import org.apache.sis.test.PlatformDependent;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assume.assumeTrue;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/StringConverterTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/StringConverterTest.java
index 1ad9af7..b1841d4 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/StringConverterTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/StringConverterTest.java
@@ -40,7 +40,7 @@ import org.apache.sis.util.UnconvertibleObjectException;
import org.apache.sis.util.iso.SimpleInternationalString;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/SystemRegistryTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/SystemRegistryTest.java
index 214e53f..6ec892f 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/SystemRegistryTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/SystemRegistryTest.java
@@ -27,7 +27,7 @@ import org.apache.sis.measure.Angle;
import org.apache.sis.util.ObjectConverter;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
import static org.apache.sis.internal.converter.SystemRegistry.INSTANCE;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/system/LoggersTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/system/LoggersTest.java
index 22b8988..6994726 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/system/LoggersTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/system/LoggersTest.java
@@ -17,7 +17,7 @@
package org.apache.sis.internal.system;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/system/ReferenceQueueConsumerTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/system/ReferenceQueueConsumerTest.java
index 9dcefc5..9206d45 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/system/ReferenceQueueConsumerTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/system/ReferenceQueueConsumerTest.java
@@ -18,7 +18,8 @@ package org.apache.sis.internal.system;
import java.lang.ref.ReferenceQueue;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
@@ -43,10 +44,13 @@ public final strictfp class ReferenceQueueConsumerTest extends TestCase {
*
* @throws InterruptedException this is the excepted exception.
*/
- @Test(expected=InterruptedException.class)
+ @Test()
public void verifyInterruptAssumption() throws InterruptedException {
- final ReferenceQueue<Object> queue = new ReferenceQueue<>();
- Thread.currentThread().interrupt();
- assertNull(queue.remove(1000));
+ Assertions.assertThrows(InterruptedException.class, () -> {
+ final ReferenceQueue<Object> queue = new ReferenceQueue<>();
+ Thread.currentThread().interrupt();
+ assertNull(queue.remove(1000));
+ });
+
}
}
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/test/AssertTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/test/AssertTest.java
index 41336a1..590c663 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/test/AssertTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/test/AssertTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.sis.internal.test;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.sis.test.TestCase;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/test/TestUtilitiesTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/test/TestUtilitiesTest.java
index 6233ec1..f973085 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/test/TestUtilitiesTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/test/TestUtilitiesTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.sis.internal.test;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestUtilities;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/util/AbstractMapTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/util/AbstractMapTest.java
index db13e37..97b31cb 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/util/AbstractMapTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/util/AbstractMapTest.java
@@ -27,7 +27,7 @@ import java.util.AbstractMap.SimpleEntry;
import java.util.NoSuchElementException;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/util/BagTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/util/BagTest.java
index f638d69..89a97f1 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/util/BagTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/util/BagTest.java
@@ -20,7 +20,7 @@ import java.util.List;
import java.util.ArrayList;
import java.util.Iterator;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/util/CheckedArrayListTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/util/CheckedArrayListTest.java
index 139b7d2..c2eaae0 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/util/CheckedArrayListTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/util/CheckedArrayListTest.java
@@ -22,7 +22,7 @@ import java.util.Collection;
import org.apache.sis.util.NullArgumentException;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationsTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationsTest.java
index 30ba976..8acffa1 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationsTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationsTest.java
@@ -22,7 +22,7 @@ import java.util.Arrays;
import org.opengis.metadata.Identifier;
import org.opengis.metadata.citation.Citation;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/util/CollectionsExtTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/util/CollectionsExtTest.java
index d8dcb5a..f7cc554 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/util/CollectionsExtTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/util/CollectionsExtTest.java
@@ -33,7 +33,7 @@ import java.util.Locale;
import java.util.function.Predicate;
import org.apache.sis.util.collection.CodeListSet;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/util/DefinitionURITest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/util/DefinitionURITest.java
index 68f46a9..b3fcaf3 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/util/DefinitionURITest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/util/DefinitionURITest.java
@@ -18,7 +18,7 @@ package org.apache.sis.internal.util;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/util/DoubleDoubleTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/util/DoubleDoubleTest.java
index 0401fc8..9eff926 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/util/DoubleDoubleTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/util/DoubleDoubleTest.java
@@ -26,7 +26,7 @@ import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static java.lang.StrictMath.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/util/ListOfUnknownSizeTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/util/ListOfUnknownSizeTest.java
index 59a7cbc..3f11ccb 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/util/ListOfUnknownSizeTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/util/ListOfUnknownSizeTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.internal.util;
import java.util.ListIterator;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/util/LocalizedParseExceptionTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/util/LocalizedParseExceptionTest.java
index 0b37efa..496ce01 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/util/LocalizedParseExceptionTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/util/LocalizedParseExceptionTest.java
@@ -23,7 +23,7 @@ import org.apache.sis.measure.Angle;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.Exceptions;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/util/NumericsTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/util/NumericsTest.java
index 2ac340f..dbafc65 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/util/NumericsTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/util/NumericsTest.java
@@ -22,7 +22,7 @@ import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.math.Vector;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.Double.NaN;
import static java.lang.Double.POSITIVE_INFINITY;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/util/StandardDateFormatTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/util/StandardDateFormatTest.java
index be4386d..11a239b 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/util/StandardDateFormatTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/util/StandardDateFormatTest.java
@@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit;
import java.text.ParseException;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.TestUtilities.date;
import static org.junit.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/util/StringsTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/util/StringsTest.java
index 3b8e76f..59f75f4 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/util/StringsTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/util/StringsTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.internal.util;
import org.apache.sis.test.TestCase;
import org.apache.sis.util.Characters;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/util/X364Test.java b/core/sis-utility/src/test/java/org/apache/sis/internal/util/X364Test.java
index 17fdaa2..15e4687 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/util/X364Test.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/util/X364Test.java
@@ -16,7 +16,7 @@
*/
package org.apache.sis.internal.util;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/util/XPathsTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/util/XPathsTest.java
index 4e25076..a062907 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/util/XPathsTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/util/XPathsTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.internal.util;
import org.apache.sis.util.Characters;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/io/AppenderTestCase.java b/core/sis-utility/src/test/java/org/apache/sis/io/AppenderTestCase.java
index 46a8d8c..903f8cf 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/io/AppenderTestCase.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/io/AppenderTestCase.java
@@ -19,7 +19,7 @@ package org.apache.sis.io;
import java.io.IOException;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOnMethod;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
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 cfc8cde..2c24566 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,7 +19,7 @@ package org.apache.sis.io;
import java.io.IOException;
import org.apache.sis.test.DependsOn;
import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/io/TableAppenderTest.java b/core/sis-utility/src/test/java/org/apache/sis/io/TableAppenderTest.java
index e53477c..698333c 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/io/TableAppenderTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/io/TableAppenderTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.io;
import java.io.IOException;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/math/DecimalFunctionsTest.java b/core/sis-utility/src/test/java/org/apache/sis/math/DecimalFunctionsTest.java
index bf6c53c..5052410 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/math/DecimalFunctionsTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/math/DecimalFunctionsTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.math;
import java.util.Random;
import java.math.BigDecimal;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/math/FractionTest.java b/core/sis-utility/src/test/java/org/apache/sis/math/FractionTest.java
index 598f55e..cdc1b39 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/math/FractionTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/math/FractionTest.java
@@ -17,7 +17,7 @@
package org.apache.sis.math;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/math/LinearlyDerivedVectorTest.java b/core/sis-utility/src/test/java/org/apache/sis/math/LinearlyDerivedVectorTest.java
index 8c0ddad..ffa19cf 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/math/LinearlyDerivedVectorTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/math/LinearlyDerivedVectorTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.math;
import org.apache.sis.measure.NumberRange;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/math/MathFunctionsTest.java b/core/sis-utility/src/test/java/org/apache/sis/math/MathFunctionsTest.java
index 5e6b35f..2fed767 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/math/MathFunctionsTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/math/MathFunctionsTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.sis.math;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/math/PlaneTest.java b/core/sis-utility/src/test/java/org/apache/sis/math/PlaneTest.java
index 196f782..78e5a1a 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/math/PlaneTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/math/PlaneTest.java
@@ -20,7 +20,7 @@ import java.util.Random;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/math/RepeatedVectorTest.java b/core/sis-utility/src/test/java/org/apache/sis/math/RepeatedVectorTest.java
index 9c8f4da..047d2da 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/math/RepeatedVectorTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/math/RepeatedVectorTest.java
@@ -17,7 +17,7 @@
package org.apache.sis.math;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/math/StatisticsFormatTest.java b/core/sis-utility/src/test/java/org/apache/sis/math/StatisticsFormatTest.java
index b8eed85..7d76337 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/math/StatisticsFormatTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/math/StatisticsFormatTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.math;
import java.text.Format;
import java.text.NumberFormat;
import java.util.Locale;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOnMethod;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/math/StatisticsTest.java b/core/sis-utility/src/test/java/org/apache/sis/math/StatisticsTest.java
index a3ce1e4..0ab8f07 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/math/StatisticsTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/math/StatisticsTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.math;
import java.util.Random;
import java.io.IOException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.sis.test.TestCase;
import static java.lang.StrictMath.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/math/VectorTest.java b/core/sis-utility/src/test/java/org/apache/sis/math/VectorTest.java
index 275ea03..054c166 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/math/VectorTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/math/VectorTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.math;
import org.apache.sis.measure.NumberRange;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.opengis.test.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/AngleFormatTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/AngleFormatTest.java
index fe4fab2..7e144f0 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/AngleFormatTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/AngleFormatTest.java
@@ -24,7 +24,8 @@ import java.text.ParseException;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static org.apache.sis.test.TestUtilities.*;
@@ -46,37 +47,48 @@ public final strictfp class AngleFormatTest extends TestCase {
/**
* Tests a pattern with illegal usage of D, M and S symbols.
*/
- @Test(expected = IllegalArgumentException.class)
+ @Test()
public void testIllegalPattern() {
- final AngleFormat f = new AngleFormat(Locale.CANADA);
- f.applyPattern("DD°SS′MM″");
+ Assertions.assertThrows(IllegalArgumentException.class, () -> {
+ final AngleFormat f = new AngleFormat(Locale.CANADA);
+ f.applyPattern("DD°SS′MM″");
+ });
+
}
/**
* Tests an illegal pattern with illegal symbols for the fraction part.
*/
- @Test(expected = IllegalArgumentException.class)
+ @Test()
public void testIllegalFractionPattern() {
- final AngleFormat f = new AngleFormat(Locale.CANADA);
- f.applyPattern("DD°MM′SS.m″");
+ Assertions.assertThrows(IllegalArgumentException.class, () -> {
+ final AngleFormat f = new AngleFormat(Locale.CANADA);
+ f.applyPattern("DD°MM′SS.m″");
+ });
+
}
/**
* Tests a {@code '?'} symbol without suffix.
*/
- @Test(expected = IllegalArgumentException.class)
+ @Test()
public void testIllegalOptionalField() {
- final AngleFormat f = new AngleFormat(Locale.CANADA);
- f.applyPattern("DD°MM?SS.m″");
+ Assertions.assertThrows(IllegalArgumentException.class, () -> {
+ final AngleFormat f = new AngleFormat(Locale.CANADA);
+ f.applyPattern("DD°MM?SS.m″");
+ });
}
/**
* Tests a {@code '?'} symbol without suffix.
*/
- @Test(expected = IllegalArgumentException.class)
+ @Test()
public void testIllegalOptionalLastField() {
- final AngleFormat f = new AngleFormat(Locale.CANADA);
- f.applyPattern("DD°MM?");
+ Assertions.assertThrows(IllegalArgumentException.class, () -> {
+ final AngleFormat f = new AngleFormat(Locale.CANADA);
+ f.applyPattern("DD°MM?");
+ });
+
}
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/AngleTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/AngleTest.java
index d1ca979..0bd5def 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/AngleTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/AngleTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.measure;
import java.util.Locale;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.Double.NaN;
import static java.lang.Double.doubleToLongBits;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/ConventionalUnitTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/ConventionalUnitTest.java
index d83f821..97ef4fc 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/ConventionalUnitTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/ConventionalUnitTest.java
@@ -23,7 +23,7 @@ import javax.measure.quantity.Volume;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/DateRangeTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/DateRangeTest.java
index 772a5e5..8ab5680 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/DateRangeTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/DateRangeTest.java
@@ -17,7 +17,7 @@
package org.apache.sis.measure;
import java.util.Date;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/FormattedCharacterIteratorTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/FormattedCharacterIteratorTest.java
index e6d858f..3802408 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/FormattedCharacterIteratorTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/FormattedCharacterIteratorTest.java
@@ -23,7 +23,7 @@ import java.text.AttributedCharacterIterator;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.internal.simple.SimpleCharacterIterator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.StrictMath.min;
import static java.lang.StrictMath.max;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/LinearConverterTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/LinearConverterTest.java
index c4b3ca0..c3ab133 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/LinearConverterTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/LinearConverterTest.java
@@ -21,7 +21,7 @@ import javax.measure.UnitConverter;
import org.apache.sis.math.Fraction;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOnMethod;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/MeasurementRangeTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/MeasurementRangeTest.java
index b3244a3..f5cb412 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/MeasurementRangeTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/MeasurementRangeTest.java
@@ -17,7 +17,7 @@
package org.apache.sis.measure;
import javax.measure.IncommensurableException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/NumberRangeTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/NumberRangeTest.java
index ce5b83b..7d77b69 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/NumberRangeTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/NumberRangeTest.java
@@ -17,7 +17,7 @@
package org.apache.sis.measure;
import org.apache.sis.math.MathFunctions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/PrefixesTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/PrefixesTest.java
index dcfb206..a06d503 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/PrefixesTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/PrefixesTest.java
@@ -21,7 +21,7 @@ import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.util.ArraysExt;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/QuantitiesTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/QuantitiesTest.java
index 5d726d2..2937583 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/QuantitiesTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/QuantitiesTest.java
@@ -22,7 +22,7 @@ import javax.measure.quantity.Length;
import javax.measure.quantity.Temperature;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.opengis.test.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/RangeFormatTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/RangeFormatTest.java
index 0226cf2..38bedf3 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/RangeFormatTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/RangeFormatTest.java
@@ -24,7 +24,7 @@ import java.text.FieldPosition;
import java.text.ParsePosition;
import java.text.ParseException;
import java.text.AttributedCharacterIterator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/RangeTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/RangeTest.java
index e00a646..eda03e0 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/RangeTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/RangeTest.java
@@ -18,7 +18,8 @@ package org.apache.sis.measure;
import java.util.Locale;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import static org.junit.Assume.assumeTrue;
import static org.apache.sis.test.Assert.*;
@@ -80,11 +81,14 @@ public final strictfp class RangeTest extends TestCase {
*
* <p>This test requires assertions to be enabled.</p>
*/
- @Test(expected = IllegalArgumentException.class)
+ @Test()
@SuppressWarnings({"unchecked", "rawtypes", "ResultOfObjectAllocationIgnored"})
public void testConstructorErrors00() {
- assumeTrue(Range.class.desiredAssertionStatus());
- new Range(Double.class, "error", true, "blast", true);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> {
+ assumeTrue(Range.class.desiredAssertionStatus());
+ new Range(Double.class, "error", true, "blast", true);
+ });
+
}
/**
@@ -95,11 +99,14 @@ public final strictfp class RangeTest extends TestCase {
*
* <p>This test requires assertions to be enabled.</p>
*/
- @Test(expected = IllegalArgumentException.class)
+ @Test()
@SuppressWarnings({"unchecked", "rawtypes", "ResultOfObjectAllocationIgnored"})
public void testConstructorErrors01() {
- assumeTrue(Range.class.desiredAssertionStatus());
- new Range(String.class, 123.233, true, 8740.09, true);
+ Assertions.assertThrows(IllegalArgumentException.class, () -> {
+ assumeTrue(Range.class.desiredAssertionStatus());
+ new Range(String.class, 123.233, true, 8740.09, true);
+ });
+
}
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/ScalarTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/ScalarTest.java
index 1108317..a33df8e 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/ScalarTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/ScalarTest.java
@@ -25,7 +25,7 @@ import javax.measure.quantity.Speed;
import javax.measure.quantity.Time;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/SexagesimalConverterTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/SexagesimalConverterTest.java
index f6c385e..e8edfc2 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/SexagesimalConverterTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/SexagesimalConverterTest.java
@@ -20,7 +20,7 @@ import javax.measure.Unit;
import javax.measure.Quantity;
import javax.measure.UnitConverter;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.measure.SexagesimalConverter.*;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/SystemUnitTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/SystemUnitTest.java
index b5c0b3c..baf695e 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/SystemUnitTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/SystemUnitTest.java
@@ -31,7 +31,7 @@ import javax.measure.Quantity;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/UnitDimensionTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/UnitDimensionTest.java
index dc92ea7..07efbdc 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/UnitDimensionTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/UnitDimensionTest.java
@@ -25,7 +25,7 @@ import org.apache.sis.math.Fraction;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.util.UnconvertibleObjectException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/UnitFormatTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/UnitFormatTest.java
index af2b8e7..ba2f302 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/UnitFormatTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/UnitFormatTest.java
@@ -29,7 +29,7 @@ import org.apache.sis.util.Characters;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/UnitServicesTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/UnitServicesTest.java
index 6186087..1de62bc 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/UnitServicesTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/UnitServicesTest.java
@@ -24,7 +24,7 @@ import javax.measure.format.UnitFormat;
import javax.measure.spi.ServiceProvider;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java
index cde077a..042910d 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java
@@ -32,7 +32,7 @@ import javax.measure.quantity.Volume;
import javax.measure.IncommensurableException;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.measure.SexagesimalConverter.*;
import static org.apache.sis.measure.Units.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/setup/OptionKeyTest.java b/core/sis-utility/src/test/java/org/apache/sis/setup/OptionKeyTest.java
index ac696ff..92497d2 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/setup/OptionKeyTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/setup/OptionKeyTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.setup;
import java.util.Map;
import org.apache.sis.util.collection.CheckedContainer;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
import static org.apache.sis.setup.OptionKey.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/test/TestRunner.java b/core/sis-utility/src/test/java/org/apache/sis/test/TestRunner.java
index 452af95..b747000 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/test/TestRunner.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/test/TestRunner.java
@@ -22,7 +22,7 @@ import java.util.HashSet;
import java.util.Arrays;
import java.io.PrintWriter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.junit.runner.Description;
import org.junit.runner.manipulation.Filter;
import org.junit.runner.manipulation.NoTestsRemainException;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/ArgumentChecksTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/ArgumentChecksTest.java
index 64b2a98..9006a76 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/ArgumentChecksTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/ArgumentChecksTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.util;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/ArraysExtTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/ArraysExtTest.java
index 65366c4..30443d7 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/ArraysExtTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/ArraysExtTest.java
@@ -17,7 +17,7 @@
package org.apache.sis.util;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/CharSequencesTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/CharSequencesTest.java
index 34b164d..91cdc89 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/CharSequencesTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/CharSequencesTest.java
@@ -22,7 +22,7 @@ import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.util.iso.SimpleInternationalString;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static org.apache.sis.util.CharSequences.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/CharactersTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/CharactersTest.java
index 1fd93fe..09a5d39 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/CharactersTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/CharactersTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.util;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static org.apache.sis.util.Characters.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/ClassesTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/ClassesTest.java
index 9809940..fe90f9d 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/ClassesTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/ClassesTest.java
@@ -17,7 +17,7 @@
package org.apache.sis.util;
import java.lang.reflect.Field;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.sis.test.TestCase;
import static org.junit.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/ExceptionsTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/ExceptionsTest.java
index 76f59f5..2c9d84d 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/ExceptionsTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/ExceptionsTest.java
@@ -20,7 +20,7 @@ import java.util.Locale;
import java.io.IOException;
import java.io.FileNotFoundException;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/LocalesTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/LocalesTest.java
index 5ff4430..2232f42 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/LocalesTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/LocalesTest.java
@@ -21,7 +21,7 @@ import java.util.IllformedLocaleException;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/NumbersTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/NumbersTest.java
index 370c737..155f32f 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/NumbersTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/NumbersTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.sis.util;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.sis.test.TestCase;
import static org.junit.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/StringBuildersTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/StringBuildersTest.java
index 8293c2b..7c81eb4 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/StringBuildersTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/StringBuildersTest.java
@@ -17,7 +17,7 @@
package org.apache.sis.util;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static org.apache.sis.util.StringBuilders.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/VersionTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/VersionTest.java
index 5749222..a9bd4d4 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/VersionTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/VersionTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.util;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/CacheTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/CacheTest.java
index f11396f..8f4b2ac 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/CacheTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/CacheTest.java
@@ -33,7 +33,7 @@ import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.Performance;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.StrictMath.*;
import static java.util.Collections.singleton;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/CodeListSetTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/CodeListSetTest.java
index 78b78c4..e65d02a 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/CodeListSetTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/CodeListSetTest.java
@@ -26,7 +26,7 @@ import org.opengis.referencing.cs.AxisDirection;
import org.opengis.metadata.citation.OnLineFunction;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOnMethod;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static org.opengis.referencing.cs.AxisDirection.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/DefaultTreeTableTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/DefaultTreeTableTest.java
index 28db757..9304ffb 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/DefaultTreeTableTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/DefaultTreeTableTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.util.collection;
import java.util.List;
import java.util.Collection;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestStep;
import org.apache.sis.test.DependsOn;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedMapTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedMapTest.java
index 55c74ed..34ef0be 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedMapTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedMapTest.java
@@ -24,7 +24,7 @@ import org.apache.sis.math.FunctionProperty;
import org.apache.sis.util.ObjectConverter;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedSetTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedSetTest.java
index 0b564e7..cff4db7 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedSetTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedSetTest.java
@@ -23,7 +23,7 @@ import java.util.Arrays;
import org.apache.sis.math.FunctionProperty;
import org.apache.sis.util.ObjectConverter;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/FrequencySortedSetTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/FrequencySortedSetTest.java
index 0c666c0..8f61416 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/FrequencySortedSetTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/FrequencySortedSetTest.java
@@ -20,7 +20,7 @@ import java.util.Arrays;
import java.util.Collections;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/IntegerListTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/IntegerListTest.java
index 11e74c3..e327d4f 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/IntegerListTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/IntegerListTest.java
@@ -29,7 +29,7 @@ import java.util.PrimitiveIterator;
import java.util.stream.IntStream;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestUtilities;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.StrictMath.*;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/RangeSetTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/RangeSetTest.java
index acbf49f..bec2899 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/RangeSetTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/RangeSetTest.java
@@ -31,7 +31,7 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.Performance;
import org.apache.sis.test.TestUtilities;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
import static org.apache.sis.internal.util.StandardDateFormat.MILLISECONDS_PER_DAY;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/TableColumnTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/TableColumnTest.java
index ca940b2..55a6103 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/TableColumnTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/TableColumnTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.util.collection;
import java.util.Locale;
import org.opengis.util.InternationalString;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.sis.test.TestCase;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTableFormatTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTableFormatTest.java
index ff6d985..5d54632 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTableFormatTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTableFormatTest.java
@@ -24,7 +24,7 @@ import org.apache.sis.util.iso.DefaultInternationalString;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
import static org.apache.sis.util.collection.TableColumn.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java
index 98bcd33..c0cc868 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java
@@ -21,7 +21,7 @@ import java.io.File;
import java.nio.file.FileSystem;
import java.nio.file.FileSystems;
import java.text.ParseException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
import org.apache.sis.util.iso.SimpleInternationalString;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakHashSetTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakHashSetTest.java
index 92132ca..391d6fa 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakHashSetTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakHashSetTest.java
@@ -22,7 +22,7 @@ import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestConfiguration;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
import static org.apache.sis.test.TestUtilities.waitForGarbageCollection;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakValueHashMapTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakValueHashMapTest.java
index 92160d8..5b08f90 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakValueHashMapTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakValueHashMapTest.java
@@ -23,7 +23,7 @@ import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestConfiguration;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
import static org.apache.sis.test.TestUtilities.waitForGarbageCollection;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/iso/DefaultInternationalStringTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/iso/DefaultInternationalStringTest.java
index cca44aa..12bcbf4 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/iso/DefaultInternationalStringTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/iso/DefaultInternationalStringTest.java
@@ -20,7 +20,7 @@ import java.util.Locale;
import org.opengis.util.InternationalString;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.opengis.test.Validators.validate;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/iso/SimpleInternationalStringTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/iso/SimpleInternationalStringTest.java
index 50bbc22..4249e15 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/iso/SimpleInternationalStringTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/iso/SimpleInternationalStringTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.util.iso;
import java.util.Locale;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.opengis.test.Validators.validate;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/logging/MonolineFormatterTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/logging/MonolineFormatterTest.java
index 91d5998..c3f5617 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/logging/MonolineFormatterTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/logging/MonolineFormatterTest.java
@@ -22,7 +22,7 @@ import org.apache.sis.internal.util.Strings;
import org.apache.sis.util.CharSequences;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/logging/PerformanceLevelTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/logging/PerformanceLevelTest.java
index 32adbb1..f9a1d14 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/logging/PerformanceLevelTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/logging/PerformanceLevelTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.util.logging;
import java.util.concurrent.TimeUnit;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static org.apache.sis.util.logging.PerformanceLevel.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/logging/WarningListenersTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/logging/WarningListenersTest.java
index c2ff86f..341c636 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/logging/WarningListenersTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/logging/WarningListenersTest.java
@@ -20,7 +20,7 @@ import java.util.logging.LogRecord;
import java.util.NoSuchElementException;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
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 4928479..4747a3e 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
@@ -27,7 +27,7 @@ import org.opengis.util.InternationalString;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.junit.After;
import static org.apache.sis.test.Assert.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/resources/LoaderTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/resources/LoaderTest.java
index cadde09..b0d17fb 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/resources/LoaderTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/resources/LoaderTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.util.resources;
import java.util.Locale;
import java.util.List;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/pom.xml b/pom.xml
index fa1f222..d1f8834 100644
--- a/pom.xml
+++ b/pom.xml
@@ -425,6 +425,12 @@
<version>${geoapi.version}</version>
<type>pom</type>
<scope>import</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.opengis</groupId>
@@ -514,6 +520,19 @@
<version>1.7.22</version> <!-- Must matches the version used by netCDF. -->
<scope>runtime</scope> <!-- Should never be needed at compile time. -->
</dependency>
+
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>${junit-jupiter-api.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>${junit-jupiter-engine.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -524,8 +543,13 @@
=========================================================== -->
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
@@ -548,6 +572,8 @@
<sis.plugin.version>${project.version}</sis.plugin.version>
<sis.non-free.version>1.0-M1</sis.non-free.version> <!-- Used only if "non-free" profile is enabled. -->
<geoapi.version>3.0.1</geoapi.version>
+ <junit-jupiter-api.version>${junit-jupiter-engine.version}</junit-jupiter-api.version>
+ <junit-jupiter-engine.version>5.4.2</junit-jupiter-engine.version>
</properties>
<profiles>
diff --git a/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DataIdentificationTest.java b/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DataIdentificationTest.java
index a9435ba..319ce72 100644
--- a/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DataIdentificationTest.java
+++ b/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DataIdentificationTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.internal.profile.fra;
import javax.xml.bind.JAXBException;
import org.apache.sis.test.xml.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java b/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java
index bcefaf8..1476bbb 100644
--- a/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java
+++ b/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java
@@ -27,7 +27,7 @@ import org.apache.sis.metadata.iso.citation.HardCodedCitations;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.xml.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.util.Collections.singleton;
import static org.apache.sis.test.Assert.*;
diff --git a/profiles/sis-french-profile/src/test/java/org/apache/sis/profile/france/FrenchProfileTest.java b/profiles/sis-french-profile/src/test/java/org/apache/sis/profile/france/FrenchProfileTest.java
index 633db90..b075359 100644
--- a/profiles/sis-french-profile/src/test/java/org/apache/sis/profile/france/FrenchProfileTest.java
+++ b/profiles/sis-french-profile/src/test/java/org/apache/sis/profile/france/FrenchProfileTest.java
@@ -28,7 +28,7 @@ import org.apache.sis.internal.profile.fra.IndirectReferenceSystem;
import org.apache.sis.internal.profile.fra.DirectReferenceSystem;
import org.apache.sis.metadata.iso.ImmutableIdentifier;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.opengis.test.Assert.*;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatReaderTest.java b/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatReaderTest.java
index fe65059..2879ab1 100644
--- a/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatReaderTest.java
+++ b/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatReaderTest.java
@@ -28,7 +28,7 @@ import org.apache.sis.storage.DataStoreException;
import org.apache.sis.util.logging.EmptyWarningListeners;
import org.apache.sis.internal.system.Modules;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
import static org.apache.sis.test.TestUtilities.formatMetadata;
diff --git a/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatStoreProviderTest.java b/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatStoreProviderTest.java
index 65b6d26..188a27c 100644
--- a/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatStoreProviderTest.java
+++ b/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatStoreProviderTest.java
@@ -22,7 +22,7 @@ import org.apache.sis.storage.ProbeResult;
import org.apache.sis.storage.StorageConnector;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
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 159510d..2410706 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
@@ -23,7 +23,7 @@ import org.opengis.referencing.operation.TransformException;
import org.apache.sis.referencing.CRS;
import org.apache.sis.test.TestCase;
import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.opengis.test.Assert.*;
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 3e16edf..e2e3fbc 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
@@ -21,7 +21,7 @@ import org.opengis.referencing.operation.TransformException;
import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.test.TestCase;
import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assume.assumeTrue;
import static org.apache.sis.test.Assert.*;
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 9201416..3870dca 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
@@ -33,7 +33,7 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestUtilities;
import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/Proj4ParserTest.java b/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/Proj4ParserTest.java
index 6a33d96..f8eb3d5 100644
--- a/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/Proj4ParserTest.java
+++ b/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/Proj4ParserTest.java
@@ -23,7 +23,7 @@ import org.apache.sis.internal.referencing.provider.Mercator1SP;
import org.apache.sis.internal.system.DefaultFactories;
import org.apache.sis.measure.Units;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.opengis.parameter.ParameterValueGroup;
import static org.opengis.test.Assert.*;
diff --git a/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/Proj4Test.java b/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/Proj4Test.java
index 5a47b9e..31d77ce 100644
--- a/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/Proj4Test.java
+++ b/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/Proj4Test.java
@@ -19,7 +19,7 @@ package org.apache.sis.storage.gdal;
import org.opengis.util.FactoryException;
import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/CRSBuilderTest.java b/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/CRSBuilderTest.java
index 810d8bb..ad9aa73 100644
--- a/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/CRSBuilderTest.java
+++ b/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/CRSBuilderTest.java
@@ -17,7 +17,7 @@
package org.apache.sis.storage.geotiff;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/CompressionTest.java b/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/CompressionTest.java
index 6d89d73..bd17ca6 100644
--- a/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/CompressionTest.java
+++ b/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/CompressionTest.java
@@ -17,7 +17,7 @@
package org.apache.sis.storage.geotiff;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/GeoKeysTest.java b/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/GeoKeysTest.java
index ea7abf8..49eeacb 100644
--- a/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/GeoKeysTest.java
+++ b/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/GeoKeysTest.java
@@ -27,7 +27,7 @@ import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/TypeTest.java b/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/TypeTest.java
index 320169d..e853fcb 100644
--- a/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/TypeTest.java
+++ b/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/TypeTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.storage.geotiff;
import org.apache.sis.internal.storage.io.ChannelDataInput;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/DataTypeTest.java b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/DataTypeTest.java
index 6231ce5..860f262 100644
--- a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/DataTypeTest.java
+++ b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/DataTypeTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.sis.internal.netcdf;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.sis.test.TestCase;
import static org.junit.Assert.*;
diff --git a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/DecoderTest.java b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/DecoderTest.java
index 6a0ebf8..5329852 100644
--- a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/DecoderTest.java
+++ b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/DecoderTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.internal.netcdf;
import java.util.Date;
import java.io.IOException;
import org.apache.sis.storage.DataStoreException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static org.apache.sis.test.TestUtilities.date;
diff --git a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/GridTest.java b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/GridTest.java
index 5863eaf..56c1230 100644
--- a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/GridTest.java
+++ b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/GridTest.java
@@ -22,7 +22,7 @@ import org.opengis.parameter.ParameterValueGroup;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.opengis.test.Assert.*;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/SatelliteGroundTrackTest.java b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/SatelliteGroundTrackTest.java
index c2fdad6..4a99618 100644
--- a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/SatelliteGroundTrackTest.java
+++ b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/SatelliteGroundTrackTest.java
@@ -24,7 +24,7 @@ import org.apache.sis.referencing.operation.builder.LocalizationGridBuilder;
import org.apache.sis.referencing.operation.transform.MathTransformTestCase;
import org.apache.sis.referencing.operation.transform.CoordinateDomain;
import org.apache.sis.internal.system.DefaultFactories;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
diff --git a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/VariableTest.java b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/VariableTest.java
index 66d80ae..d881c58 100644
--- a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/VariableTest.java
+++ b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/VariableTest.java
@@ -26,7 +26,7 @@ import org.apache.sis.storage.DataStoreException;
import org.apache.sis.internal.netcdf.ucar.DecoderWrapper;
import org.apache.sis.measure.Units;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.opengis.test.Assert.*;
diff --git a/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java b/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java
index a65451d..2821e08 100644
--- a/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java
+++ b/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java
@@ -33,7 +33,7 @@ import org.apache.sis.internal.netcdf.impl.ChannelDecoderTest;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.test.ContentVerifier;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
import static org.apache.sis.test.TestUtilities.date;
diff --git a/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java b/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java
index 3781611..b61da8d 100644
--- a/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java
+++ b/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java
@@ -29,7 +29,7 @@ import org.apache.sis.storage.DataStoreException;
import org.apache.sis.util.Version;
import org.apache.sis.test.DependsOn;
import org.apache.sis.internal.netcdf.TestData;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.opengis.test.Assert.*;
diff --git a/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreTest.java b/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreTest.java
index f342a3c..a02ea82 100644
--- a/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreTest.java
+++ b/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreTest.java
@@ -23,7 +23,7 @@ import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
import org.apache.sis.util.Version;
import org.apache.sis.internal.netcdf.TestData;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.opengis.test.Assert.*;
diff --git a/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFConnectionTest.java b/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFConnectionTest.java
index 7493a89..2595b55 100644
--- a/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFConnectionTest.java
+++ b/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFConnectionTest.java
@@ -22,6 +22,7 @@ import java.util.Properties;
import org.apache.sis.internal.shapefile.jdbc.connection.DBFConnection;
import org.apache.sis.test.DependsOnMethod;
import org.junit.*;
+import org.junit.jupiter.api.Assertions;
import static org.junit.Assert.*;
@@ -73,20 +74,23 @@ public class DBFConnectionTest extends AbstractTestBaseForInternalJDBC {
* An attempt to use a closed connection must fail with the correct exception.
* @throws SQLException if an error occurred while opening the database.
*/
- @Test(expected=SQLConnectionClosedException.class)
+ @Test()
@DependsOnMethod("openCloseConnection")
public void connectionClosed() throws SQLException {
- // Open and close an connection.
- final Driver driver = new DBFDriver();
- final Connection connection = driver.connect(this.dbfFile.getAbsolutePath(), null);
- connection.close();
+ Assertions.assertThrows(SQLConnectionClosedException.class, () -> {
+ // Open and close an connection.
+ final Driver driver = new DBFDriver();
+ final Connection connection = driver.connect(this.dbfFile.getAbsolutePath(), null);
+ connection.close();
+
+ // Then, attempt to use it.
+ try {
+ connection.createStatement();
+ } catch(SQLConnectionClosedException e) {
+ assertEquals("The database name in this exception is not well set.", e.getDatabase().getName(), this.dbfFile.getName());
+ throw e;
+ }
+ });
- // Then, attempt to use it.
- try {
- connection.createStatement();
- } catch(SQLConnectionClosedException e) {
- assertEquals("The database name in this exception is not well set.", e.getDatabase().getName(), this.dbfFile.getName());
- throw e;
- }
}
}
diff --git a/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFResultSetTest.java b/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFResultSetTest.java
index e51038e..213c968 100644
--- a/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFResultSetTest.java
+++ b/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFResultSetTest.java
@@ -26,7 +26,7 @@ import java.util.ArrayList;
import org.apache.sis.internal.shapefile.jdbc.resultset.DBFRecordBasedResultSet;
import org.apache.sis.test.DependsOnMethod;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
diff --git a/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/sql/WhereClauseTest.java b/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/sql/WhereClauseTest.java
index 5d39dd0..521c070 100644
--- a/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/sql/WhereClauseTest.java
+++ b/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/sql/WhereClauseTest.java
@@ -24,7 +24,7 @@ import java.sql.*;
import org.apache.sis.internal.shapefile.jdbc.AbstractTestBaseForInternalJDBC;
import org.apache.sis.internal.shapefile.jdbc.resultset.DBFRecordBasedResultSet;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Testing of the WHERE clause in SQL Statements.
diff --git a/storage/sis-shapefile/src/test/java/org/apache/sis/storage/shapefile/ShapeFileTest.java b/storage/sis-shapefile/src/test/java/org/apache/sis/storage/shapefile/ShapeFileTest.java
index 0e790cd..1453b6b 100644
--- a/storage/sis-shapefile/src/test/java/org/apache/sis/storage/shapefile/ShapeFileTest.java
+++ b/storage/sis-shapefile/src/test/java/org/apache/sis/storage/shapefile/ShapeFileTest.java
@@ -27,7 +27,7 @@ import java.util.logging.Logger;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.test.TestCase;
import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.sis.feature.AbstractFeature;
import org.apache.sis.feature.AbstractAttribute;
diff --git a/storage/sis-sqlstore/src/test/java/org/apache/sis/storage/sql/SQLStoreTest.java b/storage/sis-sqlstore/src/test/java/org/apache/sis/storage/sql/SQLStoreTest.java
index 4d6f526..b75f7de 100644
--- a/storage/sis-sqlstore/src/test/java/org/apache/sis/storage/sql/SQLStoreTest.java
+++ b/storage/sis-sqlstore/src/test/java/org/apache/sis/storage/sql/SQLStoreTest.java
@@ -26,7 +26,7 @@ import org.apache.sis.storage.FeatureSet;
import org.apache.sis.storage.StorageConnector;
import org.apache.sis.test.sql.TestDatabase;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/AbstractGridResourceTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/AbstractGridResourceTest.java
index f3ad8f6..b597239 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/AbstractGridResourceTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/AbstractGridResourceTest.java
@@ -23,7 +23,7 @@ import org.apache.sis.coverage.grid.GridExtent;
import org.apache.sis.coverage.grid.GridGeometry;
import org.apache.sis.coverage.grid.GridCoverage;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/CodeTypeTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/CodeTypeTest.java
index d2a7028..df8c484 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/CodeTypeTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/CodeTypeTest.java
@@ -17,7 +17,7 @@
package org.apache.sis.internal.storage;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/MetadataBuilderTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/MetadataBuilderTest.java
index fbde0e3..77d9139 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/MetadataBuilderTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/MetadataBuilderTest.java
@@ -21,7 +21,7 @@ import org.opengis.metadata.citation.Citation;
import org.apache.sis.metadata.iso.citation.DefaultCitation;
import org.apache.sis.metadata.iso.constraint.DefaultLegalConstraints;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;
import static org.apache.sis.test.TestUtilities.date;
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/csv/StoreProviderTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/csv/StoreProviderTest.java
index 9a3e17c..1b66b9e 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/csv/StoreProviderTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/csv/StoreProviderTest.java
@@ -20,7 +20,7 @@ import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.StorageConnector;
import org.apache.sis.storage.ProbeResult;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/csv/StoreTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/csv/StoreTest.java
index 06f0768..ac13fba 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/csv/StoreTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/csv/StoreTest.java
@@ -28,7 +28,7 @@ import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.StorageConnector;
import org.apache.sis.storage.DataOptionKey;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import com.esri.core.geometry.Point2D;
import com.esri.core.geometry.Polyline;
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/folder/StoreTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/folder/StoreTest.java
index 236116a..3b60763 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/folder/StoreTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/folder/StoreTest.java
@@ -32,7 +32,7 @@ import org.apache.sis.storage.Resource;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.StorageConnector;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static org.junit.Assume.assumeTrue;
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelDataInputTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelDataInputTest.java
index 97e23fc..e6c62e7 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelDataInputTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelDataInputTest.java
@@ -22,7 +22,7 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelDataOutputTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelDataOutputTest.java
index 8366c64..8a7e17b 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelDataOutputTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelDataOutputTest.java
@@ -27,7 +27,7 @@ import java.nio.InvalidMarkException;
import java.nio.channels.ByteChannel;
import javax.imageio.stream.ImageOutputStream;
import org.apache.sis.test.DependsOnMethod;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelImageInputStreamTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelImageInputStreamTest.java
index 10c4f54..90828c1 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelImageInputStreamTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelImageInputStreamTest.java
@@ -25,7 +25,7 @@ import java.io.IOException;
import javax.imageio.ImageIO;
import javax.imageio.stream.ImageInputStream;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelImageOutputStreamTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelImageOutputStreamTest.java
index cb76884..a7a1e4f 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelImageOutputStreamTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelImageOutputStreamTest.java
@@ -23,7 +23,7 @@ import java.nio.InvalidMarkException;
import javax.imageio.stream.ImageOutputStream;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/HyperRectangleReaderTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/HyperRectangleReaderTest.java
index 7ca16ae..0e9739c 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/HyperRectangleReaderTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/HyperRectangleReaderTest.java
@@ -28,7 +28,7 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestUtilities;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/IOUtilitiesTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/IOUtilitiesTest.java
index dae3080..661b7ee 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/IOUtilitiesTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/IOUtilitiesTest.java
@@ -25,7 +25,7 @@ import java.net.URISyntaxException;
import org.apache.sis.util.CharSequences;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/RewindableLineReaderTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/RewindableLineReaderTest.java
index c353924..36c3e46 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/RewindableLineReaderTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/RewindableLineReaderTest.java
@@ -20,7 +20,7 @@ import java.io.IOException;
import java.nio.charset.StandardCharsets;
import javax.imageio.stream.ImageInputStreamImpl;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/query/SimpleQueryTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/query/SimpleQueryTest.java
index 8da441f..1104780 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/query/SimpleQueryTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/query/SimpleQueryTest.java
@@ -24,7 +24,7 @@ import org.apache.sis.internal.storage.MemoryFeatureSet;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.FeatureSet;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/wkt/StoreProviderTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/wkt/StoreProviderTest.java
index ba74e61..27a17e7 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/wkt/StoreProviderTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/wkt/StoreProviderTest.java
@@ -22,7 +22,7 @@ import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.ProbeResult;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/wkt/StoreTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/wkt/StoreTest.java
index ddc13a4..275ec4d 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/wkt/StoreTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/wkt/StoreTest.java
@@ -27,7 +27,7 @@ import org.apache.sis.storage.DataStoreException;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/MimeTypeDetectorTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/MimeTypeDetectorTest.java
index 290e9e1..7e59f8b 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/MimeTypeDetectorTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/MimeTypeDetectorTest.java
@@ -25,7 +25,7 @@ import org.apache.sis.xml.Namespaces;
import org.apache.sis.metadata.xml.TestUsingFile;
import org.apache.sis.internal.xml.LegacyNamespaces;
import org.apache.sis.test.DependsOnMethod;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static org.apache.sis.metadata.iso.extent.DefaultExtentTest.FILENAME;
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/StoreProviderTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/StoreProviderTest.java
index d853241..54571c9 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/StoreProviderTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/StoreProviderTest.java
@@ -22,7 +22,7 @@ import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.ProbeResult;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/StoreTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/StoreTest.java
index ab742f1..a4e757d 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/StoreTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/StoreTest.java
@@ -27,7 +27,7 @@ import org.apache.sis.storage.DataStoreException;
import org.apache.sis.internal.xml.LegacyNamespaces;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.opengis.test.Assert.*;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/storage/DataStoresTest.java b/storage/sis-storage/src/test/java/org/apache/sis/storage/DataStoresTest.java
index cd1d918..c381ed5 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/storage/DataStoresTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/storage/DataStoresTest.java
@@ -20,7 +20,7 @@ import java.io.StringReader;
import org.apache.sis.internal.storage.xml.StoreTest;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/storage/FeatureNamingTest.java b/storage/sis-storage/src/test/java/org/apache/sis/storage/FeatureNamingTest.java
index 6e692ac..7e0b1d2 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/storage/FeatureNamingTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/storage/FeatureNamingTest.java
@@ -20,7 +20,7 @@ import org.opengis.util.GenericName;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
import org.apache.sis.util.iso.Names;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import org.opengis.util.LocalName;
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/storage/ProbeResultTest.java b/storage/sis-storage/src/test/java/org/apache/sis/storage/ProbeResultTest.java
index b11494e..947656a 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/storage/ProbeResultTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/storage/ProbeResultTest.java
@@ -17,7 +17,7 @@
package org.apache.sis.storage;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.Assert.*;
import static org.apache.sis.storage.ProbeResult.*;
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/storage/StorageConnectorTest.java b/storage/sis-storage/src/test/java/org/apache/sis/storage/StorageConnectorTest.java
index a7d33ea..97473e3 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/storage/StorageConnectorTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/storage/StorageConnectorTest.java
@@ -35,7 +35,7 @@ import org.apache.sis.internal.storage.io.InputStreamAdapter;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assume.assumeTrue;
import static org.opengis.test.Assert.*;
diff --git a/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/MetadataTest.java b/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/MetadataTest.java
index 27840c9..b8c5ec2 100644
--- a/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/MetadataTest.java
+++ b/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/MetadataTest.java
@@ -22,7 +22,7 @@ import java.net.URISyntaxException;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.junit.Ignore;
import static org.junit.Assert.*;
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 1a08eb0..c566822 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
@@ -34,7 +34,7 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.BeforeClass;
import org.junit.AfterClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
import static org.apache.sis.test.TestUtilities.date;
diff --git a/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/TypesTest.java b/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/TypesTest.java
index 20db914..a46e87c 100644
--- a/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/TypesTest.java
+++ b/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/TypesTest.java
@@ -22,7 +22,7 @@ import org.opengis.util.InternationalString;
import org.apache.sis.internal.feature.AttributeConvention;
import org.apache.sis.storage.IllegalNameException;
import org.apache.sis.test.TestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.*;
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 acff02b..8efa514 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
@@ -34,7 +34,7 @@ import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
import org.junit.BeforeClass;
import org.junit.AfterClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.sis.test.MetadataAssert.*;