ble: use new improved default namer to avoid API conflicts

Signed-off-by: deadprogram <[email protected]>
hnw · Feb 2, 2017 · ddb889a · ddb889a
1 parent 3be7c49
commit ddb889a
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 8 deletions.
diff --git a/platforms/ble/battery_driver.go b/platforms/ble/battery_driver.go
@@ -16,7 +16,7 @@ type BatteryDriver struct {
 // NewBatteryDriver creates a BatteryDriver
 func NewBatteryDriver(a *ClientAdaptor) *BatteryDriver {
 	n := &BatteryDriver{
-		name:       "Battery",
+		name:       gobot.DefaultName("Battery"),
 		connection: a,
 		Eventer:    gobot.NewEventer(),
 	}

diff --git a/platforms/ble/battery_driver_test.go b/platforms/ble/battery_driver_test.go
@@ -1,6 +1,7 @@
 package ble
 
 import (
+	"strings"
 	"testing"
 
 	"gobot.io/x/gobot"
@@ -16,5 +17,5 @@ func initTestBatteryDriver() *BatteryDriver {
 
 func TestBatteryDriver(t *testing.T) {
 	d := initTestBatteryDriver()
-	gobottest.Assert(t, d.Name(), "Battery")
+	gobottest.Assert(t, strings.HasPrefix(d.Name(), "Battery"), true)
 }
diff --git a/platforms/ble/ble_client_adaptor.go b/platforms/ble/ble_client_adaptor.go
@@ -6,6 +6,8 @@ import (
 	"strings"
 	"time"
 
+	"gobot.io/x/gobot"
+
 	blelib "github.com/currantlabs/ble"
 	"github.com/pkg/errors"
 )
@@ -32,7 +34,7 @@ type ClientAdaptor struct {
 // NewClientAdaptor returns a new ClientAdaptor given an address or peripheral name
 func NewClientAdaptor(address string) *ClientAdaptor {
 	return &ClientAdaptor{
-		name:      "BLECLient",
+		name:      gobot.DefaultName("BLEClient"),
 		address:   address,
 		connected: false,
 	}

diff --git a/platforms/ble/ble_client_adaptor_test.go b/platforms/ble/ble_client_adaptor_test.go
@@ -1,6 +1,7 @@
 package ble
 
 import (
+	"strings"
 	"testing"
 
 	"gobot.io/x/gobot"
@@ -17,7 +18,7 @@ func initTestBLEClientAdaptor() *ClientAdaptor {
 func TestBLEClientAdaptor(t *testing.T) {
 	a := NewClientAdaptor("D7:99:5A:26:EC:38")
 	gobottest.Assert(t, a.Address(), "D7:99:5A:26:EC:38")
-	gobottest.Assert(t, a.Name(), "BLECLient")
+	gobottest.Assert(t, strings.HasPrefix(a.Name(), "BLEClient"), true)
 }
 
 func TestBLEClientAdaptorName(t *testing.T) {

diff --git a/platforms/ble/device_information_driver.go b/platforms/ble/device_information_driver.go
@@ -16,7 +16,7 @@ type DeviceInformationDriver struct {
 // NewDeviceInformationDriver creates a DeviceInformationDriver
 func NewDeviceInformationDriver(a *ClientAdaptor) *DeviceInformationDriver {
 	n := &DeviceInformationDriver{
-		name:       "DeviceInformation",
+		name:       gobot.DefaultName("DeviceInformation"),
 		connection: a,
 		Eventer:    gobot.NewEventer(),
 	}

diff --git a/platforms/ble/device_information_driver_test.go b/platforms/ble/device_information_driver_test.go
@@ -1,6 +1,7 @@
 package ble
 
 import (
+	"strings"
 	"testing"
 
 	"gobot.io/x/gobot"
@@ -16,5 +17,5 @@ func initTestDeviceInformationDriver() *DeviceInformationDriver {
 
 func TestDeviceInformationDriver(t *testing.T) {
 	d := initTestDeviceInformationDriver()
-	gobottest.Assert(t, d.Name(), "DeviceInformation")
+	gobottest.Assert(t, strings.HasPrefix(d.Name(), "DeviceInformation"), true)
 }
diff --git a/platforms/ble/generic_access_driver.go b/platforms/ble/generic_access_driver.go
@@ -17,7 +17,7 @@ type GenericAccessDriver struct {
 // NewGenericAccessDriver creates a GenericAccessDriver
 func NewGenericAccessDriver(a *ClientAdaptor) *GenericAccessDriver {
 	n := &GenericAccessDriver{
-		name:       "GenericAccess",
+		name:       gobot.DefaultName("GenericAccess"),
 		connection: a,
 		Eventer:    gobot.NewEventer(),
 	}

diff --git a/platforms/ble/generic_access_driver_test.go b/platforms/ble/generic_access_driver_test.go
@@ -1,6 +1,7 @@
 package ble
 
 import (
+	"strings"
 	"testing"
 
 	"gobot.io/x/gobot"
@@ -16,5 +17,5 @@ func initTestGenericAccessDriver() *GenericAccessDriver {
 
 func TestGenericAccessDriver(t *testing.T) {
 	d := initTestGenericAccessDriver()
-	gobottest.Assert(t, d.Name(), "GenericAccess")
+	gobottest.Assert(t, strings.HasPrefix(d.Name(), "GenericAccess"), true)
 }