This is an automated email from the ASF dual-hosted git repository.
jsorel pushed a commit to branch feat/coveragejson
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/feat/coveragejson by this push:
new 26f3416a32 feat(CoverageJSON): replace junit 4 Assert by Junit 5
Assertions
26f3416a32 is described below
commit 26f3416a327db7fef28cd88f18641dc9eeb20e95
Author: jsorel <[email protected]>
AuthorDate: Wed Oct 25 17:07:40 2023 +0200
feat(CoverageJSON): replace junit 4 Assert by Junit 5 Assertions
---
.../coveragejson/CoverageJsonStoreTest.java | 30 +++++++++++-----------
.../storage/coveragejson/binding/BindingTest.java | 2 +-
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git
a/incubator/src/org.apache.sis.storage.coveragejson/test/org/apache/sis/storage/coveragejson/CoverageJsonStoreTest.java
b/incubator/src/org.apache.sis.storage.coveragejson/test/org/apache/sis/storage/coveragejson/CoverageJsonStoreTest.java
index d8a3e176bc..22a37f2155 100644
---
a/incubator/src/org.apache.sis.storage.coveragejson/test/org/apache/sis/storage/coveragejson/CoverageJsonStoreTest.java
+++
b/incubator/src/org.apache.sis.storage.coveragejson/test/org/apache/sis/storage/coveragejson/CoverageJsonStoreTest.java
@@ -39,7 +39,7 @@ import org.apache.sis.storage.GridCoverageResource;
import org.apache.sis.storage.Resource;
import org.apache.sis.storage.StorageConnector;
import org.apache.sis.storage.WritableAggregate;
-import org.junit.Assert;
+import static org.junit.jupiter.api.Assertions.*;
import org.junit.Test;
import org.opengis.metadata.spatial.DimensionNameType;
@@ -58,17 +58,17 @@ public class CoverageJsonStoreTest {
try (final DataStore store = new CoverageJsonStoreProvider().open(new
StorageConnector(CoverageJsonStoreTest.class.getResource("coverage_xyzt.json"))))
{
//test grid coverage resource exist
- Assert.assertTrue(store instanceof Aggregate);
+ assertTrue(store instanceof Aggregate);
final Aggregate aggregate = (Aggregate) store;
- Assert.assertEquals(1, aggregate.components().size());
+ assertEquals(1, aggregate.components().size());
final Resource candidate =
aggregate.components().iterator().next();
- Assert.assertTrue(candidate instanceof GridCoverageResource);
+ assertTrue(candidate instanceof GridCoverageResource);
final GridCoverageResource gcr = (GridCoverageResource) candidate;
{ //test grid geometry
final GridGeometry result = gcr.getGridGeometry();
- Assert.assertEquals(4, result.getDimension());
+ assertEquals(4, result.getDimension());
final GridExtent expectedExtent = new GridExtent(new
DimensionNameType[]{
DimensionNameType.valueOf("x"),
@@ -76,8 +76,8 @@ public class CoverageJsonStoreTest {
DimensionNameType.valueOf("z"),
DimensionNameType.valueOf("t")},
new long[]{0,0,0,0}, new long[]{2,1,0,0}, true);
- Assert.assertEquals(expectedExtent, result.getExtent());
-
Assert.assertEquals(CRS.compound(CommonCRS.WGS84.geographic3D(),
CommonCRS.Temporal.JAVA.crs()), result.getCoordinateReferenceSystem());
+ assertEquals(expectedExtent, result.getExtent());
+ assertEquals(CRS.compound(CommonCRS.WGS84.geographic3D(),
CommonCRS.Temporal.JAVA.crs()), result.getCoordinateReferenceSystem());
//TODO test transform
}
@@ -85,12 +85,12 @@ public class CoverageJsonStoreTest {
{ //test data
GridCoverage coverage = gcr.read(null);
Raster data = coverage.render(null).getData();
- Assert.assertEquals(0.5, data.getSampleDouble(0, 0, 0), 0.0);
- Assert.assertEquals(0.6, data.getSampleDouble(1, 0, 0), 0.0);
- Assert.assertEquals(0.4, data.getSampleDouble(2, 0, 0), 0.0);
- Assert.assertEquals(0.6, data.getSampleDouble(0, 1, 0), 0.0);
- Assert.assertEquals(0.2, data.getSampleDouble(1, 1, 0), 0.0);
- Assert.assertEquals(Double.NaN, data.getSampleDouble(2, 1, 0),
0.0);
+ assertEquals(0.5, data.getSampleDouble(0, 0, 0), 0.0);
+ assertEquals(0.6, data.getSampleDouble(1, 0, 0), 0.0);
+ assertEquals(0.4, data.getSampleDouble(2, 0, 0), 0.0);
+ assertEquals(0.6, data.getSampleDouble(0, 1, 0), 0.0);
+ assertEquals(0.2, data.getSampleDouble(1, 1, 0), 0.0);
+ assertEquals(Double.NaN, data.getSampleDouble(2, 1, 0), 0.0);
}
}
@@ -108,9 +108,9 @@ public class CoverageJsonStoreTest {
try (final DataStore store = new CoverageJsonStoreProvider().open(new
StorageConnector(tempPath))) {
//test grid coverage resource exist
- Assert.assertTrue(store instanceof WritableAggregate);
+ assertTrue(store instanceof WritableAggregate);
final WritableAggregate aggregate = (WritableAggregate) store;
- Assert.assertEquals(0, aggregate.components().size());
+ assertEquals(0, aggregate.components().size());
//write a grid coverage
final GridGeometry grid = new GridGeometry(new GridExtent(4,2),
CRS.getDomainOfValidity(CommonCRS.WGS84.normalizedGeographic()),
GridOrientation.REFLECTION_Y);
diff --git
a/incubator/src/org.apache.sis.storage.coveragejson/test/org/apache/sis/storage/coveragejson/binding/BindingTest.java
b/incubator/src/org.apache.sis.storage.coveragejson/test/org/apache/sis/storage/coveragejson/binding/BindingTest.java
index b81e33ad18..ebfa29f159 100644
---
a/incubator/src/org.apache.sis.storage.coveragejson/test/org/apache/sis/storage/coveragejson/binding/BindingTest.java
+++
b/incubator/src/org.apache.sis.storage.coveragejson/test/org/apache/sis/storage/coveragejson/binding/BindingTest.java
@@ -33,7 +33,7 @@ import java.util.List;
import java.util.Map;
import org.eclipse.yasson.YassonConfig;
import org.junit.AfterClass;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
import org.junit.BeforeClass;
import org.junit.Test;
