From 09299bf3201fc57dafced22f26a5ebabc56a28d2 Mon Sep 17 00:00:00 2001 From: eblondel Date: Thu, 4 Jul 2013 22:08:38 +0200 Subject: [PATCH] #84 - master - reformat the code --- .../rest/encoder/GSLayerEncoder.java | 9 +-- .../rest/encoder/GSLayerEncoderTest.java | 71 +++++++++++-------- 2 files changed, 46 insertions(+), 34 deletions(-) diff --git a/src/main/java/it/geosolutions/geoserver/rest/encoder/GSLayerEncoder.java b/src/main/java/it/geosolutions/geoserver/rest/encoder/GSLayerEncoder.java index 5f3e0f3..03ee64a 100644 --- a/src/main/java/it/geosolutions/geoserver/rest/encoder/GSLayerEncoder.java +++ b/src/main/java/it/geosolutions/geoserver/rest/encoder/GSLayerEncoder.java @@ -135,11 +135,12 @@ public class GSLayerEncoder extends PropertyXMLEncoder { set("defaultStyle", defaultStyle); } - /** + /** * Add a style - * @param style to add to the list of available styles - */ - public void addStyle(String style) { + * + * @param style + */ + public void addStyle(String style) { final Element el = new Element("style"); el.setText(style); stylesEncoder.addContent(el); diff --git a/src/test/java/it/geosolutions/geoserver/rest/encoder/GSLayerEncoderTest.java b/src/test/java/it/geosolutions/geoserver/rest/encoder/GSLayerEncoderTest.java index 60e976a..8774bb1 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/encoder/GSLayerEncoderTest.java +++ b/src/test/java/it/geosolutions/geoserver/rest/encoder/GSLayerEncoderTest.java @@ -19,7 +19,6 @@ */ package it.geosolutions.geoserver.rest.encoder; - import junit.framework.Assert; import org.jdom.Element; @@ -33,42 +32,54 @@ import org.junit.Test; * emmanuel.blondel@fao.org */ public class GSLayerEncoderTest { - + GSLayerEncoder layerEncoder; - + @Before - public void setup(){ + public void setup() { layerEncoder = new GSLayerEncoder(); layerEncoder.setEnabled(true); - layerEncoder.setQueryable(true); - layerEncoder.setDefaultStyle("point"); - layerEncoder.addStyle("additional_style1"); - layerEncoder.addStyle("additional_style2"); - } - - @Test - public void testProperties(){ - Assert.assertEquals(true, Boolean.parseBoolean(layerEncoder.getRoot().getChild("enabled").getValue())); - Assert.assertEquals(true, Boolean.parseBoolean(layerEncoder.getRoot().getChild("queryable").getValue())); - } - - @Test - public void testDefaultStyle(){ - Assert.assertEquals("point", layerEncoder.getRoot().getChild("defaultStyle").getValue()); - } - - @Test - public void testMultipleStyles(){ - Assert.assertEquals(2, layerEncoder.getRoot().getChild("styles").getChildren().size()); - 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()); + layerEncoder.setQueryable(true); + layerEncoder.setDefaultStyle("point"); + layerEncoder.addStyle("additional_style1"); + layerEncoder.addStyle("additional_style2"); } @Test - public void testRemoveStyle(){ - Assert.assertTrue(layerEncoder.delStyle("additional_style1")); - Assert.assertEquals(1,layerEncoder.getRoot().getChild("styles").getChildren().size()); - Assert.assertEquals("additional_style2", ((Element) layerEncoder.getRoot().getChild("styles").getChildren().get(0)).getText()); + public void testProperties() { + Assert.assertEquals( + true, + Boolean.parseBoolean(layerEncoder.getRoot().getChild("enabled") + .getValue())); + Assert.assertEquals( + true, + Boolean.parseBoolean(layerEncoder.getRoot() + .getChild("queryable").getValue())); + } + + @Test + public void testDefaultStyle() { + Assert.assertEquals("point", + layerEncoder.getRoot().getChild("defaultStyle").getValue()); + } + + @Test + public void testMultipleStyles() { + Assert.assertEquals(2, layerEncoder.getRoot().getChild("styles") + .getChildren().size()); + 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 + public void testRemoveStyle() { + Assert.assertTrue(layerEncoder.delStyle("additional_style1")); + Assert.assertEquals(1, layerEncoder.getRoot().getChild("styles") + .getChildren().size()); + Assert.assertEquals("additional_style2", ((Element) layerEncoder + .getRoot().getChild("styles").getChildren().get(0)).getText()); } }