diff options
| author | Edwin Kempin <ekempin@google.com> | 2018-12-19 11:47:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-12-19 11:47:35 +0000 |
| commit | 9166ccc32c075d888ec78203284d3d2bd01037d7 (patch) | |
| tree | c376e874c5937da1cb8ffa7ed1611482999526f4 | |
| parent | 5937845746f2be33a0c1890e778325b574c697d4 (diff) | |
| parent | d9e1b93daaf9e2386e4c2a487e902bef6a70df5f (diff) | |
Merge "Fix case-insensitive searching of hashtags" into stable-2.16
| -rw-r--r-- | java/com/google/gerrit/server/query/change/HashtagPredicate.java | 4 | ||||
| -rw-r--r-- | javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/java/com/google/gerrit/server/query/change/HashtagPredicate.java b/java/com/google/gerrit/server/query/change/HashtagPredicate.java index bea56884e2..95ecf89469 100644 --- a/java/com/google/gerrit/server/query/change/HashtagPredicate.java +++ b/java/com/google/gerrit/server/query/change/HashtagPredicate.java @@ -20,7 +20,9 @@ import com.google.gwtorm.server.OrmException; public class HashtagPredicate extends ChangeIndexPredicate { public HashtagPredicate(String hashtag) { - super(ChangeField.HASHTAG, HashtagsUtil.cleanupHashtag(hashtag)); + // Use toLowerCase without locale to match behavior in ChangeField. + // TODO(dborowitz): Change both. + super(ChangeField.HASHTAG, HashtagsUtil.cleanupHashtag(hashtag).toLowerCase()); } @Override diff --git a/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java b/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java index 8d57946a77..7cf148d182 100644 --- a/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java +++ b/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java @@ -1597,7 +1597,7 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests { in.add = ImmutableSet.of("foo"); gApi.changes().id(change1.getId().get()).setHashtags(in); - in.add = ImmutableSet.of("foo", "bar", "a tag"); + in.add = ImmutableSet.of("foo", "bar", "a tag", "ACamelCaseTag"); gApi.changes().id(change2.getId().get()).setHashtags(in); return ImmutableList.of(change1, change2); @@ -1614,6 +1614,8 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests { assertQuery("hashtag:\" a tag \"", changes.get(1)); assertQuery("hashtag:\"#a tag\"", changes.get(1)); assertQuery("hashtag:\"# #a tag\"", changes.get(1)); + assertQuery("hashtag:acamelcasetag", changes.get(1)); + assertQuery("hashtag:ACamelCaseTAg", changes.get(1)); } @Test |