This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git
commit ae291c6decbf79b0faeda60b53dfea8515028278 Author: Martin Desruisseaux <[email protected]> AuthorDate: Thu Dec 19 15:29:29 2024 +0100 Delete leftover temporary files during Geopackage test. --- .../org/apache/sis/storage/esri/WritableStoreTest.java | 8 ++++---- .../org/apache/sis/storage/geopackage/GpkgStoreTest.java | 16 ++++++++++------ .../geopackage/conformance/CoreConformanceTest.java | 2 +- .../org/apache/sis/storage/shapefile/ShapefileStore.java | 2 +- .../org/apache/sis/storage/shapefile/dbf/DBFIOTest.java | 2 +- .../apache/sis/storage/shapefile/shp/ShapeIOTest.java | 2 +- 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/WritableStoreTest.java b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/WritableStoreTest.java index 40a3ee77fb..88c66a1833 100644 --- a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/WritableStoreTest.java +++ b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/WritableStoreTest.java @@ -130,7 +130,7 @@ public final class WritableStoreTest extends TestCase { final Path filePRJ = toPRJ(file); final StorageConnector sc = new StorageConnector(file); sc.setOption(OptionKey.OPEN_OPTIONS, new StandardOpenOption[] {StandardOpenOption.WRITE}); - boolean deleted = false; + boolean deleted; try (WritableStore store = new WritableStore(null, sc)) { store.write(coverage); verifyContent(file); @@ -170,11 +170,11 @@ public final class WritableStoreTest extends TestCase { @Test public void testWriteInMemory() throws DataStoreException { final GridCoverage coverage = createTestCoverage(null); - final ByteArrayOutputStream out = new ByteArrayOutputStream(); - try (WritableStore store = new WritableStore(null, new StorageConnector(out))) { + final var output = new ByteArrayOutputStream(); + try (WritableStore store = new WritableStore(null, new StorageConnector(output))) { store.write(coverage); } - final String text = new String(out.toByteArray(), StandardCharsets.US_ASCII).trim(); + final String text = new String(output.toByteArray(), StandardCharsets.US_ASCII).trim(); assertArrayEquals(getExpectedLines(), CharSequences.splitOnEOL(text)); } } diff --git a/incubator/src/org.apache.sis.storage.geopackage/test/org/apache/sis/storage/geopackage/GpkgStoreTest.java b/incubator/src/org.apache.sis.storage.geopackage/test/org/apache/sis/storage/geopackage/GpkgStoreTest.java index 16e3b39753..15eb2bd9b1 100644 --- a/incubator/src/org.apache.sis.storage.geopackage/test/org/apache/sis/storage/geopackage/GpkgStoreTest.java +++ b/incubator/src/org.apache.sis.storage.geopackage/test/org/apache/sis/storage/geopackage/GpkgStoreTest.java @@ -20,7 +20,6 @@ import java.net.URL; import java.net.URI; import java.net.URISyntaxException; import java.io.IOException; -import java.io.File; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardOpenOption; @@ -312,7 +311,7 @@ public final class GpkgStoreTest { */ @Test public void testOpeningReadOnlyDatabase() throws Exception { - final File file = File.createTempFile("sis-test", ".gpkg"); + final Path file = Files.createTempFile("sis-test-", ".gpkg"); try { // Create an empty database. final var connector = new StorageConnector(file); @@ -325,17 +324,22 @@ public final class GpkgStoreTest { final var gpkg = assertInstanceOf(GpkgStore.class, store); assertTrue(gpkg.components().isEmpty()); } - assertNotEquals(0, file.length()); + assertNotEquals(0, Files.size(file)); // Make file read only, skip test if we cannot do that. - assumeTrue(file.setWritable(false)); + final var asFile = file.toFile(); + assumeTrue(asFile.setWritable(false)); try (DataStore store = DataStores.open(file)) { final var gpkg = assertInstanceOf(GpkgStore.class, store); assertTrue(gpkg.components().isEmpty()); // Should not raise any exception. + } finally { + assertTrue(asFile.setWritable(true)); } } finally { - assertTrue(file.setWritable(true)); - assertTrue(file.delete()); + Files.delete(file); + String filename = file.getFileName().toString(); + Files.delete(file.resolveSibling(filename + "-shm")); + Files.delete(file.resolveSibling(filename + "-wal")); } } } diff --git a/incubator/src/org.apache.sis.storage.geopackage/test/org/apache/sis/storage/geopackage/conformance/CoreConformanceTest.java b/incubator/src/org.apache.sis.storage.geopackage/test/org/apache/sis/storage/geopackage/conformance/CoreConformanceTest.java index 11ae5d400c..fb554870ea 100644 --- a/incubator/src/org.apache.sis.storage.geopackage/test/org/apache/sis/storage/geopackage/conformance/CoreConformanceTest.java +++ b/incubator/src/org.apache.sis.storage.geopackage/test/org/apache/sis/storage/geopackage/conformance/CoreConformanceTest.java @@ -68,7 +68,7 @@ public final class CoreConformanceTest { * @throws DataStoreException if an error occurred while creating the data store. */ public CoreConformanceTest() throws IOException, DataStoreException { - file = Files.createTempFile("sis-test", ".gpkg"); + file = Files.createTempFile("sis-test-", ".gpkg"); final var connector = new StorageConnector(file); connector.setOption(OptionKey.OPEN_OPTIONS, new StandardOpenOption[] { StandardOpenOption.CREATE_NEW, diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java index bbcfed2c35..5015d89163 100644 --- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java +++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java @@ -948,7 +948,7 @@ public final class ShapefileStore extends DataStore implements WritableFeatureSe * Create a set of temporary files for edition. */ private ShpFiles createTempFiles() throws IOException{ - final Path tmp = Files.createTempFile(this.shpFile.getParent(), ".write-session-" + baseName + "-", ".shp"); + final Path tmp = Files.createTempFile(shpFile.getParent(), ".write-session-" + baseName + "-", ".shp"); Files.delete(tmp); return new ShpFiles(tmp); } diff --git a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/dbf/DBFIOTest.java b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/dbf/DBFIOTest.java index e6665df3d5..e79943fae2 100644 --- a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/dbf/DBFIOTest.java +++ b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/dbf/DBFIOTest.java @@ -151,7 +151,7 @@ public class DBFIOTest { assertArrayEquals(expected, result); } finally { - Files.deleteIfExists(tempFile); + Files.delete(tempFile); } } diff --git a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/shp/ShapeIOTest.java b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/shp/ShapeIOTest.java index 504dc2dbca..988a76927b 100644 --- a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/shp/ShapeIOTest.java +++ b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/shp/ShapeIOTest.java @@ -90,7 +90,7 @@ public class ShapeIOTest { assertArrayEquals(expected, result); } finally { - Files.deleteIfExists(tempFile); + Files.delete(tempFile); } }
