Skip to content

Fix packString #359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xerial merged 6 commits into from
Apr 11, 2016
+47 −2
Merged

Fix packString #359

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
535ffa2
Add release notes for 0.8.5
xerial Apr 8, 2016
9cc49c0
Fix STR8 encoding and underflow check in packString
xerial Apr 8, 2016
86f443c
Ensure flushing CharsetEncoder
xerial Apr 8, 2016
4ef04d9
Import cleanup
xerial Apr 8, 2016
dfcf588
Split test case for redability
xerial Apr 8, 2016
e65e7b7
Move encoder.reset() to prepareEncoder()
xerial Apr 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Split test case for redability
  • Loading branch information
@xerial
xerial committed Apr 8, 2016
commit dfcf588e08891230be8a266a2e66ebf4affc3384
36 changes: 18 additions & 18 deletions msgpack-core/src/test/scala/org/msgpack/core/MessagePackerTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,26 +295,26 @@ class MessagePackerTest extends MessagePackSpec {

"be able to disable STR8 for backward compatibility" in {
val config = new PackerConfig()
.withSmallStringOptimizationThreshold(0) // Disable small string optimiztion
.withStr8FormatSupport(false)

{
val packer = config.newBufferPacker()
packer.packString("Hello. This is a string longer than 32 characters!")
val unpacker = MessagePack.newDefaultUnpacker(packer.toByteArray)
val f = unpacker.getNextFormat
f shouldBe MessageFormat.STR16
}
val packer = config.newBufferPacker()
packer.packString("Hello. This is a string longer than 32 characters!")
val unpacker = MessagePack.newDefaultUnpacker(packer.toByteArray)
val f = unpacker.getNextFormat
f shouldBe MessageFormat.STR16
}

{
val packer2 = config.newBufferPacker()
packer2.packString("small string")
packer2.flush()
val unpacker2 = MessagePack.newDefaultUnpacker(packer2.toByteArray)
val f2 = unpacker2.getNextFormat
f2 shouldNot be (MessageFormat.STR8)
val s = unpacker2.unpackString()
s shouldBe "small string"
}
"be able to disable STR8 when using CharsetEncoder" in {
val config = new PackerConfig()
.withStr8FormatSupport(false)
.withSmallStringOptimizationThreshold(0) // Disable small string optimization

val packer = config.newBufferPacker()
packer.packString("small string")
val unpacker = MessagePack.newDefaultUnpacker(packer.toByteArray)
val f = unpacker.getNextFormat
f shouldNot be (MessageFormat.STR8)
val s = unpacker.unpackString()
s shouldBe "small string"
}
}