From 9231eaad81e272aa0da450b022d1b0ae29a52333 Mon Sep 17 00:00:00 2001 From: Avishalom Shalit Date: Sat, 10 Mar 2018 19:06:06 -0500 Subject: [PATCH 1/3] error message --- auth/user_mgt.go | 2 +- integration/auth/user_mgt_test.go | 31 ++++++++++++++++++++++++++++++- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/auth/user_mgt.go b/auth/user_mgt.go index 551753ea..0c1af368 100644 --- a/auth/user_mgt.go +++ b/auth/user_mgt.go @@ -567,7 +567,7 @@ func (c *Client) getUser(ctx context.Context, request *identitytoolkit.Identityt return nil, err } if len(resp.Users) == 0 { - return nil, fmt.Errorf("cannot find user from params: %v", request) + return nil, fmt.Errorf("cannot find user given params: id:%v, phone:%v, email: %v", request.LocalId, request.PhoneNumber, request.Email) } eu, err := makeExportedUser(resp.Users[0]) diff --git a/integration/auth/user_mgt_test.go b/integration/auth/user_mgt_test.go index 4121d62c..b00f447d 100644 --- a/integration/auth/user_mgt_test.go +++ b/integration/auth/user_mgt_test.go @@ -40,6 +40,8 @@ func TestUserManagement(t *testing.T) { }{ {"Create test users", testCreateUsers}, {"Get user", testGetUser}, + {"Get user by phone", testGetUserByPhoneNumber}, + {"Get user by email", testGetUserByEmail}, {"Iterate users", testUserIterator}, {"Paged iteration", testPager}, {"Disable user account", testDisableUser}, @@ -96,7 +98,8 @@ func testCreateUsers(t *testing.T) { UID(uid). Email(uid + "email@test.com"). DisplayName("display_name"). - Password("password") + Password("password"). + PhoneNumber("+12223334444") if u, err = client.CreateUser(context.Background(), params); err != nil { t.Fatal(err) @@ -121,7 +124,9 @@ func testGetUserByPhoneNumber(t *testing.T) { want := testFixtures.sampleUserWithData u, err := client.GetUserByPhoneNumber(context.Background(), want.PhoneNumber) if err != nil { + t.Errorf("-- %#v -- \n%#v", want.PhoneNumber, want.UserInfo) t.Fatalf("error getting user %s", err) + } if !reflect.DeepEqual(u, want) { t.Errorf("GetUserByPhoneNumber(%q) = %#v; want = %#v", want.PhoneNumber, u, want) @@ -411,3 +416,27 @@ func testDeleteUsers(t *testing.T) { } } } + +func TestGetUserInvalidId(t *testing.T) { + we := "cannot find user given params: id:[idbad], phone:[], email: []" + _, err := client.GetUser(context.Background(), "idbad") + if err == nil || err.Error() != we { + t.Errorf("GetUser(), got error %q, wanted %q", err, we) + } +} + +func TestGetUserByEmailInvalid(t *testing.T) { + we := "cannot find user given params: id:[], phone:[], email: [foo@bar.bad]" + _, err := client.GetUserByEmail(context.Background(), "foo@bar.bad") + if err == nil || err.Error() != we { + t.Errorf("GetUserByEmail(), got error %q wanted: %q", err, we) + } +} + +func TestGetUserByPhoneInvalid(t *testing.T) { + we := "cannot find user given params: id:[], phone:[+12345678901], email: []" + _, err := client.GetUserByPhoneNumber(context.Background(), "+12345678901") + if err == nil || err.Error() != we { + t.Errorf("GetUserByPhone(), got error %q wanted: %q", err, we) + } +} From 719d501f27fbd3f59579d45b2dfc64ae9ba5ff4b Mon Sep 17 00:00:00 2001 From: Avishalom Shalit Date: Sat, 10 Mar 2018 19:24:11 -0500 Subject: [PATCH 2/3] lint --- integration/auth/user_mgt_test.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/integration/auth/user_mgt_test.go b/integration/auth/user_mgt_test.go index b00f447d..bb9bc34a 100644 --- a/integration/auth/user_mgt_test.go +++ b/integration/auth/user_mgt_test.go @@ -124,9 +124,7 @@ func testGetUserByPhoneNumber(t *testing.T) { want := testFixtures.sampleUserWithData u, err := client.GetUserByPhoneNumber(context.Background(), want.PhoneNumber) if err != nil { - t.Errorf("-- %#v -- \n%#v", want.PhoneNumber, want.UserInfo) t.Fatalf("error getting user %s", err) - } if !reflect.DeepEqual(u, want) { t.Errorf("GetUserByPhoneNumber(%q) = %#v; want = %#v", want.PhoneNumber, u, want) From 830189ba80a6bed023a0db950dcb1f5f91a285c1 Mon Sep 17 00:00:00 2001 From: Avishalom Shalit Date: Wed, 14 Mar 2018 14:50:46 -0400 Subject: [PATCH 3/3] move to unit tests --- auth/user_mgt_test.go | 25 ++++++++++++++++--------- integration/auth/user_mgt_test.go | 24 ------------------------ 2 files changed, 16 insertions(+), 33 deletions(-) diff --git a/auth/user_mgt_test.go b/auth/user_mgt_test.go index 3f298ed6..fedb0baf 100644 --- a/auth/user_mgt_test.go +++ b/auth/user_mgt_test.go @@ -148,17 +148,24 @@ func TestGetNonExistingUser(t *testing.T) { s := echoServer([]byte(resp), t) defer s.Close() - user, err := s.Client.GetUser(context.Background(), "ignored_id") - if user != nil || err == nil { - t.Errorf("GetUser(non-existing) = (%v, %v); want = (nil, error)", user, err) + want := "cannot find user given params: id:[%s], phone:[%s], email: [%s]" + + we := fmt.Sprintf(want, "id-nonexisting", "", "") + user, err := s.Client.GetUser(context.Background(), "id-nonexisting") + if user != nil || err == nil || err.Error() != we { + t.Errorf("GetUser(non-existing) = (%v, %q); want = (nil, %q)", user, err, we) } - user, err = s.Client.GetUserByEmail(context.Background(), "test@email.com") - if user != nil || err == nil { - t.Errorf("GetUserByEmail(non-existing) = (%v, %v); want = (nil, error)", user, err) + + we = fmt.Sprintf(want, "", "", "foo@bar.nonexisting") + user, err = s.Client.GetUserByEmail(context.Background(), "foo@bar.nonexisting") + if user != nil || err == nil || err.Error() != we { + t.Errorf("GetUserByEmail(non-existing) = (%v, %q); want = (nil, %q)", user, err, we) } - user, err = s.Client.GetUserByPhoneNumber(context.Background(), "+1234567890") - if user != nil || err == nil { - t.Errorf("GetUserPhoneNumber(non-existing) = (%v, %v); want = (nil, error)", user, err) + + we = fmt.Sprintf(want, "", "+12345678901", "") + user, err = s.Client.GetUserByPhoneNumber(context.Background(), "+12345678901") + if user != nil || err == nil || err.Error() != we { + t.Errorf("GetUserPhoneNumber(non-existing) = (%v, %q); want = (nil, %q)", user, err, we) } } diff --git a/integration/auth/user_mgt_test.go b/integration/auth/user_mgt_test.go index bb9bc34a..6a5aeb04 100644 --- a/integration/auth/user_mgt_test.go +++ b/integration/auth/user_mgt_test.go @@ -414,27 +414,3 @@ func testDeleteUsers(t *testing.T) { } } } - -func TestGetUserInvalidId(t *testing.T) { - we := "cannot find user given params: id:[idbad], phone:[], email: []" - _, err := client.GetUser(context.Background(), "idbad") - if err == nil || err.Error() != we { - t.Errorf("GetUser(), got error %q, wanted %q", err, we) - } -} - -func TestGetUserByEmailInvalid(t *testing.T) { - we := "cannot find user given params: id:[], phone:[], email: [foo@bar.bad]" - _, err := client.GetUserByEmail(context.Background(), "foo@bar.bad") - if err == nil || err.Error() != we { - t.Errorf("GetUserByEmail(), got error %q wanted: %q", err, we) - } -} - -func TestGetUserByPhoneInvalid(t *testing.T) { - we := "cannot find user given params: id:[], phone:[+12345678901], email: []" - _, err := client.GetUserByPhoneNumber(context.Background(), "+12345678901") - if err == nil || err.Error() != we { - t.Errorf("GetUserByPhone(), got error %q wanted: %q", err, we) - } -}