Author: desruisseaux Date: Mon Feb 19 21:58:55 2018 New Revision: 1824822 URL: http://svn.apache.org/viewvc?rev=1824822&view=rev Log: Fix Landsat test for new metadata element order.
Modified: sis/branches/ISO-19115-3/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatReaderTest.java Modified: sis/branches/ISO-19115-3/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatReaderTest.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatReaderTest.java?rev=1824822&r1=1824821&r2=1824822&view=diff ============================================================================== --- sis/branches/ISO-19115-3/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatReaderTest.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatReaderTest.java [UTF-8] Mon Feb 19 21:58:55 2018 @@ -39,7 +39,7 @@ import static org.apache.sis.storage.ear * Tests {@link LandsatReader}. * * @author Thi Phuong Hao Nguyen (VNSC) - * @version 0.8 + * @version 1.0 * @since 0.8 * @module */ @@ -94,7 +94,26 @@ public class LandsatReaderTest extends T final String text = formatNameAndValue(DefaultMetadata.castOrCopy(actual).asTreeTable()); assertMultilinesEquals( "Metadata\n" + + " ├─Metadata identifier……………………………………………………………… LandsatTest\n" + " ├─Language…………………………………………………………………………………………… en\n" + + " ├─Metadata standard (1 of 2)…………………………………………… Geographic Information — Metadata Part 1: Fundamentals\n" + + " │ ├─Edition…………………………………………………………………………………… ISO 19115-1:2014(E)\n" + + " │ ├─Identifier…………………………………………………………………………… 19115-1\n" + + " │ │ ├─Code space………………………………………………………………… ISO\n" + + " │ │ └─Version………………………………………………………………………… 2014(E)\n" + + " │ ├─Cited responsible party\n" + + " │ │ ├─Role………………………………………………………………………………… Principal investigator\n" + + " │ │ └─Organisation…………………………………………………………… International Organization for Standardization\n" + + " │ └─Presentation form………………………………………………………… Document digital\n" + + " ├─Metadata standard (2 of 2)…………………………………………… Geographic Information — Metadata Part 2: Extensions for imagery and gridded data\n" + + " │ ├─Edition…………………………………………………………………………………… ISO 19115-2:2009(E)\n" + + " │ ├─Identifier…………………………………………………………………………… 19115-2\n" + + " │ │ ├─Code space………………………………………………………………… ISO\n" + + " │ │ └─Version………………………………………………………………………… 2009(E)\n" + + " │ ├─Cited responsible party\n" + + " │ │ ├─Role………………………………………………………………………………… Principal investigator\n" + + " │ │ └─Organisation…………………………………………………………… International Organization for Standardization\n" + + " │ └─Presentation form………………………………………………………… Document digital\n" + " ├─Spatial representation info (1 of 2)\n" + " │ ├─Number of dimensions………………………………………………… 2\n" + " │ ├─Axis dimension properties (1 of 2)…………… Sample\n" @@ -117,140 +136,142 @@ public class LandsatReaderTest extends T + " │ │ └─Date………………………………………………………………………………… 2016-06-27 16:48:12\n" + " │ │ └─Date type………………………………………………………… Creation\n" + " │ ├─Credit……………………………………………………………………………………… Derived from U.S. Geological Survey data\n" - + " │ ├─Resource format\n" - + " │ │ └─Format specification citation……………… GeoTIFF Coverage Encoding Profile\n" - + " │ │ └─Alternate title………………………………………… GeoTIFF\n" + " │ ├─Spatial resolution (1 of 2)\n" + " │ │ └─Distance……………………………………………………………………… 15.0\n" + " │ ├─Spatial resolution (2 of 2)\n" + " │ │ └─Distance……………………………………………………………………… 30.0\n" - + " │ └─Extent\n" - + " │ └─Geographic element\n" - + " │ ├─West bound longitude…………………………… 108°20′24″E\n" - + " │ ├─East bound longitude…………………………… 110°26′24″E\n" - + " │ ├─South bound latitude…………………………… 10°30′N\n" - + " │ ├─North bound latitude…………………………… 12°37′12″N\n" - + " │ └─Extent type code……………………………………… true\n" + + " │ ├─Extent\n" + + " │ │ └─Geographic element\n" + + " │ │ ├─West bound longitude…………………………… 108°20′24″E\n" + + " │ │ ├─East bound longitude…………………………… 110°26′24″E\n" + + " │ │ ├─South bound latitude…………………………… 10°30′N\n" + + " │ │ ├─North bound latitude…………………………… 12°37′12″N\n" + + " │ │ └─Extent type code……………………………………… true\n" + + " │ └─Resource format\n" + + " │ └─Format specification citation……………… GeoTIFF Coverage Encoding Profile\n" + + " │ └─Alternate title………………………………………… GeoTIFF\n" + " ├─Content info\n" - + " │ ├─Illumination elevation angle…………………………… 58.8\n" - + " │ ├─Illumination azimuth angle………………………………… 116.9\n" - + " │ ├─Cloud cover percentage…………………………………………… 8.3\n" + " │ ├─Attribute group (1 of 3)\n" + " │ │ ├─Content type…………………………………………………………… Physical measurement\n" + " │ │ ├─Attribute (1 of 8)\n" + + " │ │ │ ├─Description…………………………………………………… Coastal Aerosol\n" + + " │ │ │ ├─Name……………………………………………………………………… TestImage_B1.TIF\n" + " │ │ │ ├─Max value………………………………………………………… 65535.0\n" + " │ │ │ ├─Min value………………………………………………………… 1.0\n" - + " │ │ │ ├─Peak response……………………………………………… 433.0\n" + " │ │ │ ├─Scale factor………………………………………………… 0.0127\n" + " │ │ │ ├─Offset………………………………………………………………… -63.6\n" - + " │ │ │ ├─Transfer function type……………………… Linear\n" + " │ │ │ ├─Bound units…………………………………………………… nm\n" - + " │ │ │ ├─Description…………………………………………………… Coastal Aerosol\n" - + " │ │ │ └─Name……………………………………………………………………… TestImage_B1.TIF\n" + + " │ │ │ ├─Peak response……………………………………………… 433.0\n" + + " │ │ │ └─Transfer function type……………………… Linear\n" + " │ │ ├─Attribute (2 of 8)\n" + + " │ │ │ ├─Description…………………………………………………… Blue\n" + + " │ │ │ ├─Name……………………………………………………………………… TestImage_B2.TIF\n" + " │ │ │ ├─Max value………………………………………………………… 65535.0\n" + " │ │ │ ├─Min value………………………………………………………… 1.0\n" - + " │ │ │ ├─Peak response……………………………………………… 482.0\n" + " │ │ │ ├─Scale factor………………………………………………… 0.013\n" + " │ │ │ ├─Offset………………………………………………………………… -65.1\n" - + " │ │ │ ├─Transfer function type……………………… Linear\n" + " │ │ │ ├─Bound units…………………………………………………… nm\n" - + " │ │ │ ├─Description…………………………………………………… Blue\n" - + " │ │ │ └─Name……………………………………………………………………… TestImage_B2.TIF\n" + + " │ │ │ ├─Peak response……………………………………………… 482.0\n" + + " │ │ │ └─Transfer function type……………………… Linear\n" + " │ │ ├─Attribute (3 of 8)\n" + + " │ │ │ ├─Description…………………………………………………… Green\n" + + " │ │ │ ├─Name……………………………………………………………………… TestImage_B3.TIF\n" + " │ │ │ ├─Max value………………………………………………………… 65535.0\n" + " │ │ │ ├─Min value………………………………………………………… 1.0\n" - + " │ │ │ ├─Peak response……………………………………………… 562.0\n" + " │ │ │ ├─Scale factor………………………………………………… 0.012\n" + " │ │ │ ├─Offset………………………………………………………………… -60.0\n" - + " │ │ │ ├─Transfer function type……………………… Linear\n" + " │ │ │ ├─Bound units…………………………………………………… nm\n" - + " │ │ │ ├─Description…………………………………………………… Green\n" - + " │ │ │ └─Name……………………………………………………………………… TestImage_B3.TIF\n" + + " │ │ │ ├─Peak response……………………………………………… 562.0\n" + + " │ │ │ └─Transfer function type……………………… Linear\n" + " │ │ ├─Attribute (4 of 8)\n" + + " │ │ │ ├─Description…………………………………………………… Red\n" + + " │ │ │ ├─Name……………………………………………………………………… TestImage_B4.TIF\n" + " │ │ │ ├─Max value………………………………………………………… 65535.0\n" + " │ │ │ ├─Min value………………………………………………………… 1.0\n" - + " │ │ │ ├─Peak response……………………………………………… 655.0\n" + " │ │ │ ├─Scale factor………………………………………………… 0.0101\n" + " │ │ │ ├─Offset………………………………………………………………… -50.6\n" - + " │ │ │ ├─Transfer function type……………………… Linear\n" + " │ │ │ ├─Bound units…………………………………………………… nm\n" - + " │ │ │ ├─Description…………………………………………………… Red\n" - + " │ │ │ └─Name……………………………………………………………………… TestImage_B4.TIF\n" + + " │ │ │ ├─Peak response……………………………………………… 655.0\n" + + " │ │ │ └─Transfer function type……………………… Linear\n" + " │ │ ├─Attribute (5 of 8)\n" + + " │ │ │ ├─Description…………………………………………………… Near-Infrared\n" + + " │ │ │ ├─Name……………………………………………………………………… TestImage_B5.TIF\n" + " │ │ │ ├─Max value………………………………………………………… 65535.0\n" + " │ │ │ ├─Min value………………………………………………………… 1.0\n" - + " │ │ │ ├─Peak response……………………………………………… 865.0\n" + " │ │ │ ├─Scale factor………………………………………………… 0.00619\n" + " │ │ │ ├─Offset………………………………………………………………… -31.0\n" - + " │ │ │ ├─Transfer function type……………………… Linear\n" + " │ │ │ ├─Bound units…………………………………………………… nm\n" - + " │ │ │ ├─Description…………………………………………………… Near-Infrared\n" - + " │ │ │ └─Name……………………………………………………………………… TestImage_B5.TIF\n" + + " │ │ │ ├─Peak response……………………………………………… 865.0\n" + + " │ │ │ └─Transfer function type……………………… Linear\n" + " │ │ ├─Attribute (6 of 8)\n" + + " │ │ │ ├─Description…………………………………………………… Short Wavelength Infrared (SWIR) 1\n" + + " │ │ │ ├─Name……………………………………………………………………… TestImage_B6.TIF\n" + " │ │ │ ├─Max value………………………………………………………… 65535.0\n" + " │ │ │ ├─Min value………………………………………………………… 1.0\n" - + " │ │ │ ├─Peak response……………………………………………… 1610.0\n" + " │ │ │ ├─Scale factor………………………………………………… 0.00154\n" + " │ │ │ ├─Offset………………………………………………………………… -7.7\n" - + " │ │ │ ├─Transfer function type……………………… Linear\n" + " │ │ │ ├─Bound units…………………………………………………… nm\n" - + " │ │ │ ├─Description…………………………………………………… Short Wavelength Infrared (SWIR) 1\n" - + " │ │ │ └─Name……………………………………………………………………… TestImage_B6.TIF\n" + + " │ │ │ ├─Peak response……………………………………………… 1610.0\n" + + " │ │ │ └─Transfer function type……………………… Linear\n" + " │ │ ├─Attribute (7 of 8)\n" + + " │ │ │ ├─Description…………………………………………………… Short Wavelength Infrared (SWIR) 2\n" + + " │ │ │ ├─Name……………………………………………………………………… TestImage_B7.TIF\n" + " │ │ │ ├─Max value………………………………………………………… 65535.0\n" + " │ │ │ ├─Min value………………………………………………………… 1.0\n" - + " │ │ │ ├─Peak response……………………………………………… 2200.0\n" + " │ │ │ ├─Scale factor………………………………………………… 5.19E-4\n" + " │ │ │ ├─Offset………………………………………………………………… -2.6\n" - + " │ │ │ ├─Transfer function type……………………… Linear\n" + " │ │ │ ├─Bound units…………………………………………………… nm\n" - + " │ │ │ ├─Description…………………………………………………… Short Wavelength Infrared (SWIR) 2\n" - + " │ │ │ └─Name……………………………………………………………………… TestImage_B7.TIF\n" + + " │ │ │ ├─Peak response……………………………………………… 2200.0\n" + + " │ │ │ └─Transfer function type……………………… Linear\n" + " │ │ └─Attribute (8 of 8)\n" + + " │ │ ├─Description…………………………………………………… Cirrus\n" + + " │ │ ├─Name……………………………………………………………………… TestImage_B9.TIF\n" + " │ │ ├─Max value………………………………………………………… 65535.0\n" + " │ │ ├─Min value………………………………………………………… 1.0\n" - + " │ │ ├─Peak response……………………………………………… 1375.0\n" + " │ │ ├─Scale factor………………………………………………… 0.00242\n" + " │ │ ├─Offset………………………………………………………………… -12.1\n" - + " │ │ ├─Transfer function type……………………… Linear\n" + " │ │ ├─Bound units…………………………………………………… nm\n" - + " │ │ ├─Description…………………………………………………… Cirrus\n" - + " │ │ └─Name……………………………………………………………………… TestImage_B9.TIF\n" + + " │ │ ├─Peak response……………………………………………… 1375.0\n" + + " │ │ └─Transfer function type……………………… Linear\n" + " │ ├─Attribute group (2 of 3)\n" + " │ │ ├─Content type…………………………………………………………… Physical measurement\n" + " │ │ └─Attribute\n" + + " │ │ ├─Description…………………………………………………… Panchromatic\n" + + " │ │ ├─Name……………………………………………………………………… TestImage_B8.TIF\n" + " │ │ ├─Max value………………………………………………………… 65535.0\n" + " │ │ ├─Min value………………………………………………………… 1.0\n" - + " │ │ ├─Peak response……………………………………………… 590.0\n" + " │ │ ├─Scale factor………………………………………………… 0.0115\n" + " │ │ ├─Offset………………………………………………………………… -57.3\n" - + " │ │ ├─Transfer function type……………………… Linear\n" + " │ │ ├─Bound units…………………………………………………… nm\n" - + " │ │ ├─Description…………………………………………………… Panchromatic\n" - + " │ │ └─Name……………………………………………………………………… TestImage_B8.TIF\n" - + " │ └─Attribute group (3 of 3)\n" - + " │ ├─Content type…………………………………………………………… Physical measurement\n" - + " │ ├─Attribute (1 of 2)\n" - + " │ │ ├─Max value………………………………………………………… 65535.0\n" - + " │ │ ├─Min value………………………………………………………… 1.0\n" - + " │ │ ├─Peak response……………………………………………… 10800.0\n" - + " │ │ ├─Scale factor………………………………………………… 3.34E-4\n" - + " │ │ ├─Offset………………………………………………………………… 0.1\n" - + " │ │ ├─Transfer function type……………………… Linear\n" - + " │ │ ├─Bound units…………………………………………………… nm\n" - + " │ │ ├─Description…………………………………………………… Thermal Infrared Sensor (TIRS) 1\n" - + " │ │ └─Name……………………………………………………………………… TestImage_B10.TIF\n" - + " │ └─Attribute (2 of 2)\n" - + " │ ├─Max value………………………………………………………… 65535.0\n" - + " │ ├─Min value………………………………………………………… 1.0\n" - + " │ ├─Peak response……………………………………………… 12000.0\n" - + " │ ├─Scale factor………………………………………………… 3.34E-4\n" - + " │ ├─Offset………………………………………………………………… 0.1\n" - + " │ ├─Transfer function type……………………… Linear\n" - + " │ ├─Bound units…………………………………………………… nm\n" - + " │ ├─Description…………………………………………………… Thermal Infrared Sensor (TIRS) 2\n" - + " │ └─Name……………………………………………………………………… TestImage_B11.TIF\n" + + " │ │ ├─Peak response……………………………………………… 590.0\n" + + " │ │ └─Transfer function type……………………… Linear\n" + + " │ ├─Attribute group (3 of 3)\n" + + " │ │ ├─Content type…………………………………………………………… Physical measurement\n" + + " │ │ ├─Attribute (1 of 2)\n" + + " │ │ │ ├─Description…………………………………………………… Thermal Infrared Sensor (TIRS) 1\n" + + " │ │ │ ├─Name……………………………………………………………………… TestImage_B10.TIF\n" + + " │ │ │ ├─Max value………………………………………………………… 65535.0\n" + + " │ │ │ ├─Min value………………………………………………………… 1.0\n" + + " │ │ │ ├─Scale factor………………………………………………… 3.34E-4\n" + + " │ │ │ ├─Offset………………………………………………………………… 0.1\n" + + " │ │ │ ├─Bound units…………………………………………………… nm\n" + + " │ │ │ ├─Peak response……………………………………………… 10800.0\n" + + " │ │ │ └─Transfer function type……………………… Linear\n" + + " │ │ └─Attribute (2 of 2)\n" + + " │ │ ├─Description…………………………………………………… Thermal Infrared Sensor (TIRS) 2\n" + + " │ │ ├─Name……………………………………………………………………… TestImage_B11.TIF\n" + + " │ │ ├─Max value………………………………………………………… 65535.0\n" + + " │ │ ├─Min value………………………………………………………… 1.0\n" + + " │ │ ├─Scale factor………………………………………………… 3.34E-4\n" + + " │ │ ├─Offset………………………………………………………………… 0.1\n" + + " │ │ ├─Bound units…………………………………………………… nm\n" + + " │ │ ├─Peak response……………………………………………… 12000.0\n" + + " │ │ └─Transfer function type……………………… Linear\n" + + " │ ├─Illumination elevation angle…………………………… 58.8\n" + + " │ ├─Illumination azimuth angle………………………………… 116.9\n" + + " │ └─Cloud cover percentage…………………………………………… 8.3\n" + + " ├─Metadata scope\n" + + " │ └─Resource scope………………………………………………………………… Coverage\n" + " ├─Acquisition information\n" + " │ ├─Acquisition requirement\n" + " │ │ └─Identifier………………………………………………………………… Software unit tests\n" @@ -264,28 +285,7 @@ public class LandsatReaderTest extends T + " │ ├─Identifier………………………………………………………………… Pseudo LANDSAT\n" + " │ └─Instrument\n" + " │ └─Identifier……………………………………………………… Pseudo TIRS\n" - + " ├─Date info………………………………………………………………………………………… 2016-06-27 16:48:12\n" - + " │ └─Date type……………………………………………………………………………… Creation\n" - + " ├─Metadata scope\n" - + " │ └─Resource scope………………………………………………………………… Coverage\n" - + " ├─Metadata identifier……………………………………………………………… LandsatTest\n" - + " ├─Metadata standard (1 of 2)…………………………………………… Geographic Information — Metadata Part 1: Fundamentals\n" - + " │ ├─Edition…………………………………………………………………………………… ISO 19115-1:2014(E)\n" - + " │ ├─Identifier…………………………………………………………………………… 19115-1\n" - + " │ │ ├─Code space………………………………………………………………… ISO\n" - + " │ │ └─Version………………………………………………………………………… 2014(E)\n" - + " │ ├─Cited responsible party\n" - + " │ │ ├─Organisation…………………………………………………………… International Organization for Standardization\n" - + " │ │ └─Role………………………………………………………………………………… Principal investigator\n" - + " │ └─Presentation form………………………………………………………… Document digital\n" - + " └─Metadata standard (2 of 2)…………………………………………… Geographic Information — Metadata Part 2: Extensions for imagery and gridded data\n" - + " ├─Edition…………………………………………………………………………………… ISO 19115-2:2009(E)\n" - + " ├─Identifier…………………………………………………………………………… 19115-2\n" - + " │ ├─Code space………………………………………………………………… ISO\n" - + " │ └─Version………………………………………………………………………… 2009(E)\n" - + " ├─Cited responsible party\n" - + " │ ├─Organisation…………………………………………………………… International Organization for Standardization\n" - + " │ └─Role………………………………………………………………………………… Principal investigator\n" - + " └─Presentation form………………………………………………………… Document digital\n", text); + + " └─Date info………………………………………………………………………………………… 2016-06-27 16:48:12\n" + + " └─Date type……………………………………………………………………………… Creation\n", text); } }