List measurements

Also, fixed typo in router.
This commit is contained in:
Matthew Dillon 2014-12-02 14:26:51 -09:00
parent 87ac729c98
commit d462935682
9 changed files with 153 additions and 1 deletions

View file

@ -38,6 +38,9 @@ type MeasurementsService interface {
// Get a measurement
Get(id int64) (*Measurement, error)
// List all measurements
List(opt *MeasurementListOptions) ([]*Measurement, error)
// Create a measurement
Create(measurement *Measurement) (bool, error)
}
@ -91,8 +94,33 @@ func (s *measurementsService) Create(measurement *Measurement) (bool, error) {
return resp.StatusCode == http.StatusCreated, nil
}
type MeasurementListOptions struct {
ListOptions
}
func (s *measurementsService) List(opt *MeasurementListOptions) ([]*Measurement, error) {
url, err := s.client.url(router.Measurements, nil, opt)
if err != nil {
return nil, err
}
req, err := s.client.NewRequest("GET", url.String(), nil)
if err != nil {
return nil, err
}
var measurements []*Measurement
_, err = s.client.Do(req, &measurements)
if err != nil {
return nil, err
}
return measurements, nil
}
type MockMeasurementsService struct {
Get_ func(id int64) (*Measurement, error)
List_ func(opt *MeasurementListOptions) ([]*Measurement, error)
Create_ func(measurement *Measurement) (bool, error)
}
@ -111,3 +139,10 @@ func (s *MockMeasurementsService) Create(measurement *Measurement) (bool, error)
}
return s.Create_(measurement)
}
func (s *MockMeasurementsService) List(opt *MeasurementListOptions) ([]*Measurement, error) {
if s.List_ == nil {
return nil, nil
}
return s.List_(opt)
}

View file

@ -83,3 +83,36 @@ func TestMeasurementService_Create(t *testing.T) {
t.Errorf("Measurements.Create returned %+v, want %+v", measurement, want)
}
}
func TestMeasurementService_List(t *testing.T) {
setup()
defer teardown()
want := []*Measurement{newMeasurement()}
var called bool
mux.HandleFunc(urlPath(t, router.Measurements, nil), func(w http.ResponseWriter, r *http.Request) {
called = true
testMethod(t, r, "GET")
testFormValues(t, r, values{})
writeJSON(w, want)
})
measurements, err := client.Measurements.List(nil)
if err != nil {
t.Errorf("Measurements.List returned error: %v", err)
}
if !called {
t.Fatal("!called")
}
for _, u := range want {
normalizeTime(&u.CreatedAt, &u.UpdatedAt, &u.DeletedAt)
}
if !reflect.DeepEqual(measurements, want) {
t.Errorf("Measurements.List return %+v, want %+v", measurements, want)
}
}