From f2b8798a34aab4411a50861a4cdf47203edc3a19 Mon Sep 17 00:00:00 2001
From: Artem Kustikov <artem.kustikov@gmail.com>
Date: Sun, 4 Oct 2020 16:07:39 +0300
Subject: extend cell value load to support custom datetime format (#703)

* extend cell value load to support custom datetime format

* cleanup incorrect imports

* fix numeric values conversion as done in legacy Excel

* fix tests coverage

* revert temporary package name fix

* remove personal info from test XLSX files

* remove unused dependencies

* update format conversion in parseTime

* new UT to increase code coverage

* Resolve code review issue for PR #703

* Rename broken file name generated by unit test

Co-authored-by: xuri <xuri.me@gmail.com>
---
 sheetview_test.go | 92 +++++++++++++++++++++++++++----------------------------
 1 file changed, 45 insertions(+), 47 deletions(-)

(limited to 'sheetview_test.go')

diff --git a/sheetview_test.go b/sheetview_test.go
index d999875..e323e23 100644
--- a/sheetview_test.go
+++ b/sheetview_test.go
@@ -1,60 +1,58 @@
-package excelize_test
+package excelize
 
 import (
 	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-
-	"github.com/360EntSecGroup-Skylar/excelize/v2"
 )
 
-var _ = []excelize.SheetViewOption{
-	excelize.DefaultGridColor(true),
-	excelize.RightToLeft(false),
-	excelize.ShowFormulas(false),
-	excelize.ShowGridLines(true),
-	excelize.ShowRowColHeaders(true),
-	excelize.TopLeftCell("B2"),
+var _ = []SheetViewOption{
+	DefaultGridColor(true),
+	RightToLeft(false),
+	ShowFormulas(false),
+	ShowGridLines(true),
+	ShowRowColHeaders(true),
+	TopLeftCell("B2"),
 	// SheetViewOptionPtr are also SheetViewOption
-	new(excelize.DefaultGridColor),
-	new(excelize.RightToLeft),
-	new(excelize.ShowFormulas),
-	new(excelize.ShowGridLines),
-	new(excelize.ShowRowColHeaders),
-	new(excelize.TopLeftCell),
+	new(DefaultGridColor),
+	new(RightToLeft),
+	new(ShowFormulas),
+	new(ShowGridLines),
+	new(ShowRowColHeaders),
+	new(TopLeftCell),
 }
 
-var _ = []excelize.SheetViewOptionPtr{
-	(*excelize.DefaultGridColor)(nil),
-	(*excelize.RightToLeft)(nil),
-	(*excelize.ShowFormulas)(nil),
-	(*excelize.ShowGridLines)(nil),
-	(*excelize.ShowRowColHeaders)(nil),
-	(*excelize.TopLeftCell)(nil),
+var _ = []SheetViewOptionPtr{
+	(*DefaultGridColor)(nil),
+	(*RightToLeft)(nil),
+	(*ShowFormulas)(nil),
+	(*ShowGridLines)(nil),
+	(*ShowRowColHeaders)(nil),
+	(*TopLeftCell)(nil),
 }
 
 func ExampleFile_SetSheetViewOptions() {
-	f := excelize.NewFile()
+	f := NewFile()
 	const sheet = "Sheet1"
 
 	if err := f.SetSheetViewOptions(sheet, 0,
-		excelize.DefaultGridColor(false),
-		excelize.RightToLeft(false),
-		excelize.ShowFormulas(true),
-		excelize.ShowGridLines(true),
-		excelize.ShowRowColHeaders(true),
-		excelize.ZoomScale(80),
-		excelize.TopLeftCell("C3"),
+		DefaultGridColor(false),
+		RightToLeft(false),
+		ShowFormulas(true),
+		ShowGridLines(true),
+		ShowRowColHeaders(true),
+		ZoomScale(80),
+		TopLeftCell("C3"),
 	); err != nil {
 		fmt.Println(err)
 	}
 
-	var zoomScale excelize.ZoomScale
+	var zoomScale ZoomScale
 	fmt.Println("Default:")
 	fmt.Println("- zoomScale: 80")
 
-	if err := f.SetSheetViewOptions(sheet, 0, excelize.ZoomScale(500)); err != nil {
+	if err := f.SetSheetViewOptions(sheet, 0, ZoomScale(500)); err != nil {
 		fmt.Println(err)
 	}
 
@@ -65,7 +63,7 @@ func ExampleFile_SetSheetViewOptions() {
 	fmt.Println("Used out of range value:")
 	fmt.Println("- zoomScale:", zoomScale)
 
-	if err := f.SetSheetViewOptions(sheet, 0, excelize.ZoomScale(123)); err != nil {
+	if err := f.SetSheetViewOptions(sheet, 0, ZoomScale(123)); err != nil {
 		fmt.Println(err)
 	}
 
@@ -87,18 +85,18 @@ func ExampleFile_SetSheetViewOptions() {
 }
 
 func ExampleFile_GetSheetViewOptions() {
-	f := excelize.NewFile()
+	f := NewFile()
 	const sheet = "Sheet1"
 
 	var (
-		defaultGridColor  excelize.DefaultGridColor
-		rightToLeft       excelize.RightToLeft
-		showFormulas      excelize.ShowFormulas
-		showGridLines     excelize.ShowGridLines
-		showZeros         excelize.ShowZeros
-		showRowColHeaders excelize.ShowRowColHeaders
-		zoomScale         excelize.ZoomScale
-		topLeftCell       excelize.TopLeftCell
+		defaultGridColor  DefaultGridColor
+		rightToLeft       RightToLeft
+		showFormulas      ShowFormulas
+		showGridLines     ShowGridLines
+		showZeros         ShowZeros
+		showRowColHeaders ShowRowColHeaders
+		zoomScale         ZoomScale
+		topLeftCell       TopLeftCell
 	)
 
 	if err := f.GetSheetViewOptions(sheet, 0,
@@ -124,7 +122,7 @@ func ExampleFile_GetSheetViewOptions() {
 	fmt.Println("- zoomScale:", zoomScale)
 	fmt.Println("- topLeftCell:", `"`+topLeftCell+`"`)
 
-	if err := f.SetSheetViewOptions(sheet, 0, excelize.TopLeftCell("B2")); err != nil {
+	if err := f.SetSheetViewOptions(sheet, 0, TopLeftCell("B2")); err != nil {
 		fmt.Println(err)
 	}
 
@@ -132,7 +130,7 @@ func ExampleFile_GetSheetViewOptions() {
 		fmt.Println(err)
 	}
 
-	if err := f.SetSheetViewOptions(sheet, 0, excelize.ShowGridLines(false)); err != nil {
+	if err := f.SetSheetViewOptions(sheet, 0, ShowGridLines(false)); err != nil {
 		fmt.Println(err)
 	}
 
@@ -140,7 +138,7 @@ func ExampleFile_GetSheetViewOptions() {
 		fmt.Println(err)
 	}
 
-	if err := f.SetSheetViewOptions(sheet, 0, excelize.ShowZeros(false)); err != nil {
+	if err := f.SetSheetViewOptions(sheet, 0, ShowZeros(false)); err != nil {
 		fmt.Println(err)
 	}
 
@@ -170,7 +168,7 @@ func ExampleFile_GetSheetViewOptions() {
 }
 
 func TestSheetViewOptionsErrors(t *testing.T) {
-	f := excelize.NewFile()
+	f := NewFile()
 	const sheet = "Sheet1"
 
 	assert.NoError(t, f.GetSheetViewOptions(sheet, 0))
-- 
cgit v1.2.1