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
The following commit(s) were added to refs/heads/geoapi-4.0 by this push: new 052ffa5fa7 Remove GIGS tests because they will be removed from GeoAPI-conformance module. Those tests moved to an IOGP project: https://github.com/IOGP-GIGS/GIGSGeoAPI That project targets official OGC GeoAPI release, currently GeoAPI 3.0.1. It means that GIGS tests can be executed on SIS master branch but not yet on the `geoapi-4.0` branch. 052ffa5fa7 is described below commit 052ffa5fa7a3d0f7870ac73a6c832168616ef853 Author: Martin Desruisseaux <martin.desruisse...@geomatys.com> AuthorDate: Sat Dec 17 15:01:32 2022 +0100 Remove GIGS tests because they will be removed from GeoAPI-conformance module. Those tests moved to an IOGP project: https://github.com/IOGP-GIGS/GIGSGeoAPI That project targets official OGC GeoAPI release, currently GeoAPI 3.0.1. It means that GIGS tests can be executed on SIS master branch but not yet on the `geoapi-4.0` branch. --- .../apache/sis/referencing/factory/GIGS2001.java | 73 --------- .../apache/sis/referencing/factory/GIGS2002.java | 121 --------------- .../apache/sis/referencing/factory/GIGS2003.java | 77 ---------- .../apache/sis/referencing/factory/GIGS2004.java | 166 --------------------- .../apache/sis/referencing/factory/GIGS2005.java | 123 --------------- .../apache/sis/referencing/factory/GIGS2006.java | 118 --------------- .../apache/sis/referencing/factory/GIGS2007.java | 77 ---------- .../apache/sis/referencing/factory/GIGS2008.java | 77 ---------- .../apache/sis/referencing/factory/GIGS2009.java | 77 ---------- .../apache/sis/referencing/factory/GIGS3002.java | 49 ------ .../apache/sis/referencing/factory/GIGS3003.java | 49 ------ .../apache/sis/referencing/factory/GIGS3004.java | 56 ------- .../apache/sis/referencing/factory/GIGS3005.java | 49 ------ .../referencing/factory/sql/EPSGFactoryTest.java | 2 - .../sis/test/suite/ReferencingTestSuite.java | 17 +-- 15 files changed, 1 insertion(+), 1130 deletions(-) diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2001.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2001.java deleted file mode 100644 index 5013bcf8d0..0000000000 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2001.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.sis.referencing.factory; - -import org.opengis.util.FactoryException; - -// Test imports -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.FixMethodOrder; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; -import org.junit.runners.MethodSorters; - - - -/** - * Tests {@link org.apache.sis.referencing.factory.sql.EPSGDataAccess#createUnit(String)}. - * This is part of <cite>Geospatial Integrity of Geoscience Software</cite> (GIGS) tests implemented in GeoAPI. - * - * <div class="note"><b>Note:</b> - * this test is defined in this package instead of in the {@code sql} sub-package because of the need to access - * package-private methods in {@link ConcurrentAuthorityFactory}, and for keeping all GIGS tests together.</div> - * - * @author Martin Desruisseaux (Geomatys) - * @version 0.8 - * @since 0.7 - * @module - */ -@RunWith(JUnit4.class) -@FixMethodOrder(MethodSorters.JVM) // Intentionally want some randomness -public final strictfp class GIGS2001 extends org.opengis.test.referencing.gigs.GIGS2001 { - /** - * Creates a new test using the default authority factory. - */ - public GIGS2001() { - super(TestFactorySource.factory); - } - - /** - * Creates the factory to use for all tests in this class. - * - * @throws FactoryException if an error occurred while creating the factory. - */ - @BeforeClass - public static void createFactory() throws FactoryException { - TestFactorySource.createFactory(); - } - - /** - * Forces release of JDBC connections after the tests in this class. - * - * @throws FactoryException if an error occurred while closing the connections. - */ - @AfterClass - public static void close() throws FactoryException { - TestFactorySource.close(); - } -} diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2002.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2002.java deleted file mode 100644 index e441e57726..0000000000 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2002.java +++ /dev/null @@ -1,121 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.sis.referencing.factory; - -import org.opengis.util.FactoryException; -import org.apache.sis.internal.system.Loggers; - -// Test imports -import org.junit.Rule; -import org.junit.Test; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.FixMethodOrder; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; -import org.junit.runners.MethodSorters; -import org.apache.sis.test.DependsOn; -import org.apache.sis.test.LoggingWatcher; - - -/** - * Tests {@link org.apache.sis.referencing.factory.sql.EPSGDataAccess#createEllipsoid(String)}. - * This is part of <cite>Geospatial Integrity of Geoscience Software</cite> (GIGS) tests implemented in GeoAPI. - * - * <div class="note"><b>Note:</b> - * this test is defined in this package instead of in the {@code sql} sub-package because of the need to access - * package-private methods in {@link ConcurrentAuthorityFactory}, and for keeping all GIGS tests together.</div> - * - * @author Martin Desruisseaux (Geomatys) - * @version 0.7 - * @since 0.7 - * @module - */ -@DependsOn({ - GIGS2001.class, // Units created from EPSG codes - GIGS3002.class // Ellipsoids created from properties -}) -@RunWith(JUnit4.class) -@FixMethodOrder(MethodSorters.JVM) // Intentionally want some randomness -public final strictfp class GIGS2002 extends org.opengis.test.referencing.gigs.GIGS2002 { - /** - * A JUnit {@link Rule} for listening to log events. This field is public because JUnit requires us to - * do so, but should be considered as an implementation details (it should have been a private field). - */ - @Rule - public final LoggingWatcher loggings = new LoggingWatcher(Loggers.CRS_FACTORY); - - /** - * Creates a new test using the default authority factory. - */ - public GIGS2002() { - super(TestFactorySource.factory); - } - - /** - * Creates the factory to use for all tests in this class. - * - * @throws FactoryException if an error occurred while creating the factory. - */ - @BeforeClass - public static void createFactory() throws FactoryException { - TestFactorySource.createFactory(); - } - - /** - * Forces release of JDBC connections after the tests in this class. - * - * @throws FactoryException if an error occurred while closing the connections. - */ - @AfterClass - public static void close() throws FactoryException { - TestFactorySource.close(); - } - - /** - * Overrides the GeoAPI test for verifying the log messages emitted during the construction of deprecated objects. - * - * @throws FactoryException if an error occurred while creating the object. - */ - @Test - @Override - public void testClarkeMichigan() throws FactoryException { - super.testClarkeMichigan(); - loggings.assertNextLogContains("EPSG:7009"); - } - - /** - * Overrides the GeoAPI test for verifying the log messages emitted during the construction of deprecated objects. - * - * @throws FactoryException if an error occurred while creating the object. - */ - @Test - @Override - public void testPopularVisualisationSphere() throws FactoryException { - super.testPopularVisualisationSphere(); - loggings.assertNextLogContains("EPSG:7059"); - } - - /** - * Verifies that no unexpected warning has been emitted in this test. - */ - @After - public void assertNoUnexpectedLog() { - loggings.assertNoUnexpectedLog(); - } -} diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2003.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2003.java deleted file mode 100644 index 8720875adc..0000000000 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2003.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.sis.referencing.factory; - -import org.opengis.util.FactoryException; - -// Test imports -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.FixMethodOrder; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; -import org.junit.runners.MethodSorters; -import org.apache.sis.test.DependsOn; - - -/** - * Tests {@link org.apache.sis.referencing.factory.sql.EPSGDataAccess#createPrimeMeridian(String)}. - * This is part of <cite>Geospatial Integrity of Geoscience Software</cite> (GIGS) tests implemented in GeoAPI. - * - * <div class="note"><b>Note:</b> - * this test is defined in this package instead of in the {@code sql} sub-package because of the need to access - * package-private methods in {@link ConcurrentAuthorityFactory}, and for keeping all GIGS tests together.</div> - * - * @author Martin Desruisseaux (Geomatys) - * @version 0.7 - * @since 0.7 - * @module - */ -@DependsOn({ - GIGS2001.class, // Units created from EPSG codes - GIGS3003.class // Prime meridians created from properties -}) -@RunWith(JUnit4.class) -@FixMethodOrder(MethodSorters.JVM) // Intentionally want some randomness -public final strictfp class GIGS2003 extends org.opengis.test.referencing.gigs.GIGS2003 { - /** - * Creates a new test using the default authority factory. - */ - public GIGS2003() { - super(TestFactorySource.factory); - } - - /** - * Creates the factory to use for all tests in this class. - * - * @throws FactoryException if an error occurred while creating the factory. - */ - @BeforeClass - public static void createFactory() throws FactoryException { - TestFactorySource.createFactory(); - } - - /** - * Forces release of JDBC connections after the tests in this class. - * - * @throws FactoryException if an error occurred while closing the connections. - */ - @AfterClass - public static void close() throws FactoryException { - TestFactorySource.close(); - } -} diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2004.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2004.java deleted file mode 100644 index ff26494115..0000000000 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2004.java +++ /dev/null @@ -1,166 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.sis.referencing.factory; - -import org.opengis.util.FactoryException; -import org.opengis.referencing.IdentifiedObject; -import org.apache.sis.internal.system.Loggers; -import org.apache.sis.util.CharSequences; - -// Test imports -import org.junit.Rule; -import org.junit.Test; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.FixMethodOrder; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; -import org.junit.runners.MethodSorters; -import org.apache.sis.test.DependsOn; -import org.apache.sis.test.LoggingWatcher; - - -/** - * Tests {@link org.apache.sis.referencing.factory.sql.EPSGDataAccess#createCoordinateReferenceSystem(String)} - * for geodetic (geographic or geocentric) CRS. - * This is part of <cite>Geospatial Integrity of Geoscience Software</cite> (GIGS) tests implemented in GeoAPI. - * - * <div class="note"><b>Note:</b> - * this test is defined in this package instead of in the {@code sql} sub-package because of the need to access - * package-private methods in {@link ConcurrentAuthorityFactory}, and for keeping all GIGS tests together.</div> - * - * @author Martin Desruisseaux (Geomatys) - * @version 1.1 - * @since 0.7 - * @module - */ -@DependsOn({ - GIGS2002.class, // Ellipsoids created from EPSG codes - GIGS2003.class, // Prime meridians created from EPSG codes - GIGS3004.class // Geodetic datums created from properties -}) -@RunWith(JUnit4.class) -@FixMethodOrder(MethodSorters.JVM) // Intentionally want some randomness -public final strictfp class GIGS2004 extends org.opengis.test.referencing.gigs.GIGS2004 { - /** - * A JUnit {@link Rule} for listening to log events. This field is public because JUnit requires us to - * do so, but should be considered as an implementation details (it should have been a private field). - */ - @Rule - public final LoggingWatcher loggings = new LoggingWatcher(Loggers.CRS_FACTORY); - - /** - * Creates a new test using the default authority factory. - */ - public GIGS2004() { - super(TestFactorySource.factory, TestFactorySource.factory); - } - - /** - * Creates the factory to use for all tests in this class. - * - * @throws FactoryException if an error occurred while creating the factory. - */ - @BeforeClass - public static void createFactory() throws FactoryException { - TestFactorySource.createFactory(); - } - - /** - * Forces release of JDBC connections after the tests in this class. - * - * @throws FactoryException if an error occurred while closing the connections. - */ - @AfterClass - public static void close() throws FactoryException { - TestFactorySource.close(); - } - - /** - * Removes the accented characters from the object name, so it can be compared against the expected name. - * - * @param object the object from which to get a name that can be verified against the expected name. - * @return the name of the given object, eventually modified in order to match the expected name. - */ - @Override - protected String getVerifiableName(final IdentifiedObject object) { - return CharSequences.toASCII(super.getVerifiableName(object)).toString(); - } - - /** - * Overrides the GeoAPI test for verifying the log messages emitted during the construction of deprecated objects. - * - * @throws FactoryException if an error occurred while creating the object. - */ - @Test - @Override - public void testNAD27_Michigan() throws FactoryException { - super.testNAD27_Michigan(); - loggings.assertNextLogContains("EPSG:6268"); // Datum replaced by 6267 - loggings.skipNextLogIfContains("EPSG:7009"); // Ellipsoid replaced by 7008 (may have been created by GIGS2002) - loggings.assertNextLogContains("EPSG:4268"); // CRS replaced by 4267 - } - - /** - * Overrides the GeoAPI test for verifying the log messages emitted during the construction of deprecated objects. - * - * @throws FactoryException if an error occurred while creating the object. - */ - @Test - @Override - public void testPopularVisualisation() throws FactoryException { - super.testPopularVisualisation(); - loggings.assertNextLogContains("EPSG:6055"); - loggings.skipNextLogIfContains("EPSG:7059"); // Ellipsoid may have been created by GIGS2002. - loggings.assertNextLogContains("EPSG:4055"); - } - - /** - * Overrides the GeoAPI test for verifying the log messages emitted during the construction of deprecated objects. - * - * @throws FactoryException if an error occurred while creating the object. - */ - @Test - @Override - public void testPadang() throws FactoryException { - super.testPadang(); - loggings.assertNextLogContains("EPSG:6280"); // Datum - loggings.assertNextLogContains("EPSG:4280"); // CRS - } - - /** - * Overrides the GeoAPI test for verifying the log messages emitted during the construction of deprecated objects. - * - * @throws FactoryException if an error occurred while creating the object. - */ - @Test - @Override - public void testPadang_Jakarta() throws FactoryException { - super.testPadang_Jakarta(); - loggings.assertNextLogContains("EPSG:6808"); // Datum - loggings.assertNextLogContains("EPSG:4808"); // CRS - } - - /** - * Verifies that no unexpected warning has been emitted in this test. - */ - @After - public void assertNoUnexpectedLog() { - loggings.assertNoUnexpectedLog(); - } -} diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2005.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2005.java deleted file mode 100644 index 2b9dd45cfc..0000000000 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2005.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.sis.referencing.factory; - -import org.opengis.util.FactoryException; -import org.apache.sis.internal.system.Loggers; - -// Test imports -import org.junit.Rule; -import org.junit.Test; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.FixMethodOrder; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; -import org.junit.runners.MethodSorters; -import org.apache.sis.test.DependsOn; -import org.apache.sis.test.LoggingWatcher; - - -/** - * Tests {@link org.apache.sis.referencing.factory.sql.EPSGDataAccess#createCoordinateOperation(String)} - * for map projections. - * This is part of <cite>Geospatial Integrity of Geoscience Software</cite> (GIGS) tests implemented in GeoAPI. - * - * <div class="note"><b>Note:</b> - * this test is defined in this package instead of in the {@code sql} sub-package because of the need to access - * package-private methods in {@link ConcurrentAuthorityFactory}, and for keeping all GIGS tests together.</div> - * - * @author Martin Desruisseaux (Geomatys) - * @version 0.7 - * @since 0.7 - * @module - */ -@DependsOn({ - GIGS2001.class, // Units created from EPSG codes - GIGS3005.class // Conversions created from properties -}) -@RunWith(JUnit4.class) -@FixMethodOrder(MethodSorters.JVM) // Intentionally want some randomness -public final strictfp class GIGS2005 extends org.opengis.test.referencing.gigs.GIGS2005 { - /** - * A JUnit {@link Rule} for listening to log events. This field is public because JUnit requires us to - * do so, but should be considered as an implementation details (it should have been a private field). - */ - @Rule - public final LoggingWatcher loggings = new LoggingWatcher(Loggers.CRS_FACTORY); - - /** - * Creates a new test using the default authority factory. - */ - public GIGS2005() { - super(TestFactorySource.factory); - } - - /** - * Creates the factory to use for all tests in this class. - * - * @throws FactoryException if an error occurred while creating the factory. - */ - @BeforeClass - public static void createFactory() throws FactoryException { - TestFactorySource.createFactory(); - } - - /** - * Forces release of JDBC connections after the tests in this class. - * - * @throws FactoryException if an error occurred while closing the connections. - */ - @AfterClass - public static void close() throws FactoryException { - TestFactorySource.close(); - } - - /** - * Overrides the GeoAPI test for verifying the log messages emitted during the construction of deprecated objects. - * - * @throws FactoryException if an error occurred while creating the object. - */ - @Test - @Override - public void testAustralianMapGridZones() throws FactoryException { - super.testAustralianMapGridZones(); - loggings.assertNextLogContains("EPSG:17448"); // Falls outside EEZ area. - } - - /** - * Overrides the GeoAPI test for verifying the log messages emitted during the construction of deprecated objects. - * - * @throws FactoryException if an error occurred while creating the object. - */ - @Test - @Override - public void testUSStatePlaneZones_LCC() throws FactoryException { - super.testUSStatePlaneZones_LCC(); - loggings.assertNextLogContains("EPSG:12112"); // Method changed to accord with NGS practice. - loggings.assertNextLogContains("EPSG:12113"); - } - - /** - * Verifies that no unexpected warning has been emitted in this test. - */ - @After - public void assertNoUnexpectedLog() { - loggings.assertNoUnexpectedLog(); - } -} diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2006.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2006.java deleted file mode 100644 index 1e804e1f9e..0000000000 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2006.java +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.sis.referencing.factory; - -import org.opengis.util.FactoryException; -import org.apache.sis.internal.system.Loggers; - -// Test imports -import org.junit.Rule; -import org.junit.Test; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.FixMethodOrder; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; -import org.junit.runners.MethodSorters; -import org.apache.sis.test.DependsOn; -import org.apache.sis.test.LoggingWatcher; - - -/** - * Tests {@link org.apache.sis.referencing.factory.sql.EPSGDataAccess#createCoordinateReferenceSystem(String)} - * for projected CRS. - * This is part of <cite>Geospatial Integrity of Geoscience Software</cite> (GIGS) tests implemented in GeoAPI. - * - * <div class="note"><b>Note:</b> - * this test is defined in this package instead of in the {@code sql} sub-package because of the need to access - * package-private methods in {@link ConcurrentAuthorityFactory}, and for keeping all GIGS tests together.</div> - * - * @author Martin Desruisseaux (Geomatys) - * @version 0.7 - * @since 0.7 - * @module - */ -@DependsOn({ - GIGS2004.class, // Geodetic CRSs created from EPSG codes - GIGS2005.class // Conversions created from EPSG codes -}) -@RunWith(JUnit4.class) -@FixMethodOrder(MethodSorters.JVM) // Intentionally want some randomness -public final strictfp class GIGS2006 extends org.opengis.test.referencing.gigs.GIGS2006 { - /** - * A JUnit {@link Rule} for listening to log events. This field is public because JUnit requires us to - * do so, but should be considered as an implementation details (it should have been a private field). - */ - @Rule - public final LoggingWatcher loggings = new LoggingWatcher(Loggers.CRS_FACTORY); - - /** - * Creates a new test using the default authority factory. - */ - public GIGS2006() { - super(TestFactorySource.factory); - } - - /** - * Creates the factory to use for all tests in this class. - * - * @throws FactoryException if an error occurred while creating the factory. - */ - @BeforeClass - public static void createFactory() throws FactoryException { - TestFactorySource.createFactory(); - } - - /** - * Forces release of JDBC connections after the tests in this class. - * - * @throws FactoryException if an error occurred while closing the connections. - */ - @AfterClass - public static void close() throws FactoryException { - TestFactorySource.close(); - } - - /** - * Overrides the GeoAPI test for verifying the log messages emitted during the construction of deprecated objects. - * - * @throws FactoryException if an error occurred while creating the object. - */ - @Test - @Override - public void testNAD27_Michigan() throws FactoryException { - super.testNAD27_Michigan(); - loggings.skipNextLogIfContains("EPSG:6268"); // Datum replaced by 6267 - loggings.skipNextLogIfContains("EPSG:7009"); // Ellipsoid replaced by 7008 - loggings.skipNextLogIfContains("EPSG:4268"); // CRS replaced by 4267 - loggings.assertNextLogContains("EPSG:12111"); - loggings.assertNextLogContains("EPSG:26811"); // ProjectedCRS (no replacement). - loggings.skipNextLogIfContains("EPSG:12112"); // Conversion replaced by 6198 - loggings.assertNextLogContains("EPSG:26812"); // ProjectedCRS replaced by 6201 - loggings.skipNextLogIfContains("EPSG:12113"); // Conversion replaced by 6199 - loggings.assertNextLogContains("EPSG:26813"); // ProjectedCRS replaced by 6202 - } - - /** - * Verifies that no unexpected warning has been emitted in this test. - */ - @After - public void assertNoUnexpectedLog() { - loggings.assertNoUnexpectedLog(); - } -} diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2007.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2007.java deleted file mode 100644 index 04d074d405..0000000000 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2007.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.sis.referencing.factory; - -import org.opengis.util.FactoryException; - -// Test imports -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.FixMethodOrder; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; -import org.junit.runners.MethodSorters; -import org.apache.sis.test.DependsOn; - - -/** - * Tests {@link org.apache.sis.referencing.factory.sql.EPSGDataAccess#createCoordinateOperation(String)} - * for horizontal coordinate transformations. - * This is part of <cite>Geospatial Integrity of Geoscience Software</cite> (GIGS) tests implemented in GeoAPI. - * - * <div class="note"><b>Note:</b> - * this test is defined in this package instead of in the {@code sql} sub-package because of the need to access - * package-private methods in {@link ConcurrentAuthorityFactory}, and for keeping all GIGS tests together.</div> - * - * @author Martin Desruisseaux (Geomatys) - * @version 0.7 - * @since 0.7 - * @module - */ -@DependsOn({ - GIGS2006.class // Projected CRSs created from EPSG codes -}) -@RunWith(JUnit4.class) -@FixMethodOrder(MethodSorters.JVM) // Intentionally want some randomness -public final strictfp class GIGS2007 extends org.opengis.test.referencing.gigs.GIGS2007 { - /** - * Creates a new test using the default authority factory. - */ - public GIGS2007() { - super(TestFactorySource.factory); - } - - /** - * Creates the factory to use for all tests in this class. - * - * @throws FactoryException if an error occurred while creating the factory. - */ - @BeforeClass - public static void createFactory() throws FactoryException { - TestFactorySource.createFactory(); - } - - /** - * Forces release of JDBC connections after the tests in this class. - * - * @throws FactoryException if an error occurred while closing the connections. - */ - @AfterClass - public static void close() throws FactoryException { - TestFactorySource.close(); - } -} diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2008.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2008.java deleted file mode 100644 index b7054c9573..0000000000 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2008.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.sis.referencing.factory; - -import org.opengis.util.FactoryException; - -// Test imports -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.FixMethodOrder; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; -import org.junit.runners.MethodSorters; -import org.apache.sis.test.DependsOn; - - -/** - * Tests {@link org.apache.sis.referencing.factory.sql.EPSGDataAccess#createCoordinateReferenceSystem(String)} - * for vertical CRS. - * This is part of <cite>Geospatial Integrity of Geoscience Software</cite> (GIGS) tests implemented in GeoAPI. - * - * <div class="note"><b>Note:</b> - * this test is defined in this package instead of in the {@code sql} sub-package because of the need to access - * package-private methods in {@link ConcurrentAuthorityFactory}, and for keeping all GIGS tests together.</div> - * - * @author Martin Desruisseaux (Geomatys) - * @version 0.7 - * @since 0.7 - * @module - */ -@DependsOn({ - GIGS2001.class // Units created from EPSG codes -}) -@RunWith(JUnit4.class) -@FixMethodOrder(MethodSorters.JVM) // Intentionally want some randomness -public final strictfp class GIGS2008 extends org.opengis.test.referencing.gigs.GIGS2008 { - /** - * Creates a new test using the default authority factory. - */ - public GIGS2008() { - super(TestFactorySource.factory, TestFactorySource.factory); - } - - /** - * Creates the factory to use for all tests in this class. - * - * @throws FactoryException if an error occurred while creating the factory. - */ - @BeforeClass - public static void createFactory() throws FactoryException { - TestFactorySource.createFactory(); - } - - /** - * Forces release of JDBC connections after the tests in this class. - * - * @throws FactoryException if an error occurred while closing the connections. - */ - @AfterClass - public static void close() throws FactoryException { - TestFactorySource.close(); - } -} diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2009.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2009.java deleted file mode 100644 index 90314bba29..0000000000 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2009.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.sis.referencing.factory; - -import org.opengis.util.FactoryException; - -// Test imports -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.FixMethodOrder; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; -import org.junit.runners.MethodSorters; -import org.apache.sis.test.DependsOn; - - -/** - * Tests {@link org.apache.sis.referencing.factory.sql.EPSGDataAccess#createCoordinateOperation(String)} - * for vertical coordinate transformations. - * This is part of <cite>Geospatial Integrity of Geoscience Software</cite> (GIGS) tests implemented in GeoAPI. - * - * <div class="note"><b>Note:</b> - * this test is defined in this package instead of in the {@code sql} sub-package because of the need to access - * package-private methods in {@link ConcurrentAuthorityFactory}, and for keeping all GIGS tests together.</div> - * - * @author Martin Desruisseaux (Geomatys) - * @version 0.7 - * @since 0.7 - * @module - */ -@DependsOn({ - GIGS2008.class // Vertical CRSs created from EPSG codes -}) -@RunWith(JUnit4.class) -@FixMethodOrder(MethodSorters.JVM) // Intentionally want some randomness -public final strictfp class GIGS2009 extends org.opengis.test.referencing.gigs.GIGS2009 { - /** - * Creates a new test using the default authority factory. - */ - public GIGS2009() { - super(TestFactorySource.factory); - } - - /** - * Creates the factory to use for all tests in this class. - * - * @throws FactoryException if an error occurred while creating the factory. - */ - @BeforeClass - public static void createFactory() throws FactoryException { - TestFactorySource.createFactory(); - } - - /** - * Forces release of JDBC connections after the tests in this class. - * - * @throws FactoryException if an error occurred while closing the connections. - */ - @AfterClass - public static void close() throws FactoryException { - TestFactorySource.close(); - } -} diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS3002.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS3002.java deleted file mode 100644 index f5dcb9f3bd..0000000000 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS3002.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.sis.referencing.factory; - -import org.opengis.referencing.datum.DatumFactory; -import org.apache.sis.internal.system.DefaultFactories; -import org.apache.sis.test.DependsOn; -import org.junit.FixMethodOrder; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; -import org.junit.runners.MethodSorters; - - -/** - * Runs the <cite>Geospatial Integrity of Geoscience Software</cite> tests on - * {@link org.apache.sis.referencing.datum.DefaultEllipsoid} objects creation. - * - * @author Martin Desruisseaux (Geomatys) - * @version 0.6 - * @since 0.6 - * @module - */ -@DependsOn({ - org.apache.sis.referencing.datum.DefaultEllipsoidTest.class -}) -@RunWith(JUnit4.class) -@FixMethodOrder(MethodSorters.JVM) // Intentionally want some randomness -public final strictfp class GIGS3002 extends org.opengis.test.referencing.gigs.GIGS3002 { - /** - * Creates a new test suite using the singleton factory instance. - */ - public GIGS3002() { - super(DefaultFactories.forBuildin(DatumFactory.class)); - } -} diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS3003.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS3003.java deleted file mode 100644 index 7e847151ed..0000000000 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS3003.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.sis.referencing.factory; - -import org.opengis.referencing.datum.DatumFactory; -import org.apache.sis.internal.system.DefaultFactories; -import org.apache.sis.test.DependsOn; -import org.junit.FixMethodOrder; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; -import org.junit.runners.MethodSorters; - - -/** - * Runs the <cite>Geospatial Integrity of Geoscience Software</cite> tests on - * {@link org.apache.sis.referencing.datum.DefaultPrimeMeridian} objects creation. - * - * @author Martin Desruisseaux (Geomatys) - * @version 0.6 - * @since 0.6 - * @module - */ -@DependsOn({ - org.apache.sis.referencing.datum.DefaultPrimeMeridianTest.class -}) -@RunWith(JUnit4.class) -@FixMethodOrder(MethodSorters.JVM) // Intentionally want some randomness -public final strictfp class GIGS3003 extends org.opengis.test.referencing.gigs.GIGS3003 { - /** - * Creates a new test suite using the singleton factory instance. - */ - public GIGS3003() { - super(DefaultFactories.forBuildin(DatumFactory.class)); - } -} diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS3004.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS3004.java deleted file mode 100644 index 4e80d01327..0000000000 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS3004.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.sis.referencing.factory; - -import org.opengis.referencing.cs.CSFactory; -import org.opengis.referencing.crs.CRSFactory; -import org.opengis.referencing.datum.DatumFactory; -import org.apache.sis.internal.system.DefaultFactories; -import org.apache.sis.test.DependsOn; -import org.junit.FixMethodOrder; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; -import org.junit.runners.MethodSorters; - - -/** - * Runs the <cite>Geospatial Integrity of Geoscience Software</cite> tests on - * {@link org.apache.sis.referencing.datum.DefaultGeodeticDatum} objects creation. - * {@code GIGS3004} tests also geographic and geocentric CRS creations with the tested geodetic datum. - * - * @author Martin Desruisseaux (Geomatys) - * @version 0.6 - * @since 0.6 - * @module - */ -@DependsOn({ - GIGS3002.class, // Ellipsoids created from properties - GIGS3003.class, // Prime meridians created from properties - org.apache.sis.referencing.datum.DefaultGeodeticDatumTest.class -}) -@RunWith(JUnit4.class) -@FixMethodOrder(MethodSorters.JVM) // Intentionally want some randomness -public final strictfp class GIGS3004 extends org.opengis.test.referencing.gigs.GIGS3004 { - /** - * Creates a new test suite using the singleton factory instance. - */ - public GIGS3004() { - super(DefaultFactories.forBuildin(DatumFactory.class), - DefaultFactories.forBuildin(CSFactory.class), - DefaultFactories.forBuildin(CRSFactory.class)); - } -} diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS3005.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS3005.java deleted file mode 100644 index 9cb3f931a7..0000000000 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS3005.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.sis.referencing.factory; - -import org.opengis.referencing.operation.CoordinateOperationFactory; -import org.apache.sis.internal.system.DefaultFactories; -import org.apache.sis.test.DependsOn; -import org.junit.FixMethodOrder; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; -import org.junit.runners.MethodSorters; - - -/** - * Runs the <cite>Geospatial Integrity of Geoscience Software</cite> tests on - * {@link org.apache.sis.referencing.operation.DefaultConversion} objects creation. - * - * @author Martin Desruisseaux (Geomatys) - * @version 0.6 - * @since 0.6 - * @module - */ -@DependsOn({ - org.apache.sis.referencing.operation.DefaultConversionTest.class -}) -@RunWith(JUnit4.class) -@FixMethodOrder(MethodSorters.JVM) // Intentionally want some randomness -public final strictfp class GIGS3005 extends org.opengis.test.referencing.gigs.GIGS3005 { - /** - * Creates a new test suite using the singleton factory instance. - */ - public GIGS3005() { - super(DefaultFactories.forBuildin(CoordinateOperationFactory.class)); - } -} diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java index 9ae4078b3d..981b1015ac 100644 --- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java @@ -74,8 +74,6 @@ import static org.apache.sis.test.ReferencingAssert.*; /** * Tests {@link EPSGFactory}. - * More tests are provided by the {@code GIGS2000} series - * in the {@code org.apache.sis.referencing.factory} package. * * @author Martin Desruisseaux (IRD, Geomatys) * @author Vadim Semenov diff --git a/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java b/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java index a689d192ef..94d7d09628 100644 --- a/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java @@ -25,7 +25,7 @@ import org.junit.BeforeClass; * All tests from the {@code sis-referencing} module, in rough dependency order. * * @author Martin Desruisseaux (Geomatys) - * @version 1.3 + * @version 1.4 * @since 0.3 * @module */ @@ -219,10 +219,6 @@ import org.junit.BeforeClass; // Direct (not from authority codes) geodetic object creations. org.apache.sis.referencing.StandardDefinitionsTest.class, org.apache.sis.referencing.factory.GeodeticObjectFactoryTest.class, - org.apache.sis.referencing.factory.GIGS3002.class, - org.apache.sis.referencing.factory.GIGS3003.class, - org.apache.sis.referencing.factory.GIGS3004.class, - org.apache.sis.referencing.factory.GIGS3005.class, // Well Known Text parsing require above factory. org.apache.sis.io.wkt.MathTransformParserTest.class, @@ -232,17 +228,6 @@ import org.junit.BeforeClass; org.apache.sis.io.wkt.WKTDictionaryTest.class, org.apache.sis.io.wkt.ComparisonWithEPSG.class, - // Geodetic object creations from authority codes. - org.apache.sis.referencing.factory.GIGS2001.class, - org.apache.sis.referencing.factory.GIGS2002.class, - org.apache.sis.referencing.factory.GIGS2003.class, - org.apache.sis.referencing.factory.GIGS2004.class, - org.apache.sis.referencing.factory.GIGS2005.class, - org.apache.sis.referencing.factory.GIGS2006.class, - org.apache.sis.referencing.factory.GIGS2007.class, - org.apache.sis.referencing.factory.GIGS2008.class, - org.apache.sis.referencing.factory.GIGS2009.class, - // Following tests may use indirectly EPSG factory. org.apache.sis.referencing.CommonCRSTest.class, org.apache.sis.referencing.factory.CommonAuthorityFactoryTest.class,