(sis) 01/01: Merge branch 'geoapi-3.1': Remove unsupported custom annotations.
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/sis.git commit 55d09a63e092adc1b0736d01b207e861a641a9af Merge: 131b4ae055 6879e93e0e Author: Martin Desruisseaux AuthorDate: Sun Feb 18 00:03:09 2024 +0100 Merge branch 'geoapi-3.1': Remove unsupported custom annotations. .../org/apache/sis/console/AboutCommandTest.java | 2 - .../org/apache/sis/console/CRSCommandTest.java | 5 -- .../org/apache/sis/console/CommandRunnerTest.java | 3 -- .../org/apache/sis/console/HelpCommandTest.java| 2 - .../apache/sis/console/MetadataCommandTest.java| 4 -- .../apache/sis/console/MimeTypeCommandTest.java| 2 - .../org/apache/sis/coverage/CategoryListTest.java | 7 --- .../sis/coverage/grid/GridCoverage2DTest.java | 2 - .../sis/coverage/grid/GridDerivationTest.java | 8 .../apache/sis/coverage/grid/GridGeometryTest.java | 2 - .../coverage/grid/ResampledGridCoverageTest.java | 5 -- .../sis/coverage/grid/ReshapedImageTest.java | 2 - .../apache/sis/feature/AbstractFeatureTest.java| 5 -- .../apache/sis/feature/AbstractOperationTest.java | 2 - .../apache/sis/feature/CharacteristicMapTest.java | 7 --- .../sis/feature/CharacteristicTypeMapTest.java | 2 - .../sis/feature/DefaultAssociationRoleTest.java| 4 -- .../sis/feature/DefaultAttributeTypeTest.java | 2 - .../apache/sis/feature/DefaultFeatureTypeTest.java | 13 -- .../org/apache/sis/feature/DenseFeatureTest.java | 8 .../org/apache/sis/feature/FeatureFormatTest.java | 5 -- .../apache/sis/feature/FeatureOperationsTest.java | 5 -- .../org/apache/sis/feature/FeatureTestCase.java| 7 --- .../test/org/apache/sis/feature/FeaturesTest.java | 2 - .../org/apache/sis/feature/LinkOperationTest.java | 5 -- .../sis/feature/MultiValuedAttributeTest.java | 8 .../apache/sis/feature/PropertySingletonTest.java | 4 -- .../sis/feature/SingletonAssociationTest.java | 5 -- .../apache/sis/feature/SingletonAttributeTest.java | 11 - .../org/apache/sis/feature/SparseFeatureTest.java | 8 .../sis/feature/StringJoinOperationTest.java | 5 -- .../feature/builder/AttributeTypeBuilderTest.java | 9 .../feature/builder/FeatureTypeBuilderTest.java| 10 .../sis/geometry/wrapper/GeometriesTestCase.java | 2 - .../apache/sis/image/BandAggregateImageTest.java | 7 --- .../org/apache/sis/image/ComputedImageTest.java| 2 - .../org/apache/sis/image/ImageCombinerTest.java| 2 - .../org/apache/sis/image/ImageProcessorTest.java | 2 - .../org/apache/sis/image/PixelIteratorTest.java| 32 - .../apache/sis/image/StatisticsCalculatorTest.java | 2 - .../org/apache/sis/index/tree/PointTreeTest.java | 2 - .../apache/sis/metadata/AbstractMetadataTest.java | 2 - .../test/org/apache/sis/metadata/HashCodeTest.java | 5 -- .../apache/sis/metadata/InformationMapTest.java| 2 - .../apache/sis/metadata/MetadataCopierTest.java| 2 - .../apache/sis/metadata/MetadataStandardTest.java | 16 --- .../sis/metadata/ModifiableMetadataTest.java | 2 - .../test/org/apache/sis/metadata/NameMapTest.java | 2 - .../org/apache/sis/metadata/NilReasonMapTest.java | 2 - .../apache/sis/metadata/PropertyAccessorTest.java | 14 -- .../sis/metadata/PropertyConsistencyCheck.java | 2 - .../sis/metadata/PropertyInformationTest.java | 2 - .../test/org/apache/sis/metadata/PrunerTest.java | 6 --- .../org/apache/sis/metadata/SpecialCasesTest.java | 6 --- .../apache/sis/metadata/TreeNodeChildrenTest.java | 17 --- .../test/org/apache/sis/metadata/TreeNodeTest.java | 12 - .../apache/sis/metadata/TreeTableFormatTest.java | 2 - .../org/apache/sis/metadata/TreeTableViewTest.java | 4 -- .../test/org/apache/sis/metadata/TypeMapTest.java | 2 - .../test/org/apache/sis/metadata/ValueMapTest.java | 8 .../sis/metadata/internal/NameMeaningTest.java | 2 - .../apache/sis/metadata/iso/AllMetadataTest.java | 2 - .../sis/metadata/iso/DefaultIdentifierTest.java| 2 - .../sis/metadata/iso/DefaultMetadataTest.java | 2 - .../sis/metadata/iso/citation/CitationsTest.java | 6 --- .../metadata/iso/citation/DefaultCitationTest.java | 3 -- .../metadata/iso/citation/DefaultContactTest.java | 3 -- .../sis/metadata/iso/extent/DefaultExtentTest.java | 2 - .../extent/DefaultGeographicBoundingBoxTest.java | 3 -- .../sis/metadata/iso/extent/ExtentsTest.java | 2 - .../identification/DefaultBrowseGraphicTest.java | 9 .../identification/DefaultCoupledResourceTest.java | 2 - .../DefaultDataIdentificationTest.java | 8 .../DefaultRepresentativeFractionTest.java | 2 - .../iso/identification/DefaultResolutionTest.java | 2 - .../DefaultServiceIdentificationTest.java | 5 --
(sis) branch main updated (131b4ae055 -> 55d09a63e0)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/sis.git from 131b4ae055 Merge branch 'geoapi-3.1': skip the replacement of SIS assertion methods by GeoAPI ones since the latter do not exist on GeoAPI 3.0. add 1ee5ff885a Remove `@DependsOn` and `@DependsOnMethod` annotation, which are not supported anymore since we upgraded to JUnit 5. We could replace them by JUnit 5 `@Order` annotation, but it is probably not worth the effort. add 6879e93e0e Merge branch 'geoapi-4.0' into geoapi-3.1: Removal of unsupported custom annotations. new 55d09a63e0 Merge branch 'geoapi-3.1': Remove unsupported custom annotations. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/sis/console/AboutCommandTest.java | 2 - .../org/apache/sis/console/CRSCommandTest.java | 5 -- .../org/apache/sis/console/CommandRunnerTest.java | 3 -- .../org/apache/sis/console/HelpCommandTest.java| 2 - .../apache/sis/console/MetadataCommandTest.java| 4 -- .../apache/sis/console/MimeTypeCommandTest.java| 2 - .../org/apache/sis/coverage/CategoryListTest.java | 7 --- .../sis/coverage/grid/GridCoverage2DTest.java | 2 - .../sis/coverage/grid/GridDerivationTest.java | 8 .../apache/sis/coverage/grid/GridGeometryTest.java | 2 - .../coverage/grid/ResampledGridCoverageTest.java | 5 -- .../sis/coverage/grid/ReshapedImageTest.java | 2 - .../apache/sis/feature/AbstractFeatureTest.java| 5 -- .../apache/sis/feature/AbstractOperationTest.java | 2 - .../apache/sis/feature/CharacteristicMapTest.java | 7 --- .../sis/feature/CharacteristicTypeMapTest.java | 2 - .../sis/feature/DefaultAssociationRoleTest.java| 4 -- .../sis/feature/DefaultAttributeTypeTest.java | 2 - .../apache/sis/feature/DefaultFeatureTypeTest.java | 13 -- .../org/apache/sis/feature/DenseFeatureTest.java | 8 .../org/apache/sis/feature/FeatureFormatTest.java | 5 -- .../apache/sis/feature/FeatureOperationsTest.java | 5 -- .../org/apache/sis/feature/FeatureTestCase.java| 7 --- .../test/org/apache/sis/feature/FeaturesTest.java | 2 - .../org/apache/sis/feature/LinkOperationTest.java | 5 -- .../sis/feature/MultiValuedAttributeTest.java | 8 .../apache/sis/feature/PropertySingletonTest.java | 4 -- .../sis/feature/SingletonAssociationTest.java | 5 -- .../apache/sis/feature/SingletonAttributeTest.java | 11 - .../org/apache/sis/feature/SparseFeatureTest.java | 8 .../sis/feature/StringJoinOperationTest.java | 5 -- .../feature/builder/AttributeTypeBuilderTest.java | 9 .../feature/builder/FeatureTypeBuilderTest.java| 10 .../sis/geometry/wrapper/GeometriesTestCase.java | 2 - .../apache/sis/image/BandAggregateImageTest.java | 7 --- .../org/apache/sis/image/ComputedImageTest.java| 2 - .../org/apache/sis/image/ImageCombinerTest.java| 2 - .../org/apache/sis/image/ImageProcessorTest.java | 2 - .../org/apache/sis/image/PixelIteratorTest.java| 32 - .../apache/sis/image/StatisticsCalculatorTest.java | 2 - .../org/apache/sis/index/tree/PointTreeTest.java | 2 - .../apache/sis/metadata/AbstractMetadataTest.java | 2 - .../test/org/apache/sis/metadata/HashCodeTest.java | 5 -- .../apache/sis/metadata/InformationMapTest.java| 2 - .../apache/sis/metadata/MetadataCopierTest.java| 2 - .../apache/sis/metadata/MetadataStandardTest.java | 16 --- .../sis/metadata/ModifiableMetadataTest.java | 2 - .../test/org/apache/sis/metadata/NameMapTest.java | 2 - .../org/apache/sis/metadata/NilReasonMapTest.java | 2 - .../apache/sis/metadata/PropertyAccessorTest.java | 14 -- .../sis/metadata/PropertyConsistencyCheck.java | 2 - .../sis/metadata/PropertyInformationTest.java | 2 - .../test/org/apache/sis/metadata/PrunerTest.java | 6 --- .../org/apache/sis/metadata/SpecialCasesTest.java | 6 --- .../apache/sis/metadata/TreeNodeChildrenTest.java | 17 --- .../test/org/apache/sis/metadata/TreeNodeTest.java | 12 - .../apache/sis/metadata/TreeTableFormatTest.java | 2 - .../org/apache/sis/metadata/TreeTableViewTest.java | 4 -- .../test/org/apache/sis/metadata/TypeMapTest.java | 2 - .../test/org/apache/sis/metadata/ValueMapTest.java | 8 .../sis/metadata/internal/NameMeaningTest.java | 2 - .../apache/sis/metadata/iso/AllMetadataTest.java | 2 - .../sis/metadata/iso/DefaultIdentifierTest.java| 2 - .../sis/metadata/iso/DefaultMetadataTest.java | 2 - .../sis/metadata/iso/citation/CitationsTest.java | 6 --- .../metadata/iso/citation/DefaultCitationTest.java | 3 --
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1: Removal of unsupported custom annotations.
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git commit 6879e93e0e9ca1bd073da058829da15f383d265f Merge: 6cd28b5cd2 1ee5ff885a Author: Martin Desruisseaux AuthorDate: Sat Feb 17 23:54:53 2024 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1: Removal of unsupported custom annotations. .../org/apache/sis/console/AboutCommandTest.java | 2 - .../org/apache/sis/console/CRSCommandTest.java | 5 -- .../org/apache/sis/console/CommandRunnerTest.java | 3 -- .../org/apache/sis/console/HelpCommandTest.java| 2 - .../apache/sis/console/MetadataCommandTest.java| 4 -- .../apache/sis/console/MimeTypeCommandTest.java| 2 - .../org/apache/sis/coverage/CategoryListTest.java | 7 --- .../sis/coverage/grid/GridCoverage2DTest.java | 2 - .../sis/coverage/grid/GridDerivationTest.java | 8 .../apache/sis/coverage/grid/GridGeometryTest.java | 2 - .../coverage/grid/ResampledGridCoverageTest.java | 5 -- .../sis/coverage/grid/ReshapedImageTest.java | 2 - .../apache/sis/feature/AbstractFeatureTest.java| 5 -- .../apache/sis/feature/AbstractOperationTest.java | 2 - .../apache/sis/feature/CharacteristicMapTest.java | 7 --- .../sis/feature/CharacteristicTypeMapTest.java | 2 - .../sis/feature/DefaultAssociationRoleTest.java| 4 -- .../sis/feature/DefaultAttributeTypeTest.java | 2 - .../apache/sis/feature/DefaultFeatureTypeTest.java | 13 -- .../org/apache/sis/feature/DenseFeatureTest.java | 8 .../org/apache/sis/feature/FeatureFormatTest.java | 5 -- .../apache/sis/feature/FeatureOperationsTest.java | 5 -- .../org/apache/sis/feature/FeatureTestCase.java| 7 --- .../test/org/apache/sis/feature/FeaturesTest.java | 2 - .../org/apache/sis/feature/LinkOperationTest.java | 5 -- .../sis/feature/MultiValuedAttributeTest.java | 8 .../apache/sis/feature/PropertySingletonTest.java | 4 -- .../sis/feature/SingletonAssociationTest.java | 5 -- .../apache/sis/feature/SingletonAttributeTest.java | 11 - .../org/apache/sis/feature/SparseFeatureTest.java | 8 .../sis/feature/StringJoinOperationTest.java | 5 -- .../feature/builder/AttributeTypeBuilderTest.java | 9 .../feature/builder/FeatureTypeBuilderTest.java| 10 .../sis/geometry/wrapper/GeometriesTestCase.java | 2 - .../apache/sis/image/BandAggregateImageTest.java | 7 --- .../org/apache/sis/image/ComputedImageTest.java| 2 - .../org/apache/sis/image/ImageCombinerTest.java| 2 - .../org/apache/sis/image/ImageProcessorTest.java | 2 - .../org/apache/sis/image/PixelIteratorTest.java| 32 - .../apache/sis/image/StatisticsCalculatorTest.java | 2 - .../org/apache/sis/index/tree/PointTreeTest.java | 2 - .../apache/sis/metadata/AbstractMetadataTest.java | 2 - .../test/org/apache/sis/metadata/HashCodeTest.java | 5 -- .../apache/sis/metadata/InformationMapTest.java| 2 - .../apache/sis/metadata/MetadataCopierTest.java| 2 - .../apache/sis/metadata/MetadataStandardTest.java | 17 --- .../sis/metadata/ModifiableMetadataTest.java | 2 - .../test/org/apache/sis/metadata/NameMapTest.java | 2 - .../org/apache/sis/metadata/NilReasonMapTest.java | 2 - .../apache/sis/metadata/PropertyAccessorTest.java | 14 -- .../sis/metadata/PropertyConsistencyCheck.java | 2 - .../sis/metadata/PropertyInformationTest.java | 2 - .../test/org/apache/sis/metadata/PrunerTest.java | 6 --- .../org/apache/sis/metadata/SpecialCasesTest.java | 6 --- .../apache/sis/metadata/TreeNodeChildrenTest.java | 17 --- .../test/org/apache/sis/metadata/TreeNodeTest.java | 12 - .../apache/sis/metadata/TreeTableFormatTest.java | 2 - .../org/apache/sis/metadata/TreeTableViewTest.java | 4 -- .../test/org/apache/sis/metadata/TypeMapTest.java | 2 - .../test/org/apache/sis/metadata/ValueMapTest.java | 8 .../sis/metadata/internal/NameMeaningTest.java | 2 - .../apache/sis/metadata/iso/AllMetadataTest.java | 2 - .../sis/metadata/iso/DefaultIdentifierTest.java| 2 - .../sis/metadata/iso/DefaultMetadataTest.java | 2 - .../sis/metadata/iso/citation/CitationsTest.java | 6 --- .../metadata/iso/citation/DefaultCitationTest.java | 3 -- .../metadata/iso/citation/DefaultContactTest.java | 3 -- .../sis/metadata/iso/extent/DefaultExtentTest.java | 2 - .../extent/DefaultGeographicBoundingBoxTest.java | 3 -- .../sis/metadata/iso/extent/ExtentsTest.java | 2 - .../identification/DefaultBrowseGraphicTest.java | 9 .../identification/DefaultCoupledResourceTest.java | 2 - .../DefaultDataIdentificationTest.java | 8 .../DefaultRepresentativeFractionTest.java | 2 - .../iso/identification/DefaultResolutionTest.java | 2 - .../DefaultServiceIdentificationTest.java
(sis) branch geoapi-3.1 updated (6cd28b5cd2 -> 6879e93e0e)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git from 6cd28b5cd2 Merge branch 'geoapi-4.0' into geoapi-3.1 add 1ee5ff885a Remove `@DependsOn` and `@DependsOnMethod` annotation, which are not supported anymore since we upgraded to JUnit 5. We could replace them by JUnit 5 `@Order` annotation, but it is probably not worth the effort. new 6879e93e0e Merge branch 'geoapi-4.0' into geoapi-3.1: Removal of unsupported custom annotations. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/sis/console/AboutCommandTest.java | 2 - .../org/apache/sis/console/CRSCommandTest.java | 5 -- .../org/apache/sis/console/CommandRunnerTest.java | 3 -- .../org/apache/sis/console/HelpCommandTest.java| 2 - .../apache/sis/console/MetadataCommandTest.java| 4 -- .../apache/sis/console/MimeTypeCommandTest.java| 2 - .../org/apache/sis/coverage/CategoryListTest.java | 7 --- .../sis/coverage/grid/GridCoverage2DTest.java | 2 - .../sis/coverage/grid/GridDerivationTest.java | 8 .../apache/sis/coverage/grid/GridGeometryTest.java | 2 - .../coverage/grid/ResampledGridCoverageTest.java | 5 -- .../sis/coverage/grid/ReshapedImageTest.java | 2 - .../apache/sis/feature/AbstractFeatureTest.java| 5 -- .../apache/sis/feature/AbstractOperationTest.java | 2 - .../apache/sis/feature/CharacteristicMapTest.java | 7 --- .../sis/feature/CharacteristicTypeMapTest.java | 2 - .../sis/feature/DefaultAssociationRoleTest.java| 4 -- .../sis/feature/DefaultAttributeTypeTest.java | 2 - .../apache/sis/feature/DefaultFeatureTypeTest.java | 13 -- .../org/apache/sis/feature/DenseFeatureTest.java | 8 .../org/apache/sis/feature/FeatureFormatTest.java | 5 -- .../apache/sis/feature/FeatureOperationsTest.java | 5 -- .../org/apache/sis/feature/FeatureTestCase.java| 7 --- .../test/org/apache/sis/feature/FeaturesTest.java | 2 - .../org/apache/sis/feature/LinkOperationTest.java | 5 -- .../sis/feature/MultiValuedAttributeTest.java | 8 .../apache/sis/feature/PropertySingletonTest.java | 4 -- .../sis/feature/SingletonAssociationTest.java | 5 -- .../apache/sis/feature/SingletonAttributeTest.java | 11 - .../org/apache/sis/feature/SparseFeatureTest.java | 8 .../sis/feature/StringJoinOperationTest.java | 5 -- .../feature/builder/AttributeTypeBuilderTest.java | 9 .../feature/builder/FeatureTypeBuilderTest.java| 10 .../sis/geometry/wrapper/GeometriesTestCase.java | 2 - .../apache/sis/image/BandAggregateImageTest.java | 7 --- .../org/apache/sis/image/ComputedImageTest.java| 2 - .../org/apache/sis/image/ImageCombinerTest.java| 2 - .../org/apache/sis/image/ImageProcessorTest.java | 2 - .../org/apache/sis/image/PixelIteratorTest.java| 32 - .../apache/sis/image/StatisticsCalculatorTest.java | 2 - .../org/apache/sis/index/tree/PointTreeTest.java | 2 - .../apache/sis/metadata/AbstractMetadataTest.java | 2 - .../test/org/apache/sis/metadata/HashCodeTest.java | 5 -- .../apache/sis/metadata/InformationMapTest.java| 2 - .../apache/sis/metadata/MetadataCopierTest.java| 2 - .../apache/sis/metadata/MetadataStandardTest.java | 17 --- .../sis/metadata/ModifiableMetadataTest.java | 2 - .../test/org/apache/sis/metadata/NameMapTest.java | 2 - .../org/apache/sis/metadata/NilReasonMapTest.java | 2 - .../apache/sis/metadata/PropertyAccessorTest.java | 14 -- .../sis/metadata/PropertyConsistencyCheck.java | 2 - .../sis/metadata/PropertyInformationTest.java | 2 - .../test/org/apache/sis/metadata/PrunerTest.java | 6 --- .../org/apache/sis/metadata/SpecialCasesTest.java | 6 --- .../apache/sis/metadata/TreeNodeChildrenTest.java | 17 --- .../test/org/apache/sis/metadata/TreeNodeTest.java | 12 - .../apache/sis/metadata/TreeTableFormatTest.java | 2 - .../org/apache/sis/metadata/TreeTableViewTest.java | 4 -- .../test/org/apache/sis/metadata/TypeMapTest.java | 2 - .../test/org/apache/sis/metadata/ValueMapTest.java | 8 .../sis/metadata/internal/NameMeaningTest.java | 2 - .../apache/sis/metadata/iso/AllMetadataTest.java | 2 - .../sis/metadata/iso/DefaultIdentifierTest.java| 2 - .../sis/metadata/iso/DefaultMetadataTest.java | 2 - .../sis/metadata/iso/citation/CitationsTest.java | 6 --- .../metadata/iso/citation/DefaultCitationTest.java | 3 -- .../metadata/iso/citation/DefaultContactTest.java | 3 -- .../sis/metadata/iso/extent/DefaultExtentTest.java | 2 - .../extent/DefaultGeographicBoundingBoxTest.java | 3
(sis) branch geoapi-4.0 updated (52e92eab1e -> 7d2c731b1b)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git from 52e92eab1e Update for change in argument order in GeoAPI, for consistency with JUnit 5. add a71069f707 Remove an assertion method replaced by a GeoAPI assertion methods. add 7d2c731b1b Replace calls to an SIS assertion method by calls to the equivalent GeoAPI assertion method. No new revisions were added by this update. Summary of changes: .../sis/coverage/grid/GridCoverage2DTest.java | 3 +- .../coverage/grid/ResampledGridCoverageTest.java | 9 +++--- .../test/org/apache/sis/feature/Assertions.java| 35 -- .../sis/geometry/wrapper/j2d/FlatShapeTest.java| 8 ++--- .../test/org/apache/sis/image/MaskedImageTest.java | 13 5 files changed, 18 insertions(+), 50 deletions(-)
(sis) branch geoapi-3.1 updated (df1eb4f7d0 -> 6cd28b5cd2)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git from df1eb4f7d0 Merge branch 'geoapi-4.0' into geoapi-3.1 add a71069f707 Remove an assertion method replaced by a GeoAPI assertion methods. add 7d2c731b1b Replace calls to an SIS assertion method by calls to the equivalent GeoAPI assertion method. add 6cd28b5cd2 Merge branch 'geoapi-4.0' into geoapi-3.1 No new revisions were added by this update. Summary of changes: .../sis/coverage/grid/GridCoverage2DTest.java | 3 +- .../coverage/grid/ResampledGridCoverageTest.java | 9 +++--- .../test/org/apache/sis/feature/Assertions.java| 35 -- .../sis/geometry/wrapper/j2d/FlatShapeTest.java| 8 ++--- .../test/org/apache/sis/image/MaskedImageTest.java | 13 5 files changed, 18 insertions(+), 50 deletions(-)
(sis) 02/04: Replace calls to an SIS assertion method by calls to the equivalent GeoAPI assertion method.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 7d2c731b1b1a1fc4e8077734f99ec5b446943662
Author: Martin Desruisseaux
AuthorDate: Sat Feb 17 22:59:40 2024 +0100
Replace calls to an SIS assertion method by calls to the equivalent GeoAPI
assertion method.
---
.../org/apache/sis/coverage/grid/GridCoverage2DTest.java| 3 ++-
.../apache/sis/coverage/grid/ResampledGridCoverageTest.java | 9 +
.../test/org/apache/sis/image/MaskedImageTest.java | 13 +++--
3 files changed, 14 insertions(+), 11 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridCoverage2DTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridCoverage2DTest.java
index 542ae3cff0..bf4084bb03 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridCoverage2DTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridCoverage2DTest.java
@@ -43,6 +43,7 @@ import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.referencing.crs.HardCodedCRS;
+import static org.opengis.test.Assertions.assertSampleValuesEqual;
import static org.apache.sis.test.Assertions.assertMessageContains;
import static org.apache.sis.feature.Assertions.assertPixelsEqual;
@@ -294,7 +295,7 @@ public class GridCoverage2DTest extends TestCase {
assertEquals(2, result.getMinY());
assertEquals(GRID_SIZE, result.getWidth());
assertEquals(GRID_SIZE, result.getHeight());
-assertPixelsEqual(coverage.render(null), null, result, null);
+assertSampleValuesEqual(coverage.render(null), result, STRICT, null);
}
/**
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/ResampledGridCoverageTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/ResampledGridCoverageTest.java
index 2557bc727f..592bd01f5b 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/ResampledGridCoverageTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/ResampledGridCoverageTest.java
@@ -57,6 +57,7 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.image.TiledImageMock;
import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.referencing.operation.HardCodedConversions;
+import static org.opengis.test.Assertions.assertSampleValuesEqual;
import static org.apache.sis.referencing.Assertions.assertEnvelopeEquals;
import static org.apache.sis.feature.Assertions.assertValuesEqual;
import static org.apache.sis.feature.Assertions.assertPixelsEqual;
@@ -408,7 +409,7 @@ public final class ResampledGridCoverageTest extends
TestCase {
new AxisDirection[] {AxisDirection.FUTURE, AxisDirection.EAST,
AxisDirection.NORTH, AxisDirection.UP},
"Expected (t,λ,φ,H) axes.");
-assertPixelsEqual(source.render(null), null, result.render(null),
null);
+assertSampleValuesEqual(source.render(null), result.render(null),
STRICT, null);
}
/**
@@ -548,7 +549,7 @@ public final class ResampledGridCoverageTest extends
TestCase {
* Target image should be 6×6 pixels, like source image.
*/
final GridCoverage result = resample(source, targetGeom);
-assertPixelsEqual(source.render(null), null, result.render(null),
null);
+assertSampleValuesEqual(source.render(null), result.render(null),
STRICT, null);
}
/**
@@ -564,7 +565,7 @@ public final class ResampledGridCoverageTest extends
TestCase {
final GridGeometry target4D =
createGridGeometryND(HardCodedCRS.WGS84_4D, 0, 1, 2, 3, false);
final GridCoverage result = resample(source3D, target4D);
assertEquals(target4D, result.getGridGeometry());
-assertPixelsEqual(source3D.render(null), null, result.render(null),
null);
+assertSampleValuesEqual(source3D.render(null), result.render(null),
STRICT, null);
}
/**
@@ -578,7 +579,7 @@ public final class ResampledGridCoverageTest extends
TestCase {
final GridCoverage source4D = createCoverageND(true);
final GridCoverage result = resample(source4D, target3D);
assertEquals(target3D, result.getGridGeometry());
-assertPixelsEqual(source4D.render(null), null, result.render(null),
null);
+assertSampleValuesEqual(source4D.render(null), result.render(null),
STRICT, null);
}
/**
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/MaskedImageTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/MaskedImageTest.java
index 81c8e5c26e..e09fc2028a 100644
---
(sis) 03/04: Merge branch 'geoapi-4.0' into geoapi-3.1
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/sis.git commit 6cd28b5cd265357007a456132259881c0cfc9ca8 Merge: df1eb4f7d0 7d2c731b1b Author: Martin Desruisseaux AuthorDate: Sat Feb 17 23:00:43 2024 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1 .../sis/coverage/grid/GridCoverage2DTest.java | 3 +- .../coverage/grid/ResampledGridCoverageTest.java | 9 +++--- .../test/org/apache/sis/feature/Assertions.java| 35 -- .../sis/geometry/wrapper/j2d/FlatShapeTest.java| 8 ++--- .../test/org/apache/sis/image/MaskedImageTest.java | 13 5 files changed, 18 insertions(+), 50 deletions(-)
(sis) 01/04: Remove an assertion method replaced by a GeoAPI assertion methods.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git
commit a71069f7072bb21050b4bb9c82fa20f4a68e06e4
Author: Martin Desruisseaux
AuthorDate: Sat Feb 17 22:49:26 2024 +0100
Remove an assertion method replaced by a GeoAPI assertion methods.
---
.../test/org/apache/sis/feature/Assertions.java| 35 --
.../sis/geometry/wrapper/j2d/FlatShapeTest.java| 8 ++---
2 files changed, 4 insertions(+), 39 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/Assertions.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/Assertions.java
index 66f13daa9a..20545eff26 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/Assertions.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/Assertions.java
@@ -20,7 +20,6 @@ import java.awt.Point;
import java.awt.Rectangle;
import java.awt.image.Raster;
import java.awt.image.RenderedImage;
-import java.awt.geom.PathIterator;
import org.apache.sis.image.PixelIterator;
import org.apache.sis.util.Static;
@@ -170,38 +169,4 @@ public final class Assertions extends Static {
+ "— matrix indices (" + i + ", " + j + ") band " + band
+ ": expected " + expected + " but found " + actual;
}
-
-/**
- * Asserts that the path is equal to given reference.
- *
- * @param expected expected geometry outline.
- * @param actual actual geometry outline.
- * @param tolerance tolerance threshold for floating point value
comparisons.
- */
-@SuppressWarnings("fallthrough")
-public static void assertPathEquals(final PathIterator expected, final
PathIterator actual, final double tolerance) {
-assertEquals(expected.getWindingRule(), actual.getWindingRule(),
"windingRule");
-final double[] buffer = new double[6];
-final double[] values = new double[6];
-while (!expected.isDone()) {
-assertFalse(actual.isDone(), "isDone");
-final int type = expected.currentSegment(buffer);
-assertEquals(type, actual.currentSegment(values),
"currentSegment");
-switch (type) {
-case PathIterator.SEG_CUBICTO: assertEquals(buffer[4],
values[4], tolerance, "x₃");
- assertEquals(buffer[5],
values[5], tolerance, "y₃");
-case PathIterator.SEG_QUADTO: assertEquals(buffer[2],
values[2], tolerance, "x₂");
- assertEquals(buffer[3],
values[3], tolerance, "y₂");
-case PathIterator.SEG_LINETO: assertEquals(buffer[0],
values[0], tolerance, "x₁");
- assertEquals(buffer[1],
values[1], tolerance, "y₁"); break;
-case PathIterator.SEG_MOVETO: assertEquals(buffer[0],
values[0], tolerance, "x₀");
- assertEquals(buffer[1],
values[1], tolerance, "y₀");
-case PathIterator.SEG_CLOSE: break;
-default: fail("Unexpected type: " + type);
-}
-expected.next();
-actual.next();
-}
-assertTrue(actual.isDone(), "isDone");
-}
}
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/j2d/FlatShapeTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/j2d/FlatShapeTest.java
index a85ee63b00..3dded7cc3e 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/j2d/FlatShapeTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/j2d/FlatShapeTest.java
@@ -22,7 +22,7 @@ import org.opengis.referencing.operation.TransformException;
// Test dependencies
import org.junit.jupiter.api.Test;
import org.apache.sis.test.TestCase;
-import static org.apache.sis.feature.Assertions.assertPathEquals;
+import static org.opengis.test.Assertions.assertPathEquals;
/**
@@ -65,7 +65,7 @@ public final class FlatShapeTest extends TestCase {
final Path2D.Double r = new Path2D.Double(Path2D.WIND_NON_ZERO);
createReferenceShape(r, coordinates, closed);
-assertPathEquals(r.getPathIterator(null), p.getPathIterator(null),
STRICT);
+assertPathEquals(r.getPathIterator(null), p.getPathIterator(null),
STRICT, STRICT, null);
}
/**
@@ -105,7 +105,7 @@ public final class FlatShapeTest extends TestCase {
createReferenceShape(r, coordinates[i], false);
}
final MultiPolylines p = new MultiPolylines(polylines);
-assertPathEquals(r.getPathIterator(null), p.getPathIterator(null),
STRICT);
+assertPathEquals(r.getPathIterator(null), p.getPathIterator(null),
STRICT, STRICT, null);
}
/**
@@ -128,6 +128,6
(sis) 04/04: Merge branch 'geoapi-3.1': skip the replacement of SIS assertion methods by GeoAPI ones since the latter do not exist on GeoAPI 3.0.
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/sis.git commit 131b4ae055b0595daa4d38b5aac4d8bb3e24bb7b Merge: 9ccb657bbb 6cd28b5cd2 Author: Martin Desruisseaux AuthorDate: Sat Feb 17 23:11:29 2024 +0100 Merge branch 'geoapi-3.1': skip the replacement of SIS assertion methods by GeoAPI ones since the latter do not exist on GeoAPI 3.0. .../test/org/apache/sis/image/MaskedImageTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/MaskedImageTest.java index 81c8e5c26e,e09fc2028a..2bfaa9a38e --- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/MaskedImageTest.java +++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/MaskedImageTest.java @@@ -36,8 -36,9 +36,8 @@@ import org.apache.sis.util.Debug // Test dependencies import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; - import org.apache.sis.test.TestCase; -import static org.opengis.test.Assertions.assertSampleValuesEqual; import static org.apache.sis.feature.Assertions.assertPixelsEqual; + import org.apache.sis.test.TestCase; /**
(sis) branch main updated (9ccb657bbb -> 131b4ae055)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/sis.git from 9ccb657bbb Merge branch 'geoapi-3.1' new a71069f707 Remove an assertion method replaced by a GeoAPI assertion methods. new 7d2c731b1b Replace calls to an SIS assertion method by calls to the equivalent GeoAPI assertion method. new 6cd28b5cd2 Merge branch 'geoapi-4.0' into geoapi-3.1 new 131b4ae055 Merge branch 'geoapi-3.1': skip the replacement of SIS assertion methods by GeoAPI ones since the latter do not exist on GeoAPI 3.0. The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../test/org/apache/sis/image/MaskedImageTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(sis) 01/01: Merge branch 'geoapi-3.1'
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/sis.git commit 9ccb657bbbe35f1379f80736b88133ddfca0fcc2 Merge: 0af06aeeb2 df1eb4f7d0 Author: Martin Desruisseaux AuthorDate: Sat Feb 17 22:29:49 2024 +0100 Merge branch 'geoapi-3.1'
(sis) branch main updated (0af06aeeb2 -> 9ccb657bbb)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/sis.git from 0af06aeeb2 Merge branch 'geoapi-3.1': Change of argument order in `Assertions` classes for consistency with JUnit 5 convention. add 52e92eab1e Update for change in argument order in GeoAPI, for consistency with JUnit 5. add df1eb4f7d0 Merge branch 'geoapi-4.0' into geoapi-3.1 new 9ccb657bbb Merge branch 'geoapi-3.1' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes:
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git commit df1eb4f7d0600792dd3a4ea7645ff50bac2c5700 Merge: 5909d8a9de 52e92eab1e Author: Martin Desruisseaux AuthorDate: Sat Feb 17 22:24:48 2024 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1 .../projection/ObliqueStereographicTest.java | 5 ++--- .../operation/projection/TransverseMercatorTest.java | 2 +- .../transform/AbridgedMolodenskyTransformTest.java | 2 +- .../operation/transform/MolodenskyTransformTest.java | 6 -- .../transform/PassThroughTransformTest.java | 20 ++-- geoapi/snapshot | 2 +- 6 files changed, 19 insertions(+), 18 deletions(-) diff --cc geoapi/snapshot index d537df759d,84e48733a2..b0d7ebf742 --- a/geoapi/snapshot +++ b/geoapi/snapshot @@@ -1,1 -1,1 +1,1 @@@ - Subproject commit d537df759d406cf8ea20d021a551fbadcb9de94f -Subproject commit 84e48733a2ec792e1af71ed51f15e70683182e53 ++Subproject commit b0d7ebf742ee7d7683a42f1cec27826310b7438f
(sis) branch geoapi-3.1 updated (5909d8a9de -> df1eb4f7d0)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git from 5909d8a9de Merge branch 'geoapi-4.0' into geoapi-3.1: Change of argument order in `Assertions` classes for consistency with JUnit 5 convention. add 52e92eab1e Update for change in argument order in GeoAPI, for consistency with JUnit 5. new df1eb4f7d0 Merge branch 'geoapi-4.0' into geoapi-3.1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../projection/ObliqueStereographicTest.java | 5 ++--- .../operation/projection/TransverseMercatorTest.java | 2 +- .../transform/AbridgedMolodenskyTransformTest.java | 2 +- .../operation/transform/MolodenskyTransformTest.java | 6 -- .../transform/PassThroughTransformTest.java | 20 ++-- geoapi/snapshot | 2 +- 6 files changed, 19 insertions(+), 18 deletions(-)
(sis) branch geoapi-4.0 updated: Update for change in argument order in GeoAPI, for consistency with JUnit 5.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new 52e92eab1e Update for change in argument order in GeoAPI, for
consistency with JUnit 5.
52e92eab1e is described below
commit 52e92eab1ec021af638b08416ac504126e4d09a0
Author: Martin Desruisseaux
AuthorDate: Sat Feb 17 22:11:10 2024 +0100
Update for change in argument order in GeoAPI, for consistency with JUnit 5.
---
.../projection/ObliqueStereographicTest.java | 5 ++---
.../operation/projection/TransverseMercatorTest.java | 2 +-
.../transform/AbridgedMolodenskyTransformTest.java | 2 +-
.../operation/transform/MolodenskyTransformTest.java | 6 --
.../transform/PassThroughTransformTest.java | 20 ++--
geoapi/snapshot | 2 +-
6 files changed, 19 insertions(+), 18 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java
index 7fda3f1253..f534bb20d2 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java
@@ -375,9 +375,8 @@ public final class ObliqueStereographicTest extends
MapProjectionTestCase {
final Matrix derivative = spherical.transform(srcPts, 0, null, 0,
true);
tolerance = 1E-12;
-assertMatrixEquals("Spherical derivative", reference, derivative,
-new Matrix2(tolerance, tolerance,
-tolerance, tolerance));
+assertMatrixEquals(reference, derivative, new Matrix2(tolerance,
tolerance, tolerance, tolerance),
+ "Spherical derivative");
}
/**
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java
index 874326a6a0..c6563701b8 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java
@@ -275,7 +275,7 @@ public final class TransverseMercatorTest extends
MapProjectionTestCase {
else if (longitude <= 66) tolerance = 0.1;
else tolerance = 0.7;
transform.transform(source, 0, source, 0, 1);
-assertCoordinateEquals(line, target, source,
reader.getLineNumber(), CalculationType.DIRECT_TRANSFORM);
+assertCoordinateEquals(target, source,
reader.getLineNumber(), CalculationType.DIRECT_TRANSFORM, line);
}
}
}
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/AbridgedMolodenskyTransformTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/AbridgedMolodenskyTransformTest.java
index 3238cd68a4..c4388f19dc 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/AbridgedMolodenskyTransformTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/AbridgedMolodenskyTransformTest.java
@@ -77,7 +77,7 @@ public final class AbridgedMolodenskyTransformTest extends
MathTransformTestCase
for (int i=0; i
(sis) branch main updated (878da1aaa3 -> 0af06aeeb2)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/sis.git from 878da1aaa3 Merge branch 'geoapi-3.1': Upgrade from JUnit 4 to JUnit 5. add fa7418654f Replace GeoAPI `Assert` by `Assertions` with argument order consistent with JUnit 5 convention. add cf0f562292 Change argument order in SIS `Assertions` classes for consistency with JUnit 5 convention. add 5909d8a9de Merge branch 'geoapi-4.0' into geoapi-3.1: Change of argument order in `Assertions` classes for consistency with JUnit 5 convention. new 0af06aeeb2 Merge branch 'geoapi-3.1': Change of argument order in `Assertions` classes for consistency with JUnit 5 convention. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../sis/coverage/grid/DimensionAppenderTest.java | 2 +- .../coverage/grid/DimensionalityReductionTest.java | 4 +- .../sis/coverage/grid/GridDerivationTest.java | 62 + .../apache/sis/coverage/grid/GridExtentTest.java | 32 ++--- .../apache/sis/coverage/grid/GridGeometryTest.java | 115 .../sis/coverage/grid/PixelTranslationTest.java| 28 ++-- .../coverage/grid/ResampledGridCoverageTest.java | 6 +- .../test/org/apache/sis/metadata/Assertions.java | 9 +- .../apache/sis/metadata/PropertyAccessorTest.java | 10 +- .../sis/metadata/PropertyInformationTest.java | 2 +- .../test/org/apache/sis/metadata/TreeNodeTest.java | 2 +- .../sis/metadata/iso/DefaultIdentifierTest.java| 4 +- .../sis/metadata/iso/DefaultMetadataTest.java | 28 ++-- .../sis/metadata/iso/citation/CitationsTest.java | 32 ++--- .../metadata/iso/citation/DefaultCitationTest.java | 15 +- .../DefaultDataIdentificationTest.java | 3 +- .../DefaultServiceIdentificationTest.java | 9 +- .../apache/sis/xml/NilReasonMarshallingTest.java | 11 +- .../org/apache/sis/xml/UUIDMarshallingTest.java| 12 +- .../sis/xml/bind/fra/DataIdentificationTest.java | 4 +- .../apache/sis/io/wkt/MathTransformParserTest.java | 28 ++-- .../org/apache/sis/io/wkt/WKTDictionaryTest.java | 8 +- .../org/apache/sis/referencing/Assertions.java | 4 +- .../org/apache/sis/referencing/CommonCRSTest.java | 7 +- .../sis/referencing/GeodeticCalculatorTest.java| 9 +- .../sis/referencing/ImmutableIdentifierTest.java | 18 +-- .../referencing/crs/DefaultCompoundCRSTest.java| 6 +- .../sis/referencing/crs/DefaultDerivedCRSTest.java | 12 +- .../referencing/crs/DefaultEngineeringCRSTest.java | 4 +- .../sis/referencing/crs/DefaultImageCRSTest.java | 2 +- .../referencing/crs/DefaultProjectedCRSTest.java | 4 +- .../sis/referencing/cs/CoordinateSystemsTest.java | 50 +++ .../referencing/cs/DefaultCylindricalCSTest.java | 6 +- .../sis/referencing/cs/DefaultPolarCSTest.java | 6 +- .../sis/referencing/cs/DefaultSphericalCSTest.java | 4 +- .../referencing/datum/BursaWolfParametersTest.java | 18 +-- .../datum/DefaultGeodeticDatumTest.java| 10 +- .../datum/DefaultTemporalDatumTest.java| 4 +- .../referencing/datum/TimeDependentBWPTest.java| 4 +- .../factory/CommonAuthorityFactoryTest.java| 18 +-- .../sis/referencing/factory/TestFactorySource.java | 4 +- .../referencing/factory/sql/EPSGFactoryTest.java | 30 ++-- .../operation/CoordinateOperationFinderTest.java | 31 ++--- .../DefaultConcatenatedOperationTest.java | 10 +- .../operation/DefaultConversionTest.java | 47 --- .../operation/DefaultOperationMethodTest.java | 4 +- .../operation/DefaultPassThroughOperationTest.java | 8 +- .../operation/SingleOperationMarshallingTest.java | 10 +- .../builder/LinearTransformBuilderTest.java| 37 ++--- .../operation/builder/LinearizerTest.java | 15 +- .../builder/LocalizationGridBuilderTest.java | 6 +- .../operation/builder/ResidualGridTest.java| 2 +- .../referencing/operation/matrix/MatricesTest.java | 40 +++--- .../referencing/operation/matrix/Matrix4Test.java | 14 +- .../operation/matrix/MatrixTestCase.java | 2 +- .../operation/matrix/NonSquareMatrixTest.java | 24 ++-- .../operation/projection/MercatorTest.java | 6 +- .../projection/ObliqueStereographicTest.java | 2 +- .../operation/provider/Geographic3Dto2DTest.java | 22 +-- .../operation/provider/LongitudeRotationTest.java | 11 +- .../referencing/operation/provider/NADCONTest.java | 9 +- .../referencing/operation/provider/NTv2Test.java | 9 +- .../transform/ConcatenatedTransformTest.java | 28 ++-- .../transform/ContextualParametersTest.java| 24 ++--
(sis) 01/01: Merge branch 'geoapi-3.1': Change of argument order in `Assertions` classes for consistency with JUnit 5 convention.
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/sis.git commit 0af06aeeb2335011af92e60ff75cc089e4074f99 Merge: 878da1aaa3 5909d8a9de Author: Martin Desruisseaux AuthorDate: Sat Feb 17 17:42:17 2024 +0100 Merge branch 'geoapi-3.1': Change of argument order in `Assertions` classes for consistency with JUnit 5 convention. .../sis/coverage/grid/DimensionAppenderTest.java | 2 +- .../coverage/grid/DimensionalityReductionTest.java | 4 +- .../sis/coverage/grid/GridDerivationTest.java | 62 + .../apache/sis/coverage/grid/GridExtentTest.java | 32 ++--- .../apache/sis/coverage/grid/GridGeometryTest.java | 115 .../sis/coverage/grid/PixelTranslationTest.java| 28 ++-- .../coverage/grid/ResampledGridCoverageTest.java | 6 +- .../test/org/apache/sis/metadata/Assertions.java | 9 +- .../apache/sis/metadata/PropertyAccessorTest.java | 10 +- .../sis/metadata/PropertyInformationTest.java | 2 +- .../test/org/apache/sis/metadata/TreeNodeTest.java | 2 +- .../sis/metadata/iso/DefaultIdentifierTest.java| 4 +- .../sis/metadata/iso/DefaultMetadataTest.java | 28 ++-- .../sis/metadata/iso/citation/CitationsTest.java | 32 ++--- .../metadata/iso/citation/DefaultCitationTest.java | 15 +- .../DefaultDataIdentificationTest.java | 3 +- .../DefaultServiceIdentificationTest.java | 9 +- .../apache/sis/xml/NilReasonMarshallingTest.java | 11 +- .../org/apache/sis/xml/UUIDMarshallingTest.java| 12 +- .../sis/xml/bind/fra/DataIdentificationTest.java | 4 +- .../apache/sis/io/wkt/MathTransformParserTest.java | 28 ++-- .../org/apache/sis/io/wkt/WKTDictionaryTest.java | 8 +- .../org/apache/sis/referencing/Assertions.java | 4 +- .../org/apache/sis/referencing/CommonCRSTest.java | 7 +- .../sis/referencing/GeodeticCalculatorTest.java| 9 +- .../sis/referencing/ImmutableIdentifierTest.java | 18 +-- .../referencing/crs/DefaultCompoundCRSTest.java| 6 +- .../sis/referencing/crs/DefaultDerivedCRSTest.java | 12 +- .../referencing/crs/DefaultEngineeringCRSTest.java | 4 +- .../sis/referencing/crs/DefaultImageCRSTest.java | 2 +- .../referencing/crs/DefaultProjectedCRSTest.java | 4 +- .../sis/referencing/cs/CoordinateSystemsTest.java | 50 +++ .../referencing/cs/DefaultCylindricalCSTest.java | 6 +- .../sis/referencing/cs/DefaultPolarCSTest.java | 6 +- .../sis/referencing/cs/DefaultSphericalCSTest.java | 4 +- .../referencing/datum/BursaWolfParametersTest.java | 18 +-- .../datum/DefaultGeodeticDatumTest.java| 10 +- .../datum/DefaultTemporalDatumTest.java| 4 +- .../referencing/datum/TimeDependentBWPTest.java| 4 +- .../factory/CommonAuthorityFactoryTest.java| 18 +-- .../sis/referencing/factory/TestFactorySource.java | 4 +- .../referencing/factory/sql/EPSGFactoryTest.java | 30 ++-- .../operation/CoordinateOperationFinderTest.java | 31 ++--- .../DefaultConcatenatedOperationTest.java | 10 +- .../operation/DefaultConversionTest.java | 47 --- .../operation/DefaultOperationMethodTest.java | 4 +- .../operation/DefaultPassThroughOperationTest.java | 8 +- .../operation/SingleOperationMarshallingTest.java | 10 +- .../builder/LinearTransformBuilderTest.java| 37 ++--- .../operation/builder/LinearizerTest.java | 15 +- .../builder/LocalizationGridBuilderTest.java | 6 +- .../operation/builder/ResidualGridTest.java| 2 +- .../referencing/operation/matrix/MatricesTest.java | 40 +++--- .../referencing/operation/matrix/Matrix4Test.java | 14 +- .../operation/matrix/MatrixTestCase.java | 2 +- .../operation/matrix/NonSquareMatrixTest.java | 24 ++-- .../operation/projection/MercatorTest.java | 6 +- .../projection/ObliqueStereographicTest.java | 2 +- .../operation/provider/Geographic3Dto2DTest.java | 22 +-- .../operation/provider/LongitudeRotationTest.java | 11 +- .../referencing/operation/provider/NADCONTest.java | 9 +- .../referencing/operation/provider/NTv2Test.java | 9 +- .../transform/ConcatenatedTransformTest.java | 28 ++-- .../transform/ContextualParametersTest.java| 24 ++-- .../transform/DefaultMathTransformFactoryTest.java | 19 +-- .../operation/transform/MathTransformsTest.java| 22 +-- .../transform/PassThroughTransformTest.java| 8 +- .../transform/ProjectiveTransformTest.java | 10 +- .../operation/transform/ScaleTransformTest.java| 5 +- .../operation/transform/TransferFunctionTest.java | 10 +- .../transform/TransformResultComparator.java | 2 +- .../transform/TransformSeparatorTest.java | 36 ++--- .../transform/TranslationTransformTest.java| 5 +-
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1: Change of argument order in `Assertions` classes for consistency with JUnit 5 convention.
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git commit 5909d8a9dec6d091f05db20aac62976fb83f2d2f Merge: 84992dfbd2 cf0f562292 Author: Martin Desruisseaux AuthorDate: Sat Feb 17 16:16:23 2024 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1: Change of argument order in `Assertions` classes for consistency with JUnit 5 convention. .../sis/coverage/grid/DimensionAppenderTest.java | 4 +- .../coverage/grid/DimensionalityReductionTest.java | 6 +- .../sis/coverage/grid/GridDerivationTest.java | 64 - .../apache/sis/coverage/grid/GridExtentTest.java | 36 +++-- .../apache/sis/coverage/grid/GridGeometryTest.java | 117 .../sis/coverage/grid/PixelTranslationTest.java| 30 ++-- .../coverage/grid/ResampledGridCoverageTest.java | 8 +- .../test/org/apache/sis/metadata/Assertions.java | 9 +- .../apache/sis/metadata/PropertyAccessorTest.java | 10 +- .../sis/metadata/PropertyInformationTest.java | 2 +- .../test/org/apache/sis/metadata/TreeNodeTest.java | 2 +- .../sis/metadata/iso/DefaultIdentifierTest.java| 4 +- .../sis/metadata/iso/DefaultMetadataTest.java | 28 ++-- .../sis/metadata/iso/citation/CitationsTest.java | 32 ++--- .../metadata/iso/citation/DefaultCitationTest.java | 15 +- .../DefaultDataIdentificationTest.java | 3 +- .../DefaultServiceIdentificationTest.java | 9 +- .../apache/sis/xml/NilReasonMarshallingTest.java | 11 +- .../org/apache/sis/xml/UUIDMarshallingTest.java| 12 +- .../sis/xml/bind/fra/DataIdentificationTest.java | 4 +- .../apache/sis/io/wkt/MathTransformParserTest.java | 30 ++-- .../org/apache/sis/io/wkt/WKTDictionaryTest.java | 10 +- .../org/apache/sis/referencing/Assertions.java | 4 +- .../org/apache/sis/referencing/CommonCRSTest.java | 9 +- .../sis/referencing/GeodeticCalculatorTest.java| 10 +- .../sis/referencing/ImmutableIdentifierTest.java | 18 +-- .../referencing/crs/DefaultCompoundCRSTest.java| 8 +- .../sis/referencing/crs/DefaultDerivedCRSTest.java | 16 +-- .../referencing/crs/DefaultEngineeringCRSTest.java | 6 +- .../sis/referencing/crs/DefaultImageCRSTest.java | 4 +- .../referencing/crs/DefaultProjectedCRSTest.java | 6 +- .../sis/referencing/cs/CoordinateSystemsTest.java | 52 +++ .../referencing/cs/DefaultCylindricalCSTest.java | 8 +- .../sis/referencing/cs/DefaultPolarCSTest.java | 8 +- .../sis/referencing/cs/DefaultSphericalCSTest.java | 6 +- .../referencing/datum/BursaWolfParametersTest.java | 20 +-- .../datum/DefaultGeodeticDatumTest.java| 12 +- .../datum/DefaultTemporalDatumTest.java| 6 +- .../referencing/datum/TimeDependentBWPTest.java| 6 +- .../factory/CommonAuthorityFactoryTest.java| 20 +-- .../factory/GeodeticObjectFactoryTest.java | 7 - .../sis/referencing/factory/TestFactorySource.java | 4 +- .../referencing/factory/sql/EPSGFactoryTest.java | 32 ++--- .../operation/CoordinateOperationFinderTest.java | 33 ++--- .../DefaultConcatenatedOperationTest.java | 12 +- .../operation/DefaultConversionTest.java | 49 --- .../operation/DefaultOperationMethodTest.java | 4 +- .../operation/DefaultPassThroughOperationTest.java | 10 +- .../operation/SingleOperationMarshallingTest.java | 14 +- .../builder/LinearTransformBuilderTest.java| 39 +++--- .../operation/builder/LinearizerTest.java | 16 +-- .../builder/LocalizationGridBuilderTest.java | 6 +- .../operation/builder/ResidualGridTest.java| 4 +- .../referencing/operation/matrix/MatricesTest.java | 42 +++--- .../referencing/operation/matrix/Matrix4Test.java | 16 ++- .../operation/matrix/MatrixTestCase.java | 4 +- .../operation/matrix/NonSquareMatrixTest.java | 26 ++-- .../operation/projection/MercatorTest.java | 6 +- .../operation/provider/Geographic3Dto2DTest.java | 24 ++-- .../operation/provider/LongitudeRotationTest.java | 13 +- .../referencing/operation/provider/NADCONTest.java | 11 +- .../referencing/operation/provider/NTv2Test.java | 11 +- .../transform/ConcatenatedTransformTest.java | 30 ++-- .../transform/ContextualParametersTest.java| 26 ++-- .../transform/DefaultMathTransformFactoryTest.java | 21 +-- .../operation/transform/MathTransformsTest.java| 24 ++-- .../transform/ProjectiveTransformTest.java | 12 +- .../operation/transform/ScaleTransformTest.java| 7 +- .../operation/transform/TransferFunctionTest.java | 12 +- .../transform/TransformResultComparator.java | 4 +- .../transform/TransformSeparatorTest.java | 38 +++--- .../transform/TranslationTransformTest.java| 7 +- .../transform/WraparoundTransformTest.java | 42
(sis) branch geoapi-3.1 updated (84992dfbd2 -> 5909d8a9de)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git from 84992dfbd2 Merge branch 'geoapi-4.0' into geoapi-3.1: Upgrade from JUnit 4 to JUnit 5. add fa7418654f Replace GeoAPI `Assert` by `Assertions` with argument order consistent with JUnit 5 convention. add cf0f562292 Change argument order in SIS `Assertions` classes for consistency with JUnit 5 convention. new 5909d8a9de Merge branch 'geoapi-4.0' into geoapi-3.1: Change of argument order in `Assertions` classes for consistency with JUnit 5 convention. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../sis/coverage/grid/DimensionAppenderTest.java | 4 +- .../coverage/grid/DimensionalityReductionTest.java | 6 +- .../sis/coverage/grid/GridDerivationTest.java | 64 - .../apache/sis/coverage/grid/GridExtentTest.java | 36 +++-- .../apache/sis/coverage/grid/GridGeometryTest.java | 117 .../sis/coverage/grid/PixelTranslationTest.java| 30 ++-- .../coverage/grid/ResampledGridCoverageTest.java | 8 +- .../test/org/apache/sis/metadata/Assertions.java | 9 +- .../apache/sis/metadata/PropertyAccessorTest.java | 10 +- .../sis/metadata/PropertyInformationTest.java | 2 +- .../test/org/apache/sis/metadata/TreeNodeTest.java | 2 +- .../sis/metadata/iso/DefaultIdentifierTest.java| 4 +- .../sis/metadata/iso/DefaultMetadataTest.java | 28 ++-- .../sis/metadata/iso/citation/CitationsTest.java | 32 ++--- .../metadata/iso/citation/DefaultCitationTest.java | 15 +- .../DefaultDataIdentificationTest.java | 3 +- .../DefaultServiceIdentificationTest.java | 9 +- .../apache/sis/xml/NilReasonMarshallingTest.java | 11 +- .../org/apache/sis/xml/UUIDMarshallingTest.java| 12 +- .../sis/xml/bind/fra/DataIdentificationTest.java | 4 +- .../apache/sis/io/wkt/MathTransformParserTest.java | 30 ++-- .../org/apache/sis/io/wkt/WKTDictionaryTest.java | 10 +- .../org/apache/sis/referencing/Assertions.java | 4 +- .../org/apache/sis/referencing/CommonCRSTest.java | 9 +- .../sis/referencing/GeodeticCalculatorTest.java| 10 +- .../sis/referencing/ImmutableIdentifierTest.java | 18 +-- .../referencing/crs/DefaultCompoundCRSTest.java| 8 +- .../sis/referencing/crs/DefaultDerivedCRSTest.java | 16 +-- .../referencing/crs/DefaultEngineeringCRSTest.java | 6 +- .../sis/referencing/crs/DefaultImageCRSTest.java | 4 +- .../referencing/crs/DefaultProjectedCRSTest.java | 6 +- .../sis/referencing/cs/CoordinateSystemsTest.java | 52 +++ .../referencing/cs/DefaultCylindricalCSTest.java | 8 +- .../sis/referencing/cs/DefaultPolarCSTest.java | 8 +- .../sis/referencing/cs/DefaultSphericalCSTest.java | 6 +- .../referencing/datum/BursaWolfParametersTest.java | 20 +-- .../datum/DefaultGeodeticDatumTest.java| 12 +- .../datum/DefaultTemporalDatumTest.java| 6 +- .../referencing/datum/TimeDependentBWPTest.java| 6 +- .../factory/CommonAuthorityFactoryTest.java| 20 +-- .../factory/GeodeticObjectFactoryTest.java | 7 - .../sis/referencing/factory/TestFactorySource.java | 4 +- .../referencing/factory/sql/EPSGFactoryTest.java | 32 ++--- .../operation/CoordinateOperationFinderTest.java | 33 ++--- .../DefaultConcatenatedOperationTest.java | 12 +- .../operation/DefaultConversionTest.java | 49 --- .../operation/DefaultOperationMethodTest.java | 4 +- .../operation/DefaultPassThroughOperationTest.java | 10 +- .../operation/SingleOperationMarshallingTest.java | 14 +- .../builder/LinearTransformBuilderTest.java| 39 +++--- .../operation/builder/LinearizerTest.java | 16 +-- .../builder/LocalizationGridBuilderTest.java | 6 +- .../operation/builder/ResidualGridTest.java| 4 +- .../referencing/operation/matrix/MatricesTest.java | 42 +++--- .../referencing/operation/matrix/Matrix4Test.java | 16 ++- .../operation/matrix/MatrixTestCase.java | 4 +- .../operation/matrix/NonSquareMatrixTest.java | 26 ++-- .../operation/projection/MercatorTest.java | 6 +- .../operation/provider/Geographic3Dto2DTest.java | 24 ++-- .../operation/provider/LongitudeRotationTest.java | 13 +- .../referencing/operation/provider/NADCONTest.java | 11 +- .../referencing/operation/provider/NTv2Test.java | 11 +- .../transform/ConcatenatedTransformTest.java | 30 ++-- .../transform/ContextualParametersTest.java| 26 ++-- .../transform/DefaultMathTransformFactoryTest.java | 21 +-- .../operation/transform/MathTransformsTest.java
(sis) branch geoapi-4.0 updated: Change argument order in SIS `Assertions` classes for consistency with JUnit 5 convention.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new cf0f562292 Change argument order in SIS `Assertions` classes for
consistency with JUnit 5 convention.
cf0f562292 is described below
commit cf0f5622922b3efab03791a42ac75291552ee7d8
Author: Martin Desruisseaux
AuthorDate: Sat Feb 17 15:20:36 2024 +0100
Change argument order in SIS `Assertions` classes for consistency with
JUnit 5 convention.
---
.../test/org/apache/sis/metadata/Assertions.java | 9 +-
.../apache/sis/metadata/PropertyAccessorTest.java | 10 +-
.../sis/metadata/PropertyInformationTest.java | 2 +-
.../test/org/apache/sis/metadata/TreeNodeTest.java | 2 +-
.../sis/metadata/iso/DefaultIdentifierTest.java| 4 +-
.../sis/metadata/iso/DefaultMetadataTest.java | 28 ++--
.../sis/metadata/iso/citation/CitationsTest.java | 32 ++---
.../metadata/iso/citation/DefaultCitationTest.java | 15 +-
.../DefaultDataIdentificationTest.java | 3 +-
.../DefaultServiceIdentificationTest.java | 9 +-
.../apache/sis/xml/NilReasonMarshallingTest.java | 11 +-
.../org/apache/sis/xml/UUIDMarshallingTest.java| 12 +-
.../sis/xml/bind/fra/DataIdentificationTest.java | 4 +-
.../org/apache/sis/referencing/Assertions.java | 4 +-
.../sis/referencing/ImmutableIdentifierTest.java | 18 +--
.../operation/DefaultOperationMethodTest.java | 4 +-
.../sis/storage/base/MetadataBuilderTest.java | 10 +-
.../sis/converter/ConverterRegistryTest.java | 152 ++---
.../test/org/apache/sis/io/AppenderTestCase.java | 2 +-
.../test/org/apache/sis/test/Assertions.java | 6 +-
20 files changed, 168 insertions(+), 169 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/Assertions.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/Assertions.java
index 21f2230a9f..63fd863c48 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/Assertions.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/Assertions.java
@@ -55,14 +55,13 @@ public final class Assertions extends Static {
/**
* Asserts that the English title of the given citation is equal to the
expected string.
*
- * @param message the message to report in case of test failure.
* @param expected the expected English title.
* @param citation the citation to test.
- *
+ * @param message the message to report in case of test failure.
*
* @see #assertAnyTitleEquals(String, String, Citation)
*/
-public static void assertTitleEquals(final String message, final String
expected, final Citation citation) {
+public static void assertTitleEquals(final String expected, final Citation
citation, final String message) {
assertNotNull(citation, message);
final InternationalString title = citation.getTitle();
assertNotNull(title, message);
@@ -73,11 +72,11 @@ public final class Assertions extends Static {
* Asserts that the given citation has only one responsible party,
* and its English name is equal to the expected string.
*
- * @param message the message to report in case of test failure.
* @param expected the expected English responsibly party name.
* @param citation the citation to test.
+ * @param message the message to report in case of test failure.
*/
-public static void assertPartyNameEquals(final String message, final
String expected, final Citation citation) {
+public static void assertPartyNameEquals(final String expected, final
Citation citation, final String message) {
assertNotNull(citation, message);
final Responsibility r =
getSingleton(citation.getCitedResponsibleParties());
final InternationalString name =
getSingleton(r.getParties()).getName();
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
index bdf1a1b768..dc85f799cd 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
@@ -455,7 +455,7 @@ public final class PropertyAccessorTest extends TestCase {
assertEquals(oldTitles, oldValue, "set(…, RETURN_PREVIOUS)");
assertEquals(newTitles, newValue, "get(…)");
assertSame (newValue, instance.getAlternateTitles());
-assertTitleEquals("title", "Ignored title", instance);
+assertTitleEquals("Ignored title", instance, "citation");
}
/**
@@ -521,7
(sis) branch SIS-457 deleted (was e807c05257)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch SIS-457 in repository https://gitbox.apache.org/repos/asf/sis.git was e807c05257 Upgrade JUnit dependency and replace JUnit 4 dependency by JUnit 5 in NetBeans project configuration. This change permanently discards the following revisions: discard e807c05257 Upgrade JUnit dependency and replace JUnit 4 dependency by JUnit 5 in NetBeans project configuration. discard ca0e3b710d SIS-457 Replace @BeforeClass and @AfterClass discard 6f72a1ddab SIS-457 Update javadoc discard 5bc9d1e99b SIS-457 Run TestSuites with junit5 discard 85784b5a35 First patch from Michiel Rop for migrating to JUnit 5: https://issues.apache.org/jira/browse/SIS-457 The code compile but tests are not yet enabled.
(sis) branch main updated (7763c6c1a5 -> 878da1aaa3)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/sis.git from 7763c6c1a5 Merge branch 'geoapi-3.1' add 787c527ca1 Port some tests to JUnit 5. add e8143973c8 Port more tests to JUnit 5. add e410aa7ec8 Remove JUnit 4 dependency from incubator and optional modules. Those modules are now tested with the JUnit 5 framework only. add 3d3d3b7251 Upgraded JUnit 5 dependency to 5.10.2 and ported a few more tests. add 23c65d0589 Partial revert of previous changes: we need to keep JUnit 4 `org.junit.Assume` until the JUnit 4 runner is remplaced by the JUnit 5 runner. add bc6f94524a Partial migration of the referencing module to JUnit 5. add f210473405 Partial migration of the metadata module to JUnit 5. add e4871e300e Port remaining tests from JUnit 4 to JUnit 5. This is only a replacement of `org.junit.Assert` by `org.junit.jupiter.api.Assertions`, but the runner is still JUnit 4 one. Now that the `assert` method calls are replaced, the next step will be to replace the runner itself (after search and replace of @Test). add acc896a725 Cleanup: - Use JUnit 5 runner for the `buildSrc` module. - Replace `assertFalse(a == b)` by `assertNotEquals(a, b)`. - Change argument order of assertion methods in `AnnotationConsistencyCheck` for consistency with JUnit 5 order. add 1355d5ca81 Replace JUnit 4 runner by JUnit 5 runner. This work requires: - Replacements of `org.junit.Test` by `org.junit.jupiter.api.Test` annotations. - Replacements of `org.junit.Assume` by `org.junit.jupiter.api.Assumptions`. - Replacements JUnit 4 rules by JUnit 5 extensions (implementation classes modified). - Changes in the `buildSrc/.../ModularTest.java` class. - Changes in the Gradle scripts. - A few changes related to `Assertions` that should have been in the previous commit. add 84992dfbd2 Merge branch 'geoapi-4.0' into geoapi-3.1: Upgrade from JUnit 4 to JUnit 5. new 878da1aaa3 Merge branch 'geoapi-3.1': Upgrade from JUnit 4 to JUnit 5. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: NOTICE | 2 +- buildSrc/build.gradle.kts | 7 +- .../apache/sis/buildtools/gradle/ModularTest.java | 11 +- .../resources/IndexedResourceCompilerTest.java | 7 +- endorsed/build.gradle.kts | 20 +- .../sis/cloud/aws/s3/ClientFileSystemTest.java | 4 +- .../sis/cloud/aws/s3/KeyPathMatcherTest.java | 4 +- .../org/apache/sis/cloud/aws/s3/KeyPathTest.java | 4 +- .../org/apache/sis/console/AboutCommandTest.java | 2 +- .../org/apache/sis/console/CRSCommandTest.java | 2 +- .../org/apache/sis/console/CommandRunnerTest.java | 4 +- .../org/apache/sis/console/HelpCommandTest.java| 2 +- .../apache/sis/console/MetadataCommandTest.java| 8 +- .../apache/sis/console/MimeTypeCommandTest.java| 2 +- .../main/org/apache/sis/filter/internal/Node.java | 2 +- .../geometry/wrapper/SpatialOperationContext.java | 2 +- .../org/apache/sis/coverage/CategoryListTest.java | 134 +++ .../test/org/apache/sis/coverage/CategoryTest.java | 167 .../apache/sis/coverage/CoverageCombinerTest.java | 6 +- .../apache/sis/coverage/SampleDimensionTest.java | 81 ++-- .../apache/sis/coverage/SampleRangeFormatTest.java | 2 +- .../grid/BandAggregateGridCoverageTest.java| 4 +- .../coverage/grid/BufferedGridCoverageTest.java| 2 +- .../coverage/grid/ConvertedGridCoverageTest.java | 19 +- .../sis/coverage/grid/DimensionAppenderTest.java | 2 +- .../coverage/grid/DimensionalityReductionTest.java | 2 +- .../grid/FractionalGridCoordinatesTest.java| 4 +- .../sis/coverage/grid/GridCoverage2DTest.java | 81 ++-- .../sis/coverage/grid/GridCoverageBuilderTest.java | 42 +- .../sis/coverage/grid/GridDerivationTest.java | 20 +- .../apache/sis/coverage/grid/GridExtentTest.java | 2 +- .../apache/sis/coverage/grid/GridGeometryTest.java | 2 +- .../sis/coverage/grid/GridOrientationTest.java | 16 +- .../sis/coverage/grid/PixelTranslationTest.java| 10 +- .../coverage/grid/ResampledGridCoverageTest.java | 35 +- .../sis/coverage/grid/ReshapedImageTest.java | 4 +- .../coverage/grid/TranslatedGridCoverageTest.java | 6 +- .../coverage/grid/j2d/ColorModelBuilderTest.java | 22 +- .../sis/coverage/grid/j2d/ImageLayoutTest.java | 8 +- .../sis/coverage/grid/j2d/ImageUtilitiesTest.java | 16 +- .../coverage/grid/j2d/SampleModelFactoryTest.java | 41 +- .../coverage/grid/j2d/ScaledColorSpaceTest.java| 4 +-
