From 00e00d96e42bf85e6ea1463509c85e40df6a7eba Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Mon, 16 Apr 2018 10:29:12 +0200 Subject: [PATCH] AbstractQueryChangesTest: Add test coverage for since: and until: predicates Bug: Issue 8605 Change-Id: I85570c019fd00cf1503a4f44170589ab37b4d50a --- .../change/AbstractQueryChangesTest.java | 38 ++++++++++--------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java index 6fbe692a73..c06f3054af 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java @@ -1131,7 +1131,7 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests { } @Test - public void byBefore() throws Exception { + public void byBeforeUntil() throws Exception { long thirtyHoursInMs = MILLISECONDS.convert(30, HOURS); resetTimeWithClockStep(thirtyHoursInMs, MILLISECONDS); TestRepository repo = createProject("repo"); @@ -1140,20 +1140,22 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests { Change change2 = insert(repo, newChange(repo), null, new Timestamp(startMs + thirtyHoursInMs)); TestTimeUtil.setClockStep(0, MILLISECONDS); - assertQuery("before:2009-09-29"); - assertQuery("before:2009-09-30"); - assertQuery("before:\"2009-09-30 16:59:00 -0400\""); - assertQuery("before:\"2009-09-30 20:59:00 -0000\""); - assertQuery("before:\"2009-09-30 20:59:00\""); - assertQuery("before:\"2009-09-30 17:02:00 -0400\"", change1); - assertQuery("before:\"2009-10-01 21:02:00 -0000\"", change1); - assertQuery("before:\"2009-10-01 21:02:00\"", change1); - assertQuery("before:2009-10-01", change1); - assertQuery("before:2009-10-03", change2, change1); + for (String predicate : new String[] {"before:", "until:"}) { + assertQuery(predicate + "2009-09-29"); + assertQuery(predicate + "2009-09-30"); + assertQuery(predicate + "\"2009-09-30 16:59:00 -0400\""); + assertQuery(predicate + "\"2009-09-30 20:59:00 -0000\""); + assertQuery(predicate + "\"2009-09-30 20:59:00\""); + assertQuery(predicate + "\"2009-09-30 17:02:00 -0400\"", change1); + assertQuery(predicate + "\"2009-10-01 21:02:00 -0000\"", change1); + assertQuery(predicate + "\"2009-10-01 21:02:00\"", change1); + assertQuery(predicate + "2009-10-01", change1); + assertQuery(predicate + "2009-10-03", change2, change1); + } } @Test - public void byAfter() throws Exception { + public void byAfterSince() throws Exception { long thirtyHoursInMs = MILLISECONDS.convert(30, HOURS); resetTimeWithClockStep(thirtyHoursInMs, MILLISECONDS); TestRepository repo = createProject("repo"); @@ -1162,11 +1164,13 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests { Change change2 = insert(repo, newChange(repo), null, new Timestamp(startMs + thirtyHoursInMs)); TestTimeUtil.setClockStep(0, MILLISECONDS); - assertQuery("after:2009-10-03"); - assertQuery("after:\"2009-10-01 20:59:59 -0400\"", change2); - assertQuery("after:\"2009-10-01 20:59:59 -0000\"", change2); - assertQuery("after:2009-10-01", change2); - assertQuery("after:2009-09-30", change2, change1); + for (String predicate : new String[] {"after:", "since:"}) { + assertQuery(predicate + "2009-10-03"); + assertQuery(predicate + "\"2009-10-01 20:59:59 -0400\"", change2); + assertQuery(predicate + "\"2009-10-01 20:59:59 -0000\"", change2); + assertQuery(predicate + "2009-10-01", change2); + assertQuery(predicate + "2009-09-30", change2, change1); + } } @Test