From 23db9c488b918eac666c48d8541a12b49ec12d50 Mon Sep 17 00:00:00 2001 From: Andrea Aime Date: Thu, 12 Sep 2024 18:59:48 +0200 Subject: [PATCH] Do not share the test store with all test modules --- .../org.geotools.api.data.DataStoreFactorySpi | 1 - .../org/geoserver/catalog/ResourcePoolTest.java | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) delete mode 100644 src/main/src/test/java/META-INF/services/org.geotools.api.data.DataStoreFactorySpi diff --git a/src/main/src/test/java/META-INF/services/org.geotools.api.data.DataStoreFactorySpi b/src/main/src/test/java/META-INF/services/org.geotools.api.data.DataStoreFactorySpi deleted file mode 100644 index 92f909fde8d..00000000000 --- a/src/main/src/test/java/META-INF/services/org.geotools.api.data.DataStoreFactorySpi +++ /dev/null @@ -1 +0,0 @@ -org.geoserver.catalog.TestDirectoryStoreFactorySpi \ No newline at end of file diff --git a/src/main/src/test/java/org/geoserver/catalog/ResourcePoolTest.java b/src/main/src/test/java/org/geoserver/catalog/ResourcePoolTest.java index 343530b4788..07a74bcaa22 100644 --- a/src/main/src/test/java/org/geoserver/catalog/ResourcePoolTest.java +++ b/src/main/src/test/java/org/geoserver/catalog/ResourcePoolTest.java @@ -130,8 +130,10 @@ import org.geotools.util.factory.GeoTools; import org.geotools.util.factory.Hints; import org.hamcrest.Matchers; +import org.junit.AfterClass; import org.junit.Assert; import org.junit.Assume; +import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; import org.locationtech.jts.geom.Point; @@ -154,6 +156,8 @@ public class ResourcePoolTest extends GeoServerSystemTestSupport { private static final String HUMANS = "humans"; private static final String BAD_CONN_DATASTORE = "bad_conn_data_store"; + public static final DataStoreFactorySpi TEST_DIRECTORY_STORE_FACTORY_SPI = + new TestDirectoryStoreFactorySpi(); static { System.setProperty("ALLOW_ENV_PARAMETRIZATION", "true"); @@ -166,6 +170,17 @@ public class ResourcePoolTest extends GeoServerSystemTestSupport { private static final String EXTERNAL_ENTITIES = "externalEntities"; + @BeforeClass + public static void registerTestDirectoryStore() { + // a "catch-all" datastore that will use any File without requiring a filetype/dbtype + DataStoreFinder.registerFactrory(TEST_DIRECTORY_STORE_FACTORY_SPI); + } + + @AfterClass + public static void deregisterTestDirectoryStore() { + DataStoreFinder.deregisterFactrory(TEST_DIRECTORY_STORE_FACTORY_SPI); + } + @Override protected void onSetUp(SystemTestData testData) throws Exception { super.onSetUp(testData);