From 53b602e399b0e7c8034695d0b0ecf37d243c9427 Mon Sep 17 00:00:00 2001 From: Carl Schroedl Date: Tue, 20 Sep 2016 15:05:32 -0500 Subject: [PATCH] Prevented setup from running outside of integration tests. --- .../publisher/GeoserverRESTRecalculateTest.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTRecalculateTest.java b/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTRecalculateTest.java index 1f94f2d..841d8d4 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTRecalculateTest.java +++ b/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTRecalculateTest.java @@ -26,18 +26,12 @@ package it.geosolutions.geoserver.rest.publisher; import it.geosolutions.geoserver.rest.GeoServerRESTPublisher; -import it.geosolutions.geoserver.rest.GeoServerRESTPublisher.StoreType; -import it.geosolutions.geoserver.rest.GeoServerRESTPublisher.UploadMethod; import it.geosolutions.geoserver.rest.GeoserverRESTTest; -import it.geosolutions.geoserver.rest.decoder.RESTLayer; -import it.geosolutions.geoserver.rest.encoder.GSResourceEncoder.ProjectionPolicy; -import it.geosolutions.geoserver.rest.encoder.coverage.GSCoverageEncoderTest; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; -import org.apache.commons.httpclient.NameValuePair; import org.junit.After; import org.junit.Test; import static org.junit.Assert.*; @@ -61,12 +55,19 @@ public class GeoserverRESTRecalculateTest extends GeoserverRESTTest { @Override public void before(){ super.before(); + + if (!enabled()) + return; + deleteAll(); assertTrue(publisher.createWorkspace(DEFAULT_WS)); } @After public void cleanUp(){ + if (!enabled()) + return; + deleteAll(); }