summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse <dpursehouse@collab.net>2018-06-11 08:23:42 +0900
committerDavid Pursehouse <dpursehouse@collab.net>2018-07-12 08:31:36 +0900
commit1c31e2cb7b98d1813b8545a6dfb4f8b4ba473879 (patch)
treec24e62139f46b99d637e18fc17af85c3570c6d28
parent85048f496323587f18bd0e07223351ce22c52299 (diff)
AbstractQueryChangesTest: Expand byTopic with more 'intopic' tests
Bug: Issue 9147 Change-Id: Id33c105351b47c38a1f87258cde83d4c8fb4e8de
-rw-r--r--gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java14
1 files 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