Skip to content

Commit 38ad83d

Browse files
davidborrydavidborry
authored
This closes qax-os#1330 update non existing sheet error messages (qax-os#1331)
1 parent 81586c9 commit 38ad83d

23 files changed

+94
-94
lines changed

‎adjust_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ func TestAdjustHelper(t *testing.T) {
339339
assert.EqualError(t, f.adjustHelper("Sheet1", rows, 0, 0), newCellNameToCoordinatesError("A", newInvalidCellNameError("A")).Error())
340340
assert.EqualError(t, f.adjustHelper("Sheet2", rows, 0, 0), newCellNameToCoordinatesError("B", newInvalidCellNameError("B")).Error())
341341
// 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")
343343
}
344344

345345
func TestAdjustCalcChain(t *testing.T) {

‎calc_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4330,7 +4330,7 @@ func TestCalcCellValue(t *testing.T) {
43304330
// Test get calculated cell value on not exists worksheet.
43314331
f = prepareCalcData(cellData)
43324332
_, 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")
43344334
// Test get calculated cell value with not support formula.
43354335
f = prepareCalcData(cellData)
43364336
assert.NoError(t, f.SetCellFormula("Sheet1", "A1", "=UNSUPPORT(A1)"))

‎cell_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ func TestGetCellFormula(t *testing.T) {
373373
// Test get cell formula on not exist worksheet.
374374
f := NewFile()
375375
_, 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")
377377

378378
// Test get cell formula on no formula cell.
379379
assert.NoError(t, f.SetCellValue("Sheet1", "A1", true))
@@ -555,7 +555,7 @@ func TestGetCellRichText(t *testing.T) {
555555
assert.EqualError(t, err, "strconv.Atoi: parsing \"x\": invalid syntax")
556556
// Test set cell rich text on not exists worksheet
557557
_, 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")
559559
// Test set cell rich text with illegal cell coordinates
560560
_, err = f.GetCellRichText("Sheet1", "A")
561561
assert.EqualError(t, err, newCellNameToCoordinatesError("A", newInvalidCellNameError("A")).Error())
@@ -652,7 +652,7 @@ func TestSetCellRichText(t *testing.T) {
652652
assert.NoError(t, f.SetCellStyle("Sheet1", "A1", "A1", style))
653653
assert.NoError(t, f.SaveAs(filepath.Join("test", "TestSetCellRichText.xlsx")))
654654
// 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")
656656
// Test set cell rich text with illegal cell coordinates
657657
assert.EqualError(t, f.SetCellRichText("Sheet1", "A", richTextRun), newCellNameToCoordinatesError("A", newInvalidCellNameError("A")).Error())
658658
richTextRun = []RichTextRun{{Text: strings.Repeat("s", TotalCellChars+1)}}

‎chart_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func TestAddChart(t *testing.T) {
114114
assert.EqualError(t, f.AddChart("Sheet1", "P1", ""), "unexpected end of JSON input")
115115

116116
// 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")
118118

119119
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"}`))
120120
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) {
250250
assert.NoError(t, f.DeleteChart("Sheet1", "P1"))
251251
assert.NoError(t, f.SaveAs(filepath.Join("test", "TestDeleteChart.xlsx")))
252252
// 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")
254254
// Test delete chart with invalid coordinates.
255255
assert.EqualError(t, f.DeleteChart("Sheet1", ""), newCellNameToCoordinatesError("", newInvalidCellNameError("")).Error())
256256
// Test delete chart on no chart worksheet.

‎col_test.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ func TestColsError(t *testing.T) {
9494
t.FailNow()
9595
}
9696
_, err = f.Cols("SheetN")
97-
assert.EqualError(t, err, "sheet SheetN is not exist")
97+
assert.EqualError(t, err, "sheet SheetN does not exist")
9898
assert.NoError(t, f.Close())
9999
}
100100

@@ -104,7 +104,7 @@ func TestGetColsError(t *testing.T) {
104104
t.FailNow()
105105
}
106106
_, err = f.GetCols("SheetN")
107-
assert.EqualError(t, err, "sheet SheetN is not exist")
107+
assert.EqualError(t, err, "sheet SheetN does not exist")
108108
assert.NoError(t, f.Close())
109109

110110
f = NewFile()
@@ -205,7 +205,7 @@ func TestColumnVisibility(t *testing.T) {
205205

206206
// Test get column visible on an inexistent worksheet.
207207
_, 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")
209209

210210
// Test get column visible with illegal cell coordinates.
211211
_, err = f.GetColVisible("Sheet1", "*")
@@ -215,7 +215,7 @@ func TestColumnVisibility(t *testing.T) {
215215
f.NewSheet("Sheet3")
216216
assert.NoError(t, f.SetColVisible("Sheet3", "E", false))
217217
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")
219219
assert.NoError(t, f.SaveAs(filepath.Join("test", "TestColumnVisibility.xlsx")))
220220
})
221221

@@ -243,7 +243,7 @@ func TestOutlineLevel(t *testing.T) {
243243

244244
level, err = f.GetColOutlineLevel("SheetN", "A")
245245
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")
247247

248248
assert.NoError(t, f.SetColWidth("Sheet2", "A", "D", 13))
249249
assert.EqualError(t, f.SetColWidth("Sheet2", "A", "D", MaxColumnWidth+1), ErrColumnWidth.Error())
@@ -253,18 +253,18 @@ func TestOutlineLevel(t *testing.T) {
253253
assert.EqualError(t, f.SetColOutlineLevel("Sheet1", "D", 8), ErrOutlineLevel.Error())
254254
assert.EqualError(t, f.SetRowOutlineLevel("Sheet1", 2, 8), ErrOutlineLevel.Error())
255255
// 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")
257257
// Test get row outline level on not exists worksheet.
258258
_, 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")
260260

261261
// Test set and get column outline level with illegal cell coordinates.
262262
assert.EqualError(t, f.SetColOutlineLevel("Sheet1", "*", 1), newInvalidColumnNameError("*").Error())
263263
_, err = f.GetColOutlineLevel("Sheet1", "*")
264264
assert.EqualError(t, err, newInvalidColumnNameError("*").Error())
265265

266266
// 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")
268268

269269
assert.EqualError(t, f.SetRowOutlineLevel("Sheet1", 0, 1), newInvalidRowNumberError(0).Error())
270270
level, err = f.GetRowOutlineLevel("Sheet1", 2)
@@ -292,7 +292,7 @@ func TestSetColStyle(t *testing.T) {
292292
styleID, err := f.NewStyle(`{"fill":{"type":"pattern","color":["#94d3a2"],"pattern":1}}`)
293293
assert.NoError(t, err)
294294
// 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")
296296
// Test set column style with illegal cell coordinates.
297297
assert.EqualError(t, f.SetColStyle("Sheet1", "*", styleID), newInvalidColumnNameError("*").Error())
298298
assert.EqualError(t, f.SetColStyle("Sheet1", "A:*", styleID), newInvalidColumnNameError("*").Error())
@@ -329,11 +329,11 @@ func TestColWidth(t *testing.T) {
329329
assert.EqualError(t, f.SetColWidth("Sheet1", "A", "*", 1), newInvalidColumnNameError("*").Error())
330330

331331
// 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")
333333

334334
// Test get column width on not exists worksheet.
335335
_, 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")
337337

338338
assert.NoError(t, f.SaveAs(filepath.Join("test", "TestColWidth.xlsx")))
339339
convertRowHeightToPixels(0)
@@ -376,7 +376,7 @@ func TestRemoveCol(t *testing.T) {
376376
assert.EqualError(t, f.RemoveCol("Sheet1", "*"), newInvalidColumnNameError("*").Error())
377377

378378
// 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")
380380

381381
assert.NoError(t, f.SaveAs(filepath.Join("test", "TestRemoveCol.xlsx")))
382382
}

‎comment_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func TestAddComments(t *testing.T) {
3131
assert.NoError(t, f.AddComment("Sheet2", "B7", `{"author":"Excelize: ","text":"This is a comment."}`))
3232

3333
// 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")
3535
// Test add comment on with illegal cell coordinates
3636
assert.EqualError(t, f.AddComment("Sheet1", "A", `{"author":"Excelize: ","text":"This is a comment."}`), newCellNameToCoordinatesError("A", newInvalidCellNameError("A")).Error())
3737
if assert.NoError(t, f.SaveAs(filepath.Join("test", "TestAddComments.xlsx"))) {
@@ -66,7 +66,7 @@ func TestDeleteComment(t *testing.T) {
6666
assert.NoError(t, f.DeleteComment("Sheet2", "C41"))
6767
assert.EqualValues(t, 0, len(f.GetComments()["Sheet2"]))
6868
// 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")
7070
// Test delete comment with worksheet part
7171
f.Pkg.Delete("xl/worksheets/sheet1.xml")
7272
assert.NoError(t, f.DeleteComment("Sheet1", "A22"))

‎datavalidation_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func TestDataValidation(t *testing.T) {
9090

9191
// Test get data validation on no exists worksheet
9292
_, err = f.GetDataValidations("SheetN")
93-
assert.EqualError(t, err, "sheet SheetN is not exist")
93+
assert.EqualError(t, err, "sheet SheetN does not exist")
9494

9595
assert.NoError(t, f.SaveAs(resultFile))
9696

@@ -158,7 +158,7 @@ func TestDataValidationError(t *testing.T) {
158158

159159
// Test add data validation on no exists worksheet.
160160
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")
162162
}
163163

164164
func TestDeleteDataValidation(t *testing.T) {
@@ -201,7 +201,7 @@ func TestDeleteDataValidation(t *testing.T) {
201201
assert.EqualError(t, f.DeleteDataValidation("Sheet1", "A1:B2"), newCellNameToCoordinatesError("A", newInvalidCellNameError("A")).Error())
202202

203203
// 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")
205205

206206
// Test delete all data validations in the worksheet.
207207
assert.NoError(t, f.DeleteDataValidation("Sheet1"))

‎errors.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ func newCellNameToCoordinatesError(cell string, err error) error {
7070
return fmt.Errorf("cannot convert cell %q to coordinates: %v", cell, err)
7171
}
7272

73-
// newNoExistSheetError defined the error message on receiving the not exist
73+
// newNoExistSheetError defined the error message on receiving the non existing
7474
// sheet name.
7575
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)
7777
}
7878

7979
// newNotWorksheetError defined the error message on receiving a sheet which

0 commit comments

Comments
 (0)