Skip to content

Commit 0d7a74f

Browse files
authored
Improve unit test coverage of tenant/provider-related code (#453)
I've improved the unit test coverage of tenant/provider-related code, and I've also removed a number of unused imports.
1 parent 042121b commit 0d7a74f

18 files changed

+887
-42
lines changed

src/main/java/com/google/firebase/auth/AbstractFirebaseAuth.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,9 @@
3030
import com.google.firebase.FirebaseApp;
3131
import com.google.firebase.auth.FirebaseUserManager.EmailLinkType;
3232
import com.google.firebase.auth.FirebaseUserManager.UserImportRequest;
33-
import com.google.firebase.auth.ListProviderConfigsPage;
3433
import com.google.firebase.auth.ListProviderConfigsPage.DefaultOidcProviderConfigSource;
3534
import com.google.firebase.auth.ListProviderConfigsPage.DefaultSamlProviderConfigSource;
36-
import com.google.firebase.auth.ListUsersPage;
3735
import com.google.firebase.auth.ListUsersPage.DefaultUserSource;
38-
import com.google.firebase.auth.UserRecord;
3936
import com.google.firebase.auth.internal.FirebaseTokenFactory;
4037
import com.google.firebase.internal.CallableOperation;
4138
import com.google.firebase.internal.NonNull;

src/main/java/com/google/firebase/auth/FirebaseUserManager.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@
5454
* FirebaseUserManager provides methods for interacting with the Google Identity Toolkit via its
5555
* REST API. This class does not hold any mutable state, and is thread safe.
5656
*
57-
* <p>TODO(micahstairs): Rename this class to IdentityToolkitClient.
58-
*
5957
* @see <a href="https://developers.google.com/identity/toolkit/web/reference/relyingparty">
6058
* Google Identity Toolkit</a>
6159
*/

src/main/java/com/google/firebase/auth/ListProviderConfigsPage.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@
1919
import static com.google.common.base.Preconditions.checkArgument;
2020
import static com.google.common.base.Preconditions.checkNotNull;
2121

22-
import com.google.api.client.json.JsonFactory;
2322
import com.google.api.gax.paging.Page;
2423
import com.google.common.collect.ImmutableList;
25-
import com.google.firebase.auth.internal.DownloadAccountResponse;
2624
import com.google.firebase.auth.internal.ListOidcProviderConfigsResponse;
2725
import com.google.firebase.auth.internal.ListProviderConfigsResponse;
2826
import com.google.firebase.auth.internal.ListSamlProviderConfigsResponse;
@@ -113,7 +111,7 @@ public ListProviderConfigsPage<T> getNextPage() {
113111
@NonNull
114112
@Override
115113
public Iterable<T> iterateAll() {
116-
return new ProviderConfigIterable(this);
114+
return new ProviderConfigIterable<T>(this);
117115
}
118116

119117
/**
@@ -248,7 +246,7 @@ static class Factory<T extends ProviderConfig> {
248246
}
249247

250248
Factory(
251-
@NonNull ProviderConfigSource source,
249+
@NonNull ProviderConfigSource<T> source,
252250
int maxResults,
253251
@Nullable String pageToken) {
254252
checkArgument(

src/main/java/com/google/firebase/auth/OidcProviderConfig.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020

2121
import com.google.api.client.util.Key;
2222
import com.google.common.base.Strings;
23-
import com.google.firebase.auth.ProviderConfig.AbstractCreateRequest;
24-
import com.google.firebase.auth.ProviderConfig.AbstractUpdateRequest;
2523

2624
/**
2725
* Contains metadata associated with an OIDC Auth provider.

src/main/java/com/google/firebase/auth/SamlProviderConfig.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
import com.google.common.base.Strings;
2525
import com.google.common.collect.ImmutableList;
2626
import com.google.common.collect.ImmutableMap;
27-
import com.google.firebase.auth.ProviderConfig.AbstractCreateRequest;
28-
import com.google.firebase.auth.ProviderConfig.AbstractUpdateRequest;
2927
import java.util.ArrayList;
3028
import java.util.Collection;
3129
import java.util.HashMap;

src/main/java/com/google/firebase/auth/internal/ListOidcProviderConfigsResponse.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package com.google.firebase.auth.internal;
1818

1919
import com.google.api.client.util.Key;
20+
import com.google.common.annotations.VisibleForTesting;
2021
import com.google.common.base.Strings;
2122
import com.google.common.collect.ImmutableList;
2223
import com.google.firebase.auth.OidcProviderConfig;
@@ -35,6 +36,15 @@ public final class ListOidcProviderConfigsResponse
3536
@Key("nextPageToken")
3637
private String pageToken;
3738

39+
@VisibleForTesting
40+
public ListOidcProviderConfigsResponse(
41+
List<OidcProviderConfig> providerConfigs, String pageToken) {
42+
this.providerConfigs = providerConfigs;
43+
this.pageToken = pageToken;
44+
}
45+
46+
public ListOidcProviderConfigsResponse() { }
47+
3848
@Override
3949
public List<OidcProviderConfig> getProviderConfigs() {
4050
return providerConfigs == null ? ImmutableList.<OidcProviderConfig>of() : providerConfigs;

src/main/java/com/google/firebase/auth/internal/ListSamlProviderConfigsResponse.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package com.google.firebase.auth.internal;
1818

1919
import com.google.api.client.util.Key;
20+
import com.google.common.annotations.VisibleForTesting;
2021
import com.google.common.base.Strings;
2122
import com.google.common.collect.ImmutableList;
2223
import com.google.firebase.auth.SamlProviderConfig;
@@ -35,6 +36,15 @@ public final class ListSamlProviderConfigsResponse
3536
@Key("nextPageToken")
3637
private String pageToken;
3738

39+
@VisibleForTesting
40+
public ListSamlProviderConfigsResponse(
41+
List<SamlProviderConfig> providerConfigs, String pageToken) {
42+
this.providerConfigs = providerConfigs;
43+
this.pageToken = pageToken;
44+
}
45+
46+
public ListSamlProviderConfigsResponse() { }
47+
3848
@Override
3949
public List<SamlProviderConfig> getProviderConfigs() {
4050
return providerConfigs == null ? ImmutableList.<SamlProviderConfig>of() : providerConfigs;

src/test/java/com/google/firebase/auth/FirebaseAuthTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import com.google.firebase.FirebaseApp;
3333
import com.google.firebase.FirebaseOptions;
3434
import com.google.firebase.TestOnlyImplFirebaseTrampolines;
35-
import com.google.firebase.auth.internal.FirebaseTokenFactory;
3635
import com.google.firebase.testing.ServiceAccount;
3736
import com.google.firebase.testing.TestUtils;
3837
import java.lang.reflect.InvocationTargetException;

0 commit comments

Comments
 (0)