Add a handful of tests for querying changes

This covers a good fraction of search operators for both SQL and
Lucene index types. Over the course of this several bugs and
inconsistencies in the existing implementations were discovered; some
have been fixed in previous changes, and some have the corresponding
assertions commented out in this change.

In addition to the few simple operators not yet covered, we do not yet
test many forms of compound queries.

Change-Id: I6e14116a56fc2a352f99bea930d6aed297c0749d

gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java

@@ -16,6 +16,7 @@ package com.google.gerrit.server;
 
 import static com.google.gerrit.server.change.PatchSetInserter.ValidatePolicy.RECEIVE_COMMITS;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.gerrit.common.ChangeHooks;
 import com.google.gerrit.common.errors.EmailException;
 import com.google.gerrit.reviewdb.client.Change;
@@ -35,7 +36,6 @@ import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
 import com.google.gerrit.server.git.GitRepositoryManager;
 import com.google.gerrit.server.git.validators.CommitValidationException;
 import com.google.gerrit.server.git.validators.CommitValidators;
-
 import com.google.gerrit.server.index.ChangeIndexer;
 import com.google.gerrit.server.mail.CommitMessageEditedSender;
 import com.google.gerrit.server.mail.RevertedSender;
@@ -80,7 +80,9 @@ import java.util.Set;
 import java.util.regex.Matcher;
 
 public class ChangeUtil {
-  private static final long SORT_KEY_EPOCH = 1222819200L; // Oct 1 2008 00:00
+  @VisibleForTesting
+  public static final long SORT_KEY_EPOCH = 1222819200L; // Oct 1 2008 00:00
+
   private static final Object uuidLock = new Object();
   private static final int SEED = 0x2418e6f9;
   private static int uuidPrefix;

gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java

@@ -113,6 +113,10 @@ public class ChangeInserter {
     ChangeUtil.computeSortKey(change);
   }
 
+  public Change getChange() {
+    return change;
+  }
+
   public ChangeInserter setMessage(ChangeMessage changeMessage) {
     this.changeMessage = changeMessage;
     return this;
@@ -152,7 +156,7 @@ public class ChangeInserter {
     return patchSetInfo;
   }
 
-  public void insert() throws OrmException, IOException {
+  public Change insert() throws OrmException, IOException {
     ReviewDb db = dbProvider.get();
     db.changes().beginTransaction(change.getId());
     try {
@@ -193,5 +197,6 @@ public class ChangeInserter {
       }
     }
     indexFuture.checkedGet();
+    return change;
   }
 }

gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java

@@ -49,6 +49,7 @@ import com.google.gerrit.server.index.ChangeIndexer;
 import com.google.gerrit.server.project.ChangeControl;
 import com.google.gwtorm.server.OrmException;
 import com.google.inject.Inject;
+import com.google.inject.Provider;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -68,7 +69,7 @@ public class PostReview implements RestModifyView<RevisionResource, Input> {
     public String message;
 
     public Map<String, Short> labels;
-    Map<String, List<Comment>> comments;
+    public Map<String, List<Comment>> comments;
 
     /**
      * If true require all labels to be within the user's permitted ranges based
@@ -110,20 +111,20 @@ public class PostReview implements RestModifyView<RevisionResource, Input> {
     NONE, OWNER, OWNER_REVIEWERS, ALL;
   }
 
-  static class Comment {
+  public static class Comment {
-    String id;
+    public String id;
-    Side side;
+    public Side side;
-    int line;
+    public int line;
-    String inReplyTo;
+    public String inReplyTo;
-    String message;
+    public String message;
-    CommentRange range;
+    public CommentRange range;
   }
 
   static class Output {
     Map<String, Short> labels;
   }
 
-  private final ReviewDb db;
+  private final Provider<ReviewDb> db;
   private final ChangeIndexer indexer;
   private final AccountsCollection accounts;
   private final EmailReviewComments.Factory email;
@@ -137,7 +138,7 @@ public class PostReview implements RestModifyView<RevisionResource, Input> {
   private Map<String, Short> categories = Maps.newHashMap();
 
   @Inject
-  PostReview(ReviewDb db,
+  PostReview(Provider<ReviewDb> db,
       ChangeIndexer indexer,
       AccountsCollection accounts,
       EmailReviewComments.Factory email,
@@ -167,10 +168,10 @@ public class PostReview implements RestModifyView<RevisionResource, Input> {
       input.notify = NotifyHandling.NONE;
     }
 
-    db.changes().beginTransaction(revision.getChange().getId());
+    db.get().changes().beginTransaction(revision.getChange().getId());
     boolean dirty = false;
     try {
-      change = db.changes().get(revision.getChange().getId());
+      change = db.get().changes().get(revision.getChange().getId());
       ChangeUtil.updated(change);
       timestamp = change.getLastUpdatedOn();
 
@@ -178,11 +179,11 @@ public class PostReview implements RestModifyView<RevisionResource, Input> {
       dirty |= updateLabels(revision, input.labels);
       dirty |= insertMessage(revision, input.message);
       if (dirty) {
-        db.changes().update(Collections.singleton(change));
+        db.get().changes().update(Collections.singleton(change));
-        db.commit();
+        db.get().commit();
       }
     } finally {
-      db.rollback();
+      db.get().rollback();
     }
 
     CheckedFuture<?, IOException> indexWrite;
@@ -357,7 +358,7 @@ public class PostReview implements RestModifyView<RevisionResource, Input> {
           e = new PatchLineComment(
               new PatchLineComment.Key(
                   new Patch.Key(rsrc.getPatchSet().getId(), path),
-                  ChangeUtil.messageUUID(db)),
+                  ChangeUtil.messageUUID(db.get())),
               c.line,
               rsrc.getAccountId(),
               parent);
@@ -388,9 +389,9 @@ public class PostReview implements RestModifyView<RevisionResource, Input> {
         }
         break;
     }
-    db.patchComments().delete(del);
+    db.get().patchComments().delete(del);
-    db.patchComments().insert(ins);
+    db.get().patchComments().insert(ins);
-    db.patchComments().update(upd);
+    db.get().patchComments().update(upd);
     comments.addAll(ins);
     comments.addAll(upd);
     return !del.isEmpty() || !ins.isEmpty() || !upd.isEmpty();
@@ -399,7 +400,7 @@ public class PostReview implements RestModifyView<RevisionResource, Input> {
   private Map<String, PatchLineComment> scanDraftComments(
       RevisionResource rsrc) throws OrmException {
     Map<String, PatchLineComment> drafts = Maps.newHashMap();
-    for (PatchLineComment c : db.patchComments().draftByPatchSetAuthor(
+    for (PatchLineComment c : db.get().patchComments().draftByPatchSetAuthor(
           rsrc.getPatchSet().getId(),
           rsrc.getAccountId())) {
       drafts.put(c.getKey().get(), c);
@@ -461,9 +462,9 @@ public class PostReview implements RestModifyView<RevisionResource, Input> {
     }
 
     forceCallerAsReviewer(rsrc, current, ins, upd, del);
-    db.patchSetApprovals().delete(del);
+    db.get().patchSetApprovals().delete(del);
-    db.patchSetApprovals().insert(ins);
+    db.get().patchSetApprovals().insert(ins);
-    db.patchSetApprovals().update(upd);
+    db.get().patchSetApprovals().update(upd);
     return !del.isEmpty() || !ins.isEmpty() || !upd.isEmpty();
   }
 
@@ -501,7 +502,7 @@ public class PostReview implements RestModifyView<RevisionResource, Input> {
       List<PatchSetApproval> del) throws OrmException {
     LabelTypes labelTypes = rsrc.getControl().getLabelTypes();
     Map<String, PatchSetApproval> current = Maps.newHashMap();
-    for (PatchSetApproval a : db.patchSetApprovals().byPatchSetUser(
+    for (PatchSetApproval a : db.get().patchSetApprovals().byPatchSetUser(
           rsrc.getPatchSet().getId(), rsrc.getAccountId())) {
       if (a.isSubmit()) {
         continue;
@@ -548,7 +549,7 @@ public class PostReview implements RestModifyView<RevisionResource, Input> {
     }
 
     message = new ChangeMessage(
-        new ChangeMessage.Key(change.getId(), ChangeUtil.messageUUID(db)),
+        new ChangeMessage.Key(change.getId(), ChangeUtil.messageUUID(db.get())),
         rsrc.getAccountId(),
         timestamp,
         rsrc.getPatchSet().getId());
@@ -556,7 +557,7 @@ public class PostReview implements RestModifyView<RevisionResource, Input> {
         "Patch Set %d:%s",
         rsrc.getPatchSet().getPatchSetId(),
         buf.toString()));
-    db.changeMessages().insert(Collections.singleton(message));
+    db.get().changeMessages().insert(Collections.singleton(message));
     return true;
   }
 
@@ -568,7 +569,7 @@ public class PostReview implements RestModifyView<RevisionResource, Input> {
           user.getAccount(),
           rsrc.getPatchSet(),
           message.getMessage(),
-          categories, db);
+          categories, db.get());
     } catch (OrmException e) {
       log.warn("ChangeHook.doCommentAddedHook delivery failed", e);
     }

gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractIndexQueryChangesTest.java

@@ -0,0 +1,87 @@
+// Copyright (C) 2013 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.package com.google.gerrit.server.git;
+
+package com.google.gerrit.server.query.change;
+
+import static org.junit.Assert.assertTrue;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.gerrit.reviewdb.client.Change;
+import com.google.gerrit.server.change.ChangeInserter;
+import com.google.gerrit.server.change.ChangeResource;
+import com.google.gerrit.server.change.PostReview;
+import com.google.gerrit.server.change.RevisionResource;
+import com.google.gerrit.server.project.ChangeControl;
+
+import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository;
+import org.eclipse.jgit.junit.TestRepository;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import java.util.List;
+
+@Ignore
+public abstract class AbstractIndexQueryChangesTest
+    extends AbstractQueryChangesTest {
+  @Test
+  public void byFileExact() throws Exception {
+    TestRepository<InMemoryRepository> repo = createProject("repo");
+    RevCommit commit = repo.parseBody(
+        repo.commit().message("one")
+        .add("file1", "contents1").add("file2", "contents2")
+        .create());
+    Change change = newChange(repo, commit, null, null, null).insert();
+
+    assertTrue(query("file:file").isEmpty());
+    assertResultEquals(change, queryOne("file:file1"));
+    assertResultEquals(change, queryOne("file:file2"));
+  }
+
+  @Test
+  public void byFileRegex() throws Exception {
+    TestRepository<InMemoryRepository> repo = createProject("repo");
+    RevCommit commit = repo.parseBody(
+        repo.commit().message("one")
+        .add("file1", "contents1").add("file2", "contents2")
+        .create());
+    Change change = newChange(repo, commit, null, null, null).insert();
+
+    assertTrue(query("file:file.*").isEmpty());
+    assertResultEquals(change, queryOne("file:^file.*"));
+  }
+
+  @Test
+  public void byComment() throws Exception {
+    TestRepository<InMemoryRepository> repo = createProject("repo");
+    ChangeInserter ins = newChange(repo, null, null, null, null);
+    Change change = ins.insert();
+    ChangeControl ctl = changeControlFactory.controlFor(change, user);
+
+    PostReview.Input input = new PostReview.Input();
+    input.message = "toplevel";
+    PostReview.Comment comment = new PostReview.Comment();
+    comment.line = 1;
+    comment.message = "inline";
+    input.comments = ImmutableMap.<String, List<PostReview.Comment>> of(
+        "Foo.java", ImmutableList.<PostReview.Comment> of(comment));
+    postReview.apply(new RevisionResource(
+        new ChangeResource(ctl), ins.getPatchSet()), input);
+
+    assertTrue(query("comment:foo").isEmpty());
+    assertResultEquals(change, queryOne("comment:toplevel"));
+    assertResultEquals(change, queryOne("comment:inline"));
+  }
+}

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

@@ -17,6 +17,11 @@ package com.google.gerrit.server.query.change;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import com.google.common.base.Charsets;
+import com.google.common.base.Objects;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.hash.Hashing;
+import com.google.gerrit.common.Nullable;
 import com.google.gerrit.extensions.restapi.TopLevelResource;
 import com.google.gerrit.lifecycle.LifecycleManager;
 import com.google.gerrit.reviewdb.client.Account;
@@ -24,16 +29,19 @@ import com.google.gerrit.reviewdb.client.Branch;
 import com.google.gerrit.reviewdb.client.Change;
 import com.google.gerrit.reviewdb.client.Project;
 import com.google.gerrit.reviewdb.server.ReviewDb;
+import com.google.gerrit.server.ChangeUtil;
 import com.google.gerrit.server.CurrentUser;
 import com.google.gerrit.server.IdentifiedUser;
 import com.google.gerrit.server.account.AccountManager;
 import com.google.gerrit.server.account.AuthRequest;
 import com.google.gerrit.server.change.ChangeInserter;
 import com.google.gerrit.server.change.ChangeJson.ChangeInfo;
+import com.google.gerrit.server.change.ChangeResource;
+import com.google.gerrit.server.change.PostReview;
+import com.google.gerrit.server.change.RevisionResource;
+import com.google.gerrit.server.project.ChangeControl;
 import com.google.gerrit.server.project.CreateProject;
-import com.google.gerrit.server.project.NoSuchProjectException;
 import com.google.gerrit.server.project.ProjectControl;
-import com.google.gerrit.server.project.RefControl;
 import com.google.gerrit.server.schema.SchemaCreator;
 import com.google.gerrit.server.util.RequestContext;
 import com.google.gerrit.server.util.ThreadLocalRequestContext;
@@ -52,25 +60,32 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import java.io.IOException;
+import java.sql.Timestamp;
 import java.util.List;
 
 @Ignore
 public abstract class AbstractQueryChangesTest {
-  @Inject private AccountManager accountManager;
+  private static final TopLevelResource TLR = TopLevelResource.INSTANCE;
-  @Inject private ChangeInserter.Factory changeFactory;
-  @Inject private CreateProject.Factory projectFactory;
-  @Inject private IdentifiedUser.RequestFactory userFactory;
-  @Inject private InMemoryDatabase schemaFactory;
-  @Inject private InMemoryRepositoryManager repoManager;
-  @Inject private ProjectControl.GenericFactory projectControlFactory;
-  @Inject private Provider<QueryChanges> queryProvider;
-  @Inject private SchemaCreator schemaCreator;
-  @Inject private ThreadLocalRequestContext requestContext;
 
-  private LifecycleManager lifecycle;
+  @Inject protected AccountManager accountManager;
-  private ReviewDb db;
+  @Inject protected ChangeControl.GenericFactory changeControlFactory;
-  private Account.Id user;
+  @Inject protected ChangeInserter.Factory changeFactory;
+  @Inject protected CreateProject.Factory projectFactory;
+  @Inject protected IdentifiedUser.RequestFactory userFactory;
+  @Inject protected InMemoryDatabase schemaFactory;
+  @Inject protected InMemoryRepositoryManager repoManager;
+  @Inject protected PostReview postReview;
+  @Inject protected ProjectControl.GenericFactory projectControlFactory;
+  @Inject protected Provider<QueryChanges> queryProvider;
+  @Inject protected SchemaCreator schemaCreator;
+  @Inject protected ThreadLocalRequestContext requestContext;
+
+  protected LifecycleManager lifecycle;
+  protected ReviewDb db;
+  protected Account.Id userId;
+  protected CurrentUser user;
+  protected int clockStepMs = 1;
+  private long ts = ChangeUtil.SORT_KEY_EPOCH * 1000;
 
   protected abstract Injector createInjector();
 
@@ -84,13 +99,14 @@ public abstract class AbstractQueryChangesTest {
 
     db = schemaFactory.open();
     schemaCreator.create(db);
-    user = accountManager.authenticate(AuthRequest.forUser("user"))
+    userId = accountManager.authenticate(AuthRequest.forUser("user"))
         .getAccountId();
+    user = userFactory.create(userId);
 
     requestContext.setContext(new RequestContext() {
       @Override
       public CurrentUser getCurrentUser() {
-        return userFactory.create(user);
+        return user;
       }
 
       @Override
@@ -111,51 +127,342 @@ public abstract class AbstractQueryChangesTest {
   @Test
   public void byId() throws Exception {
     TestRepository<InMemoryRepository> repo = createProject("repo");
-    RevCommit commit = repo.parseBody(repo.commit().message("message").create());
+    Change change1 = newChange(repo, null, null, null, null).insert();
-    Change change = new Change(
+    Change change2 = newChange(repo, null, null, null, null).insert();
-        new Change.Key("I1234567890123456789012345678901234567890"),
-        new Change.Id(db.nextChangeId()),
-        user,
-        new Branch.NameKey(new Project.NameKey("repo"), "refs/heads/master"));
-    ChangeInserter ins = changeFactory.create(
-        refControl("repo", change),
-        change,
-        commit);
-    ins.insert();
 
-    int id = change.getId().get();
+    assertTrue(query("12345").isEmpty());
-    ChangeInfo result = queryOne(Integer.toString(id));
+    assertResultEquals(change1, queryOne(change1.getId().get()));
-    assertEquals(id, result._number);
+    assertResultEquals(change2, queryOne(change2.getId().get()));
   }
 
-  private TestRepository<InMemoryRepository> createProject(String name) throws Exception {
+  @Test
+  public void byKey() throws Exception {
+    TestRepository<InMemoryRepository> repo = createProject("repo");
+    Change change = newChange(repo, null, null, null, null).insert();
+    String key = change.getKey().get();
+
+    assertTrue(query("I0000000000000000000000000000000000000000").isEmpty());
+    for (int i = 0; i <= 36; i++) {
+      String q = key.substring(0, 41 - i);
+      assertResultEquals("result for " + q, change, queryOne(q));
+    }
+  }
+
+  @Test
+  public void byStatus() throws Exception {
+    TestRepository<InMemoryRepository> repo = createProject("repo");
+    ChangeInserter ins1 = newChange(repo, null, null, null, null);
+    Change change1 = ins1.getChange();
+    change1.setStatus(Change.Status.NEW);
+    ins1.insert();
+    ChangeInserter ins2 = newChange(repo, null, null, null, null);
+    Change change2 = ins2.getChange();
+    change2.setStatus(Change.Status.MERGED);
+    ins2.insert();
+
+    assertResultEquals(change1, queryOne("status:new"));
+    assertResultEquals(change1, queryOne("is:new"));
+    assertResultEquals(change2, queryOne("status:merged"));
+    assertResultEquals(change2, queryOne("is:merged"));
+  }
+
+  @Test
+  public void byStatusOpen() throws Exception {
+    TestRepository<InMemoryRepository> repo = createProject("repo");
+    ChangeInserter ins1 = newChange(repo, null, null, null, null);
+    Change change1 = ins1.getChange();
+    change1.setStatus(Change.Status.NEW);
+    ins1.insert();
+    ChangeInserter ins2 = newChange(repo, null, null, null, null);
+    Change change2 = ins2.getChange();
+    change2.setStatus(Change.Status.DRAFT);
+    ins2.insert();
+    ChangeInserter ins3 = newChange(repo, null, null, null, null);
+    Change change3 = ins3.getChange();
+    change3.setStatus(Change.Status.MERGED);
+    ins3.insert();
+
+    List<ChangeInfo> results;
+    results = query("status:open");
+    assertEquals(2, results.size());
+    assertResultEquals(change2, results.get(0));
+    assertResultEquals(change1, results.get(1));
+    results = query("is:open");
+    assertEquals(2, results.size());
+    assertResultEquals(change2, results.get(0));
+    assertResultEquals(change1, results.get(1));
+  }
+
+  @Test
+  public void byStatusClosed() throws Exception {
+    TestRepository<InMemoryRepository> repo = createProject("repo");
+    ChangeInserter ins1 = newChange(repo, null, null, null, null);
+    Change change1 = ins1.getChange();
+    change1.setStatus(Change.Status.MERGED);
+    ins1.insert();
+    ChangeInserter ins2 = newChange(repo, null, null, null, null);
+    Change change2 = ins2.getChange();
+    change2.setStatus(Change.Status.ABANDONED);
+    ins2.insert();
+    ChangeInserter ins3 = newChange(repo, null, null, null, null);
+    Change change3 = ins3.getChange();
+    change3.setStatus(Change.Status.NEW);
+    ins3.insert();
+
+    List<ChangeInfo> results;
+    results = query("status:closed");
+    assertEquals(2, results.size());
+    assertResultEquals(change2, results.get(0));
+    assertResultEquals(change1, results.get(1));
+    results = query("is:closed");
+    assertEquals(2, results.size());
+    assertResultEquals(change2, results.get(0));
+    assertResultEquals(change1, results.get(1));
+  }
+
+  @Test
+  public void byCommit() throws Exception {
+    TestRepository<InMemoryRepository> repo = createProject("repo");
+    ChangeInserter ins = newChange(repo, null, null, null, null);
+    ins.insert();
+    String sha = ins.getPatchSet().getRevision().get();
+
+    assertTrue(query("0000000000000000000000000000000000000000").isEmpty());
+    for (int i = 0; i <= 36; i++) {
+      String q = sha.substring(0, 40 - i);
+      assertResultEquals("result for " + q, ins.getChange(), queryOne(q));
+    }
+  }
+
+  @Test
+  public void byOwner() throws Exception {
+    TestRepository<InMemoryRepository> repo = createProject("repo");
+    Change change1 = newChange(repo, null, null, userId.get(), null).insert();
+    int user2 = accountManager.authenticate(AuthRequest.forUser("anotheruser"))
+        .getAccountId().get();
+    Change change2 = newChange(repo, null, null, user2, null).insert();
+
+    assertResultEquals(change1, queryOne("owner:" + userId.get()));
+    assertResultEquals(change2, queryOne("owner:" + user2));
+  }
+
+  @Test
+  public void byOwnerIn() throws Exception {
+    TestRepository<InMemoryRepository> repo = createProject("repo");
+    Change change1 = newChange(repo, null, null, userId.get(), null).insert();
+    int user2 = accountManager.authenticate(AuthRequest.forUser("anotheruser"))
+        .getAccountId().get();
+    Change change2 = newChange(repo, null, null, user2, null).insert();
+
+    assertResultEquals(change1, queryOne("ownerin:Administrators"));
+    List<ChangeInfo> results = query("ownerin:\"Registered Users\"");
+    assertEquals(results.toString(), 2, results.size());
+    assertResultEquals(change2, results.get(0));
+    assertResultEquals(change1, results.get(1));
+  }
+
+  @Test
+  public void byProject() throws Exception {
+    TestRepository<InMemoryRepository> repo1 = createProject("repo1");
+    TestRepository<InMemoryRepository> repo2 = createProject("repo2");
+    Change change1 = newChange(repo1, null, null, null, null).insert();
+    Change change2 = newChange(repo2, null, null, null, null).insert();
+
+    assertTrue(query("project:foo").isEmpty());
+    assertResultEquals(change1, queryOne("project:repo1"));
+    assertResultEquals(change2, queryOne("project:repo2"));
+  }
+
+  @Test
+  public void byBranchAndRef() throws Exception {
+    TestRepository<InMemoryRepository> repo = createProject("repo");
+    Change change1 = newChange(repo, null, null, null, "master").insert();
+    Change change2 = newChange(repo, null, null, null, "branch").insert();
+
+    assertTrue(query("branch:foo").isEmpty());
+    assertResultEquals(change1, queryOne("branch:master"));
+    assertResultEquals(change1, queryOne("branch:refs/heads/master"));
+    assertTrue(query("ref:master").isEmpty());
+    assertResultEquals(change1, queryOne("ref:refs/heads/master"));
+    assertResultEquals(change1, queryOne("branch:refs/heads/master"));
+    assertResultEquals(change2, queryOne("branch:branch"));
+    assertResultEquals(change2, queryOne("branch:refs/heads/branch"));
+    assertTrue(query("ref:branch").isEmpty());
+    assertResultEquals(change2, queryOne("ref:refs/heads/branch"));
+  }
+
+  @Test
+  public void byTopic() throws Exception {
+    TestRepository<InMemoryRepository> repo = createProject("repo");
+    ChangeInserter ins1 = newChange(repo, null, null, null, null);
+    Change change1 = ins1.getChange();
+    change1.setTopic("feature1");
+    ins1.insert();
+    ChangeInserter ins2 = newChange(repo, null, null, null, null);
+    Change change2 = ins2.getChange();
+    change2.setTopic("feature2");
+    ins2.insert();
+
+    assertTrue(query("topic:foo").isEmpty());
+    assertResultEquals(change1, queryOne("topic:feature1"));
+    assertResultEquals(change2, queryOne("topic:feature2"));
+  }
+
+  @Test
+  public void byMessageExact() throws Exception {
+    TestRepository<InMemoryRepository> repo = createProject("repo");
+    RevCommit commit1 = repo.parseBody(repo.commit().message("one").create());
+    Change change1 = newChange(repo, commit1, null, null, null).insert();
+    RevCommit commit2 = repo.parseBody(repo.commit().message("two").create());
+    Change change2 = newChange(repo, commit2, null, null, null).insert();
+
+    assertTrue(query("topic:foo").isEmpty());
+    assertResultEquals(change1, queryOne("message:one"));
+    assertResultEquals(change2, queryOne("message:two"));
+  }
+
+  @Test
+  public void byLabel() throws Exception {
+    accountManager.authenticate(AuthRequest.forUser("anotheruser"));
+    TestRepository<InMemoryRepository> repo = createProject("repo");
+    ChangeInserter ins = newChange(repo, null, null, null, null);
+    Change change = ins.insert();
+    ChangeControl ctl = changeControlFactory.controlFor(change, user);
+
+    PostReview.Input input = new PostReview.Input();
+    input.message = "toplevel";
+    input.labels = ImmutableMap.<String, Short> of("Code-Review", (short) 1);
+    postReview.apply(new RevisionResource(
+        new ChangeResource(ctl), ins.getPatchSet()), input);
+
+    assertTrue(query("label:Code-Review=-2").isEmpty());
+    assertTrue(query("label:Code-Review-2").isEmpty());
+    assertTrue(query("label:Code-Review=-1").isEmpty());
+    assertTrue(query("label:Code-Review-1").isEmpty());
+    assertTrue(query("label:Code-Review=0").isEmpty());
+    assertResultEquals(change, queryOne("label:Code-Review=+1"));
+    assertResultEquals(change, queryOne("label:Code-Review=1"));
+    assertResultEquals(change, queryOne("label:Code-Review+1"));
+    assertTrue(query("label:Code-Review=+2").isEmpty());
+    assertTrue(query("label:Code-Review=2").isEmpty());
+    assertTrue(query("label:Code-Review+2").isEmpty());
+
+    // TODO(dborowitz): > and < are broken at head.
+
+    assertResultEquals(change, queryOne("label:Code-Review>=0"));
+    //assertResultEquals(change, queryOne("label:Code-Review>0"));
+    assertResultEquals(change, queryOne("label:Code-Review>=1"));
+    //assertTrue(query("label:Code-Review>1").isEmpty());
+    assertTrue(query("label:Code-Review>=2").isEmpty());
+
+    assertResultEquals(change, queryOne("label: Code-Review<=2"));
+    //assertResultEquals(change, queryOne("label: Code-Review<2"));
+    assertResultEquals(change, queryOne("label: Code-Review<=1"));
+    //assertTrue(query("label: Code-Review<1").isEmpty());
+    assertTrue(query("label: Code-Review<=0").isEmpty());
+
+    assertTrue(query("label:Code-Review=+1,anotheruser").isEmpty());
+    assertResultEquals(change, queryOne("label:Code-Review=+1,user"));
+    assertResultEquals(change, queryOne("label:Code-Review=+1,user=user"));
+    assertResultEquals(change, queryOne("label:Code-Review=+1,Administrators"));
+    assertResultEquals(change, queryOne("label:Code-Review=+1,group=Administrators"));
+  }
+
+  @Test
+  public void limit() throws Exception {
+    TestRepository<InMemoryRepository> repo = createProject("repo");
+    Change change1 = newChange(repo, null, null, null, null).insert();
+    Change change2 = newChange(repo, null, null, null, null).insert();
+
+    // TODO(dborowitz): Limit is broken in SQL (returns N+1 results) with some
+    // kinds of predicates but not others.
+    //assertResultEquals(change2, queryOne("status:new limit:1"));
+    List<ChangeInfo> results = query("status:new limit:2");
+    assertEquals(2, results.size());
+    assertResultEquals(change2, results.get(0));
+    assertResultEquals(change1, results.get(1));
+  }
+
+  protected ChangeInserter newChange(
+      TestRepository<InMemoryRepository> repo,
+      @Nullable RevCommit commit, @Nullable String key, @Nullable Integer owner,
+      @Nullable String branch) throws Exception {
+    if (commit == null) {
+      commit = repo.parseBody(repo.commit().message("message").create());
+    }
+    Account.Id ownerId = owner != null ? new Account.Id(owner) : userId;
+    branch = Objects.firstNonNull(branch, "refs/heads/master");
+    if (!branch.startsWith("refs/heads/")) {
+      branch = "refs/heads/" + branch;
+    }
+    Project.NameKey project = new Project.NameKey(
+        repo.getRepository().getDescription().getRepositoryName());
+
+    Change.Id id = new Change.Id(db.nextChangeId());
+    if (key == null) {
+      key = "I" + Hashing.sha1().newHasher()
+          .putInt(id.get())
+          .putString(project.get(), Charsets.UTF_8)
+          .putString(commit.name(), Charsets.UTF_8)
+          .putInt(ownerId.get())
+          .putString(branch, Charsets.UTF_8)
+          .hash()
+          .toString();
+    }
+
+    Change change = new Change(new Change.Key(key), id, ownerId,
+        new Branch.NameKey(project, branch));
+    change.setLastUpdatedOn(new Timestamp(ts));
+    ts += clockStepMs;
+    return changeFactory.create(
+        projectControlFactory.controlFor(project,
+          userFactory.create(ownerId)).controlFor(change).getRefControl(),
+        change,
+        commit);
+  }
+
+  protected void assertResultEquals(Change expected, ChangeInfo actual) {
+    assertEquals(expected.getId().get(), actual._number);
+  }
+
+  protected void assertResultEquals(String message, Change expected,
+      ChangeInfo actual) {
+    assertEquals(message, expected.getId().get(), actual._number);
+  }
+
+  protected TestRepository<InMemoryRepository> createProject(String name)
+      throws Exception {
     CreateProject create = projectFactory.create(name);
-    create.apply(TopLevelResource.INSTANCE, new CreateProject.Input());
+    create.apply(TLR, new CreateProject.Input());
     return new TestRepository<InMemoryRepository>(
         repoManager.openRepository(new Project.NameKey(name)));
   }
 
-  private RefControl refControl(String repo, Change change)
+  @SuppressWarnings({"rawtypes", "unchecked"})
-      throws NoSuchProjectException, IOException {
+  protected List<ChangeInfo> query(Object query) throws Exception {
-        return projectControlFactory.controlFor(
+    QueryChanges q = queryProvider.get();
-            new Project.NameKey(repo),
+    q.addQuery(query.toString());
-            userFactory.create(user)).controlFor(change).getRefControl();
+    Object result = q.apply(TLR);
+    assertTrue(
+        String.format("expected List<ChangeInfo>, found %s for [%s]",
+          result, query),
+        result instanceof List);
+    List results = (List) result;
+    if (!results.isEmpty()) {
+      assertTrue(
+          String.format("expected ChangeInfo, found %s for [%s]",
+            result, query),
+          results.get(0) instanceof ChangeInfo);
+    }
+    return (List<ChangeInfo>) result;
   }
 
-  private ChangeInfo queryOne(String query) throws Exception {
+  protected ChangeInfo queryOne(Object query) throws Exception {
-    QueryChanges q = queryProvider.get();
+    List<ChangeInfo> results = query(query);
-    q.addQuery(query);
+    assertTrue(
-    Object result = q.apply(TopLevelResource.INSTANCE);
+        String.format("expected singleton List<ChangeInfo>, found %s for [%s]",
-    assertTrue(String.format("expected List<ChangeInfo>, found %s", result),
+          results, query),
-        result instanceof List);
-    @SuppressWarnings("rawtypes")
-    List results = (List) result;
-    assertTrue(String.format(
-        "expected singleton List<ChangeInfo>, found %s", result),
         results.size() == 1);
-    Object ci = results.get(0);
+    return results.get(0);
-    assertTrue(String.format("expected ChangeInfo, found %s", result),
-        ci instanceof ChangeInfo);
-    return (ChangeInfo) ci;
   }
 }

gerrit-server/src/test/java/com/google/gerrit/server/query/change/LuceneQueryChangesTest.java

@@ -20,7 +20,7 @@ import com.google.inject.Injector;
 
 import org.eclipse.jgit.lib.Config;
 
-public class LuceneQueryChangesTest extends AbstractQueryChangesTest {
+public class LuceneQueryChangesTest extends AbstractIndexQueryChangesTest {
   protected Injector createInjector() {
     Config cfg = InMemoryModule.newDefaultConfig();
     cfg.setString("index", null, "type", "lucene");

gerrit-server/src/test/java/com/google/gerrit/testutil/InMemoryModule.java

@@ -17,9 +17,6 @@ package com.google.gerrit.testutil;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.inject.Scopes.SINGLETON;
 
-import com.google.common.base.Enums;
-import com.google.common.base.Objects;
-import com.google.common.base.Optional;
 import com.google.gerrit.common.ChangeHooks;
 import com.google.gerrit.common.DisabledChangeHooks;
 import com.google.gerrit.lucene.LuceneIndexModule;
@@ -159,11 +156,14 @@ public class InMemoryModule extends FactoryModule {
     install(new SmtpEmailSender.Module());
     install(new SignedTokenEmailTokenVerifier.Module());
 
-    String indexTypeStr = cfg.getString("index", null, "type");
+    IndexType indexType = null;
-    Optional<IndexType> indexType = Enums.getIfPresent(IndexType.class,
+    try {
-        Objects.firstNonNull(indexTypeStr, IndexType.SQL.toString()));
+      indexType = cfg.getEnum("index", null, "type", IndexType.SQL);
-    if (indexType.isPresent()) {
+    } catch (IllegalArgumentException e) {
-      switch (indexType.get()) {
+      // Custom index type, caller must provide their own module.
+    }
+    if (indexType != null) {
+      switch (indexType) {
         case LUCENE:
           int version = cfg.getInt("index", "lucene", "testVersion", -1);
           checkState(ChangeSchemas.ALL.containsKey(version),
@@ -177,8 +177,6 @@ public class InMemoryModule extends FactoryModule {
           throw new ProvisionException(
               "index type unsupported in tests: " + indexType);
       }
-    } else {
-      // Custom index type, caller must provide their own module.
     }
   }