update tests

This commit is contained in:
Erik Kristensen 2015-08-05 08:44:48 -06:00
parent 79dcffd4ac
commit f3a02a8d13

View File

@ -2,7 +2,9 @@ package audit
import (
"bytes"
"strings"
"testing"
"encoding/json"
"github.com/hashicorp/vault/logical"
"errors"
@ -36,13 +38,30 @@ func TestFormatJSON_formatRequest(t *testing.T) {
t.Fatalf("bad: %s\nerr: %s", name, err)
}
if buf.String() != tc.Result {
var expectedjson = new(JSONRequestEntry)
if err := json.Unmarshal([]byte(tc.Result), &expectedjson); err != nil {
t.Fatalf("bad json: %s", err)
}
var actualjson = new(JSONRequestEntry)
if err := json.Unmarshal([]byte(buf.String()), &actualjson); err != nil {
t.Fatalf("bad json: %s", err)
}
expectedjson.Time = actualjson.Time
expectedBytes, err := json.Marshal(expectedjson)
if err != nil {
t.Fatalf("unable to marshal json: %s", err)
}
if strings.TrimSpace(buf.String()) != string(expectedBytes) {
t.Fatalf(
"bad: %s\nResult:\n\n%s\n\nExpected:\n\n%s",
name, buf.String(), tc.Result)
"bad: %s\nResult:\n\n'%s'\n\nExpected:\n\n'%s'",
name, buf.String(), string(expectedBytes))
}
}
}
const testFormatJSONReqBasicStr = `{"type":"request","auth":{"display_name":"","policies":["root"],"metadata":null},"request":{"operation":"write","path":"/foo","data":null,"remote_address":"127.0.0.1"},"error":"this is an error"}
const testFormatJSONReqBasicStr = `{"time":"2015-08-05T13:45:46Z","type":"request","auth":{"display_name":"","policies":["root"],"metadata":null},"request":{"operation":"write","path":"/foo","data":null,"remote_address":"127.0.0.1"},"error":"this is an error"}
`