Skip to content

GitLab

Commit 5e30fd47 authored by Matt Bell's avatar Matt Bell Committed by Juan Batiz-Benet
Browse files
Options

commands: Updated Command tests for new Response API

parent 58597eb0
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 32 deletions
command_test.go
View file @ 5e30fd47
...@@ -8,60 +8,58 @@ func TestOptionValidation(t *testing.T) { ...@@ -8,60 +8,58 @@ func TestOptionValidation(t *testing.T) {
Option{ []string{ "b", "beep" }, Int }, Option{ []string{ "b", "beep" }, Int },
Option{ []string{ "B", "boop" }, String }, Option{ []string{ "B", "boop" }, String },
}, },
f: func(req *Request) (interface{}, error) { f: func(req *Request, res *Response) {},
return nil, nil
},
} }
req := NewRequest() req := NewRequest()
req.options["foo"] = 5 req.options["foo"] = 5
_, err := cmd.Call(nil, req) res := cmd.Call(nil, req)
if err == nil { if res.Error == nil {
t.Error("Should have failed (unrecognized command)") t.Error("Should have failed (unrecognized command)")
} }
req = NewRequest() req = NewRequest()
req.options["beep"] = 5 req.options["beep"] = 5
req.options["b"] = 10 req.options["b"] = 10
_, err = cmd.Call(nil, req) res = cmd.Call(nil, req)
if err == nil { if res.Error == nil {
t.Error("Should have failed (duplicate options)") t.Error("Should have failed (duplicate options)")
} }
req = NewRequest() req = NewRequest()
req.options["beep"] = "foo" req.options["beep"] = "foo"
_, err = cmd.Call(nil, req) res = cmd.Call(nil, req)
if err == nil { if res.Error == nil {
t.Error("Should have failed (incorrect type)") t.Error("Should have failed (incorrect type)")
} }
req = NewRequest() req = NewRequest()
req.options["beep"] = 5 req.options["beep"] = 5
_, err = cmd.Call(nil, req) res = cmd.Call(nil, req)
if err != nil { if res.Error != nil {
t.Error("Should have passed") t.Error("Should have passed")
} }
req = NewRequest() req = NewRequest()
req.options["beep"] = 5 req.options["beep"] = 5
req.options["boop"] = "test" req.options["boop"] = "test"
_, err = cmd.Call(nil, req) res = cmd.Call(nil, req)
if err != nil { if res.Error != nil {
t.Error("Should have passed") t.Error("Should have passed")
} }
req = NewRequest() req = NewRequest()
req.options["b"] = 5 req.options["b"] = 5
req.options["B"] = "test" req.options["B"] = "test"
_, err = cmd.Call(nil, req) res = cmd.Call(nil, req)
if err != nil { if res.Error != nil {
t.Error("Should have passed") t.Error("Should have passed")
} }
req = NewRequest() req = NewRequest()
req.options["enc"] = "json" req.options["enc"] = "json"
_, err = cmd.Call(nil, req) res = cmd.Call(nil, req)
if err != nil { if res.Error != nil {
t.Error("Should have passed") t.Error("Should have passed")
} }
} }
...@@ -72,45 +70,35 @@ func TestRegistration(t *testing.T) { ...@@ -72,45 +70,35 @@ func TestRegistration(t *testing.T) {
Options: []Option{ Options: []Option{
Option{ []string{ "beep" }, Int }, Option{ []string{ "beep" }, Int },
}, },
f: func(req *Request) (interface{}, error) { f: func(req *Request, res *Response) {},
return nil, nil
},
}, },
&Command{ &Command{
Options: []Option{ Options: []Option{
Option{ []string{ "boop" }, Int }, Option{ []string{ "boop" }, Int },
}, },
f: func(req *Request) (interface{}, error) { f: func(req *Request, res *Response) {},
return nil, nil
},
}, },
&Command{ &Command{
Options: []Option{ Options: []Option{
Option{ []string{ "boop" }, String }, Option{ []string{ "boop" }, String },
}, },
f: func(req *Request) (interface{}, error) { f: func(req *Request, res *Response) {},
return nil, nil
},
}, },
&Command{ &Command{
Options: []Option{ Options: []Option{
Option{ []string{ "bop" }, String }, Option{ []string{ "bop" }, String },
}, },
f: func(req *Request) (interface{}, error) { f: func(req *Request, res *Response) {},
return nil, nil
},
}, },
&Command{ &Command{
Options: []Option{ Options: []Option{
Option{ []string{ "enc" }, String }, Option{ []string{ "enc" }, String },
}, },
f: func(req *Request) (interface{}, error) { f: func(req *Request, res *Response) {},
return nil, nil
},
}, },
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment