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

#84 - master - reformat the code

Browse Source
This commit is contained in:
eblondel 2013-07-04 22:08:38 +02:00
parent 93ec8db2fb
commit 09299bf320
2 changed files with 46 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/it/geosolutions/geoserver/rest/encoder/GSLayerEncoder.java
View File

@ -135,11 +135,12 @@ public class GSLayerEncoder extends PropertyXMLEncoder {
set("defaultStyle", defaultStyle); set("defaultStyle", defaultStyle);
} }
/** /**
* Add a style * Add a style
* @param style to add to the list of available styles *
*/ * @param style
public void addStyle(String style) { */
public void addStyle(String style) {
final Element el = new Element("style"); final Element el = new Element("style");
el.setText(style); el.setText(style);
stylesEncoder.addContent(el); stylesEncoder.addContent(el);

49
src/test/java/it/geosolutions/geoserver/rest/encoder/GSLayerEncoderTest.java
View File

@ -19,7 +19,6 @@
*/ */
package it.geosolutions.geoserver.rest.encoder; package it.geosolutions.geoserver.rest.encoder;
import junit.framework.Assert; import junit.framework.Assert;
import org.jdom.Element; import org.jdom.Element;
@ -37,38 +36,50 @@ public class GSLayerEncoderTest {
GSLayerEncoder layerEncoder; GSLayerEncoder layerEncoder;
@Before @Before
public void setup(){ public void setup() {
layerEncoder = new GSLayerEncoder(); layerEncoder = new GSLayerEncoder();
layerEncoder.setEnabled(true); layerEncoder.setEnabled(true);
layerEncoder.setQueryable(true); layerEncoder.setQueryable(true);
layerEncoder.setDefaultStyle("point"); layerEncoder.setDefaultStyle("point");
layerEncoder.addStyle("additional_style1"); layerEncoder.addStyle("additional_style1");
layerEncoder.addStyle("additional_style2"); layerEncoder.addStyle("additional_style2");
} }
@Test @Test
public void testProperties(){ public void testProperties() {
Assert.assertEquals(true, Boolean.parseBoolean(layerEncoder.getRoot().getChild("enabled").getValue())); Assert.assertEquals(
Assert.assertEquals(true, Boolean.parseBoolean(layerEncoder.getRoot().getChild("queryable").getValue())); true,
Boolean.parseBoolean(layerEncoder.getRoot().getChild("enabled")
.getValue()));
Assert.assertEquals(
true,
Boolean.parseBoolean(layerEncoder.getRoot()
.getChild("queryable").getValue()));
} }
@Test @Test
public void testDefaultStyle(){ public void testDefaultStyle() {
Assert.assertEquals("point", layerEncoder.getRoot().getChild("defaultStyle").getValue()); Assert.assertEquals("point",
layerEncoder.getRoot().getChild("defaultStyle").getValue());
} }
@Test @Test
public void testMultipleStyles(){ public void testMultipleStyles() {
Assert.assertEquals(2, layerEncoder.getRoot().getChild("styles").getChildren().size()); Assert.assertEquals(2, layerEncoder.getRoot().getChild("styles")
Assert.assertEquals("additional_style1", ((Element) layerEncoder.getRoot().getChild("styles").getChildren().get(0)).getText()); .getChildren().size());
Assert.assertEquals("additional_style2", ((Element) layerEncoder.getRoot().getChild("styles").getChildren().get(1)).getText()); Assert.assertEquals("additional_style1", ((Element) layerEncoder
.getRoot().getChild("styles").getChildren().get(0)).getText());
Assert.assertEquals("additional_style2", ((Element) layerEncoder
.getRoot().getChild("styles").getChildren().get(1)).getText());
} }
@Test @Test
public void testRemoveStyle(){ public void testRemoveStyle() {
Assert.assertTrue(layerEncoder.delStyle("additional_style1")); Assert.assertTrue(layerEncoder.delStyle("additional_style1"));
Assert.assertEquals(1,layerEncoder.getRoot().getChild("styles").getChildren().size()); Assert.assertEquals(1, layerEncoder.getRoot().getChild("styles")
Assert.assertEquals("additional_style2", ((Element) layerEncoder.getRoot().getChild("styles").getChildren().get(0)).getText()); .getChildren().size());
Assert.assertEquals("additional_style2", ((Element) layerEncoder
.getRoot().getChild("styles").getChildren().get(0)).getText());
} }
} }