Fix SnappyFramedDecoderTest
This commit is contained in:
parent
319b7fa69a
commit
3268781607
|
@ -168,11 +168,13 @@ public class SnappyFramedDecoder extends ByteToByteDecoder {
|
||||||
| in.readUnsignedByte() << 16
|
| in.readUnsignedByte() << 16
|
||||||
| in.readUnsignedByte() << 24;
|
| in.readUnsignedByte() << 24;
|
||||||
if (validateChecksums) {
|
if (validateChecksums) {
|
||||||
|
// TODO: Optimize me.
|
||||||
ByteBuf uncompressed = ctx.alloc().buffer();
|
ByteBuf uncompressed = ctx.alloc().buffer();
|
||||||
snappy.decode(in, uncompressed, chunkLength);
|
snappy.decode(in.readSlice(chunkLength - 4), uncompressed, chunkLength);
|
||||||
validateChecksum(uncompressed, checksum);
|
validateChecksum(uncompressed, checksum);
|
||||||
|
out.writeBytes(uncompressed);
|
||||||
} else {
|
} else {
|
||||||
snappy.decode(in, out, chunkLength);
|
snappy.decode(in.readSlice(chunkLength - 4), out, chunkLength);
|
||||||
}
|
}
|
||||||
snappy.reset();
|
snappy.reset();
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -18,17 +18,23 @@ package io.netty.handler.codec.compression;
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
import io.netty.buffer.Unpooled;
|
import io.netty.buffer.Unpooled;
|
||||||
import io.netty.channel.embedded.EmbeddedByteChannel;
|
import io.netty.channel.embedded.EmbeddedByteChannel;
|
||||||
|
import org.junit.Before;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import static org.junit.Assert.*;
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
public class SnappyFramedDecoderTest {
|
public class SnappyFramedDecoderTest {
|
||||||
private final EmbeddedByteChannel channel = new EmbeddedByteChannel(new SnappyFramedDecoder());
|
private EmbeddedByteChannel channel;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void initChannel() {
|
||||||
|
channel = new EmbeddedByteChannel(new SnappyFramedDecoder());
|
||||||
|
}
|
||||||
|
|
||||||
@Test(expected = CompressionException.class)
|
@Test(expected = CompressionException.class)
|
||||||
public void testReservedUnskippableChunkTypeCausesError() throws Exception {
|
public void testReservedUnskippableChunkTypeCausesError() throws Exception {
|
||||||
ByteBuf in = Unpooled.wrappedBuffer(new byte[] {
|
ByteBuf in = Unpooled.wrappedBuffer(new byte[] {
|
||||||
0x03, 0x01, 0x00, 0x00
|
0x03, 0x01, 0x00, 0x00, 0x00
|
||||||
});
|
});
|
||||||
|
|
||||||
channel.writeInbound(in);
|
channel.writeInbound(in);
|
||||||
|
@ -37,7 +43,7 @@ public class SnappyFramedDecoderTest {
|
||||||
@Test(expected = CompressionException.class)
|
@Test(expected = CompressionException.class)
|
||||||
public void testInvalidStreamIdentifierLength() throws Exception {
|
public void testInvalidStreamIdentifierLength() throws Exception {
|
||||||
ByteBuf in = Unpooled.wrappedBuffer(new byte[] {
|
ByteBuf in = Unpooled.wrappedBuffer(new byte[] {
|
||||||
-0x80, 0x05, 0x00, 'n', 'e', 't', 't', 'y'
|
-0x80, 0x05, 0x00, 0x00, 'n', 'e', 't', 't', 'y'
|
||||||
});
|
});
|
||||||
|
|
||||||
channel.writeInbound(in);
|
channel.writeInbound(in);
|
||||||
|
@ -46,7 +52,7 @@ public class SnappyFramedDecoderTest {
|
||||||
@Test(expected = CompressionException.class)
|
@Test(expected = CompressionException.class)
|
||||||
public void testInvalidStreamIdentifierValue() throws Exception {
|
public void testInvalidStreamIdentifierValue() throws Exception {
|
||||||
ByteBuf in = Unpooled.wrappedBuffer(new byte[] {
|
ByteBuf in = Unpooled.wrappedBuffer(new byte[] {
|
||||||
-0x80, 0x06, 0x00, 's', 'n', 'e', 't', 't', 'y'
|
-0x80, 0x06, 0x00, 0x00, 's', 'n', 'e', 't', 't', 'y'
|
||||||
});
|
});
|
||||||
|
|
||||||
channel.writeInbound(in);
|
channel.writeInbound(in);
|
||||||
|
@ -55,7 +61,7 @@ public class SnappyFramedDecoderTest {
|
||||||
@Test(expected = CompressionException.class)
|
@Test(expected = CompressionException.class)
|
||||||
public void testReservedSkippableBeforeStreamIdentifier() throws Exception {
|
public void testReservedSkippableBeforeStreamIdentifier() throws Exception {
|
||||||
ByteBuf in = Unpooled.wrappedBuffer(new byte[] {
|
ByteBuf in = Unpooled.wrappedBuffer(new byte[] {
|
||||||
-0x7f, 0x06, 0x00, 's', 'n', 'e', 't', 't', 'y'
|
-0x7f, 0x06, 0x00, 0x00, 's', 'n', 'e', 't', 't', 'y'
|
||||||
});
|
});
|
||||||
|
|
||||||
channel.writeInbound(in);
|
channel.writeInbound(in);
|
||||||
|
@ -64,7 +70,7 @@ public class SnappyFramedDecoderTest {
|
||||||
@Test(expected = CompressionException.class)
|
@Test(expected = CompressionException.class)
|
||||||
public void testUncompressedDataBeforeStreamIdentifier() throws Exception {
|
public void testUncompressedDataBeforeStreamIdentifier() throws Exception {
|
||||||
ByteBuf in = Unpooled.wrappedBuffer(new byte[] {
|
ByteBuf in = Unpooled.wrappedBuffer(new byte[] {
|
||||||
0x01, 0x05, 0x00, 'n', 'e', 't', 't', 'y'
|
0x01, 0x05, 0x00, 0x00, 'n', 'e', 't', 't', 'y'
|
||||||
});
|
});
|
||||||
|
|
||||||
channel.writeInbound(in);
|
channel.writeInbound(in);
|
||||||
|
@ -73,7 +79,7 @@ public class SnappyFramedDecoderTest {
|
||||||
@Test(expected = CompressionException.class)
|
@Test(expected = CompressionException.class)
|
||||||
public void testCompressedDataBeforeStreamIdentifier() throws Exception {
|
public void testCompressedDataBeforeStreamIdentifier() throws Exception {
|
||||||
ByteBuf in = Unpooled.wrappedBuffer(new byte[] {
|
ByteBuf in = Unpooled.wrappedBuffer(new byte[] {
|
||||||
0x00, 0x05, 0x00, 'n', 'e', 't', 't', 'y'
|
0x00, 0x05, 0x00, 0x00, 'n', 'e', 't', 't', 'y'
|
||||||
});
|
});
|
||||||
|
|
||||||
channel.writeInbound(in);
|
channel.writeInbound(in);
|
||||||
|
@ -82,21 +88,21 @@ public class SnappyFramedDecoderTest {
|
||||||
@Test
|
@Test
|
||||||
public void testReservedSkippableSkipsInput() throws Exception {
|
public void testReservedSkippableSkipsInput() throws Exception {
|
||||||
ByteBuf in = Unpooled.wrappedBuffer(new byte[] {
|
ByteBuf in = Unpooled.wrappedBuffer(new byte[] {
|
||||||
-0x80, 0x06, 0x00, 0x73, 0x4e, 0x61, 0x50, 0x70, 0x59,
|
-0x80, 0x06, 0x00, 0x00, 0x73, 0x4e, 0x61, 0x50, 0x70, 0x59,
|
||||||
-0x7f, 0x05, 0x00, 'n', 'e', 't', 't', 'y'
|
-0x7f, 0x05, 0x00, 0x00, 'n', 'e', 't', 't', 'y'
|
||||||
});
|
});
|
||||||
|
|
||||||
channel.writeInbound(in);
|
channel.writeInbound(in);
|
||||||
assertNull(channel.readInbound());
|
assertNull(channel.readInbound());
|
||||||
|
|
||||||
assertEquals(17, in.readerIndex());
|
assertFalse(in.isReadable());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testUncompressedDataAppendsToOut() throws Exception {
|
public void testUncompressedDataAppendsToOut() throws Exception {
|
||||||
ByteBuf in = Unpooled.wrappedBuffer(new byte[] {
|
ByteBuf in = Unpooled.wrappedBuffer(new byte[] {
|
||||||
-0x80, 0x06, 0x00, 0x73, 0x4e, 0x61, 0x50, 0x70, 0x59,
|
-0x80, 0x06, 0x00, 0x00, 0x73, 0x4e, 0x61, 0x50, 0x70, 0x59,
|
||||||
0x01, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 'n', 'e', 't', 't', 'y'
|
0x01, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 'n', 'e', 't', 't', 'y'
|
||||||
});
|
});
|
||||||
|
|
||||||
channel.writeInbound(in);
|
channel.writeInbound(in);
|
||||||
|
@ -108,11 +114,11 @@ public class SnappyFramedDecoderTest {
|
||||||
@Test
|
@Test
|
||||||
public void testCompressedDataDecodesAndAppendsToOut() throws Exception {
|
public void testCompressedDataDecodesAndAppendsToOut() throws Exception {
|
||||||
ByteBuf in = Unpooled.wrappedBuffer(new byte[] {
|
ByteBuf in = Unpooled.wrappedBuffer(new byte[] {
|
||||||
-0x80, 0x06, 0x00, 0x73, 0x4e, 0x61, 0x50, 0x70, 0x59,
|
-0x80, 0x06, 0x00, 0x00, 0x73, 0x4e, 0x61, 0x50, 0x70, 0x59,
|
||||||
0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
|
0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
0x05, // preamble length
|
0x05, // preamble length
|
||||||
0x04 << 2, // literal tag + length
|
0x04 << 2, // literal tag + length
|
||||||
0x6e, 0x65, 0x74, 0x74, 0x79 // "netty"
|
0x6e, 0x65, 0x74, 0x74, 0x79 // "netty"
|
||||||
});
|
});
|
||||||
|
|
||||||
channel.writeInbound(in);
|
channel.writeInbound(in);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user