This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 84992dfbd2f67a78bf4e20b877d3d807397f7787
Merge: 9adef8be22 1355d5ca81
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Fri Feb 16 15:43:55 2024 +0100
Merge branch 'geoapi-4.0' into geoapi-3.1:
Upgrade from JUnit 4 to JUnit 5.
NOTICE | 2 +-
buildSrc/build.gradle.kts | 7 +-
.../apache/sis/buildtools/gradle/ModularTest.java | 11 +-
.../resources/IndexedResourceCompilerTest.java | 7 +-
endorsed/build.gradle.kts | 20 +-
.../sis/cloud/aws/s3/ClientFileSystemTest.java | 4 +-
.../sis/cloud/aws/s3/KeyPathMatcherTest.java | 4 +-
.../org/apache/sis/cloud/aws/s3/KeyPathTest.java | 4 +-
.../org/apache/sis/console/AboutCommandTest.java | 2 +-
.../org/apache/sis/console/CRSCommandTest.java | 2 +-
.../org/apache/sis/console/CommandRunnerTest.java | 4 +-
.../org/apache/sis/console/HelpCommandTest.java | 2 +-
.../apache/sis/console/MetadataCommandTest.java | 2 +-
.../apache/sis/console/MimeTypeCommandTest.java | 2 +-
.../main/org/apache/sis/filter/internal/Node.java | 2 +-
.../geometry/wrapper/SpatialOperationContext.java | 2 +-
.../org/apache/sis/coverage/CategoryListTest.java | 134 +++----
.../test/org/apache/sis/coverage/CategoryTest.java | 167 ++++----
.../apache/sis/coverage/CoverageCombinerTest.java | 6 +-
.../apache/sis/coverage/SampleDimensionTest.java | 81 ++--
.../apache/sis/coverage/SampleRangeFormatTest.java | 2 +-
.../grid/BandAggregateGridCoverageTest.java | 4 +-
.../coverage/grid/BufferedGridCoverageTest.java | 2 +-
.../coverage/grid/ConvertedGridCoverageTest.java | 19 +-
.../sis/coverage/grid/DimensionAppenderTest.java | 2 +-
.../coverage/grid/DimensionalityReductionTest.java | 2 +-
.../grid/FractionalGridCoordinatesTest.java | 4 +-
.../sis/coverage/grid/GridCoverage2DTest.java | 81 ++--
.../sis/coverage/grid/GridCoverageBuilderTest.java | 42 +-
.../sis/coverage/grid/GridDerivationTest.java | 20 +-
.../apache/sis/coverage/grid/GridExtentTest.java | 2 +-
.../apache/sis/coverage/grid/GridGeometryTest.java | 2 +-
.../sis/coverage/grid/GridOrientationTest.java | 16 +-
.../sis/coverage/grid/PixelTranslationTest.java | 10 +-
.../coverage/grid/ResampledGridCoverageTest.java | 35 +-
.../sis/coverage/grid/ReshapedImageTest.java | 4 +-
.../coverage/grid/TranslatedGridCoverageTest.java | 6 +-
.../coverage/grid/j2d/ColorModelBuilderTest.java | 22 +-
.../sis/coverage/grid/j2d/ImageLayoutTest.java | 8 +-
.../sis/coverage/grid/j2d/ImageUtilitiesTest.java | 16 +-
.../coverage/grid/j2d/SampleModelFactoryTest.java | 41 +-
.../coverage/grid/j2d/ScaledColorSpaceTest.java | 4 +-
.../sis/coverage/internal/RangeArgumentTest.java | 52 +--
.../apache/sis/feature/AbstractFeatureTest.java | 18 +-
.../apache/sis/feature/AbstractOperationTest.java | 4 +-
.../test/org/apache/sis/feature/Assertions.java | 46 +--
.../apache/sis/feature/CharacteristicMapTest.java | 262 ++++++------
.../sis/feature/CharacteristicTypeMapTest.java | 60 +--
.../org/apache/sis/feature/CustomAttribute.java | 6 +-
.../sis/feature/DefaultAssociationRoleTest.java | 60 +--
.../sis/feature/DefaultAttributeTypeTest.java | 47 +--
.../apache/sis/feature/DefaultFeatureTypeTest.java | 292 ++++++--------
.../apache/sis/feature/EnvelopeOperationTest.java | 41 +-
.../org/apache/sis/feature/FeatureFormatTest.java | 7 +-
.../apache/sis/feature/FeatureMemoryBenchmark.java | 5 +-
.../apache/sis/feature/FeatureOperationsTest.java | 19 +-
.../org/apache/sis/feature/FeatureTestCase.java | 131 +++---
.../test/org/apache/sis/feature/FeaturesTest.java | 52 +--
.../sis/feature/GroupAsPolylineOperationTest.java | 33 +-
.../org/apache/sis/feature/LinkOperationTest.java | 12 +-
.../sis/feature/MultiValuedAttributeTest.java | 48 ++-
.../apache/sis/feature/PropertySingletonTest.java | 74 ++--
.../sis/feature/SingletonAssociationTest.java | 17 +-
.../apache/sis/feature/SingletonAttributeTest.java | 44 +-
.../sis/feature/StringJoinOperationTest.java | 94 ++---
.../builder/AssociationRoleBuilderTest.java | 19 +-
.../feature/builder/AttributeTypeBuilderTest.java | 176 ++++----
.../builder/CharacteristicTypeBuilderTest.java | 50 +--
.../feature/builder/FeatureTypeBuilderTest.java | 345 ++++++++--------
.../feature/internal/AttributeConventionTest.java | 59 ++-
.../apache/sis/feature/test/FeatureComparator.java | 54 ++-
.../apache/sis/filter/ArithmeticFunctionTest.java | 29 +-
.../sis/filter/BinarySpatialFilterTestCase.java | 262 ++++++------
.../filter/BinarySpatialFilterUsingESRI_Test.java | 12 +-
.../BinarySpatialFilterUsingJava2D_Test.java | 20 +-
.../org/apache/sis/filter/CapabilitiesTest.java | 4 +-
.../apache/sis/filter/ComparisonFilterTest.java | 15 +-
.../apache/sis/filter/IdentifierFilterTest.java | 22 +-
.../org/apache/sis/filter/LeafExpressionTest.java | 74 ++--
.../test/org/apache/sis/filter/LikeFilterTest.java | 13 +-
.../org/apache/sis/filter/LogicalFilterTest.java | 137 +++----
.../org/apache/sis/filter/TemporalFilterTest.java | 17 +-
.../test/org/apache/sis/filter/XPathTest.java | 2 +-
.../sis/filter/internal/CopyVisitorTest.java | 4 +-
.../sis/filter/internal/FunctionNamesTest.java | 6 +-
.../apache/sis/filter/sqlmm/RegistryTestCase.java | 85 ++--
.../sis/filter/sqlmm/RegistryUsingESRI_Test.java | 16 +-
.../sis/filter/sqlmm/RegistryUsingJava2D_Test.java | 18 +-
.../org/apache/sis/filter/sqlmm/SQLMMTest.java | 42 +-
.../sis/geometry/wrapper/GeometriesTestCase.java | 26 +-
.../sis/geometry/wrapper/GeometryTypeTest.java | 6 +-
.../geometry/wrapper/StandardGeometriesTest.java | 8 +-
.../sis/geometry/wrapper/esri/FactoryTest.java | 19 +-
.../sis/geometry/wrapper/j2d/FactoryTest.java | 8 +-
.../sis/geometry/wrapper/j2d/FlatShapeTest.java | 2 +-
.../geometry/wrapper/j2d/ShapePropertiesTest.java | 4 +-
.../sis/geometry/wrapper/jts/FactoryTest.java | 8 +-
.../apache/sis/geometry/wrapper/jts/JTSTest.java | 44 +-
.../sis/geometry/wrapper/jts/ShapeAdapterTest.java | 12 +-
.../geometry/wrapper/jts/ShapeConverterTest.java | 29 +-
.../apache/sis/image/BandAggregateImageTest.java | 12 +-
.../org/apache/sis/image/BandSelectImageTest.java | 31 +-
.../org/apache/sis/image/BandedIteratorTest.java | 12 +-
.../sis/image/BandedSampleConverterTest.java | 2 +-
.../org/apache/sis/image/ComputedImageTest.java | 31 +-
.../test/org/apache/sis/image/DataTypeTest.java | 18 +-
.../org/apache/sis/image/ImageCombinerTest.java | 4 +-
.../org/apache/sis/image/ImageProcessorTest.java | 6 +-
.../test/org/apache/sis/image/ImageTestCase.java | 11 +-
.../org/apache/sis/image/InterpolationTest.java | 4 +-
.../org/apache/sis/image/LinearIteratorTest.java | 5 +-
.../test/org/apache/sis/image/MaskedImageTest.java | 10 +-
.../org/apache/sis/image/PixelIteratorTest.java | 164 ++++----
.../test/org/apache/sis/image/PlanarImageTest.java | 2 +-
.../org/apache/sis/image/ResampledImageTest.java | 26 +-
.../org/apache/sis/image/ResamplingGridTest.java | 21 +-
.../apache/sis/image/StatisticsCalculatorTest.java | 39 +-
.../sis/image/processing/isoline/IsolinesTest.java | 30 +-
.../sis/image/processing/isoline/StepsViewer.java | 4 +-
.../apache/sis/index/tree/PointTreeNodeTest.java | 22 +-
.../org/apache/sis/index/tree/PointTreeTest.java | 2 +-
.../metadata/iso/citation/DefaultTelephone.java | 2 +-
.../apache/sis/metadata/iso/extent/Extents.java | 7 +-
.../sis/metadata/iso/quality/AbstractElement.java | 2 +-
.../bind/metadata/replace/QualityParameter.java | 2 +-
.../apache/sis/metadata/AbstractMetadataTest.java | 10 +-
.../test/org/apache/sis/metadata/Assertions.java | 26 +-
.../test/org/apache/sis/metadata/HashCodeTest.java | 55 ++-
.../apache/sis/metadata/InformationMapTest.java | 18 +-
.../apache/sis/metadata/MetadataCopierTest.java | 14 +-
.../apache/sis/metadata/MetadataStandardTest.java | 157 ++++----
.../sis/metadata/ModifiableMetadataTest.java | 137 +++----
.../test/org/apache/sis/metadata/NameMapTest.java | 6 +-
.../org/apache/sis/metadata/NilReasonMapTest.java | 2 +-
.../apache/sis/metadata/PropertyAccessorTest.java | 129 +++---
.../sis/metadata/PropertyConsistencyCheck.java | 62 +--
.../sis/metadata/PropertyInformationTest.java | 17 +-
.../test/org/apache/sis/metadata/PrunerTest.java | 60 +--
.../org/apache/sis/metadata/SpecialCasesTest.java | 52 ++-
.../apache/sis/metadata/TreeNodeChildrenTest.java | 76 ++--
.../test/org/apache/sis/metadata/TreeNodeTest.java | 45 ++-
.../apache/sis/metadata/TreeTableFormatTest.java | 2 +-
.../org/apache/sis/metadata/TreeTableViewTest.java | 2 +-
.../test/org/apache/sis/metadata/TypeMapTest.java | 6 +-
.../test/org/apache/sis/metadata/ValueMapTest.java | 68 ++--
.../sis/metadata/internal/AxisNamesTest.java | 6 +-
.../sis/metadata/internal/IdentifiersTest.java | 4 +-
.../internal/ImplementationHelperTest.java | 6 +-
.../apache/sis/metadata/internal/MergerTest.java | 14 +-
.../sis/metadata/internal/NameMeaningTest.java | 6 +-
.../org/apache/sis/metadata/iso/APIVerifier.java | 20 +-
.../apache/sis/metadata/iso/AllMetadataTest.java | 6 +-
.../sis/metadata/iso/CustomMetadataTest.java | 8 +-
.../sis/metadata/iso/DefaultIdentifierTest.java | 8 +-
.../sis/metadata/iso/DefaultMetadataTest.java | 72 ++--
.../sis/metadata/iso/citation/CitationsTest.java | 51 ++-
.../iso/citation/DefaultCitationDateTest.java | 4 +-
.../metadata/iso/citation/DefaultCitationTest.java | 85 ++--
.../metadata/iso/citation/DefaultContactTest.java | 20 +-
.../iso/citation/DefaultResponsibilityTest.java | 2 +-
.../constraint/DefaultLegalConstraintsTest.java | 8 +-
.../sis/metadata/iso/content/DefaultBandTest.java | 4 +-
.../sis/metadata/iso/extent/DefaultExtentTest.java | 20 +-
.../extent/DefaultGeographicBoundingBoxTest.java | 23 +-
.../sis/metadata/iso/extent/ExtentsTest.java | 42 +-
.../identification/DefaultBrowseGraphicTest.java | 14 +-
.../identification/DefaultCoupledResourceTest.java | 19 +-
.../DefaultDataIdentificationTest.java | 21 +-
.../iso/identification/DefaultKeywordsTest.java | 6 +-
.../DefaultRepresentativeFractionTest.java | 30 +-
.../iso/identification/DefaultResolutionTest.java | 40 +-
.../DefaultServiceIdentificationTest.java | 32 +-
.../metadata/iso/lineage/DefaultLineageTest.java | 6 +-
.../iso/lineage/DefaultProcessStepTest.java | 7 +-
.../maintenance/DefaultScopeDescriptionTest.java | 28 +-
.../metadata/iso/quality/AbstractElementTest.java | 2 +-
.../quality/AbstractPositionalAccuracyTest.java | 5 +-
.../iso/quality/DefaultConformanceResultTest.java | 2 +-
.../iso/quality/DefaultDomainConsistencyTest.java | 2 +-
.../iso/quality/DefaultEvaluationMethodTest.java | 2 +-
.../iso/quality/DefaultQuantitativeResultTest.java | 2 +-
.../sis/metadata/iso/quality/ScopeCodeTest.java | 2 +-
.../iso/spatial/DefaultGeorectifiedTest.java | 20 +-
.../sis/metadata/simple/SimpleIdentifierTest.java | 4 +-
.../sis/metadata/sql/IdentifierGeneratorTest.java | 20 +-
.../sis/metadata/sql/MetadataFallbackVerifier.java | 30 +-
.../sis/metadata/sql/MetadataSourceTest.java | 27 +-
.../sis/metadata/sql/MetadataWriterTest.java | 8 +-
.../org/apache/sis/metadata/sql/TestDatabase.java | 10 +-
.../sis/metadata/sql/util/SQLUtilitiesTest.java | 4 +-
.../sis/metadata/sql/util/ScriptRunnerTest.java | 16 +-
.../sis/metadata/sql/util/TypeMapperTest.java | 4 +-
.../sis/metadata/xml/SchemaComplianceTest.java | 6 +-
.../apache/sis/util/iso/DefaultLocalNameTest.java | 8 +-
.../sis/util/iso/DefaultNameFactoryTest.java | 12 +-
.../sis/util/iso/DefaultRecordSchemaTest.java | 12 +-
.../org/apache/sis/util/iso/DefaultRecordTest.java | 68 ++--
.../apache/sis/util/iso/DefaultRecordTypeTest.java | 58 +--
.../apache/sis/util/iso/DefaultScopedNameTest.java | 10 +-
.../apache/sis/util/iso/NameMarshallingTest.java | 8 +-
.../test/org/apache/sis/util/iso/NamesTest.java | 33 +-
.../org/apache/sis/util/iso/TypeNamesTest.java | 32 +-
.../test/org/apache/sis/util/iso/TypesTest.java | 13 +-
.../sis/xml/CharSequenceSubstitutionTest.java | 2 +-
.../test/org/apache/sis/xml/LegacyCodesTest.java | 2 +-
.../org/apache/sis/xml/MarshallerPoolTest.java | 2 +-
.../test/org/apache/sis/xml/NamespacesTest.java | 2 +-
.../apache/sis/xml/NilReasonMarshallingTest.java | 2 +-
.../test/org/apache/sis/xml/NilReasonTest.java | 2 +-
.../org/apache/sis/xml/ReferenceResolverTest.java | 2 +-
.../test/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/org/apache/sis/xml/XLinkTest.java | 14 +-
.../test/org/apache/sis/xml/XPointerTest.java | 2 +-
.../sis/xml/bind/IdentifierMapAdapterTest.java | 7 +-
.../sis/xml/bind/ModifiableIdentifierMapTest.java | 94 ++---
.../sis/xml/bind/cat/CodeListMarshallingTest.java | 4 +-
.../apache/sis/xml/bind/cat/EnumAdapterTest.java | 4 +-
.../sis/xml/bind/cat/EnumMarshallingTest.java | 4 +-
.../apache/sis/xml/bind/gco/MultiplicityTest.java | 8 +-
.../apache/sis/xml/bind/gco/PropertyTypeTest.java | 40 +-
.../apache/sis/xml/bind/gco/StringAdapterTest.java | 4 +-
.../org/apache/sis/xml/bind/gml/MeasureTest.java | 4 +-
.../apache/sis/xml/bind/gml/TimePeriodTest.java | 12 +-
.../sis/xml/bind/lan/FreeTextMarshallingTest.java | 4 +-
.../apache/sis/xml/bind/lan/LanguageCodeTest.java | 12 +-
.../apache/sis/xml/bind/lan/OtherLocalesTest.java | 14 +-
.../org/apache/sis/xml/bind/lan/PT_LocaleTest.java | 4 +-
.../metadata/replace/QualityParameterTest.java | 16 +-
.../metadata/replace/ServiceParameterTest.java | 16 +-
.../sis/xml/test/AnnotationConsistencyCheck.java | 153 +++----
.../apache/sis/xml/test/DocumentComparator.java | 13 +-
.../test/org/apache/sis/xml/test/TestCase.java | 4 +-
.../sis/xml/util/DocumentComparatorTest.java | 4 +-
.../org/apache/sis/xml/util/XmlUtilitiesTest.java | 4 +-
.../sis/openoffice/ReferencingFunctionsTest.java | 56 ++-
.../org/apache/sis/openoffice/TransformerTest.java | 34 +-
.../MultiResolutionCoverageLoaderTest.java | 2 +-
.../org/apache/sis/style/se1/AnchorPointTest.java | 2 +-
.../apache/sis/style/se1/ChannelSelectionTest.java | 2 +-
.../sis/style/se1/ContrastEnhancementTest.java | 2 +-
.../org/apache/sis/style/se1/DescriptionTest.java | 2 +-
.../org/apache/sis/style/se1/DisplacementTest.java | 2 +-
.../apache/sis/style/se1/ExternalGraphicTest.java | 2 +-
.../apache/sis/style/se1/FeatureTypeStyleTest.java | 2 +-
.../test/org/apache/sis/style/se1/FillTest.java | 2 +-
.../test/org/apache/sis/style/se1/FontTest.java | 2 +-
.../apache/sis/style/se1/GraphicStrokeTest.java | 2 +-
.../test/org/apache/sis/style/se1/GraphicTest.java | 2 +-
.../test/org/apache/sis/style/se1/HaloTest.java | 2 +-
.../apache/sis/style/se1/LinePlacementTest.java | 2 +-
.../apache/sis/style/se1/LineSymbolizerTest.java | 2 +-
.../test/org/apache/sis/style/se1/MarkTest.java | 2 +-
.../apache/sis/style/se1/PointPlacementTest.java | 2 +-
.../apache/sis/style/se1/PointSymbolizerTest.java | 2 +-
.../sis/style/se1/PolygonSymbolizerTest.java | 2 +-
.../apache/sis/style/se1/RasterSymbolizerTest.java | 2 +-
.../test/org/apache/sis/style/se1/RuleTest.java | 10 +-
.../apache/sis/style/se1/SelectedChannelTest.java | 2 +-
.../org/apache/sis/style/se1/ShadedReliefTest.java | 2 +-
.../test/org/apache/sis/style/se1/StrokeTest.java | 2 +-
.../org/apache/sis/style/se1/SymbolizerTest.java | 2 +-
.../org/apache/sis/style/se1/SymbologyTest.java | 2 +-
.../apache/sis/style/se1/TextSymbolizerTest.java | 2 +-
.../test/org/apache/sis/style/se1/XmlTest.java | 2 +-
.../sis/profile/france/FrenchProfileTest.java | 25 +-
.../sis/xml/bind/fra/DataIdentificationTest.java | 2 +-
.../xml/bind/fra/DirectReferenceSystemTest.java | 4 +-
.../apache/sis/profile/japan/JapanProfileTest.java | 4 +-
.../gazetteer/GazetteerFactoryTest.java | 9 +-
.../gazetteer/GeohashReferenceSystemTest.java | 24 +-
.../referencing/gazetteer/LocationFormatTest.java | 2 +-
.../referencing/gazetteer/LocationTypeTest.java | 33 +-
.../gazetteer/MilitaryGridReferenceSystemTest.java | 278 +++++++------
.../gazetteer/ReferencingByIdentifiersTest.java | 8 +-
.../sis/referencing/util/AxisDirections.java | 2 +-
.../sis/geometry/AbstractDirectPositionTest.java | 56 ++-
.../apache/sis/geometry/AbstractEnvelopeTest.java | 2 +-
.../org/apache/sis/geometry/ArrayEnvelopeTest.java | 23 +-
.../apache/sis/geometry/CoordinateFormatTest.java | 86 ++--
.../org/apache/sis/geometry/CurveExtremumTest.java | 20 +-
.../apache/sis/geometry/DirectPosition1DTest.java | 10 +-
.../apache/sis/geometry/DirectPosition2DTest.java | 12 +-
.../org/apache/sis/geometry/Envelope2DTest.java | 31 +-
.../apache/sis/geometry/EnvelopeReducerTest.java | 2 +-
.../org/apache/sis/geometry/EnvelopesTest.java | 63 ++-
.../sis/geometry/GeneralDirectPositionTest.java | 15 +-
.../apache/sis/geometry/GeneralEnvelopeTest.java | 149 ++++---
.../apache/sis/geometry/ImmutableEnvelopeTest.java | 4 +-
.../org/apache/sis/geometry/SubEnvelopeTest.java | 22 +-
.../org/apache/sis/geometry/TransformTestCase.java | 8 +-
.../sis/geometry/WraparoundAdjustmentTest.java | 4 +-
.../test/org/apache/sis/io/wkt/ColorsTest.java | 2 +-
.../org/apache/sis/io/wkt/ComparisonWithEPSG.java | 10 +-
.../test/org/apache/sis/io/wkt/ConventionTest.java | 2 +-
.../test/org/apache/sis/io/wkt/ElementTest.java | 2 +-
.../test/org/apache/sis/io/wkt/FormatterTest.java | 2 +-
.../sis/io/wkt/GeodeticObjectParserTest.java | 2 +-
.../apache/sis/io/wkt/MathTransformParserTest.java | 2 +-
.../test/org/apache/sis/io/wkt/SymbolsTest.java | 2 +-
.../org/apache/sis/io/wkt/TransliteratorTest.java | 2 +-
.../org/apache/sis/io/wkt/WKTDictionaryTest.java | 2 +-
.../test/org/apache/sis/io/wkt/WKTFormatTest.java | 2 +-
.../test/org/apache/sis/io/wkt/WKTParserTest.java | 10 +-
.../DefaultParameterDescriptorGroupTest.java | 62 ++-
.../parameter/DefaultParameterDescriptorTest.java | 172 ++++----
.../parameter/DefaultParameterValueGroupTest.java | 164 ++++----
.../sis/parameter/DefaultParameterValueTest.java | 18 +-
.../sis/parameter/MapProjectionParametersTest.java | 34 +-
.../parameter/MatrixParametersAlphaNumTest.java | 9 +-
.../apache/sis/parameter/MatrixParametersTest.java | 19 +-
.../apache/sis/parameter/ParameterBuilderTest.java | 34 +-
.../apache/sis/parameter/ParameterFormatTest.java | 12 +-
.../sis/parameter/ParameterMarshallingTest.java | 10 +-
.../org/apache/sis/parameter/ParametersTest.java | 53 +--
.../apache/sis/parameter/TensorParametersTest.java | 79 ++--
.../org/apache/sis/parameter/TensorValuesTest.java | 43 +-
.../UnmodifiableParameterValueGroupTest.java | 51 +--
.../parameter/UnmodifiableParameterValueTest.java | 32 +-
.../referencing/AbstractIdentifiedObjectTest.java | 143 ++++---
.../referencing/AbstractReferenceSystemTest.java | 20 +-
.../org/apache/sis/referencing/Assertions.java | 148 ++++---
.../sis/referencing/AuthorityFactoriesTest.java | 68 ++--
.../org/apache/sis/referencing/BuilderTest.java | 78 ++--
.../test/org/apache/sis/referencing/CRSTest.java | 10 +-
.../org/apache/sis/referencing/CommonCRSTest.java | 103 +++--
.../sis/referencing/EPSGFactoryFallbackTest.java | 26 +-
.../sis/referencing/GeodesicsOnEllipsoidTest.java | 82 ++--
.../sis/referencing/GeodeticCalculatorTest.java | 80 ++--
.../sis/referencing/GeodeticObjectVerifier.java | 100 +++--
.../sis/referencing/IdentifiedObjectsTest.java | 14 +-
.../sis/referencing/ImmutableIdentifierTest.java | 76 ++--
.../sis/referencing/NamedIdentifierTest.java | 76 ++--
.../sis/referencing/StandardDefinitionsTest.java | 93 +++--
.../sis/referencing/crs/AbstractCRSTest.java | 6 +-
.../referencing/crs/DefaultCompoundCRSTest.java | 66 ++-
.../sis/referencing/crs/DefaultDerivedCRSTest.java | 58 +--
.../referencing/crs/DefaultEngineeringCRSTest.java | 41 +-
.../referencing/crs/DefaultGeocentricCRSTest.java | 24 +-
.../referencing/crs/DefaultGeodeticCRSTest.java | 6 +-
.../referencing/crs/DefaultGeographicCRSTest.java | 48 +--
.../sis/referencing/crs/DefaultImageCRSTest.java | 25 +-
.../referencing/crs/DefaultProjectedCRSTest.java | 48 ++-
.../referencing/crs/DefaultTemporalCRSTest.java | 22 +-
.../referencing/crs/DefaultVerticalCRSTest.java | 2 +-
.../sis/referencing/crs/HardCodedCRSTest.java | 24 +-
.../apache/sis/referencing/crs/SubTypesTest.java | 4 +-
.../apache/sis/referencing/cs/AbstractCSTest.java | 44 +-
.../org/apache/sis/referencing/cs/CodesTest.java | 6 +-
.../sis/referencing/cs/CoordinateSystemsTest.java | 28 +-
.../sis/referencing/cs/DefaultCartesianCSTest.java | 66 ++-
.../sis/referencing/cs/DefaultCompoundCSTest.java | 4 +-
.../cs/DefaultCoordinateSystemAxisTest.java | 30 +-
.../referencing/cs/DefaultCylindricalCSTest.java | 10 +-
.../referencing/cs/DefaultEllipsoidalCSTest.java | 54 +--
.../sis/referencing/cs/DefaultPolarCSTest.java | 8 +-
.../sis/referencing/cs/DefaultSphericalCSTest.java | 12 +-
.../referencing/cs/DirectionAlongMeridianTest.java | 16 +-
.../apache/sis/referencing/cs/HardCodedAxes.java | 3 +-
.../apache/sis/referencing/cs/HardCodedCSTest.java | 16 +-
.../apache/sis/referencing/cs/NormalizerTest.java | 30 +-
.../referencing/datum/BursaWolfParametersTest.java | 34 +-
.../referencing/datum/DefaultEllipsoidTest.java | 63 ++-
.../datum/DefaultGeodeticDatumTest.java | 43 +-
.../datum/DefaultPrimeMeridianTest.java | 8 +-
.../datum/DefaultTemporalDatumTest.java | 15 +-
.../datum/DefaultVerticalDatumTest.java | 18 +-
.../referencing/datum/TimeDependentBWPTest.java | 20 +-
.../referencing/factory/AuthorityFactoryMock.java | 12 +-
.../factory/AuthorityFactoryProxyTest.java | 26 +-
.../factory/CommonAuthorityFactoryTest.java | 114 +++---
.../factory/ConcurrentAuthorityFactoryTest.java | 63 ++-
.../factory/GeodeticObjectFactoryTest.java | 26 +-
.../factory/IdentifiedObjectFinderTest.java | 24 +-
.../factory/MultiAuthoritiesFactoryTest.java | 253 ++++++------
.../sis/referencing/factory/TestFactorySource.java | 26 +-
.../referencing/factory/sql/EPSGFactoryTest.java | 441 ++++++++++-----------
.../referencing/factory/sql/EPSGInstallerTest.java | 34 +-
.../sis/referencing/factory/sql/TableInfoTest.java | 4 +-
.../factory/sql/epsg/DataScriptFormatterTest.java | 4 +-
.../referencing/geoapi/AuthorityFactoryTest.java | 8 +-
.../geoapi/ParameterizedTransformTest.java | 10 +-
.../internal/ServicesForMetadataTest.java | 2 +-
.../internal/VerticalDatumTypesTest.java | 6 +-
.../operation/CoordinateOperationFinderTest.java | 302 +++++++-------
.../operation/CoordinateOperationRegistryTest.java | 79 ++--
.../DefaultConcatenatedOperationTest.java | 17 +-
.../operation/DefaultConversionTest.java | 55 ++-
.../DefaultCoordinateOperationFactoryTest.java | 73 ++--
.../referencing/operation/DefaultFormulaTest.java | 2 +-
.../operation/DefaultOperationMethodTest.java | 18 +-
.../operation/DefaultPassThroughOperationTest.java | 21 +-
.../operation/DefaultTransformationTest.java | 32 +-
.../operation/SingleOperationMarshallingTest.java | 16 +-
.../builder/LinearTransformBuilderTest.java | 90 ++---
.../operation/builder/LinearizerTest.java | 6 +-
.../builder/LocalizationGridBuilderTest.java | 16 +-
.../operation/builder/ResidualGridTest.java | 60 +--
.../operation/gridded/CompressedGridTest.java | 4 +-
.../operation/gridded/LoadedGridTest.java | 40 +-
.../operation/matrix/AffineTransforms2DTest.java | 4 +-
.../operation/matrix/GeneralMatrixTest.java | 6 +-
.../referencing/operation/matrix/MatricesTest.java | 94 ++---
.../referencing/operation/matrix/Matrix1Test.java | 6 +-
.../referencing/operation/matrix/Matrix2Test.java | 6 +-
.../referencing/operation/matrix/Matrix3Test.java | 6 +-
.../referencing/operation/matrix/Matrix4Test.java | 8 +-
.../operation/matrix/MatrixTestCase.java | 64 +--
.../operation/matrix/NonSquareMatrixTest.java | 8 +-
.../referencing/operation/matrix/SolverTest.java | 2 +-
.../operation/projection/AlbersEqualAreaTest.java | 14 +-
.../projection/AuthalicConversionTest.java | 4 +-
.../projection/AzimuthalEquidistantTest.java | 2 +-
.../operation/projection/CassiniSoldnerTest.java | 9 +-
.../projection/ConformalProjectionTest.java | 102 ++---
.../projection/CylindricalEqualAreaTest.java | 2 +-
.../operation/projection/EquirectangularTest.java | 2 +-
.../operation/projection/InitializerTest.java | 6 +-
.../projection/LambertAzimuthalEqualAreaTest.java | 24 +-
.../projection/LambertConicConformalTest.java | 62 +--
.../projection/MapProjectionTestCase.java | 6 +-
.../operation/projection/MercatorTest.java | 34 +-
.../operation/projection/MeridianArcTest.java | 21 +-
.../ModifiedAzimuthalEquidistantTest.java | 5 +-
.../operation/projection/MollweideTest.java | 4 +-
.../projection/NormalizedProjectionTest.java | 14 +-
.../operation/projection/ObliqueMercatorTest.java | 2 +-
.../projection/ObliqueStereographicTest.java | 16 +-
.../operation/projection/OrthographicTest.java | 2 +-
.../projection/PolarStereographicTest.java | 2 +-
.../operation/projection/PolyconicTest.java | 2 +-
.../projection/ProjectionResultComparator.java | 30 +-
.../projection/SatelliteTrackingTest.java | 4 +-
.../operation/projection/SinusoidalTest.java | 2 +-
.../projection/TransverseMercatorTest.java | 2 +-
.../operation/projection/ZonedGridSystemTest.java | 12 +-
.../referencing/operation/provider/AffineTest.java | 6 +-
.../provider/CoordinateFrameRotationTest.java | 4 +-
.../operation/provider/DatumShiftTestCase.java | 8 +-
.../FranceGeocentricInterpolationTest.java | 48 +--
.../provider/GeocentricTranslationTest.java | 15 +-
.../operation/provider/Geographic3Dto2DTest.java | 41 +-
.../operation/provider/GeographicOffsetsTest.java | 2 +-
.../operation/provider/LongitudeRotationTest.java | 6 +-
.../operation/provider/MapProjectionTest.java | 10 +-
.../operation/provider/MolodenskyTest.java | 8 +-
.../referencing/operation/provider/NADCONTest.java | 31 +-
.../referencing/operation/provider/NTv2Test.java | 61 ++-
.../provider/ParameterNameTableGenerator.java | 2 +-
.../provider/PositionVector7ParamTest.java | 4 +-
.../operation/provider/ProvidersTest.java | 50 +--
.../operation/provider/TransverseMercatorTest.java | 42 +-
.../transform/AbridgedMolodenskyTransformTest.java | 10 +-
.../transform/AbstractMathTransformTest.java | 24 +-
.../operation/transform/CartesianToPolarTest.java | 2 +-
.../transform/CartesianToSphericalTest.java | 6 +-
.../transform/ConcatenatedTransformTest.java | 33 +-
.../transform/ContextualParametersTest.java | 40 +-
.../operation/transform/CoordinateDomainTest.java | 4 +-
.../transform/CoordinateSystemTransformTest.java | 14 +-
.../operation/transform/CopyTransformTest.java | 7 +-
.../transform/DefaultMathTransformFactoryTest.java | 68 ++--
.../operation/transform/DomainDefinitionTest.java | 2 +-
.../transform/EllipsoidToCentricTransformTest.java | 2 +-
.../transform/ExponentialTransform1DTest.java | 11 +-
.../InterpolatedGeocentricTransformTest.java | 2 +-
.../transform/InterpolatedTransformTest.java | 2 +-
.../operation/transform/IterationStrategyTest.java | 16 +-
.../transform/LinearInterpolator1DTest.java | 57 ++-
.../operation/transform/LinearTransformTest.java | 41 +-
.../transform/LogarithmicTransform1DTest.java | 6 +-
.../operation/transform/MathTransformTestCase.java | 33 +-
.../operation/transform/MathTransformsTest.java | 17 +-
.../transform/MolodenskyTransformTest.java | 7 +-
.../transform/OperationMethodSetTest.java | 24 +-
.../transform/PassThroughTransformTest.java | 2 +-
.../operation/transform/PolarToCartesianTest.java | 2 +-
.../operation/transform/PoleRotationTest.java | 2 +-
.../transform/ProjectiveTransformTest.java | 102 ++---
.../transform/RandomFailureTransform.java | 4 +-
.../operation/transform/ScaleTransformTest.java | 19 +-
.../operation/transform/SinusoidalShiftGrid.java | 2 +-
.../transform/SpecializableTransformTest.java | 4 +-
.../transform/SphericalToCartesianTest.java | 6 +-
.../operation/transform/TransferFunctionTest.java | 87 ++--
.../transform/TransformResultComparator.java | 22 +-
.../transform/TransformSeparatorTest.java | 39 +-
.../transform/TranslationTransformTest.java | 16 +-
.../operation/transform/UnitConversionTest.java | 12 +-
.../transform/WraparoundTransformTest.java | 2 +-
.../report/CoordinateReferenceSystems.java | 2 +-
.../sis/referencing/util/AxesMapperTest.java | 4 +-
.../sis/referencing/util/AxisDirectionsTest.java | 29 +-
.../referencing/util/CoordinateOperationsTest.java | 2 +-
.../referencing/util/DefinitionVerifierTest.java | 34 +-
.../util/EllipsoidalHeightCombinerTest.java | 11 +-
.../sis/referencing/util/ExtentSelectorTest.java | 12 +-
.../apache/sis/referencing/util/FormulasTest.java | 17 +-
.../util/GeodeticObjectBuilderTest.java | 8 +-
.../apache/sis/referencing/util/LazySetTest.java | 4 +-
.../util/PositionalAccuracyConstantTest.java | 2 +-
.../referencing/util/ReferencingUtilitiesTest.java | 14 +-
.../sis/referencing/util/WKTKeywordsTest.java | 22 +-
.../sis/referencing/util/WKTUtilitiesTest.java | 4 +-
.../referencing/util/WraparoundApplicatorTest.java | 8 +-
.../referencing/util/j2d/AbstractShapeTest.java | 4 +-
.../referencing/util/j2d/ShapeUtilitiesTest.java | 39 +-
.../sis/test/integration/ConsistencyTest.java | 22 +-
.../test/integration/CoordinateOperationTest.java | 44 +-
.../integration/CoordinateReferenceSystemTest.java | 29 +-
.../sis/test/integration/DatumShiftTest.java | 4 +-
.../apache/sis/test/integration/MetadataTest.java | 14 +-
.../sis/test/integration/MetadataVerticalTest.java | 70 ++--
.../apache/sis/test/widget/SwingAssertions.java | 30 +-
.../CC_GeneralOperationParameterTest.java | 116 +++---
.../CC_OperationParameterGroupTest.java | 56 +--
.../apache/sis/xml/bind/referencing/CodeTest.java | 74 ++--
.../referencing/SecondDefiningParameterTest.java | 14 +-
.../storage/landsat/LandsatStoreProviderTest.java | 4 +-
.../sis/storage/landsat/MetadataReaderTest.java | 8 +-
.../sis/storage/geotiff/SelfConsistencyTest.java | 28 +-
.../org/apache/sis/storage/geotiff/WriterTest.java | 2 +-
.../sis/storage/geotiff/base/CompressionTest.java | 6 +-
.../sis/storage/geotiff/base/GeoCodesTest.java | 4 +-
.../sis/storage/geotiff/base/GeoKeysTest.java | 12 +-
.../apache/sis/storage/geotiff/base/TagsTest.java | 4 +-
.../sis/storage/geotiff/inflater/CCITTRLETest.java | 18 +-
.../sis/storage/geotiff/inflater/InflaterTest.java | 4 +-
.../sis/storage/geotiff/reader/CRSBuilderTest.java | 20 +-
.../sis/storage/geotiff/reader/TypeTest.java | 38 +-
.../storage/geotiff/reader/XMLMetadataTest.java | 4 +-
.../sis/storage/netcdf/MetadataReaderTest.java | 4 +-
.../storage/netcdf/NetcdfStoreProviderTest.java | 21 +-
.../apache/sis/storage/netcdf/NetcdfStoreTest.java | 10 +-
.../sis/storage/netcdf/SelfConsistencyTest.java | 12 +-
.../apache/sis/storage/netcdf/base/AxisTest.java | 4 +-
.../sis/storage/netcdf/base/DataTypeTest.java | 22 +-
.../sis/storage/netcdf/base/DecoderTest.java | 8 +-
.../sis/storage/netcdf/base/FeatureSetTest.java | 17 +-
.../apache/sis/storage/netcdf/base/GridTest.java | 25 +-
.../apache/sis/storage/netcdf/base/TestCase.java | 12 +-
.../sis/storage/netcdf/base/VariableTest.java | 71 ++--
.../org/apache/sis/storage/sql/SQLStoreTest.java | 71 ++--
.../apache/sis/storage/sql/TestOnAllDatabases.java | 2 +-
.../storage/sql/feature/GeometryGetterTest.java | 8 +-
.../sql/feature/SelectionClauseWriterTest.java | 4 +-
.../sql/feature/TemporalValueGetterTest.java | 8 +-
.../apache/sis/storage/sql/postgis/BandTest.java | 4 +-
.../sis/storage/sql/postgis/PostgresTest.java | 15 +-
.../sis/storage/sql/postgis/RasterReaderTest.java | 4 +-
.../sis/storage/sql/postgis/RasterWriterTest.java | 6 +-
.../apache/sis/storage/sql/postgis/TestRaster.java | 6 +-
.../main/org/apache/sis/storage/gpx/Store.java | 4 +-
.../org/apache/sis/storage/gpx/MetadataTest.java | 16 +-
.../org/apache/sis/storage/gpx/ReaderTest.java | 314 +++++++--------
.../test/org/apache/sis/storage/gpx/TypesTest.java | 8 +-
.../org/apache/sis/storage/gpx/UpdaterTest.java | 20 +-
.../org/apache/sis/storage/gpx/WriterTest.java | 14 +-
.../org/apache/sis/storage/base/LegalSymbols.java | 6 +-
.../apache/sis/storage/base/MetadataBuilder.java | 40 +-
.../apache/sis/storage/base/ResourceLineage.java | 2 +-
.../apache/sis/io/stream/ChannelDataInputTest.java | 44 +-
.../sis/io/stream/ChannelDataOutputTest.java | 2 +-
.../sis/io/stream/ChannelImageInputStreamTest.java | 2 +-
.../io/stream/ChannelImageOutputStreamTest.java | 2 +-
.../apache/sis/io/stream/ComputedInputStream.java | 14 +-
.../sis/io/stream/FileCacheByteChannelTest.java | 8 +-
.../sis/io/stream/HyperRectangleReaderTest.java | 8 +-
.../sis/io/stream/HyperRectangleWriterTest.java | 2 +-
.../org/apache/sis/io/stream/IOUtilitiesTest.java | 2 +-
.../sis/io/stream/ImageInputStreamComparator.java | 14 +-
.../sis/io/stream/InputStreamArrayGetterTest.java | 4 +-
.../io/stream/SubsampledRectangleWriterTest.java | 2 +-
.../apache/sis/io/stream/UpdatableWriteTest.java | 2 +-
.../org/apache/sis/storage/CoverageQueryTest.java | 13 +-
.../org/apache/sis/storage/CoverageSubsetTest.java | 6 +-
.../org/apache/sis/storage/DataOptionKeyTest.java | 2 +-
.../apache/sis/storage/DataStoreProviderTest.java | 16 +-
.../org/apache/sis/storage/DataStoresTest.java | 4 +-
.../org/apache/sis/storage/FeatureNamingTest.java | 111 ++----
.../org/apache/sis/storage/FeatureQueryTest.java | 10 +-
.../org/apache/sis/storage/GridResourceMock.java | 2 +-
.../org/apache/sis/storage/ProbeResultTest.java | 12 +-
.../apache/sis/storage/StorageConnectorTest.java | 5 +-
.../aggregate/BandAggregateGridResourceTest.java | 14 +-
.../aggregate/ConcatenatedFeatureSetTest.java | 38 +-
.../storage/aggregate/CoverageAggregatorTest.java | 7 +-
.../sis/storage/aggregate/JoinFeatureSetTest.java | 56 +--
.../org/apache/sis/storage/base/CodeTypeTest.java | 6 +-
.../sis/storage/base/MemoryGridResourceTest.java | 6 +-
.../sis/storage/base/MetadataBuilderTest.java | 13 +-
.../sis/storage/base/StoreUtilitiesTest.java | 4 +-
.../apache/sis/storage/csv/StoreProviderTest.java | 8 +-
.../test/org/apache/sis/storage/csv/StoreTest.java | 44 +-
.../sis/storage/esri/AsciiGridStoreTest.java | 18 +-
.../sis/storage/esri/BILConsistencyTest.java | 12 +-
.../sis/storage/esri/BIPConsistencyTest.java | 12 +-
.../sis/storage/esri/BSQConsistencyTest.java | 12 +-
.../apache/sis/storage/esri/WritableStoreTest.java | 6 +-
.../sis/storage/event/StoreListenersTest.java | 20 +-
.../org/apache/sis/storage/folder/StoreTest.java | 16 +-
.../sis/storage/image/SelfConsistencyTest.java | 12 +-
.../sis/storage/image/WorldFileStoreTest.java | 27 +-
.../storage/internal/RewindableLineReaderTest.java | 2 +-
.../sis/storage/test/CoverageReadConsistency.java | 18 +-
.../apache/sis/storage/test/SubsampledImage.java | 6 +-
.../apache/sis/storage/wkt/StoreProviderTest.java | 14 +-
.../test/org/apache/sis/storage/wkt/StoreTest.java | 10 +-
.../sis/storage/xml/MimeTypeDetectorTest.java | 4 +-
.../apache/sis/storage/xml/StoreProviderTest.java | 15 +-
.../test/org/apache/sis/storage/xml/StoreTest.java | 2 +-
.../test/module-info.java | 1 -
.../apache/sis/converter/AngleConverterTest.java | 4 +-
.../apache/sis/converter/ArrayConverterTest.java | 6 +-
.../sis/converter/ConverterRegistryTest.java | 56 +--
.../sis/converter/FallbackConverterTest.java | 4 +-
.../apache/sis/converter/NumberConverterTest.java | 53 ++-
.../apache/sis/converter/PathConverterTest.java | 16 +-
.../apache/sis/converter/StringConverterTest.java | 24 +-
.../apache/sis/converter/SystemRegistryTest.java | 79 ++--
.../test/org/apache/sis/io/AppenderTestCase.java | 2 +-
.../test/org/apache/sis/io/LeftMarginTest.java | 4 +-
.../test/org/apache/sis/io/LineAppenderTest.java | 6 +-
.../test/org/apache/sis/io/TableAppenderTest.java | 2 +-
.../org/apache/sis/io/TabulationExpansionTest.java | 4 +-
.../test/org/apache/sis/io/WordWrapTest.java | 6 +-
.../sis/io/WordWrapWithLineSeparatorTest.java | 4 +-
.../org/apache/sis/math/DecimalFunctionsTest.java | 102 ++---
.../test/org/apache/sis/math/FractionTest.java | 22 +-
.../org/apache/sis/math/FunctionPropertyTest.java | 4 +-
.../test/org/apache/sis/math/LineTest.java | 42 +-
.../apache/sis/math/LinearlyDerivedVectorTest.java | 30 +-
.../org/apache/sis/math/MathFunctionsTest.java | 38 +-
.../test/org/apache/sis/math/PlaneTest.java | 28 +-
.../org/apache/sis/math/RepeatedVectorTest.java | 30 +-
.../org/apache/sis/math/StatisticsFormatTest.java | 2 +-
.../test/org/apache/sis/math/StatisticsTest.java | 63 ++-
.../test/org/apache/sis/math/VectorTest.java | 146 +++----
.../org/apache/sis/measure/AngleFormatTest.java | 42 +-
.../test/org/apache/sis/measure/AngleTest.java | 44 +-
.../apache/sis/measure/ConventionalUnitTest.java | 54 +--
.../test/org/apache/sis/measure/DateRangeTest.java | 4 +-
.../measure/FormattedCharacterIteratorTest.java | 48 +--
.../apache/sis/measure/LinearConverterTest.java | 47 ++-
.../apache/sis/measure/MeasurementRangeTest.java | 4 +-
.../org/apache/sis/measure/NumberRangeTest.java | 22 +-
.../test/org/apache/sis/measure/PrefixesTest.java | 22 +-
.../org/apache/sis/measure/QuantitiesTest.java | 45 +--
.../org/apache/sis/measure/RangeFormatTest.java | 134 +++----
.../test/org/apache/sis/measure/RangeTest.java | 28 +-
.../test/org/apache/sis/measure/ScalarTest.java | 85 ++--
.../sis/measure/SexagesimalConverterTest.java | 19 +-
.../org/apache/sis/measure/SystemUnitTest.java | 115 ++----
.../org/apache/sis/measure/UnitDimensionTest.java | 38 +-
.../org/apache/sis/measure/UnitFormatTest.java | 2 +-
.../org/apache/sis/measure/UnitServicesTest.java | 84 ++--
.../test/org/apache/sis/measure/UnitsTest.java | 20 +-
.../test/org/apache/sis/setup/OptionKeyTest.java | 2 +-
.../test/org/apache/sis/system/LoggersTest.java | 12 +-
.../sis/system/ReferenceQueueConsumerTest.java | 19 +-
.../sis/test/{Assume.java => Assumptions.java} | 14 +-
.../apache/sis/test/FailureDetailsReporter.java | 100 +++++
.../org/apache/sis/test/LogRecordCollector.java | 51 ++-
.../test/org/apache/sis/test/LoggingWatcher.java | 20 +-
.../test/org/apache/sis/test/OptionalTestData.java | 8 +-
.../org/apache/sis/test/ProjectDirectories.java | 8 +-
.../test/org/apache/sis/test/TestCase.java | 60 +--
.../test/org/apache/sis/test/TestRunner.java | 361 -----------------
.../test/org/apache/sis/test/TestStep.java | 2 +-
.../test/org/apache/sis/test/TestUtilities.java | 18 +-
.../test/org/apache/sis/test/package-info.java | 5 +-
.../test/org/apache/sis/test/self/AssertTest.java | 4 +-
.../apache/sis/test/self/TestUtilitiesTest.java | 4 +-
.../org/apache/sis/util/ArgumentChecksTest.java | 2 +-
.../test/org/apache/sis/util/ArraysExtTest.java | 4 +-
.../org/apache/sis/util/CharSequencesTest.java | 86 ++--
.../test/org/apache/sis/util/CharactersTest.java | 8 +-
.../test/org/apache/sis/util/ClassesTest.java | 12 +-
.../sis/util/DefaultInternationalStringTest.java | 22 +-
.../test/org/apache/sis/util/ExceptionsTest.java | 4 +-
.../test/org/apache/sis/util/LocalesTest.java | 18 +-
.../test/org/apache/sis/util/NumbersTest.java | 23 +-
.../sis/util/SimpleInternationalStringTest.java | 4 +-
.../org/apache/sis/util/StringBuildersTest.java | 4 +-
.../test/org/apache/sis/util/UtilitiesTest.java | 12 +-
.../test/org/apache/sis/util/VersionTest.java | 6 +-
.../org/apache/sis/util/collection/CacheTest.java | 25 +-
.../sis/util/collection/CodeListSetTest.java | 90 ++---
.../sis/util/collection/DefaultTreeTableTest.java | 76 ++--
.../apache/sis/util/collection/DerivedMapTest.java | 22 +-
.../apache/sis/util/collection/DerivedSetTest.java | 24 +-
.../util/collection/FrequencySortedSetTest.java | 20 +-
.../sis/util/collection/IntegerListTest.java | 63 ++-
.../apache/sis/util/collection/LargeCodeList.java | 2 +-
.../apache/sis/util/collection/RangeSetTest.java | 60 +--
.../sis/util/collection/TableColumnTest.java | 8 +-
.../sis/util/collection/TreeTableFormatTest.java | 4 +-
.../apache/sis/util/collection/TreeTablesTest.java | 17 +-
.../sis/util/collection/WeakHashSetTest.java | 30 +-
.../sis/util/collection/WeakValueHashMapTest.java | 26 +-
.../apache/sis/util/internal/AbstractMapTest.java | 105 +++--
.../test/org/apache/sis/util/internal/BagTest.java | 4 +-
.../sis/util/internal/CheckedArrayListTest.java | 84 ++--
.../sis/util/internal/CollectionsExtTest.java | 28 +-
.../sis/util/internal/DefinitionURITest.java | 2 +-
.../apache/sis/util/internal/DoubleDoubleTest.java | 44 +-
.../sis/util/internal/ListOfUnknownSizeTest.java | 4 +-
.../util/internal/LocalizedParseExceptionTest.java | 26 +-
.../org/apache/sis/util/internal/NumericsTest.java | 12 +-
.../sis/util/internal/StandardDateFormatTest.java | 18 +-
.../org/apache/sis/util/internal/StringsTest.java | 4 +-
.../org/apache/sis/util/internal/X364Test.java | 6 +-
.../sis/util/logging/MonolineFormatterTest.java | 12 +-
.../sis/util/logging/PerformanceLevelTest.java | 4 +-
.../util/resources/IndexedResourceBundleTest.java | 12 +-
geoapi/snapshot | 2 +-
incubator/build.gradle.kts | 8 +-
.../org/apache/sis/cql/ExpressionReadingTest.java | 18 +-
.../org/apache/sis/cql/ExpressionWritingTest.java | 14 +-
.../test/org/apache/sis/cql/FilterReadingTest.java | 71 ++--
.../test/org/apache/sis/cql/FilterWritingTest.java | 36 +-
.../test/org/apache/sis/cql/QueryReadingTest.java | 4 +-
.../test/org/apache/sis/cql/QueryWritingTest.java | 4 +-
.../test/org/apache/sis/map/MapLayersTest.java | 2 +-
.../test/org/apache/sis/map/SEPortrayerTest.java | 2 +-
.../sis/map/service/GraphicsPortrayerTest.java | 9 +-
.../coveragejson/CoverageJsonStoreTest.java | 14 +-
.../storage/coveragejson/binding/BindingTest.java | 10 +-
.../sis/storage/shapefile/ShapefileStoreTest.java | 3 +-
.../sis/storage/shapefile/dbf/DBFIOTest.java | 2 +-
.../sis/storage/shapefile/shp/ShapeIOTest.java | 4 +-
.../test/module-info.java | 2 -
netbeans-project/ivy.xml | 6 +-
optional/build.gradle.kts | 7 +-
.../main/org/apache/sis/gui/referencing/Utils.java | 2 +-
.../apache/sis/gui/internal/GUIUtilitiesTest.java | 4 +-
.../test/module-info.java | 2 -
settings.gradle.kts | 6 +-
741 files changed, 9467 insertions(+), 10666 deletions(-)
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/QualityParameter.java
index e86dd91315,1fd5525f30..b05975e830
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/QualityParameter.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/QualityParameter.java
@@@ -168,9 -165,9 +168,9 @@@ public final class QualityParameter ext
* @return the parameter name as an identifier (the type specified by ISO
19111).
*/
@Override
- public synchronized Identifier getName() {
+ public synchronized ReferenceIdentifier getName() {
if (name == null && code != null) {
- final RS_Identifier id = new RS_Identifier(null, code, null);
- var id = new DefaultIdentifier(code);
++ final var id = new RS_Identifier(null, code, null);
id.setDescription(definition);
id.transitionTo(DefaultIdentifier.State.FINAL);
name = id;
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/HashCodeTest.java
index 0b78758748,a018396ce4..0a63bb8a98
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/HashCodeTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/HashCodeTest.java
@@@ -94,12 -91,11 +91,12 @@@ public final class HashCodeTest extend
@Test
@DependsOnMethod("testSimple")
public void testNested() {
- final InternationalString title = new
SimpleInternationalString("Some title");
- final InternationalString person = new
SimpleInternationalString("Illustre inconnu");
- final DefaultIndividual party = new DefaultIndividual(person,
null, null);
- final DefaultResponsibleParty resp = new
DefaultResponsibleParty(Role.AUTHOR);
- final DefaultCitation instance = new DefaultCitation(title);
+ final var title = new SimpleInternationalString("Some title");
+ final var person = new SimpleInternationalString("Illustre
inconnu");
+ final var party = new DefaultIndividual(person, null, null);
- final var resp = new DefaultResponsibility(Role.AUTHOR, null,
party);
++ final var resp = new DefaultResponsibleParty(Role.AUTHOR);
+ final var instance = new DefaultCitation(title);
+ resp.getParties().add(party);
instance.getCitedResponsibleParties().add(resp);
/*
* Individual hash code is the sum of all its properties, none of
them being a collection.
@@@ -109,8 -105,8 +106,8 @@@
/*
* The +31 below come from java.util.List contract, since above
Individual is a list member.
*/
- expected += Responsibility.class.hashCode() + Role.AUTHOR.hashCode()
+ 31;
+ expected += ResponsibleParty.class.hashCode() +
Role.AUTHOR.hashCode() + 31;
- assertEquals("Responsibility", Integer.valueOf(expected), hash(resp));
+ assertEquals(Integer.valueOf(expected), hash(resp));
/*
* The +31 below come from java.util.List contract, since above
Responsibility is a list member.
*/
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/TreeNodeTest.java
index bb754a9f8a,32c8da9260..756564a4ed
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/TreeNodeTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/TreeNodeTest.java
@@@ -40,12 -40,9 +40,13 @@@ import static org.junit.jupiter.api.Ass
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
+ import static org.apache.sis.test.Assertions.assertMessageContains;
import static org.apache.sis.metadata.Assertions.assertTitleEquals;
+// Specific to the main and geoapi-3.1 branches:
+import org.opengis.metadata.citation.ResponsibleParty;
+import org.apache.sis.metadata.iso.citation.DefaultResponsibleParty;
+
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.metadata.citation.Party;
@@@ -415,9 -407,8 +416,9 @@@ public final class TreeNodeTest extend
if (valuePolicy == ValueExistencePolicy.COMPACT) {
while (expected[count-1] == null) count--;
}
+ if (skipCountCheck) return;
- assertEquals("Missing values in the tested metadata.", count,
- assertColumnContentEquals(node, column, expected, 0));
+ assertEquals(count, assertColumnContentEquals(node, column, expected,
0),
+ "Missing values in the tested metadata.");
}
/**
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescriptionTest.java
index 12f8c50928,041a5aac51..c30795d667
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescriptionTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescriptionTest.java
@@@ -60,14 -63,14 +60,14 @@@ public final class DefaultScopeDescript
*/
@Test
public void testSetExclusiveProperties() {
- final DefaultScopeDescription metadata = new
DefaultScopeDescription();
+ final var metadata = new DefaultScopeDescription();
metadata.setDataset("A dataset");
- assertEquals("dataset", "A dataset", metadata.getDataset());
+ assertEquals("A dataset", metadata.getDataset());
loggings.assertNoUnexpectedLog();
- metadata.setOther(new SimpleInternationalString("Other value"));
+ metadata.setOther("Other value");
- assertEquals("other", "Other value", metadata.getOther());
- assertNull("dataset", metadata.getDataset());
+ assertEquals("Other value", String.valueOf(metadata.getOther()));
+ assertNull(metadata.getDataset());
loggings.assertNextLogContains("dataset", "other");
loggings.assertNoUnexpectedLog();
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataWriterTest.java
index b592776d4f,b9ec899e8d..6f9acbebcb
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataWriterTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataWriterTest.java
@@@ -124,8 -124,8 +124,8 @@@ public final class MetadataWriterTest e
assertEquals("ISO 19115",
source.search(HardCodedCitations.ISO_19115));
assertEquals("EPSG", source.search(HardCodedCitations.EPSG));
assertEquals("SIS", source.search(HardCodedCitations.SIS));
- assertNull ("ISO 19111",
source.search(HardCodedCitations.ISO_19111));
+ assertNull (
source.search(HardCodedCitations.ISO_19111));
- assertEquals("EPSG", source.search(TestUtilities.getSingleton(
+ assertEquals("{rp}EPSG", source.search(TestUtilities.getSingleton(
HardCodedCitations.EPSG.getCitedResponsibleParties())));
}
diff --cc
endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/profile/france/FrenchProfileTest.java
index 9a0d1a9349,f7670e4ecc..fd3fa0c68f
---
a/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/profile/france/FrenchProfileTest.java
+++
b/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/profile/france/FrenchProfileTest.java
@@@ -84,13 -83,13 +83,13 @@@ public final class FrenchProfileTest ex
public void testReferenceSystemToAFNOR() {
ReferenceSystem std, fra;
- std = new ReferenceSystemMetadata(new DefaultIdentifier("EPSG",
"4326", null));
+ std = new ReferenceSystemMetadata(new RS_Identifier("EPSG", "4326",
null));
fra = FrenchProfile.toAFNOR(std, false);
- assertInstanceOf("Expected AFNOR instance.",
DirectReferenceSystem.class, fra);
- assertSame("Already an AFNOR instance.", fra,
FrenchProfile.toAFNOR(fra));
+ assertInstanceOf(DirectReferenceSystem.class, fra);
+ assertSame(fra, FrenchProfile.toAFNOR(fra));
fra = FrenchProfile.toAFNOR(std, true);
- assertInstanceOf("Expected AFNOR instance.",
IndirectReferenceSystem.class, fra);
- assertSame("Already an AFNOR instance.", fra,
FrenchProfile.toAFNOR(fra));
+ assertInstanceOf(IndirectReferenceSystem.class, fra);
+ assertSame(fra, FrenchProfile.toAFNOR(fra));
}
}
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java
index 764e7b5a37,6f4f2c7ee8..90d7a858d0
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java
@@@ -62,10 -64,10 +64,10 @@@ public final class AbstractIdentifiedOb
*
* @param identifiers the value for the {@code "identifiers"} property.
*/
- private static Map<String,Object> properties(final Set<Identifier>
identifiers) {
+ private static Map<String,Object> properties(final
Set<ReferenceIdentifier> identifiers) {
- final Map<String,Object> properties = new HashMap<>(8);
+ final var properties = new HashMap<String,Object>(8);
assertNull(properties.put("name", "GRS 1980"));
- assertNull(properties.put("identifiers",
identifiers.toArray(Identifier[]::new)));
+ assertNull(properties.put("identifiers",
identifiers.toArray(ReferenceIdentifier[]::new)));
assertNull(properties.put("codespace", "EPSG"));
assertNull(properties.put("version", "8.3"));
assertNull(properties.put("alias", "International 1979"));
@@@ -82,20 -84,20 +84,20 @@@
* @param gmlID the expected value of {@link
AbstractIdentifiedObject#getID()}.
* @return the value of {@link AbstractIdentifiedObject#getIdentifier()}.
*/
- private static Identifier validate(final AbstractIdentifiedObject object,
- final Set<Identifier> identifiers, final String gmlID)
+ private static ReferenceIdentifier validate(final
AbstractIdentifiedObject object,
+ final Set<ReferenceIdentifier> identifiers, final String gmlID)
{
Validators.validate(object);
- final ReferenceIdentifier name = object.getName();
- assertEquals("name", "GRS 1980",
name.getCode());
- assertEquals("codespace", "EPSG",
name.getCodeSpace());
- assertEquals("version", "8.3",
name.getVersion());
- assertEquals("aliases", "International 1979",
getSingleton(object.getAlias()).toString());
- assertEquals("names", name,
getSingleton(object.getNames()));
- assertEquals("identifiers", identifiers,
object.getIdentifiers());
- assertEquals("ID", gmlID,
object.getID());
- assertEquals("remarks", "Adopted by IUGG 1979 Canberra",
object.getRemarks().toString(Locale.ENGLISH));
- assertEquals("remarks_fr", "Adopté par IUGG 1979 Canberra",
object.getRemarks().toString(Locale.FRENCH));
+ final var name = object.getName();
+ assertEquals("GRS 1980", name.getCode(), "name");
+ assertEquals("EPSG", name.getCodeSpace(),
"codespace");
+ assertEquals("8.3", name.getVersion(),
"version");
+ assertEquals("International 1979",
getSingleton(object.getAlias()).toString(), "aliases");
+ assertEquals(name,
getSingleton(object.getNames()), "names");
+ assertEquals(identifiers,
object.getIdentifiers(), "identifiers");
+ assertEquals(gmlID, object.getID(), "ID");
+ assertEquals("Adopted by IUGG 1979 Canberra",
object.getRemarks().toString(Locale.ENGLISH), "remarks");
+ assertEquals("Adopté par IUGG 1979 Canberra",
object.getRemarks().toString(Locale.FRENCH), "remarks_fr");
final Code code = object.getIdentifier();
return (code != null) ? code.getIdentifier() : null;
}
@@@ -139,10 -136,10 +136,10 @@@
*/
@Test
public void testWithoutIdentifier() {
- final Set<ReferenceIdentifier> identifiers = Set.of();
- final AbstractIdentifiedObject object = new
AbstractIdentifiedObject(properties(identifiers));
- final ReferenceIdentifier gmlId = validate(object,
identifiers, "GRS1980");
- assertNull("gmlId", gmlId);
- final var identifiers = Set.<Identifier>of();
++ final var identifiers = Set.<ReferenceIdentifier>of();
+ final var object = new
AbstractIdentifiedObject(properties(identifiers));
+ final var gmlId = validate(object, identifiers, "GRS1980");
+ assertNull(gmlId);
}
/**
@@@ -158,13 -155,13 +155,13 @@@
@Test
@DependsOnMethod("testWithoutIdentifier")
public void testWithSingleIdentifier() {
- final ReferenceIdentifier identifier = new
ImmutableIdentifier(null, "EPSG", "7019");
- final Set<ReferenceIdentifier> identifiers = Set.of(identifier);
- final AbstractIdentifiedObject object = new
AbstractIdentifiedObject(properties(identifiers));
- final ReferenceIdentifier gmlId = validate(object,
identifiers, "epsg-7019");
- assertNotNull("gmlId", gmlId);
- assertEquals ("gmlId.codespace", "EPSG", gmlId.getCodeSpace());
- assertEquals ("gmlId.code", "7019", gmlId.getCode());
+ final var identifier = new ImmutableIdentifier(null, "EPSG", "7019");
- final var identifiers = Set.<Identifier>of(identifier);
++ final var identifiers = Set.<ReferenceIdentifier>of(identifier);
+ final var object = new
AbstractIdentifiedObject(properties(identifiers));
+ final var gmlId = validate(object, identifiers, "epsg-7019");
+ assertNotNull( gmlId);
+ assertEquals ("EPSG", gmlId.getCodeSpace());
+ assertEquals ("7019", gmlId.getCode());
}
/**
@@@ -175,14 -172,14 +172,14 @@@
@Test
@DependsOnMethod("testWithSingleIdentifier")
public void testWithManyIdentifiers() {
- final Set<ReferenceIdentifier> identifiers = new LinkedHashSet<>(4);
- final var identifiers = new LinkedHashSet<Identifier>(4);
++ final var identifiers = new LinkedHashSet<ReferenceIdentifier>(4);
assertTrue(identifiers.add(new NamedIdentifier(EPSG, "7019")));
assertTrue(identifiers.add(new NamedIdentifier(EPSG, "IgnoreMe")));
- final AbstractIdentifiedObject object = new
AbstractIdentifiedObject(properties(identifiers));
- final ReferenceIdentifier gmlId = validate(object, identifiers,
"epsg-7019");
- assertNotNull("gmlId", gmlId);
- assertEquals ("gmlId.codespace", "EPSG", gmlId.getCodeSpace());
- assertEquals ("gmlId.code", "7019", gmlId.getCode());
+ final var object = new
AbstractIdentifiedObject(properties(identifiers));
+ final var gmlId = validate(object, identifiers, "epsg-7019");
+ assertNotNull( gmlId);
+ assertEquals ("EPSG", gmlId.getCodeSpace());
+ assertEquals ("7019", gmlId.getCode());
}
/**
@@@ -193,13 -190,13 +190,13 @@@
@Test
@DependsOnMethod("testWithManyIdentifiers")
public void testAsSubtype() {
- final ReferenceIdentifier identifier = new
NamedIdentifier(EPSG, "7019");
- final Set<ReferenceIdentifier> identifiers = Set.of(identifier);
- final AbstractIdentifiedObject object = new
AbstractDatum(properties(identifiers));
- final ReferenceIdentifier gmlId = validate(object,
identifiers, "epsg-datum-7019");
- assertNotNull("gmlId", gmlId);
- assertEquals ("gmlId.codespace", "EPSG", gmlId.getCodeSpace());
- assertEquals ("gmlId.code", "7019", gmlId.getCode());
+ final var identifier = new NamedIdentifier(EPSG, "7019");
- final var identifiers = Set.<Identifier>of(identifier);
++ final var identifiers = Set.<ReferenceIdentifier>of(identifier);
+ final var object = new AbstractDatum(properties(identifiers));
+ final var gmlId = validate(object, identifiers,
"epsg-datum-7019");
+ assertNotNull( gmlId);
+ assertEquals ("EPSG", gmlId.getCodeSpace());
+ assertEquals ("7019", gmlId.getCode());
}
/**
@@@ -238,10 -235,10 +235,10 @@@
@Test
@DependsOnMethod("testWithoutIdentifier")
public void testSerialization() {
- final Set<ReferenceIdentifier> identifiers = Set.of();
- final AbstractIdentifiedObject object = new
AbstractIdentifiedObject(properties(identifiers));
- final AbstractIdentifiedObject actual =
assertSerializedEquals(object);
- final var identifiers = Set.<Identifier>of();
++ final var identifiers = Set.<ReferenceIdentifier>of();
+ final var object = new
AbstractIdentifiedObject(properties(identifiers));
+ final var actual = assertSerializedEquals(object);
assertNotSame(object, actual);
- assertNull("gmlId", validate(actual, identifiers, "GRS1980"));
+ assertNull(validate(actual, identifiers, "GRS1980"), "gmlId");
}
}
diff --cc
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/LegalSymbols.java
index 385e6ea2e5,6ce4819765..8bb334613c
---
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/LegalSymbols.java
+++
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/LegalSymbols.java
@@@ -213,9 -213,8 +213,9 @@@ parse: for (int i = 0; i < length;)
if (i != 0) {
buffer.setLength(i);
// Same limitation as MetadataBuilder.party().
- final AbstractParty party = new AbstractParty(buffer, null);
+ final var party = new AbstractParty(buffer, null);
- final var r = new DefaultResponsibility(Role.OWNER, null, party);
+ final var r = new DefaultResponsibleParty(Role.OWNER);
+ r.setParties(Collections.singleton(party));
c.setCitedResponsibleParties(Collections.singleton(r));
}
constraints.getReferences().add(c);
diff --cc
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataBuilder.java
index e22d14dae3,7ccb0942d7..fab9fe5034
---
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataBuilder.java
+++
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataBuilder.java
@@@ -2758,12 -2756,12 +2758,12 @@@ public class MetadataBuilder
public final void addSource(final CharSequence description, final
ScopeCode level, final CharSequence feature) {
final InternationalString i18n = trim(description);
if (i18n != null) {
- final DefaultSource source = new DefaultSource(description);
+ final var source = new DefaultSource(description);
if (level != null || feature != null) {
- DefaultScope scope = new DefaultScope(level);
+ final var scope = new DefaultScope(level);
if (feature != null) {
- final DefaultScopeDescription sd = new
DefaultScopeDescription();
+ final var sd = new DefaultScopeDescription();
- sd.getFeatures().add(feature);
+ sd.getFeatures().add(new
org.apache.sis.metadata.iso.maintenance.LegacyFeatureType(feature));
scope.getLevelDescription().add(sd);
}
}
diff --cc geoapi/snapshot
index 9f7fe1ab89,9e4ff919ef..2662946e36
--- a/geoapi/snapshot
+++ b/geoapi/snapshot
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 9f7fe1ab89f54f5bfa243616ba4f035708ecc573
-Subproject commit 9e4ff919ef56e52e05767cc85c88e5795081c883
++Subproject commit 2662946e36fb4c982832ce649dd5ca202af9a9dd
