commit | 90348a27e7fdf550ebe68af84c43e1e9fc59b9f8 | [log] [tgz] |
---|---|---|
author | David Pursehouse <dpursehouse@collab.net> | Thu Nov 08 10:17:32 2018 +0900 |
committer | David Pursehouse <dpursehouse@collab.net> | Thu Nov 08 10:19:07 2018 +0900 |
tree | 7c4a5b1bbf503d528428d1fbda45095099d9de6c | |
parent | dd2182557b6fb15d50ce98eaae36600bb94fd8c8 [diff] |
GerritBaseTests: Stop using CharMatcher.javaLetterOrDigit CharMatcher.javaLetterOrDigit is deprecated in Guava 23.2 [1]. Replace it with inRange. [1] https://github.com/google/guava/releases/tag/v23.2 Change-Id: I8d296e67a32a7c9efb9100a9f25a5846dd5806cf
diff --git a/gerrit-server/src/test/java/com/google/gerrit/testutil/GerritBaseTests.java b/gerrit-server/src/test/java/com/google/gerrit/testutil/GerritBaseTests.java index 4ba5d3a..44e5d74 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/testutil/GerritBaseTests.java +++ b/gerrit-server/src/test/java/com/google/gerrit/testutil/GerritBaseTests.java
@@ -33,7 +33,12 @@ protected String getSanitizedMethodName() { String name = testName.getMethodName().toLowerCase(); - name = CharMatcher.javaLetterOrDigit().negate().replaceFrom(name, '_'); + name = + CharMatcher.inRange('a', 'z') + .or(CharMatcher.inRange('A', 'Z')) + .or(CharMatcher.inRange('0', '9')) + .negate() + .replaceFrom(name, '_'); name = CharMatcher.is('_').trimTrailingFrom(name); return name; }