tests: refactor test interfaces out of implementations and into the t…

…ests where they belong Signed-off-by: deadprogram <[email protected]>
GeekGalaxy · Aug 26, 2016 · a64f56d · a64f56d
1 parent 986cfaa
commit a64f56d
Show file tree

Hide file tree

Showing 15 changed files with 47 additions and 49 deletions.
diff --git a/platforms/audio/audio_adaptor.go b/platforms/audio/audio_adaptor.go
@@ -7,12 +7,8 @@ import (
 	"os"
 	"os/exec"
 	"path"
-
-	"github.com/hybridgroup/gobot"
 )
 
-var _ gobot.Adaptor = (*AudioAdaptor)(nil)
-
 type AudioAdaptor struct {
 	name string
 }

diff --git a/platforms/audio/audio_adaptor_test.go b/platforms/audio/audio_adaptor_test.go
@@ -5,9 +5,12 @@ import (
 	"os/exec"
 	"testing"
 
+	"github.com/hybridgroup/gobot"
 	"github.com/hybridgroup/gobot/gobottest"
 )
 
+var _ gobot.Adaptor = (*AudioAdaptor)(nil)
+
 func TestAudioAdaptor(t *testing.T) {
 	a := NewAudioAdaptor("tester")
 

diff --git a/platforms/audio/audio_driver.go b/platforms/audio/audio_driver.go
@@ -7,8 +7,6 @@ import (
 	"time"
 )
 
-var _ gobot.Driver = (*AudioDriver)(nil)
-
 type AudioDriver struct {
 	name       string
 	connection gobot.Connection

diff --git a/platforms/audio/audio_driver_test.go b/platforms/audio/audio_driver_test.go
@@ -6,9 +6,12 @@ import (
 	"os/exec"
 	"testing"
 
+	"github.com/hybridgroup/gobot"
 	"github.com/hybridgroup/gobot/gobottest"
 )
 
+var _ gobot.Driver = (*AudioDriver)(nil)
+
 func TestAudioDriver(t *testing.T) {
 	d := NewAudioDriver(NewAudioAdaptor("conn"), "dev", "../../examples/laser.mp3")
 

diff --git a/platforms/beaglebone/beaglebone_adaptor.go b/platforms/beaglebone/beaglebone_adaptor.go
@@ -10,21 +10,9 @@ import (
 	"strings"
 
 	"github.com/hybridgroup/gobot"
-	"github.com/hybridgroup/gobot/platforms/gpio"
-	"github.com/hybridgroup/gobot/platforms/i2c"
 	"github.com/hybridgroup/gobot/sysfs"
 )
 
-var _ gobot.Adaptor = (*BeagleboneAdaptor)(nil)
-
-var _ gpio.DigitalReader = (*BeagleboneAdaptor)(nil)
-var _ gpio.DigitalWriter = (*BeagleboneAdaptor)(nil)
-var _ gpio.AnalogReader = (*BeagleboneAdaptor)(nil)
-var _ gpio.PwmWriter = (*BeagleboneAdaptor)(nil)
-var _ gpio.ServoWriter = (*BeagleboneAdaptor)(nil)
-
-var _ i2c.I2c = (*BeagleboneAdaptor)(nil)
-
 var slots = "/sys/devices/bone_capemgr.*"
 var ocp = "/sys/devices/ocp.*"
 var usrLed = "/sys/devices/ocp.3/gpio-leds.8/leds/beaglebone:green:"

diff --git a/platforms/beaglebone/beaglebone_adaptor_test.go b/platforms/beaglebone/beaglebone_adaptor_test.go
@@ -5,10 +5,23 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/hybridgroup/gobot"
 	"github.com/hybridgroup/gobot/gobottest"
+	"github.com/hybridgroup/gobot/platforms/gpio"
+	"github.com/hybridgroup/gobot/platforms/i2c"
 	"github.com/hybridgroup/gobot/sysfs"
 )
 
+var _ gobot.Adaptor = (*BeagleboneAdaptor)(nil)
+
+var _ gpio.DigitalReader = (*BeagleboneAdaptor)(nil)
+var _ gpio.DigitalWriter = (*BeagleboneAdaptor)(nil)
+var _ gpio.AnalogReader = (*BeagleboneAdaptor)(nil)
+var _ gpio.PwmWriter = (*BeagleboneAdaptor)(nil)
+var _ gpio.ServoWriter = (*BeagleboneAdaptor)(nil)
+
+var _ i2c.I2c = (*BeagleboneAdaptor)(nil)
+
 type NullReadWriteCloser struct {
 	contents []byte
 }

diff --git a/platforms/ble/ble_client_adaptor_test.go b/platforms/ble/ble_client_adaptor_test.go
@@ -8,9 +8,6 @@ import (
 
 func initTestBLEClientAdaptor() *BLEClientAdaptor {
 	a := NewBLEClientAdaptor("bot", "D7:99:5A:26:EC:38")
-	// a.connect = func(n *BLEAdaptor) (io.ReadWriteCloser, error) {
-	// 	return &NullReadWriteCloser{}, nil
-	// }
 	return a
 }
 

diff --git a/platforms/chip/chip_adaptor.go b/platforms/chip/chip_adaptor.go
@@ -3,19 +3,9 @@ package chip
 import (
 	"errors"
 
-	"github.com/hybridgroup/gobot"
-	"github.com/hybridgroup/gobot/platforms/gpio"
-	"github.com/hybridgroup/gobot/platforms/i2c"
 	"github.com/hybridgroup/gobot/sysfs"
 )
 
-var _ gobot.Adaptor = (*ChipAdaptor)(nil)
-
-var _ gpio.DigitalReader = (*ChipAdaptor)(nil)
-var _ gpio.DigitalWriter = (*ChipAdaptor)(nil)
-
-var _ i2c.I2c = (*ChipAdaptor)(nil)
-
 type ChipAdaptor struct {
 	name        string
 	digitalPins map[int]sysfs.DigitalPin

diff --git a/platforms/chip/chip_adaptor_test.go b/platforms/chip/chip_adaptor_test.go
@@ -4,10 +4,20 @@ import (
 	"errors"
 	"testing"
 
+	"github.com/hybridgroup/gobot"
 	"github.com/hybridgroup/gobot/gobottest"
+	"github.com/hybridgroup/gobot/platforms/gpio"
+	"github.com/hybridgroup/gobot/platforms/i2c"
 	"github.com/hybridgroup/gobot/sysfs"
 )
 
+var _ gobot.Adaptor = (*ChipAdaptor)(nil)
+
+var _ gpio.DigitalReader = (*ChipAdaptor)(nil)
+var _ gpio.DigitalWriter = (*ChipAdaptor)(nil)
+
+var _ i2c.I2c = (*ChipAdaptor)(nil)
+
 type NullReadWriteCloser struct {
 	contents []byte
 }

diff --git a/platforms/firmata/firmata_adaptor.go b/platforms/firmata/firmata_adaptor.go
@@ -7,21 +7,9 @@ import (
 
 	"github.com/hybridgroup/gobot"
 	"github.com/hybridgroup/gobot/platforms/firmata/client"
-	"github.com/hybridgroup/gobot/platforms/gpio"
-	"github.com/hybridgroup/gobot/platforms/i2c"
 	"github.com/tarm/goserial"
 )
 
-var _ gobot.Adaptor = (*FirmataAdaptor)(nil)
-
-var _ gpio.DigitalReader = (*FirmataAdaptor)(nil)
-var _ gpio.DigitalWriter = (*FirmataAdaptor)(nil)
-var _ gpio.AnalogReader = (*FirmataAdaptor)(nil)
-var _ gpio.PwmWriter = (*FirmataAdaptor)(nil)
-var _ gpio.ServoWriter = (*FirmataAdaptor)(nil)
-
-var _ i2c.I2c = (*FirmataAdaptor)(nil)
-
 type firmataBoard interface {
 	Connect(io.ReadWriteCloser) error
 	Disconnect() error

diff --git a/platforms/firmata/firmata_adaptor_test.go b/platforms/firmata/firmata_adaptor_test.go
@@ -12,8 +12,20 @@ import (
 	"github.com/hybridgroup/gobot"
 	"github.com/hybridgroup/gobot/gobottest"
 	"github.com/hybridgroup/gobot/platforms/firmata/client"
+	"github.com/hybridgroup/gobot/platforms/gpio"
+	"github.com/hybridgroup/gobot/platforms/i2c"
 )
 
+var _ gobot.Adaptor = (*FirmataAdaptor)(nil)
+
+var _ gpio.DigitalReader = (*FirmataAdaptor)(nil)
+var _ gpio.DigitalWriter = (*FirmataAdaptor)(nil)
+var _ gpio.AnalogReader = (*FirmataAdaptor)(nil)
+var _ gpio.PwmWriter = (*FirmataAdaptor)(nil)
+var _ gpio.ServoWriter = (*FirmataAdaptor)(nil)
+
+var _ i2c.I2c = (*FirmataAdaptor)(nil)
+
 type readWriteCloser struct{}
 
 func (readWriteCloser) Write(p []byte) (int, error) {

diff --git a/platforms/joystick/joystick_adaptor.go b/platforms/joystick/joystick_adaptor.go
@@ -4,11 +4,8 @@ import (
 	"errors"
 
 	"github.com/veandco/go-sdl2/sdl"
-	"github.com/hybridgroup/gobot"
 )
 
-var _ gobot.Adaptor = (*JoystickAdaptor)(nil)
-
 type joystick interface {
 	Close()
 	InstanceID() sdl.JoystickID

diff --git a/platforms/joystick/joystick_adaptor_test.go b/platforms/joystick/joystick_adaptor_test.go
@@ -4,9 +4,12 @@ import (
 	"errors"
 	"testing"
 
+	"github.com/hybridgroup/gobot"
 	"github.com/hybridgroup/gobot/gobottest"
 )
 
+var _ gobot.Adaptor = (*JoystickAdaptor)(nil)
+
 func initTestJoystickAdaptor() *JoystickAdaptor {
 	a := NewJoystickAdaptor("bot")
 	a.connect = func(j *JoystickAdaptor) (err error) {

diff --git a/platforms/joystick/joystick_driver.go b/platforms/joystick/joystick_driver.go
@@ -6,12 +6,10 @@ import (
 	"io/ioutil"
 	"time"
 
-	"github.com/veandco/go-sdl2/sdl"
 	"github.com/hybridgroup/gobot"
+	"github.com/veandco/go-sdl2/sdl"
 )
 
-var _ gobot.Driver = (*JoystickDriver)(nil)
-
 // JoystickDriver represents a joystick
 type JoystickDriver struct {
 	name       string

diff --git a/platforms/joystick/joystick_driver_test.go b/platforms/joystick/joystick_driver_test.go
@@ -9,6 +9,8 @@ import (
 	"github.com/veandco/go-sdl2/sdl"
 )
 
+var _ gobot.Driver = (*JoystickDriver)(nil)
+
 func initTestJoystickDriver() *JoystickDriver {
 	a := NewJoystickAdaptor("bot")
 	a.connect = func(j *JoystickAdaptor) (err error) {