add test for state

Author: shota3506

main.go

@@ -123,28 +123,28 @@ func handleCommand(s tcell.Screen, commandChan chan commands.Command) {
 
 func handleChange(s tcell.Screen, stateChan chan state.State) {
 	for {
-		state, ok := <-stateChan
+		st, ok := <-stateChan
 		if !ok {
 			return
 		}
-		render(s, state)
+		render(s, st)
 	}
 }
 
 func start(s tcell.Screen, root *entry.Dir, commandChan chan commands.Command, stateChan chan state.State) {
 	width, height := s.Size()
-	state := state.NewState(root, width, height-1)
-	stateChan <- state
+	var st state.State = state.NewState(root, width, height-1)
+	stateChan <- st
 
 	for {
 		command, ok := <-commandChan
 		if !ok {
 			close(stateChan)
 			return
 		}
-		if nextState, err := command.Do(state); err == nil {
-			state = nextState
-			stateChan <- state
+		if next, err := command.Do(st); err == nil {
+			st = next
+			stateChan <- st
 		}
 	}
 }

state/state.go

@@ -23,7 +23,7 @@ type state struct {
 	height int
 }
 
-func NewState(root *entry.Dir, width, height int) State {
+func NewState(root *entry.Dir, width, height int) *state {
 	return &state{
 		root:   root,
 		pos:    0,
@@ -88,10 +88,12 @@ func (st *state) adjust() {
 }
 
 func (st *state) View() views.CellModel {
-	items := []*struct {
+	type item struct {
 		Name  string
 		Depth int
-	}{}
+	}
+
+	items := []*item{}
 	_ = st.Root().Walk(func(e entry.Entry) error {
 		name := e.String()
 		if e, ok := e.(*entry.Dir); ok {
@@ -102,18 +104,12 @@ func (st *state) View() views.CellModel {
 			}
 		}
 
-		items = append(items, &struct {
-			Name  string
-			Depth int
-		}{
-			Name:  name,
-			Depth: e.Depth(),
-		})
+		items = append(items, &item{Name: name, Depth: e.Depth()})
 		return nil
 	})
 
 	m := map[int]interface{}{}
-	lines := []*ViewLine{}
+	lines := []*viewLine{}
 	for i := len(items) - 1; i >= 0; i-- {
 		prefix := ""
 		for j := 0; j < items[i].Depth-1; j++ {
@@ -136,7 +132,7 @@ func (st *state) View() views.CellModel {
 			style = style.Reverse(true)
 		}
 
-		lines = append([]*ViewLine{{prefix + items[i].Name, style}}, lines...)
+		lines = append([]*viewLine{{prefix + items[i].Name, style}}, lines...)
 		m[items[i].Depth] = struct{}{}
 		if i < len(items)-1 {
 			for depth := items[i].Depth + 1; depth <= items[i+1].Depth; depth++ {
@@ -153,7 +149,7 @@ func (st *state) View() views.CellModel {
 }
 
 type viewState struct {
-	lines  []*ViewLine
+	lines  []*viewLine
 	width  int
 	height int
 }
@@ -183,15 +179,15 @@ func (v *viewState) SetCursor(int, int) {}
 
 func (v *viewState) MoveCursor(offx, offy int) {}
 
-type ViewLine struct {
+type viewLine struct {
 	text  string
 	style tcell.Style
 }
 
-func (l *ViewLine) String() string {
+func (l *viewLine) String() string {
 	return l.text
 }
 
-func (l *ViewLine) Style() tcell.Style {
+func (l *viewLine) Style() tcell.Style {
 	return l.style
 }

state/state_test.go

@@ -0,0 +1,130 @@
+package state
+
+import (
+	"testing"
+
+	"github.com/shota3506/gtree/entry"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+/*
+testdata
+├── a
+│   ├── b
+│   │   ├── sample4.txt
+│   │   └── sample5.txt
+│   ├── c
+│   │   └── sample6.txt
+│   └── sample3.txt
+├── sample1.txt
+└── sample2.txt
+*/
+
+func TestStateUpAndDown(t *testing.T) {
+	root, err := entry.NewRoot("testdata", false)
+	require.NoError(t, err)
+
+	st := NewState(root, 100, 100)
+	require.Equal(t, 4, st.Root().Size())
+	require.Equal(t, 0, st.offset)
+	require.Equal(t, 0, st.pos)
+
+	st.Down()
+	assert.Equal(t, 1, st.pos)
+	st.Down()
+	assert.Equal(t, 2, st.pos)
+	st.Down()
+	assert.Equal(t, 3, st.pos)
+	st.Down()
+	assert.Equal(t, 3, st.pos)
+
+	st.Up()
+	assert.Equal(t, 2, st.pos)
+	st.Up()
+	assert.Equal(t, 1, st.pos)
+	st.Up()
+	assert.Equal(t, 0, st.pos)
+	st.Up()
+	assert.Equal(t, 0, st.pos)
+}
+
+func TestStateUpAndDownWithOffsetAdjustment(t *testing.T) {
+	root, err := entry.NewRoot("testdata", false)
+	require.NoError(t, err)
+
+	st := NewState(root, 100, 2)
+	require.Equal(t, 4, st.Root().Size())
+	require.Equal(t, 0, st.offset)
+	require.Equal(t, 0, st.pos)
+
+	st.Down()
+	assert.Equal(t, 1, st.pos)
+	assert.Equal(t, 0, st.offset)
+	st.Down()
+	assert.Equal(t, 2, st.pos)
+	assert.Equal(t, 1, st.offset)
+	st.Down()
+	assert.Equal(t, 3, st.pos)
+	assert.Equal(t, 2, st.offset)
+
+	st.Up()
+	assert.Equal(t, 2, st.pos)
+	assert.Equal(t, 2, st.offset)
+	st.Up()
+	assert.Equal(t, 1, st.pos)
+	assert.Equal(t, 1, st.offset)
+	st.Up()
+	assert.Equal(t, 0, st.pos)
+	assert.Equal(t, 0, st.offset)
+}
+
+func TestStateSetSize(t *testing.T) {
+	root, err := entry.NewRoot("testdata", false)
+	require.NoError(t, err)
+
+	st := NewState(root, 100, 200)
+	require.Equal(t, 100, st.width)
+	require.Equal(t, 200, st.height)
+
+	st.SetSize(10, 20)
+	require.Equal(t, 10, st.width)
+	require.Equal(t, 20, st.height)
+}
+
+func TestStateSetSizeWithOffsetAdjustment(t *testing.T) {
+	root, err := entry.NewRoot("testdata", false)
+	require.NoError(t, err)
+
+	st := NewState(root, 100, 200)
+	st.Down()
+	st.Down()
+	st.Down()
+
+	assert.Equal(t, 0, st.offset)
+	st.SetSize(100, 2)
+	assert.Equal(t, 2, st.offset)
+}
+
+func TestStateToggle(t *testing.T) {
+	root, err := entry.NewRoot("testdata", false)
+	require.NoError(t, err)
+
+	st := NewState(root, 100, 100)
+	require.Equal(t, 4, st.Root().Size())
+	st.Down()
+	require.Equal(t, 1, st.pos)
+
+	e, err := st.Root().Get(st.pos)
+	require.NoError(t, err)
+	d, ok := e.(*entry.Dir)
+	require.True(t, ok)
+
+	err = st.Toggle() // open
+	require.NoError(t, err)
+	assert.True(t, d.IsOpen())
+
+	err = st.Toggle() // close
+	require.NoError(t, err)
+	assert.False(t, d.IsOpen())
+}