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
commit a2cb3742f8f44c97d764ab6ed85487bfa90da410
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Mon Jan 22 13:04:48 2024 +0100
Migrate tests of `org.apache.sis.portrayal` to JUnit 5.
---
.../apache/sis/map/coverage/MultiResolutionCoverageLoaderTest.java | 2 +-
.../test/org/apache/sis/style/se1/ChannelSelectionTest.java | 2 +-
.../test/org/apache/sis/style/se1/ContrastEnhancementTest.java | 2 +-
.../test/org/apache/sis/style/se1/ExternalGraphicTest.java | 2 +-
.../test/org/apache/sis/style/se1/FeatureTypeStyleTest.java | 2 +-
.../test/org/apache/sis/style/se1/FontTest.java | 2 +-
.../test/org/apache/sis/style/se1/GraphicTest.java | 2 +-
.../test/org/apache/sis/style/se1/HaloTest.java | 2 +-
.../test/org/apache/sis/style/se1/LineSymbolizerTest.java | 2 +-
.../test/org/apache/sis/style/se1/MarkTest.java | 2 +-
.../test/org/apache/sis/style/se1/PointPlacementTest.java | 2 +-
.../test/org/apache/sis/style/se1/PointSymbolizerTest.java | 2 +-
.../test/org/apache/sis/style/se1/PolygonSymbolizerTest.java | 2 +-
.../test/org/apache/sis/style/se1/RasterSymbolizerTest.java | 2 +-
.../test/org/apache/sis/style/se1/RuleTest.java | 2 +-
.../test/org/apache/sis/style/se1/SelectedChannelTest.java | 2 +-
.../test/org/apache/sis/style/se1/ShadedReliefTest.java | 2 +-
.../test/org/apache/sis/style/se1/StrokeTest.java | 2 +-
.../test/org/apache/sis/style/se1/StyleTestCase.java | 5 ++---
.../test/org/apache/sis/style/se1/SymbolizerTest.java | 5 ++---
.../test/org/apache/sis/style/se1/SymbologyTest.java | 2 +-
.../test/org/apache/sis/style/se1/TextSymbolizerTest.java | 2 +-
.../test/org/apache/sis/map/MapLayersTest.java | 2 +-
.../test/org/apache/sis/map/SEPortrayerTest.java | 2 +-
24 files changed, 26 insertions(+), 28 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/map/coverage/MultiResolutionCoverageLoaderTest.java
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/map/coverage/MultiResolutionCoverageLoaderTest.java
index 54d8808137..adc3766173 100644
---
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/map/coverage/MultiResolutionCoverageLoaderTest.java
+++
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/map/coverage/MultiResolutionCoverageLoaderTest.java
@@ -34,7 +34,7 @@ import org.apache.sis.util.iso.Names;
// Test dependencies
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.test.TestCase;
diff --git
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/ChannelSelectionTest.java
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/ChannelSelectionTest.java
index 19a053c1ff..e56bacdffc 100644
---
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/ChannelSelectionTest.java
+++
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/ChannelSelectionTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.style.se1;
// Test dependencies
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
/**
diff --git
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/ContrastEnhancementTest.java
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/ContrastEnhancementTest.java
index ecbbd0fbbc..6128243532 100644
---
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/ContrastEnhancementTest.java
+++
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/ContrastEnhancementTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.style.se1;
// Test dependencies
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
/**
diff --git
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/ExternalGraphicTest.java
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/ExternalGraphicTest.java
index 37e56d5be2..4b76544b51 100644
---
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/ExternalGraphicTest.java
+++
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/ExternalGraphicTest.java
@@ -22,7 +22,7 @@ import
org.apache.sis.metadata.iso.citation.DefaultOnlineResource;
// Test dependencies
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
/**
diff --git
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/FeatureTypeStyleTest.java
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/FeatureTypeStyleTest.java
index a60e0c4d9f..0dd712dc53 100644
---
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/FeatureTypeStyleTest.java
+++
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/FeatureTypeStyleTest.java
@@ -22,7 +22,7 @@ import org.apache.sis.util.iso.Names;
// Test dependencies
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
/**
diff --git
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/FontTest.java
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/FontTest.java
index a482828b48..cc79816073 100644
---
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/FontTest.java
+++
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/FontTest.java
@@ -20,7 +20,7 @@ import java.util.List;
// Test dependencies
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
/**
diff --git
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/GraphicTest.java
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/GraphicTest.java
index e509a6bdec..6805738a8e 100644
---
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/GraphicTest.java
+++
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/GraphicTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.style.se1;
// Test dependencies
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
/**
diff --git
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/HaloTest.java
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/HaloTest.java
index 2d22ec8643..a50299e4dd 100644
---
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/HaloTest.java
+++
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/HaloTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.style.se1;
// Test dependencies
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.feature.Feature;
diff --git
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/LineSymbolizerTest.java
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/LineSymbolizerTest.java
index 0cff31759f..caef95db04 100644
---
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/LineSymbolizerTest.java
+++
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/LineSymbolizerTest.java
@@ -20,7 +20,7 @@ import java.awt.Color;
// Test dependencies
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.feature.Feature;
diff --git
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/MarkTest.java
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/MarkTest.java
index 5671037eb6..301092edc3 100644
---
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/MarkTest.java
+++
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/MarkTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.style.se1;
// Test dependencies
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
/**
diff --git
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/PointPlacementTest.java
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/PointPlacementTest.java
index 289b530920..28ac5ad385 100644
---
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/PointPlacementTest.java
+++
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/PointPlacementTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.style.se1;
// Test dependencies
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.feature.Feature;
diff --git
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/PointSymbolizerTest.java
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/PointSymbolizerTest.java
index 3f82ad86b9..c12273c2cf 100644
---
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/PointSymbolizerTest.java
+++
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/PointSymbolizerTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.style.se1;
// Test dependencies
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.feature.Feature;
diff --git
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/PolygonSymbolizerTest.java
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/PolygonSymbolizerTest.java
index 37ef635a10..859b40d59e 100644
---
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/PolygonSymbolizerTest.java
+++
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/PolygonSymbolizerTest.java
@@ -20,7 +20,7 @@ import java.awt.Color;
// Test dependencies
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.feature.Feature;
diff --git
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/RasterSymbolizerTest.java
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/RasterSymbolizerTest.java
index d0d5f24e68..092efb0391 100644
---
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/RasterSymbolizerTest.java
+++
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/RasterSymbolizerTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.style.se1;
// Test dependencies
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
/**
diff --git
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/RuleTest.java
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/RuleTest.java
index a0ab5cd8e1..bbb17c62ba 100644
---
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/RuleTest.java
+++
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/RuleTest.java
@@ -21,7 +21,7 @@ import
org.apache.sis.metadata.iso.citation.DefaultOnlineResource;
// Test dependencies
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.filter.Filter;
diff --git
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/SelectedChannelTest.java
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/SelectedChannelTest.java
index a8f94bd1ba..7ee09ee55e 100644
---
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/SelectedChannelTest.java
+++
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/SelectedChannelTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.style.se1;
// Test dependencies
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
/**
diff --git
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/ShadedReliefTest.java
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/ShadedReliefTest.java
index 415a390bca..d710b87400 100644
---
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/ShadedReliefTest.java
+++
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/ShadedReliefTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.style.se1;
// Test dependencies
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
/**
diff --git
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/StrokeTest.java
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/StrokeTest.java
index 2acc67f213..f4a86cbefd 100644
---
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/StrokeTest.java
+++
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/StrokeTest.java
@@ -20,7 +20,7 @@ import java.awt.Color;
// Test dependencies
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
/**
diff --git
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/StyleTestCase.java
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/StyleTestCase.java
index 00b6a28ed4..26542908ca 100644
---
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/StyleTestCase.java
+++
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/StyleTestCase.java
@@ -21,8 +21,7 @@ import java.util.Optional;
import org.apache.sis.util.SimpleInternationalString;
// Test dependencies
-import static org.junit.Assert.*;
-import static org.opengis.test.Assert.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.test.TestCase;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
@@ -113,7 +112,7 @@ abstract class StyleTestCase extends TestCase {
* @param actual the expression from which to test the value.
*/
static <E> void assertLiteralEquals(final E expected, final Expression<?,
? extends E> actual) {
- assertInstanceOf("expression", Literal.class, actual);
+ assertInstanceOf(Literal.class, actual);
assertEquals(expected, actual.apply(null));
}
}
diff --git
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/SymbolizerTest.java
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/SymbolizerTest.java
index 21771943cc..c2ea08ea03 100644
---
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/SymbolizerTest.java
+++
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/SymbolizerTest.java
@@ -20,8 +20,7 @@ import org.apache.sis.measure.Units;
// Test dependencies
import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.opengis.test.Assert.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.*;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.filter.ValueReference;
@@ -62,7 +61,7 @@ public final class SymbolizerTest extends StyleTestCase {
final var cdt = factory.createLineSymbolizer();
// Check default
- assertInstanceOf("geometry", ValueReference.class, cdt.getGeometry());
+ assertInstanceOf(ValueReference.class, cdt.getGeometry());
// Check get/set
cdt.setGeometry(literal(8));
diff --git
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/SymbologyTest.java
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/SymbologyTest.java
index 3c46703128..ee3f7acbe9 100644
---
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/SymbologyTest.java
+++
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/SymbologyTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.style.se1;
// Test dependencies
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
/**
diff --git
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/TextSymbolizerTest.java
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/TextSymbolizerTest.java
index a5c78ccaf6..67341bed3b 100644
---
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/TextSymbolizerTest.java
+++
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/TextSymbolizerTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.style.se1;
// Test dependencies
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.feature.Feature;
diff --git
a/incubator/src/org.apache.sis.portrayal.map/test/org/apache/sis/map/MapLayersTest.java
b/incubator/src/org.apache.sis.portrayal.map/test/org/apache/sis/map/MapLayersTest.java
index 6b3cc32db9..15248843f6 100644
---
a/incubator/src/org.apache.sis.portrayal.map/test/org/apache/sis/map/MapLayersTest.java
+++
b/incubator/src/org.apache.sis.portrayal.map/test/org/apache/sis/map/MapLayersTest.java
@@ -21,7 +21,7 @@ import java.beans.PropertyChangeListener;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.sis.measure.NumberRange;
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
/**
diff --git
a/incubator/src/org.apache.sis.portrayal.map/test/org/apache/sis/map/SEPortrayerTest.java
b/incubator/src/org.apache.sis.portrayal.map/test/org/apache/sis/map/SEPortrayerTest.java
index e6c4162d3d..af0e38aa90 100644
---
a/incubator/src/org.apache.sis.portrayal.map/test/org/apache/sis/map/SEPortrayerTest.java
+++
b/incubator/src/org.apache.sis.portrayal.map/test/org/apache/sis/map/SEPortrayerTest.java
@@ -64,7 +64,7 @@ import org.apache.sis.storage.event.StoreEvent;
import org.apache.sis.storage.event.StoreListener;
import org.apache.sis.util.iso.Names;
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
/**
