construct all dirIdCheck results with vault relative paths

Author: infeo

src/main/java/org/cryptomator/cryptofs/health/dirid/DirIdCheck.java

@@ -61,10 +61,11 @@ public void check(Path pathToVault, VaultConfig config, Masterkey masterkey, Cry
 			boolean foundDir = dirVisitor.secondLevelDirs.remove(expectedDir);
 			if (foundDir) {
 				iter.remove();
-				if (Files.exists(dataDirPath.resolve(expectedDir).resolve(Constants.DIR_BACKUP_FILE_NAME))) {
-					resultCollector.accept(new HealthyDir(dirId, dirFile, expectedDir));
+				var expectedDirVaultRel = Path.of(Constants.DATA_DIR_NAME).resolve(expectedDir);
+				if (Files.exists(pathToVault.resolve(expectedDir).resolve(Constants.DIR_BACKUP_FILE_NAME))) {
+					resultCollector.accept(new HealthyDir(dirId, dirFile, expectedDirVaultRel));
 				} else {
-					resultCollector.accept(new MissingDirIdBackup(dirId, expectedDir));
+					resultCollector.accept(new MissingDirIdBackup(dirId, expectedDirVaultRel));
 				}
 			}
 		}

src/main/java/org/cryptomator/cryptofs/health/dirid/MissingDirIdBackup.java

@@ -29,7 +29,7 @@ public String toString() {
 
 	//visible for testing
 	void fix(Path pathToVault, Cryptor cryptor) throws IOException {
-		Path absCipherDir = pathToVault.resolve(Constants.DATA_DIR_NAME).resolve(contentDir);
+		Path absCipherDir = pathToVault.resolve(contentDir);
 		DirectoryIdBackup.backupManually(cryptor, new CryptoPathMapper.CiphertextDirectory(dirId, absCipherDir));
 	}
 

src/test/java/org/cryptomator/cryptofs/health/dirid/MissingDirIdBackupTest.java

@@ -33,7 +33,7 @@ public void testGetFix() {
 	@DisplayName("The fix calls dirId backup class with correct parameters")
 	@Test
 	public void testFix() throws IOException {
-		Path cipherDir = Path.of("ri/diculous-30-char-pseudo-hash");
+		Path cipherDir = Path.of("d/ri/diculous-30-char-pseudo-hash");
 		String dirId = "1234-456789-1234";
 		try (var dirIdBackupMock = Mockito.mockStatic(DirectoryIdBackup.class)) {
 			dirIdBackupMock.when(() -> DirectoryIdBackup.backupManually(Mockito.any(), Mockito.any())).thenAnswer(Answers.RETURNS_SMART_NULLS);
@@ -42,7 +42,7 @@ public void testFix() throws IOException {
 			result = new MissingDirIdBackup(dirId, cipherDir);
 			result.fix(pathToVault, cryptor);
 
-			var expectedPath = pathToVault.resolve("d").resolve(cipherDir);
+			var expectedPath = pathToVault.resolve(cipherDir);
 			ArgumentMatcher<CryptoPathMapper.CiphertextDirectory> cipherDirMatcher = obj -> obj.dirId.equals(dirId) && obj.path.isAbsolute() && obj.path.equals(expectedPath);
 			dirIdBackupMock.verify(() -> DirectoryIdBackup.backupManually(Mockito.eq(cryptor), Mockito.argThat(cipherDirMatcher)), Mockito.times(1));
 		}