testing/android/junit/java/src/org/chromium/testing/local/GtestFilter.java - Issue 761903003: Update from https://crrev.com/306655

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: testing/android/junit/java/src/org/chromium/testing/local/GtestFilter.java

Issue 761903003: Update from https://crrev.com/306655 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « sky/engine/platform/graphics/GraphicsContextTest.cpp ('k') | testing/android/junit/javatests/src/org/chromium/testing/local/GtestFilterTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: testing/android/junit/java/src/org/chromium/testing/local/GtestFilter.java

diff --git a/testing/android/junit/java/src/org/chromium/testing/local/GtestFilter.java b/testing/android/junit/java/src/org/chromium/testing/local/GtestFilter.java

index 68dcbb8716d3258f588993ab059b81e6eec5e898..d5527aa22a5ead774ffb565ec83a7a9816ed1e2d 100644

--- a/testing/android/junit/java/src/org/chromium/testing/local/GtestFilter.java

+++ b/testing/android/junit/java/src/org/chromium/testing/local/GtestFilter.java

@@ -9,6 +9,7 @@ import org.junit.runner.manipulation.Filter;

import java.util.HashSet;

import java.util.Set;

+import java.util.regex.Matcher;

import java.util.regex.Pattern;

/**

@@ -24,6 +25,7 @@ class GtestFilter extends Filter {

private static final Pattern ASTERISK = Pattern.compile("\\*");

private static final Pattern COLON = Pattern.compile(":");

private static final Pattern DASH = Pattern.compile("-");

+ private static final Pattern DOLLAR = Pattern.compile("\\$");

private static final Pattern PERIOD = Pattern.compile("\\.");

/**

@@ -39,7 +41,8 @@ class GtestFilter extends Filter {

for (String f : filterStrings) {

if (f.isEmpty()) continue;

- String sanitized = PERIOD.matcher(f).replaceAll("\\\\.");

+ String sanitized = PERIOD.matcher(f).replaceAll(Matcher.quoteReplacement("\\."));

+ sanitized = DOLLAR.matcher(sanitized).replaceAll(Matcher.quoteReplacement("\\$"));

sanitized = ASTERISK.matcher(sanitized).replaceAll(".*");

int negIndex = sanitized.indexOf('-');

if (negIndex == 0) {