From c6d6c3d2b9aa25c4cb28b725834df0e03f733b81 Mon Sep 17 00:00:00 2001 From: Christian Mayer Date: Tue, 19 Apr 2016 12:00:42 +0200 Subject: [PATCH 1/2] Remove Java warnings in test sources This removes Java warnings from the test sources, which do not have a functional impact, e.g. unused imports or unused variables. --- .../geosolutions/geoserver/decoder/LayerDecoder21Test.java | 1 - .../geosolutions/geoserver/decoder/MetadataDecoderTest.java | 1 - .../geosolutions/geoserver/decoder/VersionDecoderTest.java | 3 --- .../geosolutions/geoserver/rest/GeoServerRESTClassTest.java | 2 -- .../geoserver/rest/GeoserverRESTReaderTest.java | 1 - src/test/java/it/geosolutions/geoserver/rest/UtilTest.java | 6 ------ .../rest/encoder/coverage/GSCoverageEncoderTest.java | 2 -- .../encoder/dimensions/GSCoverageDimensionEncoderTest.java | 6 ------ .../rest/encoder/feature/GSFeatureEncoderTest.java | 3 --- .../geoserver/rest/publisher/GeoserverRESTStyleTest.java | 2 -- .../rest/publisher/GeoserverRESTWorkspaceTest.java | 4 ---- .../rest/publisher/GeoserverRESTWorldImageTest.java | 4 ---- 12 files changed, 35 deletions(-) diff --git a/src/test/java/it/geosolutions/geoserver/decoder/LayerDecoder21Test.java b/src/test/java/it/geosolutions/geoserver/decoder/LayerDecoder21Test.java index c31770a..d96224d 100644 --- a/src/test/java/it/geosolutions/geoserver/decoder/LayerDecoder21Test.java +++ b/src/test/java/it/geosolutions/geoserver/decoder/LayerDecoder21Test.java @@ -1,6 +1,5 @@ package it.geosolutions.geoserver.decoder; -import it.geosolutions.geoserver.rest.decoder.RESTLayer; import it.geosolutions.geoserver.rest.decoder.RESTLayer21; import it.geosolutions.geoserver.rest.encoder.authorityurl.GSAuthorityURLInfoEncoder; import it.geosolutions.geoserver.rest.encoder.identifier.GSIdentifierInfoEncoder; diff --git a/src/test/java/it/geosolutions/geoserver/decoder/MetadataDecoderTest.java b/src/test/java/it/geosolutions/geoserver/decoder/MetadataDecoderTest.java index 55e6720..028c304 100644 --- a/src/test/java/it/geosolutions/geoserver/decoder/MetadataDecoderTest.java +++ b/src/test/java/it/geosolutions/geoserver/decoder/MetadataDecoderTest.java @@ -23,7 +23,6 @@ package it.geosolutions.geoserver.decoder; import it.geosolutions.geoserver.rest.decoder.RESTCoverage; import it.geosolutions.geoserver.rest.decoder.RESTDimensionInfo; -import it.geosolutions.geoserver.rest.encoder.metadatalink.GSMetadataLinkInfoEncoder; import java.io.File; import java.io.IOException; diff --git a/src/test/java/it/geosolutions/geoserver/decoder/VersionDecoderTest.java b/src/test/java/it/geosolutions/geoserver/decoder/VersionDecoderTest.java index c9dd3b0..411129e 100644 --- a/src/test/java/it/geosolutions/geoserver/decoder/VersionDecoderTest.java +++ b/src/test/java/it/geosolutions/geoserver/decoder/VersionDecoderTest.java @@ -21,11 +21,8 @@ */ package it.geosolutions.geoserver.decoder; -import it.geosolutions.geoserver.rest.GeoServerRESTPublisher; -import it.geosolutions.geoserver.rest.GeoServerRESTReader; import it.geosolutions.geoserver.rest.GeoserverRESTTest; import it.geosolutions.geoserver.rest.decoder.about.GSVersionDecoder; -import it.geosolutions.geoserver.rest.decoder.about.GSVersionDecoder.VERSION; import junit.framework.Assert; import org.jdom.Element; diff --git a/src/test/java/it/geosolutions/geoserver/rest/GeoServerRESTClassTest.java b/src/test/java/it/geosolutions/geoserver/rest/GeoServerRESTClassTest.java index e37a626..e1b9d5b 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/GeoServerRESTClassTest.java +++ b/src/test/java/it/geosolutions/geoserver/rest/GeoServerRESTClassTest.java @@ -25,12 +25,10 @@ package it.geosolutions.geoserver.rest; import static org.junit.Assert.*; -import static org.junit.Assert.assertTrue; import java.util.List; import it.geosolutions.geoserver.rest.decoder.RESTLayerGroup; -import it.geosolutions.geoserver.rest.decoder.utils.NameLinkElem; import org.junit.Test; import org.slf4j.Logger; diff --git a/src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTReaderTest.java b/src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTReaderTest.java index 0656f24..74674c2 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTReaderTest.java +++ b/src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTReaderTest.java @@ -116,7 +116,6 @@ public class GeoserverRESTReaderTest extends GeoserverRESTTest { // assertEquals(7, wsnames.size()); // value in default gs installation // System.out.println("Workspaces: " + wslist.size()); - int dsnum = 0; int wscnt = 0; for (RESTWorkspaceList.RESTShortWorkspace ws : wslist) { String wsname = wsnames.get(wscnt++); diff --git a/src/test/java/it/geosolutions/geoserver/rest/UtilTest.java b/src/test/java/it/geosolutions/geoserver/rest/UtilTest.java index b5d1610..a1efc1f 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/UtilTest.java +++ b/src/test/java/it/geosolutions/geoserver/rest/UtilTest.java @@ -24,16 +24,12 @@ */ package it.geosolutions.geoserver.rest; -import static it.geosolutions.geoserver.rest.GeoserverRESTTest.publisher; -import static it.geosolutions.geoserver.rest.GeoserverRESTTest.reader; import it.geosolutions.geoserver.rest.decoder.RESTStyle; import java.io.File; import java.io.IOException; import org.junit.Test; import static org.junit.Assert.*; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.core.io.ClassPathResource; /** @@ -42,8 +38,6 @@ import org.springframework.core.io.ClassPathResource; */ public class UtilTest extends GeoserverRESTTest { - private final static Logger LOGGER = LoggerFactory.getLogger(UtilTest.class); - @Test public void testSearchStyle() throws IOException { if (!enabled()) { diff --git a/src/test/java/it/geosolutions/geoserver/rest/encoder/coverage/GSCoverageEncoderTest.java b/src/test/java/it/geosolutions/geoserver/rest/encoder/coverage/GSCoverageEncoderTest.java index 4c1e30d..6a7374f 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/encoder/coverage/GSCoverageEncoderTest.java +++ b/src/test/java/it/geosolutions/geoserver/rest/encoder/coverage/GSCoverageEncoderTest.java @@ -19,8 +19,6 @@ */ package it.geosolutions.geoserver.rest.encoder.coverage; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; import it.geosolutions.geoserver.rest.encoder.GSResourceEncoder; import it.geosolutions.geoserver.rest.encoder.GSResourceEncoder.ProjectionPolicy; import it.geosolutions.geoserver.rest.encoder.dimensions.GSCoverageDimensionEncoder; diff --git a/src/test/java/it/geosolutions/geoserver/rest/encoder/dimensions/GSCoverageDimensionEncoderTest.java b/src/test/java/it/geosolutions/geoserver/rest/encoder/dimensions/GSCoverageDimensionEncoderTest.java index d6350a1..a4402c1 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/encoder/dimensions/GSCoverageDimensionEncoderTest.java +++ b/src/test/java/it/geosolutions/geoserver/rest/encoder/dimensions/GSCoverageDimensionEncoderTest.java @@ -19,12 +19,6 @@ */ package it.geosolutions.geoserver.rest.encoder.dimensions; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import it.geosolutions.geoserver.rest.encoder.feature.GSFeatureTypeEncoder; - -import java.io.IOException; - import junit.framework.Assert; import org.junit.Test; diff --git a/src/test/java/it/geosolutions/geoserver/rest/encoder/feature/GSFeatureEncoderTest.java b/src/test/java/it/geosolutions/geoserver/rest/encoder/feature/GSFeatureEncoderTest.java index d2c381c..61815f5 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/encoder/feature/GSFeatureEncoderTest.java +++ b/src/test/java/it/geosolutions/geoserver/rest/encoder/feature/GSFeatureEncoderTest.java @@ -23,14 +23,11 @@ import it.geosolutions.geoserver.rest.GeoServerRESTPublisher; import it.geosolutions.geoserver.rest.GeoserverRESTTest; import it.geosolutions.geoserver.rest.decoder.RESTFeatureType; import it.geosolutions.geoserver.rest.decoder.RESTLayer; -import it.geosolutions.geoserver.rest.decoder.RESTResource; -import it.geosolutions.geoserver.rest.decoder.about.GSVersionDecoder; import it.geosolutions.geoserver.rest.decoder.about.GSVersionDecoder.VERSION; import it.geosolutions.geoserver.rest.encoder.GSLayerEncoder; import it.geosolutions.geoserver.rest.encoder.GSLayerEncoder21; import it.geosolutions.geoserver.rest.encoder.GSResourceEncoder; import it.geosolutions.geoserver.rest.encoder.authorityurl.GSAuthorityURLInfoEncoder; -import it.geosolutions.geoserver.rest.encoder.dimensions.GSCoverageDimensionEncoder; import it.geosolutions.geoserver.rest.encoder.identifier.GSIdentifierInfoEncoder; import it.geosolutions.geoserver.rest.encoder.metadata.GSDimensionInfoEncoder; import it.geosolutions.geoserver.rest.encoder.metadata.GSDimensionInfoEncoder.Presentation; diff --git a/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTStyleTest.java b/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTStyleTest.java index c89a522..04e05a8 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTStyleTest.java +++ b/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTStyleTest.java @@ -26,8 +26,6 @@ package it.geosolutions.geoserver.rest.publisher; import it.geosolutions.geoserver.rest.GeoserverRESTTest; -import static it.geosolutions.geoserver.rest.GeoserverRESTTest.publisher; -import static it.geosolutions.geoserver.rest.GeoserverRESTTest.reader; import it.geosolutions.geoserver.rest.decoder.RESTLayer; import it.geosolutions.geoserver.rest.decoder.RESTStyle; import it.geosolutions.geoserver.rest.decoder.utils.JDOMBuilder; diff --git a/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTWorkspaceTest.java b/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTWorkspaceTest.java index 4f5ca12..a30ffc4 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTWorkspaceTest.java +++ b/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTWorkspaceTest.java @@ -33,8 +33,6 @@ import java.io.IOException; import org.junit.Test; import static org.junit.Assert.*; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.core.io.ClassPathResource; /** @@ -47,8 +45,6 @@ import org.springframework.core.io.ClassPathResource; */ public class GeoserverRESTWorkspaceTest extends GeoserverRESTTest { - private final static Logger LOGGER = LoggerFactory.getLogger(GeoserverRESTWorkspaceTest.class); - @Test public void testWorkspaces() { if (!enabled()) return; diff --git a/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTWorldImageTest.java b/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTWorldImageTest.java index ec176c8..9dd0724 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTWorldImageTest.java +++ b/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTWorldImageTest.java @@ -35,8 +35,6 @@ import org.apache.commons.httpclient.NameValuePair; import org.junit.Test; import static org.junit.Assert.*; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.core.io.ClassPathResource; /** @@ -48,8 +46,6 @@ import org.springframework.core.io.ClassPathResource; */ public class GeoserverRESTWorldImageTest extends GeoserverRESTTest { - private final static Logger LOGGER = LoggerFactory.getLogger(GeoserverRESTWorldImageTest.class); - @Test public void testPublishWorldImage() throws IOException { From 88668158f6e258c2a2aea51cb2bd141382a7968f Mon Sep 17 00:00:00 2001 From: Christian Mayer Date: Tue, 19 Apr 2016 12:19:07 +0200 Subject: [PATCH 2/2] Remove System.out.print in test sources This removes the 'System.out.print' commands in the test sources by replacing them with simple LOGGER.debug commands (fixes #36). --- .../geoserver/decoder/LayerDecoder21Test.java | 8 ++- .../rest/GeoserverRESTReaderTest.java | 57 ++++++++++--------- .../geoserver/rest/GeoserverRESTTest.java | 6 +- .../geosolutions/geoserver/rest/UtilTest.java | 7 ++- 4 files changed, 46 insertions(+), 32 deletions(-) diff --git a/src/test/java/it/geosolutions/geoserver/decoder/LayerDecoder21Test.java b/src/test/java/it/geosolutions/geoserver/decoder/LayerDecoder21Test.java index d96224d..01b5959 100644 --- a/src/test/java/it/geosolutions/geoserver/decoder/LayerDecoder21Test.java +++ b/src/test/java/it/geosolutions/geoserver/decoder/LayerDecoder21Test.java @@ -13,6 +13,8 @@ import junit.framework.Assert; import org.apache.commons.io.FileUtils; import org.junit.Before; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.core.io.ClassPathResource; /** @@ -23,7 +25,9 @@ import org.springframework.core.io.ClassPathResource; * */ public class LayerDecoder21Test{ - + + private final static Logger LOGGER = LoggerFactory.getLogger(LayerDecoder21Test.class); + RESTLayer21 layer; @Before @@ -42,7 +46,7 @@ public class LayerDecoder21Test{ public void testAuthorityURLs() { List authorityURLs = layer .getEncodedAuthorityURLInfoList(); - System.out.println(authorityURLs.size()); + LOGGER.debug("Number of authority URLs: " + authorityURLs.size()); Assert.assertEquals("authority1", authorityURLs.get(0).getName()); Assert.assertEquals("http://www.authority1.org", authorityURLs.get(0) .getHref()); diff --git a/src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTReaderTest.java b/src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTReaderTest.java index 74674c2..ab2dc7b 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTReaderTest.java +++ b/src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTReaderTest.java @@ -35,6 +35,9 @@ import it.geosolutions.geoserver.rest.decoder.utils.NameLinkElem; import java.util.List; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import static org.junit.Assert.*; @@ -44,6 +47,8 @@ import static org.junit.Assert.*; */ public class GeoserverRESTReaderTest extends GeoserverRESTTest { + private final static Logger LOGGER = LoggerFactory.getLogger(GeoserverRESTReaderTest.class); + /** * Test of getLayers method, of class GeoServerRESTReader. */ @@ -56,16 +61,16 @@ public class GeoserverRESTReaderTest extends GeoserverRESTTest { // assertEquals(/*CHANGEME*/19, result.getChildren("layer").size()); // value in default gs installation // System.out.println("Layers:" + result.getChildren("layer").size()); - System.out.println("Layers:" + result.size()); - System.out.print("Layers:" ); + LOGGER.debug("Layers: " + result.size()); +// LOGGER.debug("Layers:" ); for (NameLinkElem shlayer : result) { assertNotNull(shlayer.getName()); - System.out.print(shlayer.getName() + " "); + LOGGER.debug(shlayer.getName() + " "); } // for (Element layer : (List)result.getChildren("layer")) { // System.out.print(layer.getChildText("name") + " "); // } - System.out.println(); + LOGGER.debug(""); } /** @@ -79,25 +84,25 @@ public class GeoserverRESTReaderTest extends GeoserverRESTTest { assertNotNull(wslist); // assertEquals(7, wslist.size()); // value in default gs installation - System.out.println("Workspaces: " + wslist.size()); + LOGGER.debug("Workspaces: " + wslist.size()); int dsnum = 0; for (RESTWorkspaceList.RESTShortWorkspace ws : wslist) { - System.out.println("Getting DSlist for WS " + ws.getName() + "..." ); + LOGGER.debug("Getting DSlist for WS " + ws.getName() + "..." ); RESTDataStoreList result = reader.getDatastores(ws.getName()); assertNotNull(result); dsnum += result.size(); for (NameLinkElem ds : result) { assertNotNull(ds.getName()); - System.out.print(ds.getName() + " " ); + LOGGER.debug(ds.getName() + " " ); RESTDataStore datastore = reader.getDatastore(ws.getName(), ds.getName()); assertNotNull(datastore); assertEquals(ds.getName(), datastore.getName()); assertEquals(ws.getName(), datastore.getWorkspaceName()); } - System.out.println(); + LOGGER.debug(""); } - System.out.println(); - System.out.println("Datastores:" + dsnum); // value in default gs installation + LOGGER.debug(""); + LOGGER.debug("Datastores:" + dsnum); // value in default gs installation // assertEquals(4, dsnum); // value in default gs installation } @@ -157,14 +162,14 @@ public class GeoserverRESTReaderTest extends GeoserverRESTTest { assertNotNull(names); assertEquals(names.size(), result.size()); // value in default gs installation - System.out.println("Namespaces:" + result.size()); - System.out.print("Namespaces:" ); + LOGGER.debug("Namespaces:" + result.size()); + LOGGER.debug("Namespaces:" ); int namesIdx = 0; for (RESTNamespaceList.RESTShortNamespace ns : result) { assertEquals("namespace mismatch", names.get(namesIdx++), ns.getName()); - System.out.print(ns.getName() + " " ); + LOGGER.debug(ns.getName() + " " ); } - System.out.println(); + LOGGER.debug(""); } /** @@ -178,12 +183,12 @@ public class GeoserverRESTReaderTest extends GeoserverRESTTest { assertNotNull(names); // assertEquals(7, names.size()); // value in default gs installation - System.out.println("Namespaces:" + names.size()); - System.out.print("Namespaces:"); + LOGGER.debug("Namespaces:" + names.size()); + LOGGER.debug("Namespaces:"); for (String name : names) { - System.out.print(name + " "); + LOGGER.debug(name + " "); } - System.out.println(); + LOGGER.debug(""); } /** @@ -197,12 +202,12 @@ public class GeoserverRESTReaderTest extends GeoserverRESTTest { assertNotNull(wslist); // assertEquals(7, wslist.size()); // value in default gs installation - System.out.println("Workspaces:" + wslist.size()); - System.out.print("Workspaces:"); + LOGGER.debug("Workspaces:" + wslist.size()); + LOGGER.debug("Workspaces:"); for (RESTWorkspaceList.RESTShortWorkspace ws : wslist) { - System.out.print(ws.getName() + " "); + LOGGER.debug(ws.getName() + " "); } - System.out.println(); + LOGGER.debug(""); assertEquals(wslist.size(), reader.getWorkspaceNames().size()); } @@ -217,12 +222,12 @@ public class GeoserverRESTReaderTest extends GeoserverRESTTest { assertNotNull(names); // assertEquals(7, names.size()); // value in default gs installation - System.out.println("Workspaces:" + names.size()); - System.out.print("Workspaces:"); + LOGGER.debug("Workspaces:" + names.size()); + LOGGER.debug("Workspaces:"); for (String name : names) { - System.out.print(name + " "); + LOGGER.debug(name + " "); } - System.out.println(); + LOGGER.debug(""); } } diff --git a/src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTTest.java b/src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTTest.java index d839c2c..3161492 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTTest.java +++ b/src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTTest.java @@ -135,17 +135,17 @@ public abstract class GeoserverRESTTest { + RESTURL); } } else if (existgs == false){ - System.out.println("Failing tests : geoserver not found"); + LOGGER.debug("Failing tests : geoserver not found"); fail("GeoServer not found"); } GSVersionDecoder v=reader.getGeoserverVersion(); if (v.compareTo(VERSION.getVersion(GS_VERSION))!=0){ - System.out.println("Failing tests : geoserver version does not match.\nAccepted versions: "+VERSION.print()); + LOGGER.debug("Failing tests : geoserver version does not match.\nAccepted versions: "+VERSION.print()); fail("GeoServer version ("+v.getVersion()+") does not match the desired one ("+GS_VERSION+")"); } } else { - System.out.println("Skipping tests "); + LOGGER.debug("Skipping tests "); LOGGER.warn("Tests are disabled. Please read the documentation to enable them."); } } diff --git a/src/test/java/it/geosolutions/geoserver/rest/UtilTest.java b/src/test/java/it/geosolutions/geoserver/rest/UtilTest.java index a1efc1f..69a12df 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/UtilTest.java +++ b/src/test/java/it/geosolutions/geoserver/rest/UtilTest.java @@ -29,6 +29,9 @@ import it.geosolutions.geoserver.rest.decoder.RESTStyle; import java.io.File; import java.io.IOException; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import static org.junit.Assert.*; import org.springframework.core.io.ClassPathResource; @@ -38,6 +41,8 @@ import org.springframework.core.io.ClassPathResource; */ public class UtilTest extends GeoserverRESTTest { + private final static Logger LOGGER = LoggerFactory.getLogger(UtilTest.class); + @Test public void testSearchStyle() throws IOException { if (!enabled()) { @@ -75,7 +80,7 @@ public class UtilTest extends GeoserverRESTTest { for(RESTStyle style : Util.searchStyles(reader, STYLENAME)) { - System.out.println(style.getWorkspace() + " :: " + style.getName()); + LOGGER.debug(style.getWorkspace() + " :: " + style.getName()); } // there's a bug in geoserver here: the global style will include workspace info