Moving files to keep only testd files in packages

viktomas · viktomas · commit 7074786f1183 · 2017-01-07T22:48:35.000+11:00
diff --git a/core/processor.go b/core/processor.go
@@ -19,6 +19,7 @@ func StartProcessing(
 	for {
 		command, more := <-commands
 		if !more {
+			close(states)
 			break
 		}
 		newState, err := command.Execute(state)
diff --git a/core/processor_test.go b/core/processor_test.go
@@ -47,6 +47,10 @@ func TestStartProcessing(t *testing.T) {
 	if state.Selected != 1 {
 		t.Error("StartProcessing didn't process command")
 	}
+	state, ok := <-states
+	if ok {
+		t.Error("forgot to close states channel")
+	}
 }
 
 func TestDoesntProcessInvalidCommand(t *testing.T) {
diff --git a/godu.go b/godu.go
@@ -9,7 +9,6 @@ import (
 
 	"github.com/gdamore/tcell"
 	"github.com/viktomas/godu/core"
-	"github.com/viktomas/godu/interactive"
 )
 
 func main() {
@@ -26,8 +25,8 @@ func main() {
 	var wg sync.WaitGroup
 	wg.Add(3)
 	go core.StartProcessing(&tree, *limit*core.MEGABYTE, commands, states, &wg)
-	go interactive.InteractiveTree(s, states, &wg)
-	go interactive.ParseCommand(s, commands, &wg)
+	go InteractiveTree(s, states, &wg)
+	go ParseCommand(s, commands, &wg)
 	wg.Wait()
 	s.Fini()
 }
diff --git a/interactive/interactive_test.go b/interactive/interactive_test.go
diff --git a/parser.go b/parser.go
@@ -1,4 +1,4 @@
-package interactive
+package main
 
 import (
 	"sync"
diff --git a/state_model.go b/state_model.go
@@ -1,8 +1,9 @@
-package interactive
+package main
 
 import (
 	"github.com/gdamore/tcell"
 	"github.com/viktomas/godu/core"
+	"github.com/viktomas/godu/interactive"
 )
 
 type VisualState struct {
@@ -12,7 +13,7 @@ type VisualState struct {
 }
 
 func NewVisualState(state core.State) VisualState {
-	lines := ReportTree(state.Folder)
+	lines := interactive.ReportTree(state.Folder)
 	folders := make([][]rune, len(lines))
 	xbound := 0
 	ybound := len(folders)
diff --git a/state_presenter.go b/state_presenter.go
@@ -1,4 +1,4 @@
-package interactive
+package main
 
 import (
 	"sync"

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ func StartProcessing(`
`19`	`19`	`for {`
`20`	`20`	`command, more := <-commands`
`21`	`21`	`if !more {`
	`22`	`+ close(states)`
`22`	`23`	`break`
`23`	`24`	`}`
`24`	`25`	`newState, err := command.Execute(state)`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,10 @@ func TestStartProcessing(t *testing.T) {`
`47`	`47`	`if state.Selected != 1 {`
`48`	`48`	`t.Error("StartProcessing didn't process command")`
`49`	`49`	`}`
	`50`	`+ state, ok := <-states`
	`51`	`+ if ok {`
	`52`	`+ t.Error("forgot to close states channel")`
	`53`	`+ }`
`50`	`54`	`}`
`51`	`55`
`52`	`56`	`func TestDoesntProcessInvalidCommand(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package interactive`
	`1`	`+package main`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"sync"`