Skip to content

Commit 5723da3

Browse files
committed
Fixed tests and ineff errors
1 parent d15541e commit 5723da3

File tree

5 files changed

+20
-8
lines changed

5 files changed

+20
-8
lines changed

bridge.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ func (b *Bridge) GetConfig() (*Config, error) {
5252
var config *Config
5353

5454
url, err := b.getAPIPath("/config/")
55+
if err != nil {
56+
return nil, err
57+
}
58+
5559
res, err := get(url)
5660
if err != nil {
5761
return nil, err
@@ -680,6 +684,9 @@ func (b *Bridge) GetResourcelink(i int) (*Resourcelink, error) {
680684
}
681685

682686
url, err := b.getAPIPath("/resourcelinks/", strconv.Itoa(i))
687+
if err != nil {
688+
return nil, err
689+
}
683690

684691
res, err := get(url)
685692
if err != nil {
@@ -1480,6 +1487,10 @@ func (b *Bridge) GetNewSensors() (*NewSensor, error) {
14801487
}
14811488

14821489
err = unmarshal(res, &n)
1490+
if err != nil {
1491+
return nil, err
1492+
}
1493+
14831494
sensors := make([]*Sensor, 0, len(n))
14841495

14851496
for i, l := range n {

config_test.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,5 +103,12 @@ func TestDeleteUser(t *testing.T) {
103103
t.Logf("Deleted user '%s' (%s)", user.Name, user.Username)
104104
}
105105
}
106+
}
106107

108+
func TestGetFullState(t *testing.T) {
109+
b := huego.New(hostname, username)
110+
_, err := b.GetFullState()
111+
if err != nil {
112+
t.Fatal(err)
113+
}
107114
}

group_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ func TestSetGroupXy(t *testing.T) {
244244
if err != nil {
245245
t.Fatal(err)
246246
}
247-
t.Logf("Xy of group %d set to %d", group.ID, group.State.Xy)
247+
t.Logf("Xy of group %d set to %v", group.ID, group.State.Xy)
248248
}
249249

250250
func TestSetGroupCt(t *testing.T) {

huego.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ func DiscoverAll() ([]Bridge, error) {
209209
// Discover uses DiscoverAll() but only returns the first instance in the array of bridges if any.
210210
func Discover() (*Bridge, error) {
211211

212-
var b *Bridge
212+
b := &Bridge{}
213213

214214
bridges, err := DiscoverAll()
215215
if err != nil {

huego_test.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@ func init() {
1818
username = os.Getenv("HUE_USERNAME")
1919
}
2020

21-
func TestDiscoverAndLoginLazy(t *testing.T) {
22-
b, _ := huego.Discover()
23-
b = b.Login(username)
24-
t.Logf("Successfully logged in to bridge")
25-
}
26-
2721
func TestDiscoverAndLogin(t *testing.T) {
2822
bridge, err := huego.Discover()
2923
if err != nil {

0 commit comments

Comments
 (0)