From 35426ed5dc5196374332498c82b4d480b05e5ac5 Mon Sep 17 00:00:00 2001 From: Veniamin Albaev Date: Thu, 27 Dec 2018 13:51:44 +0300 Subject: Tests refactoring Primary motivation: Avoid statefull tests with not ignorable git file tree changes. Multiple tests reads and overwrites signle file for won needs. Multiple tests reads and overwrites file under version control. Secondary motivation: Minimal tests logic aligment, separate error expectation and not error expectation tests. Introduce sub-test over test data sets and so far. This commit is not ideal but necessary (IMHO) --- sheetview_test.go | 35 ++++++++++------------------------- 1 file changed, 10 insertions(+), 25 deletions(-) (limited to 'sheetview_test.go') diff --git a/sheetview_test.go b/sheetview_test.go index ee81d5b..b565a12 100644 --- a/sheetview_test.go +++ b/sheetview_test.go @@ -4,6 +4,8 @@ import ( "fmt" "testing" + "github.com/stretchr/testify/assert" + "github.com/360EntSecGroup-Skylar/excelize" ) @@ -157,29 +159,12 @@ func TestSheetViewOptionsErrors(t *testing.T) { xl := excelize.NewFile() const sheet = "Sheet1" - if err := xl.GetSheetViewOptions(sheet, 0); err != nil { - t.Errorf("Unexpected error: %s", err) - } - if err := xl.GetSheetViewOptions(sheet, -1); err != nil { - t.Errorf("Unexpected error: %s", err) - } - if err := xl.GetSheetViewOptions(sheet, 1); err == nil { - t.Error("Error expected but got nil") - } - if err := xl.GetSheetViewOptions(sheet, -2); err == nil { - t.Error("Error expected but got nil") - } - - if err := xl.SetSheetViewOptions(sheet, 0); err != nil { - t.Errorf("Unexpected error: %s", err) - } - if err := xl.SetSheetViewOptions(sheet, -1); err != nil { - t.Errorf("Unexpected error: %s", err) - } - if err := xl.SetSheetViewOptions(sheet, 1); err == nil { - t.Error("Error expected but got nil") - } - if err := xl.SetSheetViewOptions(sheet, -2); err == nil { - t.Error("Error expected but got nil") - } + 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)) } -- cgit v1.2.1