@@ -183,7 +183,7 @@ public void testUserLifecycle() throws Exception {
183
183
assertTrue (userRecord .getUserMetadata ().getCreationTimestamp () > 0 );
184
184
assertEquals (0 , userRecord .getUserMetadata ().getLastSignInTimestamp ());
185
185
assertEquals (0 , userRecord .getProviderData ().length );
186
- assertNull (userRecord .getCustomClaims ());
186
+ assertTrue (userRecord .getCustomClaims (). isEmpty ());
187
187
188
188
// Update user
189
189
String randomId = UUID .randomUUID ().toString ().replaceAll ("-" , "" );
@@ -206,7 +206,7 @@ public void testUserLifecycle() throws Exception {
206
206
assertTrue (userRecord .isEmailVerified ());
207
207
assertFalse (userRecord .isDisabled ());
208
208
assertEquals (2 , userRecord .getProviderData ().length );
209
- assertNull (userRecord .getCustomClaims ());
209
+ assertTrue (userRecord .getCustomClaims (). isEmpty ());
210
210
211
211
// Get user by email
212
212
userRecord = auth .getUserByEmailAsync (userRecord .getEmail ()).get ();
@@ -227,7 +227,7 @@ public void testUserLifecycle() throws Exception {
227
227
assertTrue (userRecord .isEmailVerified ());
228
228
assertTrue (userRecord .isDisabled ());
229
229
assertEquals (1 , userRecord .getProviderData ().length );
230
- assertNull (userRecord .getCustomClaims ());
230
+ assertTrue (userRecord .getCustomClaims (). isEmpty ());
231
231
232
232
// Delete user
233
233
auth .deleteUserAsync (userRecord .getUid ()).get ();
@@ -318,7 +318,7 @@ public void testCustomClaims() throws Exception {
318
318
319
319
try {
320
320
// New user should not have any claims
321
- assertNull (userRecord .getCustomClaims ());
321
+ assertTrue (userRecord .getCustomClaims (). isEmpty ());
322
322
323
323
Map <String , Object > expected = ImmutableMap .<String , Object >of (
324
324
"admin" , true , "package" , "gold" );
@@ -343,7 +343,7 @@ public void testCustomClaims() throws Exception {
343
343
// Should be able to remove custom claims
344
344
auth .setCustomClaimsAsync (uid , null ).get ();
345
345
updatedUser = auth .getUserAsync (uid ).get ();
346
- assertNull (updatedUser .getCustomClaims ());
346
+ assertTrue (updatedUser .getCustomClaims (). isEmpty ());
347
347
} finally {
348
348
auth .deleteUserAsync (uid ).get ();
349
349
}
0 commit comments