test: flesh out WriteShardTests

Author: bogovicj

src/test/java/org/janelia/saalfeldlab/n5/shard/WriteShardTest.java

@@ -33,6 +33,9 @@
 import static org.junit.Assert.assertTrue;
 
 import java.util.Arrays;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.stream.Streams;
 import org.janelia.saalfeldlab.n5.DataBlock;
 import org.janelia.saalfeldlab.n5.DataType;
 import org.janelia.saalfeldlab.n5.DatasetAttributes;
@@ -185,11 +188,16 @@ public void testWriteNullBlockRemovesShard() throws Exception {
 		final PositionValueAccess store = new TestPositionValueAccess();
 		final long[] shardKey = {1};
 
+		/**
+		 * ONE BLOCK, ONE SHARD
+		 */
+
 		assertFalse("Shard should not exist at the start of the test", store.exists(shardKey));
 
 		// Write a single block at grid position [3]
-		// This block is in shard [1] (shard 0 contains blocks 0-1, shard 1
-		// contains blocks 2-3)
+		// This block is in shard [1] 
+		// ( shard 0 contains blocks 0-1,
+		//   shard 1 contains blocks 2-3 )
 		final long[] blockGridPosition = {3};
 		final DataBlock<int[]> block = createDataBlock(datablockSize, blockGridPosition, 100);
 
@@ -214,17 +222,30 @@ public void testWriteNullBlockRemovesShard() throws Exception {
 
 		// Verify the shard has been removed
 		assertFalse("Shard should be removed after writing null block", store.exists(shardKey));
-
-		// Write two blocks into the same shard
+		
+		/**
+		 * THREE BLOCKS, TWO SHARDS
+		 */
+		// Write two blocks into the same shard, and one block into a second shard
 		// Shard [1] contains blocks [2] and [3]
+		// Shard [2] contains block  [4]
+		final long[] shardKey1 = {1};
+		final long[] shardKey2 = {2};
+
 		final DataBlock<int[]> block1 = createDataBlock(datablockSize, new long[]{2}, 100);
 		final DataBlock<int[]> block2 = createDataBlock(datablockSize, new long[]{3}, 200);
+		final DataBlock<int[]> block3 = createDataBlock(datablockSize, new long[]{4}, 300);
 
-		datasetAccess.writeBlock(store, block1);
-		datasetAccess.writeBlock(store, block2);
+
+		assertFalse("Shard should not exist at the start of the test", store.exists(shardKey1));
+		assertFalse("Shard should not exist at the start of the test", store.exists(shardKey2));
+
+		// write blocks
+		datasetAccess.writeBlocks(store, Streams.of(block1, block2, block3).collect(Collectors.toList()));
 
 		// Verify the shard exists
-		assertTrue("Shard should exist after writing blocks", store.exists(shardKey));
+		assertTrue("Shard should exist after writing blocks", store.exists(shardKey1));
+		assertTrue("Shard should exist after writing blocks", store.exists(shardKey2));
 
 		// Write a null block at block [3]'s location
 		datasetAccess.writeRegion(
@@ -235,7 +256,8 @@ public void testWriteNullBlockRemovesShard() throws Exception {
 				false);
 
 		// Verify the shard still exists (because block [2] is still there)
-		assertTrue("Shard should still exist because it contains another block", store.exists(shardKey));
+		assertTrue("Shard should still exist because it contains another block", store.exists(shardKey1));
+		assertTrue("Shard should still exist because was not affected", store.exists(shardKey2));
 
 		// Verify we can still read block [2]
 		final DataBlock<int[]> readBlock = datasetAccess.readBlock(store, new long[]{2});
@@ -246,6 +268,11 @@ public void testWriteNullBlockRemovesShard() throws Exception {
 		final DataBlock<int[]> readBlock2 = datasetAccess.readBlock(store, new long[]{3});
 		assertNull("Block [3] should be null after removal", readBlock2);
 
+		// Verify block [4] exists
+		final DataBlock<int[]> readBlock3 = datasetAccess.readBlock(store, new long[]{4});
+		assertTrue("Block [4] should still be readable", readBlock3 != null);
+		assertTrue("Block [4] data should match", Arrays.equals(block3.getData(), readBlock3.getData()));
+
 		// Write a null block at block [2]'s location
 		final long[] regionMin2 = {6}; // pixel position of block [3]
 		final long[] regionSize2 = {3};
@@ -257,7 +284,8 @@ public void testWriteNullBlockRemovesShard() throws Exception {
 				(gridPosition, existingBlock) -> null,
 				false);
 
-		assertFalse("Shard should not exist after deleting all blocks", store.exists(shardKey));
+		assertFalse("Shard should not exist after deleting all blocks", store.exists(shardKey1));
+		assertTrue("Shard should still exist because was not affected", store.exists(shardKey2));
 	}
 
 	private static DataBlock<int[]> createDataBlock(int[] size, long[] gridPosition, int startValue) {