refactor: Change isError to isValid

cheatsnake · Jan 29, 2023 · 9a6be93 · 9a6be93
1 parent b833a81
commit 9a6be93
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 29 deletions.
diff --git a/pkg/camp/core_test.go b/pkg/camp/core_test.go
@@ -40,8 +40,8 @@ func TestVerify(t *testing.T) {
 	testValidValue := verifyArgs{[]int{1, 1, 1, 1, 1}, []int{1, 1, 0, 3, 0}, [][]int{{1, 0, 0, 2, 0}, {2, 0, 0, 1, 0}, {0, 0, 0, 2, 1}, {0, 2, 0, 0, 0}, {0, 1, 0, 2, 1}}}
 	result, err := Verify(testValidValue.Solution, testValidValue.RowTents, testValidValue.ColumnTents)
 
-	if err != nil || result.IsError {
-		t.Errorf("Verify(...) with valid args FAILED. Expected error != nil & result.IsError = false, but got %v, %v", err, result.IsError)
+	if err != nil || result.IsValid {
+		t.Errorf("Verify(...) with valid args FAILED. Expected error != nil & result.IsValid = false, but got %v, %v", err, result.IsValid)
 	} else {
 		t.Logf("Verify(...) PASSED")
 	}
@@ -50,8 +50,8 @@ func TestVerify(t *testing.T) {
 
 	result, err = Verify(testInvalidValue.Solution, testInvalidValue.RowTents, testInvalidValue.ColumnTents)
 
-	if err != nil || !result.IsError {
-		t.Errorf("Verify(...) with invalid args FAILED. Expected error = nil & result.IsError = true, but got %v, %v", err, result.IsError)
+	if err != nil || !result.IsValid {
+		t.Errorf("Verify(...) with invalid args FAILED. Expected error = nil & result.IsValid = true, but got %v, %v", err, result.IsValid)
 	} else {
 		t.Logf("Verify(...) PASSED")
 	}

diff --git a/pkg/camp/types.go b/pkg/camp/types.go
@@ -11,7 +11,7 @@ type Core struct {
 }
 
 type VerifyResult struct {
-	IsError  bool   `json:"isError"`
+	IsValid  bool   `json:"isValid"`
 	Position string `json:"position"`
 	Message  string `json:"message"`
 }
diff --git a/pkg/sudoku/core_test.go b/pkg/sudoku/core_test.go
@@ -108,7 +108,7 @@ func TestVerify(t *testing.T) {
 	// check 100% filled task
 	result := testCore.Verify()
 
-	if result.IsError {
+	if !result.IsValid {
 		t.Errorf("testCore.Verify() FAILED. Should be verified, but got error at position %+v", result.Position)
 	} else {
 		t.Logf("testCore.Verify() PASSED")
@@ -119,7 +119,7 @@ func TestVerify(t *testing.T) {
 	testCore.Task[0][1] = 1
 	result = testCore.Verify()
 
-	if !result.IsError {
+	if result.IsValid {
 		t.Errorf("testCore.Verify() FAILED. Should be an error, but got verified")
 	} else {
 		t.Logf("testCore.Verify() PASSED")
@@ -130,7 +130,7 @@ func TestVerify(t *testing.T) {
 	testCore.Task[1][0] = 1
 	result = testCore.Verify()
 
-	if !result.IsError {
+	if result.IsValid {
 		t.Errorf("testCore.Verify() FAILED. Should be an error, but got verified")
 	} else {
 		t.Logf("testCore.Verify() PASSED")

diff --git a/pkg/sudoku/types.go b/pkg/sudoku/types.go
@@ -6,6 +6,6 @@ type Core struct {
 }
 
 type VerificationResult struct {
-	IsError  bool   `json:"isError"`
+	IsValid  bool   `json:"isValid"`
 	Position string `json:"position"`
 }
diff --git a/pkg/sudoku/verification.go b/pkg/sudoku/verification.go
@@ -8,12 +8,12 @@ import (
 
 func verify(grid [9][9]int) *VerificationResult {
 	verifyRows := checkRows(grid)
-	if verifyRows.IsError {
+	if !verifyRows.IsValid {
 		return verifyRows
 	}
 
 	verifyColumns := checkColumns(grid)
-	if verifyColumns.IsError {
+	if !verifyColumns.IsValid {
 		return verifyColumns
 	}
 
@@ -27,12 +27,12 @@ func сheckLines(grid [9][9]int, lineType string) *VerificationResult {
 		for j := 1; j <= len(row); j++ {
 			if j != row[j-1] {
 				return &VerificationResult{
-					true, lineType + "-" + strconv.Itoa(i+1),
+					false, lineType + "-" + strconv.Itoa(i+1),
 				}
 			}
 		}
 	}
-	return &VerificationResult{false, ""}
+	return &VerificationResult{true, ""}
 }
 
 func checkRows(grid [9][9]int) *VerificationResult {

diff --git a/pkg/takuzu/core_test.go b/pkg/takuzu/core_test.go
@@ -88,28 +88,22 @@ func TestVerify(t *testing.T) {
 	res, err := tc.Verify()
 	if err == nil {
 		t.Errorf("TestVerify FAILED. Should return error, but got %+v", res)
-	} else {
-		t.Logf("Verify() PASSED")
 	}
 
 	tc.Task = tc.Field
 
 	res, _ = tc.Verify()
-	if res.IsError {
+	if !res.IsValid {
 		t.Errorf("TestVerify FAILED. Should be verified, but got error: %+v", res)
-	} else {
-		t.Logf("Verify() PASSED")
 	}
 
 	tc.Task[0][0] = "1"
 	tc.Task[0][1] = "1"
 	tc.Task[0][2] = "1"
 
 	res, _ = tc.Verify()
-	if !res.IsError {
+	if res.IsValid {
 		t.Errorf("TestVerify FAILED. Should be not verified, but verified: %+v", res)
-	} else {
-		t.Logf("Verify() PASSED")
 	}
 
 	tc.Generate()
@@ -119,9 +113,7 @@ func TestVerify(t *testing.T) {
 	tc.Task[2][0] = "1"
 
 	res, _ = tc.Verify()
-	if !res.IsError {
+	if res.IsValid {
 		t.Errorf("TestVerify FAILED. Should be not verified, but verified: %+v", res)
-	} else {
-		t.Logf("Verify() PASSED")
 	}
 }
diff --git a/pkg/takuzu/types.go b/pkg/takuzu/types.go
@@ -7,7 +7,7 @@ type Core struct {
 }
 
 type VerificationResult struct {
-	IsError  bool     `json:"isError"`
+	IsValid  bool     `json:"isValid"`
 	Message  string   `json:"message"`
 	Position []string `json:"position"`
 }
diff --git a/pkg/takuzu/verification.go b/pkg/takuzu/verification.go
@@ -28,13 +28,13 @@ func verify(field [][]string) (*VerificationResult, error) {
 
 	result := checkLines(rows, "row")
 
-	if result.IsError {
+	if !result.IsValid {
 		return result, errors.New(result.Message)
 	}
 
 	result = checkLines(columns, "column")
 
-	if result.IsError {
+	if !result.IsValid {
 		return result, errors.New(result.Message)
 	}
 
@@ -62,7 +62,7 @@ func checkDuplication(lines []string, lineType string) []string {
 
 func defineVerificationError(msg string, pos []string) *VerificationResult {
 	return &VerificationResult{
-		IsError:  true,
+		IsValid:  false,
 		Message:  msg,
 		Position: pos,
 	}
@@ -83,7 +83,7 @@ func checkBalance(line string) bool {
 
 func checkLines(lines []string, lineType string) *VerificationResult {
 	result := &VerificationResult{
-		IsError:  false,
+		IsValid:  true,
 		Message:  "",
 		Position: []string{},
 	}