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 <[email protected]>
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 +521,7 @@ public final class PropertyAccessorTest extends TestCase {
// Check final collection content.
final List<InternationalString> expected = List.of(title1, title2);
assertEquals(expected, accessor.get(index, instance));
- assertTitleEquals("title", "Ignored title", instance);
+ assertTitleEquals("Ignored title", instance, "citation");
}
/**
@@ -567,17 +567,17 @@ public final class PropertyAccessorTest extends TestCase {
assertEquals(Boolean.TRUE, changed, "set(…, APPEND)");
assertEquals(merged, newValue, "get(…)");
assertSame (newValue, instance.getAlternateTitles());
- assertTitleEquals("title", "Added title", instance);
+ assertTitleEquals("Added title", instance, "citation");
// Test setting again the title to the same value.
titleChanged = accessor.set(titleIndex, instance, "Added title",
APPEND);
assertEquals(Boolean.FALSE, titleChanged, "set(…, APPEND)");
- assertTitleEquals("title", "Added title", instance);
+ assertTitleEquals("Added title", instance, "citation");
// Test setting the title to a different value.
titleChanged = accessor.set(titleIndex, instance, "Different title",
APPEND);
assertNull(titleChanged, "set(…, APPEND)"); // Operation shall be
refused.
- assertTitleEquals("title", "Added title", instance);
+ assertTitleEquals("Added title", instance, "citation");
}
/**
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyInformationTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyInformationTest.java
index f673be85c7..e902282010 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyInformationTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyInformationTest.java
@@ -76,7 +76,7 @@ public final class PropertyInformationTest extends TestCase {
*/
private static void assertParentIsCitation(final
ExtendedElementInformation information) {
assertInstanceOf(Identifier.class, information); // Specific to SIS
implementation.
- assertTitleEquals("authority", "ISO 19115", ((Identifier)
information).getAuthority());
+ assertTitleEquals("ISO 19115", ((Identifier)
information).getAuthority(), "authority");
assertEquals("CI_Citation",
getSingleton(information.getParentEntity()));
}
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/TreeNodeTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/TreeNodeTest.java
index 32c8da9260..546d67cfcc 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/TreeNodeTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/TreeNodeTest.java
@@ -376,7 +376,7 @@ public final class TreeNodeTest extends TestCase {
child = node.newChild();
child.setValue(TableColumn.IDENTIFIER, "title");
child.setValue(TableColumn.VALUE, "A new title");
- assertTitleEquals("citation", "A new title", citation);
+ assertTitleEquals("A new title", citation, "citation");
assertSame(citation.getTitle(), child.getValue(TableColumn.VALUE));
/*
* Try adding a new element in a collection.
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/DefaultIdentifierTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/DefaultIdentifierTest.java
index 9ed1aa50b9..bd8334e59e 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/DefaultIdentifierTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/DefaultIdentifierTest.java
@@ -69,7 +69,7 @@ public final class DefaultIdentifierTest extends TestCase {
*/
@Test
public void testMarshal() throws JAXBException {
- final DefaultIdentifier identifier = new DefaultIdentifier();
+ final var identifier = new DefaultIdentifier();
identifier.setAuthority(new DefaultCitation("EPSG"));
identifier.setCode("4326");
assertXmlEquals(XML, marshal(identifier), "xmlns:*");
@@ -84,7 +84,7 @@ public final class DefaultIdentifierTest extends TestCase {
public void testUnmarshall() throws JAXBException {
final DefaultIdentifier identifier =
unmarshal(DefaultIdentifier.class, XML);
assertNull(identifier.getVersion());
- assertTitleEquals("authority", "EPSG", identifier.getAuthority());
+ assertTitleEquals("EPSG", identifier.getAuthority(), "authority");
assertEquals("4326", identifier.getCode());
}
}
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/DefaultMetadataTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/DefaultMetadataTest.java
index 6cc3bd7c1a..1f08f347a6 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/DefaultMetadataTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/DefaultMetadataTest.java
@@ -91,7 +91,7 @@ public final class DefaultMetadataTest extends TestCase {
@Test
@SuppressWarnings("deprecation")
public void testFileIdentifier() {
- final DefaultMetadata metadata = new DefaultMetadata();
+ final var metadata = new DefaultMetadata();
assertNull(metadata.getFileIdentifier());
metadata.setFileIdentifier("Apache SIS/Metadata test");
assertEquals("Apache SIS/Metadata test",
metadata.getMetadataIdentifier().getCode());
@@ -106,7 +106,7 @@ public final class DefaultMetadataTest extends TestCase {
@Test
@SuppressWarnings("deprecation")
public void testLocales() {
- final DefaultMetadata metadata = new DefaultMetadata();
+ final var metadata = new DefaultMetadata();
assertNull(metadata.getLanguage());
/*
* Set the default language, which shall be the first entry in the
collection.
@@ -154,13 +154,13 @@ public final class DefaultMetadataTest extends TestCase {
@Test
@SuppressWarnings("deprecation")
public void testParentIdentifier() {
- final DefaultMetadata metadata = new DefaultMetadata();
+ final var metadata = new DefaultMetadata();
assertNull(metadata.getParentIdentifier());
metadata.setParentIdentifier("ParentID");
assertEquals("ParentID", metadata.getParentIdentifier());
- DefaultCitation c = (DefaultCitation) metadata.getParentMetadata();
- assertTitleEquals("parentMetadata", "ParentID", c);
+ var c = assertInstanceOf(DefaultCitation.class,
metadata.getParentMetadata());
+ assertTitleEquals("ParentID", c, "parentMetadata");
c.setTitle(new SimpleInternationalString("New parent"));
assertEquals("New parent", metadata.getParentIdentifier());
}
@@ -173,9 +173,9 @@ public final class DefaultMetadataTest extends TestCase {
@Test
@SuppressWarnings("deprecation")
public void testHierarchyLevels() {
- final String[] names = new String[] {"Bridges", "Golden Gate
Bridge"};
- final ScopeCode[] levels = new ScopeCode[] {ScopeCode.FEATURE_TYPE,
ScopeCode.FEATURE};
- final DefaultMetadata metadata = new DefaultMetadata();
+ final var names = new String[] {"Bridges", "Golden Gate Bridge"};
+ final var levels = new ScopeCode[] {ScopeCode.FEATURE_TYPE,
ScopeCode.FEATURE};
+ final var metadata = new DefaultMetadata();
assertTrue(metadata.getHierarchyLevelNames().isEmpty());
assertTrue(metadata.getHierarchyLevels().isEmpty());
/*
@@ -202,7 +202,7 @@ public final class DefaultMetadataTest extends TestCase {
*/
it.remove();
assertFalse(it.hasNext());
- final DefaultMetadataScope c = new DefaultMetadataScope(
+ final var c = new DefaultMetadataScope(
levels[1] = ScopeCode.ATTRIBUTE_TYPE,
names [1] = "Clearance");
assertTrue(scopes.add(c));
@@ -227,13 +227,13 @@ public final class DefaultMetadataTest extends TestCase {
@Test
@SuppressWarnings("deprecation")
public void testDateStamp() {
- final DefaultMetadata metadata = new DefaultMetadata();
+ final var metadata = new DefaultMetadata();
assertNull(metadata.getDateStamp());
/*
* Verifies that the deprecated method get its value from the
CitationDate objects.
*/
Date creation = date("2014-10-07 00:00:00");
- final DefaultCitationDate[] dates = new DefaultCitationDate[] {
+ final var dates = new DefaultCitationDate[] {
new DefaultCitationDate(date("2014-10-09 00:00:00"),
DateType.LAST_UPDATE),
new DefaultCitationDate(creation, DateType.CREATION)
};
@@ -257,7 +257,7 @@ public final class DefaultMetadataTest extends TestCase {
@Test
@SuppressWarnings("deprecation")
public void testMetadataStandard() {
- final DefaultMetadata metadata = new DefaultMetadata();
+ final var metadata = new DefaultMetadata();
assertNull(metadata.getMetadataStandardName());
assertNull(metadata.getMetadataStandardVersion());
@@ -268,7 +268,7 @@ public final class DefaultMetadataTest extends TestCase {
assertEquals(name, metadata.getMetadataStandardName());
assertEquals(version, metadata.getMetadataStandardVersion());
final Citation standard =
getSingleton(metadata.getMetadataStandards());
- assertTitleEquals("standard", name, standard);
+ assertTitleEquals(name, standard, "standard");
assertEquals(version, standard.getEdition().toString());
}
@@ -280,7 +280,7 @@ public final class DefaultMetadataTest extends TestCase {
@Test
@SuppressWarnings("deprecation")
public void testDataSetUri() throws URISyntaxException {
- final DefaultMetadata metadata = new DefaultMetadata();
+ final var metadata = new DefaultMetadata();
metadata.setDataSetUri("file:/tmp/myfile.txt");
assertEquals("file:/tmp/myfile.txt", metadata.getDataSetUri());
assertEquals("file:/tmp/myfile.txt",
getSingleton(getSingleton(metadata.getIdentificationInfo())
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/CitationsTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/CitationsTest.java
index b12aeb1cef..638f2abd01 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/CitationsTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/CitationsTest.java
@@ -177,7 +177,7 @@ public final class CitationsTest extends TestCase {
@Test
@DependsOnMethod("testGetIdentifier")
public void testToCodeSpace() {
- final SimpleCitation citation = new SimpleCitation("
Valid\u2060Id\u200Bentifier ");
+ final var citation = new SimpleCitation(" Valid\u2060Id\u200Bentifier
");
assertEquals("ValidIdentifier", Citations.toCodeSpace(citation));
assertNull(Citations.toCodeSpace(new SimpleCitation("Proj.4")),
@@ -206,18 +206,18 @@ public final class CitationsTest extends TestCase {
*/
@Test
public void testGetTitles() {
- assertTitleEquals("SIS", "Apache Spatial Information System",
SIS);
- assertTitleEquals("WMS", "Web Map Server",
WMS);
- assertTitleEquals("OGC", "OGC Naming Authority",
OGC);
- assertTitleEquals("EPSG", "EPSG Geodetic Parameter Dataset",
EPSG);
- assertTitleEquals("ISBN", "International Standard Book Number",
ISBN);
- assertTitleEquals("ISSN", "International Standard Serial Number",
ISSN);
- assertTitleEquals("GEOTIFF", "GeoTIFF Coverage Encoding Profile",
GEOTIFF);
- assertTitleEquals("NETCDF", "NetCDF Classic and 64-bit Offset
Format", NETCDF);
- assertTitleEquals("PROJ4", "PROJ coordinate transformation
software library", PROJ4);
- assertTitleEquals("S57", "IHO transfer standard for digital
hydrographic data", S57);
- assertTitleEquals("ISO_19115", "Geographic Information — Metadata Part
1: Fundamentals", ISO_19115.get(0));
- assertTitleEquals("ISO_19115", "Geographic Information — Metadata Part
2: Extensions for imagery and gridded data", ISO_19115.get(1));
+ assertTitleEquals("Apache Spatial Information System",
SIS, "SIS");
+ assertTitleEquals("Web Map Server",
WMS, "WMS");
+ assertTitleEquals("OGC Naming Authority",
OGC, "OGC");
+ assertTitleEquals("EPSG Geodetic Parameter Dataset",
EPSG, "EPSG");
+ assertTitleEquals("International Standard Book Number",
ISBN, "ISBN");
+ assertTitleEquals("International Standard Serial Number",
ISSN, "ISSN");
+ assertTitleEquals("GeoTIFF Coverage Encoding Profile",
GEOTIFF, "GEOTIFF");
+ assertTitleEquals("NetCDF Classic and 64-bit Offset Format",
NETCDF, "NETCDF");
+ assertTitleEquals("PROJ coordinate transformation software library",
PROJ4, "PROJ4");
+ assertTitleEquals("IHO transfer standard for digital hydrographic
data", S57, "S57");
+ assertTitleEquals("Geographic Information — Metadata Part 1:
Fundamentals", ISO_19115.get(0), "ISO_19115");
+ assertTitleEquals("Geographic Information — Metadata Part 2:
Extensions for imagery and gridded data", ISO_19115.get(1), "ISO_19115");
}
/**
@@ -287,9 +287,9 @@ public final class CitationsTest extends TestCase {
*/
@Test
public void testIdentifierMatches() {
- final Identifier ogc = new DefaultIdentifier("OGC", "06-042", null);
- final Identifier iso = new DefaultIdentifier("ISO", "19128", null);
- final DefaultCitation citation = new DefaultCitation("Web Map Server");
+ final var ogc = new DefaultIdentifier("OGC", "06-042", null);
+ final var iso = new DefaultIdentifier("ISO", "19128", null);
+ final var citation = new DefaultCitation("Web Map Server");
citation.setIdentifiers(List.of(ogc, iso, new DefaultIdentifier("Foo",
"06-042", null)));
assertTrue (/* With full identifier */
Citations.identifierMatches(citation, ogc, ogc.getCode()));
assertTrue (/* With full identifier */
Citations.identifierMatches(citation, iso, iso.getCode()));
diff --git
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
index d1bf81b515..c6e9041388 100644
---
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
@@ -87,8 +87,8 @@ public final class DefaultCitationTest extends TestUsingFile {
* @return an arbitrary citation.
*/
public static DefaultCitation create() {
- final DefaultCitation citation = new DefaultCitation();
- final DefaultInternationalString title = new
DefaultInternationalString();
+ final var citation = new DefaultCitation();
+ final var title = new DefaultInternationalString();
title.add(Locale.JAPANESE, "アンダーカレント");
title.add(Locale.ENGLISH, "Undercurrent");
citation.setTitle(title);
@@ -109,7 +109,7 @@ public final class DefaultCitationTest extends
TestUsingFile {
*/
@Test
public void testIdentifierMap() {
- final DefaultCitation citation = new DefaultCitation();
+ final var citation = new DefaultCitation();
final Collection<Identifier> identifiers = citation.getIdentifiers();
final IdentifierMap identifierMap = citation.getIdentifierMap();
assertTrue(identifiers.isEmpty(), "Expected an initially empty set of
identifiers.");
@@ -161,7 +161,8 @@ public final class DefaultCitationTest extends
TestUsingFile {
*/
public void testCopy() {
final DefaultCitation original = create();
- final DefaultCitation clone = (DefaultCitation) new
MetadataCopier(MetadataStandard.ISO_19115).copy(original);
+ final var clone = assertInstanceOf(DefaultCitation.class,
+ new MetadataCopier(MetadataStandard.ISO_19115).copy(original));
assertCopy(original, clone);
}
@@ -239,12 +240,12 @@ public final class DefaultCitationTest extends
TestUsingFile {
* @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.setDescription(new SimpleInternationalString("High delay, low
throughput, and low altitude service."));
rs.setFunction(OnLineFunction.OFFLINE_ACCESS);
- final DefaultContact contact = new DefaultContact(rs);
+ final var contact = new DefaultContact(rs);
contact.setContactInstructions(new SimpleInternationalString("Send
carrier pigeon."));
contact.getIdentifierMap().putSpecialized(IdentifierSpace.ID,
"ip-protocol");
final DefaultCitation c = new DefaultCitation("Fight against poverty");
@@ -299,7 +300,7 @@ public final class DefaultCitationTest extends
TestUsingFile {
* @param c the citation.
*/
public static void verifyUnmarshalledCitation(final Citation c) {
- assertTitleEquals("title", "Fight against poverty", c);
+ assertTitleEquals("Fight against poverty", c, "citation");
final CitationDate date = getSingleton(c.getDates());
assertEquals(date.getDate(), TestUtilities.date("2015-10-17
00:00:00"));
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/identification/DefaultDataIdentificationTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/identification/DefaultDataIdentificationTest.java
index 62c25c2784..84b4b3800f 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/identification/DefaultDataIdentificationTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/identification/DefaultDataIdentificationTest.java
@@ -170,7 +170,8 @@ public final class DefaultDataIdentificationTest extends
TestCase {
final DefaultDataIdentification info = create();
final Map<String,Object> map = info.asMap();
assertEquals("Global 5.0 x 2.5 degree model data",
map.get("abstract").toString());
- assertTitleEquals("title", "Sea Surface Temperature Analysis Model",
(Citation) map.get("citation"));
+ assertTitleEquals("Sea Surface Temperature Analysis Model",
+ assertInstanceOf(Citation.class, map.get("citation")),
"citation");
assertEquals(Set.of(SpatialRepresentationType.GRID),
map.get("spatialRepresentationType"));
final Locale[] locales = {Locale.US, Locale.FRENCH};
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java
index 7c09159352..072bd2e931 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java
@@ -19,7 +19,6 @@ package org.apache.sis.metadata.iso.identification;
import java.util.Set;
import java.io.InputStream;
import jakarta.xml.bind.JAXBException;
-import org.opengis.util.NameFactory;
import org.opengis.parameter.ParameterDescriptor;
import org.opengis.metadata.citation.Citation;
import org.apache.sis.metadata.iso.citation.DefaultCitation;
@@ -74,10 +73,10 @@ public final class DefaultServiceIdentificationTest extends
TestUsingFile {
* Creates the service identification to use for testing purpose.
*/
private static DefaultServiceIdentification create() {
- final NameFactory factory = DefaultNameFactory.provider();
- final DefaultCoupledResource resource =
DefaultCoupledResourceTest.create(factory);
+ final var factory = DefaultNameFactory.provider();
+ final var resource = DefaultCoupledResourceTest.create(factory);
resource.setResourceReferences(Set.of(new DefaultCitation("WMS
specification")));
- final DefaultServiceIdentification id = new
DefaultServiceIdentification(
+ final var id = new DefaultServiceIdentification(
factory.createGenericName(null, "Web Map Server"), //
serviceType
NilReason.MISSING.createNilObject(Citation.class), //
citation
"A dummy service for testing purpose."); //
abstract
@@ -126,7 +125,7 @@ public final class DefaultServiceIdentificationTest extends
TestUsingFile {
final ServiceIdentification id =
unmarshalFile(ServiceIdentification.class, openTestFile(Format.XML2016));
verify(id);
final CoupledResource resource =
getSingleton(id.getCoupledResources());
- assertTitleEquals("resourceReference", "WMS specification",
getSingleton(resource.getResourceReferences()));
+ assertTitleEquals("WMS specification",
getSingleton(resource.getResourceReferences()), "resourceReference");
}
/**
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/NilReasonMarshallingTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/NilReasonMarshallingTest.java
index f5924ae951..d7d37cddfc 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/NilReasonMarshallingTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/NilReasonMarshallingTest.java
@@ -59,12 +59,11 @@ public final class NilReasonMarshallingTest extends
TestCase {
"</cit:CI_Citation>";
final Citation citation = unmarshal(Citation.class, expected);
- assertTitleEquals("citation", "A title", citation);
+ assertTitleEquals("A title", citation, "citation");
final Series series = citation.getSeries();
- assertInstanceOf(NilObject.class, series, "Should have instantiated a
proxy.");
-
- final NilReason reason = ((NilObject) series).getNilReason();
+ final NilObject nil = assertInstanceOf(NilObject.class, series,
"Should have instantiated a proxy.");
+ final NilReason reason = nil.getNilReason();
assertSame(NilReason.MISSING, reason, "nilReason");
assertNull(reason.getOtherExplanation(), "NilReason.explanation");
assertNull(reason.getURI(), "NilReason.URI");
@@ -129,7 +128,7 @@ public final class NilReasonMarshallingTest extends
TestCase {
"</cit:CI_Citation>";
final Citation citation = unmarshal(Citation.class, expected);
- assertTitleEquals("citation", "A title", citation);
+ assertTitleEquals("A title", citation, "citation");
final Series series = citation.getSeries();
assertInstanceOf(NilObject.class, series, "Should have instantiated a
proxy.");
@@ -164,7 +163,7 @@ public final class NilReasonMarshallingTest extends
TestCase {
"</cit:CI_Citation>";
final Citation citation = unmarshal(Citation.class, expected);
- assertTitleEquals("citation", "A title", citation);
+ assertTitleEquals("A title", citation, "citation");
final Series series = citation.getSeries();
assertInstanceOf(NilObject.class, series, "Should have instantiated a
proxy.");
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/UUIDMarshallingTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/UUIDMarshallingTest.java
index 351150d82d..8c33818288 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/UUIDMarshallingTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/UUIDMarshallingTest.java
@@ -125,8 +125,8 @@ public final class UUIDMarshallingTest extends TestCase {
*/
@Test
public void testIdentification() throws JAXBException {
- final Citation citation = (Citation) XML.unmarshal(IDENTIFIED_XML);
- assertTitleEquals("Citation", "My data", citation);
+ final var citation = assertInstanceOf(Citation.class,
XML.unmarshal(IDENTIFIED_XML));
+ assertTitleEquals("My data", citation, "citation");
/*
* Programmatic verification of the Series properties,
* which is the main object of interest in this test.
@@ -176,8 +176,8 @@ public final class UUIDMarshallingTest extends TestCase {
*/
@Test
public void testReference() throws JAXBException {
- final Citation citation = (Citation)
XML.unmarshal(REFERENCED_XML_WITH_BODY);
- assertTitleEquals("Citation.title", "My data", citation);
+ final var citation = assertInstanceOf(Citation.class,
XML.unmarshal(REFERENCED_XML_WITH_BODY));
+ assertTitleEquals("My data", citation, "citation");
/*
* Programmatic verification of the Series properties,
* which is the main object of interest in this test.
@@ -209,8 +209,8 @@ public final class UUIDMarshallingTest extends TestCase {
@Test
@DependsOnMethod("testReference")
public void testReferenceInEmptyObject() throws JAXBException {
- final Citation citation = (Citation) XML.unmarshal(REFERENCED_XML);
- assertTitleEquals("Citation.title", "My data", citation);
+ final var citation = assertInstanceOf(Citation.class,
XML.unmarshal(REFERENCED_XML));
+ assertTitleEquals("My data", citation, "citation");
/*
* Programmatic verification of the Series properties,
* which is the main object of interest in this test.
diff --git
a/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/xml/bind/fra/DataIdentificationTest.java
b/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/xml/bind/fra/DataIdentificationTest.java
index bdb9f4b2f2..08f9c6a1a3 100644
---
a/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/xml/bind/fra/DataIdentificationTest.java
+++
b/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/xml/bind/fra/DataIdentificationTest.java
@@ -68,8 +68,8 @@ public final class DataIdentificationTest extends TestCase {
"</fra:FRA_DataIdentification>";
final DataIdentification id = unmarshal(DataIdentification.class, xml);
- assertTitleEquals("citation", "Main documentation.", id.getCitation());
- assertTitleEquals("relatedCitations", "Related documentation.",
getSingleton(id.getRelatedCitations()));
+ assertTitleEquals("Main documentation.", id.getCitation(), "citation");
+ assertTitleEquals("Related documentation.",
getSingleton(id.getRelatedCitations()), "relatedCitations");
final String actual = marshal(id, VERSION_2007);
assertXmlEquals(xml, actual, "xmlns:*");
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/Assertions.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/Assertions.java
index c7d6dac82f..890733dae7 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/Assertions.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/Assertions.java
@@ -485,8 +485,8 @@ public final class Assertions extends Static {
WKT_FORMAT.setConvention(convention);
wkt = WKT_FORMAT.format(object);
}
- assertMultilinesEquals((object instanceof IdentifiedObject) ?
- ((IdentifiedObject) object).getName().getCode() :
object.getClass().getSimpleName(), expected, wkt);
+ assertMultilinesEquals(expected, wkt, (object instanceof
IdentifiedObject) ?
+ ((IdentifiedObject) object).getName().getCode() :
object.getClass().getSimpleName());
}
}
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/ImmutableIdentifierTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/ImmutableIdentifierTest.java
index e8ebd3ccd3..0b17abc012 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/ImmutableIdentifierTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/ImmutableIdentifierTest.java
@@ -77,12 +77,12 @@ public final class ImmutableIdentifierTest extends TestCase
{
@Test
public void testConstructorWithStringValues() {
final Map<String,Object> properties = properties();
- final ImmutableIdentifier identifier = new
ImmutableIdentifier(properties);
+ final var identifier = new ImmutableIdentifier(properties);
Validators.validate(identifier);
assertEquals ("This is a code", identifier.getCode());
assertNull ( identifier.getCodeSpace());
- assertTitleEquals(AUTHORITY_KEY, "This is an authority",
identifier.getAuthority());
+ assertTitleEquals("This is an authority", identifier.getAuthority(),
AUTHORITY_KEY);
assertEquals ("This is a version", identifier.getVersion());
assertEquals ("There is a description",
identifier.getDescription().toString(Locale.ENGLISH));
assertEquals ("Voici une description",
identifier.getDescription().toString(Locale.FRENCH));
@@ -99,12 +99,12 @@ public final class ImmutableIdentifierTest extends TestCase
{
public void testConstructorWithInternationalString() {
final Map<String,Object> properties = properties();
assertNotNull(properties.put("description", new
SimpleInternationalString("Overwritten description")));
- final ImmutableIdentifier identifier = new
ImmutableIdentifier(properties);
+ final var identifier = new ImmutableIdentifier(properties);
Validators.validate(identifier);
assertEquals ("This is a code", identifier.getCode());
assertNull (
identifier.getCodeSpace());
- assertTitleEquals(AUTHORITY_KEY, "This is an authority",
identifier.getAuthority());
+ assertTitleEquals("This is an authority",
identifier.getAuthority(), AUTHORITY_KEY);
assertEquals ("This is a version", identifier.getVersion());
assertEquals ("Overwritten description",
identifier.getDescription().toString(Locale.ENGLISH));
assertEquals ("Voici une description",
identifier.getDescription().toString(Locale.FRENCH));
@@ -119,12 +119,12 @@ public final class ImmutableIdentifierTest extends
TestCase {
public void testConstructorWithCitation() {
final Map<String,Object> properties = properties();
assertNotNull(properties.put(AUTHORITY_KEY, new
DefaultCitation("Another authority")));
- final ImmutableIdentifier identifier = new
ImmutableIdentifier(properties);
+ final var identifier = new ImmutableIdentifier(properties);
Validators.validate(identifier);
assertEquals ("This is a code", identifier.getCode());
assertNull ( identifier.getCodeSpace());
- assertTitleEquals(AUTHORITY_KEY, "Another authority",
identifier.getAuthority());
+ assertTitleEquals("Another authority", identifier.getAuthority(),
AUTHORITY_KEY);
assertEquals ("This is a version", identifier.getVersion());
assertEquals ("There is a description",
identifier.getDescription().toString(Locale.ENGLISH));
assertEquals ("Voici une description",
identifier.getDescription().toString(Locale.FRENCH));
@@ -141,7 +141,7 @@ public final class ImmutableIdentifierTest extends TestCase
{
public void testPredefinedCitation() {
final Map<String,Object> properties = properties();
assertNotNull(properties.put(AUTHORITY_KEY, Constants.EPSG));
- final ImmutableIdentifier identifier = new
ImmutableIdentifier(properties);
+ final var identifier = new ImmutableIdentifier(properties);
Validators.validate(identifier);
assertEquals("This is a code", identifier.getCode());
@@ -173,7 +173,7 @@ public final class ImmutableIdentifierTest extends TestCase
{
@Test
@Disabled("To be replaced by GML")
public void testMarshal() throws JAXBException {
- final ImmutableIdentifier identifier = new ImmutableIdentifier(new
DefaultCitation("EPSG"), null, "4326");
+ final var identifier = new ImmutableIdentifier(new
DefaultCitation("EPSG"), null, "4326");
assertXmlEquals(
"<gmd:RS_Identifier xmlns:gmd=\"" + LegacyNamespaces.GMD + "\"
" +
"xmlns:gco=\"" + LegacyNamespaces.GCO + "\">\n"
+
@@ -196,7 +196,7 @@ public final class ImmutableIdentifierTest extends TestCase
{
*/
@Test
public void testWKT() {
- ImmutableIdentifier id = new ImmutableIdentifier(Citations.EPSG,
"EPSG", "4326", "8.2", null);
+ var id = new ImmutableIdentifier(Citations.EPSG, "EPSG", "4326",
"8.2", null);
assertWktEquals(Convention.WKT2_SIMPLIFIED, "Id[“EPSG”, 4326, “8.2”]",
id);
assertWktEquals(Convention.WKT2, "ID[“EPSG”, 4326, “8.2”]", id);
assertWktEquals(Convention.WKT1, "AUTHORITY[“EPSG”, “4326”]", id);
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java
index 67a7aa0c46..543d7df816 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java
@@ -77,7 +77,7 @@ public final class DefaultOperationMethodTest extends
TestCase {
* The parameter group for a Mercator projection is actually not
empty, but it is not the purpose of
* this class to test DefaultParameterDescriptorGroup. So we use an
empty group of parameters here.
*/
- final ParameterDescriptorGroup pg = new
DefaultParameterDescriptorGroup(properties, 1, 1, parameters);
+ final var pg = new DefaultParameterDescriptorGroup(properties, 1, 1,
parameters);
/*
* NAME_KEY share the same Identifier instance for saving a little bit
of memory.
* Then define the other properties to be given to OperationMethod.
@@ -95,7 +95,7 @@ public final class DefaultOperationMethodTest extends
TestCase {
public void testConstruction() {
final OperationMethod method = create("Mercator (variant A)", "9804",
"EPSG guidance note #7-2");
assertEpsgNameAndIdentifierEqual("Mercator (variant A)", 9804, method);
- assertTitleEquals("formula", "EPSG guidance note #7-2",
method.getFormula().getCitation());
+ assertTitleEquals("EPSG guidance note #7-2",
method.getFormula().getCitation(), "formula");
}
/**
diff --git
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/base/MetadataBuilderTest.java
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/base/MetadataBuilderTest.java
index de07ee85ba..a3d8f44178 100644
---
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/base/MetadataBuilderTest.java
+++
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/base/MetadataBuilderTest.java
@@ -86,15 +86,15 @@ public final class MetadataBuilderTest extends TestCase {
* @param notice the copyright statement to parse.
*/
private static void verifyCopyrightParsing(final String notice) {
- final MetadataBuilder builder = new MetadataBuilder();
+ final var builder = new MetadataBuilder();
builder.parseLegalNotice(notice);
- final LegalConstraints constraints = (LegalConstraints)
getSingleton(getSingleton(
-
builder.build().getIdentificationInfo()).getResourceConstraints());
+ final var constraints = assertInstanceOf(LegalConstraints.class,
+
getSingleton(getSingleton(builder.build().getIdentificationInfo()).getResourceConstraints()));
assertEquals(Restriction.COPYRIGHT,
getSingleton(constraints.getUseConstraints()));
final Citation ref = getSingleton(constraints.getReferences());
- assertTitleEquals("reference.title", notice, ref);
- assertPartyNameEquals("reference.citedResponsibleParty", "John Smith",
ref);
+ assertTitleEquals(notice, ref, "reference.title");
+ assertPartyNameEquals("John Smith", ref,
"reference.citedResponsibleParty");
assertEquals(date("1992-01-01 00:00:00"),
getSingleton(ref.getDates()).getDate());
}
diff --git
a/endorsed/src/org.apache.sis.util/test/org/apache/sis/converter/ConverterRegistryTest.java
b/endorsed/src/org.apache.sis.util/test/org/apache/sis/converter/ConverterRegistryTest.java
index 5dd2c02234..6e7c20e08b 100644
---
a/endorsed/src/org.apache.sis.util/test/org/apache/sis/converter/ConverterRegistryTest.java
+++
b/endorsed/src/org.apache.sis.util/test/org/apache/sis/converter/ConverterRegistryTest.java
@@ -166,14 +166,14 @@ public final class ConverterRegistryTest extends TestCase
{
assertNoConverterForTarget (Cloneable .class);
assertIdentityForTarget (Comparable .class);
assertIdentityForTarget (Serializable.class);
- assertMultilinesEquals("After StringConverter.Short",
- "ConverterRegistry\n" +
- " ├─Short ← String\n" +
- " ├─Number ← String\n" + // Same instance
as above, applied to Number target.
- " │ └─Short ← String\n" +
- " ├─Object ← String\n" +
- " ├─Comparable ← String\n" +
- " └─Serializable ← String\n", registry.toString());
+ assertMultilinesEquals("ConverterRegistry\n"
+ + " ├─Short ← String\n"
+ + " ├─Number ← String\n" // Same
instance as above, applied to Number target.
+ + " │ └─Short ← String\n"
+ + " ├─Object ← String\n"
+ + " ├─Comparable ← String\n"
+ + " └─Serializable ← String\n",
+ registry.toString(), "After StringConverter.Short");
/*
* Adds String ← Long
* Expected side-effect: creation of FallbackConverter[String ← Number]
@@ -186,20 +186,20 @@ public final class ConverterRegistryTest extends TestCase
{
assertNoConverterForTarget (Cloneable .class);
assertIdentityForTarget (Comparable .class);
assertIdentityForTarget (Serializable.class);
- assertFallbackEquals (Number .class,
- "Number ← String\n" +
- " ├─Short ← String\n" +
- " └─Long ← String\n");
- assertMultilinesEquals("After StringConverter.Long",
- "ConverterRegistry\n" +
- " ├─Short ← String\n" +
- " ├─Object ← String\n" +
- " ├─Comparable ← String\n" +
- " ├─Serializable ← String\n" +
- " ├─Long ← String\n" +
- " └─Number ← String\n" + // The
FallbackConverter, which replaced the previous.
- " ├─Short ← String\n" +
- " └─Long ← String\n", registry.toString());
+ assertFallbackEquals(Number.class,
+ "Number ← String\n" +
+ " ├─Short ← String\n" +
+ " └─Long ← String\n");
+ assertMultilinesEquals("ConverterRegistry\n"
+ + " ├─Short ← String\n"
+ + " ├─Object ← String\n"
+ + " ├─Comparable ← String\n"
+ + " ├─Serializable ← String\n"
+ + " ├─Long ← String\n"
+ + " └─Number ← String\n" // The
FallbackConverter, which replaced the previous.
+ + " ├─Short ← String\n"
+ + " └─Long ← String\n",
+ registry.toString(), "After StringConverter.Long");
/*
* Adds String ← Boolean
* Expected side-effect: none since Boolean is not a Number
@@ -212,17 +212,17 @@ public final class ConverterRegistryTest extends TestCase
{
assertNoConverterForTarget (Cloneable .class);
assertIdentityForTarget (Comparable .class);
assertIdentityForTarget (Serializable.class);
- assertMultilinesEquals("After StringConverter.Boolean",
- "ConverterRegistry\n" +
- " ├─Short ← String\n" +
- " ├─Object ← String\n" +
- " ├─Comparable ← String\n" +
- " ├─Serializable ← String\n" +
- " ├─Long ← String\n" +
- " ├─Number ← String\n" +
- " │ ├─Short ← String\n" +
- " │ └─Long ← String\n" +
- " └─Boolean ← String\n", registry.toString());
+ assertMultilinesEquals("ConverterRegistry\n"
+ + " ├─Short ← String\n"
+ + " ├─Object ← String\n"
+ + " ├─Comparable ← String\n"
+ + " ├─Serializable ← String\n"
+ + " ├─Long ← String\n"
+ + " ├─Number ← String\n"
+ + " │ ├─Short ← String\n"
+ + " │ └─Long ← String\n"
+ + " └─Boolean ← String\n",
+ registry.toString(), "After StringConverter.Boolean");
/*
* Adds String ← Number
* Expected side-effect: replacement of the FallbackConverter
@@ -234,15 +234,15 @@ public final class ConverterRegistryTest extends TestCase
{
assertNoConverterForTarget (Cloneable .class);
assertIdentityForTarget (Comparable .class);
assertIdentityForTarget (Serializable.class);
- assertMultilinesEquals("After StringConverter.Number",
- "ConverterRegistry\n" +
- " ├─Short ← String\n" +
- " ├─Object ← String\n" +
- " ├─Comparable ← String\n" +
- " ├─Serializable ← String\n" +
- " ├─Long ← String\n" +
- " ├─Boolean ← String\n" +
- " └─Number ← String\n", registry.toString()); //
Replaced the FallbackConverter.
+ assertMultilinesEquals("ConverterRegistry\n"
+ + " ├─Short ← String\n"
+ + " ├─Object ← String\n"
+ + " ├─Comparable ← String\n"
+ + " ├─Serializable ← String\n"
+ + " ├─Long ← String\n"
+ + " ├─Boolean ← String\n"
+ + " └─Number ← String\n", // Replaced
the FallbackConverter.
+ registry.toString(), "After StringConverter.Number");
/*
* Adds String ← Float
* Expected side-effect: none
@@ -255,16 +255,16 @@ public final class ConverterRegistryTest extends TestCase
{
assertNoConverterForTarget (Cloneable .class);
assertIdentityForTarget (Comparable .class);
assertIdentityForTarget (Serializable.class);
- assertMultilinesEquals("After StringConverter.Float",
- "ConverterRegistry\n" +
- " ├─Short ← String\n" +
- " ├─Object ← String\n" +
- " ├─Comparable ← String\n" +
- " ├─Serializable ← String\n" +
- " ├─Long ← String\n" +
- " ├─Boolean ← String\n" +
- " ├─Number ← String\n" +
- " └─Float ← String\n", registry.toString());
+ assertMultilinesEquals("ConverterRegistry\n"
+ + " ├─Short ← String\n"
+ + " ├─Object ← String\n"
+ + " ├─Comparable ← String\n"
+ + " ├─Serializable ← String\n"
+ + " ├─Long ← String\n"
+ + " ├─Boolean ← String\n"
+ + " ├─Number ← String\n"
+ + " └─Float ← String\n",
+ registry.toString(), "After StringConverter.Float");
/*
* Final check.
*/
@@ -291,13 +291,13 @@ public final class ConverterRegistryTest extends TestCase
{
assertNoConverterForTarget (Comparable .class);
assertIdentityForTarget (Serializable.class);
assertSameConverterForTarget(CharSequence.class);
- assertMultilinesEquals("After ObjectToString.Number",
- "ConverterRegistry\n" +
- " ├─String ← Number\n" +
- " ├─CharSequence ← Number\n" +
- " │ └─String ← Number\n" +
- " ├─Object ← Number\n" +
- " └─Serializable ← Number\n", registry.toString());
+ assertMultilinesEquals("ConverterRegistry\n"
+ + " ├─String ← Number\n"
+ + " ├─CharSequence ← Number\n"
+ + " │ └─String ← Number\n"
+ + " ├─Object ← Number\n"
+ + " └─Serializable ← Number\n",
+ registry.toString(), "After ObjectToString.Number");
/*
* Adds String ← Number
* Expected side-effect: none
@@ -305,14 +305,14 @@ public final class ConverterRegistryTest extends TestCase
{
assertAllConvertersAreRegistered();
register(new StringConverter.Number());
assertSameConverterForTarget(Number.class);
- assertMultilinesEquals("After StringConverter.Number",
- "ConverterRegistry\n" +
- " ├─String ← Number\n" +
- " ├─CharSequence ← Number\n" +
- " │ └─String ← Number\n" +
- " ├─Object ← Number\n" +
- " ├─Serializable ← Number\n" +
- " └─Number ← String\n", registry.toString());
+ assertMultilinesEquals("ConverterRegistry\n"
+ + " ├─String ← Number\n"
+ + " ├─CharSequence ← Number\n"
+ + " │ └─String ← Number\n"
+ + " ├─Object ← Number\n"
+ + " ├─Serializable ← Number\n"
+ + " └─Number ← String\n",
+ registry.toString(), "After StringConverter.Number");
/*
* Adds Number ← Float
* Expected side-effect: none
@@ -320,15 +320,15 @@ public final class ConverterRegistryTest extends TestCase
{
assertAllConvertersAreRegistered();
register(new NumberConverter<>(Number.class, Float.class));
assertSameConverterForTarget(Float.class);
- assertMultilinesEquals("After NumberConverter.Float",
- "ConverterRegistry\n" +
- " ├─String ← Number\n" +
- " ├─CharSequence ← Number\n" +
- " │ └─String ← Number\n" +
- " ├─Object ← Number\n" +
- " ├─Serializable ← Number\n" +
- " ├─Number ← String\n" +
- " └─Float ← Number\n", registry.toString());
+ assertMultilinesEquals("ConverterRegistry\n"
+ + " ├─String ← Number\n"
+ + " ├─CharSequence ← Number\n"
+ + " │ └─String ← Number\n"
+ + " ├─Object ← Number\n"
+ + " ├─Serializable ← Number\n"
+ + " ├─Number ← String\n"
+ + " └─Float ← Number\n",
+ registry.toString(), "After NumberConverter.Float");
/*
* Final check.
*/
diff --git
a/endorsed/src/org.apache.sis.util/test/org/apache/sis/io/AppenderTestCase.java
b/endorsed/src/org.apache.sis.util/test/org/apache/sis/io/AppenderTestCase.java
index 765a50aa31..e91a95209e 100644
---
a/endorsed/src/org.apache.sis.util/test/org/apache/sis/io/AppenderTestCase.java
+++
b/endorsed/src/org.apache.sis.util/test/org/apache/sis/io/AppenderTestCase.java
@@ -74,7 +74,7 @@ public abstract class AppenderTestCase extends TestCase {
final void assertOutputEquals(final String expected) throws IOException {
IO.flush(appender);
final String actual = buffer.toString();
- assertMultilinesEquals("Ignoring line separators.", expected, actual);
+ assertMultilinesEquals(expected, actual, "Ignoring line separators.");
assertEquals(expected, actual, "Checking line separators.");
}
diff --git
a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/Assertions.java
b/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/Assertions.java
index 7eec830f43..aeeec8c5ff 100644
--- a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/Assertions.java
+++ b/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/Assertions.java
@@ -136,7 +136,7 @@ public final class Assertions extends Static {
* @param actual the actual string.
*/
public static void assertMultilinesEquals(final CharSequence expected,
final CharSequence actual) {
- assertMultilinesEquals(null, expected, actual);
+ assertMultilinesEquals(expected, actual, null);
}
/**
@@ -144,11 +144,11 @@ public final class Assertions extends Static {
* The comparisons is performed one a line-by-line basis. For each line,
trailing
* spaces (but not leading spaces) are ignored.
*
- * @param message the message to print in case of failure, or {@code
null} if none.
* @param expected the expected string.
* @param actual the actual string.
+ * @param message the message to print in case of failure, or {@code
null} if none.
*/
- public static void assertMultilinesEquals(final String message, final
CharSequence expected, final CharSequence actual) {
+ public static void assertMultilinesEquals(final CharSequence expected,
final CharSequence actual, final String message) {
final CharSequence[] expectedLines =
CharSequences.splitOnEOL(expected);
final CharSequence[] actualLines = CharSequences.splitOnEOL(actual);
final int length = StrictMath.min(expectedLines.length,
actualLines.length);
