diff --git a/src/main/java/org/cryptomator/common/Environment.java b/src/main/java/org/cryptomator/common/Environment.java index 0fa12ee20..e27ae9bde 100644 --- a/src/main/java/org/cryptomator/common/Environment.java +++ b/src/main/java/org/cryptomator/common/Environment.java @@ -99,12 +99,12 @@ public class Environment { } // visible for testing - Path getHomeDir() { + public Path getHomeDir() { return getPath("user.home").orElseThrow(); } // visible for testing - Stream getPaths(String propertyName) { + public Stream getPaths(String propertyName) { Stream rawSettingsPaths = getRawList(propertyName, PATH_LIST_SEP); return rawSettingsPaths.filter(Predicate.not(Strings::isNullOrEmpty)).map(Paths::get).map(this::replaceHomeDir); } diff --git a/src/test/java/org/cryptomator/common/EnvironmentTest.java b/src/test/java/org/cryptomator/common/EnvironmentTest.java index b68d4a631..5bd2e5bcb 100644 --- a/src/test/java/org/cryptomator/common/EnvironmentTest.java +++ b/src/test/java/org/cryptomator/common/EnvironmentTest.java @@ -17,12 +17,12 @@ import java.util.Optional; import java.util.stream.Collectors; @DisplayName("Environment Variables Test") -class EnvironmentTest { +public class EnvironmentTest { private Environment env; @BeforeEach - void init() { + public void init() { env = Mockito.spy(new Environment()); Mockito.when(env.getHomeDir()).thenReturn(Path.of("/home/testuser")); } @@ -82,7 +82,7 @@ class EnvironmentTest { @Nested @DisplayName("Path Lists") - class SettingsPath { + public class SettingsPath { @Test @DisplayName("test.path.property=") diff --git a/src/test/java/org/cryptomator/common/LicenseCheckerTest.java b/src/test/java/org/cryptomator/common/LicenseCheckerTest.java index 066126ccf..02d6a6d29 100644 --- a/src/test/java/org/cryptomator/common/LicenseCheckerTest.java +++ b/src/test/java/org/cryptomator/common/LicenseCheckerTest.java @@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test; import java.util.Optional; -class LicenseCheckerTest { +public class LicenseCheckerTest { private static final String PUBLIC_KEY = """ MIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQBgc4HZz+/fBbC7lmEww0AO3NK9wVZ\ diff --git a/src/test/java/org/cryptomator/ui/controls/SecurePasswordFieldTest.java b/src/test/java/org/cryptomator/ui/controls/SecurePasswordFieldTest.java index cc5223c6a..0956967e6 100644 --- a/src/test/java/org/cryptomator/ui/controls/SecurePasswordFieldTest.java +++ b/src/test/java/org/cryptomator/ui/controls/SecurePasswordFieldTest.java @@ -12,12 +12,12 @@ import java.awt.GraphicsEnvironment; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -class SecurePasswordFieldTest { +public class SecurePasswordFieldTest { private SecurePasswordField pwField = new SecurePasswordField(); @BeforeAll - static void initJavaFx() throws InterruptedException { + public static void initJavaFx() throws InterruptedException { Assumptions.assumeFalse(GraphicsEnvironment.isHeadless()); final CountDownLatch latch = new CountDownLatch(1); Platform.startup(latch::countDown); @@ -29,7 +29,7 @@ class SecurePasswordFieldTest { @Nested @DisplayName("Content Update Events") - class TextChange { + public class TextChange { @Test @DisplayName("\"ant\".append(\"eater\")") diff --git a/src/test/java/org/cryptomator/ui/recoverykey/AutoCompleterTest.java b/src/test/java/org/cryptomator/ui/recoverykey/AutoCompleterTest.java index c0535df8e..e5bbe24c9 100644 --- a/src/test/java/org/cryptomator/ui/recoverykey/AutoCompleterTest.java +++ b/src/test/java/org/cryptomator/ui/recoverykey/AutoCompleterTest.java @@ -10,7 +10,7 @@ import org.junit.jupiter.params.provider.ValueSource; import java.util.Optional; import java.util.Set; -class AutoCompleterTest { +public class AutoCompleterTest { @Test @DisplayName("no match in []") @@ -30,7 +30,7 @@ class AutoCompleterTest { @Nested @DisplayName("search in dict: ['tame', 'teach', 'teacher']") - class NarrowedDownDict { + public class NarrowedDownDict { AutoCompleter autoCompleter = new AutoCompleter(Set.of("tame", "teach", "teacher")); diff --git a/src/test/java/org/cryptomator/ui/recoverykey/RecoveryKeyFactoryTest.java b/src/test/java/org/cryptomator/ui/recoverykey/RecoveryKeyFactoryTest.java index 672b7a3b8..0df21f6c0 100644 --- a/src/test/java/org/cryptomator/ui/recoverykey/RecoveryKeyFactoryTest.java +++ b/src/test/java/org/cryptomator/ui/recoverykey/RecoveryKeyFactoryTest.java @@ -13,7 +13,7 @@ import java.io.IOException; import java.nio.file.Path; import java.security.SecureRandom; -class RecoveryKeyFactoryTest { +public class RecoveryKeyFactoryTest { private WordEncoder wordEncoder = new WordEncoder(); private MasterkeyFileAccess masterkeyFileAccess = Mockito.mock(MasterkeyFileAccess.class); diff --git a/src/test/java/org/cryptomator/ui/recoverykey/WordEncoderTest.java b/src/test/java/org/cryptomator/ui/recoverykey/WordEncoderTest.java index 9d09c3d8b..6fbd2132b 100644 --- a/src/test/java/org/cryptomator/ui/recoverykey/WordEncoderTest.java +++ b/src/test/java/org/cryptomator/ui/recoverykey/WordEncoderTest.java @@ -12,7 +12,7 @@ import java.util.stream.IntStream; import java.util.stream.Stream; @TestInstance(TestInstance.Lifecycle.PER_CLASS) -class WordEncoderTest { +public class WordEncoderTest { private static final Random PRNG = new Random(42l); private WordEncoder encoder; @@ -25,13 +25,13 @@ class WordEncoderTest { @DisplayName("decode(encode(input)) == input") @ParameterizedTest(name = "test {index}") @MethodSource("createRandomByteSequences") - void encodeAndDecode(byte[] input) { + public void encodeAndDecode(byte[] input) { String encoded = encoder.encodePadded(input); byte[] decoded = encoder.decode(encoded); Assertions.assertArrayEquals(input, decoded); } - static Stream createRandomByteSequences() { + public static Stream createRandomByteSequences() { return IntStream.range(0, 30).mapToObj(i -> { byte[] randomBytes = new byte[i * 3]; PRNG.nextBytes(randomBytes);