From 49543f609bfe0213c24d77722fa8e26c4a1a0a2e Mon Sep 17 00:00:00 2001 From: Oscar Fonts Date: Tue, 26 Jun 2012 09:03:16 +0200 Subject: [PATCH] ArcSDE and OracleNG tests to use DatastoreManager. Closes #16, closes #17. --- .../geoserver/rest/GeoserverRESTTest.java | 24 +++++++++---------- .../GSArcSDEDatastoreEncoderTest.java | 11 ++++----- .../GSOracleNGDatastoreEncoderTest.java | 9 +++---- .../GeoserverRESTDatastoreManagerTest.java | 4 ---- 4 files changed, 21 insertions(+), 27 deletions(-) diff --git a/src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTTest.java b/src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTTest.java index 82b9b7c..fbd030d 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTTest.java +++ b/src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTTest.java @@ -65,9 +65,10 @@ public abstract class GeoserverRESTTest extends TestCase { public static final String RESTUSER; public static final String RESTPW; - public static final URL URL; - public static final GeoServerRESTReader reader; - public static final GeoServerRESTPublisher publisher; + public static URL URL; + public static GeoServerRESTManager manager; + public static GeoServerRESTReader reader; + public static GeoServerRESTPublisher publisher; private static boolean enabled = false; private static Boolean existgs = null; @@ -82,15 +83,14 @@ public abstract class GeoserverRESTTest extends TestCase { if( ! enabled ) LOGGER.warn("Tests are disabled. Please read the documentation to enable them."); - URL lurl = null; - try { - lurl = new URL(RESTURL); - } catch (MalformedURLException ex) { + try { + URL = new URL(RESTURL); + manager = new GeoServerRESTManager(URL, RESTUSER, RESTPW); + reader = manager.getReader(); + publisher = manager.getPublisher(); + } catch (MalformedURLException e) { + e.printStackTrace(); } - - URL = lurl; - reader = new GeoServerRESTReader(lurl, RESTUSER, RESTPW); - publisher = new GeoServerRESTPublisher(RESTURL, RESTUSER, RESTPW); } private static String getenv(String envName, String envDefault) { @@ -205,7 +205,7 @@ public abstract class GeoserverRESTTest extends TestCase { List stores = reader.getDatastores(workspace).getNames(); for (String storename : stores) { - RESTDataStore store = reader.getDatastore(workspace, storename); +// RESTDataStore store = reader.getDatastore(workspace, storename); // if(store.getType() == RESTDataStore.DBType.POSTGIS) { // LOGGER.info("Skipping PG datastore " + store.getWorkspaceName()+":"+store.getName()); diff --git a/src/test/java/it/geosolutions/geoserver/rest/datastore/GSArcSDEDatastoreEncoderTest.java b/src/test/java/it/geosolutions/geoserver/rest/datastore/GSArcSDEDatastoreEncoderTest.java index 2d3d456..dbeaf99 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/datastore/GSArcSDEDatastoreEncoderTest.java +++ b/src/test/java/it/geosolutions/geoserver/rest/datastore/GSArcSDEDatastoreEncoderTest.java @@ -89,9 +89,6 @@ public class GSArcSDEDatastoreEncoderTest extends GeoserverRESTTest { String datastoreName = "resttestarcsde"; String description = "description"; String dsNamespace = "http://www.geo-solutions.it"; - boolean exposePrimaryKeys = true; - boolean validateConnections = false; - String primaryKeyMetadataTable = "test"; GSArcSDEDatastoreEncoder datastoreEncoder = new GSArcSDEDatastoreEncoder(datastoreName, pgServer, pgUser); datastoreEncoder.setDescription(description); @@ -103,7 +100,7 @@ public class GSArcSDEDatastoreEncoderTest extends GeoserverRESTTest { assertTrue(publisher.createWorkspace(wsName)); // creation test - boolean created = publisher.createDatastore(wsName, datastoreEncoder); + boolean created = manager.getDatastoreManager().create(wsName, datastoreEncoder); if( ! pgIgnore ) assertTrue("arcsde datastore not created", created); @@ -112,16 +109,16 @@ public class GSArcSDEDatastoreEncoderTest extends GeoserverRESTTest { RESTDataStore datastore = reader.getDatastore(wsName, datastoreName); - LOGGER.info("The type of the created datastore is: " + datastore.getType()); + LOGGER.info("The type of the created datastore is: " + datastore.getStoreType()); // removing test - boolean removed = publisher.removeDatastore(wsName, datastoreName); + boolean removed = publisher.removeDatastore(wsName, datastoreName, true); if( ! pgIgnore ) assertTrue("arcsde datastore not removed", removed); else if( ! removed ) LOGGER.error("*** Datastore " + datastoreName + " has not been removed."); - assertTrue(publisher.removeWorkspace(wsName)); + assertTrue(publisher.removeWorkspace(wsName, false)); } } diff --git a/src/test/java/it/geosolutions/geoserver/rest/datastore/GSOracleNGDatastoreEncoderTest.java b/src/test/java/it/geosolutions/geoserver/rest/datastore/GSOracleNGDatastoreEncoderTest.java index 2edb9f9..e8d7e86 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/datastore/GSOracleNGDatastoreEncoderTest.java +++ b/src/test/java/it/geosolutions/geoserver/rest/datastore/GSOracleNGDatastoreEncoderTest.java @@ -110,7 +110,8 @@ public class GSOracleNGDatastoreEncoderTest extends GeoserverRESTTest { assertTrue(publisher.createWorkspace(wsName)); // creation test - boolean created = publisher.createDatastore(wsName, datastoreEncoder); + + boolean created = manager.getDatastoreManager().create(wsName, datastoreEncoder); if( ! pgIgnore ) assertTrue("OracleNG datastore not created", created); @@ -119,15 +120,15 @@ public class GSOracleNGDatastoreEncoderTest extends GeoserverRESTTest { RESTDataStore datastore = reader.getDatastore(wsName, datastoreName); - LOGGER.info("The type of the created datastore is: " + datastore.getType()); + LOGGER.info("The type of the created datastore is: " + datastore.getStoreType()); // removing test - boolean removed = publisher.removeDatastore(wsName, datastoreName); + boolean removed = publisher.removeDatastore(wsName, datastoreName, true); if( ! pgIgnore ) assertTrue("OracleNG datastore not removed", removed); else if( ! removed ) LOGGER.error("*** Datastore " + datastoreName + " has not been removed."); - assertTrue(publisher.removeWorkspace(wsName)); + assertTrue(publisher.removeWorkspace(wsName, false)); } } diff --git a/src/test/java/it/geosolutions/geoserver/rest/manager/GeoserverRESTDatastoreManagerTest.java b/src/test/java/it/geosolutions/geoserver/rest/manager/GeoserverRESTDatastoreManagerTest.java index 98af5f6..5d296cd 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/manager/GeoserverRESTDatastoreManagerTest.java +++ b/src/test/java/it/geosolutions/geoserver/rest/manager/GeoserverRESTDatastoreManagerTest.java @@ -30,7 +30,6 @@ import java.net.URL; import java.nio.charset.Charset; import java.util.Map; -import it.geosolutions.geoserver.rest.GeoServerRESTManager; import it.geosolutions.geoserver.rest.GeoserverRESTTest; import it.geosolutions.geoserver.rest.decoder.RESTDataStore; import it.geosolutions.geoserver.rest.encoder.datastore.GSAbstractDatastoreEncoder; @@ -65,8 +64,6 @@ import it.geosolutions.geoserver.rest.encoder.datastore.GSDirectoryOfShapefilesD */ public class GeoserverRESTDatastoreManagerTest extends GeoserverRESTTest { - public final GeoServerRESTManager manager; - private static final String WS_NAME = DEFAULT_WS; private static final String DS_NAME = "testCreateDatastore"; private static final String DS_DESCRIPTION = "A description"; @@ -75,7 +72,6 @@ public class GeoserverRESTDatastoreManagerTest extends GeoserverRESTTest { public GeoserverRESTDatastoreManagerTest(String testName) throws Exception { super(testName); - manager = new GeoServerRESTManager(new URL(RESTURL), RESTUSER, RESTPW); LOCATION_1 = new URL("file:data/1"); LOCATION_2 = new URL("file:data/2");