OSDN > 浏览软件 > Excelize > SCM > git > excelize > 提交

Excelize
Fork

R/O
HTTP
SSH
HTTPS

excelize: 提交

Go language library for reading and writing Microsoft Excel™ (XLAM / XLSM / XLSX / XLTM / XLTX) spreadsheets

Commit MetaInfo

修订版	bef49e40eec508a6413e80ee5df7df52f7827424 (tree)
时间	2022-08-28 01:16:41
作者	davidborry <davidborryfr@gmai...>
Commiter	GitHub

Log Message

This closes #1330 update non existing sheet error messages (#1331)

更改概述

modified: adjust_test.go (diff)
modified: calc_test.go (diff)
modified: cell_test.go (diff)
modified: chart_test.go (diff)
modified: col_test.go (diff)
modified: comment_test.go (diff)
modified: datavalidation_test.go (diff)
modified: errors.go (diff)
modified: excelize_test.go (diff)
modified: merge_test.go (diff)
modified: picture_test.go (diff)
modified: pivotTable.go (diff)
modified: pivotTable_test.go (diff)
modified: rows.go (diff)
modified: rows_test.go (diff)
modified: shape_test.go (diff)
modified: sheet_test.go (diff)
modified: sheetpr_test.go (diff)
modified: sparkline_test.go (diff)
modified: stream_test.go (diff)
modified: styles.go (diff)
modified: styles_test.go (diff)
modified: table_test.go (diff)

差异

--- a/adjust_test.go

+++ b/adjust_test.go

		@@ -339,7 +339,7 @@ func TestAdjustHelper(t *testing.T) {
339	339	assert.EqualError(t, f.adjustHelper("Sheet1", rows, 0, 0), newCellNameToCoordinatesError("A", newInvalidCellNameError("A")).Error())
340	340	assert.EqualError(t, f.adjustHelper("Sheet2", rows, 0, 0), newCellNameToCoordinatesError("B", newInvalidCellNameError("B")).Error())
341	341	// Test adjustHelper on not exists worksheet.
342		- assert.EqualError(t, f.adjustHelper("SheetN", rows, 0, 0), "sheet SheetN is not exist")
	342	+ assert.EqualError(t, f.adjustHelper("SheetN", rows, 0, 0), "sheet SheetN does not exist")
343	343	}
344	344
345	345	func TestAdjustCalcChain(t *testing.T) {

--- a/calc_test.go

+++ b/calc_test.go

		@@ -4330,7 +4330,7 @@ func TestCalcCellValue(t *testing.T) {
4330	4330	// Test get calculated cell value on not exists worksheet.
4331	4331	f = prepareCalcData(cellData)
4332	4332	_, err = f.CalcCellValue("SheetN", "A1")
4333		- assert.EqualError(t, err, "sheet SheetN is not exist")
	4333	+ assert.EqualError(t, err, "sheet SheetN does not exist")
4334	4334	// Test get calculated cell value with not support formula.
4335	4335	f = prepareCalcData(cellData)
4336	4336	assert.NoError(t, f.SetCellFormula("Sheet1", "A1", "=UNSUPPORT(A1)"))

--- a/cell_test.go

+++ b/cell_test.go

		@@ -373,7 +373,7 @@ func TestGetCellFormula(t *testing.T) {
373	373	// Test get cell formula on not exist worksheet.
374	374	f := NewFile()
375	375	_, err := f.GetCellFormula("SheetN", "A1")
376		- assert.EqualError(t, err, "sheet SheetN is not exist")
	376	+ assert.EqualError(t, err, "sheet SheetN does not exist")
377	377
378	378	// Test get cell formula on no formula cell.
379	379	assert.NoError(t, f.SetCellValue("Sheet1", "A1", true))

		@@ -555,7 +555,7 @@ func TestGetCellRichText(t *testing.T) {
555	555	assert.EqualError(t, err, "strconv.Atoi: parsing \"x\": invalid syntax")
556	556	// Test set cell rich text on not exists worksheet
557	557	_, err = f.GetCellRichText("SheetN", "A1")
558		- assert.EqualError(t, err, "sheet SheetN is not exist")
	558	+ assert.EqualError(t, err, "sheet SheetN does not exist")
559	559	// Test set cell rich text with illegal cell coordinates
560	560	_, err = f.GetCellRichText("Sheet1", "A")
561	561	assert.EqualError(t, err, newCellNameToCoordinatesError("A", newInvalidCellNameError("A")).Error())

		@@ -652,7 +652,7 @@ func TestSetCellRichText(t *testing.T) {
652	652	assert.NoError(t, f.SetCellStyle("Sheet1", "A1", "A1", style))
653	653	assert.NoError(t, f.SaveAs(filepath.Join("test", "TestSetCellRichText.xlsx")))
654	654	// Test set cell rich text on not exists worksheet
655		- assert.EqualError(t, f.SetCellRichText("SheetN", "A1", richTextRun), "sheet SheetN is not exist")
	655	+ assert.EqualError(t, f.SetCellRichText("SheetN", "A1", richTextRun), "sheet SheetN does not exist")
656	656	// Test set cell rich text with illegal cell coordinates
657	657	assert.EqualError(t, f.SetCellRichText("Sheet1", "A", richTextRun), newCellNameToCoordinatesError("A", newInvalidCellNameError("A")).Error())
658	658	richTextRun = []RichTextRun{{Text: strings.Repeat("s", TotalCellChars+1)}}

--- a/chart_test.go

+++ b/chart_test.go

		@@ -114,7 +114,7 @@ func TestAddChart(t *testing.T) {
114	114	assert.EqualError(t, f.AddChart("Sheet1", "P1", ""), "unexpected end of JSON input")
115	115
116	116	// Test add chart on not exists worksheet.
117		- assert.EqualError(t, f.AddChart("SheetN", "P1", "{}"), "sheet SheetN is not exist")
	117	+ assert.EqualError(t, f.AddChart("SheetN", "P1", "{}"), "sheet SheetN does not exist")
118	118
119	119	assert.NoError(t, f.AddChart("Sheet1", "P1", `{"type":"col","series":[{"name":"Sheet1!$A$30","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$30:$D$30"},{"name":"Sheet1!$A$31","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$31:$D$31"},{"name":"Sheet1!$A$32","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$32:$D$32"},{"name":"Sheet1!$A$33","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$33:$D$33"},{"name":"Sheet1!$A$34","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$34:$D$34"},{"name":"Sheet1!$A$35","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$35:$D$35"},{"name":"Sheet1!$A$36","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$36:$D$36"},{"name":"Sheet1!$A$37","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$37:$D$37"}],"format":{"x_scale":1.0,"y_scale":1.0,"x_offset":15,"y_offset":10,"print_obj":true,"lock_aspect_ratio":false,"locked":false},"legend":{"none":true,"show_legend_key":true},"title":{"name":"2D Column Chart"},"plotarea":{"show_bubble_size":true,"show_cat_name":false,"show_leader_lines":false,"show_percent":true,"show_series_name":true,"show_val":true},"show_blanks_as":"zero"}`))
120	120	assert.NoError(t, f.AddChart("Sheet1", "X1", `{"type":"colStacked","series":[{"name":"Sheet1!$A$30","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$30:$D$30"},{"name":"Sheet1!$A$31","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$31:$D$31"},{"name":"Sheet1!$A$32","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$32:$D$32"},{"name":"Sheet1!$A$33","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$33:$D$33"},{"name":"Sheet1!$A$34","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$34:$D$34"},{"name":"Sheet1!$A$35","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$35:$D$35"},{"name":"Sheet1!$A$36","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$36:$D$36"},{"name":"Sheet1!$A$37","categories":"Sheet1!$B$29:$D$29","values":"Sheet1!$B$37:$D$37"}],"format":{"x_scale":1.0,"y_scale":1.0,"x_offset":15,"y_offset":10,"print_obj":true,"lock_aspect_ratio":false,"locked":false},"legend":{"position":"left","show_legend_key":false},"title":{"name":"2D Stacked Column Chart"},"plotarea":{"show_bubble_size":true,"show_cat_name":false,"show_leader_lines":false,"show_percent":true,"show_series_name":true,"show_val":true},"show_blanks_as":"zero"}`))

		@@ -250,7 +250,7 @@ func TestDeleteChart(t *testing.T) {
250	250	assert.NoError(t, f.DeleteChart("Sheet1", "P1"))
251	251	assert.NoError(t, f.SaveAs(filepath.Join("test", "TestDeleteChart.xlsx")))
252	252	// Test delete chart on not exists worksheet.
253		- assert.EqualError(t, f.DeleteChart("SheetN", "A1"), "sheet SheetN is not exist")
	253	+ assert.EqualError(t, f.DeleteChart("SheetN", "A1"), "sheet SheetN does not exist")
254	254	// Test delete chart with invalid coordinates.
255	255	assert.EqualError(t, f.DeleteChart("Sheet1", ""), newCellNameToCoordinatesError("", newInvalidCellNameError("")).Error())
256	256	// Test delete chart on no chart worksheet.

--- a/col_test.go

+++ b/col_test.go

		@@ -94,7 +94,7 @@ func TestColsError(t *testing.T) {
94	94	t.FailNow()
95	95	}
96	96	_, err = f.Cols("SheetN")
97		- assert.EqualError(t, err, "sheet SheetN is not exist")
	97	+ assert.EqualError(t, err, "sheet SheetN does not exist")
98	98	assert.NoError(t, f.Close())
99	99	}
100	100

		@@ -104,7 +104,7 @@ func TestGetColsError(t *testing.T) {
104	104	t.FailNow()
105	105	}
106	106	_, err = f.GetCols("SheetN")
107		- assert.EqualError(t, err, "sheet SheetN is not exist")
	107	+ assert.EqualError(t, err, "sheet SheetN does not exist")
108	108	assert.NoError(t, f.Close())
109	109
110	110	f = NewFile()

		@@ -205,7 +205,7 @@ func TestColumnVisibility(t *testing.T) {
205	205
206	206	// Test get column visible on an inexistent worksheet.
207	207	_, err = f.GetColVisible("SheetN", "F")
208		- assert.EqualError(t, err, "sheet SheetN is not exist")
	208	+ assert.EqualError(t, err, "sheet SheetN does not exist")
209	209
210	210	// Test get column visible with illegal cell coordinates.
211	211	_, err = f.GetColVisible("Sheet1", "*")

		@@ -215,7 +215,7 @@ func TestColumnVisibility(t *testing.T) {
215	215	f.NewSheet("Sheet3")
216	216	assert.NoError(t, f.SetColVisible("Sheet3", "E", false))
217	217	assert.EqualError(t, f.SetColVisible("Sheet1", "A:-1", true), newInvalidColumnNameError("-1").Error())
218		- assert.EqualError(t, f.SetColVisible("SheetN", "E", false), "sheet SheetN is not exist")
	218	+ assert.EqualError(t, f.SetColVisible("SheetN", "E", false), "sheet SheetN does not exist")
219	219	assert.NoError(t, f.SaveAs(filepath.Join("test", "TestColumnVisibility.xlsx")))
220	220	})
221	221

		@@ -243,7 +243,7 @@ func TestOutlineLevel(t *testing.T) {
243	243
244	244	level, err = f.GetColOutlineLevel("SheetN", "A")
245	245	assert.Equal(t, uint8(0), level)
246		- assert.EqualError(t, err, "sheet SheetN is not exist")
	246	+ assert.EqualError(t, err, "sheet SheetN does not exist")
247	247
248	248	assert.NoError(t, f.SetColWidth("Sheet2", "A", "D", 13))
249	249	assert.EqualError(t, f.SetColWidth("Sheet2", "A", "D", MaxColumnWidth+1), ErrColumnWidth.Error())

		@@ -253,10 +253,10 @@ func TestOutlineLevel(t *testing.T) {
253	253	assert.EqualError(t, f.SetColOutlineLevel("Sheet1", "D", 8), ErrOutlineLevel.Error())
254	254	assert.EqualError(t, f.SetRowOutlineLevel("Sheet1", 2, 8), ErrOutlineLevel.Error())
255	255	// Test set row outline level on not exists worksheet.
256		- assert.EqualError(t, f.SetRowOutlineLevel("SheetN", 1, 4), "sheet SheetN is not exist")
	256	+ assert.EqualError(t, f.SetRowOutlineLevel("SheetN", 1, 4), "sheet SheetN does not exist")
257	257	// Test get row outline level on not exists worksheet.
258	258	_, err = f.GetRowOutlineLevel("SheetN", 1)
259		- assert.EqualError(t, err, "sheet SheetN is not exist")
	259	+ assert.EqualError(t, err, "sheet SheetN does not exist")
260	260
261	261	// Test set and get column outline level with illegal cell coordinates.
262	262	assert.EqualError(t, f.SetColOutlineLevel("Sheet1", "", 1), newInvalidColumnNameError("").Error())

		@@ -264,7 +264,7 @@ func TestOutlineLevel(t *testing.T) {
264	264	assert.EqualError(t, err, newInvalidColumnNameError("*").Error())
265	265
266	266	// Test set column outline level on not exists worksheet.
267		- assert.EqualError(t, f.SetColOutlineLevel("SheetN", "E", 2), "sheet SheetN is not exist")
	267	+ assert.EqualError(t, f.SetColOutlineLevel("SheetN", "E", 2), "sheet SheetN does not exist")
268	268
269	269	assert.EqualError(t, f.SetRowOutlineLevel("Sheet1", 0, 1), newInvalidRowNumberError(0).Error())
270	270	level, err = f.GetRowOutlineLevel("Sheet1", 2)

		@@ -292,7 +292,7 @@ func TestSetColStyle(t *testing.T) {
292	292	styleID, err := f.NewStyle(`{"fill":{"type":"pattern","color":["#94d3a2"],"pattern":1}}`)
293	293	assert.NoError(t, err)
294	294	// Test set column style on not exists worksheet.
295		- assert.EqualError(t, f.SetColStyle("SheetN", "E", styleID), "sheet SheetN is not exist")
	295	+ assert.EqualError(t, f.SetColStyle("SheetN", "E", styleID), "sheet SheetN does not exist")
296	296	// Test set column style with illegal cell coordinates.
297	297	assert.EqualError(t, f.SetColStyle("Sheet1", "", styleID), newInvalidColumnNameError("").Error())
298	298	assert.EqualError(t, f.SetColStyle("Sheet1", "A:", styleID), newInvalidColumnNameError("").Error())

		@@ -329,11 +329,11 @@ func TestColWidth(t *testing.T) {
329	329	assert.EqualError(t, f.SetColWidth("Sheet1", "A", "", 1), newInvalidColumnNameError("").Error())
330	330
331	331	// Test set column width on not exists worksheet.
332		- assert.EqualError(t, f.SetColWidth("SheetN", "B", "A", 12), "sheet SheetN is not exist")
	332	+ assert.EqualError(t, f.SetColWidth("SheetN", "B", "A", 12), "sheet SheetN does not exist")
333	333
334	334	// Test get column width on not exists worksheet.
335	335	_, err = f.GetColWidth("SheetN", "A")
336		- assert.EqualError(t, err, "sheet SheetN is not exist")
	336	+ assert.EqualError(t, err, "sheet SheetN does not exist")
337	337
338	338	assert.NoError(t, f.SaveAs(filepath.Join("test", "TestColWidth.xlsx")))
339	339	convertRowHeightToPixels(0)

		@@ -376,7 +376,7 @@ func TestRemoveCol(t *testing.T) {
376	376	assert.EqualError(t, f.RemoveCol("Sheet1", ""), newInvalidColumnNameError("").Error())
377	377
378	378	// Test remove column on not exists worksheet.
379		- assert.EqualError(t, f.RemoveCol("SheetN", "B"), "sheet SheetN is not exist")
	379	+ assert.EqualError(t, f.RemoveCol("SheetN", "B"), "sheet SheetN does not exist")
380	380
381	381	assert.NoError(t, f.SaveAs(filepath.Join("test", "TestRemoveCol.xlsx")))
382	382	}

--- a/comment_test.go

+++ b/comment_test.go

		@@ -31,7 +31,7 @@ func TestAddComments(t *testing.T) {
31	31	assert.NoError(t, f.AddComment("Sheet2", "B7", `{"author":"Excelize: ","text":"This is a comment."}`))
32	32
33	33	// Test add comment on not exists worksheet.
34		- assert.EqualError(t, f.AddComment("SheetN", "B7", `{"author":"Excelize: ","text":"This is a comment."}`), "sheet SheetN is not exist")
	34	+ assert.EqualError(t, f.AddComment("SheetN", "B7", `{"author":"Excelize: ","text":"This is a comment."}`), "sheet SheetN does not exist")
35	35	// Test add comment on with illegal cell coordinates
36	36	assert.EqualError(t, f.AddComment("Sheet1", "A", `{"author":"Excelize: ","text":"This is a comment."}`), newCellNameToCoordinatesError("A", newInvalidCellNameError("A")).Error())
37	37	if assert.NoError(t, f.SaveAs(filepath.Join("test", "TestAddComments.xlsx"))) {

		@@ -66,7 +66,7 @@ func TestDeleteComment(t *testing.T) {
66	66	assert.NoError(t, f.DeleteComment("Sheet2", "C41"))
67	67	assert.EqualValues(t, 0, len(f.GetComments()["Sheet2"]))
68	68	// Test delete comment on not exists worksheet
69		- assert.EqualError(t, f.DeleteComment("SheetN", "A1"), "sheet SheetN is not exist")
	69	+ assert.EqualError(t, f.DeleteComment("SheetN", "A1"), "sheet SheetN does not exist")
70	70	// Test delete comment with worksheet part
71	71	f.Pkg.Delete("xl/worksheets/sheet1.xml")
72	72	assert.NoError(t, f.DeleteComment("Sheet1", "A22"))

--- a/datavalidation_test.go

+++ b/datavalidation_test.go

		@@ -90,7 +90,7 @@ func TestDataValidation(t *testing.T) {
90	90
91	91	// Test get data validation on no exists worksheet
92	92	_, err = f.GetDataValidations("SheetN")
93		- assert.EqualError(t, err, "sheet SheetN is not exist")
	93	+ assert.EqualError(t, err, "sheet SheetN does not exist")
94	94
95	95	assert.NoError(t, f.SaveAs(resultFile))
96	96

		@@ -158,7 +158,7 @@ func TestDataValidationError(t *testing.T) {
158	158
159	159	// Test add data validation on no exists worksheet.
160	160	f = NewFile()
161		- assert.EqualError(t, f.AddDataValidation("SheetN", nil), "sheet SheetN is not exist")
	161	+ assert.EqualError(t, f.AddDataValidation("SheetN", nil), "sheet SheetN does not exist")
162	162	}
163	163
164	164	func TestDeleteDataValidation(t *testing.T) {

		@@ -201,7 +201,7 @@ func TestDeleteDataValidation(t *testing.T) {
201	201	assert.EqualError(t, f.DeleteDataValidation("Sheet1", "A1:B2"), newCellNameToCoordinatesError("A", newInvalidCellNameError("A")).Error())
202	202
203	203	// Test delete data validation on no exists worksheet.
204		- assert.EqualError(t, f.DeleteDataValidation("SheetN", "A1:B2"), "sheet SheetN is not exist")
	204	+ assert.EqualError(t, f.DeleteDataValidation("SheetN", "A1:B2"), "sheet SheetN does not exist")
205	205
206	206	// Test delete all data validations in the worksheet.
207	207	assert.NoError(t, f.DeleteDataValidation("Sheet1"))

--- a/errors.go

+++ b/errors.go

		@@ -70,10 +70,10 @@ func newCellNameToCoordinatesError(cell string, err error) error {
70	70	return fmt.Errorf("cannot convert cell %q to coordinates: %v", cell, err)
71	71	}
72	72
73		-// newNoExistSheetError defined the error message on receiving the not exist
	73	+// newNoExistSheetError defined the error message on receiving the non existing
74	74	// sheet name.
75	75	func newNoExistSheetError(name string) error {
76		- return fmt.Errorf("sheet %s is not exist", name)
	76	+ return fmt.Errorf("sheet %s does not exist", name)
77	77	}
78	78
79	79	// newNotWorksheetError defined the error message on receiving a sheet which

--- a/excelize_test.go

+++ b/excelize_test.go

		@@ -29,7 +29,7 @@ func TestOpenFile(t *testing.T) {
29	29
30	30	// Test get all the rows in a not exists worksheet.
31	31	_, err = f.GetRows("Sheet4")
32		- assert.EqualError(t, err, "sheet Sheet4 is not exist")
	32	+ assert.EqualError(t, err, "sheet Sheet4 does not exist")
33	33	// Test get all the rows in a worksheet.
34	34	rows, err := f.GetRows("Sheet2")
35	35	assert.NoError(t, err)

		@@ -59,9 +59,9 @@ func TestOpenFile(t *testing.T) {
59	59	f.NewSheet(":\\/?*[]Maximum 31 characters allowed in sheet title.")
60	60	// Test set worksheet name with illegal name.
61	61	f.SetSheetName("Maximum 31 characters allowed i", "[Rename]:\\/?* Maximum 31 characters allowed in sheet title.")
62		- assert.EqualError(t, f.SetCellInt("Sheet3", "A23", 10), "sheet Sheet3 is not exist")
63		- assert.EqualError(t, f.SetCellStr("Sheet3", "b230", "10"), "sheet Sheet3 is not exist")
64		- assert.EqualError(t, f.SetCellStr("Sheet10", "b230", "10"), "sheet Sheet10 is not exist")
	62	+ assert.EqualError(t, f.SetCellInt("Sheet3", "A23", 10), "sheet Sheet3 does not exist")
	63	+ assert.EqualError(t, f.SetCellStr("Sheet3", "b230", "10"), "sheet Sheet3 does not exist")
	64	+ assert.EqualError(t, f.SetCellStr("Sheet10", "b230", "10"), "sheet Sheet10 does not exist")
65	65
66	66	// Test set cell string value with illegal row number.
67	67	assert.EqualError(t, f.SetCellStr("Sheet1", "A", "10"), newCellNameToCoordinatesError("A", newInvalidCellNameError("A")).Error())

		@@ -122,11 +122,11 @@ func TestOpenFile(t *testing.T) {
122	122	assert.NoError(t, f.SetCellValue("Sheet2", "F17", complex64(5+10i)))
123	123
124	124	// Test on not exists worksheet.
125		- assert.EqualError(t, f.SetCellDefault("SheetN", "A1", ""), "sheet SheetN is not exist")
126		- assert.EqualError(t, f.SetCellFloat("SheetN", "A1", 42.65418, 2, 32), "sheet SheetN is not exist")
127		- assert.EqualError(t, f.SetCellBool("SheetN", "A1", true), "sheet SheetN is not exist")
128		- assert.EqualError(t, f.SetCellFormula("SheetN", "A1", ""), "sheet SheetN is not exist")
129		- assert.EqualError(t, f.SetCellHyperLink("SheetN", "A1", "Sheet1!A40", "Location"), "sheet SheetN is not exist")
	125	+ assert.EqualError(t, f.SetCellDefault("SheetN", "A1", ""), "sheet SheetN does not exist")
	126	+ assert.EqualError(t, f.SetCellFloat("SheetN", "A1", 42.65418, 2, 32), "sheet SheetN does not exist")
	127	+ assert.EqualError(t, f.SetCellBool("SheetN", "A1", true), "sheet SheetN does not exist")
	128	+ assert.EqualError(t, f.SetCellFormula("SheetN", "A1", ""), "sheet SheetN does not exist")
	129	+ assert.EqualError(t, f.SetCellHyperLink("SheetN", "A1", "Sheet1!A40", "Location"), "sheet SheetN does not exist")
130	130
131	131	// Test boolean write
132	132	booltest := []struct {

		@@ -151,7 +151,7 @@ func TestOpenFile(t *testing.T) {
151	151	assert.NoError(t, f.SetCellValue("Sheet2", "G4", time.Now()))
152	152
153	153	assert.NoError(t, f.SetCellValue("Sheet2", "G4", time.Now().UTC()))
154		- assert.EqualError(t, f.SetCellValue("SheetN", "A1", time.Now()), "sheet SheetN is not exist")
	154	+ assert.EqualError(t, f.SetCellValue("SheetN", "A1", time.Now()), "sheet SheetN does not exist")
155	155	// 02:46:40
156	156	assert.NoError(t, f.SetCellValue("Sheet2", "G5", time.Duration(1e13)))
157	157	// Test completion column.

		@@ -401,7 +401,7 @@ func TestGetCellHyperLink(t *testing.T) {
401	401	assert.NoError(t, err)
402	402	t.Log(link, target)
403	403	link, target, err = f.GetCellHyperLink("Sheet3", "H3")
404		- assert.EqualError(t, err, "sheet Sheet3 is not exist")
	404	+ assert.EqualError(t, err, "sheet Sheet3 does not exist")
405	405	t.Log(link, target)
406	406	assert.NoError(t, f.Close())
407	407

		@@ -968,7 +968,7 @@ func TestCopySheetError(t *testing.T) {
968	968	t.FailNow()
969	969	}
970	970
971		- assert.EqualError(t, f.copySheet(-1, -2), "sheet is not exist")
	971	+ assert.EqualError(t, f.copySheet(-1, -2), "sheet does not exist")
972	972	if !assert.EqualError(t, f.CopySheet(-1, -2), "invalid worksheet index") {
973	973	t.FailNow()
974	974	}

		@@ -984,7 +984,7 @@ func TestGetSheetComments(t *testing.T) {
984	984	func TestSetSheetVisible(t *testing.T) {
985	985	f := NewFile()
986	986	f.WorkBook.Sheets.Sheet[0].Name = "SheetN"
987		- assert.EqualError(t, f.SetSheetVisible("Sheet1", false), "sheet SheetN is not exist")
	987	+ assert.EqualError(t, f.SetSheetVisible("Sheet1", false), "sheet SheetN does not exist")
988	988	}
989	989
990	990	func TestGetActiveSheetIndex(t *testing.T) {

		@@ -1002,7 +1002,7 @@ func TestRelsWriter(t *testing.T) {
1002	1002	func TestGetSheetView(t *testing.T) {
1003	1003	f := NewFile()
1004	1004	_, err := f.getSheetView("SheetN", 0)
1005		- assert.EqualError(t, err, "sheet SheetN is not exist")
	1005	+ assert.EqualError(t, err, "sheet SheetN does not exist")
1006	1006	}
1007	1007
1008	1008	func TestConditionalFormat(t *testing.T) {

		@@ -1067,7 +1067,7 @@ func TestConditionalFormat(t *testing.T) {
1067	1067	// Test set invalid format set in conditional format.
1068	1068	assert.EqualError(t, f.SetConditionalFormat(sheet1, "L1:L10", ""), "unexpected end of JSON input")
1069	1069	// Set conditional format on not exists worksheet.
1070		- assert.EqualError(t, f.SetConditionalFormat("SheetN", "L1:L10", "[]"), "sheet SheetN is not exist")
	1070	+ assert.EqualError(t, f.SetConditionalFormat("SheetN", "L1:L10", "[]"), "sheet SheetN does not exist")
1071	1071
1072	1072	err = f.SaveAs(filepath.Join("test", "TestConditionalFormat.xlsx"))
1073	1073	if !assert.NoError(t, err) {

		@@ -1230,7 +1230,7 @@ func TestProtectSheet(t *testing.T) {
1230	1230	Password: "password",
1231	1231	}), ErrUnsupportedHashAlgorithm.Error())
1232	1232	// Test protect not exists worksheet.
1233		- assert.EqualError(t, f.ProtectSheet("SheetN", nil), "sheet SheetN is not exist")
	1233	+ assert.EqualError(t, f.ProtectSheet("SheetN", nil), "sheet SheetN does not exist")
1234	1234	}
1235	1235
1236	1236	func TestUnprotectSheet(t *testing.T) {

		@@ -1239,7 +1239,7 @@ func TestUnprotectSheet(t *testing.T) {
1239	1239	t.FailNow()
1240	1240	}
1241	1241	// Test remove protection on not exists worksheet.
1242		- assert.EqualError(t, f.UnprotectSheet("SheetN"), "sheet SheetN is not exist")
	1242	+ assert.EqualError(t, f.UnprotectSheet("SheetN"), "sheet SheetN does not exist")
1243	1243
1244	1244	assert.NoError(t, f.UnprotectSheet("Sheet1"))
1245	1245	assert.EqualError(t, f.UnprotectSheet("Sheet1", "password"), ErrUnprotectSheet.Error())

		@@ -1267,7 +1267,7 @@ func TestUnprotectSheet(t *testing.T) {
1267	1267	func TestSetDefaultTimeStyle(t *testing.T) {
1268	1268	f := NewFile()
1269	1269	// Test set default time style on not exists worksheet.
1270		- assert.EqualError(t, f.setDefaultTimeStyle("SheetN", "", 0), "sheet SheetN is not exist")
	1270	+ assert.EqualError(t, f.setDefaultTimeStyle("SheetN", "", 0), "sheet SheetN does not exist")
1271	1271
1272	1272	// Test set default time style on invalid cell
1273	1273	assert.EqualError(t, f.setDefaultTimeStyle("Sheet1", "", 42), newCellNameToCoordinatesError("", newInvalidCellNameError("")).Error())

--- a/merge_test.go

+++ b/merge_test.go

		@@ -65,7 +65,7 @@ func TestMergeCell(t *testing.T) {
65	65	assert.NoError(t, f.MergeCell("Sheet3", "N10", "O11"))
66	66
67	67	// Test get merged cells on not exists worksheet.
68		- assert.EqualError(t, f.MergeCell("SheetN", "N10", "O11"), "sheet SheetN is not exist")
	68	+ assert.EqualError(t, f.MergeCell("SheetN", "N10", "O11"), "sheet SheetN does not exist")
69	69
70	70	assert.NoError(t, f.SaveAs(filepath.Join("test", "TestMergeCell.xlsx")))
71	71	assert.NoError(t, f.Close())

		@@ -140,7 +140,7 @@ func TestGetMergeCells(t *testing.T) {
140	140
141	141	// Test get merged cells on not exists worksheet.
142	142	_, err = f.GetMergeCells("SheetN")
143		- assert.EqualError(t, err, "sheet SheetN is not exist")
	143	+ assert.EqualError(t, err, "sheet SheetN does not exist")
144	144	assert.NoError(t, f.Close())
145	145	}
146	146

		@@ -170,7 +170,7 @@ func TestUnmergeCell(t *testing.T) {
170	170	f = NewFile()
171	171	assert.NoError(t, f.MergeCell("Sheet1", "A2", "B3"))
172	172	// Test unmerged area on not exists worksheet.
173		- assert.EqualError(t, f.UnmergeCell("SheetN", "A1", "A1"), "sheet SheetN is not exist")
	173	+ assert.EqualError(t, f.UnmergeCell("SheetN", "A1", "A1"), "sheet SheetN does not exist")
174	174
175	175	ws, ok := f.Sheet.Load("xl/worksheets/sheet1.xml")
176	176	assert.True(t, ok)

--- a/picture_test.go

+++ b/picture_test.go

		@@ -128,7 +128,7 @@ func TestGetPicture(t *testing.T) {
128	128
129	129	// Try to get picture from a worksheet that doesn't contain any images.
130	130	file, raw, err = f.GetPicture("Sheet3", "I9")
131		- assert.EqualError(t, err, "sheet Sheet3 is not exist")
	131	+ assert.EqualError(t, err, "sheet Sheet3 does not exist")
132	132	assert.Empty(t, file)
133	133	assert.Empty(t, raw)
134	134

		@@ -196,7 +196,7 @@ func TestAddPictureFromBytes(t *testing.T) {
196	196	return true
197	197	})
198	198	assert.Equal(t, 1, imageCount, "Duplicate image should only be stored once.")
199		- assert.EqualError(t, f.AddPictureFromBytes("SheetN", fmt.Sprint("A", 1), "", "logo", ".png", imgFile), "sheet SheetN is not exist")
	199	+ assert.EqualError(t, f.AddPictureFromBytes("SheetN", fmt.Sprint("A", 1), "", "logo", ".png", imgFile), "sheet SheetN does not exist")
200	200	}
201	201
202	202	func TestDeletePicture(t *testing.T) {

		@@ -207,7 +207,7 @@ func TestDeletePicture(t *testing.T) {
207	207	assert.NoError(t, f.DeletePicture("Sheet1", "P1"))
208	208	assert.NoError(t, f.SaveAs(filepath.Join("test", "TestDeletePicture.xlsx")))
209	209	// Test delete picture on not exists worksheet.
210		- assert.EqualError(t, f.DeletePicture("SheetN", "A1"), "sheet SheetN is not exist")
	210	+ assert.EqualError(t, f.DeletePicture("SheetN", "A1"), "sheet SheetN does not exist")
211	211	// Test delete picture with invalid coordinates.
212	212	assert.EqualError(t, f.DeletePicture("Sheet1", ""), newCellNameToCoordinatesError("", newInvalidCellNameError("")).Error())
213	213	assert.NoError(t, f.Close())

		@@ -219,7 +219,7 @@ func TestDrawingResize(t *testing.T) {
219	219	f := NewFile()
220	220	// Test calculate drawing resize on not exists worksheet.
221	221	_, _, _, _, err := f.drawingResize("SheetN", "A1", 1, 1, nil)
222		- assert.EqualError(t, err, "sheet SheetN is not exist")
	222	+ assert.EqualError(t, err, "sheet SheetN does not exist")
223	223	// Test calculate drawing resize with invalid coordinates.
224	224	_, _, _, _, err = f.drawingResize("Sheet1", "", 1, 1, nil)
225	225	assert.EqualError(t, err, newCellNameToCoordinatesError("", newInvalidCellNameError("")).Error())

--- a/pivotTable.go

+++ b/pivotTable.go

		@@ -190,7 +190,7 @@ func (f File) parseFormatPivotTableSet(opt PivotTableOption) (*xlsxWorksheet,
190	190	}
191	191	pivotTableSheetPath, ok := f.getSheetXMLPath(pivotTableSheetName)
192	192	if !ok {
193		- return dataSheet, pivotTableSheetPath, fmt.Errorf("sheet %s is not exist", pivotTableSheetName)
	193	+ return dataSheet, pivotTableSheetPath, fmt.Errorf("sheet %s does not exist", pivotTableSheetName)
194	194	}
195	195	return dataSheet, pivotTableSheetPath, err
196	196	}

--- a/pivotTable_test.go

+++ b/pivotTable_test.go

		@@ -182,7 +182,7 @@ func TestAddPivotTable(t *testing.T) {
182	182	Rows: []PivotTableField{{Data: "Month", DefaultSubtotal: true}, {Data: "Year"}},
183	183	Columns: []PivotTableField{{Data: "Type", DefaultSubtotal: true}},
184	184	Data: []PivotTableField{{Data: "Sales"}},
185		- }), "sheet SheetN is not exist")
	185	+ }), "sheet SheetN does not exist")
186	186	// Test the pivot table range of the worksheet that is not declared
187	187	assert.EqualError(t, f.AddPivotTable(&PivotTableOption{
188	188	DataRange: "Sheet1!$A$1:$E$31",

		@@ -198,7 +198,7 @@ func TestAddPivotTable(t *testing.T) {
198	198	Rows: []PivotTableField{{Data: "Month", DefaultSubtotal: true}, {Data: "Year"}},
199	199	Columns: []PivotTableField{{Data: "Type", DefaultSubtotal: true}},
200	200	Data: []PivotTableField{{Data: "Sales"}},
201		- }), "sheet SheetN is not exist")
	201	+ }), "sheet SheetN does not exist")
202	202	// Test not exists worksheet in data range
203	203	assert.EqualError(t, f.AddPivotTable(&PivotTableOption{
204	204	DataRange: "SheetN!$A$1:$E$31",

		@@ -206,7 +206,7 @@ func TestAddPivotTable(t *testing.T) {
206	206	Rows: []PivotTableField{{Data: "Month", DefaultSubtotal: true}, {Data: "Year"}},
207	207	Columns: []PivotTableField{{Data: "Type", DefaultSubtotal: true}},
208	208	Data: []PivotTableField{{Data: "Sales"}},
209		- }), "sheet SheetN is not exist")
	209	+ }), "sheet SheetN does not exist")
210	210	// Test invalid row number in data range
211	211	assert.EqualError(t, f.AddPivotTable(&PivotTableOption{
212	212	DataRange: "Sheet1!$A$0:$E$31",

		@@ -298,7 +298,7 @@ func TestGetPivotFieldsOrder(t *testing.T) {
298	298	f := NewFile()
299	299	// Test get pivot fields order with not exist worksheet
300	300	_, err := f.getPivotFieldsOrder(&PivotTableOption{DataRange: "SheetN!$A$1:$E$31"})
301		- assert.EqualError(t, err, "sheet SheetN is not exist")
	301	+ assert.EqualError(t, err, "sheet SheetN does not exist")
302	302	}
303	303
304	304	func TestGetPivotTableFieldName(t *testing.T) {

--- a/rows.go

+++ b/rows.go

		@@ -202,13 +202,13 @@ func appendSpace(l int, s []string) []string {
202	202	return s
203	203	}
204	204
205		-// ErrSheetNotExist defines an error of sheet is not exist
	205	+// ErrSheetNotExist defines an error of sheet that does not exist
206	206	type ErrSheetNotExist struct {
207	207	SheetName string
208	208	}
209	209
210	210	func (err ErrSheetNotExist) Error() string {
211		- return fmt.Sprintf("sheet %s is not exist", err.SheetName)
	211	+ return fmt.Sprintf("sheet %s does not exist", err.SheetName)
212	212	}
213	213
214	214	// rowXMLIterator defined runtime use field for the worksheet row SAX parser.

--- a/rows_test.go

+++ b/rows_test.go

		@@ -128,7 +128,7 @@ func TestRowsError(t *testing.T) {
128	128	t.FailNow()
129	129	}
130	130	_, err = f.Rows("SheetN")
131		- assert.EqualError(t, err, "sheet SheetN is not exist")
	131	+ assert.EqualError(t, err, "sheet SheetN does not exist")
132	132	assert.NoError(t, f.Close())
133	133	}
134	134

		@@ -160,9 +160,9 @@ func TestRowHeight(t *testing.T) {
160	160	assert.Equal(t, defaultRowHeight, height)
161	161
162	162	// Test set and get row height on not exists worksheet.
163		- assert.EqualError(t, f.SetRowHeight("SheetN", 1, 111.0), "sheet SheetN is not exist")
	163	+ assert.EqualError(t, f.SetRowHeight("SheetN", 1, 111.0), "sheet SheetN does not exist")
164	164	_, err = f.GetRowHeight("SheetN", 3)
165		- assert.EqualError(t, err, "sheet SheetN is not exist")
	165	+ assert.EqualError(t, err, "sheet SheetN does not exist")
166	166
167	167	// Test get row height with custom default row height.
168	168	assert.NoError(t, f.SetSheetFormatPr(sheet1,

		@@ -246,13 +246,13 @@ func TestRowVisibility(t *testing.T) {
246	246	assert.Equal(t, false, visible)
247	247	assert.NoError(t, err)
248	248	assert.EqualError(t, f.SetRowVisible("Sheet3", 0, true), newInvalidRowNumberError(0).Error())
249		- assert.EqualError(t, f.SetRowVisible("SheetN", 2, false), "sheet SheetN is not exist")
	249	+ assert.EqualError(t, f.SetRowVisible("SheetN", 2, false), "sheet SheetN does not exist")
250	250
251	251	visible, err = f.GetRowVisible("Sheet3", 0)
252	252	assert.Equal(t, false, visible)
253	253	assert.EqualError(t, err, newInvalidRowNumberError(0).Error())
254	254	_, err = f.GetRowVisible("SheetN", 1)
255		- assert.EqualError(t, err, "sheet SheetN is not exist")
	255	+ assert.EqualError(t, err, "sheet SheetN does not exist")
256	256
257	257	assert.NoError(t, f.SaveAs(filepath.Join("test", "TestRowVisibility.xlsx")))
258	258	}

		@@ -315,7 +315,7 @@ func TestRemoveRow(t *testing.T) {
315	315	assert.NoError(t, f.SaveAs(filepath.Join("test", "TestRemoveRow.xlsx")))
316	316
317	317	// Test remove row on not exist worksheet
318		- assert.EqualError(t, f.RemoveRow("SheetN", 1), `sheet SheetN is not exist`)
	318	+ assert.EqualError(t, f.RemoveRow("SheetN", 1), `sheet SheetN does not exist`)
319	319	}
320	320
321	321	func TestInsertRow(t *testing.T) {

		@@ -878,7 +878,7 @@ func TestDuplicateRowTo(t *testing.T) {
878	878	})
879	879	assert.EqualError(t, f.DuplicateRowTo(sheetName, 1, 2), newCellNameToCoordinatesError("A", newInvalidCellNameError("A")).Error())
880	880	// Test duplicate row on not exists worksheet
881		- assert.EqualError(t, f.DuplicateRowTo("SheetN", 1, 2), "sheet SheetN is not exist")
	881	+ assert.EqualError(t, f.DuplicateRowTo("SheetN", 1, 2), "sheet SheetN does not exist")
882	882	}
883	883
884	884	func TestDuplicateMergeCells(t *testing.T) {

		@@ -888,7 +888,7 @@ func TestDuplicateMergeCells(t *testing.T) {
888	888	}}
889	889	assert.EqualError(t, f.duplicateMergeCells("Sheet1", ws, 0, 0), `cannot convert cell "-" to coordinates: invalid cell name "-"`)
890	890	ws.MergeCells.Cells[0].Ref = "A1:B1"
891		- assert.EqualError(t, f.duplicateMergeCells("SheetN", ws, 1, 2), "sheet SheetN is not exist")
	891	+ assert.EqualError(t, f.duplicateMergeCells("SheetN", ws, 1, 2), "sheet SheetN does not exist")
892	892	}
893	893
894	894	func TestGetValueFromInlineStr(t *testing.T) {

		@@ -923,7 +923,7 @@ func TestGetValueFromNumber(t *testing.T) {
923	923
924	924	func TestErrSheetNotExistError(t *testing.T) {
925	925	err := ErrSheetNotExist{SheetName: "Sheet1"}
926		- assert.EqualValues(t, err.Error(), "sheet Sheet1 is not exist")
	926	+ assert.EqualValues(t, err.Error(), "sheet Sheet1 does not exist")
927	927	}
928	928
929	929	func TestCheckRow(t *testing.T) {

		@@ -949,7 +949,7 @@ func TestSetRowStyle(t *testing.T) {
949	949	assert.EqualError(t, f.SetRowStyle("Sheet1", 5, -1, style2), newInvalidRowNumberError(-1).Error())
950	950	assert.EqualError(t, f.SetRowStyle("Sheet1", 1, TotalRows+1, style2), ErrMaxRows.Error())
951	951	assert.EqualError(t, f.SetRowStyle("Sheet1", 1, 1, -1), newInvalidStyleID(-1).Error())
952		- assert.EqualError(t, f.SetRowStyle("SheetN", 1, 1, style2), "sheet SheetN is not exist")
	952	+ assert.EqualError(t, f.SetRowStyle("SheetN", 1, 1, style2), "sheet SheetN does not exist")
953	953	assert.NoError(t, f.SetRowStyle("Sheet1", 5, 1, style2))
954	954	cellStyleID, err := f.GetCellStyle("Sheet1", "B2")
955	955	assert.NoError(t, err)

--- a/shape_test.go

+++ b/shape_test.go

		@@ -36,7 +36,7 @@ func TestAddShape(t *testing.T) {
36	36	}
37	37	}],
38	38	"height": 90
39		- }`), "sheet Sheet3 is not exist")
	39	+ }`), "sheet Sheet3 does not exist")
40	40	assert.EqualError(t, f.AddShape("Sheet3", "H1", ""), "unexpected end of JSON input")
41	41	assert.EqualError(t, f.AddShape("Sheet1", "A", `{
42	42	"type": "rect",

--- a/sheet_test.go

+++ b/sheet_test.go

		@@ -102,7 +102,7 @@ func TestSetPane(t *testing.T) {
102	102	f.NewSheet("Panes 4")
103	103	assert.NoError(t, f.SetPanes("Panes 4", `{"freeze":true,"split":false,"x_split":0,"y_split":9,"top_left_cell":"A34","active_pane":"bottomLeft","panes":[{"sqref":"A11:XFD11","active_cell":"A11","pane":"bottomLeft"}]}`))
104	104	assert.NoError(t, f.SetPanes("Panes 4", ""))
105		- assert.EqualError(t, f.SetPanes("SheetN", ""), "sheet SheetN is not exist")
	105	+ assert.EqualError(t, f.SetPanes("SheetN", ""), "sheet SheetN does not exist")
106	106	assert.NoError(t, f.SaveAs(filepath.Join("test", "TestSetPane.xlsx")))
107	107	// Test add pane on empty sheet views worksheet
108	108	f = NewFile()

		@@ -181,7 +181,7 @@ func TestSearchSheet(t *testing.T) {
181	181	}
182	182	// Test search in a not exists worksheet.
183	183	_, err = f.SearchSheet("Sheet4", "")
184		- assert.EqualError(t, err, "sheet Sheet4 is not exist")
	184	+ assert.EqualError(t, err, "sheet Sheet4 does not exist")
185	185	var expected []string
186	186	// Test search a not exists value.
187	187	result, err := f.SearchSheet("Sheet1", "X")

		@@ -225,20 +225,20 @@ func TestSearchSheet(t *testing.T) {
225	225	func TestSetPageLayout(t *testing.T) {
226	226	f := NewFile()
227	227	// Test set page layout on not exists worksheet.
228		- assert.EqualError(t, f.SetPageLayout("SheetN"), "sheet SheetN is not exist")
	228	+ assert.EqualError(t, f.SetPageLayout("SheetN"), "sheet SheetN does not exist")
229	229	}
230	230
231	231	func TestGetPageLayout(t *testing.T) {
232	232	f := NewFile()
233	233	// Test get page layout on not exists worksheet.
234		- assert.EqualError(t, f.GetPageLayout("SheetN"), "sheet SheetN is not exist")
	234	+ assert.EqualError(t, f.GetPageLayout("SheetN"), "sheet SheetN does not exist")
235	235	}
236	236
237	237	func TestSetHeaderFooter(t *testing.T) {
238	238	f := NewFile()
239	239	assert.NoError(t, f.SetCellStr("Sheet1", "A1", "Test SetHeaderFooter"))
240	240	// Test set header and footer on not exists worksheet.
241		- assert.EqualError(t, f.SetHeaderFooter("SheetN", nil), "sheet SheetN is not exist")
	241	+ assert.EqualError(t, f.SetHeaderFooter("SheetN", nil), "sheet SheetN does not exist")
242	242	// Test set header and footer with illegal setting.
243	243	assert.EqualError(t, f.SetHeaderFooter("Sheet1", &FormatHeaderFooter{
244	244	OddHeader: strings.Repeat("c", MaxFieldLength+1),

		@@ -301,7 +301,7 @@ func TestGroupSheets(t *testing.T) {
301	301	for _, sheet := range sheets {
302	302	f.NewSheet(sheet)
303	303	}
304		- assert.EqualError(t, f.GroupSheets([]string{"Sheet1", "SheetN"}), "sheet SheetN is not exist")
	304	+ assert.EqualError(t, f.GroupSheets([]string{"Sheet1", "SheetN"}), "sheet SheetN does not exist")
305	305	assert.EqualError(t, f.GroupSheets([]string{"Sheet2", "Sheet3"}), "group worksheet must contain an active worksheet")
306	306	assert.NoError(t, f.GroupSheets([]string{"Sheet1", "Sheet2"}))
307	307	assert.NoError(t, f.SaveAs(filepath.Join("test", "TestGroupSheets.xlsx")))

		@@ -323,7 +323,7 @@ func TestInsertPageBreak(t *testing.T) {
323	323	assert.NoError(t, f.InsertPageBreak("Sheet1", "C3"))
324	324	assert.NoError(t, f.InsertPageBreak("Sheet1", "C3"))
325	325	assert.EqualError(t, f.InsertPageBreak("Sheet1", "A"), newCellNameToCoordinatesError("A", newInvalidCellNameError("A")).Error())
326		- assert.EqualError(t, f.InsertPageBreak("SheetN", "C3"), "sheet SheetN is not exist")
	326	+ assert.EqualError(t, f.InsertPageBreak("SheetN", "C3"), "sheet SheetN does not exist")
327	327	assert.NoError(t, f.SaveAs(filepath.Join("test", "TestInsertPageBreak.xlsx")))
328	328	}
329	329

		@@ -349,7 +349,7 @@ func TestRemovePageBreak(t *testing.T) {
349	349	assert.NoError(t, f.RemovePageBreak("Sheet2", "B2"))
350	350
351	351	assert.EqualError(t, f.RemovePageBreak("Sheet1", "A"), newCellNameToCoordinatesError("A", newInvalidCellNameError("A")).Error())
352		- assert.EqualError(t, f.RemovePageBreak("SheetN", "C3"), "sheet SheetN is not exist")
	352	+ assert.EqualError(t, f.RemovePageBreak("SheetN", "C3"), "sheet SheetN does not exist")
353	353	assert.NoError(t, f.SaveAs(filepath.Join("test", "TestRemovePageBreak.xlsx")))
354	354	}
355	355

--- a/sheetpr_test.go

+++ b/sheetpr_test.go

		@@ -180,13 +180,13 @@ func TestSetSheetPrOptions(t *testing.T) {
180	180	f := NewFile()
181	181	assert.NoError(t, f.SetSheetPrOptions("Sheet1", TabColorRGB("")))
182	182	// Test SetSheetPrOptions on not exists worksheet.
183		- assert.EqualError(t, f.SetSheetPrOptions("SheetN"), "sheet SheetN is not exist")
	183	+ assert.EqualError(t, f.SetSheetPrOptions("SheetN"), "sheet SheetN does not exist")
184	184	}
185	185
186	186	func TestGetSheetPrOptions(t *testing.T) {
187	187	f := NewFile()
188	188	// Test GetSheetPrOptions on not exists worksheet.
189		- assert.EqualError(t, f.GetSheetPrOptions("SheetN"), "sheet SheetN is not exist")
	189	+ assert.EqualError(t, f.GetSheetPrOptions("SheetN"), "sheet SheetN does not exist")
190	190	}
191	191
192	192	var _ = []PageMarginsOptions{

		@@ -328,13 +328,13 @@ func TestPageMarginsOption(t *testing.T) {
328	328	func TestSetPageMargins(t *testing.T) {
329	329	f := NewFile()
330	330	// Test set page margins on not exists worksheet.
331		- assert.EqualError(t, f.SetPageMargins("SheetN"), "sheet SheetN is not exist")
	331	+ assert.EqualError(t, f.SetPageMargins("SheetN"), "sheet SheetN does not exist")
332	332	}
333	333
334	334	func TestGetPageMargins(t *testing.T) {
335	335	f := NewFile()
336	336	// Test get page margins on not exists worksheet.
337		- assert.EqualError(t, f.GetPageMargins("SheetN"), "sheet SheetN is not exist")
	337	+ assert.EqualError(t, f.GetPageMargins("SheetN"), "sheet SheetN does not exist")
338	338	}
339	339
340	340	func ExampleFile_SetSheetFormatPr() {

		@@ -469,7 +469,7 @@ func TestSetSheetFormatPr(t *testing.T) {
469	469	ws.(*xlsxWorksheet).SheetFormatPr = nil
470	470	assert.NoError(t, f.SetSheetFormatPr("Sheet1", BaseColWidth(1.0)))
471	471	// Test set formatting properties on not exists worksheet.
472		- assert.EqualError(t, f.SetSheetFormatPr("SheetN"), "sheet SheetN is not exist")
	472	+ assert.EqualError(t, f.SetSheetFormatPr("SheetN"), "sheet SheetN does not exist")
473	473	}
474	474
475	475	func TestGetSheetFormatPr(t *testing.T) {

		@@ -497,5 +497,5 @@ func TestGetSheetFormatPr(t *testing.T) {
497	497	&thickBottom,
498	498	))
499	499	// Test get formatting properties on not exists worksheet.
500		- assert.EqualError(t, f.GetSheetFormatPr("SheetN"), "sheet SheetN is not exist")
	500	+ assert.EqualError(t, f.GetSheetFormatPr("SheetN"), "sheet SheetN does not exist")
501	501	}

--- a/sparkline_test.go

+++ b/sparkline_test.go

		@@ -218,7 +218,7 @@ func TestAddSparkline(t *testing.T) {
218	218	assert.EqualError(t, f.AddSparkline("SheetN", &SparklineOption{
219	219	Location: []string{"F3"},
220	220	Range: []string{"Sheet2!A3:E3"},
221		- }), "sheet SheetN is not exist")
	221	+ }), "sheet SheetN does not exist")
222	222
223	223	assert.EqualError(t, f.AddSparkline("Sheet1", nil), ErrParameterRequired.Error())
224	224

--- a/stream_test.go

+++ b/stream_test.go

		@@ -198,7 +198,7 @@ func TestNewStreamWriter(t *testing.T) {
198	198	_, err := file.NewStreamWriter("Sheet1")
199	199	assert.NoError(t, err)
200	200	_, err = file.NewStreamWriter("SheetN")
201		- assert.EqualError(t, err, "sheet SheetN is not exist")
	201	+ assert.EqualError(t, err, "sheet SheetN does not exist")
202	202	}
203	203
204	204	func TestSetRow(t *testing.T) {

--- a/styles.go

+++ b/styles.go

		@@ -1966,7 +1966,7 @@ var getXfIDFuncs = map[string]func(int, xlsxXf, *Style) bool{
1966	1966	}
1967	1967
1968	1968	// getStyleID provides a function to get styleID by given style. If given
1969		-// style is not exist, will return -1.
	1969	+// style does not exist, will return -1.
1970	1970	func (f File) getStyleID(ss xlsxStyleSheet, style *Style) (styleID int) {
1971	1971	styleID = -1
1972	1972	if ss.CellXfs == nil {

		@@ -2047,7 +2047,7 @@ func (f File) readDefaultFont() xlsxFont {
2047	2047	}
2048	2048
2049	2049	// getFontID provides a function to get font ID.
2050		-// If given font is not exist, will return -1.
	2050	+// If given font does not exist, will return -1.
2051	2051	func (f File) getFontID(styleSheet xlsxStyleSheet, style *Style) (fontID int) {
2052	2052	fontID = -1
2053	2053	if styleSheet.Fonts == nil \|\| style.Font == nil {

		@@ -2098,7 +2098,7 @@ func (f File) newFont(style Style) *xlsxFont {
2098	2098	}
2099	2099
2100	2100	// getNumFmtID provides a function to get number format code ID.
2101		-// If given number format code is not exist, will return -1.
	2101	+// If given number format code does not exist, will return -1.
2102	2102	func getNumFmtID(styleSheet xlsxStyleSheet, style Style) (numFmtID int) {
2103	2103	numFmtID = -1
2104	2104	if _, ok := builtInNumFmt[style.NumFmt]; ok {

		@@ -2195,7 +2195,7 @@ func setCustomNumFmt(styleSheet xlsxStyleSheet, style Style) int {
2195	2195	}
2196	2196
2197	2197	// getCustomNumFmtID provides a function to get custom number format code ID.
2198		-// If given custom number format code is not exist, will return -1.
	2198	+// If given custom number format code does not exist, will return -1.
2199	2199	func getCustomNumFmtID(styleSheet xlsxStyleSheet, style Style) (customNumFmtID int) {
2200	2200	customNumFmtID = -1
2201	2201	if styleSheet.NumFmts == nil {

--- a/styles_test.go

+++ b/styles_test.go

		@@ -199,7 +199,7 @@ func TestGetConditionalFormats(t *testing.T) {
199	199	// Test get conditional formats on no exists worksheet
200	200	f := NewFile()
201	201	_, err := f.GetConditionalFormats("SheetN")
202		- assert.EqualError(t, err, "sheet SheetN is not exist")
	202	+ assert.EqualError(t, err, "sheet SheetN does not exist")
203	203	}
204	204
205	205	func TestUnsetConditionalFormat(t *testing.T) {

		@@ -211,7 +211,7 @@ func TestUnsetConditionalFormat(t *testing.T) {
211	211	assert.NoError(t, f.SetConditionalFormat("Sheet1", "A1:A10", fmt.Sprintf(`[{"type":"cell","criteria":">","format":%d,"value":"6"}]`, format)))
212	212	assert.NoError(t, f.UnsetConditionalFormat("Sheet1", "A1:A10"))
213	213	// Test unset conditional format on not exists worksheet.
214		- assert.EqualError(t, f.UnsetConditionalFormat("SheetN", "A1:A10"), "sheet SheetN is not exist")
	214	+ assert.EqualError(t, f.UnsetConditionalFormat("SheetN", "A1:A10"), "sheet SheetN does not exist")
215	215	// Save spreadsheet by the given path.
216	216	assert.NoError(t, f.SaveAs(filepath.Join("test", "TestUnsetConditionalFormat.xlsx")))
217	217	}

		@@ -341,7 +341,7 @@ func TestThemeReader(t *testing.T) {
341	341	func TestSetCellStyle(t *testing.T) {
342	342	f := NewFile()
343	343	// Test set cell style on not exists worksheet.
344		- assert.EqualError(t, f.SetCellStyle("SheetN", "A1", "A2", 1), "sheet SheetN is not exist")
	344	+ assert.EqualError(t, f.SetCellStyle("SheetN", "A1", "A2", 1), "sheet SheetN does not exist")
345	345	}
346	346
347	347	func TestGetStyleID(t *testing.T) {

--- a/table_test.go

+++ b/table_test.go

		@@ -30,7 +30,7 @@ func TestAddTable(t *testing.T) {
30	30	}
31	31
32	32	// Test add table in not exist worksheet.
33		- assert.EqualError(t, f.AddTable("SheetN", "B26", "A21", `{}`), "sheet SheetN is not exist")
	33	+ assert.EqualError(t, f.AddTable("SheetN", "B26", "A21", `{}`), "sheet SheetN does not exist")
34	34	// Test add table with illegal formatset.
35	35	assert.EqualError(t, f.AddTable("Sheet1", "B26", "A21", `{x}`), "invalid character 'x' looking for beginning of object key string")
36	36	// Test add table with illegal cell coordinates.

		@@ -111,7 +111,7 @@ func TestAutoFilterError(t *testing.T) {
111	111	assert.EqualError(t, f.autoFilter("SheetN", "A1", 1, 1, &formatAutoFilter{
112	112	Column: "A",
113	113	Expression: "",
114		- }), "sheet SheetN is not exist")
	114	+ }), "sheet SheetN does not exist")
115	115	assert.EqualError(t, f.autoFilter("Sheet1", "A1", 1, 1, &formatAutoFilter{
116	116	Column: "-",
117	117	Expression: "-",

Show on old repository browser

Excelize Fork

excelize: 提交

Commit MetaInfo

Log Message

更改概述

差异

Excelize
Fork