Cover more cases for the invalid input

Author: plokhotnyuk

jsoniter-scala-benchmark/shared/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/benchmark/JacksonSerDesers.scala

@@ -3,7 +3,6 @@ package com.github.plokhotnyuk.jsoniter_scala.benchmark
 import java.util.concurrent.ConcurrentHashMap
 
 import com.fasterxml.jackson.annotation.JsonInclude.Include
-import com.fasterxml.jackson.core.JsonToken._
 import com.fasterxml.jackson.core.util.{DefaultIndenter, DefaultPrettyPrinter}
 import com.fasterxml.jackson.core.{JsonFactory, JsonFactoryBuilder, JsonGenerator, JsonParser}
 import com.fasterxml.jackson.databind._
@@ -69,18 +68,14 @@ object JacksonSerDesers {
 class ByteArraySerializer extends StdSerializer[Array[Byte]](classOf[Array[Byte]]) {
   override def serialize(value: Array[Byte], gen: JsonGenerator, provider: SerializerProvider): Unit = {
     gen.writeStartArray()
-    if (!isEmpty(provider, value)) {
-      val l = value.length
-      var i = 0
-      while (i < l) {
-        gen.writeNumber(value(i))
-        i += 1
-      }
+    val l = value.length
+    var i = 0
+    while (i < l) {
+      gen.writeNumber(value(i))
+      i += 1
     }
     gen.writeEndArray()
   }
-
-  override def isEmpty(spro: SerializerProvider, value: Array[Byte]): Boolean = value.isEmpty
 }
 
 class StringifiedBooleanSerializer extends JsonSerializer[Boolean] {
@@ -117,9 +112,5 @@ class SuitADTDeserializer extends JsonDeserializer[SuitADT] {
     "Clubs" -> Clubs)
 
   override def deserialize(jp: JsonParser, ctxt: DeserializationContext): SuitADT =
-    if (jp.getCurrentToken != VALUE_STRING) ctxt.handleUnexpectedToken(classOf[SuitADT], jp).asInstanceOf[SuitADT]
-    else {
-      val s = jp.getValueAsString
-      suite.getOrElse(s, ctxt.handleWeirdStringValue(classOf[SuitADT], s, "illegal value").asInstanceOf[SuitADT])
-    }
+    Try(suite(jp.getValueAsString)).getOrElse(ctxt.handleUnexpectedToken(classOf[SuitADT], jp).asInstanceOf[SuitADT])
 }

jsoniter-scala-benchmark/shared/src/test/scala/com/github/plokhotnyuk/jsoniter_scala/benchmark/ADTReadingSpec.scala

@@ -1,7 +1,7 @@
 package com.github.plokhotnyuk.jsoniter_scala.benchmark
 
 class ADTReadingSpec extends BenchmarkSpecBase {
-  private def benchmark = new ADTReading
+  def benchmark = new ADTReading
 
   "ADTReading" should {
     "read properly" in {
@@ -17,7 +17,7 @@ class ADTReadingSpec extends BenchmarkSpecBase {
     }
     "fail on invalid input" in {
       val b = benchmark
-      b.jsonBytes(0) = 'x'.toByte
+      b.jsonBytes(2) = 'x'.toByte
       intercept[Throwable](b.avSystemGenCodec())
       intercept[Throwable](b.borer())
       intercept[Throwable](b.circe())

jsoniter-scala-benchmark/shared/src/test/scala/com/github/plokhotnyuk/jsoniter_scala/benchmark/ADTWritingSpec.scala

@@ -1,7 +1,7 @@
 package com.github.plokhotnyuk.jsoniter_scala.benchmark
 
 class ADTWritingSpec extends BenchmarkSpecBase {
-  private val benchmark = new ADTWriting
+  val benchmark = new ADTWriting
 
   "ADTWriting" should {
     "write properly" in {

jsoniter-scala-benchmark/shared/src/test/scala/com/github/plokhotnyuk/jsoniter_scala/benchmark/AnyValsReadingSpec.scala

@@ -1,7 +1,7 @@
 package com.github.plokhotnyuk.jsoniter_scala.benchmark
 
 class AnyValsReadingSpec extends BenchmarkSpecBase {
-  private def benchmark = new AnyValsReading
+  def benchmark = new AnyValsReading
 
   "AnyValsReading" should {
     "read properly" in {

jsoniter-scala-benchmark/shared/src/test/scala/com/github/plokhotnyuk/jsoniter_scala/benchmark/AnyValsWritingSpec.scala

@@ -1,7 +1,7 @@
 package com.github.plokhotnyuk.jsoniter_scala.benchmark
 
 class AnyValsWritingSpec extends BenchmarkSpecBase {
-  private val benchmark = new AnyValsWriting
+  val benchmark = new AnyValsWriting
 
   "AnyValsWriting" should {
     "write properly" in {

jsoniter-scala-benchmark/shared/src/test/scala/com/github/plokhotnyuk/jsoniter_scala/benchmark/ArrayBufferOfBooleansReadingSpec.scala

@@ -1,7 +1,7 @@
 package com.github.plokhotnyuk.jsoniter_scala.benchmark
 
 class ArrayBufferOfBooleansReadingSpec extends BenchmarkSpecBase {
-  private def benchmark = new ArrayBufferOfBooleansReading {
+  def benchmark: ArrayBufferOfBooleansReading = new ArrayBufferOfBooleansReading {
     setup()
   }
 

jsoniter-scala-benchmark/shared/src/test/scala/com/github/plokhotnyuk/jsoniter_scala/benchmark/ArrayBufferOfBooleansWritingSpec.scala

@@ -1,7 +1,7 @@
 package com.github.plokhotnyuk.jsoniter_scala.benchmark
 
 class ArrayBufferOfBooleansWritingSpec extends BenchmarkSpecBase {
-  private val benchmark = new ArrayBufferOfBooleansWriting {
+  val benchmark = new ArrayBufferOfBooleansWriting {
     setup()
   }
 

jsoniter-scala-benchmark/shared/src/test/scala/com/github/plokhotnyuk/jsoniter_scala/benchmark/ArrayOfBigDecimalsReadingSpec.scala

@@ -1,7 +1,7 @@
 package com.github.plokhotnyuk.jsoniter_scala.benchmark
 
 class ArrayOfBigDecimalsReadingSpec extends BenchmarkSpecBase {
-  private def benchmark = new ArrayOfBigDecimalsReading {
+  def benchmark: ArrayOfBigDecimalsReading = new ArrayOfBigDecimalsReading {
     setup()
   }
 

jsoniter-scala-benchmark/shared/src/test/scala/com/github/plokhotnyuk/jsoniter_scala/benchmark/ArrayOfBigDecimalsWritingSpec.scala

@@ -1,7 +1,7 @@
 package com.github.plokhotnyuk.jsoniter_scala.benchmark
 
 class ArrayOfBigDecimalsWritingSpec extends BenchmarkSpecBase {
-  private val benchmark = new ArrayOfBigDecimalsWriting {
+  val benchmark = new ArrayOfBigDecimalsWriting {
     setup()
   }
 

jsoniter-scala-benchmark/shared/src/test/scala/com/github/plokhotnyuk/jsoniter_scala/benchmark/ArrayOfBigIntsReadingSpec.scala

@@ -1,7 +1,7 @@
 package com.github.plokhotnyuk.jsoniter_scala.benchmark
 
 class ArrayOfBigIntsReadingSpec extends BenchmarkSpecBase {
-  private def benchmark = new ArrayOfBigIntsReading {
+  def benchmark: ArrayOfBigIntsReading = new ArrayOfBigIntsReading {
     setup()
   }