mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-09-05 23:57:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge develop into /bugfix/872-vaultLetterChange

Browse Source
This commit is contained in:
infeo
2019-07-04 11:22:08 +02:00
parent b71c6a9d9f
commit 688726b98d
5 changed files with 42 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/commons/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java
+5 -1
View File
@@ -51,7 +51,11 @@ public class VaultSettingsJsonAdapterTest {
String result = buf.toString();
MatcherAssert.assertThat(result, CoreMatchers.containsString("\"id\":\"test\""));
MatcherAssert.assertThat(result, CoreMatchers.containsString("\"path\":\"/foo/bar\""));
if(System.getProperty("os.name").contains("Windows")){
MatcherAssert.assertThat(result, CoreMatchers.containsString("\"path\":\"\\\\foo\\\\bar\""));
} else {
MatcherAssert.assertThat(result, CoreMatchers.containsString("\"path\":\"/foo/bar\""));
}
MatcherAssert.assertThat(result, CoreMatchers.containsString("\"mountName\":\"mountyMcMountFace\""));
MatcherAssert.assertThat(result, CoreMatchers.containsString("\"mountFlags\":\"--foo --bar\""));
}