opendev/gerrit
Code Issues Proposed changes

Merge changes If77b630b,I3bbeb623,I14ab15f1,Ia7777ac5,Iffae33bd

Browse Source 
* changes:
  Add field for watched projects to account index
  Add project watches to AccountState
  Remove suggest.fullTextSearch option
  Use account index for reviewer suggestion
  Fix highlighting in suggestions with full text search
This commit is contained in:
David Pursehouse
2016-07-08 00:23:21 +00:00
committed by Gerrit Code Review
parent 17699c8bf0 56c1349c55
commit a5b9e43029
24 changed files with 261 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-server/src/test/java/com/google/gerrit/server/index/change/FakeQueryBuilder.java
View File

@@ -29,7 +29,8 @@ public class FakeQueryBuilder extends ChangeQueryBuilder {
FakeQueryBuilder.class),
new ChangeQueryBuilder.Arguments(null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null,
null, null, null, indexes, null, null, null, null, null, null, null));
null, null, null, indexes, null, null, null, null, null, null, null,
null));
}
@Operator

4
gerrit-server/src/test/java/com/google/gerrit/server/mail/FromAddressGeneratorProviderTest.java
View File

@@ -25,6 +25,7 @@ import com.google.gerrit.common.TimeUtil;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.AccountExternalId;
import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.reviewdb.client.AccountProjectWatch;
import com.google.gerrit.server.account.AccountCache;
import com.google.gerrit.server.account.AccountState;
@@ -298,6 +299,7 @@ public class FromAddressGeneratorProviderTest {
account.setFullName(name);
account.setPreferredEmail(email);
return new AccountState(account, Collections.<AccountGroup.UUID> emptySet(),
Collections.<AccountExternalId> emptySet());
Collections.<AccountExternalId> emptySet(),
Collections.<AccountProjectWatch> emptySet());
}
}

2
gerrit-server/src/test/java/com/google/gerrit/server/query/account/AbstractQueryAccountsTest.java
View File

@@ -255,6 +255,8 @@ public abstract class AbstractQueryAccountsTest extends GerritServerTests {
assertQuery("Doe", user1);
assertQuery("doe", user1);
assertQuery("DOE", user1);
assertQuery("Jo Do", user1);
assertQuery("jo do", user1);
assertQuery("self", currentUserInfo, user3);
assertQuery("name:John", user1);
assertQuery("name:john", user1);

7
gerrit-server/src/test/java/com/google/gerrit/testutil/FakeAccountCache.java
View File

@@ -19,6 +19,7 @@ import com.google.gerrit.common.TimeUtil;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.AccountExternalId;
import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.reviewdb.client.AccountProjectWatch;
import com.google.gerrit.server.account.AccountCache;
import com.google.gerrit.server.account.AccountState;
@@ -73,8 +74,8 @@ public class FakeAccountCache implements AccountCache {
}
private static AccountState newState(Account account) {
return new AccountState(
account, ImmutableSet.<AccountGroup.UUID> of(),
ImmutableSet.<AccountExternalId> of());
return new AccountState(account, ImmutableSet.<AccountGroup.UUID> of(),
ImmutableSet.<AccountExternalId> of(),
ImmutableSet.<AccountProjectWatch> of());
}
}