Merge branch 'master' into fix/cell_lock

1 files changed, 46 insertions, 32 deletions

diff --git a/sheetview_test.go b/sheetview_test.go
index b565a12..d999875 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),
@@ -47,30 +47,30 @@ func ExampleFile_SetSheetViewOptions() {
 		excelize.ZoomScale(80),
 		excelize.TopLeftCell("C3"),
 	); err != nil {
-		panic(err)
+		fmt.Println(err)
 	}
 
 	var zoomScale excelize.ZoomScale
 	fmt.Println("Default:")
 	fmt.Println("- zoomScale: 80")
 
-	if err := xl.SetSheetViewOptions(sheet, 0, excelize.ZoomScale(500)); err != nil {
-		panic(err)
+	if err := f.SetSheetViewOptions(sheet, 0, excelize.ZoomScale(500)); err != nil {
+		fmt.Println(err)
 	}
 
-	if err := xl.GetSheetViewOptions(sheet, 0, &zoomScale); err != nil {
-		panic(err)
+	if err := f.GetSheetViewOptions(sheet, 0, &zoomScale); err != nil {
+		fmt.Println(err)
 	}
 
 	fmt.Println("Used out of range value:")
 	fmt.Println("- zoomScale:", zoomScale)
 
-	if err := xl.SetSheetViewOptions(sheet, 0, excelize.ZoomScale(123)); err != nil {
-		panic(err)
+	if err := f.SetSheetViewOptions(sheet, 0, excelize.ZoomScale(123)); err != nil {
+		fmt.Println(err)
 	}
 
-	if err := xl.GetSheetViewOptions(sheet, 0, &zoomScale); err != nil {
-		panic(err)
+	if err := f.GetSheetViewOptions(sheet, 0, &zoomScale); err != nil {
+		fmt.Println(err)
 	}
 
 	fmt.Println("Used correct value:")
@@ -87,7 +87,7 @@ func ExampleFile_SetSheetViewOptions() {
 }
 
 func ExampleFile_GetSheetViewOptions() {
-	xl := excelize.NewFile()
+	f := excelize.NewFile()
 	const sheet = "Sheet1"
 
 	var (
@@ -95,21 +95,23 @@ func ExampleFile_GetSheetViewOptions() {
 		rightToLeft       excelize.RightToLeft
 		showFormulas      excelize.ShowFormulas
 		showGridLines     excelize.ShowGridLines
+		showZeros         excelize.ShowZeros
 		showRowColHeaders excelize.ShowRowColHeaders
 		zoomScale         excelize.ZoomScale
 		topLeftCell       excelize.TopLeftCell
 	)
 
-	if err := xl.GetSheetViewOptions(sheet, 0,
+	if err := f.GetSheetViewOptions(sheet, 0,
 		&defaultGridColor,
 		&rightToLeft,
 		&showFormulas,
 		&showGridLines,
+		&showZeros,
 		&showRowColHeaders,
 		&zoomScale,
 		&topLeftCell,
 	); err != nil {
-		panic(err)
+		fmt.Println(err)
 	}
 
 	fmt.Println("Default:")
@@ -117,28 +119,38 @@ 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+`"`)
 
-	if err := xl.SetSheetViewOptions(sheet, 0, excelize.TopLeftCell("B2")); err != nil {
-		panic(err)
+	if err := f.SetSheetViewOptions(sheet, 0, excelize.TopLeftCell("B2")); err != nil {
+		fmt.Println(err)
 	}
 
-	if err := xl.GetSheetViewOptions(sheet, 0, &topLeftCell); err != nil {
-		panic(err)
+	if err := f.GetSheetViewOptions(sheet, 0, &topLeftCell); err != nil {
+		fmt.Println(err)
 	}
 
-	if err := xl.SetSheetViewOptions(sheet, 0, excelize.ShowGridLines(false)); err != nil {
-		panic(err)
+	if err := f.SetSheetViewOptions(sheet, 0, excelize.ShowGridLines(false)); err != nil {
+		fmt.Println(err)
 	}
 
-	if err := xl.GetSheetViewOptions(sheet, 0, &showGridLines); err != nil {
-		panic(err)
+	if err := f.GetSheetViewOptions(sheet, 0, &showGridLines); err != nil {
+		fmt.Println(err)
+	}
+
+	if err := f.SetSheetViewOptions(sheet, 0, excelize.ShowZeros(false)); err != nil {
+		fmt.Println(err)
+	}
+
+	if err := f.GetSheetViewOptions(sheet, 0, &showZeros); err != nil {
+		fmt.Println(err)
 	}
 
 	fmt.Println("After change:")
 	fmt.Println("- showGridLines:", showGridLines)
+	fmt.Println("- showZeros:", showZeros)
 	fmt.Println("- topLeftCell:", topLeftCell)
 
 	// Output:
@@ -147,24 +159,26 @@ func ExampleFile_GetSheetViewOptions() {
 	// - rightToLeft: false
 	// - showFormulas: false
 	// - showGridLines: true
+	// - showZeros: true
 	// - showRowColHeaders: true
 	// - zoomScale: 0
 	// - topLeftCell: ""
 	// After change:
 	// - showGridLines: false
+	// - showZeros: false
 	// - topLeftCell: B2
 }
 
 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))
 }