golang/delve
1
0
Fork 0
mirror of https://github.com/go-delve/delve.git synced 2025-10-31 02:36:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

terminal: Refactor Term/FakeTerm

Browse Source
This commit is contained in:
Derek Parker
2016-02-27 15:02:55 -08:00
parent 9e588fef72
commit 16f30d0738
2 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
terminal/command_test.go
View File

@ -16,19 +16,17 @@ import (
)
type FakeTerminal struct {
t testing.TB
client service.Client
cmds *Commands
term *Term
*Term
t testing.TB
}
func (term *FakeTerminal) Exec(cmdstr string) (outstr string, err error) {
func (ft *FakeTerminal) Exec(cmdstr string) (outstr string, err error) {
cmdstr, args := parseCommand(cmdstr)
cmd := term.cmds.Find(cmdstr)
cmd := ft.cmds.Find(cmdstr)
outfh, err := ioutil.TempFile("", "cmdtestout")
if err != nil {
term.t.Fatalf("could not create temporary file: %v", err)
ft.t.Fatalf("could not create temporary file: %v", err)
}
stdout, stderr := os.Stdout, os.Stderr
@ -38,19 +36,19 @@ func (term *FakeTerminal) Exec(cmdstr string) (outstr string, err error) {
outfh.Close()
outbs, err1 := ioutil.ReadFile(outfh.Name())
if err1 != nil {
term.t.Fatalf("could not read temporary output file: %v", err)
ft.t.Fatalf("could not read temporary output file: %v", err)
}
outstr = string(outbs)
os.Remove(outfh.Name())
}()
err = cmd(term.term, args)
err = cmd(ft.Term, args)
return
}
func (term *FakeTerminal) MustExec(cmdstr string) string {
outstr, err := term.Exec(cmdstr)
func (ft *FakeTerminal) MustExec(cmdstr string) string {
outstr, err := ft.Exec(cmdstr)
if err != nil {
term.t.Fatalf("Error executing <%s>: %v", cmdstr, err)
ft.t.Fatalf("Error executing <%s>: %v", cmdstr, err)
}
return outstr
}
@ -72,7 +70,11 @@ func withTestTerminal(name string, t testing.TB, fn func(*FakeTerminal)) {
defer func() {
client.Detach(true)
}()
fn(&FakeTerminal{t, client, DebugCommands(client), New(client, nil)})
ft := &FakeTerminal{
t: t,
Term: New(client, nil),
}
fn(ft)
}
func TestCommandDefault(t *testing.T) {