40 files changed, 79 insertions, 6 deletions
diff --git a/src/BUILD b/src/BUILD
index bca7c98a15..d1887a9939 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -296,8 +296,8 @@ filegroup(
         "//src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/api:srcs",
         "//src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/testing:srcs",
         "//src/java_tools/junitrunner/java/com/google/testing/junit/runner/util:srcs",
-        "//src/test/junitrunner/javatests/com/google/testing/junit/runner:srcs",
-        "//src/test/junitrunner/javatests/com/google/testing/junit/runner/testbed:srcs",
+        "//src/java_tools/junitrunner/javatests/com/google/testing/junit/runner:srcs",
+        "//src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/testbed:srcs",
         "//src/java_tools/singlejar:srcs",
         "//src/main/cpp:srcs",
         "//src/main/java/com/google/devtools/build/docgen:srcs",
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/BUILD b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/BUILD
index db8c8f52b2..0dd82ccb6c 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/BUILD
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/BUILD
@@ -1,6 +1,5 @@
 DEFAULT_VISIBILITY = [
-    "//src/java_tools/junitrunner/java/com/google/testing/junit/runner:__subpackages__",
-    "//src/test/junitrunner/javatests/com/google/testing/junit/runner:__subpackages__",
+    "//src/java_tools/junitrunner:__subpackages__",
 ]
 
 licenses(["notice"])  # Apache 2.0
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/TestListener.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/TestListener.java
index 2573574094..2573574094 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/TestListener.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/TestListener.java
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/TestRunner.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/TestRunner.java
index 35d361a35a..35d361a35a 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/TestRunner.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/TestRunner.java
diff --git a/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/internal/SignalHandlersTest.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/internal/SignalHandlersTest.java
new file mode 100644
index 0000000000..038b427759
--- /dev/null
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/internal/SignalHandlersTest.java
@@ -0,0 +1,75 @@
+// Copyright 2010 The Bazel Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.testing.junit.runner.internal;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+import org.mockito.Mockito;
+import sun.misc.Signal;
+import sun.misc.SignalHandler;
+
+/**
+ * Tests for SignalHandlers.
+ */
+@RunWith(JUnit4.class)
+public class SignalHandlersTest {
+
+  private static final Signal TERM_SIGNAL = new Signal("TERM");
+
+  private final FakeSignalInstaller fakeSignalInstaller = new FakeSignalInstaller();
+  private final SignalHandlers signalHandlers = new SignalHandlers(fakeSignalInstaller);
+
+  static class FakeSignalInstaller implements SignalHandlers.HandlerInstaller {
+    private SignalHandler currentHandler = null;
+
+    @Override
+    public SignalHandler install(Signal signal, SignalHandler handler) {
+      SignalHandler previousHandler = currentHandler;
+      assertEquals("This fake only supports the TERM signal", TERM_SIGNAL, signal);
+      currentHandler = handler;
+      return previousHandler;
+    }
+
+    public void sendSignal() {
+      currentHandler.handle(TERM_SIGNAL);
+    }
+  }
+
+  @Test
+  public void testHandlersCanBeChained() {
+    SignalHandler handler1 = Mockito.mock(SignalHandler.class);
+    SignalHandler handler2 = Mockito.mock(SignalHandler.class);
+
+    signalHandlers.installHandler(TERM_SIGNAL, handler1);
+    signalHandlers.installHandler(TERM_SIGNAL, handler2);
+    fakeSignalInstaller.sendSignal();
+
+    Mockito.verify(handler1).handle(Mockito.eq(TERM_SIGNAL));
+    Mockito.verify(handler2).handle(Mockito.eq(TERM_SIGNAL));
+  }
+
+  @Test
+  public void testOneHandlerCanHandleSignal() {
+    SignalHandler handler = Mockito.mock(SignalHandler.class);
+
+    signalHandlers.installHandler(TERM_SIGNAL, handler);
+    fakeSignalInstaller.sendSignal();
+    
+    Mockito.verify(handler).handle(Mockito.eq(TERM_SIGNAL));
+  }
+}
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/internal/junit4/CancellableRequestFactoryTest.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/internal/junit4/CancellableRequestFactoryTest.java
index f89c7ab277..f89c7ab277 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/internal/junit4/CancellableRequestFactoryTest.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/internal/junit4/CancellableRequestFactoryTest.java
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/internal/junit4/JUnit4TestNameListenerTest.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/internal/junit4/JUnit4TestNameListenerTest.java
index a63788779b..a63788779b 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/internal/junit4/JUnit4TestNameListenerTest.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/internal/junit4/JUnit4TestNameListenerTest.java
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/internal/junit4/JUnit4TestXmlListenerTest.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/internal/junit4/JUnit4TestXmlListenerTest.java
index 11d35c7888..11d35c7888 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/internal/junit4/JUnit4TestXmlListenerTest.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/internal/junit4/JUnit4TestXmlListenerTest.java
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/internal/junit4/MemoizingRequestTest.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/internal/junit4/MemoizingRequestTest.java
index a2818eb453..a2818eb453 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/internal/junit4/MemoizingRequestTest.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/internal/junit4/MemoizingRequestTest.java
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/junit4/JUnit4BazelMock.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/junit4/JUnit4BazelMock.java
index 02c18746f4..02c18746f4 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/junit4/JUnit4BazelMock.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/junit4/JUnit4BazelMock.java
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/junit4/JUnit4ConfigTest.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/junit4/JUnit4ConfigTest.java
index 9ddc682657..9ddc682657 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/junit4/JUnit4ConfigTest.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/junit4/JUnit4ConfigTest.java
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/junit4/JUnit4OptionsTest.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/junit4/JUnit4OptionsTest.java
index 699c5883bb..699c5883bb 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/junit4/JUnit4OptionsTest.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/junit4/JUnit4OptionsTest.java
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/junit4/JUnit4RunnerTest.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/junit4/JUnit4RunnerTest.java
index 6dd9bf32e2..6dd9bf32e2 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/junit4/JUnit4RunnerTest.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/junit4/JUnit4RunnerTest.java
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/junit4/JUnit4TestModelBuilderTest.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/junit4/JUnit4TestModelBuilderTest.java
index 8a355842c2..8a355842c2 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/junit4/JUnit4TestModelBuilderTest.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/junit4/JUnit4TestModelBuilderTest.java
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/junit4/TestModuleConfigFactory.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/junit4/TestModuleConfigFactory.java
index 57f3074c09..57f3074c09 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/junit4/TestModuleConfigFactory.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/junit4/TestModuleConfigFactory.java
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/junit4/TestModuleMockRunListenerFactory.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/junit4/TestModuleMockRunListenerFactory.java
index 97b40e9f09..97b40e9f09 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/junit4/TestModuleMockRunListenerFactory.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/junit4/TestModuleMockRunListenerFactory.java
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/junit4/TestModuleProvideStdoutStreamFactory.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/junit4/TestModuleProvideStdoutStreamFactory.java
index c7037bcc9d..c7037bcc9d 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/junit4/TestModuleProvideStdoutStreamFactory.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/junit4/TestModuleProvideStdoutStreamFactory.java
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/junit4/TestModuleShardingEnvironmentFactory.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/junit4/TestModuleShardingEnvironmentFactory.java
index ba5e4e27bf..ba5e4e27bf 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/junit4/TestModuleShardingEnvironmentFactory.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/junit4/TestModuleShardingEnvironmentFactory.java
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/junit4/TestModuleShardingFiltersFactory.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/junit4/TestModuleShardingFiltersFactory.java
index 144ed5dfe6..144ed5dfe6 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/junit4/TestModuleShardingFiltersFactory.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/junit4/TestModuleShardingFiltersFactory.java
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/junit4/TestModuleTickerFactory.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/junit4/TestModuleTickerFactory.java
index 95376668a3..95376668a3 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/junit4/TestModuleTickerFactory.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/junit4/TestModuleTickerFactory.java
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/junit4/TestModuleXmlResultWriterFactory.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/junit4/TestModuleXmlResultWriterFactory.java
index e0734d7554..e0734d7554 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/junit4/TestModuleXmlResultWriterFactory.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/junit4/TestModuleXmlResultWriterFactory.java
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/model/TestCaseNodeTest.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/model/TestCaseNodeTest.java
index ed313c1da8..ed313c1da8 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/model/TestCaseNodeTest.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/model/TestCaseNodeTest.java
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/model/TestIntervalTest.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/model/TestIntervalTest.java
index ebab4a7cd5..ebab4a7cd5 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/model/TestIntervalTest.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/model/TestIntervalTest.java
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/model/TestSuiteNodeTest.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/model/TestSuiteNodeTest.java
index 61b97cdd6f..61b97cdd6f 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/model/TestSuiteNodeTest.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/model/TestSuiteNodeTest.java
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/model/XmlWriterTest.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/model/XmlWriterTest.java
index 423d1f4f3d..423d1f4f3d 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/model/XmlWriterTest.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/model/XmlWriterTest.java
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/sharding/HashBackedShardingFilterTest.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/sharding/HashBackedShardingFilterTest.java
index 8ae46f7272..8ae46f7272 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/sharding/HashBackedShardingFilterTest.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/sharding/HashBackedShardingFilterTest.java
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/sharding/RoundRobinShardingFilterTest.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/sharding/RoundRobinShardingFilterTest.java
index 5aa55aa467..5aa55aa467 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/sharding/RoundRobinShardingFilterTest.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/sharding/RoundRobinShardingFilterTest.java
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/sharding/ShardingEnvironmentTest.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/sharding/ShardingEnvironmentTest.java
index b8ab333ca2..b8ab333ca2 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/sharding/ShardingEnvironmentTest.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/sharding/ShardingEnvironmentTest.java
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/sharding/ShardingFiltersTest.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/sharding/ShardingFiltersTest.java
index ec55f91a56..ec55f91a56 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/sharding/ShardingFiltersTest.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/sharding/ShardingFiltersTest.java
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/testbed/BUILD b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/testbed/BUILD
index 35c90fc8a9..2bb65e1643 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/testbed/BUILD
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/testbed/BUILD
@@ -1,6 +1,5 @@
 DEFAULT_VISIBILITY = [
-    "//src/java_tools/junitrunner/java/com/google/testing/junit/runner:__subpackages__",
-    "//src/test/junitrunner/javatests/com/google/testing/junit/runner:__subpackages__",
+    "//src/java_tools/junitrunner:__subpackages__",
 ]
 
 package(default_visibility = DEFAULT_VISIBILITY)
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/testbed/ExampleObject.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/testbed/ExampleObject.java
index e6d66cf460..e6d66cf460 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/testbed/ExampleObject.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/testbed/ExampleObject.java
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/testbed/Fifo.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/testbed/Fifo.java
index 26fb73ad05..26fb73ad05 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/testbed/Fifo.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/testbed/Fifo.java
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/testbed/InternationalCharsTest.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/testbed/InternationalCharsTest.java
index ee7979ee74..ee7979ee74 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/testbed/InternationalCharsTest.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/testbed/InternationalCharsTest.java
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/testbed/JUnit4TestbridgeExercises.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/testbed/JUnit4TestbridgeExercises.java
index cd575262fd..cd575262fd 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/testbed/JUnit4TestbridgeExercises.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/testbed/JUnit4TestbridgeExercises.java
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/testbed/StackTraceExercises.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/testbed/StackTraceExercises.java
index e9c34100ef..e9c34100ef 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/testbed/StackTraceExercises.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/testbed/StackTraceExercises.java
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/testbed/SuiteMethodTakesForever.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/testbed/SuiteMethodTakesForever.java
index e0d6bde9b3..e0d6bde9b3 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/testbed/SuiteMethodTakesForever.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/testbed/SuiteMethodTakesForever.java
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/testbed/XmlOutputExercises.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/testbed/XmlOutputExercises.java
index 09de3a8b59..09de3a8b59 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/testbed/XmlOutputExercises.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/testbed/XmlOutputExercises.java
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/util/GoogleTestSecurityManagerTest.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/util/GoogleTestSecurityManagerTest.java
index ab0c704a2e..ab0c704a2e 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/util/GoogleTestSecurityManagerTest.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/util/GoogleTestSecurityManagerTest.java
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/util/TestIntegrationsExporterTest.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/util/TestIntegrationsExporterTest.java
index 01ffb641ad..01ffb641ad 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/util/TestIntegrationsExporterTest.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/util/TestIntegrationsExporterTest.java
diff --git a/src/test/junitrunner/javatests/com/google/testing/junit/runner/util/TestPropertyExporterTest.java b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/util/TestPropertyExporterTest.java
index b467e263dc..b467e263dc 100644
--- a/src/test/junitrunner/javatests/com/google/testing/junit/runner/util/TestPropertyExporterTest.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/util/TestPropertyExporterTest.java