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

Add unit testing for layer retrieval by workspace

Browse Source
This commit is contained in:
Louis JOHANET 2019-08-20 16:29:08 +02:00
parent 3846a6c1f5
commit 8fdeea788d
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/it/geosolutions/geoserver/rest/decoder/about/GSVersionDecoder.java
View File

@ -154,6 +154,7 @@ public class GSVersionDecoder extends XmlElement {
v26(26, "2\\.6([^0-9]|$).*"), v26(26, "2\\.6([^0-9]|$).*"),
v27(27, "2\\.7([^0-9]|$).*"), v27(27, "2\\.7([^0-9]|$).*"),
v28(28, "2\\.8([^0-9]|$).*"), v28(28, "2\\.8([^0-9]|$).*"),
v213(213, "2\\.13([^0-9]|$).*"),
ABOVE(9999, "2\\..+"), ABOVE(9999, "2\\..+"),
UNRECOGNIZED(-1, null); UNRECOGNIZED(-1, null);

29
src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTReaderTest.java
View File

@ -30,14 +30,16 @@ import it.geosolutions.geoserver.rest.decoder.RESTDataStoreList;
import it.geosolutions.geoserver.rest.decoder.RESTLayerList; import it.geosolutions.geoserver.rest.decoder.RESTLayerList;
import it.geosolutions.geoserver.rest.decoder.RESTNamespaceList; import it.geosolutions.geoserver.rest.decoder.RESTNamespaceList;
import it.geosolutions.geoserver.rest.decoder.RESTWorkspaceList; import it.geosolutions.geoserver.rest.decoder.RESTWorkspaceList;
import it.geosolutions.geoserver.rest.decoder.about.GSVersionDecoder;
import it.geosolutions.geoserver.rest.decoder.utils.NameLinkElem; import it.geosolutions.geoserver.rest.decoder.utils.NameLinkElem;
import java.io.File;
import java.io.IOException;
import java.util.List; import java.util.List;
import org.junit.Test; import org.junit.Test;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.core.io.ClassPathResource;
import static org.junit.Assert.*; import static org.junit.Assert.*;
@ -48,7 +50,6 @@ import static org.junit.Assert.*;
public class GeoserverRESTReaderTest extends GeoserverRESTTest { public class GeoserverRESTReaderTest extends GeoserverRESTTest {
private final static Logger LOGGER = LoggerFactory.getLogger(GeoserverRESTReaderTest.class); private final static Logger LOGGER = LoggerFactory.getLogger(GeoserverRESTReaderTest.class);
/** /**
* Test of getLayers method, of class GeoServerRESTReader. * Test of getLayers method, of class GeoServerRESTReader.
*/ */
@ -73,6 +74,28 @@ public class GeoserverRESTReaderTest extends GeoserverRESTTest {
LOGGER.debug(""); LOGGER.debug("");
} }
/**
* Test of getLayers method with a given workspace, of class GeoServerRESTReader.
* Requires Geoserver > 2.13
* @throws IOException
*/
@Test
public void testGetLayersWithWorkspace() throws IOException {
if(!enabled()) return;
// Skip the test if Geoserver < 2.13
if(GSVersionDecoder.VERSION.v213.compareTo(GSVersionDecoder.VERSION.getVersion(GS_VERSION)) > 0) {
return;
}
deleteAllWorkspacesRecursively();
assertTrue(publisher.createWorkspace(DEFAULT_WS));
File zipFile = new ClassPathResource("testdata/resttestshp.zip").getFile();
// test insert
assertTrue(publisher.publishShp(DEFAULT_WS, "resttestshp", "cities", zipFile));
assertTrue(reader.getLayers(DEFAULT_WS).size() == 1);
LOGGER.debug("");
}
/** /**
* Test of getDatastores method, of class GeoServerRESTReader. * Test of getDatastores method, of class GeoServerRESTReader.
*/ */