commit d23835d4248dfd1830d30d13f7f7b50350c02aad
parent 8cb756b5e68ee053e8bee7a987c5d7a300ce2667
Author: francoispqt <francois@parquet.ninja>
Date: Sun, 20 May 2018 02:12:56 +0800
correct some misspells in comments
Diffstat:
14 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/benchmarks/benchmarks_medium.go b/benchmarks/benchmarks_medium.go
@@ -2,7 +2,7 @@ package benchmarks
import "github.com/francoispqt/gojay"
-// Reponse from Clearbit API. Size: 2.4kb
+// Response from Clearbit API. Size: 2.4kb
var MediumFixture = []byte(`{
"person": {
"id": "d50887ca-a6ce-4e59-b89f-14f0b5d03b03",
diff --git a/decode_bool_test.go b/decode_bool_test.go
@@ -253,7 +253,7 @@ func TestDecoderBoolPoolError(t *testing.T) {
dec.Release()
defer func() {
err := recover()
- assert.NotNil(t, err, "err shouldnot be nil")
+ assert.NotNil(t, err, "err shouldnt be nil")
assert.IsType(t, InvalidUsagePooledDecoderError(""), err, "err should be of type InvalidUsagePooledDecoderError")
}()
_ = dec.DecodeBool(&v)
diff --git a/decode_number_float_test.go b/decode_number_float_test.go
@@ -181,7 +181,7 @@ func TestDecoderFloat64(t *testing.T) {
dec.Release()
defer func() {
err := recover()
- assert.NotNil(t, err, "err shouldnot be nil")
+ assert.NotNil(t, err, "err shouldnt be nil")
assert.IsType(t, InvalidUsagePooledDecoderError(""), err, "err should be of type InvalidUsagePooledDecoderError")
}()
_ = dec.DecodeFloat64(&result)
@@ -384,7 +384,7 @@ func TestDecoderFloat32(t *testing.T) {
dec.Release()
defer func() {
err := recover()
- assert.NotNil(t, err, "err shouldnot be nil")
+ assert.NotNil(t, err, "err shouldnt be nil")
assert.IsType(t, InvalidUsagePooledDecoderError(""), err, "err should be of type InvalidUsagePooledDecoderError")
}()
_ = dec.DecodeFloat32(&result)
diff --git a/decode_number_int_test.go b/decode_number_int_test.go
@@ -223,7 +223,7 @@ func TestDecoderInt(t *testing.T) {
dec.Release()
defer func() {
err := recover()
- assert.NotNil(t, err, "err shouldnot be nil")
+ assert.NotNil(t, err, "err shouldnt be nil")
assert.IsType(t, InvalidUsagePooledDecoderError(""), err, "err should be of type InvalidUsagePooledDecoderError")
}()
_ = dec.DecodeInt(&result)
@@ -466,7 +466,7 @@ func TestDecoderInt64(t *testing.T) {
dec.Release()
defer func() {
err := recover()
- assert.NotNil(t, err, "err shouldnot be nil")
+ assert.NotNil(t, err, "err shouldnt be nil")
assert.IsType(t, InvalidUsagePooledDecoderError(""), err, "err should be of type InvalidUsagePooledDecoderError")
}()
_ = dec.DecodeInt64(&result)
@@ -720,7 +720,7 @@ func TestDecoderInt32(t *testing.T) {
dec.Release()
defer func() {
err := recover()
- assert.NotNil(t, err, "err shouldnot be nil")
+ assert.NotNil(t, err, "err shouldnt be nil")
assert.IsType(t, InvalidUsagePooledDecoderError(""), err, "err should be of type InvalidUsagePooledDecoderError")
}()
_ = dec.DecodeInt32(&result)
@@ -981,7 +981,7 @@ func TestDecoderInt16(t *testing.T) {
dec.Release()
defer func() {
err := recover()
- assert.NotNil(t, err, "err shouldnot be nil")
+ assert.NotNil(t, err, "err shouldnt be nil")
assert.IsType(t, InvalidUsagePooledDecoderError(""), err, "err should be of type InvalidUsagePooledDecoderError")
}()
_ = dec.DecodeInt16(&result)
@@ -1242,7 +1242,7 @@ func TestDecoderInt8(t *testing.T) {
dec.Release()
defer func() {
err := recover()
- assert.NotNil(t, err, "err shouldnot be nil")
+ assert.NotNil(t, err, "err shouldnt be nil")
assert.IsType(t, InvalidUsagePooledDecoderError(""), err, "err should be of type InvalidUsagePooledDecoderError")
}()
_ = dec.DecodeInt8(&result)
diff --git a/decode_number_uint_test.go b/decode_number_uint_test.go
@@ -137,7 +137,7 @@ func TestDecoderUint64(t *testing.T) {
dec.Release()
defer func() {
err := recover()
- assert.NotNil(t, err, "err shouldnot be nil")
+ assert.NotNil(t, err, "err shouldnt be nil")
assert.IsType(t, InvalidUsagePooledDecoderError(""), err, "err should be of type InvalidUsagePooledDecoderError")
}()
_ = dec.DecodeUint64(&result)
@@ -297,7 +297,7 @@ func TestDecoderUint32(t *testing.T) {
dec.Release()
defer func() {
err := recover()
- assert.NotNil(t, err, "err shouldnot be nil")
+ assert.NotNil(t, err, "err shouldnt be nil")
assert.IsType(t, InvalidUsagePooledDecoderError(""), err, "err should be of type InvalidUsagePooledDecoderError")
}()
_ = dec.DecodeUint32(&result)
@@ -477,7 +477,7 @@ func TestDecoderUint16(t *testing.T) {
dec.Release()
defer func() {
err := recover()
- assert.NotNil(t, err, "err shouldnot be nil")
+ assert.NotNil(t, err, "err shouldnt be nil")
assert.IsType(t, InvalidUsagePooledDecoderError(""), err, "err should be of type InvalidUsagePooledDecoderError")
}()
_ = dec.DecodeUint16(&result)
@@ -653,7 +653,7 @@ func TestDecoderUint8(t *testing.T) {
dec.Release()
defer func() {
err := recover()
- assert.NotNil(t, err, "err shouldnot be nil")
+ assert.NotNil(t, err, "err shouldnt be nil")
assert.IsType(t, InvalidUsagePooledDecoderError(""), err, "err should be of type InvalidUsagePooledDecoderError")
}()
_ = dec.DecodeUint8(&result)
diff --git a/decode_object_test.go b/decode_object_test.go
@@ -431,6 +431,13 @@ func TestDecodeObjectBasic0Keys(t *testing.T) {
errType: InvalidJSONError(""),
},
{
+ name: "basic-err-invalid-type",
+ json: ``,
+ expectedResult: testObject0Keys{},
+ err: true,
+ errType: InvalidJSONError(""),
+ },
+ {
name: "basic-err",
json: `{
"testStr": "hello world!",
@@ -1189,7 +1196,7 @@ func TestDecoderObjectPoolError(t *testing.T) {
dec.Release()
defer func() {
err := recover()
- assert.NotNil(t, err, "err shouldnot be nil")
+ assert.NotNil(t, err, "err shouldnt be nil")
assert.IsType(t, InvalidUsagePooledDecoderError(""), err, "err should be of type InvalidUsagePooledDecoderError")
}()
_ = dec.DecodeObject(&result)
diff --git a/decode_stream_pool_test.go b/decode_stream_pool_test.go
@@ -12,7 +12,7 @@ func TestDecodeStreamDecodePooledDecoderError(t *testing.T) {
dec.Release()
defer func() {
err := recover()
- assert.NotNil(t, err, "err shouldnot be nil")
+ assert.NotNil(t, err, "err shouldnt be nil")
assert.IsType(t, InvalidUsagePooledDecoderError(""), err, "err should be of type InvalidUsagePooledDecoderError")
}()
var v = 0
@@ -27,7 +27,7 @@ func TestDecodeStreamDecodePooledDecoderError1(t *testing.T) {
dec.Release()
defer func() {
err := recover()
- assert.NotNil(t, err, "err shouldnot be nil")
+ assert.NotNil(t, err, "err shouldnt be nil")
assert.IsType(t, InvalidUsagePooledDecoderError(""), err, "err should be of type InvalidUsagePooledDecoderError")
}()
var v = testSliceStrings{}
@@ -42,7 +42,7 @@ func TestDecodeStreamDecodePooledDecoderError2(t *testing.T) {
dec.Release()
defer func() {
err := recover()
- assert.NotNil(t, err, "err shouldnot be nil")
+ assert.NotNil(t, err, "err shouldnt be nil")
assert.IsType(t, InvalidUsagePooledDecoderError(""), err, "err should be of type InvalidUsagePooledDecoderError")
assert.Equal(t, "Invalid usage of pooled decoder", err.(InvalidUsagePooledDecoderError).Error(), "err should be of type InvalidUsagePooledDecoderError")
}()
diff --git a/decode_stream_test.go b/decode_stream_test.go
@@ -413,7 +413,7 @@ func TestStreamDecodingPoolError(t *testing.T) {
dec.Release()
defer func() {
err := recover()
- assert.NotNil(t, err, "err shouldnot be nil")
+ assert.NotNil(t, err, "err shouldnt be nil")
assert.IsType(t, InvalidUsagePooledDecoderError(""), err, "err should be of type InvalidUsagePooledEncoderError")
assert.Equal(t, "Invalid usage of pooled decoder", err.(InvalidUsagePooledDecoderError).Error(), "err should be of type InvalidUsagePooledDecoderError")
}()
diff --git a/decode_string_test.go b/decode_string_test.go
@@ -324,7 +324,7 @@ func TestDecoderStringPoolError(t *testing.T) {
dec.Release()
defer func() {
err := recover()
- assert.NotNil(t, err, "err shouldnot be nil")
+ assert.NotNil(t, err, "err shouldnt be nil")
assert.IsType(t, InvalidUsagePooledDecoderError(""), err, "err should be of type InvalidUsagePooledDecoderError")
}()
_ = dec.DecodeString(&result)
diff --git a/encode_array_test.go b/encode_array_test.go
@@ -323,7 +323,7 @@ func TestEncoderArrErrors(t *testing.T) {
enc.Release()
defer func() {
err := recover()
- assert.NotNil(t, err, "err shouldnot be nil")
+ assert.NotNil(t, err, "err shouldnt be nil")
assert.IsType(t, InvalidUsagePooledEncoderError(""), err, "err should be of type InvalidUsagePooledEncoderError")
assert.Equal(t, "Invalid usage of pooled encoder", err.(InvalidUsagePooledEncoderError).Error(), "err should be of type InvalidUsagePooledDecoderError")
}()
diff --git a/encode_bool_test.go b/encode_bool_test.go
@@ -46,7 +46,7 @@ func TestEncoderBoolErrors(t *testing.T) {
enc.Release()
defer func() {
err := recover()
- assert.NotNil(t, err, "err shouldnot be nil")
+ assert.NotNil(t, err, "err shouldnt be nil")
assert.IsType(t, InvalidUsagePooledEncoderError(""), err, "err should be of type InvalidUsagePooledEncoderError")
assert.Equal(t, "Invalid usage of pooled encoder", err.(InvalidUsagePooledEncoderError).Error(), "err should be of type InvalidUsagePooledEncoderError")
}()
diff --git a/encode_embedded_json_test.go b/encode_embedded_json_test.go
@@ -127,7 +127,7 @@ func TestEncodingEmbeddedJSON(t *testing.T) {
enc.Release()
defer func() {
err := recover()
- assert.NotNil(t, err, "err shouldnot be nil")
+ assert.NotNil(t, err, "err shouldnt be nil")
assert.IsType(t, InvalidUsagePooledEncoderError(""), err, "err should be of type InvalidUsagePooledEncoderError")
assert.Equal(t, "Invalid usage of pooled encoder", err.(InvalidUsagePooledEncoderError).Error(), "err should be of type InvalidUsagePooledDecoderError")
}()
diff --git a/encode_object_test.go b/encode_object_test.go
@@ -395,7 +395,7 @@ func TestEncoderObjectEncodeAPIError(t *testing.T) {
enc.Release()
defer func() {
err := recover()
- assert.NotNil(t, err, "err shouldnot be nil")
+ assert.NotNil(t, err, "err shouldnt be nil")
assert.IsType(t, InvalidUsagePooledEncoderError(""), err, "err should be of type InvalidUsagePooledEncoderError")
assert.Equal(t, "Invalid usage of pooled encoder", err.(InvalidUsagePooledEncoderError).Error(), "err should be of type InvalidUsagePooledDecoderError")
}()
diff --git a/encode_string_test.go b/encode_string_test.go
@@ -113,7 +113,7 @@ func TestEncoderStringEncodeAPIErrors(t *testing.T) {
enc.Release()
defer func() {
err := recover()
- assert.NotNil(t, err, "err shouldnot be nil")
+ assert.NotNil(t, err, "err shouldnt be nil")
assert.IsType(t, InvalidUsagePooledEncoderError(""), err, "err should be of type InvalidUsagePooledEncoderError")
assert.Equal(t, "Invalid usage of pooled encoder", err.(InvalidUsagePooledEncoderError).Error(), "err should be of type InvalidUsagePooledDecoderError")
}()