From b1f632d4084130628f10906ff6a7bb55022e4c08 Mon Sep 17 00:00:00 2001 From: xuri Date: Tue, 30 Apr 2019 18:39:27 +0800 Subject: Resolve #393, upgrade Go module to v2 --- sheetview_test.go | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'sheetview_test.go') diff --git a/sheetview_test.go b/sheetview_test.go index b565a12..2e697b8 100644 --- a/sheetview_test.go +++ b/sheetview_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/360EntSecGroup-Skylar/excelize" + "github.com/360EntSecGroup-Skylar/excelize/v2" ) var _ = []excelize.SheetViewOption{ @@ -35,10 +35,10 @@ var _ = []excelize.SheetViewOptionPtr{ } func ExampleFile_SetSheetViewOptions() { - xl := excelize.NewFile() + f := excelize.NewFile() const sheet = "Sheet1" - if err := xl.SetSheetViewOptions(sheet, 0, + if err := f.SetSheetViewOptions(sheet, 0, excelize.DefaultGridColor(false), excelize.RightToLeft(false), excelize.ShowFormulas(true), @@ -54,22 +54,22 @@ func ExampleFile_SetSheetViewOptions() { fmt.Println("Default:") fmt.Println("- zoomScale: 80") - if err := xl.SetSheetViewOptions(sheet, 0, excelize.ZoomScale(500)); err != nil { + if err := f.SetSheetViewOptions(sheet, 0, excelize.ZoomScale(500)); err != nil { panic(err) } - if err := xl.GetSheetViewOptions(sheet, 0, &zoomScale); err != nil { + if err := f.GetSheetViewOptions(sheet, 0, &zoomScale); err != nil { panic(err) } fmt.Println("Used out of range value:") fmt.Println("- zoomScale:", zoomScale) - if err := xl.SetSheetViewOptions(sheet, 0, excelize.ZoomScale(123)); err != nil { + if err := f.SetSheetViewOptions(sheet, 0, excelize.ZoomScale(123)); err != nil { panic(err) } - if err := xl.GetSheetViewOptions(sheet, 0, &zoomScale); err != nil { + if err := f.GetSheetViewOptions(sheet, 0, &zoomScale); err != nil { panic(err) } @@ -87,7 +87,7 @@ func ExampleFile_SetSheetViewOptions() { } func ExampleFile_GetSheetViewOptions() { - xl := excelize.NewFile() + f := excelize.NewFile() const sheet = "Sheet1" var ( @@ -100,7 +100,7 @@ func ExampleFile_GetSheetViewOptions() { topLeftCell excelize.TopLeftCell ) - if err := xl.GetSheetViewOptions(sheet, 0, + if err := f.GetSheetViewOptions(sheet, 0, &defaultGridColor, &rightToLeft, &showFormulas, @@ -121,19 +121,19 @@ func ExampleFile_GetSheetViewOptions() { fmt.Println("- zoomScale:", zoomScale) fmt.Println("- topLeftCell:", `"`+topLeftCell+`"`) - if err := xl.SetSheetViewOptions(sheet, 0, excelize.TopLeftCell("B2")); err != nil { + if err := f.SetSheetViewOptions(sheet, 0, excelize.TopLeftCell("B2")); err != nil { panic(err) } - if err := xl.GetSheetViewOptions(sheet, 0, &topLeftCell); err != nil { + if err := f.GetSheetViewOptions(sheet, 0, &topLeftCell); err != nil { panic(err) } - if err := xl.SetSheetViewOptions(sheet, 0, excelize.ShowGridLines(false)); err != nil { + if err := f.SetSheetViewOptions(sheet, 0, excelize.ShowGridLines(false)); err != nil { panic(err) } - if err := xl.GetSheetViewOptions(sheet, 0, &showGridLines); err != nil { + if err := f.GetSheetViewOptions(sheet, 0, &showGridLines); err != nil { panic(err) } @@ -156,15 +156,15 @@ func ExampleFile_GetSheetViewOptions() { } func TestSheetViewOptionsErrors(t *testing.T) { - xl := excelize.NewFile() + f := excelize.NewFile() const sheet = "Sheet1" - assert.NoError(t, xl.GetSheetViewOptions(sheet, 0)) - assert.NoError(t, xl.GetSheetViewOptions(sheet, -1)) - assert.Error(t, xl.GetSheetViewOptions(sheet, 1)) - assert.Error(t, xl.GetSheetViewOptions(sheet, -2)) - assert.NoError(t, xl.SetSheetViewOptions(sheet, 0)) - assert.NoError(t, xl.SetSheetViewOptions(sheet, -1)) - assert.Error(t, xl.SetSheetViewOptions(sheet, 1)) - assert.Error(t, xl.SetSheetViewOptions(sheet, -2)) + assert.NoError(t, f.GetSheetViewOptions(sheet, 0)) + assert.NoError(t, f.GetSheetViewOptions(sheet, -1)) + assert.Error(t, f.GetSheetViewOptions(sheet, 1)) + assert.Error(t, f.GetSheetViewOptions(sheet, -2)) + assert.NoError(t, f.SetSheetViewOptions(sheet, 0)) + assert.NoError(t, f.SetSheetViewOptions(sheet, -1)) + assert.Error(t, f.SetSheetViewOptions(sheet, 1)) + assert.Error(t, f.SetSheetViewOptions(sheet, -2)) } -- cgit v1.2.1 From 0acb3ef9685e80d51dfda5ab9a9db870af7e1614 Mon Sep 17 00:00:00 2001 From: xuri Date: Mon, 2 Sep 2019 21:52:55 +0800 Subject: Testing files updated --- sheetview_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sheetview_test.go') diff --git a/sheetview_test.go b/sheetview_test.go index 2e697b8..07f59ed 100644 --- a/sheetview_test.go +++ b/sheetview_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/360EntSecGroup-Skylar/excelize/v2" + "github.com/360EntSecGroup-Skylar/excelize" ) var _ = []excelize.SheetViewOption{ -- cgit v1.2.1 From 3c327413d963f6ffa934a72beb483d1fedd25660 Mon Sep 17 00:00:00 2001 From: Ben Wells Date: Fri, 13 Sep 2019 11:38:44 +0100 Subject: Fix dependency on github.com/360EntSecGroup-Skylar/excelize v1 --- sheetview_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sheetview_test.go') diff --git a/sheetview_test.go b/sheetview_test.go index 07f59ed..2e697b8 100644 --- a/sheetview_test.go +++ b/sheetview_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/360EntSecGroup-Skylar/excelize" + "github.com/360EntSecGroup-Skylar/excelize/v2" ) var _ = []excelize.SheetViewOption{ -- cgit v1.2.1 From babfeb6b57ad3e63f68f5e031869efc54c9cfe0b Mon Sep 17 00:00:00 2001 From: jaby Date: Mon, 30 Sep 2019 14:37:52 +0200 Subject: Add missing ShowZeros SheetViewOption implementation --- sheetview_test.go | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'sheetview_test.go') diff --git a/sheetview_test.go b/sheetview_test.go index 2e697b8..e45b8ce 100644 --- a/sheetview_test.go +++ b/sheetview_test.go @@ -95,6 +95,7 @@ func ExampleFile_GetSheetViewOptions() { rightToLeft excelize.RightToLeft showFormulas excelize.ShowFormulas showGridLines excelize.ShowGridLines + showZeros excelize.ShowZeros showRowColHeaders excelize.ShowRowColHeaders zoomScale excelize.ZoomScale topLeftCell excelize.TopLeftCell @@ -105,6 +106,7 @@ func ExampleFile_GetSheetViewOptions() { &rightToLeft, &showFormulas, &showGridLines, + &showZeros, &showRowColHeaders, &zoomScale, &topLeftCell, @@ -117,6 +119,7 @@ func ExampleFile_GetSheetViewOptions() { fmt.Println("- rightToLeft:", rightToLeft) fmt.Println("- showFormulas:", showFormulas) fmt.Println("- showGridLines:", showGridLines) + fmt.Println("- showZeros:", showZeros) fmt.Println("- showRowColHeaders:", showRowColHeaders) fmt.Println("- zoomScale:", zoomScale) fmt.Println("- topLeftCell:", `"`+topLeftCell+`"`) @@ -137,8 +140,17 @@ func ExampleFile_GetSheetViewOptions() { panic(err) } + if err := f.SetSheetViewOptions(sheet, 0, excelize.ShowZeros(false)); err != nil { + panic(err) + } + + if err := f.GetSheetViewOptions(sheet, 0, &showZeros); err != nil { + panic(err) + } + fmt.Println("After change:") fmt.Println("- showGridLines:", showGridLines) + fmt.Println("- showZeros:", showZeros) fmt.Println("- topLeftCell:", topLeftCell) // Output: @@ -147,11 +159,13 @@ func ExampleFile_GetSheetViewOptions() { // - rightToLeft: false // - showFormulas: false // - showGridLines: true + // - showZeros: true // - showRowColHeaders: true // - zoomScale: 0 // - topLeftCell: "" // After change: // - showGridLines: false + // - showZeros: false // - topLeftCell: B2 } -- cgit v1.2.1 From 5ca7231ed408ac264f509ff52b5d28ff4fbda757 Mon Sep 17 00:00:00 2001 From: xuri Date: Fri, 3 Jan 2020 23:57:25 +0800 Subject: optimize code and comments: use println errors instead of panic --- sheetview_test.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'sheetview_test.go') diff --git a/sheetview_test.go b/sheetview_test.go index e45b8ce..8412002 100644 --- a/sheetview_test.go +++ b/sheetview_test.go @@ -47,7 +47,7 @@ func ExampleFile_SetSheetViewOptions() { excelize.ZoomScale(80), excelize.TopLeftCell("C3"), ); err != nil { - panic(err) + println(err.Error()) } var zoomScale excelize.ZoomScale @@ -55,22 +55,22 @@ func ExampleFile_SetSheetViewOptions() { fmt.Println("- zoomScale: 80") if err := f.SetSheetViewOptions(sheet, 0, excelize.ZoomScale(500)); err != nil { - panic(err) + println(err.Error()) } if err := f.GetSheetViewOptions(sheet, 0, &zoomScale); err != nil { - panic(err) + println(err.Error()) } fmt.Println("Used out of range value:") fmt.Println("- zoomScale:", zoomScale) if err := f.SetSheetViewOptions(sheet, 0, excelize.ZoomScale(123)); err != nil { - panic(err) + println(err.Error()) } if err := f.GetSheetViewOptions(sheet, 0, &zoomScale); err != nil { - panic(err) + println(err.Error()) } fmt.Println("Used correct value:") @@ -111,7 +111,7 @@ func ExampleFile_GetSheetViewOptions() { &zoomScale, &topLeftCell, ); err != nil { - panic(err) + println(err.Error()) } fmt.Println("Default:") @@ -125,27 +125,27 @@ func ExampleFile_GetSheetViewOptions() { fmt.Println("- topLeftCell:", `"`+topLeftCell+`"`) if err := f.SetSheetViewOptions(sheet, 0, excelize.TopLeftCell("B2")); err != nil { - panic(err) + println(err.Error()) } if err := f.GetSheetViewOptions(sheet, 0, &topLeftCell); err != nil { - panic(err) + println(err.Error()) } if err := f.SetSheetViewOptions(sheet, 0, excelize.ShowGridLines(false)); err != nil { - panic(err) + println(err.Error()) } if err := f.GetSheetViewOptions(sheet, 0, &showGridLines); err != nil { - panic(err) + println(err.Error()) } if err := f.SetSheetViewOptions(sheet, 0, excelize.ShowZeros(false)); err != nil { - panic(err) + println(err.Error()) } if err := f.GetSheetViewOptions(sheet, 0, &showZeros); err != nil { - panic(err) + println(err.Error()) } fmt.Println("After change:") -- cgit v1.2.1 From ad883caa0f77dfc016ae99bd5fbb606953eb99a0 Mon Sep 17 00:00:00 2001 From: xuri Date: Wed, 19 Feb 2020 00:08:10 +0800 Subject: Resolve #580, revert commit https://github.com/360EntSecGroup-Skylar/excelize/commit/5ca7231ed408ac264f509ff52b5d28ff4fbda757 --- sheetview_test.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'sheetview_test.go') diff --git a/sheetview_test.go b/sheetview_test.go index 8412002..d999875 100644 --- a/sheetview_test.go +++ b/sheetview_test.go @@ -47,7 +47,7 @@ func ExampleFile_SetSheetViewOptions() { excelize.ZoomScale(80), excelize.TopLeftCell("C3"), ); err != nil { - println(err.Error()) + fmt.Println(err) } var zoomScale excelize.ZoomScale @@ -55,22 +55,22 @@ func ExampleFile_SetSheetViewOptions() { fmt.Println("- zoomScale: 80") if err := f.SetSheetViewOptions(sheet, 0, excelize.ZoomScale(500)); err != nil { - println(err.Error()) + fmt.Println(err) } if err := f.GetSheetViewOptions(sheet, 0, &zoomScale); err != nil { - println(err.Error()) + fmt.Println(err) } fmt.Println("Used out of range value:") fmt.Println("- zoomScale:", zoomScale) if err := f.SetSheetViewOptions(sheet, 0, excelize.ZoomScale(123)); err != nil { - println(err.Error()) + fmt.Println(err) } if err := f.GetSheetViewOptions(sheet, 0, &zoomScale); err != nil { - println(err.Error()) + fmt.Println(err) } fmt.Println("Used correct value:") @@ -111,7 +111,7 @@ func ExampleFile_GetSheetViewOptions() { &zoomScale, &topLeftCell, ); err != nil { - println(err.Error()) + fmt.Println(err) } fmt.Println("Default:") @@ -125,27 +125,27 @@ func ExampleFile_GetSheetViewOptions() { fmt.Println("- topLeftCell:", `"`+topLeftCell+`"`) if err := f.SetSheetViewOptions(sheet, 0, excelize.TopLeftCell("B2")); err != nil { - println(err.Error()) + fmt.Println(err) } if err := f.GetSheetViewOptions(sheet, 0, &topLeftCell); err != nil { - println(err.Error()) + fmt.Println(err) } if err := f.SetSheetViewOptions(sheet, 0, excelize.ShowGridLines(false)); err != nil { - println(err.Error()) + fmt.Println(err) } if err := f.GetSheetViewOptions(sheet, 0, &showGridLines); err != nil { - println(err.Error()) + fmt.Println(err) } if err := f.SetSheetViewOptions(sheet, 0, excelize.ShowZeros(false)); err != nil { - println(err.Error()) + fmt.Println(err) } if err := f.GetSheetViewOptions(sheet, 0, &showZeros); err != nil { - println(err.Error()) + fmt.Println(err) } fmt.Println("After change:") -- cgit v1.2.1