From c71e1b106e6011d148cac899f83c4685dee33a22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Tue, 10 Jan 2017 10:55:03 +0100 Subject: all: Refactor to nonglobal file systems Updates #2701 Fixes #2951 --- hugofs/fs_test.go | 60 ++++++++++++++++++++----------------------------------- 1 file changed, 22 insertions(+), 38 deletions(-) (limited to 'hugofs/fs_test.go') diff --git a/hugofs/fs_test.go b/hugofs/fs_test.go index 55007009f..5482e6d27 100644 --- a/hugofs/fs_test.go +++ b/hugofs/fs_test.go @@ -21,51 +21,35 @@ import ( "github.com/stretchr/testify/assert" ) -func TestInitDefault(t *testing.T) { +func TestNewDefault(t *testing.T) { viper.Reset() defer viper.Reset() - InitDefaultFs() + f := NewDefault() - assert.NotNil(t, Source()) - assert.IsType(t, new(afero.OsFs), Source()) - assert.NotNil(t, Destination()) - assert.IsType(t, new(afero.OsFs), Destination()) - assert.NotNil(t, Os()) - assert.IsType(t, new(afero.OsFs), Os()) - assert.Nil(t, WorkingDir()) + assert.NotNil(t, f.Source) + assert.IsType(t, new(afero.OsFs), f.Source) + assert.NotNil(t, f.Destination) + assert.IsType(t, new(afero.OsFs), f.Destination) + assert.NotNil(t, f.Os) + assert.IsType(t, new(afero.OsFs), f.Os) + assert.Nil(t, f.WorkingDir) + + assert.IsType(t, new(afero.OsFs), Os) } -func TestInitMemFs(t *testing.T) { +func TestNewMem(t *testing.T) { viper.Reset() defer viper.Reset() - InitMemFs() - - assert.NotNil(t, Source()) - assert.IsType(t, new(afero.MemMapFs), Source()) - assert.NotNil(t, Destination()) - assert.IsType(t, new(afero.MemMapFs), Destination()) - assert.IsType(t, new(afero.OsFs), Os()) - assert.Nil(t, WorkingDir()) -} - -func TestSetSource(t *testing.T) { - - InitMemFs() - - SetSource(new(afero.OsFs)) - assert.NotNil(t, Source()) - assert.IsType(t, new(afero.OsFs), Source()) -} - -func TestSetDestination(t *testing.T) { - - InitMemFs() + f := NewMem() - SetDestination(new(afero.OsFs)) - assert.NotNil(t, Destination()) - assert.IsType(t, new(afero.OsFs), Destination()) + assert.NotNil(t, f.Source) + assert.IsType(t, new(afero.MemMapFs), f.Source) + assert.NotNil(t, f.Destination) + assert.IsType(t, new(afero.MemMapFs), f.Destination) + assert.IsType(t, new(afero.OsFs), f.Os) + assert.Nil(t, f.WorkingDir) } func TestWorkingDir(t *testing.T) { @@ -74,8 +58,8 @@ func TestWorkingDir(t *testing.T) { viper.Set("workingDir", "/a/b/") - InitMemFs() + f := NewMem() - assert.NotNil(t, WorkingDir()) - assert.IsType(t, new(afero.BasePathFs), WorkingDir()) + assert.NotNil(t, f.WorkingDir) + assert.IsType(t, new(afero.BasePathFs), f.WorkingDir) } -- cgit v1.2.3