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 e354739b1bccbfad2239e1c01424ad187565648a Author: Martin Desruisseaux <martin.desruisse...@geomatys.com> AuthorDate: Thu Sep 16 17:01:13 2021 +0200 Minor cleanup following the port of `org.apache.sis.measure` to Seshat. --- .../apache/sis/measure/SexagesimalConverter.java | 2 +- .../org/apache/sis/measure/QuantitiesTest.java | 2 ++ .../sis/measure/SexagesimalConverterTest.java | 2 +- .../org/apache/sis/measure/SystemUnitTest.java | 2 +- .../org/apache/sis/measure/UnitFormatTest.java | 1 + .../java/org/apache/sis/measure/UnitsTest.java | 36 +++++++++++----------- 6 files changed, 24 insertions(+), 21 deletions(-) diff --git a/core/sis-utility/src/main/java/org/apache/sis/measure/SexagesimalConverter.java b/core/sis-utility/src/main/java/org/apache/sis/measure/SexagesimalConverter.java index b8e6d27..bb87fd2 100644 --- a/core/sis-utility/src/main/java/org/apache/sis/measure/SexagesimalConverter.java +++ b/core/sis-utility/src/main/java/org/apache/sis/measure/SexagesimalConverter.java @@ -54,7 +54,7 @@ class SexagesimalConverter extends AbstractConverter { * Small tolerance factor when comparing numbers close to 1. * For comparing numbers other than 1, multiply by the number magnitude. */ - static final double EPS = 1E-10; + private static final double EPS = 1E-10; /** * Pseudo-unit for sexagesimal degree. Numbers in this pseudo-unit have the following format: diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/QuantitiesTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/QuantitiesTest.java index cfc077c..1fa30b9 100644 --- a/core/sis-utility/src/test/java/org/apache/sis/measure/QuantitiesTest.java +++ b/core/sis-utility/src/test/java/org/apache/sis/measure/QuantitiesTest.java @@ -142,6 +142,8 @@ public final strictfp class QuantitiesTest extends TestCase { /** * Tests {@link Quantities#min(Quantity, Quantity)} and {@link Quantities#max(Quantity, Quantity)}. + * + * @since 1.1 */ @Test public void testMinAndMax() { diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/SexagesimalConverterTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/SexagesimalConverterTest.java index f6c385e..041dfd5 100644 --- a/core/sis-utility/src/test/java/org/apache/sis/measure/SexagesimalConverterTest.java +++ b/core/sis-utility/src/test/java/org/apache/sis/measure/SexagesimalConverterTest.java @@ -23,7 +23,7 @@ import org.apache.sis.test.TestCase; import org.junit.Test; import static org.apache.sis.measure.SexagesimalConverter.*; -import static org.apache.sis.test.Assert.*; +import static org.junit.Assert.*; /** diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/SystemUnitTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/SystemUnitTest.java index 5722a3a..1ead7ac 100644 --- a/core/sis-utility/src/test/java/org/apache/sis/measure/SystemUnitTest.java +++ b/core/sis-utility/src/test/java/org/apache/sis/measure/SystemUnitTest.java @@ -330,7 +330,7 @@ public final strictfp class SystemUnitTest extends TestCase { public void testAsTypeForNewQuantity() { /* * Tests with a new quantity type unknown to Apache SIS. - * SIS can not proof that the type is wrong, so it should accept it. + * SIS can not prove that the type is wrong, so it should accept it. */ final Unit<Strange> strange = Units.METRE.asType(Strange.class); final Unit<Strange> named = strange.alternate("strange"); diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/UnitFormatTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/UnitFormatTest.java index df8b7bc..bcbb3d7 100644 --- a/core/sis-utility/src/test/java/org/apache/sis/measure/UnitFormatTest.java +++ b/core/sis-utility/src/test/java/org/apache/sis/measure/UnitFormatTest.java @@ -499,6 +499,7 @@ public final strictfp class UnitFormatTest extends TestCase { assertSame(Units.CUBIC_METRE, f.parse("m⋅m⋅m")); assertSame(Units.CUBIC_METRE, f.parse("m²⋅m")); assertSame(Units.CUBIC_METRE, f.parse("m2.m")); + assertSame(Units.CUBIC_METRE, f.parse("m^3")); assertSame(Units.METRES_PER_SECOND, f.parse("m∕s")); assertSame(Units.HERTZ, f.parse("1/s")); } diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java index 9e277b3..ce8822d 100644 --- a/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java +++ b/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java @@ -367,24 +367,24 @@ public final strictfp class UnitsTest extends TestCase { assertSame(METRE, valueOf("http://www.isotc211.org/2005/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])")); assertSame(METRE, valueOf("gmxUom.xml#m")); - assertSame(TROPICAL_YEAR, valueOfEPSG(1029)); - assertSame(SECOND, valueOfEPSG(1040)); - assertSame(FOOT, valueOfEPSG(9002)); - assertSame(US_SURVEY_FOOT, valueOfEPSG(9003)); - assertSame(NAUTICAL_MILE, valueOfEPSG(9030)); - assertSame(KILOMETRE, valueOfEPSG(9036)); - assertSame(RADIAN, valueOfEPSG(9101)); - assertSame(ARC_MINUTE, valueOfEPSG(9103)); - assertSame(ARC_SECOND, valueOfEPSG(9104)); - assertSame(GRAD, valueOfEPSG(9105)); - assertSame(MICRORADIAN, valueOfEPSG(9109)); - assertSame(SexagesimalConverter.DMS_SCALED, valueOfEPSG(9107)); - assertSame(SexagesimalConverter.DMS_SCALED, valueOfEPSG(9108)); - assertSame(SexagesimalConverter.DMS, valueOfEPSG(9110)); - assertSame(SexagesimalConverter.DM, valueOfEPSG(9111)); - assertSame(UNITY, valueOfEPSG(9203)); - assertSame(UNITY, valueOfEPSG(9201)); - assertSame(PPM, valueOfEPSG(9202)); + assertSame(TROPICAL_YEAR, valueOfEPSG(1029)); + assertSame(SECOND, valueOfEPSG(1040)); + assertSame(FOOT, valueOfEPSG(9002)); + assertSame(US_SURVEY_FOOT, valueOfEPSG(9003)); + assertSame(NAUTICAL_MILE, valueOfEPSG(9030)); + assertSame(KILOMETRE, valueOfEPSG(9036)); + assertSame(RADIAN, valueOfEPSG(9101)); + assertSame(ARC_MINUTE, valueOfEPSG(9103)); + assertSame(ARC_SECOND, valueOfEPSG(9104)); + assertSame(GRAD, valueOfEPSG(9105)); + assertSame(MICRORADIAN, valueOfEPSG(9109)); + assertSame(DMS_SCALED, valueOfEPSG(9107)); + assertSame(DMS_SCALED, valueOfEPSG(9108)); + assertSame(DMS, valueOfEPSG(9110)); + assertSame(DM, valueOfEPSG(9111)); + assertSame(UNITY, valueOfEPSG(9203)); + assertSame(UNITY, valueOfEPSG(9201)); + assertSame(PPM, valueOfEPSG(9202)); } /**