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

#106 master - fix tests to use GSVersionEncoder

Browse Source
This commit is contained in:
eblondel 2013-10-19 02:21:34 +02:00
parent a277d44e15
commit 80b1767cd1
1 changed files with 58 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/test/java/it/geosolutions/geoserver/rest/encoder/feature/GSFeatureEncoderTest.java
View File

@ -23,6 +23,7 @@ import it.geosolutions.geoserver.rest.GeoServerRESTPublisher;
import it.geosolutions.geoserver.rest.GeoserverRESTTest; import it.geosolutions.geoserver.rest.GeoserverRESTTest;
import it.geosolutions.geoserver.rest.decoder.RESTLayer; import it.geosolutions.geoserver.rest.decoder.RESTLayer;
import it.geosolutions.geoserver.rest.decoder.RESTResource; import it.geosolutions.geoserver.rest.decoder.RESTResource;
import it.geosolutions.geoserver.rest.decoder.about.GSVersionDecoder;
import it.geosolutions.geoserver.rest.encoder.GSLayerEncoder; import it.geosolutions.geoserver.rest.encoder.GSLayerEncoder;
import it.geosolutions.geoserver.rest.encoder.GSLayerEncoder21; import it.geosolutions.geoserver.rest.encoder.GSLayerEncoder21;
import it.geosolutions.geoserver.rest.encoder.GSResourceEncoder; import it.geosolutions.geoserver.rest.encoder.GSResourceEncoder;
@ -91,7 +92,9 @@ public class GSFeatureEncoderTest extends GeoserverRESTTest {
fte.addMetadataLinkInfo(metadatalink); fte.addMetadataLinkInfo(metadatalink);
GSLayerEncoder layerEncoder = null; GSLayerEncoder layerEncoder = null;
if(GeoserverRESTTest.VERSION != null){ if (!GSVersionDecoder.VERSION.getVersion(VERSION).equals(
GSVersionDecoder.VERSION.UNRECOGNIZED)) {
layerEncoder = new GSLayerEncoder();
layerEncoder = new GSLayerEncoder(); layerEncoder = new GSLayerEncoder();
layerEncoder.setEnabled(true); layerEncoder.setEnabled(true);
layerEncoder.setQueryable(true); layerEncoder.setQueryable(true);
@ -111,18 +114,19 @@ public class GSFeatureEncoderTest extends GeoserverRESTTest {
"authority1", "identifier1"); "authority1", "identifier1");
layerEncoder.addIdentifier(identifier); layerEncoder.addIdentifier(identifier);
publisher.createWorkspace(DEFAULT_WS); publisher.createWorkspace(DEFAULT_WS);
File zipFile = new ClassPathResource("testdata/resttestshp.zip").getFile(); File zipFile = new ClassPathResource("testdata/resttestshp.zip")
.getFile();
// test insert // test insert
boolean published = publisher.publishShp(DEFAULT_WS, storeName, layerName, zipFile); boolean published = publisher.publishShp(DEFAULT_WS, storeName,
layerName, zipFile);
assertTrue("publish() failed", published); assertTrue("publish() failed", published);
assertTrue(existsLayer(layerName)); assertTrue(existsLayer(layerName));
publisher.publishStyle(new File(new ClassPathResource("testdata").getFile(), publisher.publishStyle(new File(new ClassPathResource("testdata")
"default_point.sld")); .getFile(), "default_point.sld"));
// optionally select the attributes to publish // optionally select the attributes to publish
RESTLayer layer = reader.getLayer(layerName); RESTLayer layer = reader.getLayer(layerName);
@ -133,7 +137,8 @@ public class GSFeatureEncoderTest extends GeoserverRESTTest {
fte.setAttribute(enc); fte.setAttribute(enc);
} }
assertTrue(publisher.publishDBLayer(DEFAULT_WS, storeName, fte, layerEncoder)); assertTrue(publisher.publishDBLayer(DEFAULT_WS, storeName, fte,
layerEncoder));
} }
} }
@ -167,7 +172,8 @@ public class GSFeatureEncoderTest extends GeoserverRESTTest {
//use of GSLayerEncoder for GS 2.1 & before //use of GSLayerEncoder for GS 2.1 & before
GSLayerEncoder21 layerEncoder = null; GSLayerEncoder21 layerEncoder = null;
if(GeoserverRESTTest.VERSION == null){ if (GSVersionDecoder.VERSION.getVersion(VERSION).equals(
GSVersionDecoder.VERSION.UNRECOGNIZED)) {
layerEncoder = new GSLayerEncoder21(); layerEncoder = new GSLayerEncoder21();
layerEncoder.setEnabled(true); layerEncoder.setEnabled(true);
layerEncoder.setQueryable(true); layerEncoder.setQueryable(true);
@ -194,7 +200,8 @@ public class GSFeatureEncoderTest extends GeoserverRESTTest {
layerEncoder.addIdentifier(identifier2); layerEncoder.addIdentifier(identifier2);
publisher.createWorkspace(DEFAULT_WS); publisher.createWorkspace(DEFAULT_WS);
assertTrue(publisher.publishDBLayer(DEFAULT_WS, storeName, fte, layerEncoder)); assertTrue(publisher.publishDBLayer(DEFAULT_WS, storeName, fte,
layerEncoder));
} }
} }