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

@ -67,6 +67,7 @@ func Handler() *mux.Router {
m.Get(router.Measurement).Handler(handler(serveMeasurement))
m.Get(router.CreateMeasurement).Handler(handler(serveCreateMeasurement))
m.Get(router.Measurements).Handler(handler(serveMeasurementList))
return m
}

View file

@ -40,3 +40,20 @@ func serveCreateMeasurement(w http.ResponseWriter, r *http.Request) error {
return writeJSON(w, measurement)
}
func serveMeasurementList(w http.ResponseWriter, r *http.Request) error {
var opt models.MeasurementListOptions
if err := schemaDecoder.Decode(&opt, r.URL.Query()); err != nil {
return err
}
measurements, err := store.Measurements.List(&opt)
if err != nil {
return err
}
if measurements == nil {
measurements = []*models.Measurement{}
}
return writeJSON(w, measurements)
}

View file

@ -65,3 +65,32 @@ func TestMeasurement_Create(t *testing.T) {
t.Error("!success")
}
}
func TestMeasurement_List(t *testing.T) {
setup()
want := []*models.Measurement{newMeasurement()}
wantOpt := &models.MeasurementListOptions{ListOptions: models.ListOptions{Page: 1, PerPage: 10}}
calledList := false
store.Measurements.(*models.MockMeasurementsService).List_ = func(opt *models.MeasurementListOptions) ([]*models.Measurement, error) {
if !normalizeDeepEqual(wantOpt, opt) {
t.Errorf("wanted options %d but got %d", wantOpt, opt)
}
calledList = true
return want, nil
}
measurements, err := apiClient.Measurements.List(wantOpt)
if err != nil {
t.Fatal(err)
}
if !calledList {
t.Error("!calledList")
}
if !normalizeDeepEqual(&want, &measurements) {
t.Errorf("got measurements %+v but wanted measurements %+v", measurements, want)
}
}