sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1722748 - in /sis/branches/JDK8/core/sis-referencing/src: main/java/org/apache/sis/referencing/factory/ main/java/org/apache/sis/referencing/factory/sql/ test/java/org/apache/sis/referencing/factory/ test/java/org/apache/sis/test/suite/
Date Sun, 03 Jan 2016 19:13:22 GMT
Author: desruisseaux
Date: Sun Jan  3 19:13:22 2016
New Revision: 1722748

URL: http://svn.apache.org/viewvc?rev=1722748&view=rev
Log:
Bug fixes and first GIGS tests for EPSG factory.

Added:
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2001.java
  (with props)
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2002.java
  (with props)
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2003.java
  (with props)
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2004.java
  (with props)
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2005.java
  (with props)
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2006.java
  (with props)
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2007.java
  (with props)
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2008.java
  (with props)
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2009.java
  (with props)
Modified:
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java?rev=1722748&r1=1722747&r2=1722748&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
[UTF-8] Sun Jan  3 19:13:22 2016
@@ -163,7 +163,7 @@ public abstract class ConcurrentAuthorit
                 value = depth;
             } else {
                 text = "%s made available %d seconds ago";
-                value = (System.nanoTime() - timestamp) / 1E+9;   // Convert nanoseconds
to seconds.
+                value = Math.round((System.nanoTime() - timestamp) / 1E+9);   // Convert
nanoseconds to seconds.
             }
             return String.format(text, Classes.getShortClassName(factory), value);
         }
@@ -348,7 +348,6 @@ public abstract class ConcurrentAuthorit
                                 Errors.Keys.FactoryNotFound_1, GeodeticAuthorityFactory.class));
                     }
                     usage = new DataAccess(factory);
-                    currentDAO.set(usage);
                 }
                 assert usage.depth == 0 : usage;
             } finally {
@@ -364,6 +363,7 @@ public abstract class ConcurrentAuthorit
                     }
                 }
             }
+            currentDAO.set(usage);
         }
         /*
          * Increment below is safe even if outside the synchronized block,
@@ -380,6 +380,7 @@ public abstract class ConcurrentAuthorit
     private void release() {
         final DataAccess usage = currentDAO.get();     // A null value here would be an error
in our algorithm.
         if (--usage.depth == 0) {
+            currentDAO.remove();
             synchronized (availableDAOs) {
                 remainingDAOs++;       // Must be done first in case an exception happen
after this point.
                 usage.timestamp = System.nanoTime();

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java?rev=1722748&r1=1722747&r2=1722748&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
[UTF-8] Sun Jan  3 19:13:22 2016
@@ -1468,6 +1468,9 @@ addURIs:    for (int i=0; ; i++) {
                     }
                 }
                 returnValue = ensureSingleton(datum, returnValue, code);
+                if (result.isClosed()) {
+                    break;                  // Because of the recursive call done by createBursaWolfParameters(…).
+                }
             }
         } catch (SQLException exception) {
             throw databaseFailure(Datum.class, code, exception);

Added: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2001.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2001.java?rev=1722748&view=auto
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2001.java
(added)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2001.java
[UTF-8] Sun Jan  3 19:13:22 2016
@@ -0,0 +1,101 @@
+/*
+ * 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.util.logging.Logging;
+import org.apache.sis.internal.system.Loggers;
+
+// Test imports
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+import org.apache.sis.referencing.factory.sql.EPSGFactory;
+
+import static org.opengis.test.Assert.*;
+
+
+/**
+ * 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 than 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)
+ * @since   0.7
+ * @version 0.7
+ * @module
+ */
+@RunWith(JUnit4.class)
+public final strictfp class GIGS2001 extends org.opengis.test.referencing.gigs.GIGS2001 {
+    /**
+     * The factory instance to use for the tests, or {@code null} if not available.
+     */
+    static EPSGFactory INSTANCE;
+
+    /**
+     * The last failure message logged. Used for avoiding to repeat the same message many
times.
+     */
+    private static String failure;
+
+    /**
+     * Creates a new test using the default authority factory.
+     */
+    public GIGS2001() {
+        super(INSTANCE);
+    }
+
+    /**
+     * 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 {
+        if (INSTANCE == null) try {
+            INSTANCE = new EPSGFactory();
+        } catch (UnavailableFactoryException e) {
+            final String message = e.toString();
+            if (!message.equals(failure)) {
+                failure = message;
+                Logging.getLogger(Loggers.CRS_FACTORY).warning(message);
+            }
+            // Leave INSTANCE to null. This will have the effect of skipping tests.
+            return;
+        }
+        assertEquals("Expected no Data Access Object (DAO) before the first test is run.",
+                0, ((ConcurrentAuthorityFactory) INSTANCE).countAvailableDataAccess());
+    }
+
+    /**
+     * Force releases 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 {
+        if (INSTANCE != null) {
+            final int n = ((ConcurrentAuthorityFactory) INSTANCE).countAvailableDataAccess();
+            INSTANCE.close();
+            // Do not set INSTANCE to null, as it will be reused by other GIGS tests.
+            assertBetween("Since we ran all tests sequantially, should have no more than
1 Data Access Object (DAO).", 0, 1, n);
+        }
+    }
+}

Propchange: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2001.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2001.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Added: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2002.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2002.java?rev=1722748&view=auto
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2002.java
(added)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2002.java
[UTF-8] Sun Jan  3 19:13:22 2016
@@ -0,0 +1,69 @@
+/*
+ * 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.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+
+/**
+ * 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 than 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)
+ * @since   0.7
+ * @version 0.7
+ * @module
+ */
+@RunWith(JUnit4.class)
+public final strictfp class GIGS2002 extends org.opengis.test.referencing.gigs.GIGS2002 {
+    /**
+     * Creates a new test using the default authority factory.
+     */
+    public GIGS2002() {
+        super(GIGS2001.INSTANCE);
+    }
+
+    /**
+     * 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 {
+        GIGS2001.createFactory();
+    }
+
+    /**
+     * Force releases 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 {
+        GIGS2001.close();
+    }
+}

Propchange: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2002.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2002.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Added: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2003.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2003.java?rev=1722748&view=auto
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2003.java
(added)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2003.java
[UTF-8] Sun Jan  3 19:13:22 2016
@@ -0,0 +1,69 @@
+/*
+ * 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.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+
+/**
+ * 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 than 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)
+ * @since   0.7
+ * @version 0.7
+ * @module
+ */
+@RunWith(JUnit4.class)
+public final strictfp class GIGS2003 extends org.opengis.test.referencing.gigs.GIGS2003 {
+    /**
+     * Creates a new test using the default authority factory.
+     */
+    public GIGS2003() {
+        super(GIGS2001.INSTANCE);
+    }
+
+    /**
+     * 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 {
+        GIGS2001.createFactory();
+    }
+
+    /**
+     * Force releases 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 {
+        GIGS2001.close();
+    }
+}

Propchange: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2003.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2003.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Added: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2004.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2004.java?rev=1722748&view=auto
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2004.java
(added)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2004.java
[UTF-8] Sun Jan  3 19:13:22 2016
@@ -0,0 +1,70 @@
+/*
+ * 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.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+
+/**
+ * Tests {@link org.apache.sis.referencing.factory.sql.EPSGDataAccess#createCoordinateReferenceSystem(String)}
+ * for geodetic 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 than 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)
+ * @since   0.7
+ * @version 0.7
+ * @module
+ */
+@RunWith(JUnit4.class)
+public final strictfp class GIGS2004 extends org.opengis.test.referencing.gigs.GIGS2004 {
+    /**
+     * Creates a new test using the default authority factory.
+     */
+    public GIGS2004() {
+        super(GIGS2001.INSTANCE, GIGS2001.INSTANCE);
+    }
+
+    /**
+     * 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 {
+        GIGS2001.createFactory();
+    }
+
+    /**
+     * Force releases 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 {
+        GIGS2001.close();
+    }
+}

Propchange: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2004.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2004.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Added: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2005.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2005.java?rev=1722748&view=auto
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2005.java
(added)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2005.java
[UTF-8] Sun Jan  3 19:13:22 2016
@@ -0,0 +1,70 @@
+/*
+ * 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.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+
+/**
+ * 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 than 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)
+ * @since   0.7
+ * @version 0.7
+ * @module
+ */
+@RunWith(JUnit4.class)
+public final strictfp class GIGS2005 extends org.opengis.test.referencing.gigs.GIGS2005 {
+    /**
+     * Creates a new test using the default authority factory.
+     */
+    public GIGS2005() {
+        super(GIGS2001.INSTANCE);
+    }
+
+    /**
+     * 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 {
+        GIGS2001.createFactory();
+    }
+
+    /**
+     * Force releases 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 {
+        GIGS2001.close();
+    }
+}

Propchange: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2005.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2005.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Added: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2006.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2006.java?rev=1722748&view=auto
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2006.java
(added)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2006.java
[UTF-8] Sun Jan  3 19:13:22 2016
@@ -0,0 +1,70 @@
+/*
+ * 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.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+
+/**
+ * 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 than 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)
+ * @since   0.7
+ * @version 0.7
+ * @module
+ */
+@RunWith(JUnit4.class)
+public final strictfp class GIGS2006 extends org.opengis.test.referencing.gigs.GIGS2006 {
+    /**
+     * Creates a new test using the default authority factory.
+     */
+    public GIGS2006() {
+        super(GIGS2001.INSTANCE);
+    }
+
+    /**
+     * 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 {
+        GIGS2001.createFactory();
+    }
+
+    /**
+     * Force releases 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 {
+        GIGS2001.close();
+    }
+}

Propchange: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2006.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2006.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Added: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2007.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2007.java?rev=1722748&view=auto
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2007.java
(added)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2007.java
[UTF-8] Sun Jan  3 19:13:22 2016
@@ -0,0 +1,70 @@
+/*
+ * 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.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+
+/**
+ * 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 than 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)
+ * @since   0.7
+ * @version 0.7
+ * @module
+ */
+@RunWith(JUnit4.class)
+public final strictfp class GIGS2007 extends org.opengis.test.referencing.gigs.GIGS2007 {
+    /**
+     * Creates a new test using the default authority factory.
+     */
+    public GIGS2007() {
+        super(GIGS2001.INSTANCE);
+    }
+
+    /**
+     * 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 {
+        GIGS2001.createFactory();
+    }
+
+    /**
+     * Force releases 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 {
+        GIGS2001.close();
+    }
+}

Propchange: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2007.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2007.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Added: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2008.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2008.java?rev=1722748&view=auto
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2008.java
(added)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2008.java
[UTF-8] Sun Jan  3 19:13:22 2016
@@ -0,0 +1,70 @@
+/*
+ * 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.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+
+/**
+ * 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 than 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)
+ * @since   0.7
+ * @version 0.7
+ * @module
+ */
+@RunWith(JUnit4.class)
+public final strictfp class GIGS2008 extends org.opengis.test.referencing.gigs.GIGS2008 {
+    /**
+     * Creates a new test using the default authority factory.
+     */
+    public GIGS2008() {
+        super(GIGS2001.INSTANCE, GIGS2001.INSTANCE);
+    }
+
+    /**
+     * 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 {
+        GIGS2001.createFactory();
+    }
+
+    /**
+     * Force releases 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 {
+        GIGS2001.close();
+    }
+}

Propchange: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2008.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2008.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Added: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2009.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2009.java?rev=1722748&view=auto
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2009.java
(added)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2009.java
[UTF-8] Sun Jan  3 19:13:22 2016
@@ -0,0 +1,70 @@
+/*
+ * 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.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+
+/**
+ * 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 than 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)
+ * @since   0.7
+ * @version 0.7
+ * @module
+ */
+@RunWith(JUnit4.class)
+public final strictfp class GIGS2009 extends org.opengis.test.referencing.gigs.GIGS2009 {
+    /**
+     * Creates a new test using the default authority factory.
+     */
+    public GIGS2009() {
+        super(GIGS2001.INSTANCE);
+    }
+
+    /**
+     * 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 {
+        GIGS2001.createFactory();
+    }
+
+    /**
+     * Force releases 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 {
+        GIGS2001.close();
+    }
+}

Propchange: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2009.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2009.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java?rev=1722748&r1=1722747&r2=1722748&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
[UTF-8] Sun Jan  3 19:13:22 2016
@@ -177,6 +177,15 @@ import org.junit.BeforeClass;
     org.apache.sis.referencing.factory.CommonAuthorityFactoryTest.class,
     org.apache.sis.referencing.factory.AuthorityFactoryProxyTest.class,
     org.apache.sis.referencing.factory.IdentifiedObjectFinderTest.class,
+    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,
     org.apache.sis.referencing.factory.sql.EPSGFactoryTest.class,
 
     org.apache.sis.io.wkt.MathTransformParserTest.class,




Mime
View raw message