This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sis.git
commit 7cb56fed2ea1afd2f0f0e05c349347a3cfbe778d Merge: b98a31fa9b 4b35a0fd74 Author: Martin Desruisseaux <[email protected]> AuthorDate: Mon May 8 19:14:21 2023 +0200 Merge branch 'geoapi-3.1'. .../apache/sis/test/suite/ConsoleTestSuite.java | 49 ---- .../org/apache/sis/test/suite/package-info.txt | 3 - .../sis/test/suite/ApplicationTestSuite.java | 44 --- .../org/apache/sis/test/suite/package-info.txt | 3 - .../apache/sis/test/suite/OpenOfficeTestSuite.java | 45 ---- .../org/apache/sis/test/suite/package-info.txt | 3 - .../org/apache/sis/test/suite/AWSTestSuite.java | 41 --- .../org/apache/sis/test/suite/package-info.txt | 3 - .../apache/sis/coverage/SampleRangeFormatTest.java | 2 +- .../coverage/grid/BufferedGridCoverageTest.java | 2 +- .../coverage/grid/ConvertedGridCoverageTest.java | 4 +- .../coverage/grid/DimensionalityReductionTest.java | 3 +- .../sis/coverage/grid/GridCoverage2DTest.java | 6 +- .../sis/coverage/grid/GridDerivationTest.java | 5 +- .../apache/sis/coverage/grid/GridExtentTest.java | 7 +- .../apache/sis/coverage/grid/GridGeometryTest.java | 4 +- .../sis/coverage/grid/PixelTranslationTest.java | 3 +- .../coverage/grid/ResampledGridCoverageTest.java | 7 +- .../sis/coverage/grid/ReshapedImageTest.java | 2 +- .../apache/sis/feature/AbstractFeatureTest.java | 2 +- .../apache/sis/feature/AbstractOperationTest.java | 3 +- .../FeatureAssert.java => feature/Assertions.java} | 9 +- .../apache/sis/feature/CharacteristicMapTest.java | 3 +- .../sis/feature/CharacteristicTypeMapTest.java | 3 +- .../sis/feature/DefaultAssociationRoleTest.java | 3 +- .../sis/feature/DefaultAttributeTypeTest.java | 4 +- .../apache/sis/feature/DefaultFeatureTypeTest.java | 3 +- .../apache/sis/feature/EnvelopeOperationTest.java | 4 +- .../org/apache/sis/feature/FeatureFormatTest.java | 2 +- .../apache/sis/feature/FeatureOperationsTest.java | 5 +- .../org/apache/sis/feature/FeatureTestCase.java | 4 +- .../sis/feature/MultiValuedAttributeTest.java | 3 +- .../sis/feature/SingletonAssociationTest.java | 3 +- .../apache/sis/feature/SingletonAttributeTest.java | 3 +- .../feature/builder/AttributeTypeBuilderTest.java | 4 +- .../builder/CharacteristicTypeBuilderTest.java | 3 +- .../apache/sis/filter/ArithmeticFunctionTest.java | 3 +- .../sis/filter/BinarySpatialFilterTestCase.java | 2 +- .../apache/sis/filter/ComparisonFilterTest.java | 4 +- .../apache/sis/filter/IdentifierFilterTest.java | 3 +- .../org/apache/sis/filter/LeafExpressionTest.java | 3 +- .../org/apache/sis/filter/LogicalFilterTest.java | 4 +- .../org/apache/sis/filter/TemporalFilterTest.java | 4 +- .../org/apache/sis/image/BandSelectImageTest.java | 4 +- .../sis/image/BandedSampleConverterTest.java | 2 +- .../org/apache/sis/image/ComputedImageTest.java | 2 +- .../org/apache/sis/image/ImageCombinerTest.java | 3 +- .../java/org/apache/sis/image/MaskedImageTest.java | 3 +- .../java/org/apache/sis/image/PlanarImageTest.java | 2 +- .../org/apache/sis/index/tree/PointTreeTest.java | 2 +- .../sis/internal/feature/j2d/FlatShapeTest.java | 2 +- .../internal/filter/sqlmm/RegistryTestCase.java | 3 +- .../test/java/org/apache/sis/test/package-info.txt | 3 - .../apache/sis/test/suite/FeatureTestSuite.java | 143 ---------- .../org/apache/sis/test/suite/package-info.txt | 3 - .../internal/jaxb/IdentifierMapAdapterTest.java | 3 +- .../internal/jaxb/ModifiableIdentifierMapTest.java | 2 +- .../internal/jaxb/cat/CodeListMarshallingTest.java | 3 +- .../sis/internal/jaxb/cat/EnumAdapterTest.java | 2 +- .../sis/internal/jaxb/cat/EnumMarshallingTest.java | 4 +- .../sis/internal/jaxb/gml/TimePeriodTest.java | 3 +- .../internal/jaxb/lan/FreeTextMarshallingTest.java | 3 +- .../sis/internal/jaxb/lan/LanguageCodeTest.java | 3 +- .../sis/internal/jaxb/lan/PT_LocaleTest.java | 2 +- .../metadata/replace/QualityParameterTest.java | 3 +- .../metadata/replace/ServiceParameterTest.java | 3 +- .../apache/sis/internal/metadata/MergerTest.java | 3 +- .../Assertions.java} | 17 +- .../apache/sis/metadata/MetadataStandardTest.java | 3 +- .../sis/metadata/ModifiableMetadataTest.java | 4 +- .../apache/sis/metadata/PropertyAccessorTest.java | 4 +- .../sis/metadata/PropertyInformationTest.java | 5 +- .../org/apache/sis/metadata/SpecialCasesTest.java | 3 +- .../java/org/apache/sis/metadata/TreeNodeTest.java | 3 +- .../apache/sis/metadata/TreeTableFormatTest.java | 2 +- .../org/apache/sis/metadata/TreeTableViewTest.java | 3 +- .../sis/metadata/iso/DefaultIdentifierTest.java | 4 +- .../sis/metadata/iso/DefaultMetadataTest.java | 3 +- .../sis/metadata/iso/citation/CitationsTest.java | 4 +- .../metadata/iso/citation/DefaultCitationTest.java | 3 +- .../iso/citation/DefaultResponsibilityTest.java | 2 +- .../constraint/DefaultLegalConstraintsTest.java | 3 +- .../sis/metadata/iso/content/DefaultBandTest.java | 3 +- .../sis/metadata/iso/extent/DefaultExtentTest.java | 3 +- .../extent/DefaultGeographicBoundingBoxTest.java | 3 +- .../identification/DefaultBrowseGraphicTest.java | 3 +- .../DefaultDataIdentificationTest.java | 4 +- .../DefaultRepresentativeFractionTest.java | 3 +- .../iso/identification/DefaultResolutionTest.java | 3 +- .../DefaultServiceIdentificationTest.java | 3 +- .../metadata/iso/lineage/DefaultLineageTest.java | 3 +- .../maintenance/DefaultScopeDescriptionTest.java | 2 +- .../iso/quality/DefaultEvaluationMethodTest.java | 3 +- .../sis/metadata/iso/quality/ScopeCodeTest.java | 3 +- .../iso/spatial/DefaultGeorectifiedTest.java | 2 +- .../test/java/org/apache/sis/test/package-info.txt | 3 - .../apache/sis/test/suite/MetadataTestSuite.java | 154 ----------- .../org/apache/sis/test/suite/package-info.txt | 3 - .../java/org/apache/sis/test/xml/TestCase.java | 4 +- .../apache/sis/util/iso/DefaultLocalNameTest.java | 5 +- .../org/apache/sis/util/iso/DefaultRecordTest.java | 4 +- .../apache/sis/util/iso/DefaultRecordTypeTest.java | 3 +- .../apache/sis/util/iso/DefaultScopedNameTest.java | 11 +- .../apache/sis/util/iso/NameMarshallingTest.java | 3 +- .../java/org/apache/sis/util/iso/TypesTest.java | 4 +- .../sis/xml/CharSequenceSubstitutionTest.java | 4 +- .../apache/sis/xml/NilReasonMarshallingTest.java | 5 +- .../java/org/apache/sis/xml/NilReasonTest.java | 3 +- .../apache/sis/xml/TransformingNamespacesTest.java | 3 +- .../org/apache/sis/xml/UUIDMarshallingTest.java | 5 +- .../org/apache/sis/xml/XLinkMarshallingTest.java | 4 +- .../gazetteer/GazetteerFactoryTest.java | 3 +- .../referencing/gazetteer/LocationFormatTest.java | 2 +- .../referencing/gazetteer/LocationTypeTest.java | 4 +- .../gazetteer/ReferencingByIdentifiersTest.java | 3 +- .../suite/ReferencingByIdentifiersTestSuite.java | 49 ---- .../org/apache/sis/test/suite/package-info.txt | 3 - .../sis/geometry/AbstractDirectPositionTest.java | 2 +- .../apache/sis/geometry/AbstractEnvelopeTest.java | 9 +- .../org/apache/sis/geometry/ArrayEnvelopeTest.java | 3 +- .../apache/sis/geometry/DirectPosition1DTest.java | 5 +- .../apache/sis/geometry/DirectPosition2DTest.java | 5 +- .../org/apache/sis/geometry/Envelope2DTest.java | 5 +- .../apache/sis/geometry/EnvelopeReducerTest.java | 2 +- .../org/apache/sis/geometry/EnvelopesTest.java | 4 +- .../sis/geometry/GeneralDirectPositionTest.java | 5 +- .../apache/sis/geometry/GeneralEnvelopeTest.java | 9 +- .../apache/sis/geometry/ImmutableEnvelopeTest.java | 5 +- .../java/org/apache/sis/geometry/Shapes2DTest.java | 2 +- .../org/apache/sis/geometry/TransformTestCase.java | 2 +- .../sis/geometry/WraparoundAdjustmentTest.java | 3 +- .../referencing/SecondDefiningParameterTest.java | 3 +- .../referencing/EllipsoidalHeightCombinerTest.java | 6 +- .../referencing/GeodeticObjectBuilderTest.java | 2 +- .../referencing/ServicesForMetadataTest.java | 3 +- .../referencing/WraparoundApplicatorTest.java | 2 +- .../internal/referencing/provider/AffineTest.java | 3 +- .../referencing/provider/Geographic3Dto2DTest.java | 4 +- .../provider/LongitudeRotationTest.java | 4 +- .../referencing/provider/MapProjectionTest.java | 4 +- .../internal/referencing/provider/NADCONTest.java | 4 +- .../internal/referencing/provider/NTv2Test.java | 4 +- .../java/org/apache/sis/io/wkt/ColorsTest.java | 3 +- .../org/apache/sis/io/wkt/ComparisonWithEPSG.java | 2 +- .../java/org/apache/sis/io/wkt/FormatterTest.java | 3 +- .../sis/io/wkt/GeodeticObjectParserTest.java | 6 +- .../apache/sis/io/wkt/MathTransformParserTest.java | 3 +- .../java/org/apache/sis/io/wkt/SymbolsTest.java | 3 +- .../org/apache/sis/io/wkt/WKTDictionaryTest.java | 4 +- .../java/org/apache/sis/io/wkt/WKTFormatTest.java | 4 +- .../java/org/apache/sis/io/wkt/package-info.txt | 7 - .../DefaultParameterDescriptorGroupTest.java | 6 +- .../parameter/DefaultParameterDescriptorTest.java | 5 +- .../parameter/DefaultParameterValueGroupTest.java | 6 +- .../sis/parameter/DefaultParameterValueTest.java | 6 +- .../parameter/MatrixParametersAlphaNumTest.java | 2 +- .../apache/sis/parameter/MatrixParametersTest.java | 3 +- .../apache/sis/parameter/ParameterFormatTest.java | 3 +- .../sis/parameter/ParameterMarshallingTest.java | 6 +- .../apache/sis/parameter/TensorParametersTest.java | 5 +- .../org/apache/sis/parameter/TensorValuesTest.java | 4 +- .../referencing/AbstractIdentifiedObjectTest.java | 3 +- .../referencing/AbstractReferenceSystemTest.java | 5 +- .../Assertions.java} | 17 +- .../sis/referencing/AuthorityFactoriesTest.java | 3 +- .../java/org/apache/sis/referencing/CRSTest.java | 4 +- .../org/apache/sis/referencing/CommonCRSTest.java | 4 +- .../sis/referencing/EPSGFactoryFallbackTest.java | 4 +- .../sis/referencing/GeodeticObjectVerifier.java | 3 +- .../sis/referencing/IdentifiedObjectsTest.java | 7 +- .../sis/referencing/ImmutableIdentifierTest.java | 5 +- .../sis/referencing/NamedIdentifierTest.java | 3 +- .../sis/referencing/crs/AbstractCRSTest.java | 2 +- .../referencing/crs/DefaultCompoundCRSTest.java | 7 +- .../sis/referencing/crs/DefaultDerivedCRSTest.java | 6 +- .../referencing/crs/DefaultEngineeringCRSTest.java | 6 +- .../referencing/crs/DefaultGeocentricCRSTest.java | 3 +- .../referencing/crs/DefaultGeodeticCRSTest.java | 2 +- .../referencing/crs/DefaultGeographicCRSTest.java | 4 +- .../sis/referencing/crs/DefaultImageCRSTest.java | 6 +- .../referencing/crs/DefaultProjectedCRSTest.java | 5 +- .../referencing/crs/DefaultTemporalCRSTest.java | 3 +- .../referencing/crs/DefaultVerticalCRSTest.java | 2 +- .../sis/referencing/crs/HardCodedCRSTest.java | 3 +- .../apache/sis/referencing/cs/AbstractCSTest.java | 3 +- .../sis/referencing/cs/CoordinateSystemsTest.java | 4 +- .../sis/referencing/cs/DefaultCartesianCSTest.java | 5 +- .../cs/DefaultCoordinateSystemAxisTest.java | 4 +- .../referencing/cs/DefaultCylindricalCSTest.java | 3 +- .../referencing/cs/DefaultEllipsoidalCSTest.java | 4 +- .../sis/referencing/cs/DefaultPolarCSTest.java | 3 +- .../sis/referencing/cs/DefaultSphericalCSTest.java | 3 +- .../referencing/cs/DirectionAlongMeridianTest.java | 3 +- .../apache/sis/referencing/cs/HardCodedCSTest.java | 3 +- .../apache/sis/referencing/cs/NormalizerTest.java | 4 +- .../referencing/datum/BursaWolfParametersTest.java | 4 +- .../referencing/datum/DefaultEllipsoidTest.java | 4 +- .../datum/DefaultGeodeticDatumTest.java | 7 +- .../datum/DefaultPrimeMeridianTest.java | 4 +- .../datum/DefaultTemporalDatumTest.java | 4 +- .../datum/DefaultVerticalDatumTest.java | 4 +- .../referencing/datum/TimeDependentBWPTest.java | 3 +- .../factory/CommonAuthorityFactoryTest.java | 7 +- .../factory/IdentifiedObjectFinderTest.java | 3 +- .../factory/MultiAuthoritiesFactoryTest.java | 4 +- .../referencing/factory/sql/EPSGFactoryTest.java | 7 +- .../operation/CoordinateOperationFinderTest.java | 24 +- .../operation/CoordinateOperationRegistryTest.java | 4 +- .../DefaultConcatenatedOperationTest.java | 7 +- .../operation/DefaultConversionTest.java | 4 +- .../DefaultCoordinateOperationFactoryTest.java | 4 +- .../referencing/operation/DefaultFormulaTest.java | 2 +- .../operation/DefaultOperationMethodTest.java | 5 +- .../operation/DefaultPassThroughOperationTest.java | 4 +- .../operation/DefaultTransformationTest.java | 4 +- .../operation/SingleOperationMarshallingTest.java | 6 +- .../builder/LinearTransformBuilderTest.java | 4 +- .../operation/builder/LinearizerTest.java | 3 +- .../builder/LocalizationGridBuilderTest.java | 3 +- .../operation/builder/ResidualGridTest.java | 3 +- .../referencing/operation/matrix/MatricesTest.java | 4 +- .../referencing/operation/matrix/Matrix4Test.java | 3 +- .../operation/matrix/MatrixTestCase.java | 4 +- .../operation/matrix/NonSquareMatrixTest.java | 14 +- .../operation/projection/EquirectangularTest.java | 8 +- .../projection/LambertConicConformalTest.java | 5 +- .../operation/projection/MercatorTest.java | 2 +- .../projection/ObliqueStereographicTest.java | 3 +- .../projection/ParameterizedTransformTestMock.java | 4 +- .../projection/TransverseMercatorTest.java | 2 +- .../transform/AbridgedMolodenskyTransformTest.java | 4 +- .../transform/ConcatenatedTransformTest.java | 11 +- .../transform/ContextualParametersTest.java | 3 +- .../operation/transform/CopyTransformTest.java | 5 +- .../transform/DefaultMathTransformFactoryTest.java | 4 +- .../operation/transform/DomainDefinitionTest.java | 2 +- .../transform/EllipsoidToCentricTransformTest.java | 4 +- .../transform/ExponentialTransform1DTest.java | 4 +- .../transform/LogarithmicTransform1DTest.java | 3 +- .../operation/transform/MathTransformTestCase.java | 12 +- .../operation/transform/MathTransformsTest.java | 4 +- .../transform/MolodenskyTransformTest.java | 3 +- .../transform/PassThroughTransformTest.java | 6 +- .../transform/ProjectiveTransformTest.java | 4 +- .../operation/transform/ScaleTransformTest.java | 6 +- .../operation/transform/TransferFunctionTest.java | 4 +- .../transform/TransformResultComparator.java | 3 +- .../transform/TransformSeparatorTest.java | 4 +- .../operation/transform/TransformTestCase.java | 4 +- .../transform/TranslationTransformTest.java | 3 +- .../transform/WraparoundTransformTest.java | 3 +- .../test/integration/CoordinateOperationTest.java | 3 +- .../apache/sis/test/integration/MetadataTest.java | 2 +- .../sis/test/integration/MetadataVerticalTest.java | 4 +- .../test/java/org/apache/sis/test/package-info.txt | 3 - .../sis/test/suite/ReferencingTestSuite.java | 294 --------------------- .../org/apache/sis/test/suite/package-info.txt | 3 - .../sis/internal/converter/AngleConverterTest.java | 3 +- .../sis/internal/converter/ArrayConverterTest.java | 4 +- .../internal/converter/ConverterRegistryTest.java | 4 +- .../internal/converter/FallbackConverterTest.java | 3 +- .../internal/converter/NumberConverterTest.java | 4 +- .../sis/internal/converter/PathConverterTest.java | 3 +- .../internal/converter/StringConverterTest.java | 3 +- .../sis/internal/converter/SystemRegistryTest.java | 4 +- .../org/apache/sis/internal/test/AssertTest.java | 10 +- .../sis/internal/util/CheckedArrayListTest.java | 2 +- .../sis/internal/util/CollectionsExtTest.java | 4 +- .../java/org/apache/sis/io/AppenderTestCase.java | 3 +- .../java/org/apache/sis/math/FractionTest.java | 3 +- .../test/java/org/apache/sis/math/LineTest.java | 3 +- .../test/java/org/apache/sis/math/PlaneTest.java | 3 +- .../org/apache/sis/math/StatisticsFormatTest.java | 2 +- .../java/org/apache/sis/math/StatisticsTest.java | 3 +- .../apache/sis/measure/ConventionalUnitTest.java | 3 +- .../apache/sis/measure/LinearConverterTest.java | 4 +- .../apache/sis/measure/MeasurementRangeTest.java | 3 +- .../java/org/apache/sis/measure/RangeTest.java | 3 +- .../java/org/apache/sis/measure/ScalarTest.java | 4 +- .../org/apache/sis/measure/SystemUnitTest.java | 5 +- .../org/apache/sis/measure/UnitDimensionTest.java | 4 +- .../org/apache/sis/measure/UnitServicesTest.java | 3 +- .../java/org/apache/sis/measure/UnitsTest.java | 3 +- .../java/org/apache/sis/setup/OptionKeyTest.java | 3 +- .../sis/test/{Assert.java => Assertions.java} | 11 +- .../test/java/org/apache/sis/test/DependsOn.java | 17 +- .../java/org/apache/sis/test/GeoapiAssert.java | 9 +- .../org/apache/sis/test/LogRecordCollector.java | 13 +- .../test/java/org/apache/sis/test/TestCase.java | 12 +- .../test/java/org/apache/sis/test/TestRunner.java | 52 +--- .../test/java/org/apache/sis/test/TestSuite.java | 263 ------------------ .../apache/sis/test/suite/UtilityTestSuite.java | 145 ---------- .../org/apache/sis/test/suite/package-info.java | 27 -- .../sis/util/DefaultInternationalStringTest.java | 3 +- .../sis/util/SimpleInternationalStringTest.java | 3 +- .../test/java/org/apache/sis/util/VersionTest.java | 3 +- .../org/apache/sis/util/collection/CacheTest.java | 3 +- .../sis/util/collection/DefaultTreeTableTest.java | 4 +- .../sis/util/collection/IntegerListTest.java | 5 +- .../apache/sis/util/collection/RangeSetTest.java | 3 +- .../sis/util/collection/TableColumnTest.java | 5 +- .../sis/util/collection/TreeTableFormatTest.java | 3 +- .../apache/sis/util/collection/TreeTablesTest.java | 4 +- .../sis/util/collection/WeakHashSetTest.java | 3 +- .../sis/util/collection/WeakValueHashMapTest.java | 3 +- .../sis/util/logging/MonolineFormatterTest.java | 3 +- .../util/resources/IndexedResourceBundleTest.java | 3 +- .../org/apache/sis/util/resources/LoaderTest.java | 2 +- pom.xml | 3 - .../profile/fra/DataIdentificationTest.java | 3 +- .../profile/fra/DirectReferenceSystemTest.java | 2 +- .../sis/test/suite/FrenchProfileTestSuite.java | 46 ---- .../org/apache/sis/test/suite/package-info.txt | 3 - .../sis/test/suite/JapanProfileTestSuite.java | 44 --- .../org/apache/sis/test/suite/package-info.txt | 3 - .../sis/test/suite/EarthObservationTestSuite.java | 46 ---- .../sis/storage/geotiff/XMLMetadataTest.java | 3 +- .../apache/sis/test/suite/GeoTiffTestSuite.java | 53 ---- .../org/apache/sis/internal/netcdf/GridTest.java | 3 +- .../sis/storage/netcdf/MetadataReaderTest.java | 2 +- .../org/apache/sis/test/suite/NetcdfTestSuite.java | 55 ---- .../org/apache/sis/test/suite/package-info.txt | 3 - .../apache/sis/test/suite/ShapefileTestSuite.java | 44 --- .../org/apache/sis/test/suite/package-info.txt | 3 - .../org/apache/sis/storage/sql/SQLStoreTest.java | 4 +- .../org/apache/sis/test/suite/SQLTestSuite.java | 46 ---- .../org/apache/sis/test/suite/package-info.txt | 3 - .../internal/storage/MemoryGridResourceTest.java | 3 +- .../sis/internal/storage/MetadataBuilderTest.java | 5 +- .../apache/sis/internal/storage/wkt/StoreTest.java | 3 +- .../org/apache/sis/storage/CoverageSubsetTest.java | 3 +- .../org/apache/sis/storage/DataStoresTest.java | 3 +- .../org/apache/sis/storage/ProbeResultTest.java | 4 +- .../aggregate/ConcatenatedFeatureSetTest.java | 4 +- .../apache/sis/test/suite/StorageTestSuite.java | 85 ------ .../org/apache/sis/test/suite/package-info.txt | 3 - .../sis/internal/storage/gpx/UpdaterTest.java | 3 +- .../sis/internal/storage/gpx/WriterTest.java | 3 +- .../org/apache/sis/test/suite/GPXTestSuite.java | 44 --- .../org/apache/sis/test/suite/package-info.txt | 3 - 340 files changed, 831 insertions(+), 2217 deletions(-) diff --cc core/sis-feature/src/test/java/org/apache/sis/coverage/grid/DimensionalityReductionTest.java index ef4f109054,565bc0af2d..6bb8d2ef34 --- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/DimensionalityReductionTest.java +++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/DimensionalityReductionTest.java @@@ -32,7 -32,7 +32,8 @@@ import org.apache.sis.util.Utilities import org.apache.sis.test.TestCase; import org.junit.Test; - import static org.apache.sis.test.Assert.*; -import static org.opengis.test.Assert.*; ++import static org.junit.Assert.*; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; /** diff --cc core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridCoverage2DTest.java index 7b5d13254f,93ef4256a1..e01f1b6850 --- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridCoverage2DTest.java +++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridCoverage2DTest.java @@@ -41,11 -42,10 +41,13 @@@ import org.apache.sis.test.DependsOnMet import org.apache.sis.test.TestCase; import org.junit.Test; + import static org.junit.Assert.*; + import static org.opengis.test.Assert.assertInstanceOf; + import static org.apache.sis.feature.Assertions.assertPixelsEqual; + +// Branch-dependent imports +import org.apache.sis.coverage.PointOutsideCoverageException; + - import static org.apache.sis.test.FeatureAssert.*; - /** * Tests the {@link GridCoverage2D} implementation. diff --cc core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridDerivationTest.java index 407836eca7,ea96a6f231..1c3c486c45 --- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridDerivationTest.java +++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridDerivationTest.java @@@ -46,7 -46,10 +46,10 @@@ import org.apache.sis.test.DependsOn import org.apache.sis.test.TestCase; import org.junit.Test; - import static org.apache.sis.test.ReferencingAssert.*; + import static org.junit.Assert.*; + import static org.opengis.test.Assert.assertBetween; -import static org.opengis.test.Assert.assertMatrixEquals; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; + import static org.apache.sis.referencing.Assertions.assertEnvelopeEquals; import static org.apache.sis.coverage.grid.GridGeometryTest.assertExtentEquals; diff --cc core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridExtentTest.java index 94f9c10cc1,075e5a3959..3e9754d369 --- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridExtentTest.java +++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridExtentTest.java @@@ -39,7 -39,12 +39,12 @@@ import org.apache.sis.internal.util.Num import org.apache.sis.test.TestCase; import org.junit.Test; - import static org.apache.sis.test.ReferencingAssert.*; + import static org.junit.Assert.*; -import static org.opengis.test.Assert.assertAxisDirectionsEqual; -import static org.opengis.test.Assert.assertMatrixEquals; ++import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; + import static org.apache.sis.test.Assertions.assertMapEquals; + import static org.apache.sis.test.Assertions.assertMultilinesEquals; + import static org.apache.sis.referencing.Assertions.assertEnvelopeEquals; /** diff --cc core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridGeometryTest.java index ea7759a1f0,dcfeb81409..db10249a09 --- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridGeometryTest.java +++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridGeometryTest.java @@@ -38,7 -38,9 +38,9 @@@ import org.apache.sis.test.DependsOn import org.apache.sis.test.TestCase; import org.junit.Test; - import static org.apache.sis.test.ReferencingAssert.*; + import static org.junit.Assert.*; -import static org.opengis.test.Assert.assertMatrixEquals; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; + import static org.apache.sis.referencing.Assertions.assertEnvelopeEquals; /** diff --cc core/sis-feature/src/test/java/org/apache/sis/coverage/grid/PixelTranslationTest.java index 95114f1149,87175dfff4..a9bdd08f46 --- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/PixelTranslationTest.java +++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/PixelTranslationTest.java @@@ -26,7 -26,7 +26,8 @@@ import org.apache.sis.referencing.opera import org.apache.sis.test.TestCase; import org.junit.Test; - import static org.apache.sis.test.Assert.*; -import static org.opengis.test.Assert.*; ++import static org.junit.Assert.*; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; /** diff --cc core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ResampledGridCoverageTest.java index ab6cbf0cef,42bf113f47..4eb1e75186 --- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ResampledGridCoverageTest.java +++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ResampledGridCoverageTest.java @@@ -54,8 -54,13 +54,13 @@@ import org.apache.sis.test.DependsOnMet import org.apache.sis.test.TestCase; import org.junit.Test; + import static org.junit.Assert.*; + import static org.opengis.test.Assert.assertInstanceOf; -import static org.opengis.test.Assert.assertAxisDirectionsEqual; ++import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual; + import static org.apache.sis.referencing.Assertions.assertEnvelopeEquals; + import static org.apache.sis.feature.Assertions.assertValuesEqual; + import static org.apache.sis.feature.Assertions.assertPixelsEqual; import static org.opengis.referencing.datum.PixelInCell.CELL_CENTER; - import static org.apache.sis.test.FeatureAssert.*; /** diff --cc core/sis-feature/src/test/java/org/apache/sis/feature/AbstractFeatureTest.java index 5d76b6cc78,40f97ce4c4..7af83ca53b --- a/core/sis-feature/src/test/java/org/apache/sis/feature/AbstractFeatureTest.java +++ b/core/sis-feature/src/test/java/org/apache/sis/feature/AbstractFeatureTest.java @@@ -21,8 -21,14 +21,8 @@@ import java.util.ArrayList import java.util.Collection; import org.apache.sis.test.DependsOn; - import static org.apache.sis.test.Assert.*; + import static org.junit.Assert.*; -// Branch-dependent imports -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 core/sis-feature/src/test/java/org/apache/sis/feature/Assertions.java index b5e143cf0f,302ce8fc53..c57ee5defb --- a/core/sis-feature/src/test/java/org/apache/sis/feature/Assertions.java +++ b/core/sis-feature/src/test/java/org/apache/sis/feature/Assertions.java @@@ -21,8 -21,9 +21,9 @@@ import java.awt.Rectangle import java.awt.image.Raster; import java.awt.image.RenderedImage; import java.awt.geom.PathIterator; -import org.opengis.coverage.grid.SequenceType; +import org.apache.sis.image.SequenceType; import org.apache.sis.image.PixelIterator; + import org.apache.sis.util.Static; import static org.junit.Assert.*; diff --cc core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicMapTest.java index d7baade2f4,98ba0eeafc..5cee069f29 --- a/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicMapTest.java +++ b/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicMapTest.java @@@ -24,8 -24,12 +24,9 @@@ import org.apache.sis.test.DependsOn import org.apache.sis.test.TestCase; import org.junit.Test; - import static org.apache.sis.test.Assert.*; + import static org.junit.Assert.*; + import static org.apache.sis.test.Assertions.assertSerializedEquals; -// Branch-dependent imports -import org.opengis.feature.Attribute; - /** * Tests {@link CharacteristicMap} indirectly, through {@link AbstractAttribute} construction. diff --cc core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicTypeMapTest.java index 607bf890b9,95fef37914..015625d8cf --- a/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicTypeMapTest.java +++ b/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicTypeMapTest.java @@@ -22,11 -22,15 +22,12 @@@ import org.apache.sis.test.DependsOn import org.apache.sis.test.TestCase; import org.junit.Test; + import static org.junit.Assert.*; + import static org.apache.sis.test.Assertions.assertSerializedEquals; import static org.apache.sis.feature.DefaultAssociationRole.NAME_KEY; - import static org.apache.sis.test.Assert.*; -// Branch-dependent imports -import org.opengis.feature.AttributeType; import org.apache.sis.util.iso.Names; - /** * Tests {@link CharacteristicTypeMap} indirectly, through {@link DefaultAttributeType} construction. * diff --cc core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java index 0dcd2f807a,605b884091..19ba9432b2 --- a/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java +++ b/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java @@@ -25,10 -26,14 +25,11 @@@ import org.apache.sis.test.DependsOn import org.apache.sis.test.TestCase; import org.junit.Test; + import static org.junit.Assert.*; + import static org.apache.sis.test.Assertions.assertSerializedEquals; import static org.apache.sis.feature.DefaultAssociationRole.NAME_KEY; import static org.apache.sis.test.TestUtilities.getSingleton; - import static org.apache.sis.test.Assert.*; -// Branch-dependent imports -import org.opengis.feature.FeatureType; - /** * Tests {@link DefaultAssociationRole}. diff --cc core/sis-feature/src/test/java/org/apache/sis/feature/DefaultFeatureTypeTest.java index 5a3680b485,11fa2d4b2c..7d5fa24933 --- a/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultFeatureTypeTest.java +++ b/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultFeatureTypeTest.java @@@ -28,9 -28,14 +28,10 @@@ import org.apache.sis.test.DependsOn import org.apache.sis.test.TestCase; import org.junit.Test; - import static org.apache.sis.test.Assert.*; + import static org.junit.Assert.*; + import static org.apache.sis.test.Assertions.assertSerializedEquals; import static org.apache.sis.test.TestUtilities.getSingleton; -// Branch-dependent imports -import org.opengis.feature.PropertyType; -import org.opengis.feature.AttributeType; - /** * Tests {@link DefaultFeatureType}. diff --cc core/sis-feature/src/test/java/org/apache/sis/feature/EnvelopeOperationTest.java index a030671dd8,47a40c9172..011dc0651c --- a/core/sis-feature/src/test/java/org/apache/sis/feature/EnvelopeOperationTest.java +++ b/core/sis-feature/src/test/java/org/apache/sis/feature/EnvelopeOperationTest.java @@@ -34,8 -34,15 +34,10 @@@ import org.apache.sis.internal.feature. import org.apache.sis.test.TestCase; import org.junit.Test; - import static org.apache.sis.test.ReferencingAssert.*; + import static org.junit.Assert.*; + import static org.opengis.test.Assert.assertInstanceOf; + import static org.apache.sis.referencing.Assertions.assertEnvelopeEquals; -// Branch-dependent imports -import org.opengis.feature.Attribute; -import org.opengis.feature.Feature; -import org.opengis.feature.FeatureType; - /** * Tests {@link EnvelopeOperation}. diff --cc core/sis-feature/src/test/java/org/apache/sis/feature/FeatureFormatTest.java index 6b7ef736cf,ba9aa52800..5351f9731e --- a/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureFormatTest.java +++ b/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureFormatTest.java @@@ -27,8 -27,11 +27,8 @@@ import org.apache.sis.test.TestCase import org.apache.sis.test.TestUtilities; import org.junit.Test; - import static org.apache.sis.test.Assert.*; + import static org.apache.sis.test.Assertions.assertMultilinesEquals; -// Branch-dependent import -import org.opengis.feature.PropertyType; - /** * Tests {@link FeatureFormat}. diff --cc core/sis-feature/src/test/java/org/apache/sis/feature/FeatureOperationsTest.java index 5fae5e9e5d,f2273c086a..5261616a29 --- a/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureOperationsTest.java +++ b/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureOperationsTest.java @@@ -33,8 -33,14 +33,11 @@@ import org.apache.sis.test.DependsOn import org.apache.sis.test.TestCase; import org.junit.Test; - import static org.apache.sis.test.ReferencingAssert.*; + import static org.junit.Assert.*; + import static org.opengis.test.Assert.assertInstanceOf; + import static org.apache.sis.test.Assertions.assertSetEquals; + import static org.apache.sis.referencing.Assertions.assertEnvelopeEquals; -// Branch-dependent imports -import org.opengis.feature.PropertyType; - /** * Tests a feature combining various {@link FeatureOperations} applied of either sparse or dense features. diff --cc core/sis-feature/src/test/java/org/apache/sis/feature/FeatureTestCase.java index 263d203ff0,36d2ab7904..2ba6ceb4ef --- a/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureTestCase.java +++ b/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureTestCase.java @@@ -30,8 -30,15 +30,10 @@@ import org.apache.sis.test.TestUtilitie import org.apache.sis.test.TestCase; import org.junit.Test; - import static org.apache.sis.test.Assert.*; + import static org.junit.Assert.*; + import static org.opengis.test.Assert.assertInstanceOf; + import static org.apache.sis.test.Assertions.assertSerializedEquals; -// Branch-dependent imports -import org.opengis.feature.Attribute; -import org.opengis.feature.AttributeType; -import org.opengis.feature.Property; - /** * Tests common to {@link DenseFeatureTest} and {@link SparseFeatureTest}. diff --cc core/sis-feature/src/test/java/org/apache/sis/feature/builder/AttributeTypeBuilderTest.java index d860ae4ae1,03477d38a2..fba9b14c0e --- a/core/sis-feature/src/test/java/org/apache/sis/feature/builder/AttributeTypeBuilderTest.java +++ b/core/sis-feature/src/test/java/org/apache/sis/feature/builder/AttributeTypeBuilderTest.java @@@ -28,14 -28,17 +28,16 @@@ import org.apache.sis.test.DependsOn import org.apache.sis.test.TestCase; import org.junit.Test; - import static org.apache.sis.test.Assert.*; + import static org.junit.Assert.*; + import static org.opengis.test.Assert.assertInstanceOf; + import static org.apache.sis.test.Assertions.assertSetEquals; // Branch-dependent imports -import org.opengis.feature.Attribute; -import org.opengis.feature.AttributeType; -import org.opengis.feature.Feature; -import org.opengis.feature.FeatureType; -import org.opengis.feature.Property; -import org.opengis.feature.PropertyType; +import org.apache.sis.feature.AbstractAttribute; +import org.apache.sis.feature.AbstractFeature; +import org.apache.sis.feature.AbstractIdentifiedType; +import org.apache.sis.feature.DefaultAttributeType; +import org.apache.sis.feature.DefaultFeatureType; /** diff --cc core/sis-feature/src/test/java/org/apache/sis/feature/builder/CharacteristicTypeBuilderTest.java index 295c01e167,6327d7a107..c252c10f03 --- a/core/sis-feature/src/test/java/org/apache/sis/feature/builder/CharacteristicTypeBuilderTest.java +++ b/core/sis-feature/src/test/java/org/apache/sis/feature/builder/CharacteristicTypeBuilderTest.java @@@ -20,10 -20,11 +20,11 @@@ import java.util.Set import org.apache.sis.test.TestCase; import org.junit.Test; - import static org.apache.sis.test.Assert.*; + import static org.junit.Assert.*; + import static org.apache.sis.test.Assertions.assertSetEquals; // Branch-dependent imports -import org.opengis.feature.AttributeType; +import org.apache.sis.feature.DefaultAttributeType; /** diff --cc core/sis-feature/src/test/java/org/apache/sis/filter/ArithmeticFunctionTest.java index 444ede19bf,4f5d9d0e24..7bd9dcc9f8 --- a/core/sis-feature/src/test/java/org/apache/sis/filter/ArithmeticFunctionTest.java +++ b/core/sis-feature/src/test/java/org/apache/sis/filter/ArithmeticFunctionTest.java @@@ -19,10 -19,13 +19,11 @@@ package org.apache.sis.filter import org.apache.sis.test.TestCase; import org.junit.Test; - import static org.apache.sis.test.Assert.*; + import static org.junit.Assert.*; + import static org.apache.sis.test.Assertions.assertSerializedEquals; // Branch-dependent imports -import org.opengis.feature.Feature; -import org.opengis.filter.Expression; -import org.opengis.filter.FilterFactory; +import org.apache.sis.feature.AbstractFeature; /** diff --cc core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterTestCase.java index 5b1c0bc185,457fd64ae7..f1cd099f08 --- a/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterTestCase.java +++ b/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterTestCase.java @@@ -38,12 -38,16 +38,12 @@@ import org.junit.Test import static org.junit.Assert.*; import static org.opengis.test.Assert.assertInstanceOf; - import static org.apache.sis.test.Assert.assertSerializedEquals; + import static org.apache.sis.test.Assertions.assertSerializedEquals; // Branch-dependent imports -import org.opengis.feature.Feature; -import org.opengis.filter.Expression; -import org.opengis.filter.Literal; -import org.opengis.filter.FilterFactory; -import org.opengis.filter.DistanceOperator; -import org.opengis.filter.DistanceOperatorName; -import org.opengis.filter.BinarySpatialOperator; +import org.apache.sis.feature.AbstractFeature; +import org.apache.sis.internal.geoapi.filter.Literal; +import org.apache.sis.internal.geoapi.filter.DistanceOperatorName; /** diff --cc core/sis-feature/src/test/java/org/apache/sis/filter/ComparisonFilterTest.java index 2f718e60a9,13e19acc4c..d2d371d09a --- a/core/sis-feature/src/test/java/org/apache/sis/filter/ComparisonFilterTest.java +++ b/core/sis-feature/src/test/java/org/apache/sis/filter/ComparisonFilterTest.java @@@ -18,13 -18,20 +18,15 @@@ package org.apache.sis.filter import org.junit.Test; import org.apache.sis.test.TestCase; -import org.apache.sis.internal.filter.FunctionNames; - import static org.apache.sis.test.Assert.*; + import static org.junit.Assert.*; + import static org.opengis.test.Assert.assertInstanceOf; + import static org.apache.sis.test.Assertions.assertSerializedEquals; // Branch-dependent imports -import org.opengis.feature.Feature; -import org.opengis.filter.Literal; -import org.opengis.filter.FilterFactory; -import org.opengis.filter.ComparisonOperator; -import org.opengis.filter.ComparisonOperatorName; -import org.opengis.filter.BinaryComparisonOperator; -import org.opengis.filter.BetweenComparisonOperator; +import org.apache.sis.feature.AbstractFeature; +import org.apache.sis.internal.geoapi.filter.ComparisonOperatorName; +import org.apache.sis.internal.geoapi.filter.BetweenComparisonOperator; /** diff --cc core/sis-feature/src/test/java/org/apache/sis/filter/IdentifierFilterTest.java index e08dbc2e1f,6dac5425f0..9a2ee04f6a --- a/core/sis-feature/src/test/java/org/apache/sis/filter/IdentifierFilterTest.java +++ b/core/sis-feature/src/test/java/org/apache/sis/filter/IdentifierFilterTest.java @@@ -21,11 -21,14 +21,12 @@@ import org.apache.sis.feature.builder.F import org.apache.sis.test.TestCase; import org.junit.Test; - import static org.apache.sis.test.Assert.*; + import static org.junit.Assert.*; + import static org.apache.sis.test.Assertions.assertSerializedEquals; // Branch-dependent imports -import org.opengis.feature.Feature; -import org.opengis.feature.FeatureType; -import org.opengis.filter.Filter; -import org.opengis.filter.FilterFactory; +import org.apache.sis.feature.AbstractFeature; +import org.apache.sis.feature.DefaultFeatureType; /** diff --cc core/sis-feature/src/test/java/org/apache/sis/filter/LeafExpressionTest.java index 84976cde44,0235703bc7..bc7bda1e70 --- a/core/sis-feature/src/test/java/org/apache/sis/filter/LeafExpressionTest.java +++ b/core/sis-feature/src/test/java/org/apache/sis/filter/LeafExpressionTest.java @@@ -20,12 -20,14 +20,13 @@@ import org.apache.sis.feature.builder.F import org.apache.sis.test.TestCase; import org.junit.Test; - import static org.apache.sis.test.Assert.*; + import static org.junit.Assert.*; + import static org.apache.sis.test.Assertions.assertSerializedEquals; // Branch-dependent imports -import org.opengis.feature.Feature; -import org.opengis.filter.Literal; -import org.opengis.filter.FilterFactory; -import org.opengis.filter.ValueReference; +import org.apache.sis.feature.AbstractFeature; +import org.apache.sis.internal.geoapi.filter.Literal; +import org.apache.sis.internal.geoapi.filter.ValueReference; /** diff --cc core/sis-feature/src/test/java/org/apache/sis/filter/LogicalFilterTest.java index a28a3dec78,81639abf22..a4d768a7aa --- a/core/sis-feature/src/test/java/org/apache/sis/filter/LogicalFilterTest.java +++ b/core/sis-feature/src/test/java/org/apache/sis/filter/LogicalFilterTest.java @@@ -27,12 -27,18 +27,14 @@@ import org.apache.sis.math.FunctionProp import org.apache.sis.test.TestCase; import org.junit.Test; - import static org.apache.sis.test.Assert.*; + import static org.junit.Assert.*; + import static org.opengis.test.Assert.assertInstanceOf; + import static org.apache.sis.test.Assertions.assertSerializedEquals; // Branch-dependent imports -import org.opengis.feature.Feature; -import org.opengis.feature.FeatureType; -import org.opengis.filter.Expression; -import org.opengis.filter.Filter; -import org.opengis.filter.Literal; -import org.opengis.filter.FilterFactory; -import org.opengis.filter.LogicalOperator; +import org.apache.sis.feature.AbstractFeature; +import org.apache.sis.feature.DefaultFeatureType; +import org.apache.sis.internal.geoapi.filter.LogicalOperator; /** diff --cc core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryTestCase.java index 7dc2374a2b,43b5570f2d..b81abaeac9 --- a/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryTestCase.java +++ b/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryTestCase.java @@@ -39,14 -40,16 +39,15 @@@ import org.junit.Test import org.junit.Rule; import org.junit.After; - import static org.apache.sis.test.Assert.*; + import static org.junit.Assert.*; + import static org.opengis.test.Assert.assertInstanceOf; // Branch-dependent imports -import org.opengis.feature.Feature; -import org.opengis.feature.FeatureType; -import org.opengis.filter.Literal; -import org.opengis.filter.Expression; -import org.opengis.filter.FilterFactory; -import org.opengis.filter.ValueReference; +import org.apache.sis.feature.AbstractFeature; +import org.apache.sis.feature.DefaultFeatureType; +import org.apache.sis.filter.Expression; +import org.apache.sis.filter.DefaultFilterFactory; +import org.apache.sis.internal.geoapi.filter.Literal; /** diff --cc core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java index 4eb126ce30,efc1d4d33f..ff725684fa --- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java +++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java @@@ -35,7 -35,9 +35,8 @@@ import org.junit.BeforeClass import org.junit.AfterClass; import org.junit.Test; - import static org.apache.sis.test.MetadataAssert.*; + import static org.junit.Assert.*; + import static org.apache.sis.metadata.Assertions.assertXmlEquals; -import static org.apache.sis.test.TestUtilities.getSingleton; import static org.apache.sis.internal.util.StandardDateFormat.UTC; diff --cc core/sis-metadata/src/test/java/org/apache/sis/metadata/Assertions.java index 2565fa6a10,ba020777f9..7ac3fca615 --- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/Assertions.java +++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/Assertions.java @@@ -23,8 -23,11 +23,9 @@@ import javax.xml.parsers.ParserConfigur import org.opengis.util.InternationalString; import org.opengis.metadata.citation.Citation; import org.opengis.metadata.lineage.Source; -import org.opengis.metadata.maintenance.Scope; import org.opengis.metadata.maintenance.ScopeCode; -import org.opengis.metadata.content.FeatureTypeInfo; import org.opengis.metadata.content.FeatureCatalogueDescription; + import org.apache.sis.util.Static; import org.apache.sis.xml.Namespaces; import org.apache.sis.test.xml.DocumentComparator; import org.apache.sis.internal.xml.LegacyNamespaces; diff --cc core/sis-metadata/src/test/java/org/apache/sis/util/iso/TypesTest.java index 94deec4e95,85531669ce..0a4a2de38c --- a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/TypesTest.java +++ b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/TypesTest.java @@@ -37,8 -38,7 +37,10 @@@ import org.apache.sis.test.TestCase import org.junit.Test; import static org.opengis.test.Assert.*; - import static org.apache.sis.test.Assert.PENDING_NEXT_GEOAPI_RELEASE; + ++// Branch-dependent imports ++import static org.apache.sis.test.GeoapiAssert.PENDING_NEXT_GEOAPI_RELEASE; + /** * Tests the {@link Types} class. diff --cc core/sis-metadata/src/test/java/org/apache/sis/xml/CharSequenceSubstitutionTest.java index 973649c084,3bf2c040a6..4d7b736502 --- a/core/sis-metadata/src/test/java/org/apache/sis/xml/CharSequenceSubstitutionTest.java +++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/CharSequenceSubstitutionTest.java @@@ -30,12 -30,11 +30,14 @@@ import org.apache.sis.test.DependsOnMet import org.apache.sis.test.xml.TestCase; import org.junit.Test; - import static org.apache.sis.test.MetadataAssert.*; + import static org.junit.Assert.*; + import static org.opengis.test.Assert.assertInstanceOf; + import static org.apache.sis.metadata.Assertions.assertXmlEquals; import static org.apache.sis.internal.metadata.ImplementationHelper.ISO_NAMESPACE; +// Branch-dependent imports +import org.opengis.referencing.ReferenceIdentifier; + /** * Tests the XML marshalling of {@code Anchor} and {@code CodeList} as substitution of {@code <gco:CharacterSequence>}. diff --cc core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationTypeTest.java index c76f4d7861,4d8244e5cf..c680aca0a0 --- a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationTypeTest.java +++ b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationTypeTest.java @@@ -22,8 -22,13 +22,10 @@@ import org.apache.sis.test.TestUtilitie import org.apache.sis.test.TestCase; import org.junit.Test; - import static org.apache.sis.test.Assert.*; + import static org.junit.Assert.*; + import static org.apache.sis.test.Assertions.assertMultilinesEquals; + import static org.apache.sis.test.Assertions.assertSerializedEquals; -// Branch-dependent imports -import org.opengis.referencing.gazetteer.LocationType; - /** * Tests {@link AbstractLocationType}, {@link FinalLocationType} and {@link ModifiableLocationType}. diff --cc core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.java index 7c5c09b430,23486e0087..b8ddde4226 --- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.java @@@ -25,10 -25,12 +25,15 @@@ import org.apache.sis.test.TestCase import org.junit.Test; import static java.lang.Double.NaN; - import static org.opengis.test.Validators.*; - import static org.apache.sis.test.ReferencingAssert.*; + import static org.junit.Assert.*; + import static org.opengis.test.Validators.validate; + import static org.apache.sis.referencing.Assertions.assertContains; + import static org.apache.sis.referencing.Assertions.assertDisjoint; import static org.apache.sis.referencing.crs.HardCodedCRS.WGS84; ++// Branch-dependent imports ++import static org.apache.sis.test.GeoapiAssert.PENDING_NEXT_GEOAPI_RELEASE; ++ /** * Tests the methods defined in the {@link AbstractEnvelope} class. diff --cc core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java index d704d6341d,458f9574f6..ffb2bcd15e --- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java @@@ -34,6 -36,6 +36,9 @@@ import static org.apache.sis.referencin import static org.apache.sis.referencing.crs.HardCodedCRS.WGS84; import static org.apache.sis.referencing.crs.HardCodedCRS.WGS84_LATITUDE_FIRST; ++// Branch-dependent imports ++import static org.apache.sis.test.GeoapiAssert.PENDING_NEXT_GEOAPI_RELEASE; ++ /** * Tests the {@link GeneralEnvelope} class. The {@link Envelope2D} class will also be tested as a diff --cc core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/EllipsoidalHeightCombinerTest.java index dbdaff85ad,d643d63596..d222123f84 --- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/EllipsoidalHeightCombinerTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/EllipsoidalHeightCombinerTest.java @@@ -37,7 -37,11 +37,11 @@@ import org.apache.sis.test.DependsOn import org.apache.sis.test.TestCase; import org.junit.Test; - import static org.apache.sis.test.Assert.*; + import static org.junit.Assert.*; + import static org.opengis.test.Assert.assertInstanceOf; -import static org.opengis.test.Assert.assertAxisDirectionsEqual; ++import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual; + import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata; + import static org.apache.sis.test.Assertions.assertArrayEqualsIgnoreMetadata; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/GeodeticObjectBuilderTest.java index 22714679e0,db2c3d9099..f340f924ea --- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/GeodeticObjectBuilderTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/GeodeticObjectBuilderTest.java @@@ -26,7 -26,7 +26,7 @@@ import org.apache.sis.test.TestCase import org.junit.Test; import static org.junit.Assert.*; - import static org.apache.sis.test.Assert.assertAxisDirectionsEqual; -import static org.opengis.test.Assert.assertAxisDirectionsEqual; ++import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/Geographic3Dto2DTest.java index 62e93e84dd,eb5d6e8b79..944e5cfa0e --- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/Geographic3Dto2DTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/Geographic3Dto2DTest.java @@@ -27,7 -27,7 +27,9 @@@ import org.apache.sis.test.DependsOn import org.apache.sis.test.TestCase; import org.junit.Test; - import static org.apache.sis.test.Assert.*; -import static org.opengis.test.Assert.*; ++import static org.junit.Assert.*; ++import static org.opengis.test.Assert.assertInstanceOf; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/LongitudeRotationTest.java index 2d8baf887a,9ef0659215..706365f971 --- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/LongitudeRotationTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/LongitudeRotationTest.java @@@ -26,7 -26,9 +26,9 @@@ import org.apache.sis.test.DependsOn import org.apache.sis.test.TestCase; import org.junit.Test; - import static org.apache.sis.test.ReferencingAssert.*; + import static org.opengis.test.Assert.assertInstanceOf; -import static org.opengis.test.Assert.assertMatrixEquals; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; + import static org.apache.sis.referencing.Assertions.assertWktEquals; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NADCONTest.java index 42557daa11,8f87a35bf8..e428fe2cb7 --- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NADCONTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NADCONTest.java @@@ -31,7 -31,7 +31,9 @@@ import org.apache.sis.geometry.Envelope import org.apache.sis.measure.Units; import org.junit.Test; - import static org.apache.sis.test.Assert.*; -import static org.opengis.test.Assert.*; ++import static org.junit.Assert.*; ++import static org.opengis.test.Assert.assertInstanceOf; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NTv2Test.java index bde4941400,d40f0202fb..7ed366741c --- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NTv2Test.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NTv2Test.java @@@ -38,7 -38,7 +38,9 @@@ import org.apache.sis.test.DependsOn import org.junit.Test; import static org.junit.Assume.assumeTrue; - import static org.apache.sis.test.Assert.*; -import static org.opengis.test.Assert.*; ++import static org.junit.Assert.*; ++import static org.opengis.test.Assert.assertInstanceOf; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; import static org.apache.sis.internal.referencing.provider.DatumShiftGridLoader.DEGREES_TO_SECONDS; diff --cc core/sis-referencing/src/test/java/org/apache/sis/io/wkt/MathTransformParserTest.java index ecc82874a4,800f8fb45d..c9ea4702e7 --- a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/MathTransformParserTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/MathTransformParserTest.java @@@ -31,7 -31,7 +31,8 @@@ import org.apache.sis.test.DependsOn import org.apache.sis.test.TestCase; import org.junit.Test; - import static org.apache.sis.test.Assert.*; -import static org.opengis.test.Assert.*; ++import static org.junit.Assert.*; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTDictionaryTest.java index 4e65177dda,9161c874dd..e8f69c3c98 --- a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTDictionaryTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTDictionaryTest.java @@@ -42,7 -42,9 +42,9 @@@ import org.apache.sis.test.DependsOn import org.apache.sis.test.TestCase; import org.junit.Test; - import static org.apache.sis.test.Assert.*; + import static org.junit.Assert.*; -import static org.opengis.test.Assert.assertAxisDirectionsEqual; ++import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual; + import static org.apache.sis.test.Assertions.assertSetEquals; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorParametersTest.java index 8081c7d681,992b16ebf7..971c00ced0 --- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorParametersTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorParametersTest.java @@@ -29,7 -29,11 +29,10 @@@ import org.apache.sis.test.TestCase import org.junit.AfterClass; import org.junit.Test; - import static org.apache.sis.test.ReferencingAssert.*; + import static org.junit.Assert.*; -import static org.opengis.test.Validators.validate; + import static org.apache.sis.test.Assertions.assertSerializedEquals; + import static org.apache.sis.referencing.Assertions.assertEpsgIdentifierEquals; + import static org.apache.sis.referencing.Assertions.assertAliasTipEquals; import static org.apache.sis.internal.util.Constants.NUM_ROW; import static org.apache.sis.internal.util.Constants.NUM_COL; diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/CommonCRSTest.java index 6df41a6ea3,0ec26a7467..c95925eaa3 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/CommonCRSTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/CommonCRSTest.java @@@ -46,7 -46,9 +46,9 @@@ import org.apache.sis.test.DependsOn import org.apache.sis.test.TestCase; import org.junit.Test; - import static org.apache.sis.test.MetadataAssert.*; + import static org.junit.Assert.*; -import static org.opengis.test.Assert.assertAxisDirectionsEqual; ++import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual; + import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata; import static org.apache.sis.test.TestUtilities.*; diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/ImmutableIdentifierTest.java index 81ec5fc5e2,413ad578d9..b223feb356 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/ImmutableIdentifierTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/ImmutableIdentifierTest.java @@@ -32,8 -32,11 +32,11 @@@ import org.apache.sis.test.xml.TestCase import org.opengis.test.Validators; import org.junit.Test; - import static org.apache.sis.test.ReferencingAssert.*; + import static org.junit.Assert.*; + import static org.apache.sis.metadata.Assertions.assertTitleEquals; + import static org.apache.sis.metadata.Assertions.assertXmlEquals; + import static org.apache.sis.referencing.Assertions.assertWktEquals; -import static org.opengis.metadata.Identifier.*; +import static org.opengis.referencing.ReferenceIdentifier.*; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java index 99e5b16523,0ab4485623..16651618ae --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java @@@ -36,7 -36,12 +36,12 @@@ import org.apache.sis.test.xml.TestCase import org.junit.Test; import static org.opengis.referencing.crs.CompoundCRS.NAME_KEY; - import static org.apache.sis.test.ReferencingAssert.*; + import static org.junit.Assert.*; + import static org.opengis.test.Assert.assertInstanceOf; -import static org.opengis.test.Assert.assertAxisDirectionsEqual; ++import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual; + import static org.apache.sis.test.Assertions.assertSerializedEquals; + import static org.apache.sis.referencing.Assertions.assertWktEquals; + import static org.apache.sis.referencing.Assertions.assertEpsgNameAndIdentifierEqual; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java index ce5cd56ffe,3f2dc5017b..343e18e553 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java @@@ -37,7 -37,11 +37,11 @@@ import org.apache.sis.test.DependsOn import org.apache.sis.test.xml.TestCase; import org.junit.Test; - import static org.apache.sis.test.ReferencingAssert.*; + import static org.junit.Assert.*; -import static org.opengis.test.Assert.assertAxisDirectionsEqual; -import static org.opengis.test.Assert.assertMatrixEquals; ++import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; + import static org.apache.sis.referencing.Assertions.assertEpsgNameAndIdentifierEqual; + import static org.apache.sis.referencing.Assertions.assertWktEquals; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultEngineeringCRSTest.java index 1b367b0e12,80578dbb28..2e8c4c9979 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultEngineeringCRSTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultEngineeringCRSTest.java @@@ -29,7 -29,11 +29,11 @@@ import org.apache.sis.test.xml.TestCase import org.apache.sis.xml.Namespaces; import org.junit.Test; - import static org.apache.sis.test.ReferencingAssert.*; + import static org.junit.Assert.*; + import static org.opengis.test.Assert.assertInstanceOf; -import static org.opengis.test.Assert.assertAxisDirectionsEqual; ++import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual; + import static org.apache.sis.metadata.Assertions.assertXmlEquals; + import static org.apache.sis.referencing.Assertions.assertWktEquals; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultImageCRSTest.java index 25e09065af,730e216edc..9917cc2791 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultImageCRSTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultImageCRSTest.java @@@ -32,7 -32,11 +32,11 @@@ import org.apache.sis.test.xml.TestCase import org.apache.sis.xml.Namespaces; import org.junit.Test; - import static org.apache.sis.test.ReferencingAssert.*; + import static org.junit.Assert.*; + import static org.opengis.test.Assert.assertInstanceOf; -import static org.opengis.test.Assert.assertAxisDirectionsEqual; ++import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual; + import static org.apache.sis.metadata.Assertions.assertXmlEquals; + import static org.apache.sis.referencing.Assertions.assertWktEquals; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java index 2d5ebced85,1d9e70bf68..2a85cfd686 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java @@@ -45,7 -45,10 +45,10 @@@ import org.junit.After import org.junit.Test; import org.junit.Rule; - import static org.apache.sis.test.ReferencingAssert.*; + import static org.junit.Assert.*; -import static org.opengis.test.Assert.assertAxisDirectionsEqual; ++import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual; + import static org.apache.sis.referencing.Assertions.assertEpsgNameAndIdentifierEqual; + import static org.apache.sis.referencing.Assertions.assertWktEquals; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CoordinateSystemsTest.java index 16006fc411,e88ffc857d..88da79f294 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CoordinateSystemsTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CoordinateSystemsTest.java @@@ -40,7 -40,9 +40,9 @@@ import static java.lang.Double.NaN import static org.opengis.referencing.IdentifiedObject.NAME_KEY; import static org.apache.sis.referencing.IdentifiedObjects.getProperties; import static org.apache.sis.referencing.cs.CoordinateSystems.*; - import static org.apache.sis.test.Assert.*; + import static org.junit.Assert.*; -import static org.opengis.test.Assert.assertMatrixEquals; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; + import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCylindricalCSTest.java index ac9961cf9f,8315d6b445..5a976df13a --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCylindricalCSTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCylindricalCSTest.java @@@ -25,7 -25,7 +25,8 @@@ import org.apache.sis.test.TestCase import org.apache.sis.test.DependsOn; import org.junit.Test; - import static org.apache.sis.test.Assert.*; -import static org.opengis.test.Assert.*; ++import static org.junit.Assert.*; ++import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultPolarCSTest.java index 756ced4f78,2e18249628..7ca384119f --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultPolarCSTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultPolarCSTest.java @@@ -25,7 -25,7 +25,8 @@@ import org.apache.sis.test.TestCase import org.apache.sis.test.DependsOn; import org.junit.Test; - import static org.apache.sis.test.Assert.*; -import static org.opengis.test.Assert.*; ++import static org.junit.Assert.*; ++import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultSphericalCSTest.java index 027996ebcc,289ff2441d..1d3dd08072 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultSphericalCSTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultSphericalCSTest.java @@@ -23,7 -23,7 +23,8 @@@ import org.apache.sis.test.TestCase import org.apache.sis.test.DependsOn; import org.junit.Test; - import static org.apache.sis.test.Assert.*; -import static org.opengis.test.Assert.*; ++import static org.junit.Assert.*; ++import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/BursaWolfParametersTest.java index 31b8e6dbd9,bdc2e483a0..29dc5b48f4 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/BursaWolfParametersTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/BursaWolfParametersTest.java @@@ -29,7 -29,9 +29,9 @@@ import org.apache.sis.test.DependsOnMet import org.apache.sis.test.TestCase; import org.junit.Test; - import static org.apache.sis.test.Assert.*; + import static org.junit.Assert.*; -import static org.opengis.test.Assert.assertMatrixEquals; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; + import static org.apache.sis.test.Assertions.assertSerializedEquals; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java index 99bec7d994,4ff39ba260..317158243d --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java @@@ -38,7 -38,12 +38,12 @@@ import org.apache.sis.test.DependsOn import org.apache.sis.test.TestStep; import org.junit.Test; - import static org.apache.sis.test.ReferencingAssert.*; + import static org.junit.Assert.*; + import static org.opengis.test.Assert.assertInstanceOf; -import static org.opengis.test.Assert.assertMatrixEquals; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; + import static org.apache.sis.test.Assertions.assertSerializedEquals; + import static org.apache.sis.metadata.Assertions.assertXmlEquals; + import static org.apache.sis.referencing.Assertions.assertWktEquals; import static org.apache.sis.referencing.GeodeticObjectVerifier.*; diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java index 78c8ceafe3,9b9bd50a42..6c25fd2b10 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java @@@ -26,7 -26,9 +26,9 @@@ import org.apache.sis.metadata.iso.cita import org.apache.sis.test.xml.TestCase; import org.junit.Test; - import static org.apache.sis.test.ReferencingAssert.*; + import static org.junit.Assert.*; -import static org.opengis.test.Assert.assertIdentifierEquals; ++import static org.apache.sis.test.GeoapiAssert.assertIdentifierEquals; + import static org.apache.sis.referencing.Assertions.assertWktEquals; import static org.apache.sis.test.TestUtilities.getSingleton; import static org.apache.sis.internal.util.StandardDateFormat.MILLISECONDS_PER_DAY; diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/TimeDependentBWPTest.java index a532ee0cee,1e15a867cf..7a39f55f69 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/TimeDependentBWPTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/TimeDependentBWPTest.java @@@ -26,7 -26,8 +26,8 @@@ import org.apache.sis.test.DependsOn import org.apache.sis.test.TestCase; import org.junit.Test; - import static org.apache.sis.test.Assert.*; + import static org.junit.Assert.*; -import static org.opengis.test.Assert.assertMatrixEquals; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; import static org.apache.sis.test.TestUtilities.date; import static org.apache.sis.internal.referencing.Formulas.JULIAN_YEAR_LENGTH; diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java index 579716d42e,9effce9a2b..1b22dbe7c6 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java @@@ -49,7 -49,12 +49,12 @@@ import org.apache.sis.test.TestCase import org.junit.Ignore; import org.junit.Test; - import static org.apache.sis.test.ReferencingAssert.*; + import static org.junit.Assert.*; + import static org.opengis.test.Assert.assertInstanceOf; -import static org.opengis.test.Assert.assertAxisDirectionsEqual; ++import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual; + import static org.apache.sis.test.Assertions.assertSetEquals; + import static org.apache.sis.test.Assertions.assertNotDeepEquals; + import static org.apache.sis.referencing.Assertions.assertWktEqualsRegex; import static org.apache.sis.test.TestUtilities.getSingleton; diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java index 067d5f4c67,240198e084..e5b8297308 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java @@@ -69,7 -69,12 +69,12 @@@ import org.apache.sis.test.DependsOn import org.apache.sis.referencing.factory.TestFactorySource; import static org.junit.Assume.assumeNotNull; - import static org.apache.sis.test.ReferencingAssert.*; + import static org.junit.Assert.*; + import static org.opengis.test.Assert.assertInstanceOf; -import static org.opengis.test.Assert.assertAxisDirectionsEqual; ++import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual; + import static org.apache.sis.test.Assertions.assertNotDeepEquals; + import static org.apache.sis.referencing.Assertions.assertEpsgNameAndIdentifierEqual; + import static org.apache.sis.referencing.Assertions.assertAliasTipEquals; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java index 17b83b9a99,c9b99b5379..1008391860 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java @@@ -64,12 -64,14 +64,14 @@@ import org.apache.sis.referencing.cs.Ha import org.apache.sis.test.TestUtilities; import org.apache.sis.test.DependsOnMethod; import org.apache.sis.test.DependsOn; - import org.apache.sis.test.Assert; -import org.opengis.test.Assert; import org.junit.BeforeClass; import org.junit.AfterClass; import org.junit.Test; - import static org.apache.sis.test.Assert.*; + import static org.junit.Assert.*; + import static org.opengis.test.Assert.assertInstanceOf; + import static org.apache.sis.test.Assertions.assertSetEquals; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; /** @@@ -704,7 -705,7 +706,7 @@@ public final class CoordinateOperationF assertInstanceOf("transform", LinearTransform.class, transform); assertEquals("sourceDimensions", 4, transform.getSourceDimensions()); assertEquals("targetDimensions", 2, transform.getTargetDimensions()); -- Assert.assertMatrixEquals("transform.matrix", Matrices.create(3, 5, new double[] { ++ assertMatrixEquals("transform.matrix", Matrices.create(3, 5, new double[] { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1 @@@ -747,7 -748,7 +749,7 @@@ assertInstanceOf("transform", LinearTransform.class, transform); assertEquals("sourceDimensions", 3, transform.getSourceDimensions()); assertEquals("targetDimensions", 2, transform.getTargetDimensions()); -- Assert.assertMatrixEquals("transform.matrix", Matrices.create(3, 4, new double[] { ++ assertMatrixEquals("transform.matrix", Matrices.create(3, 4, new double[] { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1 @@@ -790,7 -791,7 +792,7 @@@ assertInstanceOf("transform", LinearTransform.class, transform); assertEquals("sourceDimensions", 2, transform.getSourceDimensions()); assertEquals("targetDimensions", 3, transform.getTargetDimensions()); -- Assert.assertMatrixEquals("transform.matrix", Matrices.create(4, 3, new double[] { ++ assertMatrixEquals("transform.matrix", Matrices.create(4, 3, new double[] { 1, 0, 0, 0, 1, 0, 0, 0, 0, @@@ -830,7 -831,7 +832,7 @@@ assertInstanceOf("transform", LinearTransform.class, transform); assertEquals("sourceDimensions", 3, transform.getSourceDimensions()); assertEquals("targetDimensions", 1, transform.getTargetDimensions()); -- Assert.assertMatrixEquals("transform.matrix", Matrices.create(2, 4, new double[] { ++ assertMatrixEquals("transform.matrix", Matrices.create(2, 4, new double[] { 0, 0, 100, 0, 0, 0, 0, 1 }), ((LinearTransform) transform).getMatrix(), STRICT); @@@ -870,7 -871,7 +872,7 @@@ assertInstanceOf("transform", LinearTransform.class, transform); assertEquals("sourceDimensions", 4, transform.getSourceDimensions()); assertEquals("targetDimensions", 1, transform.getTargetDimensions()); -- Assert.assertMatrixEquals("transform.matrix", Matrices.create(2, 5, new double[] { ++ assertMatrixEquals("transform.matrix", Matrices.create(2, 5, new double[] { 0, 0, 1, 0, 0, 0, 0, 0, 0, 1 }), ((LinearTransform) transform).getMatrix(), STRICT); @@@ -943,7 -944,7 +945,7 @@@ assertEquals("sourceDimensions", 4, transform.getSourceDimensions()); assertEquals("targetDimensions", 2, transform.getTargetDimensions()); -- Assert.assertMatrixEquals("transform.matrix", Matrices.create(3, 5, new double[] { ++ assertMatrixEquals("transform.matrix", Matrices.create(3, 5, new double[] { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1 @@@ -983,7 -984,7 +985,7 @@@ assertInstanceOf("transform", LinearTransform.class, transform); assertEquals("sourceDimensions", 3, transform.getSourceDimensions()); assertEquals("targetDimensions", 4, transform.getTargetDimensions()); -- Assert.assertMatrixEquals("transform.matrix", Matrices.create(5, 4, new double[] { ++ assertMatrixEquals("transform.matrix", Matrices.create(5, 4, new double[] { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, @@@ -1031,7 -1032,7 +1033,7 @@@ assertInstanceOf("transform", LinearTransform.class, transform); assertEquals("sourceDimensions", 3, transform.getSourceDimensions()); assertEquals("targetDimensions", 2, transform.getTargetDimensions()); -- Assert.assertMatrixEquals("transform.matrix", Matrices.create(3, 4, new double[] { ++ assertMatrixEquals("transform.matrix", Matrices.create(3, 4, new double[] { 12, 0, 0, 480, 0, -12, 0, 790, 0, 0, 0, 1 @@@ -1064,7 -1065,7 +1066,7 @@@ assertInstanceOf("transform", LinearTransform.class, transform); assertEquals("sourceDimensions", 2, transform.getSourceDimensions()); assertEquals("targetDimensions", 2, transform.getTargetDimensions()); -- Assert.assertMatrixEquals("transform.matrix", Matrices.create(3, 3, new double[] { ++ assertMatrixEquals("transform.matrix", Matrices.create(3, 3, new double[] { 1, 0, 0, 0, -1, 0, 0, 0, 1 diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperationTest.java index 8984ac7d42,945f8f64dc..194b42ba0e --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperationTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperationTest.java @@@ -35,9 -35,12 +35,14 @@@ import org.apache.sis.test.DependsOn import org.apache.sis.test.xml.TestCase; import org.junit.Test; - import static org.apache.sis.test.ReferencingAssert.*; + import static org.junit.Assert.*; + import static org.opengis.test.Assert.assertInstanceOf; -import static org.opengis.test.Assert.assertIdentifierEquals; + import static org.apache.sis.referencing.Assertions.assertWktEquals; import static org.apache.sis.test.TestUtilities.getSingleton; ++// Branch-specific imports ++import static org.apache.sis.test.GeoapiAssert.assertIdentifierEquals; ++ /** * Tests the {@link DefaultConcatenatedOperation} class. diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConversionTest.java index 7c68c52a47,77c8ea27b2..4c90386930 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConversionTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConversionTest.java @@@ -49,7 -49,9 +49,9 @@@ import org.apache.sis.test.DependsOn import org.apache.sis.test.TestCase; import org.junit.Test; - import static org.apache.sis.test.MetadataAssert.*; + import static org.junit.Assert.*; -import static org.opengis.test.Assert.assertMatrixEquals; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; + import static org.apache.sis.test.Assertions.assertSerializedEquals; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultPassThroughOperationTest.java index bb022ac9ad,c91cfa8616..d47e13f909 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultPassThroughOperationTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultPassThroughOperationTest.java @@@ -27,8 -27,8 +27,10 @@@ import org.apache.sis.test.DependsOn import org.apache.sis.test.xml.TestCase; import org.junit.Test; ++import static org.junit.Assert.*; ++import static org.opengis.test.Assert.assertInstanceOf; ++import static org.apache.sis.test.GeoapiAssert.assertIdentifierEquals; import static org.apache.sis.test.TestUtilities.getSingleton; - import static org.apache.sis.test.Assert.*; -import static org.opengis.test.Assert.*; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/SingleOperationMarshallingTest.java index 6e7ed46adb,6a1fee7dbd..0a16c3d17c --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/SingleOperationMarshallingTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/SingleOperationMarshallingTest.java @@@ -47,7 -47,11 +47,11 @@@ import org.junit.Test import static org.apache.sis.metadata.iso.citation.Citations.EPSG; import static org.apache.sis.test.TestUtilities.getSingleton; - import static org.apache.sis.test.ReferencingAssert.*; + import static org.junit.Assert.*; + import static org.opengis.test.Assert.assertInstanceOf; -import static org.opengis.test.Assert.assertIdentifierEquals; -import static org.opengis.test.Assert.assertMatrixEquals; ++import static org.apache.sis.test.GeoapiAssert.assertIdentifierEquals; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; + import static org.apache.sis.metadata.Assertions.assertXmlEquals; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LinearTransformBuilderTest.java index e3ff1daae5,4160e55548..11e7af6c11 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LinearTransformBuilderTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LinearTransformBuilderTest.java @@@ -34,7 -34,9 +34,9 @@@ import org.apache.sis.test.TestUtilitie import org.apache.sis.test.TestCase; import org.junit.Test; - import static org.apache.sis.test.Assert.*; + import static org.junit.Assert.*; -import static org.opengis.test.Assert.assertMatrixEquals; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; + import static org.apache.sis.test.Assertions.assertMapEquals; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LinearizerTest.java index a973b1cb66,f439168913..55e04077ab --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LinearizerTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LinearizerTest.java @@@ -28,6 -28,6 +28,7 @@@ import org.apache.sis.test.TestCase import org.junit.Test; import static org.junit.Assert.*; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; /** @@@ -62,7 -62,7 +63,7 @@@ public final class LinearizerTest exten // Linear approximation by Least Square Root method. final LinearTransform linear = LinearTransformBuilder.approximate(transform, new Envelope2D(null, 0, 0, 3, 5)); - org.apache.sis.test.Assert.assertMatrixEquals("linear", - org.opengis.test.Assert.assertMatrixEquals("linear", ++ assertMatrixEquals("linear", new Matrix3(111319, 0, 0, 0, 110662, -62, 0, 0, 1), linear.getMatrix(), 0.5); diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/ResidualGridTest.java index 96b5ad4b6e,7fe0f9502d..c9f257af01 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/ResidualGridTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/ResidualGridTest.java @@@ -24,7 -24,7 +24,8 @@@ import org.apache.sis.test.DependsOnMet import org.apache.sis.test.TestCase; import org.junit.Test; - import static org.apache.sis.test.Assert.*; -import static org.opengis.test.Assert.*; ++import static org.junit.Assert.*; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatricesTest.java index cb65552699,aa8f6e0375..394cf4c40c --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatricesTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatricesTest.java @@@ -32,8 -32,10 +32,10 @@@ import org.apache.sis.test.TestCase import org.junit.Test; import static java.lang.Double.NaN; - import static org.apache.sis.test.Assert.*; import static org.opengis.referencing.cs.AxisDirection.*; + import static org.junit.Assert.*; -import static org.opengis.test.Assert.assertMatrixEquals; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; + import static org.apache.sis.test.Assertions.assertMultilinesEquals; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix4Test.java index 4327cddda4,cbb5ca03f2..bbe7a5a532 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix4Test.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix4Test.java @@@ -20,7 -20,7 +20,8 @@@ import org.apache.sis.test.DependsOn import org.junit.Test; import static java.lang.Double.NaN; - import static org.apache.sis.test.Assert.*; -import static org.opengis.test.Assert.*; ++import static org.junit.Assert.*; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; import static org.apache.sis.referencing.operation.matrix.Matrix4.SIZE; diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java index 7376c5c599,eae9da3a9f..63315cb367 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java @@@ -28,7 -28,9 +28,9 @@@ import org.apache.sis.test.DependsOnMet import org.junit.Test; import static java.lang.StrictMath.*; - import static org.apache.sis.test.Assert.*; + import static org.junit.Assert.*; -import static org.opengis.test.Assert.assertMatrixEquals; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; + import static org.apache.sis.test.Assertions.assertSerializedEquals; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java index cb063c4622,57d200330a..74662f3429 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java @@@ -23,7 -23,7 +23,8 @@@ import org.junit.AfterClass import org.junit.Test; import static java.lang.Double.NaN; - import static org.apache.sis.test.Assert.*; -import static org.opengis.test.Assert.*; ++import static org.junit.Assert.*; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java index f981c2a8a5,fe39216e2b..e3de464990 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java @@@ -35,12 -36,9 +35,13 @@@ import org.junit.Test import static java.lang.StrictMath.*; import static java.lang.Double.*; - import static org.apache.sis.test.Assert.*; + import static org.junit.Assert.*; + import static org.apache.sis.test.Assertions.assertSerializedEquals; +// Branch-specific imports +import static org.junit.Assume.assumeTrue; - import static org.apache.sis.test.Assert.PENDING_NEXT_GEOAPI_RELEASE; ++import static org.apache.sis.test.GeoapiAssert.PENDING_NEXT_GEOAPI_RELEASE; + /** * Tests the {@link LambertConicConformal} class. We test using various values of the latitude of origin. diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java index fc19a2a296,76998ee776..5bb4ed40d8 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java @@@ -38,10 -40,6 +38,10 @@@ import static java.lang.StrictMath.* import static org.opengis.test.Assert.*; import static org.apache.sis.referencing.operation.projection.ConformalProjectionTest.LN_INFINITY; +// Branch-specific imports +import static org.junit.Assume.assumeTrue; - import static org.apache.sis.test.Assert.PENDING_NEXT_GEOAPI_RELEASE; ++import static org.apache.sis.test.GeoapiAssert.PENDING_NEXT_GEOAPI_RELEASE; + /** * Tests the {@link Mercator} projection. diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java index d665473ca7,2eb73b0d27..c8ca9b95a5 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java @@@ -32,7 -33,7 +32,8 @@@ import org.apache.sis.test.DependsOn import org.junit.Test; import static java.lang.StrictMath.*; - import static org.apache.sis.test.Assert.*; + import static org.junit.Assert.*; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ParameterizedTransformTestMock.java index ed1675affa,0000000000..88faa4826b mode 100644,000000..100644 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ParameterizedTransformTestMock.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ParameterizedTransformTestMock.java @@@ -1,79 -1,0 +1,81 @@@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.sis.referencing.operation.projection; + +import org.opengis.referencing.operation.MathTransformFactory; + +import static org.junit.Assume.*; - import static org.apache.sis.test.Assert.*; ++ ++// Branch-dependent imports ++import static org.apache.sis.test.GeoapiAssert.PENDING_NEXT_GEOAPI_RELEASE; + + +/** + * Placeholder for a GeoAPI 3.1 method which was not available in GeoAPI 3.0. + * This placeholder does nothing. See Apache SIS JDK6 branch for a real test. + * + * @author Martin Desruisseaux (Geomatys) + * @since 0.5 + * @version 0.6 + */ +final class ParameterizedTransformTestMock { + ParameterizedTransformTestMock(MathTransformFactory factory) { + // See GeoAPI 3.1 for real construction. + } + + public void testMercator1SP() { + // See GeoAPI 3.1 for the real test. + // The test is run on Apache SIS branches. + assumeTrue(PENDING_NEXT_GEOAPI_RELEASE); // For reporting the test as skippped. + } + + public void testMercator2SP() { + // See GeoAPI 3.1 for the real test. + // The test is run on Apache SIS branches. + assumeTrue(PENDING_NEXT_GEOAPI_RELEASE); // For reporting the test as skippped. + } + + public void testPseudoMercator() { + // See GeoAPI 3.1 for the real test. + // The test is run on Apache SIS branches. + assumeTrue(PENDING_NEXT_GEOAPI_RELEASE); // For reporting the test as skippped. + } + + public void testMiller() { + // See GeoAPI 3.1 for the real test. + // The test is run on Apache SIS branches. + assumeTrue(PENDING_NEXT_GEOAPI_RELEASE); // For reporting the test as skippped. + } + + public void testLambertConicConformal1SP() { + // See GeoAPI 3.1 for the real test. + // The test is run on Apache SIS branches. + assumeTrue(PENDING_NEXT_GEOAPI_RELEASE); // For reporting the test as skippped. + } + + public void testLambertConicConformal2SP() { + // See GeoAPI 3.1 for the real test. + // The test is run on Apache SIS branches. + assumeTrue(PENDING_NEXT_GEOAPI_RELEASE); // For reporting the test as skippped. + } + + public void testLambertConicConformalBelgium() { + // See GeoAPI 3.1 for the real test. + // The test is run on Apache SIS branches. + assumeTrue(PENDING_NEXT_GEOAPI_RELEASE); // For reporting the test as skippped. + } +} diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java index 45c3340f61,5029b34d4f..63ce78518e --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java @@@ -34,8 -34,9 +34,8 @@@ import org.junit.Test import static java.lang.Double.NaN; import static java.lang.StrictMath.abs; import static java.lang.StrictMath.toRadians; - import static org.apache.sis.test.Assert.*; + import static org.apache.sis.test.Assertions.assertSerializedEquals; import static org.apache.sis.internal.referencing.provider.TransverseMercator.LATITUDE_OF_ORIGIN; -import org.opengis.test.CalculationType; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformTest.java index bbd751e9d1,fd7b92a5da..1d4b0df117 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformTest.java @@@ -27,9 -27,9 +27,10 @@@ import org.apache.sis.referencing.opera import org.apache.sis.referencing.operation.matrix.Matrix4; import org.apache.sis.test.DependsOn; import org.junit.Test; - import org.apache.sis.test.Assert; -import org.opengis.test.Assert; --import static org.opengis.test.Assert.*; ++import static org.junit.Assert.*; ++import static org.opengis.test.Assert.assertInstanceOf; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; /** @@@ -178,7 -178,7 +179,7 @@@ public final class ConcatenatedTransfor * Dropping a dimension is not a problem. */ final MathTransform c = MathTransforms.concatenate(tr1, tr2.inverse()); -- Assert.assertMatrixEquals("Forward", Matrices.create(3, 4, new double[] { ++ assertMatrixEquals("Forward", Matrices.create(3, 4, new double[] { 4, 0, 0, 0, // scale = 8/2 0, 2, 0, 0, // scale = 6/3 0, 0, 0, 1}), MathTransforms.getMatrix(c), STRICT); @@@ -189,7 -189,7 +190,7 @@@ * this concatenation was built from a transform which was putting value 5 in third dimension, * we can complete the matrix as below with value 10 in third dimension. */ -- Assert.assertMatrixEquals("Inverse", Matrices.create(4, 3, new double[] { ++ assertMatrixEquals("Inverse", Matrices.create(4, 3, new double[] { 0.25, 0, 0, 0, 0.5, 0, 0, 0, 10, // Having value 10 instead of NaN is the main purpose of this test. @@@ -211,6 -211,6 +212,6 @@@ final MathTransform tr2 = MathTransforms.linear(new Matrix2(-1, 0, 0, 1)); final MathTransform c = MathTransforms.concatenate(tr1, tr2); final Matrix m = ((LinearTransform) c).getMatrix(); -- Assert.assertMatrixEquals("Concatenate", new Matrix2(-4.9E-324, 5387, 0, 1), m, STRICT); ++ assertMatrixEquals("Concatenate", new Matrix2(-4.9E-324, 5387, 0, 1), m, STRICT); } } diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ContextualParametersTest.java index e83a5eb49a,f2a4486753..c5d6c0f46b --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ContextualParametersTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ContextualParametersTest.java @@@ -31,7 -31,7 +31,8 @@@ import org.junit.Test import static java.lang.StrictMath.PI; import static java.lang.StrictMath.toRadians; - import static org.apache.sis.test.Assert.*; -import static org.opengis.test.Assert.*; ++import static org.junit.Assert.*; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java index ed6b315ec5,a9c0b9731f..1f4dd6ea43 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java @@@ -48,7 -48,7 +48,9 @@@ import org.apache.sis.test.DependsOn import org.apache.sis.test.TestCase; import org.junit.Test; - import static org.apache.sis.test.Assert.*; -import static org.opengis.test.Assert.*; ++import static org.junit.Assert.*; ++import static org.opengis.test.Assert.assertInstanceOf; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ExponentialTransform1DTest.java index 57dc583422,742d64a97b..b7210d8db6 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ExponentialTransform1DTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ExponentialTransform1DTest.java @@@ -24,8 -25,15 +24,10 @@@ import static java.lang.StrictMath.* import org.junit.Test; import org.apache.sis.test.DependsOn; import org.apache.sis.test.DependsOnMethod; - import static org.apache.sis.test.ReferencingAssert.*; + import static org.junit.Assert.*; + import static org.opengis.test.Assert.assertInstanceOf; + import static org.apache.sis.referencing.Assertions.assertIsNotIdentity; -// Branch-dependent imports -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 core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LogarithmicTransform1DTest.java index 70bd09e58d,90b600de81..4f433129df --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LogarithmicTransform1DTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LogarithmicTransform1DTest.java @@@ -24,8 -24,12 +24,9 @@@ import static java.lang.StrictMath.* import org.junit.Test; import org.apache.sis.test.DependsOn; import org.apache.sis.test.DependsOnMethod; - import static org.apache.sis.test.ReferencingAssert.*; + import static org.opengis.test.Assert.assertInstanceOf; + import static org.apache.sis.referencing.Assertions.assertIsNotIdentity; -// Branch-dependent imports -import org.opengis.test.ToleranceModifier; - /** * Tests the {@link LogarithmicTransform1D} class. Note that this is closely related to diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java index 0894efe463,69ceb99a1c..71a6d2a63e --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java @@@ -37,8 -40,9 +37,8 @@@ import static java.lang.StrictMath.* // Test imports import org.opengis.test.Validators; -import org.opengis.test.referencing.TransformTestCase; import org.apache.sis.test.TestUtilities; - import org.apache.sis.test.ReferencingAssert; + import org.apache.sis.referencing.Assertions; import org.apache.sis.referencing.operation.matrix.MatrixTestCase; import static org.opengis.test.Assert.*; diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformsTest.java index 4d8534587c,974071affb..997bdd3228 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformsTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformsTest.java @@@ -33,7 -33,7 +33,9 @@@ import org.apache.sis.test.DependsOn import org.apache.sis.test.TestCase; import org.junit.Test; - import static org.apache.sis.test.Assert.*; -import static org.opengis.test.Assert.*; ++import static org.junit.Assert.*; ++import static org.opengis.test.Assert.assertInstanceOf; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java index fccdb300f8,6a902bf2b3..6712429d88 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java @@@ -37,9 -43,15 +37,10 @@@ import org.apache.sis.referencing.datum import org.apache.sis.test.DependsOnMethod; import org.apache.sis.test.DependsOn; import org.apache.sis.test.TestUtilities; -import org.apache.sis.test.TestCase; -import org.opengis.test.CalculationType; -import org.opengis.test.ToleranceModifier; -import org.opengis.test.ToleranceModifiers; -import org.opengis.test.referencing.ParameterizedTransformTest; import org.junit.Test; - import static org.apache.sis.test.Assert.*; + import static org.junit.Assert.*; + import static org.opengis.test.Assert.assertInstanceOf; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PassThroughTransformTest.java index 0b692d6e3f,00185fec10..a414121678 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PassThroughTransformTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PassThroughTransformTest.java @@@ -33,10 -33,11 +33,8 @@@ import org.apache.sis.util.ArraysExt import org.junit.Test; import org.apache.sis.test.TestUtilities; import org.apache.sis.test.DependsOn; - import static org.apache.sis.test.Assert.*; - - // Branch-dependent imports - // (all imports removed) + import static org.junit.Assert.*; - -// Branch-dependent imports -import org.opengis.test.CalculationType; -import org.opengis.test.ToleranceModifier; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java index 48a37f4223,db8f374a07..c01fba0539 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java @@@ -39,7 -40,7 +39,7 @@@ import org.apache.sis.test.DependsOn import org.junit.runner.RunWith; import org.junit.After; import org.junit.Test; - import org.apache.sis.test.Assert; -import org.opengis.test.Assert; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; import static org.opengis.test.Assert.*; // Branch-dependent imports @@@ -239,8 -168,9 +239,8 @@@ public class ProjectiveTransformTest ex public void testOptimizeConstant() throws FactoryException, TransformException { matrix = new Matrix2(0, 10, 0, 1); transform = mtFactory.createAffineTransform(matrix); -- Assert.assertMatrixEquals("Transform shall use the given matrix unmodified.", ++ assertMatrixEquals("Transform shall use the given matrix unmodified.", matrix, ((LinearTransform) transform).getMatrix(), STRICT); - verifyConsistency(1, 2, 3, -3, -2, -1); } /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java index 844c4f4767,5193743c32..3c3099ac49 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java @@@ -24,7 -24,7 +24,7 @@@ import org.apache.sis.internal.util.Dou import org.apache.sis.test.DependsOnMethod; import org.apache.sis.test.DependsOn; - import org.apache.sis.test.Assert; -import org.opengis.test.Assert; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; import org.junit.Test; import static org.opengis.test.Assert.*; @@@ -51,7 -51,7 +51,7 @@@ public final class ScaleTransformTest e final ScaleTransform tr = new ScaleTransform(matrix.getNumRow(), matrix.getNumCol(), elements); assertEquals("sourceDimensions", sourceDimensions, tr.getSourceDimensions()); assertEquals("targetDimensions", targetDimensions, tr.getTargetDimensions()); -- Assert.assertMatrixEquals("matrix", matrix, tr.getMatrix(), 0.0); ++ assertMatrixEquals("matrix", matrix, tr.getMatrix(), 0.0); assertArrayEquals("elements", elements, TranslationTransformTest.getElementAsNumbers(tr)); transform = tr; validate(); @@@ -134,7 -134,7 +134,7 @@@ final ScaleTransform tr = new ScaleTransform(4, 4, elements); assertEquals("sourceDimensions", 3, tr.getSourceDimensions()); assertEquals("targetDimensions", 3, tr.getTargetDimensions()); -- Assert.assertMatrixEquals("matrix", matrix, tr.getMatrix(), 0.0); ++ assertMatrixEquals("matrix", matrix, tr.getMatrix(), 0.0); TranslationTransformTest.replaceZeroByNull(elements, O); assertArrayEquals("elements", elements, tr.getElementAsNumbers(false)); diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransferFunctionTest.java index a4ceadd82f,e25c506bab..7765c1958b --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransferFunctionTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransferFunctionTest.java @@@ -28,7 -28,7 +28,9 @@@ import org.apache.sis.test.DependsOn import org.apache.sis.test.TestCase; import org.junit.Test; - import static org.apache.sis.test.Assert.*; -import static org.opengis.test.Assert.*; ++import static org.junit.Assert.*; ++import static org.opengis.test.Assert.assertInstanceOf; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformResultComparator.java index 8daecc4b93,72818dfe63..0a2cee361d --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformResultComparator.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformResultComparator.java @@@ -26,7 -26,7 +26,8 @@@ import org.opengis.referencing.operatio import org.opengis.referencing.operation.TransformException; import org.opengis.referencing.operation.NoninvertibleTransformException; - import static org.apache.sis.test.Assert.*; -import static org.opengis.test.Assert.*; ++import static org.junit.Assert.*; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformSeparatorTest.java index fce4735427,0fd25c1d37..b9e8d6b1f3 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformSeparatorTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformSeparatorTest.java @@@ -38,7 -38,7 +38,9 @@@ import org.apache.sis.test.TestCase import org.junit.Test; import static java.lang.Double.NaN; - import static org.apache.sis.test.Assert.*; -import static org.opengis.test.Assert.*; ++import static org.junit.Assert.*; ++import static org.opengis.test.Assert.assertInstanceOf; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformTestCase.java index cc951aafa6,0000000000..c7f4a94754 mode 100644,000000..100644 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformTestCase.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformTestCase.java @@@ -1,67 -1,0 +1,69 @@@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.sis.referencing.operation.transform; + +import java.util.Random; + +import static org.junit.Assume.*; - import static org.apache.sis.test.Assert.*; ++ ++// Branch-dependent imports ++import static org.apache.sis.test.GeoapiAssert.PENDING_NEXT_GEOAPI_RELEASE; + + +/** + * Placeholder for a GeoAPI 3.1 method which was not available in GeoAPI 3.0. + * This placeholder does nothing. See Apache SIS JDK6 branch for a real test. + * + * @author Martin Desruisseaux (Geomatys) + * @since 0.5 + * @version 0.6 + */ +public class TransformTestCase extends org.opengis.test.referencing.TransformTestCase { + /** + * The deltas to use for approximating math transform derivatives by the finite differences method. + */ + protected double[] derivativeDeltas; + + /** + * Placeholder for a GeoAPI 3.1 method which was not available in GeoAPI 3.0. + * This placeholder does nothing. See Apache SIS JDK6 branch for a real test. + * + * @param coordinate Ignored. + */ + protected final void verifyDerivative(final double... coordinate) { + // See GeoAPI 3.1 for the real test. + // The test is run on Apache SIS branches. + assumeTrue(PENDING_NEXT_GEOAPI_RELEASE); // For reporting the test as skippped. + } + + /** + * Placeholder for a GeoAPI 3.1 method which was not available in GeoAPI 3.0. + * This placeholder does nothing. See Apache SIS JDK6 branch for a real test. + * + * @param minOrdinates Ignored. + * @param maxOrdinates Ignored. + * @param numOrdinates Ignored. + * @param randomGenerator Ignored. + */ + protected final void verifyInDomain(final double[] minOrdinates, final double[] maxOrdinates, + final int[] numOrdinates, final Random randomGenerator) + { + // See GeoAPI 3.1 for the real test. + // The test is run on Apache SIS branches. + assumeTrue(PENDING_NEXT_GEOAPI_RELEASE); // For reporting the test as skippped. + } +} diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TranslationTransformTest.java index edffba82fd,204693baf0..f23fd997d2 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TranslationTransformTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TranslationTransformTest.java @@@ -25,9 -25,10 +25,10 @@@ import org.apache.sis.internal.util.Dou import org.apache.sis.test.DependsOnMethod; import org.apache.sis.test.DependsOn; -import org.opengis.test.Assert; import org.junit.Test; - import static org.apache.sis.test.Assert.*; -import static org.opengis.test.Assert.*; ++import static org.junit.Assert.*; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/WraparoundTransformTest.java index b6e539aba6,8c2991602b..518b51be42 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/WraparoundTransformTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/WraparoundTransformTest.java @@@ -30,7 -30,7 +30,8 @@@ import org.apache.sis.referencing.crs.H import org.apache.sis.test.TestCase; import org.junit.Test; - import static org.apache.sis.test.Assert.*; -import static org.opengis.test.Assert.*; ++import static org.junit.Assert.*; ++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; /** diff --cc core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java index 1dc884286e,f495a49029..a871b6293d --- a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java @@@ -76,10 -76,8 +76,10 @@@ import org.junit.After import org.junit.Rule; import org.junit.Test; - import static org.apache.sis.test.Assert.*; + import static org.junit.Assert.*; +import org.apache.sis.internal.geoapi.evolution.UnsupportedCodeList; + /** * Tests XML (un)marshalling of a metadata object containing various elements diff --cc core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataVerticalTest.java index 8375c17b7f,6e0c6b748b..a8d5d1acbb --- a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataVerticalTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataVerticalTest.java @@@ -50,7 -50,9 +50,9 @@@ import org.junit.After import org.junit.Rule; import org.junit.Test; - import static org.apache.sis.test.Assert.*; + import static org.junit.Assert.*; + import static org.opengis.test.Assert.assertInstanceOf; -import static org.opengis.test.Assert.assertIdentifierEquals; ++import static org.apache.sis.test.GeoapiAssert.assertIdentifierEquals; import static org.apache.sis.test.TestUtilities.getSingleton; diff --cc core/sis-utility/src/test/java/org/apache/sis/test/GeoapiAssert.java index 165cba7cfe,0000000000..d47b52e5b6 mode 100644,000000..100644 --- a/core/sis-utility/src/test/java/org/apache/sis/test/GeoapiAssert.java +++ b/core/sis-utility/src/test/java/org/apache/sis/test/GeoapiAssert.java @@@ -1,195 -1,0 +1,196 @@@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.sis.test; + +import org.opengis.metadata.citation.Citation; +import org.opengis.referencing.ReferenceIdentifier; +import org.opengis.referencing.cs.AxisDirection; +import org.opengis.referencing.cs.CoordinateSystem; +import org.opengis.referencing.operation.Matrix; +import org.opengis.util.InternationalString; ++import org.apache.sis.util.Static; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + + +/** + * Temporary class for test methods that are expected to be provided in next GeoAPI release. + * Those methods are defined in a separated class in order to make easier for us to identify + * which methods may be removed from SIS (actually moved to GeoAPI) in a future GeoAPI release. + * + * <p>This class is needed for Apache SIS trunk, since the later is linked to GeoAPI official release. + * But this class can be removed on Apache SIS branches which are linked to a GeoAPI development branch.</p> + * + * @author Martin Desruisseaux (Geomatys) - * @since 0.3 ++ * @since 1.4 + * @version 0.3 + */ - class GeoapiAssert extends org.opengis.test.Assert { ++public final class GeoapiAssert extends Static { + /** + * A flag for code that are pending next GeoAPI release before to be enabled. + * This flag is always set to {@code false}, except occasionally just before + * a GeoAPI release for testing purpose. It shall be used as below: + * + * {@snippet lang="java" : + * if (PENDING_NEXT_GEOAPI_RELEASE) { + * // Do some stuff here. + * } + * } + * + * The intend is to make easier to identify test cases that fail with the current version + * of the {@code geoapi-conformance} module, but should pass with the development snapshot. + */ + public static final boolean PENDING_NEXT_GEOAPI_RELEASE = false; + + /** + * The keyword for unrestricted value in {@link String} arguments. + */ + private static final String UNRESTRICTED = "##unrestricted"; + + /** - * For subclass constructor only. ++ * Do not allow instantiation of this class. + */ - GeoapiAssert() { ++ private GeoapiAssert() { + } + + /** + * Returns the concatenation of the given message with the given extension. + * This method returns the given extension if the message is null or empty. + * + * <p>Invoking this method is equivalent to invoking {@code nonNull(message) + ext}, + * but avoid the creation of temporary objects in the common case where the message + * is null.</p> + * + * @param message The message, or {@code null}. + * @param ext The extension to append after the message. + * @return The concatenated string. + */ + private static String concat(String message, final String ext) { + if (message == null || (message = message.trim()).isEmpty()) { + return ext; + } + return message + ' ' + ext; + } + + /** + * Verifies if we expected a null value, then returns {@code true} if the value is null as expected. + */ + private static boolean isNull(final String message, final Object expected, final Object actual) { + final boolean isNull = (actual == null); + if (isNull != (expected == null)) { + fail(concat(message, isNull ? "Value is null." : "Expected null.")); + } + return isNull; + } + + /** + * Asserts that the title or an alternate title of the given citation is equal to the given string. + * This method is typically used for testing if a citation stands for the OGC, OGP or EPSG authority + * for instance. Such abbreviations are often declared as {@linkplain Citation#getAlternateTitles() + * alternate titles} rather than the main {@linkplain Citation#getTitle() title}, but this method + * tests both for safety. + * + * @param message Header of the exception message in case of failure, or {@code null} if none. + * @param expected The expected title or alternate title. + * @param actual The citation to test. + */ + public static void assertAnyTitleEquals(final String message, final String expected, final Citation actual) { + if (isNull(message, expected, actual)) { + return; + } + InternationalString title = actual.getTitle(); + if (title != null && expected.equals(title.toString())) { + return; + } + for (final InternationalString t : actual.getAlternateTitles()) { + if (expected.equals(t.toString())) { + return; + } + } + fail(concat(message, '"' + expected + "\" not found in title or alternate titles.")); + } + + /** + * Asserts that the given identifier is equals to the given authority, code space, version and code. + * If any of the above-cited properties is {@code ""##unrestricted"}, then it will not be verified. + * This flexibility is useful in the common case where a test accepts any {@code version} value. + * + * @param message Header of the exception message in case of failure, or {@code null} if none. + * @param authority The expected authority title or alternate title (may be {@code null}), or {@code "##unrestricted"}. + * @param codeSpace The expected code space (may be {@code null}), or {@code "##unrestricted"}. + * @param version The expected version (may be {@code null}), or {@code "##unrestricted"}. + * @param code The expected code value (may be {@code null}), or {@code "##unrestricted"}. + * @param actual The identifier to test. + */ + public static void assertIdentifierEquals(final String message, final String authority, final String codeSpace, + final String version, final String code, final ReferenceIdentifier actual) + { + if (actual == null) { + fail(concat(message, "Identifier is null")); + } else { + if (!UNRESTRICTED.equals(authority)) assertAnyTitleEquals(message, authority, actual.getAuthority()); + if (!UNRESTRICTED.equals(codeSpace)) assertEquals (concat(message, "Wrong code space"), codeSpace, actual.getCodeSpace()); + if (!UNRESTRICTED.equals(version)) assertEquals (concat(message, "Wrong version"), version, actual.getVersion()); + if (!UNRESTRICTED.equals(code)) assertEquals (concat(message, "Wrong code"), code, actual.getCode()); + } + } + + /** + * Asserts that all axes in the given coordinate system are pointing toward the given directions, in the same order. + * + * @param message Header of the exception message in case of failure, or {@code null} if none. + * @param cs The coordinate system to test. + * @param expected The expected axis directions. + */ + public static void assertAxisDirectionsEqual(String message, + final CoordinateSystem cs, final AxisDirection... expected) + { + assertEquals(concat(message, "Wrong coordinate system dimension."), expected.length, cs.getDimension()); + message = concat(message, "Wrong axis direction."); + for (int i=0; i<expected.length; i++) { + assertEquals(message, expected[i], cs.getAxis(i).getDirection()); + } + } + + /** + * Asserts that the given matrix is equals to the expected one, up to the given tolerance value. + * + * @param message Header of the exception message in case of failure, or {@code null} if none. + * @param expected The expected matrix, which may be {@code null}. + * @param actual The matrix to compare, or {@code null}. + * @param tolerance The tolerance threshold. + */ + public static void assertMatrixEquals(final String message, final Matrix expected, final Matrix actual, final double tolerance) { + if (isNull(message, expected, actual)) { + return; + } + final int numRow = actual.getNumRow(); + final int numCol = actual.getNumCol(); + assertEquals("numRow", expected.getNumRow(), numRow); + assertEquals("numCol", expected.getNumCol(), numCol); + for (int j=0; j<numRow; j++) { + for (int i=0; i<numCol; i++) { + final double e = expected.getElement(j,i); + final double a = actual.getElement(j,i); + if (!(StrictMath.abs(e - a) <= tolerance) && Double.doubleToLongBits(a) != Double.doubleToLongBits(e)) { + fail("Matrix.getElement(" + j + ", " + i + "): expected " + e + " but got " + a); + } + } + } + } +} diff --cc storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/GridTest.java index 3c42b4c8fe,9d39b4bcb7..c9e9efe33c --- a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/GridTest.java +++ b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/GridTest.java @@@ -22,9 -22,10 +22,10 @@@ import org.opengis.parameter.ParameterV import org.apache.sis.storage.DataStoreException; import org.apache.sis.test.DependsOn; import org.apache.sis.test.DependsOnMethod; -import org.opengis.test.dataset.TestData; import org.junit.Test; --import static org.opengis.test.Assert.*; ++import static org.junit.Assert.*; ++import static org.opengis.test.Assert.assertInstanceOf; import static org.apache.sis.test.TestUtilities.getSingleton; diff --cc storage/sis-sqlstore/src/test/java/org/apache/sis/storage/sql/SQLStoreTest.java index 2718962fc0,53bb6abf66..2708c1fa4b --- a/storage/sis-sqlstore/src/test/java/org/apache/sis/storage/sql/SQLStoreTest.java +++ b/storage/sis-sqlstore/src/test/java/org/apache/sis/storage/sql/SQLStoreTest.java @@@ -34,14 -34,18 +34,16 @@@ import org.apache.sis.internal.sql.feat import org.apache.sis.test.sql.TestDatabase; import org.apache.sis.test.TestUtilities; - import static org.apache.sis.test.Assert.*; + import static org.junit.Assert.*; + import static org.opengis.test.Assert.assertInstanceOf; + import static org.apache.sis.test.Assertions.assertSetEquals; // Branch-dependent imports -import org.opengis.feature.Feature; -import org.opengis.feature.FeatureType; -import org.opengis.feature.PropertyType; -import org.opengis.feature.AttributeType; -import org.opengis.feature.FeatureAssociationRole; -import org.opengis.filter.FilterFactory; -import org.opengis.filter.SortOrder; +import org.apache.sis.feature.AbstractFeature; +import org.apache.sis.feature.DefaultFeatureType; +import org.apache.sis.feature.AbstractIdentifiedType; +import org.apache.sis.feature.DefaultAttributeType; +import org.apache.sis.feature.DefaultAssociationRole; /** diff --cc storage/sis-storage/src/test/java/org/apache/sis/internal/storage/wkt/StoreTest.java index 399b47fe09,a452dcbebf..8a22d08c87 --- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/wkt/StoreTest.java +++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/wkt/StoreTest.java @@@ -29,7 -29,7 +29,8 @@@ import org.apache.sis.test.DependsOn import org.apache.sis.test.TestCase; import org.junit.Test; - import static org.apache.sis.test.Assert.*; -import static org.opengis.test.Assert.*; ++import static org.junit.Assert.*; ++import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual; /** diff --cc storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/UpdaterTest.java index 57bbf15c3f,9f5fef014a..4d6f2b7a7e --- a/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/UpdaterTest.java +++ b/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/UpdaterTest.java @@@ -37,10 -37,11 +37,11 @@@ import org.junit.Before import org.junit.After; import org.junit.Test; - import static org.apache.sis.test.MetadataAssert.*; + import static org.junit.Assert.*; + import static org.apache.sis.metadata.Assertions.assertXmlEquals; // Branch-dependent imports -import org.opengis.feature.Feature; +import org.apache.sis.feature.AbstractFeature; /** diff --cc storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/WriterTest.java index 98e353d9c9,454dfc236d..be3f21fd13 --- a/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/WriterTest.java +++ b/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/WriterTest.java @@@ -37,10 -37,11 +37,11 @@@ import org.junit.BeforeClass import org.junit.AfterClass; import org.junit.Test; - import static org.apache.sis.test.MetadataAssert.*; + import static org.junit.Assert.*; + import static org.apache.sis.metadata.Assertions.assertXmlEquals; // Branch-dependent imports -import org.opengis.feature.Feature; +import org.apache.sis.feature.AbstractFeature; /**
