- * A shared fixture should be used with caution in order to avoid undesirable - * test interactions. In general, it should be populated with "read-only" - * objects that are not modified during the test run.
- * - */ -public class TestRunListener implements IExecutionListener { - - private static final String DATA_SOURCE = "jdbc/EPSG"; - - /** - * Looks up the DataSourcejdbc/EPSG (EPSG geodetic
- * parameters).
- */
- @Override
- public void onExecutionStart() {
- lookupDataSource(DATA_SOURCE);
- }
-
- @Override
- public void onExecutionFinish() {
- }
-
- /**
- * Looks for a JNDI DataSource that provides access to a database containing
- * the official EPSG geodetic parameters. If it is found, it is set as a
- * {@link org.geotoolkit.factory.Hints#EPSG_DATA_SOURCE hint} when
- * initializing the EPSG factory. An embedded database will be created if
- * necessary.
- *
- * @param dsName The name of the data source.
- */
- void lookupDataSource(String dsName) {
- DataSource epsgDataSource = null;
- try {
- Context initContext = new InitialContext();
- Context envContext = (Context) initContext.lookup("java:/comp/env");
- epsgDataSource = (DataSource) envContext.lookup(dsName);
- } catch (NamingException nx) {
- TestSuiteLogger.log(Level.CONFIG, String.format(
- "JNDI DataSource %s not found. An embedded database will be created if necessary.",
- dsName, nx.getMessage()));
- }
- if (null != epsgDataSource) {
- try (Connection conn = epsgDataSource.getConnection()) {
- EpsgInstaller dbInstaller = new EpsgInstaller();
- dbInstaller.setDatabase(conn);
- if (!dbInstaller.exists()) {
- dbInstaller.call();
- }
- } catch (SQLException | FactoryException e) {
- TestSuiteLogger.log(Level.CONFIG, String.format(
- "Failed to access DataSource %s .\n %s",
- dsName, e.getMessage()));
- }
- Hints.putSystemDefault(Hints.EPSG_DATA_SOURCE, epsgDataSource);
- }
- }
-}
diff --git a/src/main/java/org/opengis/cite/cat30/basic/BasicSearchTests.java b/src/main/java/org/opengis/cite/cat30/basic/BasicSearchTests.java
index 9c5dfbc..ac2276c 100644
--- a/src/main/java/org/opengis/cite/cat30/basic/BasicSearchTests.java
+++ b/src/main/java/org/opengis/cite/cat30/basic/BasicSearchTests.java
@@ -15,9 +15,9 @@
import net.sf.saxon.s9api.SaxonApiException;
import net.sf.saxon.s9api.XdmItem;
import net.sf.saxon.s9api.XdmValue;
-import org.geotoolkit.geometry.Envelopes;
-import org.geotoolkit.geometry.GeneralEnvelope;
-import org.geotoolkit.referencing.crs.DefaultGeographicCRS;
+import org.apache.sis.geometry.Envelopes;
+import org.apache.sis.geometry.GeneralEnvelope;
+import org.apache.sis.referencing.CommonCRS;
import org.opengis.cite.cat30.CAT3;
import org.opengis.cite.cat30.CommonFixture;
import org.opengis.cite.cat30.ETSAssert;
@@ -236,9 +236,9 @@ public void getSummaryRecordsByWGS84BBOX() {
Envelope bbox = this.geoExtent;
try {
if (!bbox.getCoordinateReferenceSystem().equals(
- DefaultGeographicCRS.WGS84)) {
+ CommonCRS.WGS84.normalizedGeographic())) {
bbox = new GeneralEnvelope(Envelopes.transform(bbox,
- DefaultGeographicCRS.WGS84));
+ CommonCRS.WGS84.normalizedGeographic()));
}
} catch (TransformException ex) {
throw new RuntimeException("Failed to create WGS84 envelope.", ex);
@@ -516,9 +516,9 @@ public void getRecordsByBBOXAndTitle() {
Envelope bbox = this.geoExtent;
try {
if (!bbox.getCoordinateReferenceSystem().equals(
- DefaultGeographicCRS.WGS84)) {
+ CommonCRS.WGS84.normalizedGeographic())) {
bbox = new GeneralEnvelope(Envelopes.transform(bbox,
- DefaultGeographicCRS.WGS84));
+ CommonCRS.WGS84.normalizedGeographic()));
}
} catch (TransformException ex) {
throw new RuntimeException("Failed to create WGS84 envelope.", ex);
diff --git a/src/main/java/org/opengis/cite/cat30/opensearch/OpenSearchGeoTests.java b/src/main/java/org/opengis/cite/cat30/opensearch/OpenSearchGeoTests.java
index a6cbe6c..fe758f9 100644
--- a/src/main/java/org/opengis/cite/cat30/opensearch/OpenSearchGeoTests.java
+++ b/src/main/java/org/opengis/cite/cat30/opensearch/OpenSearchGeoTests.java
@@ -14,9 +14,9 @@
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
-import org.geotoolkit.geometry.Envelopes;
-import org.geotoolkit.geometry.GeneralEnvelope;
-import org.geotoolkit.referencing.crs.DefaultGeographicCRS;
+import org.apache.sis.geometry.Envelopes;
+import org.apache.sis.geometry.GeneralEnvelope;
+import org.apache.sis.referencing.CommonCRS;
import org.opengis.cite.cat30.CAT3;
import org.opengis.cite.cat30.CommonFixture;
import org.opengis.cite.cat30.ETSAssert;
@@ -254,9 +254,9 @@ public void boundingBoxQuery() {
Envelope bbox = this.geoExtent;
try {
if (!bbox.getCoordinateReferenceSystem().equals(
- DefaultGeographicCRS.WGS84)) {
+ CommonCRS.WGS84.normalizedGeographic())) {
bbox = new GeneralEnvelope(Envelopes.transform(bbox,
- DefaultGeographicCRS.WGS84));
+ CommonCRS.WGS84.normalizedGeographic()));
}
} catch (TransformException ex) {
throw new AssertionError("Failed to create CRS84 box from envelope in source CRS: "
diff --git a/src/main/java/org/opengis/cite/cat30/util/SpatialUtils.java b/src/main/java/org/opengis/cite/cat30/util/SpatialUtils.java
index f4ca617..47fddf5 100644
--- a/src/main/java/org/opengis/cite/cat30/util/SpatialUtils.java
+++ b/src/main/java/org/opengis/cite/cat30/util/SpatialUtils.java
@@ -5,12 +5,11 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import org.geotoolkit.geometry.GeneralEnvelope;
-import org.geotoolkit.referencing.CRS;
+import org.apache.sis.geometry.GeneralEnvelope;
+import org.apache.sis.referencing.CommonCRS;
import org.opengis.cite.cat30.Namespaces;
import org.opengis.geometry.Envelope;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.util.FactoryException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -36,12 +35,7 @@ public static Envelope envelopeFromSimpleGeoRSSBox(Node boxNode) {
if (!boxNode.getNamespaceURI().equals(Namespaces.GEORSS)) {
throw new IllegalArgumentException("Not a GeoRSS element.");
}
- CoordinateReferenceSystem crs = null;
- try {
- crs = CRS.decode("EPSG:4326");
- } catch (FactoryException ex) {
- TestSuiteLogger.log(Level.WARNING, "Failed to create CRS: EPSG 4326", ex);
- }
+ CoordinateReferenceSystem crs = CommonCRS.WGS84.geographic();
GeneralEnvelope env = new GeneralEnvelope(crs);
String[] coords = boxNode.getTextContent().trim().split("\\s+");
if (coords.length != 4) {
diff --git a/src/main/resources/org/opengis/cite/cat30/testng.xml b/src/main/resources/org/opengis/cite/cat30/testng.xml
index 5a13883..bbe9a14 100644
--- a/src/main/resources/org/opengis/cite/cat30/testng.xml
+++ b/src/main/resources/org/opengis/cite/cat30/testng.xml
@@ -4,7 +4,6 @@