Browse Source

Remove GetAllOk method and GetAll now returns nil for invalid request

Pieter Joost van de Sande 13 years ago
committed by Adam Mckaig
parent
commit
08e2e8a9bc
2 changed files with 10 additions and 16 deletions
  1. +6
    -4
      context.go
  2. +4
    -12
      context_test.go

+ 6
- 4
context.go View File

@ -48,13 +48,15 @@ func GetOk(r *http.Request, key interface{}) (interface{}, bool) {
return nil, false
}
// GetAll returns all stored values for the request as a map.
func GetAll(r *http.Request) map[interface{}]interface{} {
// GetAll returns all stored values for the request as a map. Nil is returned for invalid requests.
func GetAll(r *http.Request) *map[interface{}]interface{} {
mutex.Lock()
defer mutex.Unlock()
context, _ := data[r]
return context
if context, ok := data[r]; ok {
return &context
}
return nil
}
// GetAll returns all stored values for the request as a map. It returns not ok


+ 4
- 12
context_test.go View File

@ -54,21 +54,13 @@ func TestContext(t *testing.T) {
// GetAll()
values := GetAll(r)
assertEqual(len(values), 3)
assertEqual(len(*values), 3)
// GetAll() for empty request
values = GetAll(emptyR)
assertEqual(len(values), 0)
// GetAllOk()
values, ok = GetAllOk(r)
assertEqual(ok, true)
assertEqual(len(values), 3)
// GetAllOk() for empty request
values, ok = GetAllOk(emptyR)
assertEqual(ok, false)
assertEqual(len(values), 0)
if values != nil {
t.Error("GetAll didn't return nil value for invalid request")
}
// Delete()
Delete(r, key1)


Loading…
Cancel
Save