Merge branch 'http_mock'

Author: amimof

bridge.go

@@ -186,9 +186,9 @@ func (b *Bridge) DeleteUser(n string) error {
 }
 
 // GetFullState returns the entire bridge configuration.
-func (b *Bridge) GetFullState() (*Datastore, error) {
+func (b *Bridge) GetFullState() (map[string]interface{}, error) {
 
-	var ds *Datastore
+	var n map[string]interface{}
 
 	url, err := b.getAPIPath("/")
 	if err != nil {
@@ -200,12 +200,12 @@ func (b *Bridge) GetFullState() (*Datastore, error) {
 		return nil, err
 	}
 
-	err = unmarshal(res, &ds)
+	err = unmarshal(res, &n)
 	if err != nil {
 		return nil, err
 	}
 
-	return ds, nil
+	return n, nil
 }
 
 /*
@@ -229,7 +229,6 @@ func (b *Bridge) GetGroups() ([]Group, error) {
 		return nil, err
 	}
 
-	//err = unmarshal(res, &m)
 	err = unmarshal(res, &m)
 	if err != nil {
 		return nil, err
@@ -562,7 +561,7 @@ func (b *Bridge) GetNewLights() (*NewLight, error) {
 		if k == "lastscan" {
 			lastscan = n[k].(string)
 		} else {
-			lights = append(lights, n[k].(string))
+			lights = append(lights, k)
 		}
 	}
 
@@ -1486,10 +1485,7 @@ func (b *Bridge) GetNewSensors() (*NewSensor, error) {
 		return nil, err
 	}
 
-	err = unmarshal(res, &n)
-	if err != nil {
-		return nil, err
-	}
+	_ = unmarshal(res, &n)
 
 	sensors := make([]*Sensor, 0, len(n))
 

bridge_test.go

@@ -28,3 +28,15 @@ func TestLoginUnauthorized(t *testing.T) {
 	t.Logf("Bridge: %s, Username: %s", b.Host, b.User)
 	t.Log("User logged in and authenticated which isn't what we want")
 }
+
+func TestUpdateBridgeConfig(t *testing.T) {
+	b := huego.New(hostname, username)
+	c, err := b.GetConfig()
+	if err != nil {
+		t.Fatal(err)
+	}
+	_, err = b.UpdateConfig(c)
+	if err != nil {
+		t.Fatal(err)
+	}
+}

capabilities.go

@@ -2,14 +2,14 @@ package huego
 
 // Capabilities holds a combined model of resource capabilities on the bridge: https://developers.meethue.com/documentation/lights-api
 type Capabilities struct {
-	Groups        *Capability `json:"groups,omitempty"`
-	Lights        *Capability `json:"lights,omitempty"`
-	Resourcelinks *Capability `json:"resourcelinks,omitempty"`
-	Schedules     *Capability `json:"schedules,omitempty"`
-	Rules         *Capability `json:"rules,omitempty"`
-	Scenes        *Capability `json:"scenes,omitempty"`
-	Sensors       *Capability `json:"sensors,omitempty"`
-	Streaming     *Capability `json:"streaming,omitempty"`
+	Groups        Capability `json:"groups,omitempty"`
+	Lights        Capability `json:"lights,omitempty"`
+	Resourcelinks Capability `json:"resourcelinks,omitempty"`
+	Schedules     Capability `json:"schedules,omitempty"`
+	Rules         Capability `json:"rules,omitempty"`
+	Scenes        Capability `json:"scenes,omitempty"`
+	Sensors       Capability `json:"sensors,omitempty"`
+	Streaming     Capability `json:"streaming,omitempty"`
 }
 
 // Capability defines the resource and subresource capabilities.

config_test.go

@@ -90,19 +90,11 @@ func TestGetUsers(t *testing.T) {
 
 func TestDeleteUser(t *testing.T) {
 	b := huego.New(hostname, username)
-	users, err := b.GetUsers()
+	err := b.DeleteUser("ffffffffe0341b1b376a2389376a2389")
 	if err != nil {
 		t.Fatal(err)
 	}
-	for _, user := range users {
-		if user.Name == "github.com/amimof/huego#go test" {
-			err := b.DeleteUser(user.Username)
-			if err != nil {
-				t.Fatal(err)
-			}
-			t.Logf("Deleted user '%s' (%s)", user.Name, user.Username)
-		}
-	}
+	t.Logf("Deleted user '%s'", "ffffffffe0341b1b376a2389376a2389")
 }
 
 func TestGetFullState(t *testing.T) {

group.go

@@ -2,14 +2,14 @@ package huego
 
 // Group represents a bridge group https://developers.meethue.com/documentation/groups-api
 type Group struct {
-	Name       string      `json:"name,omitempty"`
-	Lights     []string    `json:"lights,omitempty"`
-	Type       string      `json:"type,omitempty"`
-	GroupState *GroupState `json:"state,omitempty"`
-	Recycle    bool        `json:"recycle,omitempty"`
-	Class      string      `json:"class,omitempty"`
-	State      *State      `json:"action,omitempty"`
-	ID         int         `json:"-"`
+	Name       string     `json:"name,omitempty"`
+	Lights     []string   `json:"lights,omitempty"`
+	Type       string     `json:"type,omitempty"`
+	GroupState GroupState `json:"state,omitempty"`
+	Recycle    bool       `json:"recycle,omitempty"`
+	Class      string     `json:"class,omitempty"`
+	State      *State     `json:"action,omitempty"`
+	ID         int        `json:"-"`
 	bridge     *Bridge
 }
 

group_test.go

@@ -45,43 +45,36 @@ func TestGetGroups(t *testing.T) {
 
 func TestGetGroup(t *testing.T) {
 	b := huego.New(hostname, username)
-	groups, err := b.GetGroups()
-	if err != nil {
-		t.Fatal(err)
-	}
-	for _, group := range groups {
-		g, err := b.GetGroup(group.ID)
-		if err != nil {
-			t.Fatal(err)
-		}
-		t.Logf("Name: %s", g.Name)
-		t.Logf("Lights: %s", g.Lights)
-		t.Logf("Type: %s", g.Type)
-		t.Logf("GroupState:")
-		t.Logf("  AllOn: %t", g.GroupState.AllOn)
-		t.Logf("  AnyOn: %t", g.GroupState.AnyOn)
-		t.Logf("Recycle: %t", g.Recycle)
-		t.Logf("Class: %s", g.Class)
-		t.Logf("State:")
-		t.Logf("  On: %t", g.State.On)
-		t.Logf("  Bri: %d", g.State.Bri)
-		t.Logf("  Hue: %d", g.State.Hue)
-		t.Logf("  Sat: %d", g.State.Sat)
-		t.Logf("  Xy: %b", g.State.Xy)
-		t.Logf("  Ct: %d", g.State.Ct)
-		t.Logf("  Alert: %s", g.State.Alert)
-		t.Logf("  Effect: %s", g.State.Effect)
-		t.Logf("  TransitionTime: %d", g.State.TransitionTime)
-		t.Logf("  BriInc: %d", g.State.BriInc)
-		t.Logf("  SatInc: %d", g.State.SatInc)
-		t.Logf("  HueInc: %d", g.State.HueInc)
-		t.Logf("  CtInc: %d", g.State.CtInc)
-		t.Logf("  XyInc: %d", g.State.XyInc)
-		t.Logf("  ColorMode: %s", g.State.ColorMode)
-		t.Logf("  Reachable: %t", g.State.Reachable)
-		t.Logf("ID: %d", g.ID)
-		break
-	}
+	g, err := b.GetGroup(1)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Logf("Name: %s", g.Name)
+	t.Logf("Lights: %s", g.Lights)
+	t.Logf("Type: %s", g.Type)
+	t.Logf("GroupState:")
+	t.Logf("  AllOn: %t", g.GroupState.AllOn)
+	t.Logf("  AnyOn: %t", g.GroupState.AnyOn)
+	t.Logf("Recycle: %t", g.Recycle)
+	t.Logf("Class: %s", g.Class)
+	t.Logf("State:")
+	t.Logf("  On: %t", g.State.On)
+	t.Logf("  Bri: %d", g.State.Bri)
+	t.Logf("  Hue: %d", g.State.Hue)
+	t.Logf("  Sat: %d", g.State.Sat)
+	t.Logf("  Xy: %b", g.State.Xy)
+	t.Logf("  Ct: %d", g.State.Ct)
+	t.Logf("  Alert: %s", g.State.Alert)
+	t.Logf("  Effect: %s", g.State.Effect)
+	t.Logf("  TransitionTime: %d", g.State.TransitionTime)
+	t.Logf("  BriInc: %d", g.State.BriInc)
+	t.Logf("  SatInc: %d", g.State.SatInc)
+	t.Logf("  HueInc: %d", g.State.HueInc)
+	t.Logf("  CtInc: %d", g.State.CtInc)
+	t.Logf("  XyInc: %d", g.State.XyInc)
+	t.Logf("  ColorMode: %s", g.State.ColorMode)
+	t.Logf("  Reachable: %t", g.State.Reachable)
+	t.Logf("ID: %d", g.ID)
 }
 
 func TestCreateGroup(t *testing.T) {
@@ -104,7 +97,7 @@ func TestCreateGroup(t *testing.T) {
 
 func TestUpdateGroup(t *testing.T) {
 	b := huego.New(hostname, username)
-	id := 3
+	id := 1
 	resp, err := b.UpdateGroup(id, huego.Group{
 		Name:  "TestGroup (Updated)",
 		Class: "Office",
@@ -121,7 +114,7 @@ func TestUpdateGroup(t *testing.T) {
 
 func TestSetGroupState(t *testing.T) {
 	b := huego.New(hostname, username)
-	id := 3
+	id := 1
 	resp, err := b.SetGroupState(id, huego.State{
 		On:  true,
 		Bri: 150,
@@ -139,7 +132,7 @@ func TestSetGroupState(t *testing.T) {
 
 func TestRenameGroup(t *testing.T) {
 	bridge := huego.New(hostname, username)
-	id := 3
+	id := 1
 	group, err := bridge.GetGroup(id)
 	if err != nil {
 		t.Fatal(err)
@@ -336,7 +329,7 @@ func TestSetStateGroup(t *testing.T) {
 
 func TestDeleteGroup(t *testing.T) {
 	b := huego.New(hostname, username)
-	id := 3
+	id := 1
 	err := b.DeleteGroup(id)
 	if err != nil {
 		t.Fatal(err)

huego.go

@@ -189,14 +189,27 @@ func delete(url string) ([]byte, error) {
 // DiscoverAll returns a list of Bridge objects.
 func DiscoverAll() ([]Bridge, error) {
 
-	res, err := get("https://www.meethue.com/api/nupnp")
+	req, err := http.NewRequest("GET", "https://discovery.meethue.com", nil)
+	if err != nil {
+		return nil, err
+	}
+
+	client := http.Client{}
+	res, err := client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+
+	defer res.Body.Close()
+
+	d, err := ioutil.ReadAll(res.Body)
 	if err != nil {
 		return nil, err
 	}
 
 	var bridges []Bridge
 
-	err = json.Unmarshal(res, &bridges)
+	err = json.Unmarshal(d, &bridges)
 	if err != nil {
 		return nil, err
 	}