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

#102 - make tests based on GeoserverRESTTest VERSION

Browse Source
This commit is contained in:
eblondel 2013-10-18 17:52:47 +02:00
parent 5d820f5d43
commit a277d44e15
1 changed files with 70 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,7 +90,9 @@ public class GSFeatureEncoderTest extends GeoserverRESTTest {
"http://www.organization.org/metadata1"); "http://www.organization.org/metadata1");
fte.addMetadataLinkInfo(metadatalink); fte.addMetadataLinkInfo(metadatalink);
GSLayerEncoder layerEncoder = new GSLayerEncoder(); GSLayerEncoder layerEncoder = null;
if(GeoserverRESTTest.VERSION != null){
layerEncoder = new GSLayerEncoder();
layerEncoder.setEnabled(true); layerEncoder.setEnabled(true);
layerEncoder.setQueryable(true); layerEncoder.setQueryable(true);
layerEncoder.setAdvertised(true); layerEncoder.setAdvertised(true);
@ -134,9 +136,11 @@ public class GSFeatureEncoderTest extends GeoserverRESTTest {
assertTrue(publisher.publishDBLayer(DEFAULT_WS, storeName, fte, layerEncoder)); assertTrue(publisher.publishDBLayer(DEFAULT_WS, storeName, fte, layerEncoder));
} }
}
@Test @Test
public void testIntegration_21() throws IOException { public void testIntegration1() throws IOException {
if (!enabled()) if (!enabled())
return; return;
@ -161,8 +165,10 @@ public class GSFeatureEncoderTest extends GeoserverRESTTest {
"http://www.organization.org/metadata1"); "http://www.organization.org/metadata1");
fte.addMetadataLinkInfo(metadatalink); fte.addMetadataLinkInfo(metadatalink);
//use of GSLayerEncoder specific to GS 2.1 //use of GSLayerEncoder for GS 2.1 & before
GSLayerEncoder21 layerEncoder = new GSLayerEncoder21(); GSLayerEncoder21 layerEncoder = null;
if(GeoserverRESTTest.VERSION == null){
layerEncoder = new GSLayerEncoder21();
layerEncoder.setEnabled(true); layerEncoder.setEnabled(true);
layerEncoder.setQueryable(true); layerEncoder.setQueryable(true);
layerEncoder.setAdvertised(true); layerEncoder.setAdvertised(true);
@ -190,6 +196,7 @@ public class GSFeatureEncoderTest extends GeoserverRESTTest {
publisher.createWorkspace(DEFAULT_WS); publisher.createWorkspace(DEFAULT_WS);
assertTrue(publisher.publishDBLayer(DEFAULT_WS, storeName, fte, layerEncoder)); assertTrue(publisher.publishDBLayer(DEFAULT_WS, storeName, fte, layerEncoder));
} }
}
@Test @Test