Skip to content

Commit 753f5b5

Browse files
committed
adjusting tests to work with encoder
1 parent 19cc55c commit 753f5b5

File tree

1 file changed

+23
-16
lines changed
  • sdk/storage/azure-storage-common/src/test/java/com/azure/storage/common/implementation/structuredmessage

1 file changed

+23
-16
lines changed

sdk/storage/azure-storage-common/src/test/java/com/azure/storage/common/implementation/structuredmessage/MessageEncoderTests.java

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,19 @@
1515
import java.nio.ByteBuffer;
1616
import java.nio.ByteOrder;
1717
import java.util.Arrays;
18+
import java.util.Objects;
1819
import java.util.concurrent.ThreadLocalRandom;
1920
import java.util.stream.Stream;
2021

22+
import static com.azure.core.util.FluxUtil.collectBytesInByteBufferStream;
23+
import static com.azure.storage.common.implementation.structuredmessage.StructuredMessageConstants.CRC64_LENGTH;
24+
import static com.azure.storage.common.implementation.structuredmessage.StructuredMessageConstants.V1_HEADER_LENGTH;
25+
import static com.azure.storage.common.implementation.structuredmessage.StructuredMessageConstants.V1_SEGMENT_HEADER_LENGTH;
2126
import static org.junit.jupiter.api.Assertions.assertEquals;
2227
import static org.junit.jupiter.api.Assertions.assertThrows;
2328

2429
public class MessageEncoderTests {
2530

26-
private static final int V1_HEADER_LENGTH = 13;
27-
private static final int V1_SEGMENT_HEADER_LENGTH = 10;
28-
private static final int CRC64_LENGTH = 8;
29-
3031
private static byte[] getRandomData(int size) {
3132
byte[] result = new byte[size];
3233
ThreadLocalRandom.current().nextBytes(result);
@@ -156,7 +157,7 @@ public void readAll(int size, int segmentSize, StructuredMessageFlags flags) thr
156157

157158
StructuredMessageEncoder structuredMessageEncoder = new StructuredMessageEncoder(size, segmentSize, flags);
158159

159-
byte[] actual = structuredMessageEncoder.encode(unencodedBuffer).array();
160+
byte[] actual = collectBytesInByteBufferStream(structuredMessageEncoder.encode(unencodedBuffer)).block();
160161
byte[] expected = buildStructuredMessage(unencodedBuffer, segmentSize, flags).array();
161162

162163
Assertions.assertArrayEquals(expected, actual);
@@ -191,33 +192,39 @@ public void readMultiple(int segmentSize, StructuredMessageFlags flags) throws I
191192
byte[] expected = buildStructuredMessage(allWrappedData, segmentSize, flags).array();
192193

193194
ByteArrayOutputStream allActualData = new ByteArrayOutputStream();
194-
allActualData.write(structuredMessageEncoder.encode(wrappedData1).array());
195-
allActualData.write(structuredMessageEncoder.encode(wrappedData2).array());
196-
allActualData.write(structuredMessageEncoder.encode(wrappedData3).array());
195+
allActualData.write(Objects
196+
.requireNonNull(collectBytesInByteBufferStream(structuredMessageEncoder.encode(wrappedData1)).block()));
197+
allActualData.write(Objects
198+
.requireNonNull(collectBytesInByteBufferStream(structuredMessageEncoder.encode(wrappedData2)).block()));
199+
allActualData.write(Objects
200+
.requireNonNull(collectBytesInByteBufferStream(structuredMessageEncoder.encode(wrappedData3)).block()));
197201

198202
Assertions.assertArrayEquals(expected, allActualData.toByteArray());
199203
}
200204

201205
@Test
202-
public void emptyBuffer() throws IOException {
206+
public void emptyBuffer() {
203207
StructuredMessageEncoder encoder = new StructuredMessageEncoder(10, 5, StructuredMessageFlags.NONE);
204208
ByteBuffer emptyBuffer = ByteBuffer.allocate(0);
205-
ByteBuffer result = encoder.encode(emptyBuffer);
209+
ByteBuffer result = ByteBuffer
210+
.wrap(Objects.requireNonNull(collectBytesInByteBufferStream(encoder.encode(emptyBuffer)).block()));
206211
assertEquals(0, result.remaining());
207212
}
208213

209214
@Test
210-
public void contentAlreadyEncoded() throws IOException {
215+
public void contentAlreadyEncoded() {
211216
StructuredMessageEncoder encoder = new StructuredMessageEncoder(4, 2, StructuredMessageFlags.NONE);
212-
encoder.encode(ByteBuffer.wrap(new byte[] { 1, 2, 3, 4 }));
213-
assertThrows(IllegalArgumentException.class, () -> encoder.encode(ByteBuffer.wrap(new byte[] { 1, 2 })));
217+
encoder.encode(ByteBuffer.wrap(new byte[] { 1, 2, 3, 4 })).blockLast();
218+
assertThrows(IllegalArgumentException.class,
219+
() -> encoder.encode(ByteBuffer.wrap(new byte[] { 1, 2 })).blockLast());
214220
}
215221

216222
@Test
217-
public void bufferLengthExceedsContentLength() throws IOException {
223+
public void bufferLengthExceedsContentLength() {
218224
StructuredMessageEncoder encoder = new StructuredMessageEncoder(4, 2, StructuredMessageFlags.NONE);
219-
encoder.encode(ByteBuffer.wrap(new byte[] { 1, 2, 3 }));
220-
assertThrows(IllegalArgumentException.class, () -> encoder.encode(ByteBuffer.wrap(new byte[] { 1, 2 })));
225+
encoder.encode(ByteBuffer.wrap(new byte[] { 1, 2, 3 })).blockLast();
226+
assertThrows(IllegalArgumentException.class,
227+
() -> encoder.encode(ByteBuffer.wrap(new byte[] { 1, 2 })).blockLast());
221228
}
222229

223230
@Test

0 commit comments

Comments
 (0)