Skip to content

Commit ca88fb5

Browse files
committed
Merge branch 'main' into zip-store
# Conflicts: # src/test/java/dev/zarr/zarrjava/ZarrStoreTest.java
2 parents 7d4f487 + 6689585 commit ca88fb5

2 files changed

Lines changed: 21 additions & 11 deletions

File tree

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,10 @@ build/
3737

3838
### Custom ###
3939
/testdata/l4_sample
40+
/testdata/l4_sample.zip
4041
/testoutput
4142
/.python-version
4243
/main.py
4344
/pyproject.toml
4445
/uv.lock
46+
**/__pycache__

src/test/java/dev/zarr/zarrjava/ZarrStoreTest.java

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
1010
import org.apache.commons.compress.archivers.zip.ZipFile;
11+
import java.net.URI;
1112
import org.junit.jupiter.api.Assertions;
1213
import org.junit.jupiter.api.Test;
1314
import org.junit.jupiter.params.ParameterizedTest;
@@ -16,6 +17,7 @@
1617
import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider;
1718
import software.amazon.awssdk.regions.Region;
1819
import software.amazon.awssdk.services.s3.S3Client;
20+
import software.amazon.awssdk.services.s3.S3Configuration;
1921

2022
import java.io.IOException;
2123
import java.io.InputStream;
@@ -75,17 +77,23 @@ public void testFileSystemStores() throws IOException, ZarrException {
7577
@Test
7678
public void testS3Store() throws IOException, ZarrException {
7779
S3Store s3Store = new S3Store(S3Client.builder()
78-
.region(Region.of("eu-west-1"))
80+
.endpointOverride(URI.create("https://uk1s3.embassy.ebi.ac.uk"))
81+
.region(Region.US_EAST_1) // required, but ignored
82+
.serviceConfiguration(
83+
S3Configuration.builder()
84+
.pathStyleAccessEnabled(true) // required
85+
.build()
86+
)
7987
.credentialsProvider(AnonymousCredentialsProvider.create())
80-
.build(), "static.webknossos.org", "data");
88+
.build(), "idr", "zarr/v0.5/idr0033A");
8189

82-
Array arrayV3 = Array.open(s3Store.resolve("zarr_v3", "l4_sample", "color", "1"));
83-
Assertions.assertArrayEquals(new long[]{1, 4096, 4096, 2048}, arrayV3.metadata().shape);
84-
Assertions.assertEquals(0, arrayV3.read(new long[]{0,0,0,0}, new int[]{1,1,1,1}).getInt(0));
90+
Array arrayV3 = Array.open(s3Store.resolve("BR00109990_C2.zarr", "0", "0"));
91+
Assertions.assertArrayEquals(new long[]{5, 1552, 2080}, arrayV3.metadata().shape);
92+
Assertions.assertEquals(574, arrayV3.read(new long[]{0,0,0}, new int[]{1,1,1}).getInt(0));
8593

86-
dev.zarr.zarrjava.core.Array arrayCore = dev.zarr.zarrjava.core.Array.open(s3Store.resolve("zarr_v3", "l4_sample", "color", "1"));
87-
Assertions.assertArrayEquals(new long[]{1, 4096, 4096, 2048}, arrayCore.metadata().shape);
88-
Assertions.assertEquals(0, arrayCore.read(new long[]{0,0,0,0}, new int[]{1,1,1,1}).getInt(0));
94+
dev.zarr.zarrjava.core.Array arrayCore = dev.zarr.zarrjava.core.Array.open(s3Store.resolve("BR00109990_C2.zarr", "0", "0"));
95+
Assertions.assertArrayEquals(new long[]{5, 1552, 2080}, arrayCore.metadata().shape);
96+
Assertions.assertEquals(574, arrayCore.read(new long[]{0,0,0}, new int[]{1,1,1}).getInt(0));
8997
}
9098

9199
@Test
@@ -165,10 +173,10 @@ public void testStoreGetSize(StoreHandle storeHandle) throws IOException, ZarrEx
165173

166174
@Test
167175
public void testHttpStore() throws IOException, ZarrException {
168-
HttpStore httpStore = new dev.zarr.zarrjava.store.HttpStore("https://static.webknossos.org/data/zarr_v3/l4_sample");
169-
Array array = Array.open(httpStore.resolve("color", "1"));
176+
HttpStore httpStore = new dev.zarr.zarrjava.store.HttpStore("https://uk1s3.embassy.ebi.ac.uk/idr/zarr/v0.5/idr0033A");
177+
Array array = Array.open(httpStore.resolve("BR00109990_C2.zarr", "0", "0"));
170178

171-
Assertions.assertArrayEquals(new long[]{1, 4096, 4096, 2048}, array.metadata().shape);
179+
Assertions.assertArrayEquals(new long[]{5, 1552, 2080}, array.metadata().shape);
172180
}
173181

174182
@ParameterizedTest

0 commit comments

Comments
 (0)