Update opencv window and camera tests

lyhopq · Dec 19, 2014 · 6e3bb51 · 6e3bb51
1 parent 3ac4e82
commit 6e3bb51
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/platforms/opencv/camera_driver_test.go b/platforms/opencv/camera_driver_test.go
@@ -16,6 +16,11 @@ func initTestCameraDriver() *CameraDriver {
 	return d
 }
 
+func TestCameraDriver(t *testing.T) {
+	d := initTestCameraDriver()
+	gobot.Assert(t, d.Name(), "bot")
+	gobot.Assert(t, d.Connection(), (gobot.Connection)(nil))
+}
 func TestCameraDriverStart(t *testing.T) {
 	sem := make(chan bool)
 	d := initTestCameraDriver()
@@ -29,13 +34,12 @@ func TestCameraDriverStart(t *testing.T) {
 		t.Errorf("Event \"frame\" was not published")
 	}
 
-}
-func TestCameraDriver(t *testing.T) {
-	d := NewCameraDriver("bot", "")
+	d = NewCameraDriver("bot", "")
 	gobot.Assert(t, len(d.Start()), 0)
 
 	d = NewCameraDriver("bot", true)
 	gobot.Refute(t, len(d.Start()), 0)
+
 }
 
 func TestCameraDriverHalt(t *testing.T) {

diff --git a/platforms/opencv/window_driver_test.go b/platforms/opencv/window_driver_test.go
@@ -11,12 +11,14 @@ import (
 
 func initTestWindowDriver() *WindowDriver {
 	d := NewWindowDriver("bot")
-	d.start = func(w *WindowDriver) {
-		w.window = &testWindow{}
-	}
 	return d
 }
 
+func TestWindowDriver(t *testing.T) {
+	d := initTestWindowDriver()
+	gobot.Assert(t, d.Name(), "bot")
+	gobot.Assert(t, d.Connection(), (gobot.Connection)(nil))
+}
 func TestWindowDriverStart(t *testing.T) {
 	d := initTestWindowDriver()
 	gobot.Assert(t, len(d.Start()), 0)