core: update OpenCV platform to simply return error

Signed-off-by: deadprogram <ron@hybridgroup.com>
This commit is contained in:
deadprogram 2016-11-07 20:06:55 +01:00
parent 1ec2497c64
commit ed50f7fef7
3 changed files with 8 additions and 8 deletions

View File

@ -28,7 +28,7 @@ func TestCameraDriver(t *testing.T) {
func TestCameraDriverStart(t *testing.T) { func TestCameraDriverStart(t *testing.T) {
sem := make(chan bool) sem := make(chan bool)
d := initTestCameraDriver() d := initTestCameraDriver()
gobottest.Assert(t, len(d.Start()), 0) gobottest.Assert(t, d.Start(), nil)
d.On(d.Event("frame"), func(data interface{}) { d.On(d.Event("frame"), func(data interface{}) {
sem <- true sem <- true
}) })
@ -39,13 +39,13 @@ func TestCameraDriverStart(t *testing.T) {
} }
d = NewCameraDriver("") d = NewCameraDriver("")
gobottest.Assert(t, len(d.Start()), 0) gobottest.Assert(t, d.Start(), nil)
d = NewCameraDriver(true) d = NewCameraDriver(true)
gobottest.Refute(t, len(d.Start()), 0) gobottest.Refute(t, d.Start(), nil)
} }
func TestCameraDriverHalt(t *testing.T) { func TestCameraDriverHalt(t *testing.T) {
d := initTestCameraDriver() d := initTestCameraDriver()
gobottest.Assert(t, len(d.Halt()), 0) gobottest.Assert(t, d.Halt(), nil)
} }

View File

@ -31,14 +31,14 @@ func (w *WindowDriver) SetName(n string) { w.name = n }
func (w *WindowDriver) Connection() gobot.Connection { return nil } func (w *WindowDriver) Connection() gobot.Connection { return nil }
// Start starts window thread and driver // Start starts window thread and driver
func (w *WindowDriver) Start() (errs []error) { func (w *WindowDriver) Start() (err error) {
cv.StartWindowThread() cv.StartWindowThread()
w.start(w) w.start(w)
return return
} }
// Halt returns true if camera is halted successfully // Halt returns true if camera is halted successfully
func (w *WindowDriver) Halt() (errs []error) { return } func (w *WindowDriver) Halt() (err error) { return }
// ShowImage displays image in window // ShowImage displays image in window
func (w *WindowDriver) ShowImage(image *cv.IplImage) { func (w *WindowDriver) ShowImage(image *cv.IplImage) {

View File

@ -25,12 +25,12 @@ func TestWindowDriver(t *testing.T) {
func TestWindowDriverStart(t *testing.T) { func TestWindowDriverStart(t *testing.T) {
d := initTestWindowDriver() d := initTestWindowDriver()
gobottest.Assert(t, len(d.Start()), 0) gobottest.Assert(t, d.Start(), nil)
} }
func TestWindowDriverHalt(t *testing.T) { func TestWindowDriverHalt(t *testing.T) {
d := initTestWindowDriver() d := initTestWindowDriver()
gobottest.Assert(t, len(d.Halt()), 0) gobottest.Assert(t, d.Halt(), nil)
} }
func TestWindowDriverShowImage(t *testing.T) { func TestWindowDriverShowImage(t *testing.T) {