use system property path.separator and fix failing unit test on windows

This commit is contained in:
Armin Schrenk
2023-07-04 16:31:28 +02:00
parent 11a0136cb9
commit 2c984ad405
2 changed files with 27 additions and 3 deletions

View File

@@ -5,7 +5,6 @@ import com.google.common.base.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -131,7 +130,7 @@ public class Environment {
// visible for testing
Stream<Path> getPaths(String propertyName) {
Stream<String> rawSettingsPaths = getRawList(propertyName, File.pathSeparatorChar);
Stream<String> rawSettingsPaths = getRawList(propertyName, System.getProperty("path.separator").charAt(0));
return rawSettingsPaths.filter(Predicate.not(Strings::isNullOrEmpty)).map(Path::of);
}

View File

@@ -7,6 +7,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIf;
import org.mockito.Mockito;
import java.nio.file.Path;
@@ -24,6 +25,7 @@ public class EnvironmentTest {
public void init() {
env = Mockito.spy(Environment.getInstance());
}
@Test
@DisplayName("cryptomator.logDir=/foo/bar")
public void testAbsoluteLogDir() {
@@ -58,8 +60,9 @@ public class EnvironmentTest {
}
@Test
@EnabledIf("isColonPathSeperator")
@DisplayName("test.path.property=/foo/bar/test:/bar/nez/tost")
public void testTwoPaths() {
public void testTwoPathsColon() {
System.setProperty("test.path.property", "/foo/bar/test:bar/nez/tost");
List<Path> result = env.getPaths("test.path.property").toList();
@@ -67,6 +70,25 @@ public class EnvironmentTest {
MatcherAssert.assertThat(result, Matchers.hasItems(Path.of("/foo/bar/test"), Path.of("bar/nez/tost")));
}
@Test
@EnabledIf("isSemiColonPathSeperator")
@DisplayName("test.path.property=/foo/bar/test;/bar/nez/tost")
public void testTwoPathsSemiColon() {
System.setProperty("test.path.property", "/foo/bar/test;bar/nez/tost");
List<Path> result = env.getPaths("test.path.property").toList();
MatcherAssert.assertThat(result, Matchers.hasSize(2));
MatcherAssert.assertThat(result, Matchers.hasItems(Path.of("/foo/bar/test"), Path.of("bar/nez/tost")));
}
boolean isColonPathSeperator() {
return System.getProperty("path.separator").equals(":");
}
boolean isSemiColonPathSeperator() {
return System.getProperty("path.separator").equals(";");
}
}
@Nested
@@ -78,18 +100,21 @@ public class EnvironmentTest {
env.getSettingsPath();
Mockito.verify(env).getPaths("cryptomator.settingsPath");
}
@Test
public void testP12Path() {
Mockito.doReturn(Stream.of()).when(env).getPaths(Mockito.anyString());
env.getP12Path();
Mockito.verify(env).getPaths("cryptomator.p12Path");
}
@Test
public void testIpcSocketPath() {
Mockito.doReturn(Stream.of()).when(env).getPaths(Mockito.anyString());
env.getIpcSocketPath();
Mockito.verify(env).getPaths("cryptomator.ipcSocketPath");
}
@Test
public void testKeychainPath() {
Mockito.doReturn(Stream.of()).when(env).getPaths(Mockito.anyString());