Skip to content

Improve unit test coverage of tenant/provider-related code #453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,9 @@
import com.google.firebase.FirebaseApp;
import com.google.firebase.auth.FirebaseUserManager.EmailLinkType;
import com.google.firebase.auth.FirebaseUserManager.UserImportRequest;
import com.google.firebase.auth.ListProviderConfigsPage;
import com.google.firebase.auth.ListProviderConfigsPage.DefaultOidcProviderConfigSource;
import com.google.firebase.auth.ListProviderConfigsPage.DefaultSamlProviderConfigSource;
import com.google.firebase.auth.ListUsersPage;
import com.google.firebase.auth.ListUsersPage.DefaultUserSource;
import com.google.firebase.auth.UserRecord;
import com.google.firebase.auth.internal.FirebaseTokenFactory;
import com.google.firebase.internal.CallableOperation;
import com.google.firebase.internal.NonNull;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@
* FirebaseUserManager provides methods for interacting with the Google Identity Toolkit via its
* REST API. This class does not hold any mutable state, and is thread safe.
*
* <p>TODO(micahstairs): Rename this class to IdentityToolkitClient.
*
* @see <a href="https://developers.google.com/identity/toolkit/web/reference/relyingparty">
* Google Identity Toolkit</a>
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.api.client.json.JsonFactory;
import com.google.api.gax.paging.Page;
import com.google.common.collect.ImmutableList;
import com.google.firebase.auth.internal.DownloadAccountResponse;
import com.google.firebase.auth.internal.ListOidcProviderConfigsResponse;
import com.google.firebase.auth.internal.ListProviderConfigsResponse;
import com.google.firebase.auth.internal.ListSamlProviderConfigsResponse;
Expand Down Expand Up @@ -113,7 +111,7 @@ public ListProviderConfigsPage<T> getNextPage() {
@NonNull
@Override
public Iterable<T> iterateAll() {
return new ProviderConfigIterable(this);
return new ProviderConfigIterable<T>(this);
}

/**
Expand Down Expand Up @@ -248,7 +246,7 @@ static class Factory<T extends ProviderConfig> {
}

Factory(
@NonNull ProviderConfigSource source,
@NonNull ProviderConfigSource<T> source,
int maxResults,
@Nullable String pageToken) {
checkArgument(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@

import com.google.api.client.util.Key;
import com.google.common.base.Strings;
import com.google.firebase.auth.ProviderConfig.AbstractCreateRequest;
import com.google.firebase.auth.ProviderConfig.AbstractUpdateRequest;

/**
* Contains metadata associated with an OIDC Auth provider.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.firebase.auth.ProviderConfig.AbstractCreateRequest;
import com.google.firebase.auth.ProviderConfig.AbstractUpdateRequest;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package com.google.firebase.auth.internal;

import com.google.api.client.util.Key;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.firebase.auth.OidcProviderConfig;
Expand All @@ -35,6 +36,15 @@ public final class ListOidcProviderConfigsResponse
@Key("nextPageToken")
private String pageToken;

@VisibleForTesting
public ListOidcProviderConfigsResponse(
List<OidcProviderConfig> providerConfigs, String pageToken) {
this.providerConfigs = providerConfigs;
this.pageToken = pageToken;
}

public ListOidcProviderConfigsResponse() { }

@Override
public List<OidcProviderConfig> getProviderConfigs() {
return providerConfigs == null ? ImmutableList.<OidcProviderConfig>of() : providerConfigs;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package com.google.firebase.auth.internal;

import com.google.api.client.util.Key;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.firebase.auth.SamlProviderConfig;
Expand All @@ -35,6 +36,15 @@ public final class ListSamlProviderConfigsResponse
@Key("nextPageToken")
private String pageToken;

@VisibleForTesting
public ListSamlProviderConfigsResponse(
List<SamlProviderConfig> providerConfigs, String pageToken) {
this.providerConfigs = providerConfigs;
this.pageToken = pageToken;
}

public ListSamlProviderConfigsResponse() { }

@Override
public List<SamlProviderConfig> getProviderConfigs() {
return providerConfigs == null ? ImmutableList.<SamlProviderConfig>of() : providerConfigs;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import com.google.firebase.FirebaseApp;
import com.google.firebase.FirebaseOptions;
import com.google.firebase.TestOnlyImplFirebaseTrampolines;
import com.google.firebase.auth.internal.FirebaseTokenFactory;
import com.google.firebase.testing.ServiceAccount;
import com.google.firebase.testing.TestUtils;
import java.lang.reflect.InvocationTargetException;
Expand Down
Loading