From fb93a17feb41f5848867a6640f63d0b8604e5b65 Mon Sep 17 00:00:00 2001
From: nfcalabria <nfcalabria@localhost>
Date: Fri, 1 Oct 2021 15:36:03 +0200
Subject: [PATCH] Fixed CopyServiceTest
---
.../ia2/transfer/service/CopyServiceTest.java | 26 +++++++++++++------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/test/java/it/inaf/ia2/transfer/service/CopyServiceTest.java b/src/test/java/it/inaf/ia2/transfer/service/CopyServiceTest.java
index 476fcc1..7a8cc88 100644
--- a/src/test/java/it/inaf/ia2/transfer/service/CopyServiceTest.java
+++ b/src/test/java/it/inaf/ia2/transfer/service/CopyServiceTest.java
@@ -10,6 +10,7 @@ import it.inaf.ia2.transfer.persistence.model.FileInfo;
import it.inaf.ia2.transfer.persistence.FileDAO;
import it.inaf.ia2.transfer.persistence.JobDAO;
import java.io.File;
+import java.nio.file.Path;
import java.util.List;
import org.apache.commons.io.FileUtils;
import org.assertj.core.util.Files;
@@ -85,31 +86,40 @@ public class CopyServiceTest {
.thenReturn(
List.of(this.createBaseFileInfo(
filename, sourceDirectory, sourceVosRootPath)));
+ FileInfo destinationFileInfo = this.createBaseDestinationFileInfo(
+ filename, destinationDirectory, destVosRootPath);
when(fileDao.getBranchFileInfos(eq(destVosRootPath), eq(jobId)))
- .thenReturn(
- List.of(this.createBaseFileInfo(
- filename, destinationDirectory, destVosRootPath)));
+ .thenReturn(List.of(destinationFileInfo));
when(fileDao.getRemainingQuota(any())).thenReturn(null);
assertTrue(sourceFile.exists());
- File destinationFile = destinationDirectory.toPath().resolve(filename).toFile();
- assertFalse(destinationFile.exists());
fileCopyService.copyFiles(
sourceVosRootPath, destVosRootPath, jobId, fakePrincipal(userId));
assertTrue(sourceFile.exists());
- assertTrue(destinationFile.exists());
-
+ File destinationFile = Path.of(destinationFileInfo.getFilePath()).toFile();
+ assertTrue(destinationFile.exists());
assertTrue(FileUtils.contentEquals(sourceFile, destinationFile));
}
private FileInfo createBaseFileInfo(String fileName, File directory, String vosPath) {
FileInfo fileInfo = new FileInfo();
- fileInfo.setOsPath(getTestFilePath(fileName, directory));
+ fileInfo.setActualBasePath("/");
+ fileInfo.setFsPath(getTestFilePath(fileName, directory));
+ fileInfo.setVirtualPath(vosPath);
+ fileInfo.setPublic(false);
+ fileInfo.setOwnerId(userId);
+
+ return fileInfo;
+ }
+
+ private FileInfo createBaseDestinationFileInfo(String fileName, File directory, String vosPath) {
+ FileInfo fileInfo = new FileInfo();
+ fileInfo.setActualBasePath(directory.getAbsolutePath());
fileInfo.setVirtualPath(vosPath);
fileInfo.setPublic(false);
fileInfo.setOwnerId(userId);
--
GitLab