-
+
#{bundle.editor} #{bundle['dataverse.permissions.Q2.answer.editor.description']}
diff --git a/src/test/java/edu/harvard/iq/dataverse/DataCitationTest.java b/src/test/java/edu/harvard/iq/dataverse/DataCitationTest.java
index a2abf573e46..b32243d446d 100644
--- a/src/test/java/edu/harvard/iq/dataverse/DataCitationTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/DataCitationTest.java
@@ -72,7 +72,7 @@ public void testWriteAsBibtexCitation() throws ParseException, IOException {
"@data{LK0D1H_1955,\r\n"
+ "author = {First Last},\r\n"
+ "publisher = {LibraScholar},\r\n"
- + "title = \"{Dataset Title}\",\r\n"
+ + "title = {{Dataset Title}},\r\n"
+ "year = {1955},\r\n"
+ "version = {V1},\r\n"
+ "doi = {10.5072/FK2/LK0D1H},\r\n"
@@ -95,7 +95,7 @@ public void testToBibtexString() throws ParseException {
"@data{LK0D1H_1955,\r\n"
+ "author = {First Last},\r\n"
+ "publisher = {LibraScholar},\r\n"
- + "title = \"{Dataset Title}\",\r\n"
+ + "title = {{Dataset Title}},\r\n"
+ "year = {1955},\r\n"
+ "version = {V1},\r\n"
+ "doi = {10.5072/FK2/LK0D1H},\r\n"
@@ -119,7 +119,7 @@ public void testToBibtexString_withoutAuthor() throws ParseException {
"@data{LK0D1H_1955,\r\n"
+ "author = {},\r\n"
+ "publisher = {LibraScholar},\r\n"
- + "title = \"{Dataset Title}\",\r\n"
+ + "title = {{Dataset Title}},\r\n"
+ "year = {1955},\r\n"
+ "version = {V1},\r\n"
+ "doi = {10.5072/FK2/LK0D1H},\r\n"
@@ -144,7 +144,7 @@ public void testToBibtexString_withoutTitle() throws ParseException {
"@data{LK0D1H_1955,\r\n"
+ "author = {First Last},\r\n"
+ "publisher = {LibraScholar},\r\n"
- + "title = \"{}\",\r\n"
+ + "title = {{}},\r\n"
+ "year = {1955},\r\n"
+ "version = {V1},\r\n"
+ "doi = {10.5072/FK2/LK0D1H},\r\n"
@@ -169,7 +169,7 @@ public void testToBibtexString_withoutTitleAndAuthor() throws ParseException {
"@data{LK0D1H_1955,\r\n"
+ "author = {},\r\n"
+ "publisher = {LibraScholar},\r\n"
- + "title = \"{}\",\r\n"
+ + "title = {{}},\r\n"
+ "year = {1955},\r\n"
+ "version = {V1},\r\n"
+ "doi = {10.5072/FK2/LK0D1H},\r\n"
@@ -335,7 +335,7 @@ public void testTitleWithQuotes() throws ParseException {
"@data{LK0D1H_1955,\r\n"
+ "author = {First Last},\r\n"
+ "publisher = {LibraScholar},\r\n"
- + "title = \"{This Title ``Has Quotes'' In It}\",\r\n"
+ + "title = {{This Title ``Has Quotes'' In It}},\r\n"
+ "year = {1955},\r\n"
+ "version = {V1},\r\n"
+ "doi = {10.5072/FK2/LK0D1H},\r\n"
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/SearchIT.java b/src/test/java/edu/harvard/iq/dataverse/api/SearchIT.java
index 4768a8b80c4..c83afc1470c 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/SearchIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/SearchIT.java
@@ -384,6 +384,7 @@ public void testDatasetThumbnail() {
search2.prettyPrint();
search2.then().assertThat()
.body("data.items[0].name", CoreMatchers.equalTo("Darwin's Finches"))
+ .body("data.items[0].fileCount", CoreMatchers.equalTo(1))
.statusCode(200);
//Unpublished datafiles no longer populate the dataset thumbnail
diff --git a/src/test/java/edu/harvard/iq/dataverse/dataaccess/DataAccessTest.java b/src/test/java/edu/harvard/iq/dataverse/dataaccess/DataAccessTest.java
index a1a96a363ed..1ff914adff9 100644
--- a/src/test/java/edu/harvard/iq/dataverse/dataaccess/DataAccessTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/dataaccess/DataAccessTest.java
@@ -2,6 +2,7 @@
import edu.harvard.iq.dataverse.DataFile;
import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.Dataverse;
import edu.harvard.iq.dataverse.mocks.MocksFactory;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -12,12 +13,15 @@
public class DataAccessTest {
DataFile datafile;
Dataset dataset;
+ Dataverse dataverse;
@BeforeEach
void setUp() {
datafile = MocksFactory.makeDataFile();
dataset = MocksFactory.makeDataset();
+ dataverse = MocksFactory.makeDataverse();
datafile.setOwner(dataset);
+ dataset.setOwner(dataverse);
}
@Test
@@ -50,6 +54,8 @@ void testCreateNewStorageIO_throwsOnUnsupported() {
@Test
void testCreateNewStorageIO_createsFileAccessIObyDefault() throws IOException {
+ System.setProperty("dataverse.files.file.type", "file");
+ System.setProperty("dataverse.files.storage-driver-id", "file");
StorageIO storageIo = DataAccess.createNewStorageIO(dataset, "valid-tag");
assertTrue(storageIo.getClass().equals(FileAccessIO.class));
}
diff --git a/src/test/java/edu/harvard/iq/dataverse/dataaccess/FileAccessIOTest.java b/src/test/java/edu/harvard/iq/dataverse/dataaccess/FileAccessIOTest.java
index 96c74515c76..286fe8a6595 100644
--- a/src/test/java/edu/harvard/iq/dataverse/dataaccess/FileAccessIOTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/dataaccess/FileAccessIOTest.java
@@ -39,6 +39,8 @@ public class FileAccessIOTest {
private Dataset dataset;
private DataFile dataFile;
+ private String dummyDriverId = "dummmy";
+
private Path fileSystemPath = new File("/tmp/files/tmp/dataset/Dataset").toPath();
public FileAccessIOTest() {
@@ -56,10 +58,10 @@ public void setUpClass() throws IOException {
dataFile = MocksFactory.makeDataFile();
dataFile.setOwner(dataset);
dataFile.setStorageIdentifier("DataFile");
-
- datasetAccess = new FileAccessIO<>(dataset);
- dataFileAccess = new FileAccessIO<>(dataFile);
- dataverseAccess = new FileAccessIO<>(dataverse);
+
+ datasetAccess = new FileAccessIO<>(dataset,null, dummyDriverId);
+ dataFileAccess = new FileAccessIO<>(dataFile, null, dummyDriverId);
+ dataverseAccess = new FileAccessIO<>(dataverse, null, dummyDriverId);
File file = new File("/tmp/files/tmp/dataset/Dataset");
file.getParentFile().mkdirs();
@@ -209,7 +211,7 @@ public void testDeleteAuxObject() throws IOException {
*/
@Test
public void testGetStorageLocation() {
- String expResult = "file:///tmp/files/tmp/dataset/Dataset";
+ String expResult = dummyDriverId + ":///tmp/files/tmp/dataset/Dataset";
String result = datasetAccess.getStorageLocation();
assertEquals(expResult, result);
}
diff --git a/src/test/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIOTest.java b/src/test/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIOTest.java
index 4ce821a5fee..f92b44862e2 100644
--- a/src/test/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIOTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIOTest.java
@@ -43,8 +43,8 @@ public void setup() throws IOException {
dataFile.setOwner(dataSet);
dataFileId = UtilIT.getRandomIdentifier();
dataFile.setStorageIdentifier("s3://bucket:"+dataFileId);
- dataSetAccess = new S3AccessIO<>(dataSet, null, s3client);
- dataFileAccess = new S3AccessIO<>(dataFile, null, s3client);
+ dataSetAccess = new S3AccessIO<>(dataSet, null, s3client, "s3");
+ dataFileAccess = new S3AccessIO<>(dataFile, null, s3client, "s3");
}
/*
@@ -99,7 +99,7 @@ void keyNullstorageIdNull_getMainFileKey() throws IOException {
@Test
void default_getUrlExpirationMinutes() {
// given
- System.clearProperty("dataverse.files.s3-url-expiration-minutes");
+ System.clearProperty("dataverse.files.s3.url-expiration-minutes");
// when & then
assertEquals(60, dataFileAccess.getUrlExpirationMinutes());
}
@@ -107,7 +107,7 @@ void default_getUrlExpirationMinutes() {
@Test
void validSetting_getUrlExpirationMinutes() {
// given
- System.setProperty("dataverse.files.s3-url-expiration-minutes", "120");
+ System.setProperty("dataverse.files.s3.url-expiration-minutes", "120");
// when & then
assertEquals(120, dataFileAccess.getUrlExpirationMinutes());
}
@@ -115,7 +115,7 @@ void validSetting_getUrlExpirationMinutes() {
@Test
void invalidSetting_getUrlExpirationMinutes() {
// given
- System.setProperty("dataverse.files.s3-url-expiration-minutes", "NaN");
+ System.setProperty("dataverse.files.s3.url-expiration-minutes", "NaN");
// when & then
assertEquals(60, dataFileAccess.getUrlExpirationMinutes());
}
diff --git a/src/test/java/edu/harvard/iq/dataverse/dataaccess/StorageIOTest.java b/src/test/java/edu/harvard/iq/dataverse/dataaccess/StorageIOTest.java
index 2700bf3448c..513d4d90988 100644
--- a/src/test/java/edu/harvard/iq/dataverse/dataaccess/StorageIOTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/dataaccess/StorageIOTest.java
@@ -77,8 +77,9 @@ public void testGetDvObject() {
} catch (ClassCastException ex) {
assertEquals(ex.getMessage(), "edu.harvard.iq.dataverse.Dataset cannot be cast to edu.harvard.iq.dataverse.Dataverse");
}
- assertEquals(new DataFile(), new FileAccessIO<>(new DataFile()).getDataFile());
- assertEquals(new Dataverse(), new FileAccessIO<>(new Dataverse()).getDataverse());
+ // null driver defaults to 'file'
+ assertEquals(new DataFile(), new FileAccessIO<>(new DataFile(), null, null).getDataFile());
+ assertEquals(new Dataverse(), new FileAccessIO<>(new Dataverse(), null, null).getDataverse());
}
@Test
diff --git a/src/test/java/edu/harvard/iq/dataverse/dataaccess/SwiftAccessIOTest.java b/src/test/java/edu/harvard/iq/dataverse/dataaccess/SwiftAccessIOTest.java
index 554242c9311..c1aa6b5fca3 100644
--- a/src/test/java/edu/harvard/iq/dataverse/dataaccess/SwiftAccessIOTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/dataaccess/SwiftAccessIOTest.java
@@ -39,8 +39,9 @@ public void setUpClass() throws IOException {
datafile = MocksFactory.makeDataFile();
dataset = MocksFactory.makeDataset();
datafile.setOwner(dataset);
- datasetAccess = new SwiftAccessIO<>(dataset);
- datafileAccess = new SwiftAccessIO<>(datafile);
+ String dummyDriverId="dummy";
+ datasetAccess = new SwiftAccessIO<>(dataset, null, dummyDriverId);
+ datafileAccess = new SwiftAccessIO<>(datafile, null, dummyDriverId);
swiftAccess = new SwiftAccessIO();
}
diff --git a/src/test/java/edu/harvard/iq/dataverse/dataset/DatasetUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/dataset/DatasetUtilTest.java
index c72bc5d6faa..bb19a32c4f8 100644
--- a/src/test/java/edu/harvard/iq/dataverse/dataset/DatasetUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/dataset/DatasetUtilTest.java
@@ -29,7 +29,8 @@ public void testGetThumbnailCandidates() {
DataFile dataFile = MocksFactory.makeDataFile();
dataFile.setContentType("image/");
dataFile.setOwner(dataset);
- dataFile.setStorageIdentifier("file://src/test/resources/images/coffeeshop.png");
+ System.setProperty("dataverse.files.testfile.type", "file");
+ dataFile.setStorageIdentifier("testfile://src/test/resources/images/coffeeshop.png");
System.out.println(ImageThumbConverter.isThumbnailAvailable(dataFile));
DatasetVersion version = dataset.getCreateVersion();
@@ -45,7 +46,8 @@ public void testGetThumbnailNullDataset() {
assertNull(DatasetUtil.getThumbnail(null, null));
Dataset dataset = MocksFactory.makeDataset();
- dataset.setStorageIdentifier("file://");
+ System.setProperty("dataverse.files.testfile.type", "file");
+ dataset.setStorageIdentifier("testfile://");
dataset.setUseGenericThumbnail(true);
assertNull(DatasetUtil.getThumbnail(dataset));