opendev/gerrit
Code Issues Proposed changes

Merge "Add AccountQueryProcessor"

Browse Source
This commit is contained in:
Edwin Kempin
2016-06-24 13:43:09 +00:00
committed by Gerrit Code Review
parent b644ff8fcf aa332ab1c2
commit fdb8d1e8ac
13 changed files with 453 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gerrit-server/src/test/java/com/google/gerrit/server/index/change/ChangeIndexRewriterTest.java
View File

@@ -35,6 +35,7 @@ import com.google.gerrit.server.query.QueryParseException;
import com.google.gerrit.server.query.change.AndSource;
import com.google.gerrit.server.query.change.ChangeData;
import com.google.gerrit.server.query.change.ChangeQueryBuilder;
import com.google.gerrit.server.query.change.ChangeStatusPredicate;
import com.google.gerrit.server.query.change.OrSource;
import com.google.gerrit.testutil.GerritBaseTests;
@@ -72,7 +73,11 @@ public class ChangeIndexRewriterTest extends GerritBaseTests {
@Test
public void testNonIndexPredicate() throws Exception {
Predicate<ChangeData> in = parse("foo:a");
assertThat(in).isSameAs(rewrite(in));
Predicate<ChangeData> out = rewrite(in);
assertThat(AndSource.class).isSameAs(out.getClass());
assertThat(out.getChildren())
.containsExactly(query(ChangeStatusPredicate.open()), in)
.inOrder();
}
@Test
@@ -84,7 +89,11 @@ public class ChangeIndexRewriterTest extends GerritBaseTests {
@Test
public void testNonIndexPredicates() throws Exception {
Predicate<ChangeData> in = parse("foo:a OR foo:b");
assertThat(in).isEqualTo(rewrite(in));
Predicate<ChangeData> out = rewrite(in);
assertThat(AndSource.class).isSameAs(out.getClass());
assertThat(out.getChildren())
.containsExactly(query(ChangeStatusPredicate.open()), in)
.inOrder();
}
@Test

10
gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
View File

@@ -126,7 +126,7 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests {
@Inject protected ChangeNotes.Factory notesFactory;
@Inject protected PatchSetInserter.Factory patchSetFactory;
@Inject protected ChangeControl.GenericFactory changeControlFactory;
@Inject protected QueryProcessor queryProcessor;
@Inject protected ChangeQueryProcessor queryProcessor;
@Inject protected SchemaCreator schemaCreator;
@Inject protected Sequences seq;
@Inject protected ThreadLocalRequestContext requestContext;
@@ -1460,8 +1460,8 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests {
requestContext.setContext(newRequestContext(userId));
// Use QueryProcessor directly instead of API so we get ChangeDatas back.
List<ChangeData> cds = queryProcessor
.queryChanges(queryBuilder.parse(change.getId().toString()))
.changes();
.query(queryBuilder.parse(change.getId().toString()))
.entities();
assertThat(cds).hasSize(1);
ChangeData cd = cds.get(0);
@@ -1493,8 +1493,8 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests {
.setRequestedFields(ImmutableSet.of(
ChangeField.PATCH_SET.getName(),
ChangeField.CHANGE.getName()))
.queryChanges(queryBuilder.parse(change.getId().toString()))
.changes();
.query(queryBuilder.parse(change.getId().toString()))
.entities();
assertThat(cds).hasSize(1);
ChangeData cd = cds.get(0);