Merge pull request #57 from sprak3000/issue-55-check-unmarshal-errs

Issue #55 - Add error checking to JSON unmarshals
Henry-Sarabia · Nov 13, 2019 · 1196f3f · 1196f3f
2 parents 1041881 + ec5455e
commit 1196f3f
Show file tree

Hide file tree

Showing 64 changed files with 775 additions and 196 deletions.
diff --git a/achievement_test.go b/achievement_test.go
@@ -21,7 +21,10 @@ func TestAchievementService_Get(t *testing.T) {
 	}
 
 	init := make([]*Achievement, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name            string
@@ -64,7 +67,10 @@ func TestAchievementService_List(t *testing.T) {
 	}
 
 	init := make([]*Achievement, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name             string
@@ -108,7 +114,10 @@ func TestAchievementService_Index(t *testing.T) {
 	}
 
 	init := make([]*Achievement, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name             string

diff --git a/achievementicon_test.go b/achievementicon_test.go
@@ -21,7 +21,10 @@ func TestAchievementIconService_Get(t *testing.T) {
 	}
 
 	init := make([]*AchievementIcon, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                string
@@ -64,7 +67,10 @@ func TestAchievementIconService_List(t *testing.T) {
 	}
 
 	init := make([]*AchievementIcon, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                 string
@@ -108,7 +114,10 @@ func TestAchievementIconService_Index(t *testing.T) {
 	}
 
 	init := make([]*AchievementIcon, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name                 string

diff --git a/agerating_test.go b/agerating_test.go
@@ -21,7 +21,10 @@ func TestAgeRatingService_Get(t *testing.T) {
 	}
 
 	init := make([]*AgeRating, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name          string
@@ -64,7 +67,10 @@ func TestAgeRatingService_List(t *testing.T) {
 	}
 
 	init := make([]*AgeRating, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name           string
@@ -108,7 +114,10 @@ func TestAgeRatingService_Index(t *testing.T) {
 	}
 
 	init := make([]*AgeRating, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name           string

diff --git a/ageratingcontent_test.go b/ageratingcontent_test.go
@@ -21,7 +21,10 @@ func TestAgeRatingContentService_Get(t *testing.T) {
 	}
 
 	init := make([]*AgeRatingContent, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                 string
@@ -64,7 +67,10 @@ func TestAgeRatingContentService_List(t *testing.T) {
 	}
 
 	init := make([]*AgeRatingContent, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                  string
@@ -108,7 +114,10 @@ func TestAgeRatingContentService_Index(t *testing.T) {
 	}
 
 	init := make([]*AgeRatingContent, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name                  string

diff --git a/alternativename_test.go b/alternativename_test.go
@@ -21,7 +21,10 @@ func TestAlternativeNameService_Get(t *testing.T) {
 	}
 
 	init := make([]*AlternativeName, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                string
@@ -64,7 +67,10 @@ func TestAlternativeNameService_List(t *testing.T) {
 	}
 
 	init := make([]*AlternativeName, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                 string
@@ -108,7 +114,10 @@ func TestAlternativeNameService_Index(t *testing.T) {
 	}
 
 	init := make([]*AlternativeName, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name                 string

diff --git a/artwork_test.go b/artwork_test.go
@@ -21,7 +21,10 @@ func TestArtworkService_Get(t *testing.T) {
 	}
 
 	init := make([]*Artwork, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name        string
@@ -64,7 +67,10 @@ func TestArtworkService_List(t *testing.T) {
 	}
 
 	init := make([]*Artwork, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name         string
@@ -108,7 +114,10 @@ func TestArtworkService_Index(t *testing.T) {
 	}
 
 	init := make([]*Artwork, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name         string

diff --git a/character_test.go b/character_test.go
@@ -22,7 +22,10 @@ func TestCharacterService_Get(t *testing.T) {
 	}
 
 	init := make([]*Character, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name          string
@@ -65,7 +68,10 @@ func TestCharacterService_List(t *testing.T) {
 	}
 
 	init := make([]*Character, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name           string
@@ -109,7 +115,10 @@ func TestCharacterService_Index(t *testing.T) {
 	}
 
 	init := make([]*Character, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name           string
@@ -150,7 +159,10 @@ func TestCharacterService_Search(t *testing.T) {
 	}
 
 	init := make([]*Character, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name           string

diff --git a/charactermugshot_test.go b/charactermugshot_test.go
@@ -21,7 +21,10 @@ func TestCharacterMugshotService_Get(t *testing.T) {
 	}
 
 	init := make([]*CharacterMugshot, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                 string
@@ -64,7 +67,10 @@ func TestCharacterMugshotService_List(t *testing.T) {
 	}
 
 	init := make([]*CharacterMugshot, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                  string
@@ -108,7 +114,10 @@ func TestCharacterMugshotService_Index(t *testing.T) {
 	}
 
 	init := make([]*CharacterMugshot, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name                  string

diff --git a/collection_test.go b/collection_test.go
@@ -22,7 +22,10 @@ func TestCollectionService_Get(t *testing.T) {
 	}
 
 	init := make([]*Collection, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name           string
@@ -65,7 +68,10 @@ func TestCollectionService_List(t *testing.T) {
 	}
 
 	init := make([]*Collection, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name            string
@@ -109,7 +115,10 @@ func TestCollectionService_Index(t *testing.T) {
 	}
 
 	init := make([]*Collection, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name            string
@@ -150,7 +159,10 @@ func TestCollectionService_Search(t *testing.T) {
 	}
 
 	init := make([]*Collection, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name            string

diff --git a/company_test.go b/company_test.go
@@ -21,7 +21,10 @@ func TestCompanyService_Get(t *testing.T) {
 	}
 
 	init := make([]*Company, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name        string
@@ -64,7 +67,10 @@ func TestCompanyService_List(t *testing.T) {
 	}
 
 	init := make([]*Company, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name          string
@@ -108,7 +114,10 @@ func TestCompanyService_Index(t *testing.T) {
 	}
 
 	init := make([]*Company, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name          string