Move some RegExTestCaseFilter from c.g.testing.junit.runner.junit4 to
c.g.testing.junit.junit4.runner.
--
MOS_MIGRATED_REVID=134685188
diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/RegExTestCaseFilter.java b/src/java_tools/junitrunner/java/com/google/testing/junit/junit4/runner/RegExTestCaseFilter.java
similarity index 97%
rename from src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/RegExTestCaseFilter.java
rename to src/java_tools/junitrunner/java/com/google/testing/junit/junit4/runner/RegExTestCaseFilter.java
index 984ba49..225db33 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/RegExTestCaseFilter.java
+++ b/src/java_tools/junitrunner/java/com/google/testing/junit/junit4/runner/RegExTestCaseFilter.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.testing.junit.runner.junit4;
+package com.google.testing.junit.junit4.runner;
import java.util.regex.Pattern;
import org.junit.runner.Description;
diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/BUILD b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/BUILD
index 1969031..b8887fc 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/BUILD
+++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/BUILD
@@ -9,12 +9,8 @@
java_library(
name = "junit4",
- srcs = glob(
- ["*.java"],
- exclude = ["RegExTestCaseFilter.java"],
- ),
+ srcs = glob(["*.java"]),
deps = [
- ":filter",
"//src/java_tools/junitrunner/java/com/google/testing/junit/junit4:runner",
"//src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal",
"//src/java_tools/junitrunner/java/com/google/testing/junit/runner/model",
@@ -27,14 +23,6 @@
],
)
-java_library(
- name = "filter",
- srcs = ["RegExTestCaseFilter.java"],
- deps = [
- "//third_party:junit4",
- ],
-)
-
filegroup(
name = "srcs",
srcs = glob(["**"]),
diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/JUnit4Runner.java b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/JUnit4Runner.java
index 7c9338f..0dfd042 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/JUnit4Runner.java
+++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/JUnit4Runner.java
@@ -14,6 +14,7 @@
package com.google.testing.junit.runner.junit4;
+import com.google.testing.junit.junit4.runner.RegExTestCaseFilter;
import com.google.testing.junit.junit4.runner.SuiteTrimmingFilter;
import com.google.testing.junit.runner.internal.Stdout;
import com.google.testing.junit.runner.model.TestSuiteModel;