opendev/gerrit
Code Issues Proposed changes

Account.FieldName: Move to extension API as AccountFieldName

Browse Source 
Change-Id: I103dbe8bfaeb2acc67c6afd505c693953860bb0c
This commit is contained in:
David Pursehouse
2016-08-22 20:50:51 +09:00
parent 77a4c6a522
commit 117b0e802b
19 changed files with 76 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/config/ServerInfoIT.java
View File

@@ -21,7 +21,7 @@ import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.GerritConfig;
import com.google.gerrit.acceptance.GerritConfigs;
import com.google.gerrit.acceptance.RestResponse;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.extensions.client.AccountFieldName;
import com.google.gerrit.reviewdb.client.AuthType;
import com.google.gerrit.server.config.AllProjectsNameProvider;
import com.google.gerrit.server.config.AllUsersNameProvider;
@@ -79,7 +79,7 @@ public class ServerInfoIT extends AbstractDaemonTest {
// auth
assertThat(i.auth.authType).isEqualTo(AuthType.HTTP);
assertThat(i.auth.editableAccountFields).containsExactly(
Account.FieldName.REGISTER_NEW_EMAIL, Account.FieldName.FULL_NAME);
AccountFieldName.REGISTER_NEW_EMAIL, AccountFieldName.FULL_NAME);
assertThat(i.auth.useContributorAgreements).isTrue();
assertThat(i.auth.loginUrl).isEqualTo("https://example.com/login");
assertThat(i.auth.loginText).isEqualTo("LOGIN");
@@ -147,8 +147,8 @@ public class ServerInfoIT extends AbstractDaemonTest {
// auth
assertThat(i.auth.authType).isEqualTo(AuthType.OPENID);
assertThat(i.auth.editableAccountFields).containsExactly(
Account.FieldName.REGISTER_NEW_EMAIL, Account.FieldName.FULL_NAME,
Account.FieldName.USER_NAME);
AccountFieldName.REGISTER_NEW_EMAIL, AccountFieldName.FULL_NAME,
AccountFieldName.USER_NAME);
assertThat(i.auth.useContributorAgreements).isNull();
assertThat(i.auth.loginUrl).isNull();
assertThat(i.auth.loginText).isNull();