opendev/gerrit
Code Issues Proposed changes

Rewrite query tests to better use Truth

Browse Source 
Instead of asserting about individual changes in order, use
containsExactlyElementsIn(...).inOrder(). Rewrite query helper
methods so empty/non-empty assertions line up better.

Change-Id: Ib4b2a0727caa4b483e03b488d5373a0ee0009769
This commit is contained in:
Dave Borowitz
2015-04-11 11:33:06 -04:00
committed by David Pursehouse
parent e313b93bc2
commit 7f678a2352
4 changed files with 323 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/Changes.java
View File

@@ -116,6 +116,23 @@ public interface Changes {
public EnumSet<ListChangesOption> getOptions() { public EnumSet<ListChangesOption> getOptions() {
return options; return options;
} }
@Override
public String toString() {
StringBuilder sb = new StringBuilder(getClass().getSimpleName())
.append('{')
.append(query);
if (limit != 0) {
sb.append(", limit=").append(limit);
}
if (start != 0) {
sb.append(", start=").append(start);
}
if (!options.isEmpty()) {
sb.append("options=").append(options);
}
return sb.append('}').toString();
}
} }
/** /**

3
gerrit-server/src/main/java/com/google/gerrit/server/api/changes/ChangesImpl.java
View File

@@ -24,7 +24,6 @@ import com.google.gerrit.extensions.api.changes.Changes;
import com.google.gerrit.extensions.client.ListChangesOption; import com.google.gerrit.extensions.client.ListChangesOption;
import com.google.gerrit.extensions.common.ChangeInfo; import com.google.gerrit.extensions.common.ChangeInfo;
import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.extensions.restapi.IdString; import com.google.gerrit.extensions.restapi.IdString;
import com.google.gerrit.extensions.restapi.RestApiException; import com.google.gerrit.extensions.restapi.RestApiException;
import com.google.gerrit.extensions.restapi.TopLevelResource; import com.google.gerrit.extensions.restapi.TopLevelResource;
@@ -145,7 +144,7 @@ class ChangesImpl implements Changes {
List<ChangeInfo> infos = (List<ChangeInfo>) result; List<ChangeInfo> infos = (List<ChangeInfo>) result;
return ImmutableList.copyOf(infos); return ImmutableList.copyOf(infos);
} catch (BadRequestException | AuthException | OrmException e) { } catch (AuthException | OrmException e) {
throw new RestApiException("Cannot query changes", e); throw new RestApiException("Cannot query changes", e);
} }
} }

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

File diff suppressed because it is too large Load Diff

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

@@ -14,8 +14,6 @@
package com.google.gerrit.server.query.change; package com.google.gerrit.server.query.change;
import static org.junit.Assert.assertTrue;
import com.google.gerrit.lifecycle.LifecycleManager; import com.google.gerrit.lifecycle.LifecycleManager;
import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.testutil.InMemoryModule; import com.google.gerrit.testutil.InMemoryModule;
@@ -45,12 +43,12 @@ public class LuceneQueryChangesTest extends AbstractQueryChangesTest {
repo.parseBody(repo.commit().message("one.two.three").create()); repo.parseBody(repo.commit().message("one.two.three").create());
Change change2 = newChange(repo, commit2, null, null, null).insert(); Change change2 = newChange(repo, commit2, null, null, null).insert();
assertTrue(query("message:foo_ba").isEmpty()); assertQuery("message:foo_ba");
assertResultEquals(change1, queryOne("message:bar")); assertQuery("message:bar", change1);
assertResultEquals(change1, queryOne("message:foo_bar")); assertQuery("message:foo_bar", change1);
assertResultEquals(change1, queryOne("message:foo bar")); assertQuery("message:foo bar", change1);
assertResultEquals(change2, queryOne("message:two")); assertQuery("message:two", change2);
assertResultEquals(change2, queryOne("message:one.two")); assertQuery("message:one.two", change2);
assertResultEquals(change2, queryOne("message:one two")); assertQuery("message:one two", change2);
} }
} }