From 0c18894c3b6a9995f853c06161c1ec915222d2ba Mon Sep 17 00:00:00 2001
From: nfcalabria <nfcalabria@localhost>
Date: Thu, 30 Sep 2021 22:52:45 +0200
Subject: [PATCH] Fixed FileDAOTest
---
.../ia2/transfer/persistence/FileDAOTest.java | 23 ++++---------------
1 file changed, 5 insertions(+), 18 deletions(-)
diff --git a/src/test/java/it/inaf/ia2/transfer/persistence/FileDAOTest.java b/src/test/java/it/inaf/ia2/transfer/persistence/FileDAOTest.java
index 924c940..eff383e 100644
--- a/src/test/java/it/inaf/ia2/transfer/persistence/FileDAOTest.java
+++ b/src/test/java/it/inaf/ia2/transfer/persistence/FileDAOTest.java
@@ -87,13 +87,13 @@ public class FileDAOTest {
assertEquals(6, fileInfos.size());
- assertEquals("/home/vospace/upload/user1/file1", fileInfos.get(0).getOsPath());
- assertEquals("/home/vospace/upload/user1/file2", fileInfos.get(1).getOsPath());
+ assertEquals("/home/vospace/upload/2021/9/30/file1-UUID", fileInfos.get(0).getFilePath());
+ assertEquals("/home/vospace/upload/2021/9/30/file2-UUID", fileInfos.get(1).getFilePath());
assertEquals("user", fileInfos.get(1).getLocationType());
assertTrue(fileInfos.get(2).isDirectory());
assertNull(fileInfos.get(2).getLocationType());
- assertEquals("/home/username1/retrieve/subdir1/file3", fileInfos.get(3).getOsPath());
- assertEquals("/home/username1/retrieve/subdir1/file4", fileInfos.get(4).getOsPath());
+ assertEquals("/home/username1/retrieve/2021/9/30/file3-UUID", fileInfos.get(3).getFilePath());
+ assertEquals("/home/username1/retrieve/2021/9/30/file4-UUID", fileInfos.get(4).getFilePath());
assertEquals("async", fileInfos.get(4).getLocationType());
assertEquals("portal-file", fileInfos.get(5).getVirtualName());
assertEquals("portal", fileInfos.get(5).getLocationType());
@@ -138,19 +138,6 @@ public class FileDAOTest {
}
- // TODO: refactor test
- /*
- @Test
- public void testSetOsName() {
-
- FileInfo fileInfo = dao.getFileInfo("/public/file1").get();
- assertTrue(fileInfo.getOsPath().endsWith("/file1"));
-
- dao.setOsName(fileInfo.getNodeId(), "file1-renamed");
- fileInfo = dao.getFileInfo("/public/file1").get();
- assertTrue(fileInfo.getOsPath().endsWith("/file1-renamed"));
- }*/
-
@Test
public void testUpdateFileAttributes() {
@@ -160,7 +147,7 @@ public class FileDAOTest {
assertNull(fileInfo.getContentType());
assertNull(fileInfo.getContentEncoding());
assertNull(fileInfo.getContentMd5());
- assertNull(fileInfo.getFsPath());
+ assertEquals("2021/9/30/file1-UUID", fileInfo.getFsPath());
dao.updateFileAttributes(fileInfo.getNodeId(), "/2021/09/24/UIID-1", "text/plain", "UTF-8", 50000l, "<md5>");
--
GitLab