add test for dir

Author: shota3506

commands/commands.go

@@ -1,7 +1,6 @@
 package commands
 
 import (
-	"github.com/shota3506/gtree/entry"
 	"github.com/shota3506/gtree/state"
 )
 
@@ -36,16 +35,9 @@ func (c CommandResize) Do(st state.State) (state.State, error) {
 type CommandSelect struct{}
 
 func (c CommandSelect) Do(st state.State) (state.State, error) {
-	e, err := st.Get()
+	err := st.Toggle()
 	if err != nil {
 		return nil, err
 	}
-
-	if d, ok := e.(*entry.Dir); ok {
-		err := d.Toggle()
-		if err != nil {
-			return nil, err
-		}
-	}
 	return st, nil
 }

entry/entry.go

@@ -92,9 +92,6 @@ func (d *Dir) IsDir() bool {
 }
 
 func (d *Dir) Size() int {
-	if !d.IsOpen() {
-		return 1
-	}
 	var size int
 	_ = d.Walk(func(e Entry) error { // never return error
 		size += 1
@@ -119,16 +116,6 @@ func (d *Dir) Close() {
 	d.open = false
 }
 
-func (d *Dir) Toggle() error {
-	var err error
-	if d.IsOpen() {
-		d.Close()
-	} else {
-		err = d.Open()
-	}
-	return err
-}
-
 func (d *Dir) IsOpen() bool {
 	return d.open
 }

entry/entry_test.go

@@ -13,9 +13,9 @@ testdata
 ├── a
 │   ├── b
 │   │   ├── sample4.txt
-│   │   └── sample6.txt
-│   ├── c
 │   │   └── sample5.txt
+│   ├── c
+│   │   └── sample6.txt
 │   └── sample3.txt
 ├── sample1.txt
 └── sample2.txt
@@ -26,9 +26,7 @@ func TestFile(t *testing.T) {
 	require.NoError(t, err)
 
 	require.Len(t, root.children, 3)
-	c := root.children[1]
-
-	f, ok := c.(*File)
+	f, ok := root.children[1].(*File)
 	require.True(t, ok)
 
 	assert.Equal(t, "sample1.txt", f.String())
@@ -43,9 +41,7 @@ func TestDir(t *testing.T) {
 	require.NoError(t, err)
 
 	require.Len(t, root.children, 3)
-	c := root.children[0]
-
-	d, ok := c.(*Dir)
+	d, ok := root.children[0].(*Dir)
 	require.True(t, ok)
 
 	assert.Equal(t, "a", d.String())
@@ -54,3 +50,92 @@ func TestDir(t *testing.T) {
 	assert.Equal(t, 1, d.Size())
 	assert.Equal(t, 1, d.Depth())
 }
+
+func TestDirOpenAndClose(t *testing.T) {
+	root, err := NewRoot("testdata", false)
+	require.NoError(t, err)
+
+	require.Len(t, root.children, 3)
+	da, ok := root.children[0].(*Dir)
+	require.True(t, ok)
+	assert.Equal(t, 1, da.Depth())
+	assert.False(t, da.IsOpen())
+
+	// open ./testdata/a
+	err = da.Open()
+	require.NoError(t, err)
+	assert.True(t, da.IsOpen())
+	assert.Equal(t, 4, da.Size())
+
+	require.Len(t, da.children, 3)
+	db, ok := da.children[0].(*Dir)
+	require.True(t, ok)
+	assert.Equal(t, 2, db.Depth())
+	assert.False(t, db.IsOpen())
+
+	// open ./testdata/a/b
+	err = db.Open()
+	require.NoError(t, err)
+	assert.True(t, db.IsOpen())
+	assert.Equal(t, 3, db.Size())
+	assert.Equal(t, 6, da.Size())
+
+	require.Len(t, db.children, 2)
+	assert.Equal(t, 3, db.children[0].Depth())
+	assert.Equal(t, 3, db.children[1].Depth())
+
+	// close ./testdata/a/b
+	db.Close()
+	assert.False(t, db.IsOpen())
+	assert.Equal(t, 1, db.Size())
+	assert.Equal(t, 4, da.Size())
+
+	// close ./testdata/a
+	da.Close()
+	assert.False(t, da.IsOpen())
+	assert.Equal(t, 1, da.Size())
+}
+
+func TestDirGet(t *testing.T) {
+	t.Run("found", func(t *testing.T) {
+		root, err := NewRoot("testdata", false)
+		require.NoError(t, err)
+
+		e, err := root.Get(3)
+		require.NoError(t, err)
+		require.NotNil(t, e)
+		assert.Equal(t, "sample2.txt", e.String())
+	})
+
+	t.Run("not found", func(t *testing.T) {
+		root, err := NewRoot("testdata", false)
+		require.NoError(t, err)
+
+		_, err = root.Get(4)
+		require.Error(t, err)
+	})
+
+	t.Run("open", func(t *testing.T) {
+		root, err := NewRoot("testdata", false)
+		require.NoError(t, err)
+
+		e, err := root.Get(1)
+		require.NoError(t, err)
+		d, ok := e.(*Dir)
+		require.True(t, ok)
+
+		// open ./testdata/a
+		err = d.Open()
+		require.NoError(t, err)
+
+		e, err = root.Get(3)
+		require.NoError(t, err)
+		require.NotNil(t, e)
+		assert.Equal(t, "c", e.String())
+
+		e, err = root.Get(4)
+		require.NoError(t, err)
+		require.NotNil(t, e)
+		assert.Equal(t, "sample3.txt", e.String())
+	})
+}

entry/testdata/a/c/sample5.txt entry/testdata/a/b/sample5.txt

@@ -9,10 +9,10 @@ import (
 type State interface {
 	View() views.CellModel
 	Root() *entry.Dir
-	Get() (entry.Entry, error)
 	Up()
 	Down()
 	SetSize(width, height int)
+	Toggle() error
 }
 
 type state struct {
@@ -37,14 +37,6 @@ func (s *state) Root() *entry.Dir {
 	return s.root
 }
 
-func (st *state) Get() (entry.Entry, error) {
-	e, err := st.Root().Get(st.pos)
-	if err != nil {
-		return nil, err
-	}
-	return e, err
-}
-
 func (st *state) Up() {
 	if st.pos > 0 {
 		st.pos -= 1
@@ -68,6 +60,24 @@ func (st *state) SetSize(width, height int) {
 	st.adjust()
 }
 
+func (st *state) Toggle() error {
+	e, err := st.Root().Get(st.pos)
+	if err != nil {
+		return err
+	}
+
+	if d, ok := e.(*entry.Dir); ok {
+		if d.IsOpen() {
+			d.Close()
+		} else {
+			if err = d.Open(); err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
 func (st *state) adjust() {
 	if st.pos < st.offset {
 		st.offset = st.pos