From e04c2ca59f1aa11f6a1422c351891538f35646c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Dr=C4=83ghici?= Date: Wed, 26 Mar 2025 12:51:21 +0200 Subject: [PATCH 1/3] [NO-JIRA](opttbx-rapideye-reader): Fix the issue with parsing the date and time strings when the locale on the operating system is another than EN-us. --- .../eu/esa/opt/dataio/rapideye/nitf/GDALNITFMetadataTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/opttbx-rapideye-reader/src/test/java/eu/esa/opt/dataio/rapideye/nitf/GDALNITFMetadataTest.java b/opttbx-rapideye-reader/src/test/java/eu/esa/opt/dataio/rapideye/nitf/GDALNITFMetadataTest.java index f18872d402..613a161dd9 100644 --- a/opttbx-rapideye-reader/src/test/java/eu/esa/opt/dataio/rapideye/nitf/GDALNITFMetadataTest.java +++ b/opttbx-rapideye-reader/src/test/java/eu/esa/opt/dataio/rapideye/nitf/GDALNITFMetadataTest.java @@ -27,6 +27,7 @@ import java.io.File; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.Locale; import java.util.TimeZone; import static org.junit.Assert.assertEquals; @@ -44,6 +45,7 @@ public class GDALNITFMetadataTest { public void setUp() throws Exception { assumeTrue(TestUtil.testdataAvailable()); + Locale.setDefault(Locale.US); GDALNITFReaderWrapper reader = new GDALNITFReaderWrapper(TestUtil.getTestFile(productsFolder + "2009-04-16T104920_RE4_1B-NAC_3436599_84303_band2.ntf")); metadata = reader.getMetadata(); } From 4e438d2d14ce5e9fbe16c02648a172c17620dac9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Dr=C4=83ghici?= Date: Wed, 26 Mar 2025 12:52:07 +0200 Subject: [PATCH 2/3] [NO-JIRA](opttbx-rapideye-reader): Update the outdated expected for the long junit tests with data for RapidEye reader. --- .../dataio/rapideye/RapidEyeL1ReaderTest.java | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/opttbx-rapideye-reader/src/test/java/eu/esa/opt/dataio/rapideye/RapidEyeL1ReaderTest.java b/opttbx-rapideye-reader/src/test/java/eu/esa/opt/dataio/rapideye/RapidEyeL1ReaderTest.java index 4849113439..6aa8336fbd 100644 --- a/opttbx-rapideye-reader/src/test/java/eu/esa/opt/dataio/rapideye/RapidEyeL1ReaderTest.java +++ b/opttbx-rapideye-reader/src/test/java/eu/esa/opt/dataio/rapideye/RapidEyeL1ReaderTest.java @@ -156,23 +156,23 @@ public void testReadProductPixelSubset() throws IOException { assertEquals(3000, band.getRasterWidth()); assertEquals(4000, band.getRasterHeight()); - assertEquals(28.25f, band.getSampleFloat(0, 0), 0.0f); - assertEquals(22.64f, band.getSampleFloat(22, 20), 0.0f); - assertEquals(40.01f, band.getSampleFloat(123, 3221), 0.0f); - assertEquals(39.399998f, band.getSampleFloat(246, 134), 0.0f); - assertEquals(31.38f, band.getSampleFloat(435, 3543), 0.0f); - assertEquals(17.96f, band.getSampleFloat(1000, 3245), 0.0f); - assertEquals(30.81f, band.getSampleFloat(2214, 3242), 0.0f); - assertEquals(27.23f, band.getSampleFloat(221, 1233), 0.0f); - assertEquals(21.46f, band.getSampleFloat(864, 532), 0.0f); - assertEquals(25.24f, band.getSampleFloat(2763, 1445), 0.0f); - assertEquals(20.38f, band.getSampleFloat(2642, 3354), 0.0f); - assertEquals(59.449997f, band.getSampleFloat(544, 544), 0.0f); - assertEquals(23.97f, band.getSampleFloat(1332, 2345), 0.0f); - assertEquals(20.779999f, band.getSampleFloat(2200, 700), 0.0f); - assertEquals(20.99f, band.getSampleFloat(543, 12), 0.0f); - assertEquals(48.25f, band.getSampleFloat(32, 547), 0.0f); - assertEquals(18.5f, band.getSampleFloat(3000, 4000), 0.0f); + assertEquals(25.699999f, band.getSampleFloat(0, 0), 0.0f); + assertEquals(25.9f, band.getSampleFloat(22, 20), 0.0f); + assertEquals(23.3f, band.getSampleFloat(123, 3221), 0.0f); + assertEquals(21.64f, band.getSampleFloat(246, 134), 0.0f); + assertEquals(34.86f, band.getSampleFloat(435, 3543), 0.0f); + assertEquals(33.67f, band.getSampleFloat(1000, 3245), 0.0f); + assertEquals(35.329998f, band.getSampleFloat(2214, 3242), 0.0f); + assertEquals(16.619999f, band.getSampleFloat(221, 1233), 0.0f); + assertEquals(30.42f, band.getSampleFloat(864, 532), 0.0f); + assertEquals(24.1f, band.getSampleFloat(2763, 1445), 0.0f); + assertEquals(29.0f, band.getSampleFloat(2642, 3354), 0.0f); + assertEquals(27.98f, band.getSampleFloat(544, 544), 0.0f); + assertEquals(23.33f, band.getSampleFloat(1332, 2345), 0.0f); + assertEquals(24.609999f, band.getSampleFloat(2200, 700), 0.0f); + assertEquals(24.57f, band.getSampleFloat(543, 12), 0.0f); + assertEquals(52.11f, band.getSampleFloat(32, 547), 0.0f); + assertEquals(0.0f, band.getSampleFloat(3000, 4000), 0.0f); } @Test @@ -221,12 +221,12 @@ public void testReadProductGeometrySubset() throws IOException, ConversionExcept assertEquals(3017, band.getRasterWidth()); assertEquals(4002, band.getRasterHeight()); - assertEquals(28.25f, band.getSampleFloat(0, 0), 2); - assertEquals(22.64f, band.getSampleFloat(22, 20), 2); - assertEquals(40.01f, band.getSampleFloat(123, 3221), 2); - assertEquals(39.399998f, band.getSampleFloat(246, 134), 2); - assertEquals(31.38f, band.getSampleFloat(435, 3543), 2); - assertEquals(17.96f, band.getSampleFloat(1000, 3245), 2); + assertEquals(24.59f, band.getSampleFloat(0, 0), 2); + assertEquals(27.0f, band.getSampleFloat(22, 20), 2); + assertEquals(30.97f, band.getSampleFloat(123, 3221), 2); + assertEquals(42.75f, band.getSampleFloat(246, 134), 2); + assertEquals(25.05f, band.getSampleFloat(435, 3543), 2); + assertEquals(81.369995f, band.getSampleFloat(1000, 3245), 2); } private static ProductReader buildProductReader() { From d8b9a7661a72d60b6ef6b7cbb7175361c38065aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Dr=C4=83ghici?= Date: Wed, 26 Mar 2025 12:53:11 +0200 Subject: [PATCH 3/3] [NO-JIRA](opttbx-coregistration): Update the outdated expected for the long junit tests with data for CoRegistration operator. --- .../opt/coregistration/CoregistrationOpTest.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/opttbx-coregistration/src/test/java/eu/esa/opt/coregistration/CoregistrationOpTest.java b/opttbx-coregistration/src/test/java/eu/esa/opt/coregistration/CoregistrationOpTest.java index 1aeb950f2d..819383a7ad 100644 --- a/opttbx-coregistration/src/test/java/eu/esa/opt/coregistration/CoregistrationOpTest.java +++ b/opttbx-coregistration/src/test/java/eu/esa/opt/coregistration/CoregistrationOpTest.java @@ -178,8 +178,8 @@ public void testCoregistrationOp() throws Exception { parameters.put("radius", "32, 28, 24, 20, 16, 12, 8"); Map sourceProducts = new HashMap(); - sourceProducts.put("Master", masterSourceProduct); - sourceProducts.put("Slave", slaveSourceProduct); + sourceProducts.put("masterProduct", masterSourceProduct); + sourceProducts.put("slaveProduct", slaveSourceProduct); // create the operator Operator operator = GPF.getDefaultInstance().createOperator("CoregistrationOp", parameters, sourceProducts, null); @@ -220,22 +220,22 @@ public void testCoregistrationOp() throws Exception { private static void checkGrayBand(Band band) { int bandValue = band.getSampleInt(64, 84); - assertEquals(115, bandValue); + assertEquals(112, bandValue); bandValue = band.getSampleInt(164, 184); assertEquals(93, bandValue); bandValue = band.getSampleInt(264, 114); - assertEquals(105, bandValue); + assertEquals(115, bandValue); bandValue = band.getSampleInt(14, 18); - assertEquals(92, bandValue); + assertEquals(102, bandValue); bandValue = band.getSampleInt(123, 230); - assertEquals(111, bandValue); + assertEquals(114, bandValue); bandValue = band.getSampleInt(200, 100); - assertEquals(88, bandValue); + assertEquals(85, bandValue); }