Fix unit tests error handling

anton-yurchenko · Jul 9, 2023 · 40a2625 · 40a2625
1 parent 58be836
commit 40a2625
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 24 deletions.
diff --git a/changelog_test.go b/changelog_test.go
@@ -260,10 +260,8 @@ func TestSaveToFile(t *testing.T) {
 		}
 
 		err := test.Changelog.SaveToFile(m, "CHANGELOG.md")
-		if test.Expected != "" {
+		if test.Expected != "" || err != nil {
 			a.EqualError(err, fmt.Sprintf("error creating a file: %v", test.Expected))
-		} else {
-			a.Equal(nil, err)
 		}
 	}
 }
@@ -352,10 +350,10 @@ func TestSetUnreleasedURL(t *testing.T) {
 		counter++
 		t.Logf("Test Case %v/%v - %s", counter, len(suite), name)
 
-		if test.Expected != "" {
-			a.EqualError(test.Changelog.SetUnreleasedURL(test.URL), test.Expected)
-		} else {
-			a.Equal(nil, test.Changelog.SetUnreleasedURL(test.URL))
+		err := test.Changelog.SetUnreleasedURL(test.URL)
+
+		if test.Expected != "" || err != nil {
+			a.EqualError(err, test.Expected)
 		}
 	}
 }
@@ -438,7 +436,7 @@ func TestAddUnreleasedChange(t *testing.T) {
 
 		err := test.Changelog.AddUnreleasedChange(test.Scope, test.Change)
 
-		if test.Expected.Error != "" {
+		if test.Expected.Error != "" || err != nil {
 			a.EqualError(err, test.Expected.Error)
 		} else {
 			a.Equal(test.Expected.Changelog, test.Changelog)
@@ -530,7 +528,7 @@ func TestChangelogCreateRelease(t *testing.T) {
 		t.Logf("Test Case %v/%v - %s", counter, len(suite), name)
 
 		r, err := test.Changelog.CreateRelease(test.Version, test.Date)
-		if test.Expected.Error != "" {
+		if test.Expected.Error != "" || err != nil {
 			a.EqualError(err, test.Expected.Error)
 		} else {
 			a.Equal(test.Expected.Release, r)
@@ -584,7 +582,7 @@ func TestChangelogCreateReleaseWithURL(t *testing.T) {
 		t.Logf("Test Case %v/%v - %s", counter, len(suite), name)
 
 		r, err := test.Changelog.CreateReleaseWithURL(test.Version, test.Date, test.URL)
-		if test.Expected.Error != "" {
+		if test.Expected.Error != "" || err != nil {
 			a.EqualError(err, test.Expected.Error)
 		} else {
 			a.Equal(test.Expected.Release, r)
@@ -681,7 +679,7 @@ func TestCreateReleaseFromUnreleased(t *testing.T) {
 		t.Logf("Test Case %v/%v - %s", counter, len(suite), name)
 
 		r, err := test.Changelog.CreateReleaseFromUnreleased(test.Version, test.Date)
-		if test.Expected.Error != "" {
+		if test.Expected.Error != "" || err != nil {
 			a.EqualError(err, test.Expected.Error)
 		} else {
 			a.Equal(test.Expected.Release, r)
@@ -789,7 +787,7 @@ func TestCreateReleaseFromUnreleasedWithURL(t *testing.T) {
 		t.Logf("Test Case %v/%v - %s", counter, len(suite), name)
 
 		r, err := test.Changelog.CreateReleaseFromUnreleasedWithURL(test.Version, test.Date, test.URL)
-		if test.Expected.Error != "" {
+		if test.Expected.Error != "" || err != nil {
 			a.EqualError(err, test.Expected.Error)
 		} else {
 			a.Equal(test.Expected.Release, r)

diff --git a/changes_test.go b/changes_test.go
@@ -469,7 +469,7 @@ func TestAddChange(t *testing.T) {
 
 		err := test.Changes.AddChange(test.Scope, test.Change)
 		a.Equal(test.Expected.Changes, test.Changes)
-		if test.Expected.Error != "" {
+		if test.Expected.Error != "" || err != nil {
 			a.EqualError(err, test.Expected.Error)
 		}
 	}

diff --git a/release_test.go b/release_test.go
@@ -143,10 +143,8 @@ func TestSetDate(t *testing.T) {
 		t.Logf("Test Case %v/%v - %s", counter, len(suite), name)
 
 		err := test.Release.SetDate(test.Date)
-		if test.Expected.Error != "" {
+		if test.Expected.Error != "" || err != nil {
 			a.EqualError(err, test.Expected.Error)
-		} else {
-			a.Equal(nil, err)
 		}
 	}
 }
@@ -192,10 +190,8 @@ func TestSetVersion(t *testing.T) {
 		t.Logf("Test Case %v/%v - %s", counter, len(suite), name)
 
 		err := test.Release.SetVersion(test.Version)
-		if test.Expected.Error != "" {
+		if test.Expected.Error != "" || err != nil {
 			a.EqualError(err, test.Expected.Error)
-		} else {
-			a.Equal(nil, err)
 		}
 	}
 }
@@ -241,10 +237,8 @@ func TestSetURL(t *testing.T) {
 		t.Logf("Test Case %v/%v - %s", counter, len(suite), name)
 
 		err := test.Release.SetURL(test.URL)
-		if test.Expected.Error != "" {
+		if test.Expected.Error != "" || err != nil {
 			a.EqualError(err, test.Expected.Error)
-		} else {
-			a.Equal(nil, err)
 		}
 	}
 }

diff --git a/releases_test.go b/releases_test.go
@@ -242,7 +242,7 @@ func TestReleasesCreateRelease(t *testing.T) {
 		t.Logf("Test Case %v/%v - %s", counter, len(suite), name)
 
 		r, err := test.Releases.CreateRelease(test.Version, test.Date)
-		if test.Expected.Error != "" {
+		if test.Expected.Error != "" || err != nil {
 			a.EqualError(err, test.Expected.Error)
 		} else {
 			a.Equal(test.Expected.Release, r)
@@ -322,7 +322,7 @@ func TestReleasesCreateReleaseWithURL(t *testing.T) {
 		t.Logf("Test Case %v/%v - %s", counter, len(suite), name)
 
 		r, err := test.Releases.CreateReleaseWithURL(test.Version, test.Date, test.URL)
-		if test.Expected.Error != "" {
+		if test.Expected.Error != "" || err != nil {
 			a.EqualError(err, test.Expected.Error)
 		} else {
 			a.Equal(test.Expected.Release, r)