|
|
@@ -6,7 +6,7 @@ import (
|
|
|
"strings"
|
|
|
"testing"
|
|
|
|
|
|
- "github.com/pierrec/lz4"
|
|
|
+ "github.com/pierrec/lz4/internal/lz4block"
|
|
|
)
|
|
|
|
|
|
func TestFrameDescriptor(t *testing.T) {
|
|
|
@@ -14,12 +14,12 @@ func TestFrameDescriptor(t *testing.T) {
|
|
|
flags string
|
|
|
bsum, csize, csum bool
|
|
|
size uint64
|
|
|
- bsize lz4.BlockSize
|
|
|
+ bsize uint32
|
|
|
}{
|
|
|
- {"\x64\x40\xa7", false, false, true, 0, lz4.Block64Kb},
|
|
|
- {"\x64\x50\x08", false, false, true, 0, lz4.Block256Kb},
|
|
|
- {"\x64\x60\x85", false, false, true, 0, lz4.Block1Mb},
|
|
|
- {"\x64\x70\xb9", false, false, true, 0, lz4.Block4Mb},
|
|
|
+ {"\x64\x40\xa7", false, false, true, 0, lz4block.Block64Kb},
|
|
|
+ {"\x64\x50\x08", false, false, true, 0, lz4block.Block256Kb},
|
|
|
+ {"\x64\x60\x85", false, false, true, 0, lz4block.Block1Mb},
|
|
|
+ {"\x64\x70\xb9", false, false, true, 0, lz4block.Block4Mb},
|
|
|
} {
|
|
|
s := tc.flags
|
|
|
label := fmt.Sprintf("%02x %02x %02x", s[0], s[1], s[2])
|
|
|
@@ -43,18 +43,18 @@ func TestFrameDescriptor(t *testing.T) {
|
|
|
if got, want := fd.ContentSize, tc.size; got != want {
|
|
|
t.Fatalf("got %v; want %v\n", got, want)
|
|
|
}
|
|
|
- if got, want := fd.Flags.BlockSizeIndex(), tc.bsize.index(); got != want {
|
|
|
+ if got, want := fd.Flags.BlockSizeIndex(), lz4block.Index(tc.bsize); got != want {
|
|
|
t.Fatalf("got %v; want %v\n", got, want)
|
|
|
}
|
|
|
|
|
|
buf := new(bytes.Buffer)
|
|
|
- w := lz4.NewWriter(buf)
|
|
|
fd.initW()
|
|
|
fd.Checksum = 0
|
|
|
- if err := fd.Write(f, w); err != nil {
|
|
|
+ if err := fd.Write(f, buf); err != nil {
|
|
|
t.Fatal(err)
|
|
|
}
|
|
|
- if got, want := buf.String(), tc.flags; got != want {
|
|
|
+ // Skip the magic number set in the first 4 bytes.
|
|
|
+ if got, want := buf.String()[4:], tc.flags; got != want {
|
|
|
t.Fatalf("got %q; want %q\n", got, want)
|
|
|
}
|
|
|
})
|
|
|
@@ -71,15 +71,15 @@ func TestFrameDataBlock(t *testing.T) {
|
|
|
}
|
|
|
for _, tc := range []struct {
|
|
|
data string
|
|
|
- size lz4.BlockSize
|
|
|
+ size uint32
|
|
|
}{
|
|
|
- {"", lz4.Block64Kb},
|
|
|
- {sample, lz4.Block64Kb},
|
|
|
- {strings.Repeat(sample, 10), lz4.Block64Kb},
|
|
|
- {strings.Repeat(sample, 5000), lz4.Block256Kb},
|
|
|
- {strings.Repeat(sample, 5000), lz4.Block1Mb},
|
|
|
- {strings.Repeat(sample, 23000), lz4.Block1Mb},
|
|
|
- {strings.Repeat(sample, 93000), lz4.Block4Mb},
|
|
|
+ {"", lz4block.Block64Kb},
|
|
|
+ {sample, lz4block.Block64Kb},
|
|
|
+ {strings.Repeat(sample, 10), lz4block.Block64Kb},
|
|
|
+ {strings.Repeat(sample, 5000), lz4block.Block256Kb},
|
|
|
+ {strings.Repeat(sample, 5000), lz4block.Block1Mb},
|
|
|
+ {strings.Repeat(sample, 23000), lz4block.Block1Mb},
|
|
|
+ {strings.Repeat(sample, 93000), lz4block.Block4Mb},
|
|
|
} {
|
|
|
label := fmt.Sprintf("%s (%d)", tc.data[:min(len(tc.data), 10)], len(tc.data))
|
|
|
t.Run(label, func(t *testing.T) {
|
|
|
@@ -88,8 +88,8 @@ func TestFrameDataBlock(t *testing.T) {
|
|
|
zbuf := new(bytes.Buffer)
|
|
|
f := NewFrame()
|
|
|
|
|
|
- block := newFrameDataBlock(size.index())
|
|
|
- block.Compress(f, []byte(data), nil, lz4.Fast)
|
|
|
+ block := NewFrameDataBlock(lz4block.Index(size))
|
|
|
+ block.Compress(f, []byte(data), lz4block.Fast)
|
|
|
if err := block.Write(f, zbuf); err != nil {
|
|
|
t.Fatal(err)
|
|
|
}
|
Pierre.Curto