Github/geoserver-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ArcSDE and OracleNG tests to use DatastoreManager. Closes #16, closes #17.

Browse Source
This commit is contained in:
Oscar Fonts 2012-06-26 09:03:16 +02:00
parent 6120344954
commit 49543f609b
4 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTTest.java
View File

@ -65,9 +65,10 @@ public abstract class GeoserverRESTTest extends TestCase {
public static final String RESTUSER; public static final String RESTUSER;
public static final String RESTPW; public static final String RESTPW;
public static final URL URL; public static URL URL;
public static final GeoServerRESTReader reader; public static GeoServerRESTManager manager;
public static final GeoServerRESTPublisher publisher; public static GeoServerRESTReader reader;
public static GeoServerRESTPublisher publisher;
private static boolean enabled = false; private static boolean enabled = false;
private static Boolean existgs = null; private static Boolean existgs = null;
@ -82,15 +83,14 @@ public abstract class GeoserverRESTTest extends TestCase {
if( ! enabled ) if( ! enabled )
LOGGER.warn("Tests are disabled. Please read the documentation to enable them."); LOGGER.warn("Tests are disabled. Please read the documentation to enable them.");
URL lurl = null;
try { try {
lurl = new URL(RESTURL); URL = new URL(RESTURL);
} catch (MalformedURLException ex) { 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) { private static String getenv(String envName, String envDefault) {
@ -205,7 +205,7 @@ public abstract class GeoserverRESTTest extends TestCase {
List<String> stores = reader.getDatastores(workspace).getNames(); List<String> stores = reader.getDatastores(workspace).getNames();
for (String storename : stores) { for (String storename : stores) {
RESTDataStore store = reader.getDatastore(workspace, storename); // RESTDataStore store = reader.getDatastore(workspace, storename);
// if(store.getType() == RESTDataStore.DBType.POSTGIS) { // if(store.getType() == RESTDataStore.DBType.POSTGIS) {
// LOGGER.info("Skipping PG datastore " + store.getWorkspaceName()+":"+store.getName()); // LOGGER.info("Skipping PG datastore " + store.getWorkspaceName()+":"+store.getName());

11
src/test/java/it/geosolutions/geoserver/rest/datastore/GSArcSDEDatastoreEncoderTest.java
View File

@ -89,9 +89,6 @@ public class GSArcSDEDatastoreEncoderTest extends GeoserverRESTTest {
String datastoreName = "resttestarcsde"; String datastoreName = "resttestarcsde";
String description = "description"; String description = "description";
String dsNamespace = "http://www.geo-solutions.it"; String dsNamespace = "http://www.geo-solutions.it";
boolean exposePrimaryKeys = true;
boolean validateConnections = false;
String primaryKeyMetadataTable = "test";
GSArcSDEDatastoreEncoder datastoreEncoder = new GSArcSDEDatastoreEncoder(datastoreName, pgServer, pgUser); GSArcSDEDatastoreEncoder datastoreEncoder = new GSArcSDEDatastoreEncoder(datastoreName, pgServer, pgUser);
datastoreEncoder.setDescription(description); datastoreEncoder.setDescription(description);
@ -103,7 +100,7 @@ public class GSArcSDEDatastoreEncoderTest extends GeoserverRESTTest {
assertTrue(publisher.createWorkspace(wsName)); assertTrue(publisher.createWorkspace(wsName));
// creation test // creation test
boolean created = publisher.createDatastore(wsName, datastoreEncoder); boolean created = manager.getDatastoreManager().create(wsName, datastoreEncoder);
if( ! pgIgnore ) if( ! pgIgnore )
assertTrue("arcsde datastore not created", created); assertTrue("arcsde datastore not created", created);
@ -112,16 +109,16 @@ public class GSArcSDEDatastoreEncoderTest extends GeoserverRESTTest {
RESTDataStore datastore = reader.getDatastore(wsName, datastoreName); 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 // removing test
boolean removed = publisher.removeDatastore(wsName, datastoreName); boolean removed = publisher.removeDatastore(wsName, datastoreName, true);
if( ! pgIgnore ) if( ! pgIgnore )
assertTrue("arcsde datastore not removed", removed); assertTrue("arcsde datastore not removed", removed);
else if( ! removed ) else if( ! removed )
LOGGER.error("*** Datastore " + datastoreName + " has not been removed."); LOGGER.error("*** Datastore " + datastoreName + " has not been removed.");
assertTrue(publisher.removeWorkspace(wsName)); assertTrue(publisher.removeWorkspace(wsName, false));
} }
} }

9
src/test/java/it/geosolutions/geoserver/rest/datastore/GSOracleNGDatastoreEncoderTest.java
View File

@ -110,7 +110,8 @@ public class GSOracleNGDatastoreEncoderTest extends GeoserverRESTTest {
assertTrue(publisher.createWorkspace(wsName)); assertTrue(publisher.createWorkspace(wsName));
// creation test // creation test
boolean created = publisher.createDatastore(wsName, datastoreEncoder);
boolean created = manager.getDatastoreManager().create(wsName, datastoreEncoder);
if( ! pgIgnore ) if( ! pgIgnore )
assertTrue("OracleNG datastore not created", created); assertTrue("OracleNG datastore not created", created);
@ -119,15 +120,15 @@ public class GSOracleNGDatastoreEncoderTest extends GeoserverRESTTest {
RESTDataStore datastore = reader.getDatastore(wsName, datastoreName); 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 // removing test
boolean removed = publisher.removeDatastore(wsName, datastoreName); boolean removed = publisher.removeDatastore(wsName, datastoreName, true);
if( ! pgIgnore ) if( ! pgIgnore )
assertTrue("OracleNG datastore not removed", removed); assertTrue("OracleNG datastore not removed", removed);
else if( ! removed ) else if( ! removed )
LOGGER.error("*** Datastore " + datastoreName + " has not been removed."); LOGGER.error("*** Datastore " + datastoreName + " has not been removed.");
assertTrue(publisher.removeWorkspace(wsName)); assertTrue(publisher.removeWorkspace(wsName, false));
} }
} }

4
src/test/java/it/geosolutions/geoserver/rest/manager/GeoserverRESTDatastoreManagerTest.java
View File

@ -30,7 +30,6 @@ import java.net.URL;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.util.Map; import java.util.Map;
import it.geosolutions.geoserver.rest.GeoServerRESTManager;
import it.geosolutions.geoserver.rest.GeoserverRESTTest; import it.geosolutions.geoserver.rest.GeoserverRESTTest;
import it.geosolutions.geoserver.rest.decoder.RESTDataStore; import it.geosolutions.geoserver.rest.decoder.RESTDataStore;
import it.geosolutions.geoserver.rest.encoder.datastore.GSAbstractDatastoreEncoder; 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 class GeoserverRESTDatastoreManagerTest extends GeoserverRESTTest {
public final GeoServerRESTManager manager;
private static final String WS_NAME = DEFAULT_WS; private static final String WS_NAME = DEFAULT_WS;
private static final String DS_NAME = "testCreateDatastore"; private static final String DS_NAME = "testCreateDatastore";
private static final String DS_DESCRIPTION = "A description"; private static final String DS_DESCRIPTION = "A description";
@ -75,7 +72,6 @@ public class GeoserverRESTDatastoreManagerTest extends GeoserverRESTTest {
public GeoserverRESTDatastoreManagerTest(String testName) throws Exception { public GeoserverRESTDatastoreManagerTest(String testName) throws Exception {
super(testName); super(testName);
manager = new GeoServerRESTManager(new URL(RESTURL), RESTUSER, RESTPW);
LOCATION_1 = new URL("file:data/1"); LOCATION_1 = new URL("file:data/1");
LOCATION_2 = new URL("file:data/2"); LOCATION_2 = new URL("file:data/2");