Fix test

Author: lunny

modules/markup/csv/csv.go

@@ -83,18 +83,24 @@ func (Renderer) Render(ctx *markup.RenderContext, input io.Reader, output io.Wri
 	}
 
 	if setting.UI.CSV.MaxFileSize != 0 && setting.UI.CSV.MaxFileSize < int64(len(rawBytes)) {
-		tmpBlock.WriteString("<pre>")
-		tmpBlock.WriteString(html.EscapeString(string(rawBytes)))
-		tmpBlock.WriteString("</pre>")
-		return nil
+		if _, err := tmpBlock.WriteString("<pre>"); err != nil {
+			return err
+		}
+		if _, err := tmpBlock.WriteString(html.EscapeString(string(rawBytes))); err != nil {
+			return err
+		}
+		_, err = tmpBlock.WriteString("</pre>")
+		return err
 	}
 
 	rd, err := csv.CreateReaderAndGuessDelimiter(bytes.NewReader(rawBytes))
 	if err != nil {
 		return err
 	}
 
-	tmpBlock.WriteString(`<table class="data-table">`)
+	if _, err := tmpBlock.WriteString(`<table class="data-table">`); err != nil {
+		return err
+	}
 	row := 1
 	for {
 		fields, err := rd.Read()
@@ -104,16 +110,24 @@ func (Renderer) Render(ctx *markup.RenderContext, input io.Reader, output io.Wri
 		if err != nil {
 			continue
 		}
-		tmpBlock.WriteString("<tr>")
+		if _, err := tmpBlock.WriteString("<tr>"); err != nil {
+			return err
+		}
 		element := "td"
 		if row == 1 {
 			element = "th"
 		}
-		writeField(tmpBlock, element, "line-num", strconv.Itoa(row))
+		if err := writeField(tmpBlock, element, "line-num", strconv.Itoa(row)); err != nil {
+			return err
+		}
 		for _, field := range fields {
-			writeField(tmpBlock, element, "", field)
+			if err := writeField(tmpBlock, element, "", field); err != nil {
+				return err
+			}
+		}
+		if _, err := tmpBlock.WriteString("</tr>"); err != nil {
+			return err
 		}
-		tmpBlock.WriteString("</tr>")
 
 		row++
 	}

modules/markup/html_test.go

@@ -9,7 +9,6 @@ import (
 	"testing"
 
 	"code.gitea.io/gitea/modules/emoji"
-	"code.gitea.io/gitea/modules/markup"
 	. "code.gitea.io/gitea/modules/markup"
 	"code.gitea.io/gitea/modules/markup/markdown"
 	"code.gitea.io/gitea/modules/setting"
@@ -29,7 +28,7 @@ func TestRender_Commits(t *testing.T) {
 	setting.AppSubURL = AppSubURL
 
 	test := func(input, expected string) {
-		buffer, err := RenderString(&markup.RenderContext{
+		buffer, err := RenderString(&RenderContext{
 			Filename:  ".md",
 			URLPrefix: setting.AppSubURL,
 			Metas:     localMetas,
@@ -65,7 +64,7 @@ func TestRender_CrossReferences(t *testing.T) {
 	setting.AppSubURL = AppSubURL
 
 	test := func(input, expected string) {
-		buffer, err := RenderString(&markup.RenderContext{
+		buffer, err := RenderString(&RenderContext{
 			Filename:  "a.md",
 			URLPrefix: setting.AppSubURL,
 			Metas:     localMetas,
@@ -102,7 +101,7 @@ func TestRender_links(t *testing.T) {
 	setting.AppSubURL = AppSubURL
 
 	test := func(input, expected string) {
-		buffer, err := RenderString(&markup.RenderContext{
+		buffer, err := RenderString(&RenderContext{
 			Filename:  "a.md",
 			URLPrefix: setting.AppSubURL,
 		}, input)
@@ -202,7 +201,7 @@ func TestRender_email(t *testing.T) {
 	setting.AppSubURL = AppSubURL
 
 	test := func(input, expected string) {
-		res, err := RenderString(&markup.RenderContext{
+		res, err := RenderString(&RenderContext{
 			Filename:  "a.md",
 			URLPrefix: setting.AppSubURL,
 		}, input)
@@ -261,7 +260,7 @@ func TestRender_emoji(t *testing.T) {
 
 	test := func(input, expected string) {
 		expected = strings.ReplaceAll(expected, "&", "&")
-		buffer, err := RenderString(&markup.RenderContext{
+		buffer, err := RenderString(&RenderContext{
 			Filename:  "a.md",
 			URLPrefix: setting.AppSubURL,
 		}, input)
@@ -314,12 +313,12 @@ func TestRender_ShortLinks(t *testing.T) {
 	tree := util.URLJoin(AppSubURL, "src", "master")
 
 	test := func(input, expected, expectedUncyclo string) {
-		buffer, err := markdown.RenderString(&markup.RenderContext{
+		buffer, err := markdown.RenderString(&RenderContext{
 			URLPrefix: tree,
 		}, input)
 		assert.NoError(t, err)
 		assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(buffer))
-		buffer, err = markdown.RenderString(&markup.RenderContext{
+		buffer, err = markdown.RenderString(&RenderContext{
 			URLPrefix: setting.AppSubURL,
 			Metas:     localMetas,
 			IsUncyclo:    true,

services/gitdiff/csv_test.go

@@ -95,7 +95,7 @@ func TestCSVDiff(t *testing.T) {
 
 		var baseReader *csv.Reader
 		if len(c.base) > 0 {
-			baseReader,err = csv_module.CreateReaderAndGuessDelimiter(strings.NewReader(c.base))
+			baseReader, err = csv_module.CreateReaderAndGuessDelimiter(strings.NewReader(c.base))
 			if err != nil {
 				t.Errorf("CreateReaderAndGuessDelimiter failed: %s", err)
 			}