This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 55d09a63e092adc1b0736d01b207e861a641a9af
Merge: 131b4ae055 6879e93e0e
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Sun Feb 18 00:03:09 2024 +0100
Merge branch 'geoapi-3.1':
Remove unsupported custom annotations.
.../org/apache/sis/console/AboutCommandTest.java | 2 -
.../org/apache/sis/console/CRSCommandTest.java | 5 --
.../org/apache/sis/console/CommandRunnerTest.java | 3 --
.../org/apache/sis/console/HelpCommandTest.java | 2 -
.../apache/sis/console/MetadataCommandTest.java | 4 --
.../apache/sis/console/MimeTypeCommandTest.java | 2 -
.../org/apache/sis/coverage/CategoryListTest.java | 7 ---
.../sis/coverage/grid/GridCoverage2DTest.java | 2 -
.../sis/coverage/grid/GridDerivationTest.java | 8 ----
.../apache/sis/coverage/grid/GridGeometryTest.java | 2 -
.../coverage/grid/ResampledGridCoverageTest.java | 5 --
.../sis/coverage/grid/ReshapedImageTest.java | 2 -
.../apache/sis/feature/AbstractFeatureTest.java | 5 --
.../apache/sis/feature/AbstractOperationTest.java | 2 -
.../apache/sis/feature/CharacteristicMapTest.java | 7 ---
.../sis/feature/CharacteristicTypeMapTest.java | 2 -
.../sis/feature/DefaultAssociationRoleTest.java | 4 --
.../sis/feature/DefaultAttributeTypeTest.java | 2 -
.../apache/sis/feature/DefaultFeatureTypeTest.java | 13 ------
.../org/apache/sis/feature/DenseFeatureTest.java | 8 ----
.../org/apache/sis/feature/FeatureFormatTest.java | 5 --
.../apache/sis/feature/FeatureOperationsTest.java | 5 --
.../org/apache/sis/feature/FeatureTestCase.java | 7 ---
.../test/org/apache/sis/feature/FeaturesTest.java | 2 -
.../org/apache/sis/feature/LinkOperationTest.java | 5 --
.../sis/feature/MultiValuedAttributeTest.java | 8 ----
.../apache/sis/feature/PropertySingletonTest.java | 4 --
.../sis/feature/SingletonAssociationTest.java | 5 --
.../apache/sis/feature/SingletonAttributeTest.java | 11 -----
.../org/apache/sis/feature/SparseFeatureTest.java | 8 ----
.../sis/feature/StringJoinOperationTest.java | 5 --
.../feature/builder/AttributeTypeBuilderTest.java | 9 ----
.../feature/builder/FeatureTypeBuilderTest.java | 10 ----
.../sis/geometry/wrapper/GeometriesTestCase.java | 2 -
.../apache/sis/image/BandAggregateImageTest.java | 7 ---
.../org/apache/sis/image/ComputedImageTest.java | 2 -
.../org/apache/sis/image/ImageCombinerTest.java | 2 -
.../org/apache/sis/image/ImageProcessorTest.java | 2 -
.../org/apache/sis/image/PixelIteratorTest.java | 32 -------------
.../apache/sis/image/StatisticsCalculatorTest.java | 2 -
.../org/apache/sis/index/tree/PointTreeTest.java | 2 -
.../apache/sis/metadata/AbstractMetadataTest.java | 2 -
.../test/org/apache/sis/metadata/HashCodeTest.java | 5 --
.../apache/sis/metadata/InformationMapTest.java | 2 -
.../apache/sis/metadata/MetadataCopierTest.java | 2 -
.../apache/sis/metadata/MetadataStandardTest.java | 16 -------
.../sis/metadata/ModifiableMetadataTest.java | 2 -
.../test/org/apache/sis/metadata/NameMapTest.java | 2 -
.../org/apache/sis/metadata/NilReasonMapTest.java | 2 -
.../apache/sis/metadata/PropertyAccessorTest.java | 14 ------
.../sis/metadata/PropertyConsistencyCheck.java | 2 -
.../sis/metadata/PropertyInformationTest.java | 2 -
.../test/org/apache/sis/metadata/PrunerTest.java | 6 ---
.../org/apache/sis/metadata/SpecialCasesTest.java | 6 ---
.../apache/sis/metadata/TreeNodeChildrenTest.java | 17 -------
.../test/org/apache/sis/metadata/TreeNodeTest.java | 12 -----
.../apache/sis/metadata/TreeTableFormatTest.java | 2 -
.../org/apache/sis/metadata/TreeTableViewTest.java | 4 --
.../test/org/apache/sis/metadata/TypeMapTest.java | 2 -
.../test/org/apache/sis/metadata/ValueMapTest.java | 8 ----
.../sis/metadata/internal/NameMeaningTest.java | 2 -
.../apache/sis/metadata/iso/AllMetadataTest.java | 2 -
.../sis/metadata/iso/DefaultIdentifierTest.java | 2 -
.../sis/metadata/iso/DefaultMetadataTest.java | 2 -
.../sis/metadata/iso/citation/CitationsTest.java | 6 ---
.../metadata/iso/citation/DefaultCitationTest.java | 3 --
.../metadata/iso/citation/DefaultContactTest.java | 3 --
.../sis/metadata/iso/extent/DefaultExtentTest.java | 2 -
.../extent/DefaultGeographicBoundingBoxTest.java | 3 --
.../sis/metadata/iso/extent/ExtentsTest.java | 2 -
.../identification/DefaultBrowseGraphicTest.java | 9 ----
.../identification/DefaultCoupledResourceTest.java | 2 -
.../DefaultDataIdentificationTest.java | 8 ----
.../DefaultRepresentativeFractionTest.java | 2 -
.../iso/identification/DefaultResolutionTest.java | 2 -
.../DefaultServiceIdentificationTest.java | 5 --
.../metadata/iso/lineage/DefaultLineageTest.java | 4 --
.../quality/AbstractPositionalAccuracyTest.java | 2 -
.../sis/metadata/sql/MetadataSourceTest.java | 2 -
.../sis/metadata/sql/MetadataWriterTest.java | 5 --
.../sis/util/iso/DefaultNameFactoryTest.java | 2 -
.../sis/util/iso/DefaultRecordSchemaTest.java | 5 --
.../org/apache/sis/util/iso/DefaultRecordTest.java | 6 ---
.../apache/sis/util/iso/DefaultRecordTypeTest.java | 5 --
.../apache/sis/util/iso/DefaultScopedNameTest.java | 2 -
.../apache/sis/util/iso/NameMarshallingTest.java | 5 --
.../test/org/apache/sis/util/iso/NamesTest.java | 4 --
.../org/apache/sis/util/iso/TypeNamesTest.java | 5 --
.../sis/xml/CharSequenceSubstitutionTest.java | 4 --
.../apache/sis/xml/NilReasonMarshallingTest.java | 4 --
.../org/apache/sis/xml/UUIDMarshallingTest.java | 4 --
.../org/apache/sis/xml/ValueConverterTest.java | 2 -
.../org/apache/sis/xml/XLinkMarshallingTest.java | 2 -
.../sis/xml/bind/ModifiableIdentifierMapTest.java | 2 -
.../sis/xml/bind/cat/CodeListMarshallingTest.java | 2 -
.../apache/sis/xml/bind/gco/PropertyTypeTest.java | 7 ---
.../apache/sis/xml/bind/gco/StringAdapterTest.java | 2 -
.../org/apache/sis/xml/bind/gml/MeasureTest.java | 2 -
.../apache/sis/xml/bind/lan/LanguageCodeTest.java | 2 -
.../sis/xml/test/AnnotationConsistencyCheck.java | 3 --
.../sis/openoffice/ReferencingFunctionsTest.java | 2 -
.../org/apache/sis/openoffice/TransformerTest.java | 2 -
.../gazetteer/GeohashReferenceSystemTest.java | 5 --
.../referencing/gazetteer/LocationFormatTest.java | 3 --
.../referencing/gazetteer/LocationTypeTest.java | 7 ---
.../gazetteer/MilitaryGridReferenceSystemTest.java | 24 ----------
.../gazetteer/ReferencingByIdentifiersTest.java | 4 --
.../apache/sis/geometry/AbstractEnvelopeTest.java | 5 --
.../org/apache/sis/geometry/ArrayEnvelopeTest.java | 2 -
.../apache/sis/geometry/CoordinateFormatTest.java | 5 --
.../apache/sis/geometry/DirectPosition1DTest.java | 2 -
.../apache/sis/geometry/DirectPosition2DTest.java | 2 -
.../org/apache/sis/geometry/Envelope2DTest.java | 4 --
.../apache/sis/geometry/EnvelopeReducerTest.java | 2 -
.../org/apache/sis/geometry/EnvelopesTest.java | 8 ----
.../sis/geometry/GeneralDirectPositionTest.java | 2 -
.../apache/sis/geometry/GeneralEnvelopeTest.java | 5 --
.../apache/sis/geometry/ImmutableEnvelopeTest.java | 2 -
.../test/org/apache/sis/geometry/Shapes2DTest.java | 2 -
.../org/apache/sis/geometry/SubEnvelopeTest.java | 2 -
.../org/apache/sis/geometry/TransformTestCase.java | 7 ---
.../test/org/apache/sis/io/wkt/ColorsTest.java | 2 -
.../test/org/apache/sis/io/wkt/ElementTest.java | 8 ----
.../test/org/apache/sis/io/wkt/FormatterTest.java | 2 -
.../sis/io/wkt/GeodeticObjectParserTest.java | 33 --------------
.../apache/sis/io/wkt/MathTransformParserTest.java | 5 --
.../org/apache/sis/io/wkt/TransliteratorTest.java | 2 -
.../org/apache/sis/io/wkt/WKTDictionaryTest.java | 2 -
.../test/org/apache/sis/io/wkt/WKTFormatTest.java | 7 ---
.../DefaultParameterDescriptorGroupTest.java | 4 --
.../parameter/DefaultParameterDescriptorTest.java | 7 ---
.../parameter/DefaultParameterValueGroupTest.java | 15 ------
.../sis/parameter/DefaultParameterValueTest.java | 9 ----
.../sis/parameter/MapProjectionParametersTest.java | 2 -
.../parameter/MatrixParametersAlphaNumTest.java | 2 -
.../apache/sis/parameter/MatrixParametersTest.java | 2 -
.../apache/sis/parameter/ParameterBuilderTest.java | 8 ----
.../apache/sis/parameter/ParameterFormatTest.java | 8 ----
.../sis/parameter/ParameterMarshallingTest.java | 17 -------
.../org/apache/sis/parameter/ParametersTest.java | 7 ---
.../apache/sis/parameter/TensorParametersTest.java | 11 -----
.../org/apache/sis/parameter/TensorValuesTest.java | 6 ---
.../UnmodifiableParameterValueGroupTest.java | 2 -
.../parameter/UnmodifiableParameterValueTest.java | 4 --
.../referencing/AbstractIdentifiedObjectTest.java | 11 -----
.../referencing/AbstractReferenceSystemTest.java | 5 --
.../sis/referencing/AuthorityFactoriesTest.java | 2 -
.../org/apache/sis/referencing/BuilderTest.java | 6 ---
.../test/org/apache/sis/referencing/CRSTest.java | 8 ----
.../org/apache/sis/referencing/CommonCRSTest.java | 14 ------
.../sis/referencing/EPSGFactoryFallbackTest.java | 7 ---
.../sis/referencing/GeodesicsOnEllipsoidTest.java | 7 ---
.../sis/referencing/GeodeticCalculatorTest.java | 6 ---
.../sis/referencing/ImmutableIdentifierTest.java | 5 --
.../sis/referencing/NamedIdentifierTest.java | 3 --
.../sis/referencing/StandardDefinitionsTest.java | 11 -----
.../sis/referencing/crs/AbstractCRSTest.java | 2 -
.../referencing/crs/DefaultCompoundCRSTest.java | 9 ----
.../sis/referencing/crs/DefaultDerivedCRSTest.java | 9 ----
.../referencing/crs/DefaultGeocentricCRSTest.java | 9 ----
.../referencing/crs/DefaultGeodeticCRSTest.java | 6 ---
.../referencing/crs/DefaultGeographicCRSTest.java | 14 ------
.../referencing/crs/DefaultProjectedCRSTest.java | 14 ------
.../referencing/crs/DefaultVerticalCRSTest.java | 3 --
.../sis/referencing/crs/HardCodedCRSTest.java | 5 --
.../apache/sis/referencing/crs/SubTypesTest.java | 2 -
.../apache/sis/referencing/cs/AbstractCSTest.java | 8 ----
.../sis/referencing/cs/CoordinateSystemsTest.java | 11 -----
.../sis/referencing/cs/DefaultCartesianCSTest.java | 7 ---
.../sis/referencing/cs/DefaultCompoundCSTest.java | 2 -
.../cs/DefaultCoordinateSystemAxisTest.java | 8 ----
.../referencing/cs/DefaultCylindricalCSTest.java | 2 -
.../referencing/cs/DefaultEllipsoidalCSTest.java | 4 --
.../sis/referencing/cs/DefaultPolarCSTest.java | 2 -
.../sis/referencing/cs/DefaultSphericalCSTest.java | 2 -
.../referencing/cs/DirectionAlongMeridianTest.java | 2 -
.../apache/sis/referencing/cs/HardCodedCSTest.java | 5 --
.../apache/sis/referencing/cs/NormalizerTest.java | 5 --
.../referencing/datum/BursaWolfParametersTest.java | 6 ---
.../referencing/datum/DefaultEllipsoidTest.java | 5 --
.../datum/DefaultGeodeticDatumTest.java | 10 ----
.../datum/DefaultPrimeMeridianTest.java | 8 ----
.../referencing/datum/TimeDependentBWPTest.java | 4 --
.../factory/AuthorityFactoryProxyTest.java | 2 -
.../factory/CommonAuthorityFactoryTest.java | 11 -----
.../factory/ConcurrentAuthorityFactoryTest.java | 2 -
.../factory/IdentifiedObjectFinderTest.java | 4 --
.../factory/MultiAuthoritiesFactoryTest.java | 9 ----
.../referencing/factory/sql/EPSGFactoryTest.java | 20 --------
.../referencing/factory/sql/EPSGInstallerTest.java | 2 -
.../internal/ServicesForMetadataTest.java | 6 ---
.../internal/VerticalDatumTypesTest.java | 2 -
.../operation/CoordinateOperationFinderTest.java | 24 ----------
.../operation/CoordinateOperationRegistryTest.java | 12 -----
.../DefaultConcatenatedOperationTest.java | 5 --
.../operation/DefaultConversionTest.java | 9 ----
.../DefaultCoordinateOperationFactoryTest.java | 7 ---
.../operation/DefaultOperationMethodTest.java | 8 ----
.../operation/DefaultPassThroughOperationTest.java | 5 --
.../operation/DefaultTransformationTest.java | 7 ---
.../operation/SingleOperationMarshallingTest.java | 9 ----
.../builder/LinearTransformBuilderTest.java | 6 ---
.../operation/builder/LinearizerTest.java | 2 -
.../builder/LocalizationGridBuilderTest.java | 2 -
.../operation/builder/ResidualGridTest.java | 5 --
.../operation/gridded/LoadedGridTest.java | 4 --
.../referencing/operation/matrix/MatricesTest.java | 14 ------
.../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 | 9 ----
.../operation/matrix/NonSquareMatrixTest.java | 2 -
.../referencing/operation/matrix/SolverTest.java | 4 --
.../operation/projection/AlbersEqualAreaTest.java | 7 ---
.../projection/AuthalicConversionTest.java | 2 -
.../projection/AzimuthalEquidistantTest.java | 2 -
.../projection/ConformalProjectionTest.java | 6 ---
.../projection/CylindricalEqualAreaTest.java | 3 --
.../projection/LambertConicConformalTest.java | 12 -----
.../operation/projection/MercatorTest.java | 16 -------
.../operation/projection/MeridianArcTest.java | 6 ---
.../ModifiedAzimuthalEquidistantTest.java | 2 -
.../operation/projection/MollweideTest.java | 7 ---
.../projection/NormalizedProjectionTest.java | 7 ---
.../operation/projection/ObliqueMercatorTest.java | 2 -
.../projection/ObliqueStereographicTest.java | 9 ----
.../operation/projection/OrthographicTest.java | 2 -
.../projection/PolarStereographicTest.java | 5 --
.../operation/projection/PolyconicTest.java | 5 --
.../operation/projection/SinusoidalTest.java | 5 --
.../projection/TransverseMercatorTest.java | 6 ---
.../operation/projection/ZonedGridSystemTest.java | 2 -
.../referencing/operation/provider/AffineTest.java | 4 --
.../provider/CoordinateFrameRotationTest.java | 6 ---
.../FranceGeocentricInterpolationTest.java | 2 -
.../provider/GeocentricTranslationTest.java | 14 ------
.../operation/provider/Geographic3Dto2DTest.java | 2 -
.../operation/provider/GeographicOffsetsTest.java | 2 -
.../operation/provider/LongitudeRotationTest.java | 4 --
.../operation/provider/MapProjectionTest.java | 4 --
.../referencing/operation/provider/NTv2Test.java | 2 -
.../provider/PositionVector7ParamTest.java | 6 ---
.../operation/provider/ProvidersTest.java | 7 ---
.../operation/provider/TransverseMercatorTest.java | 5 --
.../transform/AbridgedMolodenskyTransformTest.java | 5 --
.../transform/AbstractMathTransformTest.java | 4 --
.../operation/transform/CartesianToPolarTest.java | 8 ----
.../transform/CartesianToSphericalTest.java | 5 --
.../transform/ConcatenatedTransformTest.java | 2 -
.../transform/ContextualParametersTest.java | 4 --
.../transform/CoordinateSystemTransformTest.java | 5 --
.../operation/transform/CopyTransformTest.java | 8 ----
.../transform/DefaultMathTransformFactoryTest.java | 8 ----
.../transform/EllipsoidToCentricTransformTest.java | 12 -----
.../transform/ExponentialTransform1DTest.java | 13 ------
.../InterpolatedGeocentricTransformTest.java | 10 ----
.../transform/InterpolatedTransformTest.java | 9 ----
.../operation/transform/IterationStrategyTest.java | 2 -
.../transform/LinearInterpolator1DTest.java | 2 -
.../operation/transform/LinearTransformTest.java | 2 -
.../transform/LogarithmicTransform1DTest.java | 11 -----
.../operation/transform/MathTransformsTest.java | 5 --
.../transform/MolodenskyTransformTest.java | 13 ------
.../transform/OperationMethodSetTest.java | 6 ---
.../transform/PassThroughTransformTest.java | 6 ---
.../operation/transform/PolarToCartesianTest.java | 6 ---
.../operation/transform/PoleRotationTest.java | 6 ---
.../transform/ProjectiveTransformTest.java | 2 -
.../operation/transform/ScaleTransformTest.java | 6 ---
.../transform/SpecializableTransformTest.java | 2 -
.../transform/SphericalToCartesianTest.java | 3 --
.../operation/transform/TransferFunctionTest.java | 6 ---
.../transform/TransformSeparatorTest.java | 11 -----
.../transform/TranslationTransformTest.java | 4 --
.../sis/referencing/util/AxisDirectionsTest.java | 5 --
.../referencing/util/CoordinateOperationsTest.java | 2 -
.../referencing/util/DefinitionVerifierTest.java | 5 --
.../util/EllipsoidalHeightCombinerTest.java | 7 ---
.../apache/sis/referencing/util/LazySetTest.java | 3 --
.../sis/referencing/util/WKTUtilitiesTest.java | 2 -
.../sis/test/integration/ConsistencyTest.java | 5 --
.../test/integration/CoordinateOperationTest.java | 8 ----
.../integration/CoordinateReferenceSystemTest.java | 7 ---
.../sis/test/integration/DatumShiftTest.java | 6 ---
.../apache/sis/test/integration/MetadataTest.java | 4 --
.../sis/test/integration/MetadataVerticalTest.java | 4 --
.../CC_GeneralOperationParameterTest.java | 8 ----
.../CC_OperationParameterGroupTest.java | 5 --
.../apache/sis/xml/bind/referencing/CodeTest.java | 5 --
.../sis/storage/geotiff/base/GeoKeysTest.java | 3 --
.../sis/storage/netcdf/MetadataReaderTest.java | 5 --
.../storage/netcdf/NetcdfStoreProviderTest.java | 5 --
.../apache/sis/storage/netcdf/NetcdfStoreTest.java | 5 --
.../apache/sis/storage/netcdf/base/GridTest.java | 5 --
.../sis/storage/netcdf/base/VariableTest.java | 2 -
.../storage/netcdf/classic/ChannelDecoderTest.java | 2 -
.../sis/storage/netcdf/classic/GridInfoTest.java | 2 -
.../storage/netcdf/classic/VariableInfoTest.java | 2 -
.../sis/storage/sql/postgis/PostgresTest.java | 2 -
.../org/apache/sis/storage/gpx/MetadataTest.java | 4 --
.../org/apache/sis/storage/gpx/ReaderTest.java | 12 -----
.../org/apache/sis/storage/gpx/UpdaterTest.java | 2 -
.../org/apache/sis/storage/gpx/WriterTest.java | 10 ----
.../sis/io/stream/ChannelDataOutputTest.java | 4 --
.../sis/io/stream/ChannelImageInputStreamTest.java | 2 -
.../io/stream/ChannelImageOutputStreamTest.java | 2 -
.../sis/io/stream/HyperRectangleReaderTest.java | 5 --
.../org/apache/sis/io/stream/IOUtilitiesTest.java | 4 --
.../apache/sis/storage/DataStoreProviderTest.java | 2 -
.../org/apache/sis/storage/DataStoresTest.java | 2 -
.../org/apache/sis/storage/FeatureNamingTest.java | 4 --
.../apache/sis/storage/StorageConnectorTest.java | 11 -----
.../aggregate/ConcatenatedFeatureSetTest.java | 3 --
.../sis/storage/aggregate/JoinFeatureSetTest.java | 2 -
.../sis/storage/event/StoreListenersTest.java | 3 --
.../sis/storage/test/CoverageReadConsistency.java | 7 ---
.../apache/sis/storage/wkt/StoreProviderTest.java | 2 -
.../test/org/apache/sis/storage/wkt/StoreTest.java | 2 -
.../sis/storage/xml/MimeTypeDetectorTest.java | 2 -
.../apache/sis/storage/xml/StoreProviderTest.java | 2 -
.../test/org/apache/sis/storage/xml/StoreTest.java | 2 -
.../apache/sis/converter/ArrayConverterTest.java | 2 -
.../sis/converter/ConverterRegistryTest.java | 8 ----
.../sis/converter/FallbackConverterTest.java | 3 --
.../apache/sis/converter/NumberConverterTest.java | 2 -
.../apache/sis/converter/PathConverterTest.java | 2 -
.../apache/sis/converter/StringConverterTest.java | 2 -
.../apache/sis/converter/SystemRegistryTest.java | 2 -
.../test/org/apache/sis/io/AppenderTestCase.java | 8 ----
.../test/org/apache/sis/io/LeftMarginTest.java | 2 -
.../test/org/apache/sis/io/LineAppenderTest.java | 5 --
.../test/org/apache/sis/io/TableAppenderTest.java | 5 --
.../org/apache/sis/io/TabulationExpansionTest.java | 2 -
.../test/org/apache/sis/io/WordWrapTest.java | 2 -
.../sis/io/WordWrapWithLineSeparatorTest.java | 2 -
.../org/apache/sis/math/DecimalFunctionsTest.java | 8 ----
.../test/org/apache/sis/math/LineTest.java | 2 -
.../org/apache/sis/math/MathFunctionsTest.java | 10 ----
.../test/org/apache/sis/math/PlaneTest.java | 5 --
.../org/apache/sis/math/StatisticsFormatTest.java | 3 --
.../test/org/apache/sis/math/VectorTest.java | 9 ----
.../org/apache/sis/measure/AngleFormatTest.java | 15 ------
.../test/org/apache/sis/measure/AngleTest.java | 2 -
.../apache/sis/measure/ConventionalUnitTest.java | 7 ---
.../test/org/apache/sis/measure/DateRangeTest.java | 2 -
.../measure/FormattedCharacterIteratorTest.java | 2 -
.../apache/sis/measure/LinearConverterTest.java | 4 --
.../apache/sis/measure/MeasurementRangeTest.java | 2 -
.../org/apache/sis/measure/NumberRangeTest.java | 5 --
.../test/org/apache/sis/measure/PrefixesTest.java | 4 --
.../org/apache/sis/measure/QuantitiesTest.java | 2 -
.../org/apache/sis/measure/RangeFormatTest.java | 2 -
.../test/org/apache/sis/measure/ScalarTest.java | 2 -
.../org/apache/sis/measure/SystemUnitTest.java | 12 -----
.../org/apache/sis/measure/UnitDimensionTest.java | 7 ---
.../org/apache/sis/measure/UnitFormatTest.java | 13 ------
.../org/apache/sis/measure/UnitServicesTest.java | 2 -
.../test/org/apache/sis/measure/UnitsTest.java | 6 ---
.../test/org/apache/sis/test/DependsOn.java | 53 ----------------------
.../test/org/apache/sis/test/DependsOnMethod.java | 45 ------------------
.../org/apache/sis/util/ArgumentChecksTest.java | 2 -
.../org/apache/sis/util/CharSequencesTest.java | 15 ------
.../test/org/apache/sis/util/CharactersTest.java | 2 -
.../sis/util/DefaultInternationalStringTest.java | 2 -
.../test/org/apache/sis/util/LocalesTest.java | 4 --
.../test/org/apache/sis/util/VersionTest.java | 3 --
.../org/apache/sis/util/collection/CacheTest.java | 6 ---
.../sis/util/collection/CodeListSetTest.java | 7 ---
.../sis/util/collection/DefaultTreeTableTest.java | 2 -
.../apache/sis/util/collection/DerivedMapTest.java | 2 -
.../util/collection/FrequencySortedSetTest.java | 3 --
.../apache/sis/util/collection/RangeSetTest.java | 5 --
.../sis/util/collection/TreeTableFormatTest.java | 11 -----
.../apache/sis/util/collection/TreeTablesTest.java | 4 --
.../sis/util/collection/WeakHashSetTest.java | 5 --
.../sis/util/collection/WeakValueHashMapTest.java | 6 ---
.../apache/sis/util/internal/AbstractMapTest.java | 3 --
.../sis/util/internal/CheckedArrayListTest.java | 3 --
.../sis/util/internal/DefinitionURITest.java | 6 ---
.../apache/sis/util/internal/DoubleDoubleTest.java | 12 -----
.../sis/util/internal/StandardDateFormatTest.java | 4 --
.../org/apache/sis/util/internal/X364Test.java | 2 -
.../sis/util/logging/MonolineFormatterTest.java | 3 --
.../util/resources/IndexedResourceBundleTest.java | 9 ----
385 files changed, 2119 deletions(-)
diff --cc
endorsed/src/org.apache.sis.console/test/org/apache/sis/console/MetadataCommandTest.java
index 78984e0cde,9fe1d84362..6e7c064136
---
a/endorsed/src/org.apache.sis.console/test/org/apache/sis/console/MetadataCommandTest.java
+++
b/endorsed/src/org.apache.sis.console/test/org/apache/sis/console/MetadataCommandTest.java
@@@ -21,12 -21,10 +21,10 @@@ import java.net.URL
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
- import org.apache.sis.test.DependsOnMethod;
- import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.dataset.TestData;
+// Specific to the main branch:
+import org.junit.jupiter.api.Disabled;
/**
@@@ -73,10 -69,8 +70,9 @@@ public final class MetadataCommandTest
* @throws Exception if an error occurred while creating the command.
*/
@Test
+ @Disabled("Requires GeoAPI 3.1")
- @DependsOnMethod("testNetCDF")
public void testFormatXML() throws Exception {
- final URL url = TestData.NETCDF_2D_GEOGRAPHIC.location();
+ final URL url = new URL("Cube2D_geographic_packed.nc") ; //
TestData.NETCDF_2D_GEOGRAPHIC.location();
var test = new MetadataCommand(0, new String[] {CommandRunner.TEST,
url.toString(), "--format", "XML"});
test.run();
verifyNetCDF("<?xml", test.outputBuffer.toString());
diff --cc
endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridCoverage2DTest.java
index 7e29e524b5,606f467146..9e7f4b05df
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridCoverage2DTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridCoverage2DTest.java
@@@ -41,8 -41,8 +41,7 @@@ import org.apache.sis.referencing.opera
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.test.TestCase;
- import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.referencing.crs.HardCodedCRS;
-import static org.opengis.test.Assertions.assertSampleValuesEqual;
import static org.apache.sis.test.Assertions.assertMessageContains;
import static org.apache.sis.feature.Assertions.assertPixelsEqual;
diff --cc
endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridDerivationTest.java
index 9ca6aa7eb1,ff776e3060..1a1c24cd48
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridDerivationTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridDerivationTest.java
@@@ -44,9 -44,8 +44,7 @@@ import static org.apache.sis.coverage.g
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
-import static org.opengis.test.Assertions.assertBetween;
import org.apache.sis.test.TestCase;
- import org.apache.sis.test.DependsOn;
- import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.referencing.operation.HardCodedConversions;
import static org.apache.sis.referencing.Assertions.assertEnvelopeEquals;
diff --cc
endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/AbstractFeatureTest.java
index 1a6ac9725c,24ba610414..3a00544abf
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/AbstractFeatureTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/AbstractFeatureTest.java
@@@ -22,8 -22,13 +22,7 @@@ import java.util.Collection
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
- import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.AttributeType;
-import org.opengis.feature.FeatureType;
-import org.opengis.feature.Property;
-import org.opengis.feature.PropertyType;
-
/**
* Tests some default method implementations provided in {@link
AbstractFeature}.
diff --cc
endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/CharacteristicMapTest.java
index 584ffa51bb,2ff66c69ba..b6631487d4
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/CharacteristicMapTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/CharacteristicMapTest.java
@@@ -140,10 -140,9 +137,9 @@@ public final class CharacteristicMapTes
}
/**
- * Tests adding a characteristic indirectly with {@link
CharacteristicMap#addValue(Attribute)}.
+ * Tests adding a characteristic indirectly with {@code
CharacteristicMap.addValue(AbstractAttribute)}.
*/
@Test
- @DependsOnMethod("testPut")
public void testAddValue() {
final AbstractAttribute<?> temperature = temperature();
final AbstractAttribute<?> units = create(temperature, "units");
@@@ -196,9 -195,8 +192,8 @@@
* Tests adding a characteristic indirectly with {@link
CharacteristicMap#addKey(String)}.
*/
@Test
- @DependsOnMethod("testPut")
public void testAddKey() {
- final Attribute<?> units, accuracy;
+ final AbstractAttribute<?> units, accuracy;
final AbstractAttribute<?> temperature = temperature();
final var characteristics = temperature.characteristics();
final Collection<String> keys = characteristics.keySet();
diff --cc
endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeatureTestCase.java
index 1aaa8969f0,09b04194ea..5e5311b792
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeatureTestCase.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeatureTestCase.java
@@@ -286,10 -287,9 +282,9 @@@ public abstract class FeatureTestCase e
}
/**
- * Tests the possibility to plugin custom attributes via {@link
AbstractFeature#setProperty(Property)}.
+ * Tests the possibility to plugin custom attributes via {@code
AbstractFeature.setProperty(Property)}.
*/
@Test
- @DependsOnMethod({"testSimpleValues", "testSimpleProperties"})
public void testCustomAttribute() {
feature = createFeature(DefaultFeatureTypeTest.city());
final var wrong = SingletonAttributeTest.parliament();
diff --cc
endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeaturesTest.java
index d3b95a2379,7398ae805a..6b044c4b54
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeaturesTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeaturesTest.java
@@@ -20,9 -20,11 +20,8 @@@ package org.apache.sis.feature
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import static org.apache.sis.test.Assertions.assertMessageContains;
- import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.InvalidPropertyValueException;
-
/**
* Tests {@link Features}.
diff --cc
endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/StringJoinOperationTest.java
index c718940689,c838ff1076..cafd29cf48
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/StringJoinOperationTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/StringJoinOperationTest.java
@@@ -23,10 -23,11 +23,8 @@@ import org.apache.sis.feature.internal.
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import static org.apache.sis.test.Assertions.assertMessageContains;
- import org.apache.sis.test.DependsOnMethod;
- import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.InvalidPropertyValueException;
-
/**
* Tests {@link StringJoinOperation}.
diff --cc
endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/builder/AttributeTypeBuilderTest.java
index d3ce8bbc13,4ae3dc30c0..a74f237cd0
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/builder/AttributeTypeBuilderTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/builder/AttributeTypeBuilderTest.java
@@@ -29,13 -29,11 +29,11 @@@ import org.junit.jupiter.api.Test
import static org.junit.jupiter.api.Assertions.*;
import static org.apache.sis.test.Assertions.assertSetEquals;
import static org.apache.sis.test.Assertions.assertMessageContains;
- import org.apache.sis.test.DependsOnMethod;
- import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Attribute;
-import org.opengis.feature.AttributeType;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractAttribute;
+import org.apache.sis.feature.DefaultAttributeType;
/**
diff --cc
endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/builder/FeatureTypeBuilderTest.java
index 883d7b75c1,6332d83ac4..627bde51a0
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/builder/FeatureTypeBuilderTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/builder/FeatureTypeBuilderTest.java
@@@ -31,14 -31,13 +31,12 @@@ import static org.apache.sis.test.Asser
import org.apache.sis.feature.DefaultFeatureTypeTest;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestUtilities;
- import org.apache.sis.test.DependsOn;
- import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.referencing.crs.HardCodedCRS;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.AttributeType;
-import org.opengis.feature.FeatureType;
-import org.opengis.feature.IdentifiedType;
-import org.opengis.feature.Operation;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractIdentifiedType;
+import org.apache.sis.feature.DefaultAttributeType;
+import org.apache.sis.feature.DefaultFeatureType;
/**
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
index 95c3ca55f4,b6a95c64a3..b76c0b5be4
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
@@@ -238,10 -233,10 +234,9 @@@ public final class PropertyAccessorTes
/**
* Tests the constructor with a method which override another method with
covariant return type.
- * This test may need to be updated if a future GeoAPI release modifies
the {@link GeographicCRS}
- * interface or one of its parent interfaces.
+ * This test may need to be updated if a future GeoAPI release modifies
the {@link GeographicCRS} interface.
*/
@Test
- @DependsOnMethod("testConstructorWithInheritance")
public void testConstructorWithCovariantReturnType() {
final Class<?> type = GeographicCRS.class;
assertMappingEquals(new PropertyAccessor(type, type, type),
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/AllMetadataTest.java
index 290c89107e,6bccd4cb00..3e43d879e2
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/AllMetadataTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/AllMetadataTest.java
@@@ -26,10 -26,10 +26,9 @@@ import org.apache.sis.metadata.Property
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.apache.sis.test.LoggingWatcher;
- import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.annotation.Stereotype;
-import org.opengis.util.ControlledVocabulary;
+// Specific to the main branch:
+import org.opengis.util.CodeList;
/**
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultContactTest.java
index 71d1b6c4ad,1eb3c935fd..8458e8b500
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultContactTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultContactTest.java
@@@ -26,11 -26,10 +26,10 @@@ import org.apache.sis.xml.bind.Context
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
- import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.xml.test.TestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.citation.TelephoneType;
+// Specific to the main branch:
+import org.apache.sis.pending.geoapi.evolution.UnsupportedCodeList;
/**
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/identification/DefaultCoupledResourceTest.java
index 27f34207b6,9f5fe35485..a43a174bb9
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/identification/DefaultCoupledResourceTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/identification/DefaultCoupledResourceTest.java
@@@ -28,11 -28,11 +28,10 @@@ import org.apache.sis.util.iso.DefaultN
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.xml.bind.metadata.replace.ServiceParameterTest;
- import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.identification.OperationMetadata;
-import org.opengis.metadata.identification.DistributedComputingPlatform;
+// Specific to the main branch:
+import org.apache.sis.pending.geoapi.evolution.UnsupportedCodeList;
/**
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataWriterTest.java
index db7c262240,7ceadd2535..a9678f2be3
---
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
@@@ -31,11 -31,13 +31,10 @@@ import org.junit.jupiter.api.Test
import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestUtilities;
- import org.apache.sis.test.DependsOn;
import org.apache.sis.metadata.iso.citation.HardCodedCitations;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.citation.Contact;
-import org.opengis.metadata.citation.Party;
-import org.opengis.metadata.citation.Responsibility;
-import org.apache.sis.util.internal.URLs;
+// Specific to the main branch:
+import org.opengis.metadata.citation.ResponsibleParty;
/**
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java
index f28391bd03,63a8f05b11..0b594ea212
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java
@@@ -720,10 -707,9 +719,9 @@@ public abstract class AnnotationConsist
* This method does not check the method annotations, since it is {@link
#testMethodAnnotations()} job.
*/
@Test
- @DependsOnMethod("testInterfaceAnnotations")
public void testImplementationAnnotations() {
for (final Class<?> type : types) {
- if (ControlledVocabulary.class.isAssignableFrom(type)) {
+ if (CodeList.class.isAssignableFrom(type)) {
// Skip code lists, since they are not the purpose of this
test.
continue;
}
@@@ -772,10 -769,9 +770,9 @@@
* </ul>
*/
@Test
- @DependsOnMethod("testImplementationAnnotations")
public void testMethodAnnotations() {
for (final Class<?> type : types) {
- if (ControlledVocabulary.class.isAssignableFrom(type)) {
+ if (CodeList.class.isAssignableFrom(type)) {
// Skip code lists, since they are not the purpose of this
test.
continue;
}
diff --cc
endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/GeohashReferenceSystemTest.java
index 2f0537cb4d,fd49cdedaf..758af9a609
---
a/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/GeohashReferenceSystemTest.java
+++
b/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/GeohashReferenceSystemTest.java
@@@ -31,10 -31,12 +31,8 @@@ import org.apache.sis.measure.Units
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.test.TestUtilities;
- import org.apache.sis.test.DependsOnMethod;
- import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.gazetteer.Location;
-import org.opengis.referencing.gazetteer.LocationType;
-
/**
* Tests methods from the {@link GeohashReferenceSystem} class.
diff --cc
endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/LocationTypeTest.java
index 449c887ed0,8fa1657115..921b643dc4
---
a/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/LocationTypeTest.java
+++
b/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/LocationTypeTest.java
@@@ -184,9 -185,8 +182,8 @@@ public final class LocationTypeTest ext
* Tests the creation of an unmodifiable snapshot.
*/
@Test
- @DependsOnMethod("testInheritance")
public void testSnapshot() {
- verify(ModifiableLocationType.snapshot(null,
create(true)).toArray(LocationType[]::new));
+ verify(ModifiableLocationType.snapshot(null,
create(true)).toArray(AbstractLocationType[]::new));
}
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/MathTransformParserTest.java
index 7a30b4942f,b2c6a847ab..9a8d8b0bf7
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/MathTransformParserTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/MathTransformParserTest.java
@@@ -28,12 -28,10 +28,10 @@@ import org.apache.sis.measure.Units
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
- import org.apache.sis.test.DependsOnMethod;
- import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assertions.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/BuilderTest.java
index 038bb6cdee,e075067cac..2e19fc55fb
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/BuilderTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/BuilderTest.java
@@@ -33,13 -33,8 +33,11 @@@ import org.apache.sis.util.iso.DefaultN
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import static org.apache.sis.test.Assertions.assertMessageContains;
- import org.apache.sis.test.DependsOnMethod;
- import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
+
/**
* Tests {@link Builder}.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/GeodesicsOnEllipsoidTest.java
index 0396505a7b,6620b9b4ec..0ad15a2588
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/GeodesicsOnEllipsoidTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/GeodesicsOnEllipsoidTest.java
@@@ -44,13 -42,7 +42,12 @@@ import org.apache.sis.referencing.crs.H
* @author Matthieu Bastianelli (Geomatys)
* @author Martin Desruisseaux (Geomatys)
*/
- @DependsOn(GeodeticCalculatorTest.class)
public final class GeodesicsOnEllipsoidTest extends GeodeticCalculatorTest {
+ /**
+ * Tolerance threshold for comparison of floating point numbers.
+ */
+ private static final double STRICT = 0;
+
/**
* The {@link GeodesicsOnEllipsoid} instance to be tested.
* A specialized type is used for tracking locale variables.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/GeodeticCalculatorTest.java
index 7d959e30e1,3181a1bcb8..03ab8d4a55
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/GeodeticCalculatorTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/GeodeticCalculatorTest.java
@@@ -44,8 -43,8 +44,7 @@@ import static org.apache.sis.metadata.i
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
-import static org.opengis.test.Assertions.assertBetween;
import org.apache.sis.test.OptionalTestData;
- import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.widget.VisualCheck;
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/NamedIdentifierTest.java
index c79224bd07,93959a31cb..0934b00b00
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/NamedIdentifierTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/NamedIdentifierTest.java
@@@ -117,10 -116,9 +116,9 @@@ public final class NamedIdentifierTest
* Tests the {@link NamedIdentifier#NamedIdentifier(Citation,
CharSequence)} constructor.
*/
@Test
- @DependsOnMethod("testCreateFromCode")
public void testCreateFromInternationalString() {
final NamedIdentifier identifier = createI18N();
- Validators.validate((Identifier) identifier);
+ Validators.validate((ReferenceIdentifier) identifier);
Validators.validate((GenericName) identifier);
// ImmutableIdentifier properties
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultCylindricalCSTest.java
index 73ce3bfff5,8ae57535cf..a202ac3240
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultCylindricalCSTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultCylindricalCSTest.java
@@@ -26,10 -26,9 +26,9 @@@ import org.apache.sis.measure.Units
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.test.TestCase;
- import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assertions.assertAxisDirectionsEqual;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultPolarCSTest.java
index db1cf14676,76a66888a6..225fe74fd1
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultPolarCSTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultPolarCSTest.java
@@@ -26,10 -26,9 +26,9 @@@ import org.apache.sis.measure.Units
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.test.TestCase;
- import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assertions.assertAxisDirectionsEqual;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultSphericalCSTest.java
index abbb4723b4,4033e9230a..24dcf5e793
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultSphericalCSTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultSphericalCSTest.java
@@@ -24,10 -24,9 +24,9 @@@ import org.apache.sis.referencing.util.
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.test.TestCase;
- import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assertions.assertAxisDirectionsEqual;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java
index 936aa124dc,25874cbfce..9c38fe682c
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java
@@@ -42,12 -42,10 +42,10 @@@ import org.junit.jupiter.api.AfterAll
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
import static org.junit.jupiter.api.Assertions.*;
- import org.apache.sis.test.DependsOnMethod;
- import org.apache.sis.test.DependsOn;
import static
org.apache.sis.referencing.Assertions.assertEpsgNameAndIdentifierEqual;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/builder/LinearizerTest.java
index f594a21d5a,39575c0d70..7df80a4801
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/builder/LinearizerTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/builder/LinearizerTest.java
@@@ -26,13 -26,10 +26,12 @@@ import org.apache.sis.geometry.Envelope
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
-import org.opengis.test.Assertions;
import org.apache.sis.test.TestCase;
- import org.apache.sis.test.DependsOn;
import org.apache.sis.referencing.operation.HardCodedConversions;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
+
/**
* Tests {@link Linearizer}.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/builder/ResidualGridTest.java
index a5b0cf1ed7,856ab06626..3c1d996f6c
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/builder/ResidualGridTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/builder/ResidualGridTest.java
@@@ -24,11 -24,10 +24,10 @@@ import org.apache.sis.referencing.opera
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
- import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assertions.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/matrix/Matrix4Test.java
index 7068c3a733,e9a1bfe481..9a4aa87086
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/matrix/Matrix4Test.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/matrix/Matrix4Test.java
@@@ -22,10 -22,9 +22,9 @@@ import static org.apache.sis.referencin
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
- import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assertions.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java
index aad6d97eec,ec860e4e7c..65e725d50e
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java
@@@ -29,11 -29,10 +29,10 @@@ import org.junit.jupiter.api.Test
import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestUtilities;
- import org.apache.sis.test.DependsOnMethod;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assertions.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java
index 70123c09f7,bc37b792e6..5b280b79f5
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java
@@@ -23,11 -23,10 +23,10 @@@ import static java.lang.Double.NaN
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
- import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestUtilities;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assertions.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/AlbersEqualAreaTest.java
index 3b6d7e8ab9,6f3f404e4a..c8689ab106
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/AlbersEqualAreaTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/AlbersEqualAreaTest.java
@@@ -25,10 -25,11 +25,8 @@@ import org.apache.sis.referencing.util.
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
- import org.apache.sis.test.DependsOnMethod;
- import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestUtilities;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.ToleranceModifier;
-
/**
* Tests the {@link AlbersEqualArea} class. We test using various values of
standard parallels.
@@@ -159,8 -160,8 +155,7 @@@ public final class AlbersEqualAreaTest
* @throws TransformException if an error occurred while projecting a
point.
*/
@Test
- @DependsOnMethod("testEllipse")
public void compareWithPROJ() throws FactoryException, TransformException
{
- toleranceModifier = ToleranceModifier.PROJECTION;
tolerance = Formulas.LINEAR_TOLERANCE;
// Spherical case
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/CylindricalEqualAreaTest.java
index 086dbb3684,2c80530e59..24f3fa1ed4
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/CylindricalEqualAreaTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/CylindricalEqualAreaTest.java
@@@ -27,8 -27,10 +27,7 @@@ import org.apache.sis.referencing.opera
// Test dependencies
import org.junit.jupiter.api.Test;
- import org.apache.sis.test.DependsOnMethod;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.ToleranceModifier;
-
/**
* Tests the {@link CylindricalEqualArea} class.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java
index 5ebb0298cf,878b9748ec..e50a6e4c9e
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java
@@@ -189,9 -184,10 +185,8 @@@ public final class LambertConicConforma
*
* @throws FactoryException if an error occurred while creating the map
projection.
* @throws TransformException if an error occurred while projecting a
coordinate.
- *
- * @see
org.opengis.test.referencing.ParameterizedTransformTest#testLambertConicConformal1SP()
*/
@Test
- @DependsOnMethod({"testSpecialLatitudes", "testDerivative"})
public void testLambertConicConformal1SP() throws FactoryException,
TransformException {
createGeoApiTest(new
LambertConformal1SP()).testLambertConicConformal1SP();
}
@@@ -202,9 -198,10 +197,8 @@@
*
* @throws FactoryException if an error occurred while creating the map
projection.
* @throws TransformException if an error occurred while projecting a
coordinate.
- *
- * @see
org.opengis.test.referencing.ParameterizedTransformTest#testLambertConicConformal1SP()
*/
@Test
- @DependsOnMethod("testLambertConicConformal1SP")
public void testLambertConicConformal2SP() throws FactoryException,
TransformException {
createGeoApiTest(new
LambertConformal2SP()).testLambertConicConformal2SP();
}
@@@ -215,9 -212,10 +209,8 @@@
*
* @throws FactoryException if an error occurred while creating the map
projection.
* @throws TransformException if an error occurred while projecting a
coordinate.
- *
- * @see
org.opengis.test.referencing.ParameterizedTransformTest#testLambertConicConformal1SP()
*/
@Test
- @DependsOnMethod({"testLambertConicConformal2SP", "verifyBelgeConstant"})
public void testLambertConicConformalBelgium() throws FactoryException,
TransformException {
createGeoApiTest(new
LambertConformalBelgium()).testLambertConicConformalBelgium();
}
@@@ -228,11 -226,12 +221,10 @@@
*
* @throws FactoryException if an error occurred while creating the map
projection.
* @throws TransformException if an error occurred while projecting a
coordinate.
- *
- * @see
org.opengis.test.referencing.ParameterizedTransformTest#testLambertConicConformalMichigan()
*/
@Test
- @DependsOnMethod("testLambertConicConformal2SP")
public void testLambertConicConformalMichigan() throws FactoryException,
TransformException {
- createGeoApiTest(new
LambertConformalMichigan()).testLambertConicConformalMichigan();
+ assumeTrue(PENDING_NEXT_GEOAPI_RELEASE); // Test not available in
GeoAPI 3.0
}
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MercatorTest.java
index 8946798018,b209235f3e..d82c6b0283
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MercatorTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MercatorTest.java
@@@ -36,13 -36,11 +36,11 @@@ import static org.apache.sis.referencin
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
- import org.apache.sis.test.DependsOnMethod;
- import org.apache.sis.test.DependsOn;
-import static org.opengis.test.Assertions.assertBetween;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.apache.sis.referencing.operation.provider.MercatorSpherical;
-import org.apache.sis.referencing.operation.provider.RegionalMercator;
+// Specific to the main branch:
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import static org.apache.sis.test.GeoapiAssert.assertBetween;
+import static org.apache.sis.test.GeoapiAssert.PENDING_NEXT_GEOAPI_RELEASE;
/**
@@@ -191,9 -185,10 +185,8 @@@ public final class MercatorTest extend
*
* @throws FactoryException if an error occurred while creating the map
projection.
* @throws TransformException if an error occurred while projecting a
coordinate.
- *
- * @see
org.opengis.test.referencing.ParameterizedTransformTest#testMercator1SP()
*/
@Test
- @DependsOnMethod({"testSpecialLatitudes", "testDerivative"})
public void testMercator1SP() throws FactoryException, TransformException
{
createGeoApiTest(new Mercator1SP()).testMercator1SP();
}
@@@ -204,9 -199,10 +197,8 @@@
*
* @throws FactoryException if an error occurred while creating the map
projection.
* @throws TransformException if an error occurred while projecting a
coordinate.
- *
- * @see
org.opengis.test.referencing.ParameterizedTransformTest#testMercator2SP()
*/
@Test
- @DependsOnMethod("testMercator1SP")
public void testMercator2SP() throws FactoryException, TransformException
{
createGeoApiTest(new Mercator2SP()).testMercator2SP();
}
@@@ -217,11 -213,12 +209,10 @@@
*
* @throws FactoryException if an error occurred while creating the map
projection.
* @throws TransformException if an error occurred while projecting a
coordinate.
- *
- * @see
org.opengis.test.referencing.ParameterizedTransformTest#testMercatorVariantC()
*/
@Test
- @DependsOnMethod("testMercator2SP")
public void testRegionalMercator() throws FactoryException,
TransformException {
- createGeoApiTest(new RegionalMercator()).testMercatorVariantC();
+ assumeTrue(PENDING_NEXT_GEOAPI_RELEASE); // Test not available in
GeoAPI 3.0
}
/**
@@@ -230,11 -227,12 +221,10 @@@
*
* @throws FactoryException if an error occurred while creating the map
projection.
* @throws TransformException if an error occurred while projecting a
coordinate.
- *
- * @see
org.opengis.test.referencing.ParameterizedTransformTest#testMercatorSpherical()
*/
@Test
- @DependsOnMethod("testMercator1SP")
public void testMercatorSpherical() throws FactoryException,
TransformException {
- createGeoApiTest(new MercatorSpherical()).testMercatorSpherical();
+ assumeTrue(PENDING_NEXT_GEOAPI_RELEASE); // Test not available in
GeoAPI 3.0
}
/**
@@@ -243,9 -241,10 +233,8 @@@
*
* @throws FactoryException if an error occurred while creating the map
projection.
* @throws TransformException if an error occurred while projecting a
coordinate.
- *
- * @see
org.opengis.test.referencing.ParameterizedTransformTest#testPseudoMercator()
*/
@Test
- @DependsOnMethod("testMercatorSpherical")
public void testPseudoMercator() throws FactoryException,
TransformException {
createGeoApiTest(new PseudoMercator()).testPseudoMercator();
}
@@@ -256,9 -255,10 +245,8 @@@
*
* @throws FactoryException if an error occurred while creating the map
projection.
* @throws TransformException if an error occurred while projecting a
coordinate.
- *
- * @see
org.opengis.test.referencing.ParameterizedTransformTest#testMiller()
*/
@Test
- @DependsOnMethod("testMercator1SP")
public void testMiller() throws FactoryException, TransformException {
createGeoApiTest(new MillerCylindrical()).testMiller();
}
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/NormalizedProjectionTest.java
index 696a6982e5,dbac9c1bf9..ab91a3a431
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/NormalizedProjectionTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/NormalizedProjectionTest.java
@@@ -22,10 -22,9 +22,9 @@@ import static org.apache.sis.metadata.i
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
- import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.referencing.TransformTestCase;
+// Specific to the main branch:
+import org.apache.sis.referencing.operation.transform.TransformTestCase;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ObliqueMercatorTest.java
index cc6e755390,b74a70b6a6..517c8fadde
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ObliqueMercatorTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ObliqueMercatorTest.java
@@@ -26,16 -26,20 +26,14 @@@ import org.apache.sis.parameter.Paramet
// Test dependencies
import org.junit.jupiter.api.Test;
- import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.util.FactoryException;
-import
org.apache.sis.referencing.operation.transform.DefaultMathTransformFactory;
-import org.opengis.test.ToleranceModifier;
-
/**
* Tests the {@link ObliqueMercator} class.
*
* @author Martin Desruisseaux (Geomatys)
* @author Rémi Maréchal (Geomatys)
- * @author Emmanuel Giasson (Thales)
*/
- @DependsOn(MercatorTest.class)
public final class ObliqueMercatorTest extends MapProjectionTestCase {
/**
* Creates a new test case.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java
index 350b52ed62,2ec9a88148..ca0cf5c908
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java
@@@ -31,11 -31,9 +31,9 @@@ import org.apache.sis.measure.Units
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
- import org.apache.sis.test.DependsOnMethod;
- import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.apache.sis.referencing.operation.matrix.Matrix2;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/OrthographicTest.java
index 43d3766a62,3cbe5e56c1..2a658fd552
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/OrthographicTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/OrthographicTest.java
@@@ -24,8 -24,10 +24,7 @@@ import org.apache.sis.parameter.Paramet
// Test dependencies
import org.junit.jupiter.api.Test;
- import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.util.FactoryException;
-
/**
* Tests the {@link Orthographic} class.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java
index 34cb7c2be0,237780e04c..4da610417a
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java
@@@ -34,10 -34,11 +34,8 @@@ import static org.apache.sis.referencin
// Test dependencies
import org.junit.jupiter.api.Test;
import org.apache.sis.test.OptionalTestData;
- import org.apache.sis.test.DependsOnMethod;
- import org.apache.sis.test.DependsOn;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.CalculationType;
-
/**
* Tests the {@link TransverseMercator} class.
@@@ -125,11 -126,12 +122,10 @@@ public final class TransverseMercatorTe
*
* @throws FactoryException if an error occurred while creating the map
projection.
* @throws TransformException if an error occurred while projecting a
coordinate.
- *
- * @see
org.opengis.test.referencing.ParameterizedTransformTest#testTransverseMercatorSouthOrientated()
*/
@Test
- @DependsOnMethod("testTransverseMercator")
public void testTransverseMercatorSouthOrientated() throws
FactoryException, TransformException {
- createGeoApiTest(new
TransverseMercatorSouth()).testTransverseMercatorSouthOrientated();
+ new TransverseMercatorSouth(); // Test creation only, as GeoAPI 3.0
did not yet had the test method.
}
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/GeocentricTranslationTest.java
index d6d6153a0d,dc78da3bf8..7195df59db
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/GeocentricTranslationTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/GeocentricTranslationTest.java
@@@ -37,9 -37,12 +37,7 @@@ import org.apache.sis.referencing.opera
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
- import org.apache.sis.test.DependsOnMethod;
- import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import java.util.Arrays;
-import org.opengis.test.ToleranceModifier;
-import org.apache.sis.referencing.datum.HardCodedDatum;
-
/**
* Tests {@link GeocentricTranslation} and {@link GeocentricTranslation3D}.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/Geographic3Dto2DTest.java
index 42880d4f3d,30b196a252..32b16f1c77
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/Geographic3Dto2DTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/Geographic3Dto2DTest.java
@@@ -27,11 -27,10 +27,10 @@@ import org.apache.sis.parameter.Paramet
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
- import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assertions.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/NTv2Test.java
index 19684ebb1b,33798e6b2c..6bfa7d6c42
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/NTv2Test.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/NTv2Test.java
@@@ -44,11 -44,10 +44,10 @@@ import org.apache.sis.system.DataDirect
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
import static org.junit.jupiter.api.Assertions.*;
- import org.apache.sis.test.DependsOn;
import org.apache.sis.referencing.operation.gridded.LoadedGridTest;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assertions.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
@@@ -57,9 -56,9 +56,8 @@@
*
* @author Martin Desruisseaux (Geomatys)
*
- * @see GeocentricTranslationTest#testFranceGeocentricInterpolationPoint()
* @see
org.apache.sis.referencing.operation.transform.MolodenskyTransformTest#testFranceGeocentricInterpolationPoint()
*/
- @DependsOn(LoadedGridTest.class)
public final class NTv2Test extends DatumShiftTestCase {
/**
* Name of the file containing a small extract of the "{@code
NTF_R93.gsb}" file.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/ProvidersTest.java
index 039e769ebf,e6f7db5aef..5bd1bd577b
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/ProvidersTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/ProvidersTest.java
@@@ -30,12 -30,8 +30,11 @@@ import org.opengis.referencing.operatio
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import static org.apache.sis.test.Assertions.assertMessageContains;
- import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
+// Specific to the main branch:
+import org.apache.sis.parameter.DefaultParameterDescriptor;
+
/**
* Tests some consistency rules of all providers defined in this package.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/CartesianToPolarTest.java
index 5a9f638ebd,d3b419421d..7ce69ba874
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/CartesianToPolarTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/CartesianToPolarTest.java
@@@ -21,10 -21,11 +21,8 @@@ import org.opengis.referencing.operatio
// Test dependencies
import org.junit.jupiter.api.Test;
- import org.apache.sis.test.DependsOn;
- import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestUtilities;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.referencing.TransformTestCase;
-
/**
* Tests {@link CartesianToPolar}.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/CartesianToSphericalTest.java
index b8beb9f171,968ccbe47b..ca8e24cb56
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/CartesianToSphericalTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/CartesianToSphericalTest.java
@@@ -25,10 -25,11 +25,8 @@@ import org.opengis.referencing.operatio
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.BeforeEach;
import static org.junit.jupiter.api.Assertions.*;
- import org.apache.sis.test.DependsOn;
- import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestUtilities;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.referencing.TransformTestCase;
-
/**
* Tests {@link CartesianToSpherical}.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ConcatenatedTransformTest.java
index d764e3dc45,7fc59df7fa..4f7c38dfa8
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ConcatenatedTransformTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ConcatenatedTransformTest.java
@@@ -30,10 -30,9 +30,9 @@@ import org.apache.sis.referencing.opera
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import static org.apache.sis.test.TestCase.STRICT;
- import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.Assertions;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ContextualParametersTest.java
index 582358b432,6e9a8ab4d8..bd3f7b3006
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ContextualParametersTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ContextualParametersTest.java
@@@ -31,12 -31,10 +31,10 @@@ import org.junit.jupiter.api.Test
import static org.junit.jupiter.api.Assertions.*;
import static org.apache.sis.test.Assertions.assertMessageContains;
import org.apache.sis.parameter.DefaultParameterDescriptorGroupTest;
- import org.apache.sis.test.DependsOnMethod;
- import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assertions.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java
index 35ab061ba9,210ca7fdc8..a6980ad829
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java
@@@ -34,10 -34,11 +34,8 @@@ import org.apache.sis.measure.Units
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import
org.apache.sis.referencing.operation.provider.GeocentricTranslationTest;
- import org.apache.sis.test.DependsOnMethod;
- import org.apache.sis.test.DependsOn;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.ToleranceModifier;
-
/**
* Tests {@link EllipsoidToCentricTransform}.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ExponentialTransform1DTest.java
index d0b2138afe,688a13c927..9957d3e631
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ExponentialTransform1DTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ExponentialTransform1DTest.java
@@@ -23,10 -23,14 +23,8 @@@ import org.opengis.referencing.operatio
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
- import org.apache.sis.test.DependsOn;
- import org.apache.sis.test.DependsOnMethod;
import static org.apache.sis.referencing.Assertions.assertIsNotIdentity;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import java.util.EnumSet;
-import org.opengis.test.CalculationType;
-import org.opengis.test.ToleranceModifier;
-import org.opengis.test.ToleranceModifiers;
-
/**
* Tests the {@link ExponentialTransform1D} class. Note that this is closely
related to
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/LinearInterpolator1DTest.java
index 52fd8878bb,ea60d7654b..6c2396d89c
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/LinearInterpolator1DTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/LinearInterpolator1DTest.java
@@@ -25,8 -25,10 +25,7 @@@ import org.opengis.referencing.operatio
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import static org.apache.sis.test.Assertions.assertMessageContains;
- import org.apache.sis.test.DependsOnMethod;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.referencing.TransformTestCase;
-
/**
* Test {@link LinearInterpolator1D} class.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/LinearTransformTest.java
index 417df9936b,207cca0e1e..870434f381
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/LinearTransformTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/LinearTransformTest.java
@@@ -25,11 -25,7 +25,10 @@@ import org.apache.sis.referencing.util.
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
- import org.apache.sis.test.DependsOn;
+// Specific to the main branch:
+import org.junit.jupiter.api.Disabled;
+
/**
* Tests various implementation of the {@link LinearTransform} interface by
inheriting the tests defined
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/LogarithmicTransform1DTest.java
index a8d0b036ea,8e9731c9dc..ffae3b768a
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/LogarithmicTransform1DTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/LogarithmicTransform1DTest.java
@@@ -23,10 -23,11 +23,8 @@@ import org.opengis.referencing.operatio
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
- import org.apache.sis.test.DependsOn;
- import org.apache.sis.test.DependsOnMethod;
import static org.apache.sis.referencing.Assertions.assertIsNotIdentity;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.ToleranceModifier;
-
/**
* Tests the {@link LogarithmicTransform1D} class. Note that this is closely
related to
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformsTest.java
index 7bf4418b1e,01af411c2d..c4644fb167
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformsTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformsTest.java
@@@ -33,12 -33,10 +33,10 @@@ import org.apache.sis.geometry.GeneralD
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import static org.apache.sis.test.TestCase.STRICT;
- import org.apache.sis.test.DependsOnMethod;
- import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assertions.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
index 452d53f1ff,e75524793d..d2bbba743e
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
@@@ -187,9 -249,10 +177,8 @@@ public final class MolodenskyTransformT
*
* @throws FactoryException if an error occurred while creating the
transform.
* @throws TransformException if transformation of a point failed.
- *
- * @see GeocentricTranslationTest#testFranceGeocentricInterpolationPoint()
*/
@Test
- @DependsOnMethod("testMolodensky")
public void testFranceGeocentricInterpolationPoint() throws
FactoryException, TransformException {
transform = MolodenskyTransform.createGeodeticTransformation(
DefaultMathTransformFactory.provider(),
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/PassThroughTransformTest.java
index e030710198,d6d365ec92..6af766cdab
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/PassThroughTransformTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/PassThroughTransformTest.java
@@@ -33,11 -33,11 +33,10 @@@ import org.apache.sis.util.ArraysExt
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.test.TestUtilities;
- import org.apache.sis.test.DependsOn;
import static org.apache.sis.test.Assertions.assertMessageContains;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.CalculationType;
-import org.opengis.test.ToleranceModifier;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/PolarToCartesianTest.java
index 699d5f011d,17475c5ae9..f4aab79c24
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/PolarToCartesianTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/PolarToCartesianTest.java
@@@ -22,9 -22,11 +22,8 @@@ import org.opengis.referencing.operatio
// Test dependencies
import org.junit.jupiter.api.Test;
- import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestUtilities;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.referencing.TransformTestCase;
-
/**
* Tests {@link PolarToCartesian}.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java
index fd3e72026d,5018977a3b..7a9a4a2e4b
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java
@@@ -37,14 -36,12 +37,13 @@@ import org.apache.sis.math.Fraction
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.opengis.test.Validators;
- import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+// Specific to the main branch:
+import org.junit.jupiter.api.Disabled;
import static org.junit.jupiter.api.Assertions.*;
import static org.apache.sis.test.TestCase.STRICT;
-import org.opengis.test.Assertions;
-import org.opengis.test.referencing.AffineTransformTest;
+import org.opengis.test.referencing.TransformTestCase;
+import org.apache.sis.test.GeoapiAssert;
/**
@@@ -55,19 -52,7 +54,18 @@@
*
* @author Martin Desruisseaux (Geomatys)
*/
-public class ProjectiveTransformTest extends AffineTransformTest {
+@SuppressWarnings("doclint:missing")
- @DependsOn({AbstractMathTransformTest.class, ScaleTransformTest.class})
+public class ProjectiveTransformTest extends TransformTestCase {
+ /**
+ * The factory to use for creating linear transforms.
+ */
+ private final MathTransformFactory mtFactory;
+
+ /**
+ * The matrix for the tested transform.
+ */
+ private Matrix matrix;
+
/**
* A math transform factory which delegates instantiations to the
enclosing test class.
* This is a workaround for RFE #4093999 ("Relax constraint on placement
of this()/super()
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java
index 5284c18775,14dfaf4fdd..9278bc3462
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java
@@@ -26,11 -26,9 +26,9 @@@ import org.apache.sis.util.internal.Dou
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import static org.apache.sis.test.TestCase.STRICT;
- import org.apache.sis.test.DependsOnMethod;
- import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.Assertions;
+// Specific to the main branch:
+import org.apache.sis.test.GeoapiAssert;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/SphericalToCartesianTest.java
index b6e3d9e57e,72bdb59ec1..6e27cb8a62
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/SphericalToCartesianTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/SphericalToCartesianTest.java
@@@ -26,9 -26,11 +26,8 @@@ import org.opengis.referencing.operatio
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.BeforeEach;
import static org.junit.jupiter.api.Assertions.*;
- import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestUtilities;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.referencing.TransformTestCase;
-
/**
* Tests {@link SphericalToCartesian}.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TransferFunctionTest.java
index 836e2c8419,d99bb74db6..bfd325617c
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TransferFunctionTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TransferFunctionTest.java
@@@ -26,12 -26,10 +26,10 @@@ import org.apache.sis.referencing.opera
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
- import org.apache.sis.test.DependsOnMethod;
- import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assertions.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TranslationTransformTest.java
index 5ad569505e,7bce0074b0..1a0ba0d583
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TranslationTransformTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TranslationTransformTest.java
@@@ -27,11 -27,9 +27,9 @@@ import org.apache.sis.util.internal.Dou
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import static org.apache.sis.test.TestCase.STRICT;
- import org.apache.sis.test.DependsOnMethod;
- import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.Assertions;
+// Specific to the main branch:
+import org.apache.sis.test.GeoapiAssert;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CodeTest.java
index 446a158cdf,1527638bbb..03a760d8f2
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CodeTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CodeTest.java
@@@ -27,11 -27,10 +27,10 @@@ import org.apache.sis.metadata.iso.cita
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
- import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
/**
diff --cc
endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/MetadataReaderTest.java
index a5fd1523d7,5efd013397..fa9e7303c1
---
a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/MetadataReaderTest.java
+++
b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/MetadataReaderTest.java
@@@ -36,12 -36,11 +36,11 @@@ import org.apache.sis.storage.netcdf.ba
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.storage.netcdf.classic.ChannelDecoderTest;
- import org.apache.sis.test.DependsOn;
import static org.apache.sis.test.TestUtilities.date;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.dataset.ContentVerifier;
-import org.opengis.test.dataset.TestData;
+// Specific to the main branch:
+import org.apache.sis.storage.netcdf.base.TestData;
+import org.apache.sis.test.ContentVerifier;
/**
diff --cc
endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java
index 3445dc7ee3,3a396c4ffb..dc5d086ee1
---
a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java
+++
b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java
@@@ -31,11 -31,9 +31,9 @@@ import org.apache.sis.util.Version
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
- import org.apache.sis.storage.netcdf.classic.ChannelDecoderTest;
- import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.dataset.TestData;
+// Specific to the main branch:
+import org.apache.sis.storage.netcdf.base.TestData;
/**
diff --cc
endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/NetcdfStoreTest.java
index d4681c7e89,aa9c5ac188..19e5adc7b1
---
a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/NetcdfStoreTest.java
+++
b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/NetcdfStoreTest.java
@@@ -25,10 -25,9 +25,9 @@@ import org.apache.sis.util.Version
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.test.TestCase;
- import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.dataset.TestData;
+// Specific to the main branch:
+import org.apache.sis.storage.netcdf.base.TestData;
/**
diff --cc
endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/GridTest.java
index 5e3bd001c5,b1b24b749e..338c887de7
---
a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/GridTest.java
+++
b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/GridTest.java
@@@ -24,10 -24,11 +24,8 @@@ import org.apache.sis.storage.DataStore
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
- import org.apache.sis.test.DependsOn;
- import org.apache.sis.test.DependsOnMethod;
import static org.apache.sis.test.TestUtilities.getSingleton;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.dataset.TestData;
-
/**
* Tests the {@link Grid} implementation. The default implementation tests
diff --cc
endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/VariableTest.java
index a1416567d1,f7250df4e0..aedc9a827f
---
a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/VariableTest.java
+++
b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/VariableTest.java
@@@ -29,8 -29,10 +29,7 @@@ import org.apache.sis.measure.Units
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
- import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.dataset.TestData;
-
/**
* Tests the {@link Variable} implementation. The default implementation tests
diff --cc
endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/classic/ChannelDecoderTest.java
index 2da24b3206,0dca72466d..779cd13a34
---
a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/classic/ChannelDecoderTest.java
+++
b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/classic/ChannelDecoderTest.java
@@@ -27,10 -27,9 +27,9 @@@ import org.apache.sis.setup.GeometryLib
// Test dependencies
import org.apache.sis.storage.netcdf.base.DecoderTest;
- import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.dataset.TestData;
+// Specific to the main branch:
+import org.apache.sis.storage.netcdf.base.TestData;
/**
diff --cc
endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/classic/GridInfoTest.java
index 724c0a37d3,28783926fd..2ca041d7bf
---
a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/classic/GridInfoTest.java
+++
b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/classic/GridInfoTest.java
@@@ -24,10 -24,9 +24,9 @@@ import org.apache.sis.util.ArraysExt
// Test dependencies
import org.apache.sis.storage.netcdf.base.GridTest;
- import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.dataset.TestData;
+// Specific to the main branch:
+import org.apache.sis.storage.netcdf.base.TestData;
/**
diff --cc
endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/classic/VariableInfoTest.java
index ba692f7d16,bed3b348f2..7f11bc067a
---
a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/classic/VariableInfoTest.java
+++
b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/classic/VariableInfoTest.java
@@@ -22,10 -22,9 +22,9 @@@ import org.apache.sis.storage.netcdf.ba
// Test dependencies
import org.apache.sis.storage.netcdf.base.VariableTest;
- import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.dataset.TestData;
+// Specific to the main branch:
+import org.apache.sis.storage.netcdf.base.TestData;
/**
diff --cc
endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/MetadataTest.java
index b037676822,6ea920a8da..217f8c426e
---
a/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/MetadataTest.java
+++
b/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/MetadataTest.java
@@@ -68,12 -62,6 +65,11 @@@ public final class MetadataTest extend
* @throws URISyntaxException if a {@link Link} element is constructed
with an invalid URI.
*/
@Test
- @DependsOnMethod("testEqualsAndHashCode")
+ @Disabled("Can not execute this test on this branch because it depends on
Citation.getOnlineResources() "
+ + "and Identification.getExtents() methods, which are not present
in GeoAPI 3.0 interfaces. "
+ + "Despite this test failure, the copy constructor should
nevertheless works in practice "
+ + "if the Citation and Identification objects are instances of
DefaultCitation or AbstractExtent "
+ + "(the SIS implementations of GeoAPI interfaces).")
public void testCopyConstructor() throws URISyntaxException {
final Metadata md1 = create();
final Metadata md2 = new Metadata(md1, null);
diff --cc
endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/ReaderTest.java
index ed573e044f,3886890ddf..2710976ac4
---
a/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/ReaderTest.java
+++
b/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/ReaderTest.java
@@@ -616,17 -605,16 +605,16 @@@ public final class ReaderTest extends T
* @throws DataStoreException if reader failed to be created or failed at
reading.
*/
@Test
- @DependsOnMethod("testSequentialReads")
public void testConcurrentReads() throws DataStoreException {
try (Store reader = createFromURL()) {
- final Stream<Feature> f1 = reader.features(false);
- final Iterator<Feature> i1 = f1.iterator();
+ final Stream<AbstractFeature> f1 = reader.features(false);
+ final Iterator<AbstractFeature> i1 = f1.iterator();
verifyRoute(i1.next(), true, 3);
- final Stream<Feature> f2 = reader.features(false);
- final Iterator<Feature> i2 = f2.iterator();
+ final Stream<AbstractFeature> f2 = reader.features(false);
+ final Iterator<AbstractFeature> i2 = f2.iterator();
verifyEmpty(i1.next(), "rtept");
- final Stream<Feature> f3 = reader.features(false);
- final Iterator<Feature> i3 = f3.iterator();
+ final Stream<AbstractFeature> f3 = reader.features(false);
+ final Iterator<AbstractFeature> i3 = f3.iterator();
verifyRoute(i2.next(), true, 3);
verifyRoute(i3.next(), true, 3);
verifyEmpty(i3.next(), "rtept");
diff --cc
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/aggregate/JoinFeatureSetTest.java
index e5fc69c5b4,63eb160aba..cf6adcd1ac
---
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/aggregate/JoinFeatureSetTest.java
+++
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/aggregate/JoinFeatureSetTest.java
@@@ -32,15 -32,14 +32,14 @@@ import org.apache.sis.storage.base.Memo
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
- import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
-import org.opengis.feature.FeatureType;
-import org.opengis.filter.FilterFactory;
-import org.opengis.filter.BinaryComparisonOperator;
-import org.opengis.filter.MatchAction;
+// Specific to the main branch:
+import org.apache.sis.filter.Filter;
+import org.apache.sis.feature.AbstractAttribute;
+import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.feature.DefaultFeatureType;
+import org.apache.sis.pending.geoapi.filter.BinaryComparisonOperator;
/**
diff --cc
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/wkt/StoreTest.java
index f6c05e4ae8,12b30d1532..1aa052760d
---
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/wkt/StoreTest.java
+++
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/wkt/StoreTest.java
@@@ -29,11 -29,10 +29,10 @@@ import org.apache.sis.storage.DataStore
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.test.TestUtilities;
- import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assertions.assertAxisDirectionsEqual;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual;
/**
diff --cc
endorsed/src/org.apache.sis.util/test/org/apache/sis/util/resources/IndexedResourceBundleTest.java
index 78218ba25d,e9a8daa265..c0586ca119
---
a/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/resources/IndexedResourceBundleTest.java
+++
b/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/resources/IndexedResourceBundleTest.java
@@@ -164,9 -158,9 +158,8 @@@ public final class IndexedResourceBundl
/**
* Tests the {@link IndexedResourceBundle#getString(short, Object)}
method with a {@code CodeList} argument.
- * The intent is to test the code list localization.
*/
@Test
- @DependsOnMethod("testGetStringWithParameter")
public void testGetStringWithCodeList() {
testing = Errors.forLocale(Locale.ENGLISH);
assertEquals("Argument ‘Series’ shall not be null.",
testing.getString(Errors.Keys.NullArgument_1, ScopeCode.SERIES));
