mirror of
				https://github.com/go-gitea/gitea
				synced 2025-11-04 13:28:25 +00:00 
			
		
		
		
	* Make diff line-marker non-selectable * Move to use data-* as per @mrsdizzie * fix missing line nums * Add a minimum-width to force right-align of the line num * Move line-type-marker into separate column
		
			
				
	
	
		
			191 lines
		
	
	
		
			5.2 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			191 lines
		
	
	
		
			5.2 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
package models
 | 
						|
 | 
						|
import (
 | 
						|
	"html/template"
 | 
						|
	"strings"
 | 
						|
	"testing"
 | 
						|
 | 
						|
	"code.gitea.io/gitea/modules/setting"
 | 
						|
 | 
						|
	dmp "github.com/sergi/go-diff/diffmatchpatch"
 | 
						|
	"github.com/stretchr/testify/assert"
 | 
						|
)
 | 
						|
 | 
						|
func assertEqual(t *testing.T, s1 string, s2 template.HTML) {
 | 
						|
	if s1 != string(s2) {
 | 
						|
		t.Errorf("%s should be equal %s", s2, s1)
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
func TestDiffToHTML(t *testing.T) {
 | 
						|
	assertEqual(t, "foo <span class=\"added-code\">bar</span> biz", diffToHTML([]dmp.Diff{
 | 
						|
		{Type: dmp.DiffEqual, Text: "foo "},
 | 
						|
		{Type: dmp.DiffInsert, Text: "bar"},
 | 
						|
		{Type: dmp.DiffDelete, Text: " baz"},
 | 
						|
		{Type: dmp.DiffEqual, Text: " biz"},
 | 
						|
	}, DiffLineAdd))
 | 
						|
 | 
						|
	assertEqual(t, "foo <span class=\"removed-code\">bar</span> biz", diffToHTML([]dmp.Diff{
 | 
						|
		{Type: dmp.DiffEqual, Text: "foo "},
 | 
						|
		{Type: dmp.DiffDelete, Text: "bar"},
 | 
						|
		{Type: dmp.DiffInsert, Text: " baz"},
 | 
						|
		{Type: dmp.DiffEqual, Text: " biz"},
 | 
						|
	}, DiffLineDel))
 | 
						|
}
 | 
						|
 | 
						|
const exampleDiff = `diff --git a/README.md b/README.md
 | 
						|
--- a/README.md
 | 
						|
+++ b/README.md
 | 
						|
@@ -1,3 +1,6 @@
 | 
						|
 # gitea-github-migrator
 | 
						|
+
 | 
						|
+ Build Status
 | 
						|
- Latest Release
 | 
						|
 Docker Pulls
 | 
						|
+ cut off
 | 
						|
+ cut off`
 | 
						|
 | 
						|
func TestCutDiffAroundLine(t *testing.T) {
 | 
						|
	result := CutDiffAroundLine(strings.NewReader(exampleDiff), 4, false, 3)
 | 
						|
	resultByLine := strings.Split(result, "\n")
 | 
						|
	assert.Len(t, resultByLine, 7)
 | 
						|
	// Check if headers got transferred
 | 
						|
	assert.Equal(t, "diff --git a/README.md b/README.md", resultByLine[0])
 | 
						|
	assert.Equal(t, "--- a/README.md", resultByLine[1])
 | 
						|
	assert.Equal(t, "+++ b/README.md", resultByLine[2])
 | 
						|
	// Check if hunk header is calculated correctly
 | 
						|
	assert.Equal(t, "@@ -2,2 +3,2 @@", resultByLine[3])
 | 
						|
	// Check if line got transferred
 | 
						|
	assert.Equal(t, "+ Build Status", resultByLine[4])
 | 
						|
 | 
						|
	// Must be same result as before since old line 3 == new line 5
 | 
						|
	newResult := CutDiffAroundLine(strings.NewReader(exampleDiff), 3, true, 3)
 | 
						|
	assert.Equal(t, result, newResult, "Must be same result as before since old line 3 == new line 5")
 | 
						|
 | 
						|
	newResult = CutDiffAroundLine(strings.NewReader(exampleDiff), 6, false, 300)
 | 
						|
	assert.Equal(t, exampleDiff, newResult)
 | 
						|
 | 
						|
	emptyResult := CutDiffAroundLine(strings.NewReader(exampleDiff), 6, false, 0)
 | 
						|
	assert.Empty(t, emptyResult)
 | 
						|
 | 
						|
	// Line is out of scope
 | 
						|
	emptyResult = CutDiffAroundLine(strings.NewReader(exampleDiff), 434, false, 0)
 | 
						|
	assert.Empty(t, emptyResult)
 | 
						|
}
 | 
						|
 | 
						|
func BenchmarkCutDiffAroundLine(b *testing.B) {
 | 
						|
	for n := 0; n < b.N; n++ {
 | 
						|
		CutDiffAroundLine(strings.NewReader(exampleDiff), 3, true, 3)
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
func ExampleCutDiffAroundLine() {
 | 
						|
	const diff = `diff --git a/README.md b/README.md
 | 
						|
--- a/README.md
 | 
						|
+++ b/README.md
 | 
						|
@@ -1,3 +1,6 @@
 | 
						|
 # gitea-github-migrator
 | 
						|
+
 | 
						|
+ Build Status
 | 
						|
- Latest Release
 | 
						|
 Docker Pulls
 | 
						|
+ cut off
 | 
						|
+ cut off`
 | 
						|
	result := CutDiffAroundLine(strings.NewReader(diff), 4, false, 3)
 | 
						|
	println(result)
 | 
						|
}
 | 
						|
 | 
						|
func TestParsePatch(t *testing.T) {
 | 
						|
	var diff = `diff --git "a/README.md" "b/README.md"
 | 
						|
--- a/README.md
 | 
						|
+++ b/README.md
 | 
						|
@@ -1,3 +1,6 @@
 | 
						|
 # gitea-github-migrator
 | 
						|
+
 | 
						|
+ Build Status
 | 
						|
- Latest Release
 | 
						|
 Docker Pulls
 | 
						|
+ cut off
 | 
						|
+ cut off`
 | 
						|
	result, err := ParsePatch(setting.Git.MaxGitDiffLines, setting.Git.MaxGitDiffLineCharacters, setting.Git.MaxGitDiffFiles, strings.NewReader(diff))
 | 
						|
	if err != nil {
 | 
						|
		t.Errorf("ParsePatch failed: %s", err)
 | 
						|
	}
 | 
						|
	println(result)
 | 
						|
 | 
						|
	var diff2 = `diff --git "a/A \\ B" "b/A \\ B"
 | 
						|
--- "a/A \\ B"
 | 
						|
+++ "b/A \\ B"
 | 
						|
@@ -1,3 +1,6 @@
 | 
						|
 # gitea-github-migrator
 | 
						|
+
 | 
						|
+ Build Status
 | 
						|
- Latest Release
 | 
						|
 Docker Pulls
 | 
						|
+ cut off
 | 
						|
+ cut off`
 | 
						|
	result, err = ParsePatch(setting.Git.MaxGitDiffLines, setting.Git.MaxGitDiffLineCharacters, setting.Git.MaxGitDiffFiles, strings.NewReader(diff2))
 | 
						|
	if err != nil {
 | 
						|
		t.Errorf("ParsePatch failed: %s", err)
 | 
						|
	}
 | 
						|
	println(result)
 | 
						|
 | 
						|
	var diff3 = `diff --git a/README.md b/README.md
 | 
						|
--- a/README.md
 | 
						|
+++ b/README.md
 | 
						|
@@ -1,3 +1,6 @@
 | 
						|
 # gitea-github-migrator
 | 
						|
+
 | 
						|
+ Build Status
 | 
						|
- Latest Release
 | 
						|
 Docker Pulls
 | 
						|
+ cut off
 | 
						|
+ cut off`
 | 
						|
	result, err = ParsePatch(setting.Git.MaxGitDiffLines, setting.Git.MaxGitDiffLineCharacters, setting.Git.MaxGitDiffFiles, strings.NewReader(diff3))
 | 
						|
	if err != nil {
 | 
						|
		t.Errorf("ParsePatch failed: %s", err)
 | 
						|
	}
 | 
						|
	println(result)
 | 
						|
}
 | 
						|
 | 
						|
func setupDefaultDiff() *Diff {
 | 
						|
	return &Diff{
 | 
						|
		Files: []*DiffFile{
 | 
						|
			{
 | 
						|
				Name: "README.md",
 | 
						|
				Sections: []*DiffSection{
 | 
						|
					{
 | 
						|
						Lines: []*DiffLine{
 | 
						|
							{
 | 
						|
								LeftIdx:  4,
 | 
						|
								RightIdx: 4,
 | 
						|
							},
 | 
						|
						},
 | 
						|
					},
 | 
						|
				},
 | 
						|
			},
 | 
						|
		},
 | 
						|
	}
 | 
						|
}
 | 
						|
func TestDiff_LoadComments(t *testing.T) {
 | 
						|
	issue := AssertExistsAndLoadBean(t, &Issue{ID: 2}).(*Issue)
 | 
						|
	user := AssertExistsAndLoadBean(t, &User{ID: 1}).(*User)
 | 
						|
	diff := setupDefaultDiff()
 | 
						|
	assert.NoError(t, PrepareTestDatabase())
 | 
						|
	assert.NoError(t, diff.LoadComments(issue, user))
 | 
						|
	assert.Len(t, diff.Files[0].Sections[0].Lines[0].Comments, 2)
 | 
						|
}
 | 
						|
 | 
						|
func TestDiffLine_CanComment(t *testing.T) {
 | 
						|
	assert.False(t, (&DiffLine{Type: DiffLineSection}).CanComment())
 | 
						|
	assert.False(t, (&DiffLine{Type: DiffLineAdd, Comments: []*Comment{{Content: "bla"}}}).CanComment())
 | 
						|
	assert.True(t, (&DiffLine{Type: DiffLineAdd}).CanComment())
 | 
						|
	assert.True(t, (&DiffLine{Type: DiffLineDel}).CanComment())
 | 
						|
	assert.True(t, (&DiffLine{Type: DiffLinePlain}).CanComment())
 | 
						|
}
 | 
						|
 | 
						|
func TestDiffLine_GetCommentSide(t *testing.T) {
 | 
						|
	assert.Equal(t, "previous", (&DiffLine{Comments: []*Comment{{Line: -3}}}).GetCommentSide())
 | 
						|
	assert.Equal(t, "proposed", (&DiffLine{Comments: []*Comment{{Line: 3}}}).GetCommentSide())
 | 
						|
}
 |