#102 - make tests based on GeoserverRESTTest VERSION

This commit is contained in:
eblondel 2013-10-18 17:52:47 +02:00
parent 5d820f5d43
commit a277d44e15

View File

@ -90,53 +90,57 @@ 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;
layerEncoder.setEnabled(true); if(GeoserverRESTTest.VERSION != null){
layerEncoder.setQueryable(true); layerEncoder = new GSLayerEncoder();
layerEncoder.setAdvertised(true); layerEncoder.setEnabled(true);
layerEncoder.setQueryable(true);
layerEncoder.setAdvertised(true);
layerEncoder.setDefaultStyle("point"); layerEncoder.setDefaultStyle("point");
layerEncoder.addStyle("point2"); layerEncoder.addStyle("point2");
layerEncoder.addStyle("point3"); layerEncoder.addStyle("point3");
// authorityURL // authorityURL
GSAuthorityURLInfoEncoder authorityURL = new GSAuthorityURLInfoEncoder( GSAuthorityURLInfoEncoder authorityURL = new GSAuthorityURLInfoEncoder(
"authority1", "http://www.authority1.org"); "authority1", "http://www.authority1.org");
layerEncoder.addAuthorityURL(authorityURL); layerEncoder.addAuthorityURL(authorityURL);
// identifier // identifier
GSIdentifierInfoEncoder identifier = new GSIdentifierInfoEncoder( GSIdentifierInfoEncoder identifier = new GSIdentifierInfoEncoder(
"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").getFile(),
"default_point.sld")); "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);
RESTResource resource = reader.getResource(layer); RESTResource resource = reader.getResource(layer);
List<GSAttributeEncoder> attrs = resource.getEncodedAttributeList(); List<GSAttributeEncoder> attrs = resource.getEncodedAttributeList();
assertNotNull(attrs); assertNotNull(attrs);
for (GSAttributeEncoder enc : attrs) { for (GSAttributeEncoder enc : attrs) {
fte.setAttribute(enc); fte.setAttribute(enc);
}
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,34 +165,37 @@ 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;
layerEncoder.setEnabled(true); if(GeoserverRESTTest.VERSION == null){
layerEncoder.setQueryable(true); layerEncoder = new GSLayerEncoder21();
layerEncoder.setAdvertised(true); layerEncoder.setEnabled(true);
layerEncoder.setQueryable(true);
layerEncoder.setDefaultStyle("point"); layerEncoder.setAdvertised(true);
layerEncoder.addStyle("point2");
layerEncoder.addStyle("point3"); layerEncoder.setDefaultStyle("point");
layerEncoder.addStyle("point2");
// authorityURL layerEncoder.addStyle("point3");
GSAuthorityURLInfoEncoder authorityURL = new GSAuthorityURLInfoEncoder(
"authority1", "http://www.authority1.org"); // authorityURL
GSAuthorityURLInfoEncoder authorityURL2 = new GSAuthorityURLInfoEncoder( GSAuthorityURLInfoEncoder authorityURL = new GSAuthorityURLInfoEncoder(
"authority2", "http://www.authority2.org"); "authority1", "http://www.authority1.org");
layerEncoder.addAuthorityURL(authorityURL); GSAuthorityURLInfoEncoder authorityURL2 = new GSAuthorityURLInfoEncoder(
layerEncoder.addAuthorityURL(authorityURL2); "authority2", "http://www.authority2.org");
layerEncoder.addAuthorityURL(authorityURL);
// identifier layerEncoder.addAuthorityURL(authorityURL2);
GSIdentifierInfoEncoder identifier = new GSIdentifierInfoEncoder(
"authority1", "identifier1"); // identifier
GSIdentifierInfoEncoder identifier2 = new GSIdentifierInfoEncoder( GSIdentifierInfoEncoder identifier = new GSIdentifierInfoEncoder(
"authority2", "identifier2"); "authority1", "identifier1");
layerEncoder.addIdentifier(identifier); GSIdentifierInfoEncoder identifier2 = new GSIdentifierInfoEncoder(
layerEncoder.addIdentifier(identifier2); "authority2", "identifier2");
layerEncoder.addIdentifier(identifier);
publisher.createWorkspace(DEFAULT_WS); layerEncoder.addIdentifier(identifier2);
assertTrue(publisher.publishDBLayer(DEFAULT_WS, storeName, fte, layerEncoder));
publisher.createWorkspace(DEFAULT_WS);
assertTrue(publisher.publishDBLayer(DEFAULT_WS, storeName, fte, layerEncoder));
}
} }