From 0127d2148e16efb7103f0a32bcc9eb8cb9f65271 Mon Sep 17 00:00:00 2001 From: Stepan Usatiuk Date: Sun, 16 Jun 2024 15:24:48 +0200 Subject: [PATCH] Fix tests --- .../RemoteObjectServiceClient.java | 2 +- ...FileRepoTest.java => TestDataCleaner.java} | 30 ++++++++++++------- .../dhfs/files/DhfsFileServiceSimpleTest.java | 3 +- .../com/usatiuk/dhfs/fuse/DhfsFuseTest.java | 3 +- .../storage/DhfsObjectGrpcServiceTest.java | 3 +- 5 files changed, 23 insertions(+), 18 deletions(-) rename server/src/test/java/com/usatiuk/dhfs/{storage/SimpleFileRepoTest.java => TestDataCleaner.java} (52%) diff --git a/server/src/main/java/com/usatiuk/dhfs/storage/objects/repository/distributed/RemoteObjectServiceClient.java b/server/src/main/java/com/usatiuk/dhfs/storage/objects/repository/distributed/RemoteObjectServiceClient.java index 80302641..28a96d72 100644 --- a/server/src/main/java/com/usatiuk/dhfs/storage/objects/repository/distributed/RemoteObjectServiceClient.java +++ b/server/src/main/java/com/usatiuk/dhfs/storage/objects/repository/distributed/RemoteObjectServiceClient.java @@ -11,7 +11,7 @@ public class RemoteObjectServiceClient { ObjectIndexService objectIndexService; public Uni getObject(String namespace, String name) { - return Uni.createFrom().item(null); + return Uni.createFrom().item(() -> null); } public Uni notifyUpdate(String namespace, String name) { diff --git a/server/src/test/java/com/usatiuk/dhfs/storage/SimpleFileRepoTest.java b/server/src/test/java/com/usatiuk/dhfs/TestDataCleaner.java similarity index 52% rename from server/src/test/java/com/usatiuk/dhfs/storage/SimpleFileRepoTest.java rename to server/src/test/java/com/usatiuk/dhfs/TestDataCleaner.java index 48aa5884..a461a9f8 100644 --- a/server/src/test/java/com/usatiuk/dhfs/storage/SimpleFileRepoTest.java +++ b/server/src/test/java/com/usatiuk/dhfs/TestDataCleaner.java @@ -1,20 +1,34 @@ -package com.usatiuk.dhfs.storage; +package com.usatiuk.dhfs; -import io.quarkus.test.junit.QuarkusTest; +import io.quarkus.runtime.ShutdownEvent; +import io.quarkus.runtime.StartupEvent; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import org.eclipse.microprofile.config.inject.ConfigProperty; -import org.junit.jupiter.api.AfterEach; import java.io.File; +import java.io.IOException; import java.nio.file.Path; import java.util.Objects; -@QuarkusTest -public abstract class SimpleFileRepoTest { +@ApplicationScoped +public class TestDataCleaner { @ConfigProperty(name = "dhfs.objects.persistence.files.root") String tempDirectory; @ConfigProperty(name = "dhfs.objects.distributed.root") String tempDirectoryIdx; + void init(@Observes @Priority(1) StartupEvent event) throws IOException { + purgeDirectory(Path.of(tempDirectory).toFile()); + purgeDirectory(Path.of(tempDirectoryIdx).toFile()); + } + + void shutdown(@Observes @Priority(1000000000) ShutdownEvent event) throws IOException { + purgeDirectory(Path.of(tempDirectory).toFile()); + purgeDirectory(Path.of(tempDirectoryIdx).toFile()); + } + void purgeDirectory(File dir) { for (File file : Objects.requireNonNull(dir.listFiles())) { if (file.isDirectory()) @@ -22,10 +36,4 @@ public abstract class SimpleFileRepoTest { file.delete(); } } - - @AfterEach - void teardown() { - purgeDirectory(Path.of(tempDirectory).toFile()); - purgeDirectory(Path.of(tempDirectoryIdx).toFile()); - } } diff --git a/server/src/test/java/com/usatiuk/dhfs/files/DhfsFileServiceSimpleTest.java b/server/src/test/java/com/usatiuk/dhfs/files/DhfsFileServiceSimpleTest.java index e548c7fd..f34c3002 100644 --- a/server/src/test/java/com/usatiuk/dhfs/files/DhfsFileServiceSimpleTest.java +++ b/server/src/test/java/com/usatiuk/dhfs/files/DhfsFileServiceSimpleTest.java @@ -1,6 +1,5 @@ package com.usatiuk.dhfs.files; -import com.usatiuk.dhfs.storage.SimpleFileRepoTest; import com.usatiuk.dhfs.storage.files.objects.Chunk; import com.usatiuk.dhfs.storage.files.objects.File; import com.usatiuk.dhfs.storage.files.service.DhfsFileService; @@ -23,7 +22,7 @@ class Profiles { @QuarkusTest @TestProfile(Profiles.DhfsFileServiceSimpleTestProfile.class) -public class DhfsFileServiceSimpleTest extends SimpleFileRepoTest { +public class DhfsFileServiceSimpleTest { @Inject DhfsFileService fileService; @Inject diff --git a/server/src/test/java/com/usatiuk/dhfs/fuse/DhfsFuseTest.java b/server/src/test/java/com/usatiuk/dhfs/fuse/DhfsFuseTest.java index 897bccf9..31b7931b 100644 --- a/server/src/test/java/com/usatiuk/dhfs/fuse/DhfsFuseTest.java +++ b/server/src/test/java/com/usatiuk/dhfs/fuse/DhfsFuseTest.java @@ -1,6 +1,5 @@ package com.usatiuk.dhfs.fuse; -import com.usatiuk.dhfs.storage.SimpleFileRepoTest; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.QuarkusTestProfile; import io.quarkus.test.junit.TestProfile; @@ -19,7 +18,7 @@ class Profiles { @QuarkusTest @TestProfile(Profiles.DhfsFuseTestProfile.class) -public class DhfsFuseTest extends SimpleFileRepoTest { +public class DhfsFuseTest { @ConfigProperty(name = "dhfs.fuse.root") String root; diff --git a/server/src/test/java/com/usatiuk/dhfs/storage/DhfsObjectGrpcServiceTest.java b/server/src/test/java/com/usatiuk/dhfs/storage/DhfsObjectGrpcServiceTest.java index 343ed8d3..729b78a1 100644 --- a/server/src/test/java/com/usatiuk/dhfs/storage/DhfsObjectGrpcServiceTest.java +++ b/server/src/test/java/com/usatiuk/dhfs/storage/DhfsObjectGrpcServiceTest.java @@ -10,7 +10,6 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import java.time.Duration; -import java.util.List; class Profiles { public static class DhfsObjectGrpcServiceTestProfile implements QuarkusTestProfile { @@ -19,7 +18,7 @@ class Profiles { @QuarkusTest @TestProfile(Profiles.DhfsObjectGrpcServiceTestProfile.class) -class DhfsObjectGrpcServiceTest extends SimpleFileRepoTest { +class DhfsObjectGrpcServiceTest { @GrpcClient DhfsObjectGrpc dhfsObjectGrpc;