hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-17 15:03:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken tests on Windows by using Paths to split file path instead of regex. Also switch to in-memory s3mock because Windows cannot cleanup created files successfully.

Browse Source
This commit is contained in:
Tim Donohue
2025-07-18 11:33:41 -05:00
parent 39fb2afba1
commit d2c120bd8b
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
dspace-api/src/test/java/org/dspace/storage/bitstore/S3BitStoreServiceIT.java
View File

@@ -26,9 +26,11 @@ import static org.junit.Assert.assertTrue;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.nio.file.Paths;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -41,7 +43,6 @@ import com.amazonaws.services.s3.model.AmazonS3Exception;
import com.amazonaws.services.s3.model.Bucket; import com.amazonaws.services.s3.model.Bucket;
import com.amazonaws.services.s3.model.ObjectMetadata; import com.amazonaws.services.s3.model.ObjectMetadata;
import io.findify.s3mock.S3Mock; import io.findify.s3mock.S3Mock;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.BooleanUtils; import org.apache.commons.lang.BooleanUtils;
import org.dspace.AbstractIntegrationTestWithDatabase; import org.dspace.AbstractIntegrationTestWithDatabase;
@@ -80,8 +81,6 @@ public class S3BitStoreServiceIT extends AbstractIntegrationTestWithDatabase {
private Collection collection; private Collection collection;
private File s3Directory;
private ConfigurationService configurationService = DSpaceServicesFactory.getInstance().getConfigurationService(); private ConfigurationService configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
@@ -89,9 +88,8 @@ public class S3BitStoreServiceIT extends AbstractIntegrationTestWithDatabase {
public void setup() throws Exception { public void setup() throws Exception {
configurationService.setProperty("assetstore.s3.enabled", "true"); configurationService.setProperty("assetstore.s3.enabled", "true");
s3Directory = new File(System.getProperty("java.io.tmpdir"), "s3");
s3Mock = S3Mock.create(8001, s3Directory.getAbsolutePath()); s3Mock = new S3Mock.Builder().withPort(8001).withInMemoryBackend().build();
s3Mock.start(); s3Mock.start();
amazonS3Client = createAmazonS3Client(); amazonS3Client = createAmazonS3Client();
@@ -112,8 +110,7 @@ public class S3BitStoreServiceIT extends AbstractIntegrationTestWithDatabase {
} }
@After @After
public void cleanUp() throws IOException { public void cleanUp() {
FileUtils.deleteDirectory(s3Directory);
s3Mock.shutdown(); s3Mock.shutdown();
} }
@@ -337,7 +334,7 @@ public class S3BitStoreServiceIT extends AbstractIntegrationTestWithDatabase {
String computedPath = this.s3BitStoreService.getIntermediatePath(path.toString()); String computedPath = this.s3BitStoreService.getIntermediatePath(path.toString());
int slashes = computeSlashes(path.toString()); int slashes = computeSlashes(path.toString());
assertThat(computedPath, Matchers.endsWith(File.separator)); assertThat(computedPath, Matchers.endsWith(File.separator));
assertThat(computedPath.split(File.separator).length, Matchers.equalTo(slashes)); assertThat(countPathElements(computedPath), Matchers.equalTo(slashes));
path.append("2"); path.append("2");
computedPath = this.s3BitStoreService.getIntermediatePath(path.toString()); computedPath = this.s3BitStoreService.getIntermediatePath(path.toString());
@@ -362,31 +359,31 @@ public class S3BitStoreServiceIT extends AbstractIntegrationTestWithDatabase {
String computedPath = this.s3BitStoreService.getIntermediatePath(path.toString()); String computedPath = this.s3BitStoreService.getIntermediatePath(path.toString());
int slashes = computeSlashes(path.toString()); int slashes = computeSlashes(path.toString());
assertThat(computedPath, Matchers.endsWith(File.separator)); assertThat(computedPath, Matchers.endsWith(File.separator));
assertThat(computedPath.split(File.separator).length, Matchers.equalTo(slashes)); assertThat(countPathElements(computedPath), Matchers.equalTo(slashes));
path.append("2"); path.append("2");
computedPath = this.s3BitStoreService.getIntermediatePath(path.toString()); computedPath = this.s3BitStoreService.getIntermediatePath(path.toString());
slashes = computeSlashes(path.toString()); slashes = computeSlashes(path.toString());
assertThat(computedPath, Matchers.endsWith(File.separator)); assertThat(computedPath, Matchers.endsWith(File.separator));
assertThat(computedPath.split(File.separator).length, Matchers.equalTo(slashes)); assertThat(countPathElements(computedPath), Matchers.equalTo(slashes));
path.append("3"); path.append("3");
computedPath = this.s3BitStoreService.getIntermediatePath(path.toString()); computedPath = this.s3BitStoreService.getIntermediatePath(path.toString());
slashes = computeSlashes(path.toString()); slashes = computeSlashes(path.toString());
assertThat(computedPath, Matchers.endsWith(File.separator)); assertThat(computedPath, Matchers.endsWith(File.separator));
assertThat(computedPath.split(File.separator).length, Matchers.equalTo(slashes)); assertThat(countPathElements(computedPath), Matchers.equalTo(slashes));
path.append("4"); path.append("4");
computedPath = this.s3BitStoreService.getIntermediatePath(path.toString()); computedPath = this.s3BitStoreService.getIntermediatePath(path.toString());
slashes = computeSlashes(path.toString()); slashes = computeSlashes(path.toString());
assertThat(computedPath, Matchers.endsWith(File.separator)); assertThat(computedPath, Matchers.endsWith(File.separator));
assertThat(computedPath.split(File.separator).length, Matchers.equalTo(slashes)); assertThat(countPathElements(computedPath), Matchers.equalTo(slashes));
path.append("56789"); path.append("56789");
computedPath = this.s3BitStoreService.getIntermediatePath(path.toString()); computedPath = this.s3BitStoreService.getIntermediatePath(path.toString());
slashes = computeSlashes(path.toString()); slashes = computeSlashes(path.toString());
assertThat(computedPath, Matchers.endsWith(File.separator)); assertThat(computedPath, Matchers.endsWith(File.separator));
assertThat(computedPath.split(File.separator).length, Matchers.equalTo(slashes)); assertThat(countPathElements(computedPath), Matchers.equalTo(slashes));
} }
@Test @Test
@@ -465,4 +462,12 @@ public class S3BitStoreServiceIT extends AbstractIntegrationTestWithDatabase {
return Math.min(slashes, S3BitStoreService.directoryLevels); return Math.min(slashes, S3BitStoreService.directoryLevels);
} }
// Count the number of elements in a Unix or Windows path.
// We use 'Paths' instead of splitting on slashes because these OSes use different path separators.
private int countPathElements(String stringPath) {
List<String> pathElements = new ArrayList<>();
Paths.get(stringPath).forEach(p -> pathElements.add(p.toString()));
return pathElements.size();
}
} }