replace bespoke json comparison helper with JSONEq from testify (#148)

bmoffatt · web-flow · commit 554303c87797 · 2018-12-13T20:12:37.000Z
diff --git a/events/apigw_test.go b/events/apigw_test.go
@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	"github.com/aws/aws-lambda-go/events/test"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestApiGatewayRequestMarshaling(t *testing.T) {
@@ -38,7 +39,7 @@ func TestApiGatewayRequestMarshaling(t *testing.T) {
 		t.Errorf("could not marshal event. details: %v", err)
 	}
 
-	test.AssertJsonsEqual(t, inputJSON, outputJSON)
+	assert.JSONEq(t, string(inputJSON), string(outputJSON))
 }
 
 func TestApiGatewayRequestMalformedJson(t *testing.T) {
@@ -65,7 +66,7 @@ func TestApiGatewayResponseMarshaling(t *testing.T) {
 		t.Errorf("could not marshal event. details: %v", err)
 	}
 
-	test.AssertJsonsEqual(t, inputJSON, outputJSON)
+	assert.JSONEq(t, string(inputJSON), string(outputJSON))
 }
 
 func TestApiGatewayResponseMalformedJson(t *testing.T) {
@@ -92,7 +93,7 @@ func TestApiGatewayCustomAuthorizerRequestMarshaling(t *testing.T) {
 		t.Errorf("could not marshal event. details: %v", err)
 	}
 
-	test.AssertJsonsEqual(t, inputJSON, outputJSON)
+	assert.JSONEq(t, string(inputJSON), string(outputJSON))
 }
 
 func TestApiGatewayCustomAuthorizerRequestTypeRequestMarshaling(t *testing.T) {
@@ -115,7 +116,7 @@ func TestApiGatewayCustomAuthorizerRequestTypeRequestMarshaling(t *testing.T) {
 		t.Errorf("could not marshal event. details: %v", err)
 	}
 
-	test.AssertJsonsEqual(t, inputJSON, outputJSON)
+	assert.JSONEq(t, string(inputJSON), string(outputJSON))
 }
 
 func TestApiGatewayCustomAuthorizerRequestMalformedJson(t *testing.T) {
@@ -146,7 +147,7 @@ func TestApiGatewayCustomAuthorizerResponseMarshaling(t *testing.T) {
 		t.Errorf("could not marshal event. details: %v", err)
 	}
 
-	test.AssertJsonsEqual(t, inputJSON, outputJSON)
+	assert.JSONEq(t, string(inputJSON), string(outputJSON))
 }
 
 func TestApiGatewayCustomAuthorizerResponseMalformedJson(t *testing.T) {
diff --git a/events/appsync_test.go b/events/appsync_test.go
@@ -5,7 +5,6 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"github.com/aws/aws-lambda-go/events/test"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -26,7 +25,7 @@ func TestAppSyncResolverTemplate_invoke(t *testing.T) {
 		t.Errorf("could not marshal event. details: %v", err)
 	}
 
-	test.AssertJsonsEqual(t, inputJSON, outputJSON)
+	assert.JSONEq(t, string(inputJSON), string(outputJSON))
 }
 
 func TestAppSyncResolverTemplate_batchinvoke(t *testing.T) {
@@ -46,5 +45,5 @@ func TestAppSyncResolverTemplate_batchinvoke(t *testing.T) {
 		t.Errorf("could not marshal event. details: %v", err)
 	}
 
-	test.AssertJsonsEqual(t, inputJSON, outputJSON)
+	assert.JSONEq(t, string(inputJSON), string(outputJSON))
 }
diff --git a/events/autoscaling_test.go b/events/autoscaling_test.go
@@ -2,8 +2,10 @@ package events
 
 import (
 	"encoding/json"
-	"github.com/aws/aws-lambda-go/events/test"
 	"testing"
+
+	"github.com/aws/aws-lambda-go/events/test"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestAutoScalingEventMarshaling(t *testing.T) {
@@ -29,7 +31,7 @@ func TestAutoScalingEventMarshaling(t *testing.T) {
 			t.Errorf("could not marshal event. details: %v", err)
 		}
 		// 4. check result
-		test.AssertJsonsEqual(t, inputJson, outputJson)
+		assert.JSONEq(t, string(inputJson), string(outputJson))
 	}
 
 }
diff --git a/events/cloudwatch_events_test.go b/events/cloudwatch_events_test.go
@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/aws/aws-lambda-go/events/test"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestCloudwatchScheduledEventIdempotency(t *testing.T) {
@@ -27,7 +28,7 @@ func TestCloudwatchScheduledEventIdempotency(t *testing.T) {
 		t.Errorf("Could not marshal scheduled event: %v", err)
 	}
 
-	test.AssertJsonsEqual(t, inputJSON, outputJSON)
+	assert.JSONEq(t, string(inputJSON), string(outputJSON))
 }
 
 func TestCloudwatchScheduledEventRequestMalformedJson(t *testing.T) {
diff --git a/events/codepipeline_test.go b/events/codepipeline_test.go
@@ -7,6 +7,7 @@ import (
 	"testing"
 
 	"github.com/aws/aws-lambda-go/events/test"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestCodePipeLineEventMarshaling(t *testing.T) {
@@ -29,7 +30,7 @@ func TestCodePipeLineEventMarshaling(t *testing.T) {
 		t.Errorf("could not marshal event. details: %v", err)
 	}
 
-	test.AssertJsonsEqual(t, inputJSON, outputJSON)
+	assert.JSONEq(t, string(inputJSON), string(outputJSON))
 }
 
 func TestCodePipelineEventMarshalingMalformedJson(t *testing.T) {
diff --git a/events/cognito_test.go b/events/cognito_test.go
@@ -7,6 +7,7 @@ import (
 	"testing"
 
 	"github.com/aws/aws-lambda-go/events/test"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestCognitoEventMarshaling(t *testing.T) {
@@ -29,7 +30,7 @@ func TestCognitoEventMarshaling(t *testing.T) {
 		t.Errorf("could not marshal event. details: %v", err)
 	}
 
-	test.AssertJsonsEqual(t, inputJSON, outputJSON)
+	assert.JSONEq(t, string(inputJSON), string(outputJSON))
 }
 
 func TestCognitoMarshalingMalformedJson(t *testing.T) {
@@ -56,7 +57,7 @@ func TestCognitoEventUserPoolsPreSignupMarshaling(t *testing.T) {
 		t.Errorf("could not marshal event. details: %v", err)
 	}
 
-	test.AssertJsonsEqual(t, inputJSON, outputJSON)
+	assert.JSONEq(t, string(inputJSON), string(outputJSON))
 }
 
 func TestCognitoUserPoolsPreSignupMarshalingMalformedJson(t *testing.T) {
@@ -83,7 +84,7 @@ func TestCognitoEventUserPoolsPostConfirmationMarshaling(t *testing.T) {
 		t.Errorf("could not marshal event. details: %v", err)
 	}
 
-	test.AssertJsonsEqual(t, inputJSON, outputJSON)
+	assert.JSONEq(t, string(inputJSON), string(outputJSON))
 }
 
 func TestCognitoEventUserPoolsPreTokenGenMarshalingMalformedJson(t *testing.T) {
diff --git a/events/config_test.go b/events/config_test.go
@@ -7,6 +7,7 @@ import (
 	"testing"
 
 	"github.com/aws/aws-lambda-go/events/test"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestConfigEventMarshaling(t *testing.T) {
@@ -28,7 +29,7 @@ func TestConfigEventMarshaling(t *testing.T) {
 		t.Errorf("could not marshal event. details: %v", err)
 	}
 
-	test.AssertJsonsEqual(t, inputJSON, outputJSON)
+	assert.JSONEq(t, string(inputJSON), string(outputJSON))
 }
 
 func TestConfigMarshalingMalformedJson(t *testing.T) {
diff --git a/events/connect_test.go b/events/connect_test.go
@@ -7,6 +7,7 @@ import (
 	"testing"
 
 	"github.com/aws/aws-lambda-go/events/test"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestConnectMarshaling(t *testing.T) {
@@ -27,7 +28,7 @@ func TestConnectMarshaling(t *testing.T) {
 	}
 
 	// 4. check result
-	test.AssertJsonsEqual(t, inputJson, outputJson)
+	assert.JSONEq(t, string(inputJson), string(outputJson))
 }
 
 func TestConnectMarshalingMalformedJson(t *testing.T) {
diff --git a/events/dynamodb_test.go b/events/dynamodb_test.go
@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	"github.com/aws/aws-lambda-go/events/test"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestDynamoDBEventMarshaling(t *testing.T) {
@@ -28,7 +29,7 @@ func TestDynamoDBEventMarshaling(t *testing.T) {
 	}
 
 	// 4. check result
-	test.AssertJsonsEqual(t, inputJson, outputJson)
+	assert.JSONEq(t, string(inputJson), string(outputJson))
 }
 
 func TestDynamoDBEventMarshalingMalformedJson(t *testing.T) {
diff --git a/events/firehose_test.go b/events/firehose_test.go
@@ -37,7 +37,7 @@ func testMarshaling(t *testing.T, jsonFile string) {
 	}
 
 	// 4. check result
-	test.AssertJsonsEqual(t, inputJson, outputJson)
+	assert.JSONEq(t, string(inputJson), string(outputJson))
 }
 
 func TestSampleTransformation(t *testing.T) {
diff --git a/events/iot_button_test.go b/events/iot_button_test.go
@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/aws/aws-lambda-go/events/test"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestIoTButtonMalformedJson(t *testing.T) {
@@ -25,7 +26,7 @@ func TestIoTButtonMalformedJson(t *testing.T) {
 		t.Errorf("could not marshal event. details: %v", err)
 	}
 	// 4. check result
-	test.AssertJsonsEqual(t, inputJson, outputJson)
+	assert.JSONEq(t, string(inputJson), string(outputJson))
 }
 
 func TestIoTButtonEventMarshaling(t *testing.T) {
diff --git a/events/kinesis_test.go b/events/kinesis_test.go
@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/aws/aws-lambda-go/events/test"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestKinesisEventMarshaling(t *testing.T) {
@@ -26,7 +27,7 @@ func TestKinesisEventMarshaling(t *testing.T) {
 	}
 
 	// 4. check result
-	test.AssertJsonsEqual(t, inputJson, outputJson)
+	assert.JSONEq(t, string(inputJson), string(outputJson))
 }
 
 func TestKinesisMarshalingMalformedJson(t *testing.T) {
diff --git a/events/lex_test.go b/events/lex_test.go
@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/aws/aws-lambda-go/events/test"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestLexEventMarshaling(t *testing.T) {
@@ -25,7 +26,7 @@ func TestLexEventMarshaling(t *testing.T) {
 			t.Errorf("could not marshal event. details: %v", err)
 		}
 
-		test.AssertJsonsEqual(t, inputJSON, outputJSON)
+		assert.JSONEq(t, string(inputJSON), string(outputJSON))
 	}
 }
 
diff --git a/events/s3_test.go b/events/s3_test.go
@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/aws/aws-lambda-go/events/test"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestS3EventMarshaling(t *testing.T) {
@@ -26,7 +27,7 @@ func TestS3EventMarshaling(t *testing.T) {
 	}
 
 	// 4. check result
-	test.AssertJsonsEqual(t, inputJson, outputJson)
+	assert.JSONEq(t, string(inputJson), string(outputJson))
 }
 
 func TestS3MarshalingMalformedJson(t *testing.T) {
diff --git a/events/ses_test.go b/events/ses_test.go
@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/aws/aws-lambda-go/events/test"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestSESEventMarshaling(t *testing.T) {
@@ -20,7 +21,7 @@ func TestSESEventMarshaling(t *testing.T) {
 		t.Errorf("could not marshal event. details: %v", err)
 	}
 
-	test.AssertJsonsEqual(t, inputJSON, outputJSON)
+	assert.JSONEq(t, string(inputJSON), string(outputJSON))
 }
 
 func TestSESMarshalingMalformedJson(t *testing.T) {
diff --git a/events/sns_test.go b/events/sns_test.go
@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/aws/aws-lambda-go/events/test"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestSnsEventMarshaling(t *testing.T) {
@@ -26,7 +27,7 @@ func TestSnsEventMarshaling(t *testing.T) {
 	}
 
 	// 4. check result
-	test.AssertJsonsEqual(t, inputJson, outputJson)
+	assert.JSONEq(t, string(inputJson), string(outputJson))
 }
 
 func TestSnsMarshalingMalformedJson(t *testing.T) {
diff --git a/events/sqs_test.go b/events/sqs_test.go
@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/aws/aws-lambda-go/events/test"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestSqsEventMarshaling(t *testing.T) {
@@ -26,7 +27,7 @@ func TestSqsEventMarshaling(t *testing.T) {
 	}
 
 	// 4. check result
-	test.AssertJsonsEqual(t, inputJson, outputJson)
+	assert.JSONEq(t, string(inputJson), string(outputJson))
 }
 
 func TestSqsMarshalingMalformedJson(t *testing.T) {
diff --git a/events/test/jsoncompare.go b/events/test/jsoncompare.go
diff --git a/events/test/jsoncompare_test.go b/events/test/jsoncompare_test.go

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import (`
`8`	`8`	`"testing"`
`9`	`9`
`10`	`10`	`"github.com/aws/aws-lambda-go/events/test"`
	`11`	`+ "github.com/stretchr/testify/assert"`
`11`	`12`	`)`
`12`	`13`
`13`	`14`	`func TestApiGatewayRequestMarshaling(t *testing.T) {`
`@@ -38,7 +39,7 @@ func TestApiGatewayRequestMarshaling(t *testing.T) {`
`38`	`39`	`t.Errorf("could not marshal event. details: %v", err)`
`39`	`40`	`}`
`40`	`41`
`41`		`- test.AssertJsonsEqual(t, inputJSON, outputJSON)`
	`42`	`+ assert.JSONEq(t, string(inputJSON), string(outputJSON))`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`func TestApiGatewayRequestMalformedJson(t *testing.T) {`
`@@ -65,7 +66,7 @@ func TestApiGatewayResponseMarshaling(t *testing.T) {`
`65`	`66`	`t.Errorf("could not marshal event. details: %v", err)`
`66`	`67`	`}`
`67`	`68`
`68`		`- test.AssertJsonsEqual(t, inputJSON, outputJSON)`
	`69`	`+ assert.JSONEq(t, string(inputJSON), string(outputJSON))`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`func TestApiGatewayResponseMalformedJson(t *testing.T) {`
`@@ -92,7 +93,7 @@ func TestApiGatewayCustomAuthorizerRequestMarshaling(t *testing.T) {`
`92`	`93`	`t.Errorf("could not marshal event. details: %v", err)`
`93`	`94`	`}`
`94`	`95`
`95`		`- test.AssertJsonsEqual(t, inputJSON, outputJSON)`
	`96`	`+ assert.JSONEq(t, string(inputJSON), string(outputJSON))`
`96`	`97`	`}`
`97`	`98`
`98`	`99`	`func TestApiGatewayCustomAuthorizerRequestTypeRequestMarshaling(t *testing.T) {`
`@@ -115,7 +116,7 @@ func TestApiGatewayCustomAuthorizerRequestTypeRequestMarshaling(t *testing.T) {`
`115`	`116`	`t.Errorf("could not marshal event. details: %v", err)`
`116`	`117`	`}`
`117`	`118`
`118`		`- test.AssertJsonsEqual(t, inputJSON, outputJSON)`
	`119`	`+ assert.JSONEq(t, string(inputJSON), string(outputJSON))`
`119`	`120`	`}`
`120`	`121`
`121`	`122`	`func TestApiGatewayCustomAuthorizerRequestMalformedJson(t *testing.T) {`
`@@ -146,7 +147,7 @@ func TestApiGatewayCustomAuthorizerResponseMarshaling(t *testing.T) {`
`146`	`147`	`t.Errorf("could not marshal event. details: %v", err)`
`147`	`148`	`}`
`148`	`149`
`149`		`- test.AssertJsonsEqual(t, inputJSON, outputJSON)`
	`150`	`+ assert.JSONEq(t, string(inputJSON), string(outputJSON))`
`150`	`151`	`}`
`151`	`152`
`152`	`153`	`func TestApiGatewayCustomAuthorizerResponseMalformedJson(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@ import (`
`5`	`5`	`"io/ioutil"`
`6`	`6`	`"testing"`
`7`	`7`
`8`		`- "github.com/aws/aws-lambda-go/events/test"`
`9`	`8`	`"github.com/stretchr/testify/assert"`
`10`	`9`	`)`
`11`	`10`
`@@ -26,7 +25,7 @@ func TestAppSyncResolverTemplate_invoke(t *testing.T) {`
`26`	`25`	`t.Errorf("could not marshal event. details: %v", err)`
`27`	`26`	`}`
`28`	`27`
`29`		`- test.AssertJsonsEqual(t, inputJSON, outputJSON)`
	`28`	`+ assert.JSONEq(t, string(inputJSON), string(outputJSON))`
`30`	`29`	`}`
`31`	`30`
`32`	`31`	`func TestAppSyncResolverTemplate_batchinvoke(t *testing.T) {`
`@@ -46,5 +45,5 @@ func TestAppSyncResolverTemplate_batchinvoke(t *testing.T) {`
`46`	`45`	`t.Errorf("could not marshal event. details: %v", err)`
`47`	`46`	`}`
`48`	`47`
`49`		`- test.AssertJsonsEqual(t, inputJSON, outputJSON)`
	`48`	`+ assert.JSONEq(t, string(inputJSON), string(outputJSON))`
`50`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,10 @@ package events`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"encoding/json"`
`5`		`- "github.com/aws/aws-lambda-go/events/test"`
`6`	`5`	`"testing"`
	`6`	`+`
	`7`	`+ "github.com/aws/aws-lambda-go/events/test"`
	`8`	`+ "github.com/stretchr/testify/assert"`
`7`	`9`	`)`
`8`	`10`
`9`	`11`	`func TestAutoScalingEventMarshaling(t *testing.T) {`
`@@ -29,7 +31,7 @@ func TestAutoScalingEventMarshaling(t *testing.T) {`
`29`	`31`	`t.Errorf("could not marshal event. details: %v", err)`
`30`	`32`	`}`
`31`	`33`	`// 4. check result`
`32`		`- test.AssertJsonsEqual(t, inputJson, outputJson)`
	`34`	`+ assert.JSONEq(t, string(inputJson), string(outputJson))`
`33`	`35`	`}`
`34`	`36`
`35`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import (`
`5`	`5`	`"testing"`
`6`	`6`
`7`	`7`	`"github.com/aws/aws-lambda-go/events/test"`
	`8`	`+ "github.com/stretchr/testify/assert"`
`8`	`9`	`)`
`9`	`10`
`10`	`11`	`func TestCloudwatchScheduledEventIdempotency(t *testing.T) {`
`@@ -27,7 +28,7 @@ func TestCloudwatchScheduledEventIdempotency(t *testing.T) {`
`27`	`28`	`t.Errorf("Could not marshal scheduled event: %v", err)`
`28`	`29`	`}`
`29`	`30`
`30`		`- test.AssertJsonsEqual(t, inputJSON, outputJSON)`
	`31`	`+ assert.JSONEq(t, string(inputJSON), string(outputJSON))`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`func TestCloudwatchScheduledEventRequestMalformedJson(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import (`
`7`	`7`	`"testing"`
`8`	`8`
`9`	`9`	`"github.com/aws/aws-lambda-go/events/test"`
	`10`	`+ "github.com/stretchr/testify/assert"`
`10`	`11`	`)`
`11`	`12`
`12`	`13`	`func TestCodePipeLineEventMarshaling(t *testing.T) {`
`@@ -29,7 +30,7 @@ func TestCodePipeLineEventMarshaling(t *testing.T) {`
`29`	`30`	`t.Errorf("could not marshal event. details: %v", err)`
`30`	`31`	`}`
`31`	`32`
`32`		`- test.AssertJsonsEqual(t, inputJSON, outputJSON)`
	`33`	`+ assert.JSONEq(t, string(inputJSON), string(outputJSON))`
`33`	`34`	`}`
`34`	`35`
`35`	`36`	`func TestCodePipelineEventMarshalingMalformedJson(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ func testMarshaling(t *testing.T, jsonFile string) {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`// 4. check result`
`40`		`- test.AssertJsonsEqual(t, inputJson, outputJson)`
	`40`	`+ assert.JSONEq(t, string(inputJson), string(outputJson))`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`func TestSampleTransformation(t *testing.T) {`