fine tune tests

Author: wxiaoguang

routers/web/repo/compare.go

@@ -641,7 +641,7 @@ func PrepareCompareDiff(
 	ctx.Data["DiffShortStat"] = diffShortStat
 	ctx.Data["Diff"] = diff
 	ctx.Data["DiffBlobExcerptData"] = &gitdiff.DiffBlobExcerptData{
-		BaseLink:      ctx.Repo.RepoLink + "/blob_excerpt",
+		BaseLink:      ci.HeadRepo.Link() + "/blob_excerpt",
 		DiffStyle:     ctx.FormString("style"),
 		AfterCommitID: headCommitID,
 	}

services/gitdiff/gitdiff.go

@@ -224,8 +224,8 @@ func FillHiddenCommentIDsForDiffLine(line *DiffLine, lineComments map[int64][]*i
 	var hiddenCommentIDs []int64
 	for commentLineNum, comments := range lineComments {
 		absLineNum := int(commentLineNum)
-		if commentLineNum < 0 {
-			absLineNum = int(-commentLineNum)
+		if absLineNum < 0 {
+			absLineNum = -absLineNum
 		}
 		// Check if comments are in the hidden range
 		if absLineNum > line.SectionInfo.LastRightIdx && absLineNum <= line.SectionInfo.RightIdx {

services/gitdiff/gitdiff_test.go

@@ -721,17 +721,17 @@ func TestGeneratePatchForUnchangedLineFromReader(t *testing.T) {
 		},
 		{
 			name:         "multi-line context",
-			content:      "package main\n\nfunc main() {\n\tfmt.Println(\"Hello\")\n}\n",
+			content:      "package main\n\nfunc main() {\n  fmt.Println(\"Hello\")\n}\n",
 			treePath:     "main.go",
 			line:         4,
 			contextLines: 2,
 			want: `diff --git a/main.go b/main.go
 --- a/main.go
 +++ b/main.go
 @@ -2,3 +2,3 @@
-
+<SP>
  func main() {
- 	fmt.Println("Hello")
+   fmt.Println("Hello")
 `,
 		},
 		{
@@ -752,7 +752,7 @@ func TestGeneratePatchForUnchangedLineFromReader(t *testing.T) {
 				assert.Error(t, err)
 			} else {
 				require.NoError(t, err)
-				assert.Equal(t, tt.want, got)
+				assert.Equal(t, strings.ReplaceAll(tt.want, "<SP>", " "), got)
 			}
 		})
 	}
@@ -820,38 +820,16 @@ func TestCalculateHiddenCommentIDsForLine(t *testing.T) {
 			},
 			lineComments: map[int64][]*issues_model.Comment{
 				10: {{ID: 100}}, // at LastRightIdx, should not be included
-				20: {{ID: 101}}, // at RightIdx, should not be included
+				20: {{ID: 101}}, // at RightIdx, should be included
 				11: {{ID: 102}}, // just inside range, should be included
 				19: {{ID: 103}}, // just inside range, should be included
 			},
-			expected: []int64{102, 103},
-		},
-		{
-			name: "not a section line",
-			line: &DiffLine{
-				Type: DiffLinePlain,
-			},
-			lineComments: map[int64][]*issues_model.Comment{
-				15: {{ID: 100}},
-			},
-			expected: nil,
-		},
-		{
-			name: "section line without section info",
-			line: &DiffLine{
-				Type:        DiffLineSection,
-				SectionInfo: nil,
-			},
-			lineComments: map[int64][]*issues_model.Comment{
-				15: {{ID: 100}},
-			},
-			expected: nil,
+			expected: []int64{101, 102, 103},
 		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			tt.line.SectionInfo = &DiffLineSectionInfo{}
 			FillHiddenCommentIDsForDiffLine(tt.line, tt.lineComments)
 			assert.ElementsMatch(t, tt.expected, tt.line.SectionInfo.HiddenCommentIDs)
 		})