You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2024/02/17 15:17:02 UTC
(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 <ma...@geomatys.com>
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 +++---
.../util/EllipsoidalHeightCombinerTest.java | 22 +--
.../util/GeodeticObjectBuilderTest.java | 5 +-
.../sis/test/integration/MetadataVerticalTest.java | 13 +-
.../sis/storage/base/MetadataBuilderTest.java | 10 +-
.../test/org/apache/sis/storage/wkt/StoreTest.java | 4 +-
.../sis/converter/ConverterRegistryTest.java | 152 ++++++++++-----------
.../test/org/apache/sis/io/AppenderTestCase.java | 2 +-
.../test/org/apache/sis/test/Assertions.java | 6 +-
.../test/org/apache/sis/test/TestCase.java | 2 +-
geoapi/snapshot | 2 +-
83 files changed, 746 insertions(+), 743 deletions(-)
diff --cc endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
index 68e55191bd,c6e9041388..7998809576
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
@@@ -245,8 -240,8 +246,8 @@@ public final class DefaultCitationTest
* @param format whether to use the 2007 or 2016 version of ISO 19115.
*/
private void testMarshalling(final Format format) throws JAXBException {
- final DefaultOnlineResource rs = new DefaultOnlineResource(URI.create("https://tools.ietf.org/html/rfc1149"));
+ final var rs = new DefaultOnlineResource(URI.create("https://tools.ietf.org/html/rfc1149"));
- rs.setName(new SimpleInternationalString("IP over Avian Carriers"));
+ rs.setName("IP over Avian Carriers");
rs.setDescription(new SimpleInternationalString("High delay, low throughput, and low altitude service."));
rs.setFunction(OnLineFunction.OFFLINE_ACCESS);
diff --cc geoapi/snapshot
index 2662946e36,5ad50c808f..d537df759d
--- a/geoapi/snapshot
+++ b/geoapi/snapshot
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 2662946e36fb4c982832ce649dd5ca202af9a9dd
-Subproject commit 5ad50c808fc8cea1aa2ace46992435a86f604003
++Subproject commit d537df759d406cf8ea20d021a551fbadcb9de94f