Split test case for redability

xerial · xerial · commit dfcf588e0889 · 2016-04-08T10:48:53.000-07:00
diff --git a/msgpack-core/src/test/scala/org/msgpack/core/MessagePackerTest.scala b/msgpack-core/src/test/scala/org/msgpack/core/MessagePackerTest.scala
@@ -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"
   }
 }
