From 33e378acd62eaa39cc387634e497f9702305c24c Mon Sep 17 00:00:00 2001 From: Yuli Date: Sat, 15 Feb 2020 20:29:47 +0200 Subject: [PATCH] add tests --- src/audit_db.go | 14 ++++++++------ src/users_test.go | 17 ++++++++++++----- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/src/audit_db.go b/src/audit_db.go index c4455b2..c3fe4c0 100644 --- a/src/audit_db.go +++ b/src/audit_db.go @@ -173,18 +173,20 @@ func (dbobj dbcon) getAuditEvent(atoken string) (string, []byte, error) { } result := fmt.Sprintf(`{"before":%s,"after":%s,"debug":"%s"}`, before2, after2, debug) return userTOKEN, []byte(result), nil - } else if len(after) > 0 { + } + if len(after) > 0 { after2, _ := dbobj.userDecrypt(userTOKEN, after) log.Printf("after: %s", after2) record["after"] = after2 result := fmt.Sprintf(`{"after":%s,"debug":"%s"}`, after2, debug) return userTOKEN, []byte(result), nil } + if len(debug) > 0 { + result := fmt.Sprintf(`{"debug":"%s"}`, debug) + return userTOKEN, []byte(result), nil + } + return userTOKEN, []byte("{}"), nil } } - if len(debug) > 0 { - result := fmt.Sprintf(`{"debug":"%s"}`, debug) - return userTOKEN, []byte(result), nil - } - return userTOKEN, nil, nil + return userTOKEN, nil, errors.New("not found") } diff --git a/src/users_test.go b/src/users_test.go index 61992ce..3a67469 100644 --- a/src/users_test.go +++ b/src/users_test.go @@ -85,7 +85,7 @@ func TestCreateUpdateUser(t *testing.T) { if _, ok := raw["status"]; ok && raw["status"].(string) == "ok" { t.Fatalf("Lookup by login should fail now") } - raw, _ = helpGetUserAuditEvents(userTOKEN, "?limit=1") + raw, _ = helpGetUserAuditEvents(userTOKEN, "?offset=1&limit=1") if _, ok := raw["status"]; !ok || raw["status"].(string) != "ok" { t.Fatalf("Failed to get audit event/s\n") } @@ -103,13 +103,20 @@ func TestCreateUpdateUser(t *testing.T) { t.Fatalf("Failed to extract atoken\n") } fmt.Printf("Audit record: %s\n", atoken) - raw3, _ := helpGetUserAuditEvent(atoken) - if raw3["status"].(string) != "ok" { + raw, _ = helpGetUserAuditEvent(atoken) + if _, ok := raw["status"]; !ok || raw["status"].(string) != "ok" { t.Fatalf("Failed to get specific audit event\n") } + oldRootToken := rootToken + rootToken, _ = uuid.GenerateUUID() + raw, _ = helpGetUserAuditEvent(atoken) + if _, ok := raw["status"]; ok && raw["status"].(string) == "ok" { + t.Fatalf("Should failed to get specific audit event\n") + } + rootToken = oldRootToken helpDeleteUser("token", userTOKEN) - raw4, _ := helpGetUser("token", userTOKEN) - d := raw4["data"].(map[string]interface{}) + raw, _ = helpGetUser("token", userTOKEN) + d := raw["data"].(map[string]interface{}) if len(d) != 0 { t.Fatalf("Failed to delete user") }