From 1c31e2cb7b98d1813b8545a6dfb4f8b4ba473879 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Mon, 11 Jun 2018 08:23:42 +0900 Subject: [PATCH] AbstractQueryChangesTest: Expand byTopic with more 'intopic' tests Bug: Issue 9147 Change-Id: Id33c105351b47c38a1f87258cde83d4c8fb4e8de --- .../query/change/AbstractQueryChangesTest.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 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 56743aa738..369901a924 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 @@ -590,7 +590,13 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests { ChangeInserter ins4 = newChangeWithTopic(repo, "feature2-fixup"); Change change4 = insert(repo, ins4); - Change change5 = insert(repo, newChange(repo)); + ChangeInserter ins5 = newChangeWithTopic(repo, "https://gerrit.local"); + Change change5 = insert(repo, ins5); + + ChangeInserter ins6 = newChangeWithTopic(repo, "git_gerrit_training"); + Change change6 = insert(repo, ins6); + + Change change_no_topic = insert(repo, newChange(repo)); assertQuery("intopic:foo"); assertQuery("intopic:feature1", change1); @@ -598,10 +604,12 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests { assertQuery("topic:feature2", change2); assertQuery("intopic:feature2", change4, change3, change2); assertQuery("intopic:fixup", change4); - assertQuery("topic:\"\"", change5); - assertQuery("intopic:\"\"", change5); assertQuery("intopic:^feature2.*", change4, change2); assertQuery("intopic:{^.*feature2$}", change3, change2); + assertQuery("intopic:gerrit", change6, change5); + + assertQuery("topic:\"\"", change_no_topic); + assertQuery("intopic:\"\"", change_no_topic); } @Test