Merge lp:~jani/lpad/misc into lp:lpad

[Jani Monoses]

Reenable functions, add corresponding tests. Add commenting for Bug, link Bug

to Bugtask

https://codereview.appspot.com/5552049/

[Jani Monoses (jani)]

Reviewers: mp+90773_code.launchpad.net,

Message:
Please take a look.

Description:
to Bugtask

https://code.launchpad.net/~jani/lpad/misc/+merge/90773

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/5552049/

Affected files:
   M bug.go
   M bug_test.go
   M distro.go
   M distro_test.go

Unmerged revisions

57. By Jani Monoses on 2012-01-30

Get bugtask list and build list for distros and distroseries

56. By Jani Monoses on 2012-01-30

Support for adding comments to bugs and getting bug of bugtask

=== modified file 'bug.go'
--- bug.go	2011-11-17 05:56:25 +0000
+++ bug.go	2012-01-30 19:45:39 +0000
@@ -130,6 +130,16 @@
 	return err
 }
 
+// AddComment adds a comment to this bug.
+func (bug *Bug) AddComment(comment string) error {
+	params := Params{
+		"ws.op":   "newMessage",
+		"content": comment,
+	}
+	_, err := bug.Post(params)
+	return err
+}
+
 // A BugTask represents the association of a bug with a project
 // or source package, and the related information.
 type BugTask struct {
@@ -165,6 +175,15 @@
 	StFixReleased  BugStatus = "Fix Released"
 )
 
+// Bug returns the bug this task is associated with.
+func (task *BugTask) Bug() (*Bug, error) {
+	v, err := task.Link("bug_link").Get(nil)
+	if err != nil {
+		return nil, err
+	}
+	return &Bug{v}, nil
+}
+
 // Status returns the current status for the bug task. See
 // the Status type for supported values.
 func (task *BugTask) Status() BugStatus {

=== modified file 'bug_test.go'
--- bug_test.go	2011-11-17 14:56:24 +0000
+++ bug_test.go	2012-01-30 19:45:39 +0000
@@ -39,6 +39,7 @@
 	m := M{
 		"assignee_link":  testServer.URL + "/assignee_link",
 		"milestone_link": testServer.URL + "/milestone_link",
+		"bug_link":       testServer.URL + "/bug_link",
 		"status":         "New",
 		"importance":     "High",
 	}
@@ -53,6 +54,7 @@
 
 	testServer.PrepareResponse(200, jsonType, `{"display_name": "Joe"}`)
 	testServer.PrepareResponse(200, jsonType, `{"name": "mymiles"}`)
+	testServer.PrepareResponse(200, jsonType, `{"title": "Bugtitle"}`)
 
 	assignee, err := task.Assignee()
 	c.Assert(err, IsNil)
@@ -62,6 +64,10 @@
 	c.Assert(err, IsNil)
 	c.Assert(milestone.Name(), Equals, "mymiles")
 
+	bug, err := task.Bug()
+	c.Assert(err, IsNil)
+	c.Assert(bug.Title(), Equals, "Bugtitle")
+
 	req := testServer.WaitRequest()
 	c.Assert(req.Method, Equals, "GET")
 	c.Assert(req.URL.Path, Equals, "/assignee_link")
@@ -70,6 +76,10 @@
 	c.Assert(req.Method, Equals, "GET")
 	c.Assert(req.URL.Path, Equals, "/milestone_link")
 
+	req = testServer.WaitRequest()
+	c.Assert(req.Method, Equals, "GET")
+	c.Assert(req.URL.Path, Equals, "/bug_link")
+
 	milestone = &lpad.Milestone{lpad.NewValue(nil, "", "/new_milestone_link", nil)}
 	assignee = &lpad.Person{lpad.NewValue(nil, "", "/new_assignee_link", nil)}
 
@@ -176,6 +186,21 @@
 	c.Assert(req.Form["branch"], Equals, []string{branch.AbsLoc()})
 }
 
+func (s *ModelS) TestBugAddComment(c *C) {
+	testServer.PrepareResponse(200, jsonType, `{}`)
+	bug := &lpad.Bug{lpad.NewValue(nil, "", testServer.URL+"/bugs/123456", nil)}
+
+	comment := "Me too!"
+	err := bug.AddComment(comment)
+	c.Assert(err, IsNil)
+
+	req := testServer.WaitRequest()
+	c.Assert(req.Method, Equals, "POST")
+	c.Assert(req.URL.Path, Equals, "/bugs/123456")
+	c.Assert(req.Form["ws.op"], Equals, []string{"newMessage"})
+	c.Assert(req.Form["content"], Equals, []string{comment})
+}
+
 func (s *ModelS) TestBugTasks(c *C) {
 	data := `{
 		"total_size": 2,

=== modified file 'distro.go'
--- distro.go	2012-01-17 02:09:33 +0000
+++ distro.go	2012-01-30 19:45:39 +0000
@@ -269,60 +269,60 @@
 
 // TODO: These have no tests.
 //
-//type TagMatching string
-//
-//const (
-//	MatchAny TagMatching = "Any"
-//	MatchAll TagMatching = "All"
-//)
-//
-//// SearchTasks returns the list of bug tasks associated with this
-//// distribution that match the given criteria.
-//func (d *Distro) SearchTasks(tags string, matching TagMatching) (*BugTaskList, error) {
-//	params := Params{
-//		"ws.op": "searchTasks",
-//		"tags": tags,
-//		"tags_combinator": string(matching),
-//	}
-//	v, err := d.Location("").Get(params)
-//	if err != nil {
-//		return nil, err
-//	}
-//	return &BugTaskList{v}, nil
-//}
-//
-//// SearchTasks returns the list of bug tasks associated with this
-//// distribution series that match the given criteria.
-//func (d *DistroSeries) SearchTasks(tags string, matching TagMatching) (*BugTaskList, error) {
-//	params := Params{
-//		"ws.op": "searchTasks",
-//		"tags": tags,
-//		"tags_combinator": string(match),
-//	}
-//	v, err := d.Location("").Get(params)
-//	if err != nil {
-//		return nil, err
-//	}
-//	return &BugTaskList{v}, nil
-//}
-//
-//// Builds returns a list of all the Build objects for this distribution
-//// series for the source packages matching the given criteria.
-//func (d *DistroSeries) Builds(buildState BuildState, pocket Pocket, sourceName string) (*BuildList, error) {
-//	params := Params{
-//		"ws.op": "getBuildRecords",
-//		"build_state": string(buildState),
-//		"source_name": sourceName,
-//	}
-//	if pocket != PocketAny {
-//		params["pocket"] = string(pocket)
-//	}
-//	v, err := d.Location("").Get(params)
-//	if err != nil {
-//		return nil, err
-//	}
-//	return &BuildList{v}, nil
-//}
+type TagMatching string
+
+const (
+	MatchAny TagMatching = "Any"
+	MatchAll TagMatching = "All"
+)
+
+// SearchTasks returns the list of bug tasks associated with this
+// distribution that match the given criteria.
+func (d *Distro) SearchTasks(tags string, matching TagMatching) (*BugTaskList, error) {
+	params := Params{
+		"ws.op": "searchTasks",
+		"tags": tags,
+		"tags_combinator": string(matching),
+	}
+	v, err := d.Location("").Get(params)
+	if err != nil {
+		return nil, err
+	}
+	return &BugTaskList{v}, nil
+}
+
+// SearchTasks returns the list of bug tasks associated with this
+// distribution series that match the given criteria.
+func (d *DistroSeries) SearchTasks(tags string, matching TagMatching) (*BugTaskList, error) {
+	params := Params{
+		"ws.op": "searchTasks",
+		"tags": tags,
+		"tags_combinator": string(matching),
+	}
+	v, err := d.Location("").Get(params)
+	if err != nil {
+		return nil, err
+	}
+	return &BugTaskList{v}, nil
+}
+
+// Builds returns a list of all the Build objects for this distribution
+// series for the source packages matching the given criteria.
+func (d *DistroSeries) Builds(buildState BuildState, pocket Pocket, sourceName string) (*BuildList, error) {
+	params := Params{
+		"ws.op": "getBuildRecords",
+		"build_state": string(buildState),
+		"source_name": sourceName,
+	}
+	if pocket != PocketAny {
+		params["pocket"] = string(pocket)
+	}
+	v, err := d.Location("").Get(params)
+	if err != nil {
+		return nil, err
+	}
+	return &BuildList{v}, nil
+}
 
 // DistroSourcePackage returns the DistroSourcePackage with the given name.
 func (d *Distro) DistroSourcePackage(name string) (*DistroSourcePackage, error) {

=== modified file 'distro_test.go'
--- distro_test.go	2012-01-17 02:09:33 +0000
+++ distro_test.go	2012-01-30 19:45:39 +0000
@@ -191,3 +191,105 @@
 	c.Assert(req.Form["ws.op"], Equals, []string{"getBranchTips"})
 	c.Assert(req.Form["since"], Equals, []string{"2011-09-21T01:16:26Z"})
 }
+
+func (s *ModelS) TestDistroSearchTasks(c *C) {
+	data := `{
+		"total_size": 2,
+		"start": 0,
+		"entries": [{
+			"self_link": "http://self0",
+			"status": "New"
+		}, {
+			"self_link": "http://self1",
+			"status": "Unknown"
+		}]
+	}`
+
+	testServer.PrepareResponse(200, jsonType, data)
+	distro := lpad.Distro{lpad.NewValue(nil, testServer.URL, testServer.URL+"/distro", nil)}
+	tasks, err := distro.SearchTasks("ftbfs", lpad.MatchAny)
+	c.Assert(err, IsNil)
+	c.Assert(tasks.TotalSize(), Equals, 2)
+
+	status := []lpad.BugStatus{}
+	tasks.For(func(task *lpad.BugTask) error {
+		status = append(status, task.Status())
+		return nil
+	})
+	c.Assert(status, Equals, []lpad.BugStatus{lpad.StNew, lpad.StUnknown})
+
+	req := testServer.WaitRequest()
+	c.Assert(req.Method, Equals, "GET")
+	c.Assert(req.URL.Path, Equals, "/distro")
+	c.Assert(req.Form["ws.op"], Equals, []string{"searchTasks"})
+	c.Assert(req.Form["tags"], Equals, []string{"ftbfs"})
+	c.Assert(req.Form["tags_combinator"], Equals, []string{"Any"})
+}
+
+func (s *ModelS) TestDistroSeriesSearchTasks(c *C) {
+	data := `{
+		"total_size": 2,
+		"start": 0,
+		"entries": [{
+			"self_link": "http://self0",
+			"status": "New"
+		}, {
+			"self_link": "http://self1",
+			"status": "Unknown"
+		}]
+	}`
+
+	testServer.PrepareResponse(200, jsonType, data)
+	distroseries := lpad.DistroSeries{lpad.NewValue(nil, testServer.URL, testServer.URL+"/distroseries", nil)}
+	tasks, err := distroseries.SearchTasks("ftbfs", lpad.MatchAny)
+	c.Assert(err, IsNil)
+	c.Assert(tasks.TotalSize(), Equals, 2)
+
+	status := []lpad.BugStatus{}
+	tasks.For(func(task *lpad.BugTask) error {
+		status = append(status, task.Status())
+		return nil
+	})
+	c.Assert(status, Equals, []lpad.BugStatus{lpad.StNew, lpad.StUnknown})
+
+	req := testServer.WaitRequest()
+	c.Assert(req.Method, Equals, "GET")
+	c.Assert(req.URL.Path, Equals, "/distroseries")
+	c.Assert(req.Form["ws.op"], Equals, []string{"searchTasks"})
+	c.Assert(req.Form["tags"], Equals, []string{"ftbfs"})
+	c.Assert(req.Form["tags_combinator"], Equals, []string{"Any"})
+}
+
+func (s *ModelS) TestDistroSeriesBuilds(c *C) {
+	data := `{
+		"total_size": 2,
+		"start": 0,
+		"entries": [{
+			"self_link": "http://self0",
+			"buildstate": "Failed to build"
+		}, {
+			"self_link": "http://self1",
+			"buildstate": "Failed to build"
+		}]
+	}`
+
+	testServer.PrepareResponse(200, jsonType, data)
+	distroseries := lpad.DistroSeries{lpad.NewValue(nil, testServer.URL, testServer.URL+"/distroseries", nil)}
+	builds, err := distroseries.Builds(lpad.BSFailedToBuild, lpad.PocketRelease, "woobar")
+	c.Assert(err, IsNil)
+	c.Assert(builds.TotalSize(), Equals, 2)
+
+	states := []lpad.BuildState{}
+	builds.For(func(build *lpad.Build) error {
+		states = append(states, build.State())
+		return nil
+	})
+	c.Assert(states, Equals, []lpad.BuildState{lpad.BSFailedToBuild, lpad.BSFailedToBuild})
+
+	req := testServer.WaitRequest()
+	c.Assert(req.Method, Equals, "GET")
+	c.Assert(req.URL.Path, Equals, "/distroseries")
+	c.Assert(req.Form["ws.op"], Equals, []string{"getBuildRecords"})
+	c.Assert(req.Form["build_state"], Equals, []string{"Failed to build"})
+	c.Assert(req.Form["pocket"], Equals, []string{"Release"})
+}