From ce93945747887db0802239129a70fce4660538c2 Mon Sep 17 00:00:00 2001
From: Andrea Aime <andrea.aime@gmail.com>
Date: Thu, 16 Jun 2016 14:37:30 +0200
Subject: [PATCH] Increase test coverage in the ncwms module

---
 .../wms/style/PaletteStyleHandler.java        |  9 ++---
 .../wms/style/PaletteParserTest.java          | 10 ++---
 .../wms/style/PaletteStyleHandlerTest.java    | 38 +++++++++++++++++++
 3 files changed, 46 insertions(+), 11 deletions(-)
 create mode 100644 src/community/ncwms/src/test/java/org/geoserver/wms/style/PaletteStyleHandlerTest.java

diff --git a/src/community/ncwms/src/main/java/org/geoserver/wms/style/PaletteStyleHandler.java b/src/community/ncwms/src/main/java/org/geoserver/wms/style/PaletteStyleHandler.java
index 225a108241e..31c9ea99e68 100644
--- a/src/community/ncwms/src/main/java/org/geoserver/wms/style/PaletteStyleHandler.java
+++ b/src/community/ncwms/src/main/java/org/geoserver/wms/style/PaletteStyleHandler.java
@@ -24,6 +24,9 @@
 import org.geotools.util.logging.Logging;
 import org.xml.sax.EntityResolver;
 
+/**
+ * Handler for the dynamic palette style language. See {@link PaletteParser} for details on the grammar
+ */
 public class PaletteStyleHandler extends StyleHandler {
     static final Logger LOGGER = Logging.getLogger(PaletteStyleHandler.class);
 
@@ -54,12 +57,6 @@ public StyledLayerDescriptor parse(Object input, Version version,
                 }
             }
             
-            // TODO: remove me!!
-            try {
-                LOGGER.info("Palette has been parsed to " + toSLD(sld));
-            } catch(Exception e) {
-                
-            }
             return sld;
         }
 
diff --git a/src/community/ncwms/src/test/java/org/geoserver/wms/style/PaletteParserTest.java b/src/community/ncwms/src/test/java/org/geoserver/wms/style/PaletteParserTest.java
index aef795ddb95..545fa35629a 100644
--- a/src/community/ncwms/src/test/java/org/geoserver/wms/style/PaletteParserTest.java
+++ b/src/community/ncwms/src/test/java/org/geoserver/wms/style/PaletteParserTest.java
@@ -86,18 +86,18 @@ public void testErrorMessage() throws IOException {
     @Test
     public void testParseBlackWhiteToStyle() throws IOException, TransformerException {
         StyledLayerDescriptor sld = parser.parseStyle(toReader("#000000\n#FFFFFF"));
-        Function cm = checkStyleAndGetColormap(sld);
+        Function cm = assertDynamicColorColormap(sld);
         assertEquals("rgb(0,0,0);rgb(255,255,255)", cm.getParameters().get(0).evaluate(null));
     }
     
     @Test
     public void testParseBlackWhiteTranslucentToStyle() throws IOException, TransformerException {
         StyledLayerDescriptor sld = parser.parseStyle(toReader("#64000000\n#64FFFFFF"));
-        Function cm = checkStyleAndGetColormap(sld);
+        Function cm = assertDynamicColorColormap(sld);
         assertEquals("rgba(0,0,0,0.39);rgba(255,255,255,0.39)", cm.getParameters().get(0).evaluate(null));
     }
 
-    private Function checkStyleAndGetColormap(StyledLayerDescriptor sld)
+    static Function assertDynamicColorColormap(StyledLayerDescriptor sld)
             throws TransformerException {
         // logStyle(sld); 
         NamedLayer layer = (NamedLayer) sld.getStyledLayers()[0];
@@ -122,13 +122,13 @@ private Function checkStyleAndGetColormap(StyledLayerDescriptor sld)
         return cm;
     }
 
-    private void logStyle(StyledLayerDescriptor sld) throws TransformerException {
+    void logStyle(StyledLayerDescriptor sld) throws TransformerException {
         final SLDTransformer tx = new SLDTransformer();
         tx.setIndentation(2);
         tx.transform(sld, System.out);
     }
 
-    private Expression assetIsParameterFunction(Expression e, String key) {
+    private static Expression assetIsParameterFunction(Expression e, String key) {
         Function p1 = (Function) e;
         assertEquals("parameter", p1.getName());
         assertEquals(key, p1.getParameters().get(0).evaluate(null));
diff --git a/src/community/ncwms/src/test/java/org/geoserver/wms/style/PaletteStyleHandlerTest.java b/src/community/ncwms/src/test/java/org/geoserver/wms/style/PaletteStyleHandlerTest.java
new file mode 100644
index 00000000000..ef077c7ad23
--- /dev/null
+++ b/src/community/ncwms/src/test/java/org/geoserver/wms/style/PaletteStyleHandlerTest.java
@@ -0,0 +1,38 @@
+/* (c) 2016 Open Source Geospatial Foundation - all rights reserved
+ * This code is licensed under the GPL 2.0 license, available at the root
+ * application directory.
+ */
+package org.geoserver.wms.style;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
+
+import org.geotools.styling.StyledLayerDescriptor;
+import org.junit.Test;
+import org.opengis.filter.expression.Function;
+
+public class PaletteStyleHandlerTest {
+    
+    PaletteStyleHandler handler = new PaletteStyleHandler();
+    
+    @Test
+    public void testParse() throws Exception {
+        StyledLayerDescriptor sld = handler.parse("#000000\n#FFFFFF", null, null, null);
+        Function cm = PaletteParserTest.assertDynamicColorColormap(sld);
+        assertEquals("rgb(0,0,0);rgb(255,255,255)", cm.getParameters().get(0).evaluate(null));   
+    }
+    
+    @Test
+    public void testValidateValid() throws Exception {
+        List<Exception> exceptions = handler.validate("#000000\n#FFFFFF", null,null);
+        assertEquals(0, exceptions.size());
+    }
+    
+    @Test
+    public void testValidateInvalid() throws Exception {
+        List<Exception> exceptions = handler.validate("abcde", null,null);
+        assertEquals(1, exceptions.size());
+    }
+    
+}