go-sylixos/elvish
3
0
Fork 0
mirror of https://github.com/go-sylixos/elvish.git synced 2024-12-14 19:27:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

eval: Test return values in eval_test.go.

Browse Source
This commit is contained in:
Qi Xiao 2016-09-15 20:31:20 +02:00
parent 0b854da23e
commit 1e07108639
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
eval/compile_op.go
View File

@ -287,6 +287,9 @@ func (cp *compiler) form(n *parse.Form) OpFunc {
redirOp.Exec(ec)
}
// In case some arguments returned false.
ec.predReturn = true
ec.begin, ec.end = begin, end
headFn.Call(ec, args, convertedOpts)
}
@ -312,6 +315,7 @@ func (cp *compiler) control(n *parse.Control) OpFunc {
if elseOp.Func != nil {
elseOp.Exec(ec)
}
ec.predReturn = true
}
case parse.TryControl:
Logger.Println("compiling a try control")
@ -362,6 +366,7 @@ func (cp *compiler) control(n *parse.Control) OpFunc {
if e != nil {
throw(e)
}
ec.predReturn = true
}
case parse.WhileControl:
condOp := cp.chunkOp(n.Condition)
@ -382,6 +387,7 @@ func (cp *compiler) control(n *parse.Control) OpFunc {
throw(ex)
}
}
ec.predReturn = true
}
case parse.ForControl:
iteratorOp, restOp := cp.lvaluesOp(n.Iterator)
@ -409,6 +415,7 @@ func (cp *compiler) control(n *parse.Control) OpFunc {
throw(ex)
}
}
ec.predReturn = true
}
case parse.BeginControl:
return cp.chunk(n.Body)

27
eval/eval_test.go
View File

@ -24,6 +24,7 @@ var errAny = errors.New("")
type more struct {
wantBytesOut []byte
wantError error
wantFalse bool
}
var nomore more
@ -92,6 +93,10 @@ var evalTests = []struct {
// begin/end
{"begin; put lorem; put ipsum; end", strs("lorem", "ipsum"), nomore},
// Predicates.
{"false", strs(), more{wantFalse: true}},
{"true | false | true", strs(), more{wantFalse: true}},
// Redirections.
{"f=`mktemp elvXXXXXX`; echo 233 > $f; cat < $f; rm $f", strs(),
more{wantBytesOut: []byte("233\n")}},
@ -253,7 +258,7 @@ func mustParse(t *testing.T, name, text string) *parse.Chunk {
return n
}
func evalAndCollect(t *testing.T, texts []string, chsize int) ([]Value, []byte, error) {
func evalAndCollect(t *testing.T, texts []string, chsize int) ([]Value, []byte, bool, error) {
name := "<eval test>"
ev := NewEvaler(nil)
@ -276,7 +281,8 @@ func evalAndCollect(t *testing.T, texts []string, chsize int) ([]Value, []byte,
// Channel output
outs := []Value{}
// Exit. Only the exit of the last text is saved.
// Boolean return and error. Only those of the last text is saved.
var ret bool
var ex error
for _, text := range texts {
@ -297,21 +303,21 @@ func evalAndCollect(t *testing.T, texts []string, chsize int) ([]Value, []byte,
{File: os.Stderr},
}
_, ex = ev.Eval(name, text, n, ports)
ret, ex = ev.Eval(name, text, n, ports)
close(outCh)
<-outDone
}
pw.Close()
<-bytesDone
return outs, outBytes, ex
return outs, outBytes, ret, ex
}
func TestEval(t *testing.T) {
for _, tt := range evalTests {
// fmt.Printf("eval %q\n", tt.text)
out, bytesOut, err := evalAndCollect(t, []string{tt.text}, len(tt.wantOut))
out, bytesOut, ret, err := evalAndCollect(t, []string{tt.text}, len(tt.wantOut))
good := true
errorf := func(format string, args ...interface{}) {
@ -322,16 +328,19 @@ func TestEval(t *testing.T) {
t.Errorf(format, args...)
}
if !reflect.DeepEqual(tt.wantOut, out) {
errorf("got out=%v, want %v", out, tt.wantOut)
}
if string(bytesOut) != string(tt.wantBytesOut) {
errorf("got bytesOut=%q, want %q", bytesOut, tt.wantBytesOut)
}
if ret != !tt.wantFalse {
errorf("got ret=%v, want %v", ret, !tt.wantFalse)
}
// Check error. We accept errAny as a "wildcard" for all non-nil errors.
if !(tt.wantError == errAny && err != nil) && !reflect.DeepEqual(tt.wantError, err) {
errorf("got err=%v, want %v", err, tt.wantError)
}
if !reflect.DeepEqual(tt.wantOut, out) {
errorf("got out=%v, want %v", out, tt.wantOut)
}
if !good {
t.Errorf("--------------")
}
@ -340,7 +349,7 @@ func TestEval(t *testing.T) {
func TestMultipleEval(t *testing.T) {
texts := []string{"x=hello", "put $x"}
outs, _, err := evalAndCollect(t, texts, 1)
outs, _, _, err := evalAndCollect(t, texts, 1)
wanted := strs("hello")
if err != nil {
t.Errorf("eval %s => %v, want nil", texts, err)