Avoid full context reload in GWC integration tests

geoserver · Dec 28, 2018 · 5450860 · 5450860
1 parent 51f39ba
commit 5450860
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/src/gwc/src/main/java/org/geoserver/gwc/config/GWCInitializer.java b/src/gwc/src/main/java/org/geoserver/gwc/config/GWCInitializer.java
@@ -23,6 +23,7 @@
 import org.geoserver.catalog.PublishedInfo;
 import org.geoserver.config.GeoServer;
 import org.geoserver.config.GeoServerInitializer;
+import org.geoserver.config.GeoServerReinitializer;
 import org.geoserver.gwc.ConfigurableBlobStore;
 import org.geoserver.gwc.layer.CatalogConfiguration;
 import org.geoserver.gwc.layer.GeoServerTileLayerInfo;
@@ -62,7 +63,7 @@
  * @author groldan
  * @see GeoServerInitializer
  */
-public class GWCInitializer implements GeoServerInitializer {
+public class GWCInitializer implements GeoServerReinitializer {
 
     private static final Logger LOGGER = Logging.getLogger(GWCInitializer.class);
 

diff --git a/src/gwc/src/test/java/org/geoserver/gwc/GWCIntegrationTest.java b/src/gwc/src/test/java/org/geoserver/gwc/GWCIntegrationTest.java
@@ -73,8 +73,6 @@
 import org.geoserver.platform.GeoServerExtensions;
 import org.geoserver.platform.GeoServerResourceLoader;
 import org.geoserver.test.GeoServerSystemTestSupport;
-import org.geoserver.test.TestSetup;
-import org.geoserver.test.TestSetupFrequency;
 import org.geotools.feature.NameImpl;
 import org.geowebcache.GeoWebCacheDispatcher;
 import org.geowebcache.GeoWebCacheException;
@@ -96,13 +94,13 @@
 import org.geowebcache.layer.TileLayerDispatcher;
 import org.geowebcache.service.wmts.WMTSService;
 import org.hamcrest.Matchers;
+import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.w3c.dom.Document;
 
-@TestSetup(run = TestSetupFrequency.REPEAT)
 public class GWCIntegrationTest extends GeoServerSystemTestSupport {
 
     // WMTS 1.0 namespaces
@@ -149,10 +147,7 @@ protected void setUpSpring(List<String> springContextLocations) {
         springContextLocations.add("gwc-integration-test.xml");
     }
 
-    @Override
+    private void prepareDataDirectory(SystemTestData testData) throws Exception {
-    protected void onSetUp(SystemTestData testData) throws Exception {
-        super.onSetUp(testData);
-
         Catalog catalog = getCatalog();
         testData.addWorkspace(TEST_WORKSPACE_NAME, TEST_WORKSPACE_URI, catalog);
         WorkspaceInfo wi = catalog.getWorkspaceByName(TEST_WORKSPACE_NAME);
@@ -192,6 +187,20 @@ protected void onSetUp(SystemTestData testData) throws Exception {
         HttpRequestRecorderCallback.reset();
     }
 
+    @Before
+    public void cleanup() throws Exception {
+        SystemTestData testData = getTestData();
+        for (File f : testData.getDataDirectoryRoot().listFiles()) {
+            FileUtils.deleteQuietly(f);
+        }
+        testData.setUp();
+        testData.setUpDefault();
+        getGeoServer().reload();
+        //        GeoServerLoader loader = GeoServerExtensions.bean(DefaultGeoServerLoader.class);
+        //        loader.initializeStyles(getCatalog());
+        prepareDataDirectory(testData);
+    }
+
     protected GridSet namedGridsetCopy(final String newName, final GridSet oldGridset) {
         final GridSet newGridset;
         {