From 6ed7ed61b30e8670baa6c804a5f01eb22f54415e Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 20 Jul 2021 12:14:06 +0200 Subject: [PATCH] enrich DummyChecks with some mock results --- .../ui/health/DummyHealthChecks.java | 37 +++++++++++++++++++ .../ui/health/HealthCheckModule.java | 9 ++++- ...ryptomator.cryptofs.health.api.HealthCheck | 3 -- 3 files changed, 45 insertions(+), 4 deletions(-) delete mode 100644 src/main/resources/META-INF/services/org.cryptomator.cryptofs.health.api.HealthCheck diff --git a/src/main/java/org/cryptomator/ui/health/DummyHealthChecks.java b/src/main/java/org/cryptomator/ui/health/DummyHealthChecks.java index d2bccff37..718b16860 100644 --- a/src/main/java/org/cryptomator/ui/health/DummyHealthChecks.java +++ b/src/main/java/org/cryptomator/ui/health/DummyHealthChecks.java @@ -6,6 +6,7 @@ import org.cryptomator.cryptofs.health.api.HealthCheck; import org.cryptomator.cryptolib.api.Cryptor; import org.cryptomator.cryptolib.api.Masterkey; +import java.io.IOException; import java.nio.file.Path; import java.util.function.Consumer; @@ -19,6 +20,12 @@ public class DummyHealthChecks { @Override public void check(Path path, VaultConfig vaultConfig, Masterkey masterkey, Cryptor cryptor, Consumer consumer) { // no-op + try { + Thread.sleep(3000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + consumer.accept(() -> DiagnosticResult.Severity.GOOD); } } @@ -27,6 +34,7 @@ public class DummyHealthChecks { @Override public void check(Path path, VaultConfig vaultConfig, Masterkey masterkey, Cryptor cryptor, Consumer consumer) { // no-op + throw new RuntimeException("asd"); } } @@ -35,6 +43,35 @@ public class DummyHealthChecks { @Override public void check(Path path, VaultConfig vaultConfig, Masterkey masterkey, Cryptor cryptor, Consumer consumer) { // no-op + consumer.accept(() -> DiagnosticResult.Severity.GOOD); + consumer.accept(() -> DiagnosticResult.Severity.CRITICAL); + consumer.accept(() -> DiagnosticResult.Severity.INFO); + consumer.accept(new DiagnosticResult() { + @Override + public Severity getSeverity() { + return Severity.WARN; + } + + @Override + public void fix(Path pathToVault, VaultConfig config, Masterkey masterkey, Cryptor cryptor) throws IOException { + try { + Thread.sleep(3000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + }); + consumer.accept(new DiagnosticResult() { + @Override + public Severity getSeverity() { + return Severity.WARN; + } + + @Override + public void fix(Path pathToVault, VaultConfig config, Masterkey masterkey, Cryptor cryptor) throws IOException { + throw new IOException("asd"); + } + }); } } diff --git a/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java b/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java index 6c0a9b39e..e8376af31 100644 --- a/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java +++ b/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java @@ -27,6 +27,7 @@ import javafx.scene.Scene; import javafx.stage.Modality; import javafx.stage.Stage; import java.io.IOException; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Optional; @@ -68,7 +69,13 @@ abstract class HealthCheckModule { @Provides @HealthCheckScoped static List provideAvailableChecks() { - return HealthCheck.allChecks().stream().map(Check::new).toList(); + //return HealthCheck.allChecks().stream().map(Check::new).toList(); + //TODO: remove below lines and uncomment above one + var realChecks = HealthCheck.allChecks().stream().map(Check::new).toList(); + var tmp = new ArrayList<>(realChecks); + var tmp2 = List.of(new DummyHealthChecks.DummyCheck1(), new DummyHealthChecks.DummyCheck2(), new DummyHealthChecks.DummyCheck3()).stream().map(Check::new).toList(); + tmp.addAll(tmp2); + return tmp; } @Provides diff --git a/src/main/resources/META-INF/services/org.cryptomator.cryptofs.health.api.HealthCheck b/src/main/resources/META-INF/services/org.cryptomator.cryptofs.health.api.HealthCheck deleted file mode 100644 index e78e709b4..000000000 --- a/src/main/resources/META-INF/services/org.cryptomator.cryptofs.health.api.HealthCheck +++ /dev/null @@ -1,3 +0,0 @@ -org.cryptomator.ui.health.DummyHealthChecks$DummyCheck1 -org.cryptomator.ui.health.DummyHealthChecks$DummyCheck2 -org.cryptomator.ui.health.DummyHealthChecks$DummyCheck3 \ No newline at end of file