From afae74be4b299d40b18647212ef21761a4c7658f Mon Sep 17 00:00:00 2001
From: jericks <jared.erickson@gmail.com>
Date: Wed, 30 Dec 2015 16:03:20 -0800
Subject: [PATCH] Switch to Java 8

---
 .travis.yml                                       |  2 +-
 .../groovy/geoscript/GeoScriptTestCase.groovy     |  2 --
 .../geoscript/style/SymbolizerTestCase.groovy     | 15 ++++++++-------
 .../geoscript/style/io/SLDWriterTestCase.groovy   | 15 ++++++++-------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1d0da71e..0a0828f7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
 language: java
 
 jdk:
-   - openjdk7
+   - oraclejdk8
diff --git a/src/test/groovy/geoscript/GeoScriptTestCase.groovy b/src/test/groovy/geoscript/GeoScriptTestCase.groovy
index cf351260..fc14211e 100644
--- a/src/test/groovy/geoscript/GeoScriptTestCase.groovy
+++ b/src/test/groovy/geoscript/GeoScriptTestCase.groovy
@@ -5,7 +5,6 @@ import geoscript.feature.Schema
 import geoscript.filter.Expression
 import geoscript.geom.Point
 import geoscript.layer.Cursor
-import geoscript.layer.Property
 import geoscript.proj.Geodetic
 import geoscript.layer.Format
 import geoscript.layer.GeoTIFF
@@ -18,7 +17,6 @@ import org.junit.rules.TemporaryFolder
 import static org.junit.Assert.*
 
 import geoscript.geom.*
-import geoscript.layer.Shapefile
 import geoscript.layer.Layer
 import geoscript.filter.Color
 import geoscript.proj.Projection
diff --git a/src/test/groovy/geoscript/style/SymbolizerTestCase.groovy b/src/test/groovy/geoscript/style/SymbolizerTestCase.groovy
index 8bb62d62..1a2677d2 100644
--- a/src/test/groovy/geoscript/style/SymbolizerTestCase.groovy
+++ b/src/test/groovy/geoscript/style/SymbolizerTestCase.groovy
@@ -1,5 +1,6 @@
 package geoscript.style
 
+import geoscript.AssertUtil
 import geoscript.feature.Field
 import geoscript.style.io.SLDWriter
 import org.junit.Rule
@@ -326,28 +327,28 @@ class SymbolizerTestCase {
       </sld:FeatureTypeStyle>
     </sld:UserStyle>
   </sld:UserLayer>
-</sld:StyledLayerDescriptor>""".trim().replaceAll("\n","")
+</sld:StyledLayerDescriptor>"""
 
         Symbolizer sym = new Fill("wheat") + new Stroke("brown")
 
         ByteArrayOutputStream out = new ByteArrayOutputStream()
         sym.asSLD(out)
-        String sld = out.toString().trim().replaceAll(NEW_LINE,"")
+        String sld = out.toString().trim()
         assertNotNull sld
         assertTrue sld.length() > 0
-        assertEquals expectedSld, sld
+        AssertUtil.assertStringsEqual expectedSld, sld, removeXmlNS: true, trim: true
 
         File file = folder.newFile("simple.sld")
         sym.asSLD(file)
-        sld = file.text.trim().replaceAll(NEW_LINE,"")
+        sld = file.text.trim()
         assertNotNull sld
         assertTrue sld.length() > 0
-        assertEquals expectedSld, sld
+        AssertUtil.assertStringsEqual expectedSld, sld, removeXmlNS: true, trim: true
 
-        sld = sym.sld.trim().replaceAll(NEW_LINE,"")
+        sld = sym.sld.trim()
         assertNotNull sld
         assertTrue sld.length() > 0
-        assertEquals expectedSld, sld
+        AssertUtil.assertStringsEqual expectedSld, sld, removeXmlNS: true, trim: true
     }
 
     @Test
diff --git a/src/test/groovy/geoscript/style/io/SLDWriterTestCase.groovy b/src/test/groovy/geoscript/style/io/SLDWriterTestCase.groovy
index 67aaa748..45b07597 100644
--- a/src/test/groovy/geoscript/style/io/SLDWriterTestCase.groovy
+++ b/src/test/groovy/geoscript/style/io/SLDWriterTestCase.groovy
@@ -1,5 +1,6 @@
 package geoscript.style.io
 
+import geoscript.AssertUtil
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TemporaryFolder
@@ -43,17 +44,17 @@ class SLDWriterTestCase {
       </sld:FeatureTypeStyle>
     </sld:UserStyle>
   </sld:UserLayer>
-</sld:StyledLayerDescriptor>""".trim().replaceAll("\n","")
+</sld:StyledLayerDescriptor>"""
 
     @Test void writeToOutputStream() {
         Symbolizer sym = new Fill("wheat") + new Stroke("brown")
         SLDWriter writer = new SLDWriter();
         ByteArrayOutputStream out = new ByteArrayOutputStream()
         writer.write(sym, out)
-        String sld = out.toString().trim().replaceAll(NEW_LINE,"")
+        String sld = out.toString().trim()
         assertNotNull sld
         assertTrue sld.length() > 0
-        assertEquals expectedSld, sld
+        AssertUtil.assertStringsEqual expectedSld, sld, removeXmlNS: true, trim: true
     }
 
     @Test void writeToFile() {
@@ -61,18 +62,18 @@ class SLDWriterTestCase {
         SLDWriter writer = new SLDWriter();
         File file = folder.newFile("simple.sld")
         writer.write(sym, file)
-        String sld = file.text.trim().replaceAll(NEW_LINE,"")
+        String sld = file.text.trim()
         assertNotNull sld
         assertTrue sld.length() > 0
-        assertEquals expectedSld, sld
+        AssertUtil.assertStringsEqual expectedSld, sld, removeXmlNS: true, trim: true
     }
 
     @Test void writeToString() {
         Symbolizer sym = new Fill("wheat") + new Stroke("brown")
         SLDWriter writer = new SLDWriter();
-        String sld = writer.write(sym).trim().replaceAll(NEW_LINE,"")
+        String sld = writer.write(sym).trim()
         assertNotNull sld
         assertTrue sld.length() > 0
-        assertEquals expectedSld, sld
+        AssertUtil.assertStringsEqual expectedSld, sld, removeXmlNS: true, trim: true
     }
 }