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 f4bb5471ef2637d63f9396644acaade913b4a7ab
Merge: 6879e93e0e 86578a47d9
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Wed Feb 21 11:09:39 2024 +0100
Merge branch 'geoapi-4.0' into geoapi-3.1:
Last cleanups (for now) about migration to JUnit 5.
endorsed/build.gradle.kts | 5 +
.../sis/coverage/grid/j2d/TilePlaceholder.java | 4 +-
.../main/org/apache/sis/image/TileCache.java | 3 +-
.../apache/sis/feature/AbstractFeatureTest.java | 14 +-
.../apache/sis/feature/FeatureMemoryBenchmark.java | 6 +-
.../org/apache/sis/feature/FeatureTestCase.java | 2 +-
.../feature/builder/FeatureTypeBuilderTest.java | 4 +-
.../apache/sis/feature/test/FeatureComparator.java | 34 ++-
.../test/org/apache/sis/filter/PeriodLiteral.java | 3 +-
.../apache/sis/filter/sqlmm/RegistryTestCase.java | 57 +++--
.../apache/sis/image/StatisticsCalculatorTest.java | 18 +-
.../org.apache.sis.metadata/main/module-info.java | 1 +
.../sis/metadata/PropertyConsistencyCheck.java | 9 +-
.../test/org/apache/sis/metadata/TreeNodeTest.java | 4 +-
.../org/apache/sis/metadata/TreeTableViewTest.java | 4 +-
.../apache/sis/metadata/iso/AllMetadataTest.java | 10 -
.../iso/identification/DefaultResolutionTest.java | 25 +-
.../maintenance/DefaultScopeDescriptionTest.java | 24 +-
.../iso/spatial/DefaultGeorectifiedTest.java | 24 +-
.../sis/metadata/sql/MetadataFallbackVerifier.java | 2 +-
.../sis/metadata/sql/MetadataSourceTest.java | 2 +
.../sis/metadata/sql/MetadataWriterTest.java | 2 +
.../org/apache/sis/metadata/sql/TestDatabase.java | 43 +++-
.../sis/util/iso/DefaultNameFactoryTest.java | 28 +-
.../org/apache/sis/util/iso/DefaultRecordTest.java | 43 ++--
.../apache/sis/util/iso/DefaultRecordTypeTest.java | 30 +--
.../apache/sis/util/iso/NameMarshallingTest.java | 33 +--
.../sis/util/iso/SerializableRecordSchema.java | 20 +-
.../apache/sis/xml/bind/gco/MultiplicityTest.java | 16 +-
.../apache/sis/xml/bind/gml/TimePeriodTest.java | 45 +---
.../apache/sis/xml/bind/lan/LanguageCodeTest.java | 29 +--
.../sis/xml/test/AnnotationConsistencyCheck.java | 11 +-
.../apache/sis/xml/test/DocumentComparator.java | 48 ++--
.../org/apache/sis/xml/test/PackageVerifier.java | 22 +-
.../test/org/apache/sis/xml/test/TestCase.java | 38 +++
.../sis/openoffice/ReferencingFunctionsTest.java | 23 +-
.../org/apache/sis/openoffice/TransformerTest.java | 23 +-
.../coverage/MultiResolutionCoverageLoader.java | 3 +-
.../apache/sis/referencing/AuthorityFactories.java | 2 +
.../main/org/apache/sis/referencing/CommonCRS.java | 281 +++++++++++----------
.../referencing/factory/sql/EPSGDataAccess.java | 22 +-
.../apache/sis/geometry/AbstractEnvelopeTest.java | 6 +-
.../apache/sis/geometry/GeneralEnvelopeTest.java | 3 +-
.../org/apache/sis/io/wkt/ComparisonWithEPSG.java | 33 ++-
.../org/apache/sis/io/wkt/WKTDictionaryTest.java | 4 +-
.../test/org/apache/sis/io/wkt/WKTParserTest.java | 3 +
.../apache/sis/parameter/ParameterFormatTest.java | 28 +-
.../sis/parameter/ParameterMarshallingTest.java | 33 +--
.../org/apache/sis/referencing/Assertions.java | 26 +-
.../sis/referencing/AuthorityFactoriesTest.java | 30 +--
.../test/org/apache/sis/referencing/CRSTest.java | 46 ++--
.../sis/referencing/EPSGFactoryFallbackTest.java | 5 +
.../sis/referencing/GeodeticObjectVerifier.java | 4 +-
.../referencing/crs/DefaultProjectedCRSTest.java | 47 ++--
.../org/apache/sis/referencing/cs/CodesTest.java | 2 +-
.../factory/ConcurrentAuthorityFactoryTest.java | 46 +++-
.../factory/GeodeticObjectFactoryTest.java | 3 +
.../factory/MultiAuthoritiesFactoryTest.java | 32 +--
.../sis/referencing/factory/TestFactorySource.java | 91 +++----
.../referencing/factory/sql/EPSGFactoryTest.java | 150 +++++------
.../referencing/factory/sql/EPSGInstallerTest.java | 35 +--
.../referencing/geoapi/AuthorityFactoryTest.java | 3 +
.../geoapi/ParameterizedTransformTest.java | 3 +
.../operation/CoordinateOperationFinderTest.java | 91 +++----
.../operation/CoordinateOperationRegistryTest.java | 48 ++--
.../DefaultCoordinateOperationFactoryTest.java | 38 +--
.../operation/SingleOperationMarshallingTest.java | 24 +-
.../builder/LocalizationGridBuilderTest.java | 3 +
.../projection/ConformalProjectionTest.java | 5 +-
.../projection/MapProjectionTestCase.java | 4 +-
.../projection/MercatorMethodComparison.java | 4 +
.../projection/NormalizedProjectionTest.java | 3 +
.../{Benchmark.java => ProjectionBenchmark.java} | 14 +-
.../projection/ProjectionResultComparator.java | 3 +-
.../operation/provider/GeographicOffsetsTest.java | 5 +-
.../operation/provider/MapProjectionTest.java | 4 +-
.../referencing/operation/provider/NTv2Test.java | 6 +-
.../operation/transform/CartesianToPolarTest.java | 3 +
.../transform/CartesianToSphericalTest.java | 3 +
.../transform/CoordinateSystemTransformTest.java | 45 ++--
.../transform/EllipsoidToCentricTransformTest.java | 28 +-
.../transform/LinearInterpolator1DTest.java | 3 +
.../operation/transform/MathTransformTestCase.java | 63 +++--
.../operation/transform/MathTransformWrapper.java | 4 +-
.../operation/transform/PolarToCartesianTest.java | 3 +
.../transform/ProjectiveTransformTest.java | 3 +
.../transform/SphericalToCartesianTest.java | 3 +
.../transform/TransformResultComparator.java | 6 +-
.../report/CoordinateOperationMethods.java | 16 +-
.../report/CoordinateReferenceSystems.java | 24 +-
.../referencing/util/j2d/ShapeUtilitiesExt.java | 9 +-
.../sis/test/integration/ConsistencyTest.java | 6 +-
.../integration/CoordinateReferenceSystemTest.java | 7 +-
.../apache/sis/test/integration/MetadataTest.java | 23 +-
.../sis/test/integration/MetadataVerticalTest.java | 22 +-
.../CC_GeneralOperationParameterTest.java | 32 +--
.../sis/storage/geotiff/SelfConsistencyTest.java | 49 ++--
.../sis/storage/netcdf/SelfConsistencyTest.java | 50 ++--
.../sis/storage/netcdf/base/FeatureSetTest.java | 13 +
.../apache/sis/storage/netcdf/base/GridTest.java | 4 +
.../apache/sis/storage/netcdf/base/TestCase.java | 57 +++--
.../apache/sis/storage/sql/TestOnAllDatabases.java | 6 +
.../sql/feature/SelectionClauseWriterTest.java | 2 +-
.../sis/storage/sql/postgis/PostgresTest.java | 2 +
.../org/apache/sis/storage/gpx/StoreProvider.java | 13 +
.../org/apache/sis/storage/gpx/ReaderTest.java | 25 +-
.../org/apache/sis/storage/gpx/UpdaterTest.java | 23 +-
.../org/apache/sis/storage/gpx/WriterTest.java | 21 +-
.../org/apache/sis/storage/CoverageSubset.java | 7 +-
.../sis/storage/esri/BILConsistencyTest.java | 45 ++--
.../sis/storage/esri/BIPConsistencyTest.java | 45 ++--
.../sis/storage/esri/BSQConsistencyTest.java | 45 ++--
.../org/apache/sis/storage/folder/StoreTest.java | 4 +-
.../sis/storage/image/SelfConsistencyTest.java | 45 ++--
.../sis/storage/image/WorldFileStoreTest.java | 93 +++----
.../sis/storage/test/CoverageReadConsistency.java | 89 +++++--
.../apache/sis/storage/test/SubsampledImage.java | 13 +-
.../src/org.apache.sis.util/main/module-info.java | 1 +
.../main/org/apache/sis/pending/jdk/JDK16.java | 18 +-
.../main/org/apache/sis/system/Configuration.java | 3 +-
.../main/org/apache/sis/util/collection/Cache.java | 3 +-
.../test/org/apache/sis/io/LineAppenderTest.java | 4 +-
.../org/apache/sis/io/TabulationExpansionTest.java | 4 +-
.../test/org/apache/sis/io/WordWrapTest.java | 4 +-
.../org/apache/sis/measure/SystemUnitTest.java | 7 +-
.../sis/test/{Performance.java => Benchmark.java} | 21 +-
.../apache/sis/test/FailureDetailsReporter.java | 42 +--
.../org/apache/sis/test/LogRecordCollector.java | 122 ++++++---
.../test/org/apache/sis/test/LoggingWatcher.java | 197 +++++++++++++--
.../test/org/apache/sis/test/TestCase.java | 19 +-
.../test/org/apache/sis/test/TestCaseWithLogs.java | 76 ++++++
.../org/apache/sis/test/TestConfiguration.java | 11 -
.../test/org/apache/sis/test/TestStep.java | 12 +-
.../test/org/apache/sis/test/TestUtilities.java | 91 +------
.../org/apache/sis/util/collection/CacheTest.java | 11 +-
.../apache/sis/util/collection/RangeSetTest.java | 6 +-
.../apache/sis/util/collection/TestCaseWithGC.java | 114 +++++++++
.../sis/util/collection/TreeTableFormatTest.java | 3 +
.../sis/util/collection/WeakHashSetTest.java | 15 +-
.../sis/util/collection/WeakValueHashMapTest.java | 7 +-
.../sis/util/logging/PerformanceLevelTest.java | 3 +
geoapi/snapshot | 2 +-
incubator/build.gradle.kts | 5 +
.../test/org/apache/sis/map/SEPortrayerTest.java | 11 +-
.../sis/map/service/GraphicsPortrayerTest.java | 10 +-
.../storage/coveragejson/binding/BindingTest.java | 24 +-
.../sis/storage/shapefile/ShapefileStoreTest.java | 33 +--
optional/build.gradle.kts | 5 +
148 files changed, 1984 insertions(+), 1756 deletions(-)
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescriptionTest.java
index c30795d667,9d80cb9105..625899cd8a
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescriptionTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescriptionTest.java
@@@ -20,12 -20,12 +20,9 @@@ import org.apache.sis.xml.bind.Context
// Test dependencies
import org.junit.jupiter.api.Test;
- import org.junit.jupiter.api.AfterEach;
import static org.junit.jupiter.api.Assertions.*;
- import org.junit.jupiter.api.extension.RegisterExtension;
- import org.apache.sis.test.LoggingWatcher;
- import org.apache.sis.test.TestCase;
+ import org.apache.sis.test.TestCaseWithLogs;
-// Specific to the geoapi-4.0 branch:
-import org.apache.sis.util.SimpleInternationalString;
-
/**
* Tests {@link DefaultScopeDescription}.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/geoapi/AuthorityFactoryTest.java
index c60e804936,4942e3c371..d17bfaea84
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/geoapi/AuthorityFactoryTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/geoapi/AuthorityFactoryTest.java
@@@ -31,9 -33,8 +33,10 @@@ import org.apache.sis.test.FailureDetai
*
* @author Cédric Briançon (Geomatys)
* @author Martin Desruisseaux (Geomatys)
+ * @version 1.4
+ * @since 1.1
*/
+ @ExtendWith(FailureDetailsReporter.class)
public final class AuthorityFactoryTest extends
org.opengis.test.referencing.AuthorityFactoryTest {
/**
* Creates a new test suite using the singleton factory instance.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/geoapi/ParameterizedTransformTest.java
index 38a6e6732e,05ff9a6d14..a9c8a40a32
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/geoapi/ParameterizedTransformTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/geoapi/ParameterizedTransformTest.java
@@@ -32,9 -34,8 +34,10 @@@ import org.apache.sis.test.FailureDetai
* Runs a suite of tests provided in the GeoAPI project.
*
* @author Martin Desruisseaux (Geomatys)
+ * @version 1.4
+ * @since 1.1
*/
+ @ExtendWith(FailureDetailsReporter.class)
public final class ParameterizedTransformTest extends
org.opengis.test.referencing.ParameterizedTransformTest {
/**
* Creates a new test suite using the singleton factory instance.
diff --cc geoapi/snapshot
index b0d7ebf742,c786929b56..3d58e2c44d
--- a/geoapi/snapshot
+++ b/geoapi/snapshot
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit b0d7ebf742ee7d7683a42f1cec27826310b7438f
-Subproject commit c786929b56e8f8aed8eceb0144734bbd7ac28ea6
++Subproject commit 3d58e2c44d64d0b84df243363f1ee1e571b081fd
