Skip to content

chore(test): Improve S3FileSystemProviderTest robustness #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 2, 2023
Merged

chore(test): Improve S3FileSystemProviderTest robustness #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be6e85f
chore(test): Clean up fs after creating it
guicamest Sep 29, 2023
18b8bf3
chore(test): Reuse fs in S3FileSystemProviderTest
guicamest Sep 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/test/java/software/amazon/nio/spi/s3/S3FileSystemProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public void init() {
provider = new S3FileSystemProvider();
lenient().when(mockClient.headObject(any(Consumer.class))).thenReturn(
CompletableFuture.supplyAsync(() -> HeadObjectResponse.builder().contentLength(100L).build()));
fs = provider.newFileSystem(URI.create(pathUri));
fs = provider.getFileSystem(URI.create(pathUri), true);
fs.clientProvider(new FixedS3ClientProvider(mockClient));
}

Expand Down
8 changes: 7 additions & 1 deletion src/test/java/software/amazon/nio/spi/s3/S3PathTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,13 @@ public void testEquals() {
// the working directory, which is always "/" for a bucket.
assertEquals(S3Path.getPath(fileSystem, "dir1/"), S3Path.getPath(fileSystem, "/dir1/"));

assertNotEquals(S3Path.getPath(fileSystem, "dir1/"), S3Path.getPath(provider.newFileSystem(URI.create("s3://foo")), "/dir1/"));
S3FileSystem fooFS = null;
try{
fooFS = provider.newFileSystem(URI.create("s3://foo"));;
assertNotEquals(S3Path.getPath(fileSystem, "dir1/"), S3Path.getPath(fooFS, "/dir1/"));
} finally {
if ( fooFS != null ) provider.closeFileSystem(fooFS);
}

// not equal because in s3 dir1 cannot be implied to be a directory unless it ends with "/"
assertNotEquals(S3Path.getPath(fileSystem, "dir1/"), S3Path.getPath(fileSystem, "dir1"));
Expand Down