Use gtest_filter syntax in jstest filter

javatests/org/chromium/distiller/JsTestSuiteBase.java

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.distiller;
 
 import com.google.gwt.core.client.JavaScriptException;
 import com.google.gwt.regexp.shared.RegExp;
 import com.google.gwt.user.client.Window;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 
 public class JsTestSuiteBase {
     private boolean debug = false;
 
     public interface TestCaseRunner {
         public void run(JsTestCase testCase) throws Throwable;
     }
@@ skipping 97 matching lines @@
             }
             return results;
         }
 
         public Set<String> getTestNames() {
             return tests.keySet();
         }
     }
 
     private class TestFilter {
-        RegExp regexp;
+        List<RegExp> pos;
+        List<RegExp> neg;
+
         TestFilter(String filter) {
-            if (filter != null) regexp = RegExp.compile(filter);
+            pos = new ArrayList<RegExp>();
+            neg = new ArrayList<RegExp>();
+
+            if (filter == null) return;
+
+            int begin = 0;
+            filter = filter + ":";
+            for (int i = 0; i < filter.length(); i++) {

[cjhopman, 2015/03/31 17:55:40]

how about just split on "-" and then split each side on ":" (and maybe have a
func that converts String[] to List<Regex> appropriately)? up to you.

[wychen, 2015/03/31 18:26:49]

Done.

+                if (filter.charAt(i) == ':' || filter.charAt(i) == '-') {
+                    if (begin != i) {
+                        Boolean isNeg = false;

[cjhopman, 2015/03/31 17:55:40]

Doesn't this need to be initialized outside the loop?

[wychen, 2015/03/31 18:26:49]

isNeg is used to tell whether the current segment begins with "-", so this
should stay here. However, I see the current implementation looks messy and
harder to understand.

+
+                        if (filter.charAt(begin) == '-') {
+                            isNeg = true;
+                            begin++;
+                        }
+                        String q = filter.substring(begin, i);
+                        q = q.replace(".", "\\.");
+                        q = q.replace("*", ".*");
+                        q = q.replace("?", ".");
+                        RegExp r = RegExp.compile("^" + q + "$");
+                        if (isNeg) {
+                            neg.add(r);
+                        } else {
+                            pos.add(r);
+                        }
+                    }
+                    if (filter.charAt(i) == ':') {
+                        begin = i + 1;
+                    } else {
+                        begin = i;
+                    }
+                }
+            }
         }
 
         public boolean test(String className, String methodName) {
-            if (regexp == null) return true;
-            return regexp.test(className + "." + methodName);
+            boolean ans = false;
+            if (pos.size() == 0) ans = true;
+            for (int i = 0; i < pos.size(); i++) {
+                if (pos.get(i).test(className + "." + methodName)) {
+                    ans = true;
+                }
+            }
+            for (int i = 0; i < neg.size(); i++) {
+                if (neg.get(i).test(className + "." + methodName)) {
+                    ans = false;
+                }
+            }
+            return ans;
         }
     }
 
     private TreeMap<String, TestCase> testCases;
 
     public JsTestSuiteBase() {
         testCases = new TreeMap<String, TestCase>();
         debug = "1".equals(Window.Location.getParameter("debug"));
     }
 
@@ skipping 53 matching lines @@
     }
 
     public static String stackFrameString(StackTraceElement ste) {
         String mangledName = ste.getMethodName();
         mangledName = mangledName.split("__")[0];
         String demangledName =
                 mangledName.replaceAll("_1", "~~").replaceAll("_", ".").replaceAll("~~", "_");
         return demangledName + "(" + ste.getFileName() + ":" + ste.getLineNumber() + ")";
     }
 }