Migrate Java tests to Truth.

RELNOTES: None.

PiperOrigin-RevId: 157446717

18 files changed, 235 insertions, 235 deletions

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
index 038b427759..9da84292cc 100644
--- 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
@@ -14,7 +14,7 @@
 
 package com.google.testing.junit.runner.internal;
 
-import static org.junit.Assert.assertEquals;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -40,7 +40,9 @@ public class SignalHandlersTest {
     @Override
     public SignalHandler install(Signal signal, SignalHandler handler) {
       SignalHandler previousHandler = currentHandler;
-      assertEquals("This fake only supports the TERM signal", TERM_SIGNAL, signal);
+      assertWithMessage("This fake only supports the TERM signal")
+          .that(signal)
+          .isEqualTo(TERM_SIGNAL);
       currentHandler = handler;
       return previousHandler;
     }
diff --git a/src/java_tools/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..7bd9a10b6f 100644
--- a/src/java_tools/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
@@ -14,10 +14,7 @@
 
 package com.google.testing.junit.runner.internal.junit4;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
 import java.util.Arrays;
@@ -103,9 +100,9 @@ public class CancellableRequestFactoryTest {
       fail("exception expected");
     } catch (ExecutionException e) {
       Throwable runnerException = e.getCause();
-      assertTrue(runnerException instanceof RuntimeException);
-      assertEquals("Test run interrupted", runnerException.getMessage());
-      assertTrue(runnerException.getCause() instanceof StoppedByUserException);
+      assertThat(runnerException).isInstanceOf(RuntimeException.class);
+      assertThat(runnerException).hasMessageThat().isEqualTo("Test run interrupted");
+      assertThat(runnerException).hasCauseThat().isInstanceOf(StoppedByUserException.class);
     }
 
     executor.shutdownNow();
@@ -131,11 +128,11 @@ public class CancellableRequestFactoryTest {
       core.run(request);
       fail("exception expected");
     } catch (RuntimeException e) {
-      assertEquals("Test run interrupted", e.getMessage());
-      assertTrue(e.getCause() instanceof StoppedByUserException);
+      assertThat(e).hasMessageThat().isEqualTo("Test run interrupted");
+      assertThat(e).hasCauseThat().isInstanceOf(StoppedByUserException.class);
     }
 
-    assertFalse(testRan.get());
+    assertThat(testRan.get()).isFalse();
   }
 
   @Test
@@ -154,9 +151,9 @@ public class CancellableRequestFactoryTest {
     JUnitCore core = new JUnitCore();
     Result result = core.run(request);
 
-    assertTrue(testRan.get());
-    assertEquals(1, result.getRunCount());
-    assertEquals(0, result.getFailureCount());
+    assertThat(testRan.get()).isTrue();
+    assertThat(result.getRunCount()).isEqualTo(1);
+    assertThat(result.getFailureCount()).isEqualTo(0);
   }
 
   @Test
@@ -177,10 +174,10 @@ public class CancellableRequestFactoryTest {
     JUnitCore core = new JUnitCore();
     Result result = core.run(request);
 
-    assertTrue(testRan.get());
-    assertEquals(1, result.getRunCount());
-    assertEquals(1, result.getFailureCount());
-    assertSame(expectedFailure, result.getFailures().get(0).getException());
+    assertThat(testRan.get()).isTrue();
+    assertThat(result.getRunCount()).isEqualTo(1);
+    assertThat(result.getFailureCount()).isEqualTo(1);
+    assertThat(result.getFailures().get(0).getException()).isSameAs(expectedFailure);
   }
 
 
diff --git a/src/java_tools/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..1c3073454c 100644
--- a/src/java_tools/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
@@ -15,8 +15,7 @@
 package com.google.testing.junit.runner.internal.junit4;
 
 import static com.google.common.base.Throwables.throwIfUnchecked;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static com.google.common.truth.Truth.assertThat;
 
 import com.google.testing.junit.runner.util.TestNameProvider;
 import java.util.concurrent.ExecutorService;
@@ -53,26 +52,26 @@ public class JUnit4TestNameListenerTest {
 
   @Test
   public void testJUnit4Listener_normalUsage() throws Exception {
-    assertNull(testNameProviderForTesting);
+    assertThat(testNameProviderForTesting).isNull();
 
     Description description = Description.createSuiteDescription(FakeTest.class);
     testNameListener.testRunStarted(description);
-    assertNull(testNameProviderForTesting.get());
+    assertThat(testNameProviderForTesting.get()).isNull();
 
     description = Description.createTestDescription(FakeTest.class, "methodName");
     testNameListener.testStarted(description);
-    assertEquals(description, testNameProviderForTesting.get());
+    assertThat(testNameProviderForTesting.get()).isEqualTo(description);
     testNameListener.testFinished(description);
-    assertNull(testNameProviderForTesting.get());
+    assertThat(testNameProviderForTesting.get()).isNull();
 
     description = Description.createTestDescription(FakeTest.class, "anotherMethodName");
     testNameListener.testStarted(description);
-    assertEquals(description, testNameProviderForTesting.get());
+    assertThat(testNameProviderForTesting.get()).isEqualTo(description);
     testNameListener.testFinished(description);
-    assertNull(testNameProviderForTesting.get());
+    assertThat(testNameProviderForTesting.get()).isNull();
 
     testNameListener.testRunFinished(null);
-    assertNull(testNameProviderForTesting.get());
+    assertThat(testNameProviderForTesting.get()).isNull();
   }
 
   @Test
@@ -82,9 +81,11 @@ public class JUnit4TestNameListenerTest {
 
     description = Description.createTestDescription(this.getClass(), name.getMethodName());
     testNameListener.testStarted(description);
-    assertEquals("testJUnit4Listener_hasExpectedDisplayName("
-        + JUnit4TestNameListenerTest.class.getCanonicalName() + ")",
-        testNameProviderForTesting.get().getDisplayName());
+    assertThat(testNameProviderForTesting.get().getDisplayName())
+        .isEqualTo(
+            "testJUnit4Listener_hasExpectedDisplayName("
+                + JUnit4TestNameListenerTest.class.getCanonicalName()
+                + ")");
   }
 
   @Test
@@ -96,49 +97,49 @@ public class JUnit4TestNameListenerTest {
         Description.createTestDescription(FakeTest.class, "anotherMethodName");
 
     testNameListener.testRunStarted(Description.createSuiteDescription(FakeTest.class));
-    assertNull(testNameProviderForTesting.get());
+    assertThat(testNameProviderForTesting.get()).isNull();
     testNameListener.testStarted(description1);
-    assertEquals(description1, testNameProviderForTesting.get());
+    assertThat(testNameProviderForTesting.get()).isEqualTo(description1);
 
     Future<?> startSecondTestFuture =
         executorService.submit(
             new Runnable() {
               @Override
               public void run() {
-                assertNull(testNameProviderForTesting.get());
+                assertThat(testNameProviderForTesting.get()).isNull();
                 try {
                   testNameListener.testStarted(description2);
                 } catch (Exception e) {
                   throwIfUnchecked(e);
                   throw new RuntimeException(e);
                 }
-                assertEquals(description2, testNameProviderForTesting.get());
+                assertThat(testNameProviderForTesting.get()).isEqualTo(description2);
               }
             });
     startSecondTestFuture.get();
 
-    assertEquals(description1, testNameProviderForTesting.get());
+    assertThat(testNameProviderForTesting.get()).isEqualTo(description1);
     testNameListener.testFinished(description1);
-    assertNull(testNameProviderForTesting.get());
+    assertThat(testNameProviderForTesting.get()).isNull();
 
     Future<?> endSecondTestFuture =
         executorService.submit(
             new Runnable() {
               @Override
               public void run() {
-                assertEquals(description2, testNameProviderForTesting.get());
+                assertThat(testNameProviderForTesting.get()).isEqualTo(description2);
                 try {
                   testNameListener.testFinished(description2);
                 } catch (Exception e) {
                   throwIfUnchecked(e);
                   throw new RuntimeException(e);
                 }
-                assertNull(testNameProviderForTesting.get());
+                assertThat(testNameProviderForTesting.get()).isNull();
               }
             });
     endSecondTestFuture.get();
 
-    assertNull(testNameProviderForTesting.get());
+    assertThat(testNameProviderForTesting.get()).isNull();
   }
 
   /**
@@ -158,16 +159,16 @@ public class JUnit4TestNameListenerTest {
 
     testNameListener.testStarted(description1);
     testNameListener.testStarted(description1);
-    assertEquals(description1, testNameProviderForTesting.get());
+    assertThat(testNameProviderForTesting.get()).isEqualTo(description1);
 
     testNameListener.testStarted(description2);
-    assertEquals(description2, testNameProviderForTesting.get());
+    assertThat(testNameProviderForTesting.get()).isEqualTo(description2);
 
     testNameListener.testFinished(description1);
-    assertNull(testNameProviderForTesting.get());
+    assertThat(testNameProviderForTesting.get()).isNull();
 
     testNameListener.testFinished(description2);
-    assertNull(testNameProviderForTesting.get());
+    assertThat(testNameProviderForTesting.get()).isNull();
   }
 
 
diff --git a/src/java_tools/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..51f10a059a 100644
--- a/src/java_tools/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
@@ -14,8 +14,8 @@
 
 package com.google.testing.junit.runner.internal.junit4;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeTrue;
 import static org.mockito.Matchers.any;
@@ -77,13 +77,17 @@ public class JUnit4TestXmlListenerTest {
     when(mockModelSupplier.get()).thenReturn(mockModel);
 
     listener.testRunStarted(suiteDescription);
-    assertEquals(1, fakeSignalHandlers.handlers.size());
+    assertThat(fakeSignalHandlers.handlers).hasSize(1);
 
     fakeSignalHandlers.handlers.get(0).handle(new Signal("TERM"));
 
     String errOutput = errStream.toString(CHARSET);
-    assertTrue("expected signal name in stderr", errOutput.contains("SIGTERM"));
-    assertTrue("expected message in stderr", errOutput.contains("Done writing test XML"));
+    assertWithMessage("expected signal name in stderr")
+        .that(errOutput.contains("SIGTERM"))
+        .isTrue();
+    assertWithMessage("expected message in stderr")
+        .that(errOutput.contains("Done writing test XML"))
+        .isTrue();
 
     InOrder inOrder = inOrder(mockRequestFactory, mockModel);
     inOrder.verify(mockRequestFactory).cancelRun();
@@ -106,7 +110,7 @@ public class JUnit4TestXmlListenerTest {
     core.addListener(listener);
     core.run(Request.classWithoutSuiteMethod(PassingTest.class));
 
-    assertEquals("no output to stderr expected", 0, errStream.size());
+    assertWithMessage("no output to stderr expected").that(errStream.size()).isEqualTo(0);
     verify(mockModel).writeAsXml(mockXmlStream);
     verify(mockRequestFactory, never()).cancelRun();
   }
@@ -130,7 +134,7 @@ public class JUnit4TestXmlListenerTest {
     core.addListener(listener);
     core.run(request);
 
-    assertEquals("no output to stderr expected", 0, errStream.size());
+    assertWithMessage("no output to stderr expected").that(errStream.size()).isEqualTo(0);
     InOrder inOrder = inOrder(mockModel);
     inOrder.verify(mockModel).testSkipped(testDescription);
     inOrder.verify(mockModel).writeAsXml(mockXmlStream);
@@ -156,7 +160,7 @@ public class JUnit4TestXmlListenerTest {
     core.addListener(listener);
     core.run(request);
 
-    assertEquals("no output to stderr expected", 0, errStream.size());
+    assertWithMessage("no output to stderr expected").that(errStream.size()).isEqualTo(0);
     InOrder inOrder = inOrder(mockModel);
     inOrder.verify(mockModel).testSkipped(suiteDescription);
     inOrder.verify(mockModel).writeAsXml(mockXmlStream);
@@ -182,7 +186,7 @@ public class JUnit4TestXmlListenerTest {
     core.addListener(listener);
     core.run(request);
 
-    assertEquals("no output to stderr expected", 0, errStream.size());
+    assertWithMessage("no output to stderr expected").that(errStream.size()).isEqualTo(0);
     InOrder inOrder = inOrder(mockModel);
     inOrder.verify(mockModel).testFailure(eq(testDescription), any(Throwable.class));
     inOrder.verify(mockModel).writeAsXml(mockXmlStream);
@@ -208,7 +212,7 @@ public class JUnit4TestXmlListenerTest {
     core.addListener(listener);
     core.run(request);
 
-    assertEquals("no output to stderr expected", 0, errStream.size());
+    assertWithMessage("no output to stderr expected").that(errStream.size()).isEqualTo(0);
     InOrder inOrder = inOrder(mockModel);
     inOrder.verify(mockModel).testSuppressed(testDescription);
     inOrder.verify(mockModel).writeAsXml(mockXmlStream);
diff --git a/src/java_tools/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..ab383f0990 100644
--- a/src/java_tools/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
@@ -14,6 +14,7 @@
 
 package com.google.testing.junit.runner.internal.junit4;
 
+import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.RETURNS_MOCKS;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -21,7 +22,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.verifyZeroInteractions;
 
 import junit.framework.TestCase;
-
 import org.junit.runner.Request;
 import org.junit.runner.Runner;
 
@@ -49,7 +49,7 @@ public class MemoizingRequestTest extends TestCase {
     Runner firstRunner = memoizingRequest.getRunner();
     Runner secondRunner = memoizingRequest.getRunner();
 
-    assertSame(firstRunner, secondRunner);
+    assertThat(secondRunner).isSameAs(firstRunner);
     verify(mockRequestDelegate).getRunner();
     verifyNoMoreInteractions(mockRequestDelegate);
   }
@@ -66,8 +66,8 @@ public class MemoizingRequestTest extends TestCase {
     Runner firstRunner = memoizingRequest.getRunner();
     Runner secondRunner = memoizingRequest.getRunner();
 
-    assertSame(stubRunner, firstRunner);
-    assertSame(firstRunner, secondRunner);
+    assertThat(firstRunner).isSameAs(stubRunner);
+    assertThat(secondRunner).isSameAs(firstRunner);
     verifyZeroInteractions(mockRequestDelegate);
   }
 }
diff --git a/src/java_tools/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..5410de1b20 100644
--- a/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/junit4/JUnit4ConfigTest.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/junit4/JUnit4ConfigTest.java
@@ -14,11 +14,9 @@
 
 package com.google.testing.junit.runner.junit4;
 
+import static com.google.common.truth.Truth.assertThat;
 import static com.google.testing.junit.runner.junit4.JUnit4Config.JUNIT_API_VERSION_PROPERTY;
 import static com.google.testing.junit.runner.junit4.JUnit4Config.SHOULD_INSTALL_SECURITY_MANAGER_PROPERTY;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import com.google.testing.junit.runner.util.GoogleTestSecurityManager;
@@ -46,7 +44,7 @@ public class JUnit4ConfigTest {
   @Test
   public void testGetJUnitRunnerApiVersion_defaultValue() {
     JUnit4Config config = createConfigWithApiVersion("1");
-    assertEquals(1, config.getJUnitRunnerApiVersion());
+    assertThat(config.getJUnitRunnerApiVersion()).isEqualTo(1);
   }
 
   @Test
@@ -57,7 +55,7 @@ public class JUnit4ConfigTest {
       config.getJUnitRunnerApiVersion();
       fail("exception expected");
     } catch (IllegalStateException expected) {
-      assertTrue(expected.getMessage().contains("I love pesto"));
+      assertThat(expected).hasMessageThat().contains("I love pesto");
     }
   }
 
@@ -69,7 +67,7 @@ public class JUnit4ConfigTest {
       config.getJUnitRunnerApiVersion();
       fail("exception expected");
     } catch (IllegalStateException expected) {
-      assertTrue(expected.getMessage().contains("3.14"));
+      assertThat(expected).hasMessageThat().contains("3.14");
     }
   }
 
@@ -81,14 +79,14 @@ public class JUnit4ConfigTest {
       config.getJUnitRunnerApiVersion();
       fail("exception expected");
     } catch (IllegalStateException expected) {
-      assertTrue(expected.getMessage().contains("13"));
+      assertThat(expected).hasMessageThat().contains("13");
     }
   }
 
   @Test
   public void testGetJUnitRunnerApiVersion_oneIsValid() {
     JUnit4Config config = createConfigWithApiVersion("1");
-    assertEquals(1, config.getJUnitRunnerApiVersion());
+    assertThat(config.getJUnitRunnerApiVersion()).isEqualTo(1);
   }
 
   @Test
@@ -96,7 +94,7 @@ public class JUnit4ConfigTest {
     GoogleTestSecurityManager.uninstallIfInstalled();
 
     JUnit4Config config = createConfigWithProperties(new Properties());
-    assertTrue(config.shouldInstallSecurityManager());
+    assertThat(config.shouldInstallSecurityManager()).isTrue();
   }
 
   @Test
@@ -105,7 +103,7 @@ public class JUnit4ConfigTest {
     properties.put("java.security.manager", "MySecurityManager");
     properties.put(SHOULD_INSTALL_SECURITY_MANAGER_PROPERTY, "true");
     JUnit4Config config = createConfigWithProperties(properties);
-    assertFalse(config.shouldInstallSecurityManager());
+    assertThat(config.shouldInstallSecurityManager()).isFalse();
   }
 
   @Test
@@ -113,6 +111,6 @@ public class JUnit4ConfigTest {
     Properties properties = new Properties();
     properties.put(SHOULD_INSTALL_SECURITY_MANAGER_PROPERTY, "false");
     JUnit4Config config = createConfigWithProperties(properties);
-    assertFalse(config.shouldInstallSecurityManager());
+    assertThat(config.shouldInstallSecurityManager()).isFalse();
   }
 }
diff --git a/src/java_tools/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..f92f1dcd5c 100644
--- a/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/junit4/JUnit4OptionsTest.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/junit4/JUnit4OptionsTest.java
@@ -14,9 +14,7 @@
 
 package com.google.testing.junit.runner.junit4;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
 import com.google.common.collect.ImmutableList;
@@ -38,46 +36,46 @@ public class JUnit4OptionsTest {
   @Test
   public void testParse_noArgs() throws Exception {
     JUnit4Options options = JUnit4Options.parse(EMPTY_ENV, ImmutableList.<String>of());
-    assertNull(options.getTestIncludeFilter());
-    assertEquals(0, options.getUnparsedArgs().length);
+    assertThat(options.getTestIncludeFilter()).isNull();
+    assertThat(options.getUnparsedArgs()).isEmpty();
   }
 
   @Test
   public void testParse_onlyUnparsedArgs() {
     JUnit4Options options = JUnit4Options.parse(EMPTY_ENV, ImmutableList.of("--bar", "baz"));
-    assertNull(options.getTestIncludeFilter());
-    assertArrayEquals(new String[] {"--bar", "baz"}, options.getUnparsedArgs());
+    assertThat(options.getTestIncludeFilter()).isNull();
+    assertThat(options.getUnparsedArgs()).isEqualTo(new String[] {"--bar", "baz"});
   }
 
   @Test
   public void testParse_withTwoArgTestFilter() throws Exception {
     JUnit4Options options = JUnit4Options.parse(
         EMPTY_ENV, ImmutableList.of("--test_filter", "foo"));
-    assertEquals("foo", options.getTestIncludeFilter());
-    assertEquals(0, options.getUnparsedArgs().length);
+    assertThat(options.getTestIncludeFilter()).isEqualTo("foo");
+    assertThat(options.getUnparsedArgs()).isEmpty();
   }
 
   @Test
   public void testParse_withOneArgTestFilter() throws Exception {
     JUnit4Options options = JUnit4Options.parse(EMPTY_ENV, ImmutableList.of("--test_filter=foo"));
-    assertEquals("foo", options.getTestIncludeFilter());
-    assertEquals(0, options.getUnparsedArgs().length);
+    assertThat(options.getTestIncludeFilter()).isEqualTo("foo");
+    assertThat(options.getUnparsedArgs()).isEmpty();
   }
 
   @Test
   public void testParse_testFilterAndUnparsedArgs() throws Exception {
     JUnit4Options options = JUnit4Options.parse(
         EMPTY_ENV, ImmutableList.of("--bar", "--test_filter=foo", "--baz"));
-    assertEquals("foo", options.getTestIncludeFilter());
-    assertArrayEquals(new String[] {"--bar", "--baz"}, options.getUnparsedArgs());
+    assertThat(options.getTestIncludeFilter()).isEqualTo("foo");
+    assertThat(options.getUnparsedArgs()).isEqualTo(new String[] {"--bar", "--baz"});
   }
 
   @Test
   public void testParse_testLastTestFilterWins() throws Exception {
     JUnit4Options options =
         JUnit4Options.parse(EMPTY_ENV, ImmutableList.of("--test_filter=foo", "--test_filter=bar"));
-    assertEquals("bar", options.getTestIncludeFilter());
-    assertEquals(0, options.getUnparsedArgs().length);
+    assertThat(options.getTestIncludeFilter()).isEqualTo("bar");
+    assertThat(options.getUnparsedArgs()).isEmpty();
   }
 
   @Test
@@ -94,23 +92,23 @@ public class JUnit4OptionsTest {
   public void testParse_testFilterExcludeWithTwoArgTestFilter() throws Exception {
     JUnit4Options options = JUnit4Options.parse(
         EMPTY_ENV, ImmutableList.of("--test_exclude_filter", "foo"));
-    assertEquals("foo", options.getTestExcludeFilter());
-    assertEquals(0, options.getUnparsedArgs().length);
+    assertThat(options.getTestExcludeFilter()).isEqualTo("foo");
+    assertThat(options.getUnparsedArgs()).isEmpty();
   }
 
   @Test
   public void testParse_testFilterExcludewithOneArgTestFilter() throws Exception {
     JUnit4Options options = JUnit4Options.parse(
         EMPTY_ENV, ImmutableList.of("--test_exclude_filter=foo"));
-    assertEquals("foo", options.getTestExcludeFilter());
-    assertEquals(0, options.getUnparsedArgs().length);
+    assertThat(options.getTestExcludeFilter()).isEqualTo("foo");
+    assertThat(options.getUnparsedArgs()).isEmpty();
   }
 
   @Test
   public void testParse_unknownOptionName() throws Exception {
     JUnit4Options options = JUnit4Options.parse(
         EMPTY_ENV, ImmutableList.of("--unknown=foo"));
-    assertArrayEquals(new String[] {"--unknown=foo"}, options.getUnparsedArgs());
+    assertThat(options.getUnparsedArgs()).isEqualTo(new String[] {"--unknown=foo"});
   }
 
   @Test
@@ -118,8 +116,8 @@ public class JUnit4OptionsTest {
     Map<String, String> env = new HashMap<>();
     env.put("TESTBRIDGE_TEST_ONLY", "foo");
     JUnit4Options options = JUnit4Options.parse(env, ImmutableList.<String>of());
-    assertEquals("foo", options.getTestIncludeFilter());
-    assertEquals(0, options.getUnparsedArgs().length);
+    assertThat(options.getTestIncludeFilter()).isEqualTo("foo");
+    assertThat(options.getUnparsedArgs()).isEmpty();
   }
 
   @Test
@@ -127,7 +125,7 @@ public class JUnit4OptionsTest {
     Map<String, String> env = new HashMap<>();
     env.put("TESTBRIDGE_TEST_ONLY", "foo");
     JUnit4Options options = JUnit4Options.parse(env, ImmutableList.of("--test_filter=bar"));
-    assertEquals("bar", options.getTestIncludeFilter());
-    assertEquals(0, options.getUnparsedArgs().length);
+    assertThat(options.getTestIncludeFilter()).isEqualTo("bar");
+    assertThat(options.getUnparsedArgs()).isEmpty();
   }
 }
diff --git a/src/java_tools/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..b8bff631eb 100644
--- a/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/junit4/JUnit4RunnerTest.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/junit4/JUnit4RunnerTest.java
@@ -15,8 +15,7 @@
 package com.google.testing.junit.runner.junit4;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static com.google.common.truth.Truth.assertWithMessage;
 import static org.junit.Assert.fail;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyListOf;
@@ -126,9 +125,9 @@ public class JUnit4RunnerTest {
 
     Result result = runner.run();
 
-    assertEquals(1, result.getRunCount());
-    assertEquals(0, result.getFailureCount());
-    assertEquals(0, result.getIgnoreCount());
+    assertThat(result.getRunCount()).isEqualTo(1);
+    assertThat(result.getFailureCount()).isEqualTo(0);
+    assertThat(result.getIgnoreCount()).isEqualTo(0);
 
     assertPassingTestHasExpectedOutput(stdoutByteStream, SamplePassingTest.class);
 
@@ -154,13 +153,16 @@ public class JUnit4RunnerTest {
 
     Result result = runner.run();
 
-    assertEquals(1, result.getRunCount());
-    assertEquals(1, result.getFailureCount());
-    assertEquals(0, result.getIgnoreCount());
+    assertThat(result.getRunCount()).isEqualTo(1);
+    assertThat(result.getFailureCount()).isEqualTo(1);
+    assertThat(result.getIgnoreCount()).isEqualTo(0);
 
-    assertTrue(extractOutput(stdoutByteStream).contains(
-        "1) testThatAlwaysFails(" + SampleFailingTest.class.getName() + ")\n" +
-        "java.lang.AssertionError: expected"));
+    assertThat(extractOutput(stdoutByteStream))
+        .contains(
+            "1) testThatAlwaysFails("
+                + SampleFailingTest.class.getName()
+                + ")\n"
+                + "java.lang.AssertionError: expected");
 
     InOrder inOrder = inOrder(mockRunListener);
 
@@ -186,14 +188,14 @@ public class JUnit4RunnerTest {
 
     Result result = runner.run();
 
-    assertEquals(1, result.getRunCount());
-    assertEquals(1, result.getFailureCount());
-    assertEquals(0, result.getIgnoreCount());
+    assertThat(result.getRunCount()).isEqualTo(1);
+    assertThat(result.getFailureCount()).isEqualTo(1);
+    assertThat(result.getIgnoreCount()).isEqualTo(0);
 
     String output = new String(stdoutByteStream.toByteArray(), StandardCharsets.UTF_8);
     // Intentionally swapped "Test 日\u672C." / "Test \u65E5本." to make sure that the "raw"
     // character does not get corrupted (would become ? in both cases and we would not notice).
-    assertTrue(output.contains("expected:<Test [Japan].> but was:<Test [日\u672C].>"));
+    assertThat(output).contains("expected:<Test [Japan].> but was:<Test [日\u672C].>");
 
     InOrder inOrder = inOrder(mockRunListener);
 
@@ -222,9 +224,10 @@ public class JUnit4RunnerTest {
       runner.run();
       fail("exception expected");
     } catch (RuntimeException e) {
-      assertEquals("Test run interrupted", e.getMessage());
-      assertTrue("Expected cause to be a StoppedByUserException",
-          e.getCause() instanceof StoppedByUserException);
+      assertThat(e).hasMessageThat().isEqualTo("Test run interrupted");
+      assertWithMessage("Expected cause to be a StoppedByUserException")
+          .that(e.getCause() instanceof StoppedByUserException)
+          .isTrue();
 
       InOrder inOrder = inOrder(mockRunListener);
       inOrder.verify(mockRunListener).testRunStarted(any(Description.class));
@@ -255,9 +258,9 @@ public class JUnit4RunnerTest {
     JUnit4Runner runner = createRunner(SampleExitingTest.class);
     Result result = runner.run();
 
-    assertEquals(1, result.getRunCount());
-    assertEquals(1, result.getFailureCount());
-    assertEquals(0, result.getIgnoreCount());
+    assertThat(result.getRunCount()).isEqualTo(1);
+    assertThat(result.getFailureCount()).isEqualTo(1);
+    assertThat(result.getIgnoreCount()).isEqualTo(0);
   }
 
   @Test
@@ -275,13 +278,13 @@ public class JUnit4RunnerTest {
 
     verify(shardingEnvironment).touchShardFile();
 
-    assertEquals(2, result.getRunCount());
+    assertThat(result.getRunCount()).isEqualTo(2);
     if (result.getFailureCount() > 1) {
       fail("Too many failures: " + result.getFailures());
     }
-    assertEquals(1, result.getFailureCount());
-    assertEquals(0, result.getIgnoreCount());
-    assertEquals(2, runner.getModel().getNumTestCases());
+    assertThat(result.getFailureCount()).isEqualTo(1);
+    assertThat(result.getIgnoreCount()).isEqualTo(0);
+    assertThat(runner.getModel().getNumTestCases()).isEqualTo(2);
   }
 
   @Test
@@ -290,12 +293,12 @@ public class JUnit4RunnerTest {
     JUnit4Runner runner = createRunner(SampleSuite.class);
     Result result = runner.run();
 
-    assertEquals(1, result.getRunCount());
-    assertEquals(1, result.getFailureCount());
-    assertEquals(0, result.getIgnoreCount());
-    assertEquals(
-        Description.createTestDescription(SampleFailingTest.class, "testThatAlwaysFails"),
-        result.getFailures().get(0).getDescription());
+    assertThat(result.getRunCount()).isEqualTo(1);
+    assertThat(result.getFailureCount()).isEqualTo(1);
+    assertThat(result.getIgnoreCount()).isEqualTo(0);
+    assertThat(result.getFailures().get(0).getDescription())
+        .isEqualTo(
+            Description.createTestDescription(SampleFailingTest.class, "testThatAlwaysFails"));
   }
 
   @Test
@@ -304,10 +307,10 @@ public class JUnit4RunnerTest {
     JUnit4Runner runner = createRunner(SampleSuite.class);
     Result result = runner.run();
 
-    assertEquals(1, result.getRunCount());
-    assertEquals(1, result.getFailureCount());
-    assertEquals(0, result.getIgnoreCount());
-    assertTrue(result.getFailures().get(0).getMessage().contains("No tests found"));
+    assertThat(result.getRunCount()).isEqualTo(1);
+    assertThat(result.getFailureCount()).isEqualTo(1);
+    assertThat(result.getIgnoreCount()).isEqualTo(0);
+    assertThat(result.getFailures().get(0).getMessage()).contains("No tests found");
   }
 
   @Test
@@ -316,12 +319,12 @@ public class JUnit4RunnerTest {
     JUnit4Runner runner = createRunner(SampleSuite.class);
     Result result = runner.run();
 
-    assertEquals(2, result.getRunCount());
-    assertEquals(1, result.getFailureCount());
-    assertEquals(0, result.getIgnoreCount());
-    assertEquals(
-        Description.createTestDescription(SampleFailingTest.class, "testThatAlwaysFails"),
-        result.getFailures().get(0).getDescription());
+    assertThat(result.getRunCount()).isEqualTo(2);
+    assertThat(result.getFailureCount()).isEqualTo(1);
+    assertThat(result.getIgnoreCount()).isEqualTo(0);
+    assertThat(result.getFailures().get(0).getDescription())
+        .isEqualTo(
+            Description.createTestDescription(SampleFailingTest.class, "testThatAlwaysFails"));
   }
 
   @Test
@@ -339,12 +342,12 @@ public class JUnit4RunnerTest {
 
     verify(shardingEnvironment).touchShardFile();
 
-    assertEquals(2, result.getRunCount());
-    assertEquals(1, result.getFailureCount());
-    assertEquals(0, result.getIgnoreCount());
-    assertEquals(
-        Description.createTestDescription(SampleFailingTest.class, "testThatAlwaysFails"),
-        result.getFailures().get(0).getDescription());
+    assertThat(result.getRunCount()).isEqualTo(2);
+    assertThat(result.getFailureCount()).isEqualTo(1);
+    assertThat(result.getIgnoreCount()).isEqualTo(0);
+    assertThat(result.getFailures().get(0).getDescription())
+        .isEqualTo(
+            Description.createTestDescription(SampleFailingTest.class, "testThatAlwaysFails"));
   }
 
   @Test
@@ -361,9 +364,9 @@ public class JUnit4RunnerTest {
 
     verify(shardingEnvironment).touchShardFile();
 
-    assertEquals(0, result.getRunCount());
-    assertEquals(0, result.getFailureCount());
-    assertEquals(0, result.getIgnoreCount());
+    assertThat(result.getRunCount()).isEqualTo(0);
+    assertThat(result.getFailureCount()).isEqualTo(0);
+    assertThat(result.getIgnoreCount()).isEqualTo(0);
   }
 
   @Test
@@ -379,10 +382,10 @@ public class JUnit4RunnerTest {
     JUnit4Runner runner = createRunner(SampleSuite.class);
     Result result = runner.run();
 
-    assertEquals(1, result.getRunCount());
-    assertEquals(1, result.getFailureCount());
-    assertEquals(0, result.getIgnoreCount());
-    assertTrue(result.getFailures().get(0).getMessage().contains("No tests found"));
+    assertThat(result.getRunCount()).isEqualTo(1);
+    assertThat(result.getFailureCount()).isEqualTo(1);
+    assertThat(result.getIgnoreCount()).isEqualTo(0);
+    assertThat(result.getFailures().get(0).getMessage()).contains("No tests found");
 
     verify(shardingEnvironment).touchShardFile();
     verify(shardingFilters).createShardingFilter(anyListOf(Description.class));
@@ -397,7 +400,7 @@ public class JUnit4RunnerTest {
       runner.run();
       fail();
     } catch (IllegalStateException e) {
-      assertThat(e.getMessage()).startsWith("Unsupported JUnit Runner API version");
+      assertThat(e).hasMessageThat().startsWith("Unsupported JUnit Runner API version");
     }
   }
 
@@ -417,7 +420,7 @@ public class JUnit4RunnerTest {
       Class<?> testClass) {
     ByteArrayOutputStream expectedOutputStream = getExpectedOutput(testClass);
 
-    assertEquals(extractOutput(expectedOutputStream), extractOutput(outputStream));
+    assertThat(extractOutput(outputStream)).isEqualTo(extractOutput(expectedOutputStream));
   }
 
   private String extractOutput(ByteArrayOutputStream outputStream) {
@@ -487,7 +490,7 @@ public class JUnit4RunnerTest {
 
     @Test
     public void testThatAlwaysFails() {
-      assertEquals("Test Japan.", "Test \u65E5本.");
+      assertThat("Test \u65E5本.").isEqualTo("Test Japan.");
     }
   }
 
diff --git a/src/java_tools/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..b409163617 100644
--- a/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/junit4/JUnit4TestModelBuilderTest.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/junit4/JUnit4TestModelBuilderTest.java
@@ -14,9 +14,8 @@
 
 package com.google.testing.junit.runner.junit4;
 
+import static com.google.common.truth.Truth.assertThat;
 import static com.google.testing.junit.runner.sharding.ShardingFilters.DEFAULT_SHARDING_STRATEGY;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
@@ -106,16 +105,16 @@ public class JUnit4TestModelBuilderTest {
 
     TestSuiteModel model = modelBuilder.get();
     TestNode suiteNode = Iterables.getOnlyElement(model.getTopLevelTestSuites());
-    assertEquals(suite, suiteNode.getDescription());
+    assertThat(suiteNode.getDescription()).isEqualTo(suite);
     List<TestNode> testCases = suiteNode.getChildren();
-    assertEquals(2, testCases.size());
+    assertThat(testCases).hasSize(2);
     TestNode testOneNode = testCases.get(0);
     TestNode testTwoNode = testCases.get(1);
-    assertEquals(testOne, testOneNode.getDescription());
-    assertEquals(testTwo, testTwoNode.getDescription());
-    assertTrue(testOneNode.getChildren().isEmpty());
-    assertTrue(testTwoNode.getChildren().isEmpty());
-    assertEquals(2, model.getNumTestCases());
+    assertThat(testOneNode.getDescription()).isEqualTo(testOne);
+    assertThat(testTwoNode.getDescription()).isEqualTo(testTwo);
+    assertThat(testOneNode.getChildren()).isEmpty();
+    assertThat(testTwoNode.getChildren()).isEmpty();
+    assertThat(model.getNumTestCases()).isEqualTo(2);
   }
 
   @Test
@@ -132,13 +131,13 @@ public class JUnit4TestModelBuilderTest {
 
     TestSuiteModel model = modelBuilder.get();
     TestNode topSuiteNode = Iterables.getOnlyElement(model.getTopLevelTestSuites());
-    assertEquals(topSuite, topSuiteNode.getDescription());
+    assertThat(topSuiteNode.getDescription()).isEqualTo(topSuite);
     TestNode innerSuiteNode = Iterables.getOnlyElement(topSuiteNode.getChildren());
-    assertEquals(innerSuite, innerSuiteNode.getDescription());
+    assertThat(innerSuiteNode.getDescription()).isEqualTo(innerSuite);
     TestNode testOneNode = Iterables.getOnlyElement(innerSuiteNode.getChildren());
-    assertEquals(testOne, testOneNode.getDescription());
-    assertTrue(testOneNode.getChildren().isEmpty());
-    assertEquals(1, model.getNumTestCases());
+    assertThat(testOneNode.getDescription()).isEqualTo(testOne);
+    assertThat(testOneNode.getChildren()).isEmpty();
+    assertThat(model.getNumTestCases()).isEqualTo(1);
   }
 
 
diff --git a/src/java_tools/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 07a768cbff..852dd7b2f2 100644
--- a/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/model/TestCaseNodeTest.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/model/TestCaseNodeTest.java
@@ -14,10 +14,7 @@
 
 package com.google.testing.junit.runner.model;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static com.google.common.truth.Truth.assertThat;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -44,7 +41,7 @@ public class TestCaseNodeTest {
 
   @Test
   public void assertIsTestCase() {
-    assertTrue(new TestCaseNode(testCase, new TestSuiteNode(suite)).isTestCase());
+    assertThat(new TestCaseNode(testCase, new TestSuiteNode(suite)).isTestCase()).isTrue();
   }
 
   @Test
@@ -144,16 +141,16 @@ public class TestCaseNodeTest {
   private void assertStatusAndTiming(
       TestCaseNode testCase, TestResult.Status status, long start, long duration) {
     TestResult result = testCase.getResult();
-    assertEquals(status, result.getStatus());
-    assertNotNull(result.getRunTimeInterval());
-    assertEquals(start, result.getRunTimeInterval().getStartMillis());
-    assertEquals(duration, result.getRunTimeInterval().toDurationMillis());
+    assertThat(result.getStatus()).isEqualTo(status);
+    assertThat(result.getRunTimeInterval()).isNotNull();
+    assertThat(result.getRunTimeInterval().getStartMillis()).isEqualTo(start);
+    assertThat(result.getRunTimeInterval().toDurationMillis()).isEqualTo(duration);
   }
 
   private void assertStatusWithoutTiming(TestCaseNode testCase, TestResult.Status status) {
     TestResult result = testCase.getResult();
-    assertEquals(status, result.getStatus());
-    assertNull(result.getRunTimeInterval());
+    assertThat(result.getStatus()).isEqualTo(status);
+    assertThat(result.getRunTimeInterval()).isNull();
   }
 
   static class TestSuite {
diff --git a/src/java_tools/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..26573e8f55 100644
--- a/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/model/TestIntervalTest.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/model/TestIntervalTest.java
@@ -14,7 +14,7 @@
 
 package com.google.testing.junit.runner.model;
 
-import static org.junit.Assert.assertEquals;
+import static com.google.common.truth.Truth.assertThat;
 
 import java.util.Date;
 import java.util.TimeZone;
@@ -31,12 +31,12 @@ public class TestIntervalTest {
   @Test
   public void testCreation() {
     TestInterval interval = new TestInterval(123456, 234567);
-    assertEquals(123456, interval.getStartMillis());
-    assertEquals(234567, interval.getEndMillis());
+    assertThat(interval.getStartMillis()).isEqualTo(123456);
+    assertThat(interval.getEndMillis()).isEqualTo(234567);
 
     interval = new TestInterval(123456, 123456);
-    assertEquals(123456, interval.getStartMillis());
-    assertEquals(123456, interval.getEndMillis());
+    assertThat(interval.getStartMillis()).isEqualTo(123456);
+    assertThat(interval.getEndMillis()).isEqualTo(123456);
   }
 
   @Test
@@ -48,18 +48,17 @@ public class TestIntervalTest {
 
   @Test
   public void testToDuration() {
-    assertEquals(100, new TestInterval(50, 150).toDurationMillis());
-    assertEquals(0, new TestInterval(100, 100).toDurationMillis());
+    assertThat(new TestInterval(50, 150).toDurationMillis()).isEqualTo(100);
+    assertThat(new TestInterval(100, 100).toDurationMillis()).isEqualTo(0);
   }
 
   @Test
   public void testDateFormat() {
     Date date = new Date(1471709734000L);
     TestInterval interval = new TestInterval(date.getTime(), date.getTime() + 100);
-    assertEquals(
-        "2016-08-20T12:15:34.000-04:00",
-        interval.startInstantToString(TimeZone.getTimeZone("America/New_York")));
-    assertEquals(
-        "2016-08-20T16:15:34.000Z", interval.startInstantToString(TimeZone.getTimeZone("GMT")));
+    assertThat(interval.startInstantToString(TimeZone.getTimeZone("America/New_York")))
+        .isEqualTo("2016-08-20T12:15:34.000-04:00");
+    assertThat(interval.startInstantToString(TimeZone.getTimeZone("GMT")))
+        .isEqualTo("2016-08-20T16:15:34.000Z");
   }
 }
diff --git a/src/java_tools/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..e6448c55ef 100644
--- a/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/model/TestSuiteNodeTest.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/model/TestSuiteNodeTest.java
@@ -14,11 +14,12 @@
 
 package com.google.testing.junit.runner.model;
 
-import static org.junit.Assert.assertFalse;
+import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.Description;
@@ -45,7 +46,7 @@ public class TestSuiteNodeTest {
 
   @Test
   public void testIsTestCase() {
-    assertFalse(testSuiteNode.isTestCase());
+    assertThat(testSuiteNode.isTestCase()).isFalse();
     verifyZeroInteractions(testCaseNode);
   }
 
diff --git a/src/java_tools/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..1fed6a319b 100644
--- a/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/model/XmlWriterTest.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/model/XmlWriterTest.java
@@ -14,7 +14,7 @@
 
 package com.google.testing.junit.runner.model;
 
-import static org.junit.Assert.assertEquals;
+import static com.google.common.truth.Truth.assertThat;
 
 import com.google.common.base.Joiner;
 import java.io.ByteArrayOutputStream;
@@ -226,7 +226,7 @@ public class XmlWriterTest {
   
   private void assertHasContents(String... contents) throws UnsupportedEncodingException {
     Object[] expected = contents;
-    
-    assertEquals(LINE_JOINER.join(expected).trim(), outputStream.toString("UTF-8").trim());
+
+    assertThat(outputStream.toString("UTF-8").trim()).isEqualTo(LINE_JOINER.join(expected).trim());
   }
 }
diff --git a/src/java_tools/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..8fe314d269 100644
--- a/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/sharding/RoundRobinShardingFilterTest.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/sharding/RoundRobinShardingFilterTest.java
@@ -14,19 +14,17 @@
 
 package com.google.testing.junit.runner.sharding;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import com.google.testing.junit.runner.sharding.api.ShardingFilterFactory;
 import com.google.testing.junit.runner.sharding.testing.RoundRobinShardingFilterFactory;
 import com.google.testing.junit.runner.sharding.testing.ShardingFilterTestCase;
-
-import org.junit.runner.Description;
-import org.junit.runner.manipulation.Filter;
-
 import java.util.List;
 import java.util.Map;
+import org.junit.runner.Description;
+import org.junit.runner.manipulation.Filter;
 
-/**
- * Tests for the {@link RoundRobinShardingFilter}.
- */
+/** Tests for the {@link RoundRobinShardingFilter}. */
 public class RoundRobinShardingFilterTest extends ShardingFilterTestCase {
 
   private static final List<Description> GENERIC_TEST_DESCRIPTIONS =
@@ -39,15 +37,15 @@ public class RoundRobinShardingFilterTest extends ShardingFilterTestCase {
 
   public void testShardingIsBalanced() {
     Map<Filter, List<Description>> run1 = simulateTestRun(FILTERS_1, GENERIC_TEST_DESCRIPTIONS);
-    assertEquals(2, run1.get(FILTERS_1.get(0)).size());
-    assertEquals(2, run1.get(FILTERS_1.get(1)).size());
-    assertEquals(2, run1.get(FILTERS_1.get(2)).size());
+    assertThat(run1.get(FILTERS_1.get(0))).hasSize(2);
+    assertThat(run1.get(FILTERS_1.get(1))).hasSize(2);
+    assertThat(run1.get(FILTERS_1.get(2))).hasSize(2);
 
     Map<Filter, List<Description>> run2 = simulateTestRun(FILTERS_2, GENERIC_TEST_DESCRIPTIONS);
-    assertEquals(2, run2.get(FILTERS_2.get(0)).size());
-    assertEquals(2, run2.get(FILTERS_2.get(1)).size());
-    assertEquals(1, run2.get(FILTERS_2.get(2)).size());
-    assertEquals(1, run2.get(FILTERS_2.get(3)).size());
+    assertThat(run2.get(FILTERS_2.get(0))).hasSize(2);
+    assertThat(run2.get(FILTERS_2.get(1))).hasSize(2);
+    assertThat(run2.get(FILTERS_2.get(2))).hasSize(1);
+    assertThat(run2.get(FILTERS_2.get(3))).hasSize(1);
   }
 
   public void testShouldRun_throwsExceptionForUnknownDescription() {
diff --git a/src/java_tools/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..69d9f20601 100644
--- a/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/sharding/ShardingEnvironmentTest.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/sharding/ShardingEnvironmentTest.java
@@ -14,18 +14,15 @@
 
 package com.google.testing.junit.runner.sharding;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static com.google.common.truth.Truth.assertThat;
 
 import com.google.devtools.build.lib.testutil.TestUtils;
+import java.io.File;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
-import java.io.File;
 
-/**
- * Tests interactions with the test environment related to sharding.
- */
+/** Tests interactions with the test environment related to sharding. */
 @RunWith(JUnit4.class)
 public class ShardingEnvironmentTest {
 
@@ -33,10 +30,10 @@ public class ShardingEnvironmentTest {
   @Test
   public void testTouchShardingFile() {
     File shardFile = new File(TestUtils.tmpDirFile(), "shard_file_123");
-    assertFalse(shardFile.exists());
+    assertThat(shardFile.exists()).isFalse();
     try {
       ShardingEnvironment.touchShardFile(shardFile);
-      assertTrue(shardFile.exists());
+      assertThat(shardFile.exists()).isTrue();
     } finally {
       shardFile.delete();
     }
diff --git a/src/java_tools/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..2495cfa103 100644
--- a/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/sharding/ShardingFiltersTest.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/sharding/ShardingFiltersTest.java
@@ -15,7 +15,6 @@
 package com.google.testing.junit.runner.sharding;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.when;
 
 import com.google.testing.junit.runner.sharding.api.ShardingFilterFactory;
@@ -51,9 +50,9 @@ public class ShardingFiltersTest {
 
     assertThat(filter).isInstanceOf(RoundRobinShardingFilter.class);
     RoundRobinShardingFilter shardingFilter = (RoundRobinShardingFilter) filter;
-    assertEquals(expectedFilter.testToShardMap, shardingFilter.testToShardMap);
-    assertEquals(expectedFilter.shardIndex, shardingFilter.shardIndex);
-    assertEquals(expectedFilter.totalShards, shardingFilter.totalShards);
+    assertThat(shardingFilter.testToShardMap).isEqualTo(expectedFilter.testToShardMap);
+    assertThat(shardingFilter.shardIndex).isEqualTo(expectedFilter.shardIndex);
+    assertThat(shardingFilter.totalShards).isEqualTo(expectedFilter.totalShards);
   }
 
   @Test
@@ -68,8 +67,8 @@ public class ShardingFiltersTest {
     ShardingFilters shardingFilters = new ShardingFilters(mockShardingEnvironment);
     Filter filter = shardingFilters.createShardingFilter(descriptions);
 
-    assertEquals("com.google.testing.junit.runner.sharding.ShardingFiltersTest.TestFilter",
-        filter.getClass().getCanonicalName());
+    assertThat(filter.getClass().getCanonicalName())
+        .isEqualTo("com.google.testing.junit.runner.sharding.ShardingFiltersTest.TestFilter");
   }
 
   public static class TestFilterFactory implements ShardingFilterFactory {
diff --git a/src/java_tools/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..7d3c1c8d30 100644
--- a/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/testbed/InternationalCharsTest.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/testbed/InternationalCharsTest.java
@@ -14,6 +14,8 @@
 
 package com.google.testing.junit.runner.testbed;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import junit.framework.TestCase;
 
 /**
@@ -22,6 +24,6 @@ import junit.framework.TestCase;
  */
 public class InternationalCharsTest extends TestCase {
   public void testThatAlwaysFails() {
-    assertEquals("Test Japan.", "Test \u65E5本.");
+    assertThat("Test \u65E5本.").isEqualTo("Test Japan.");
   }
 }
diff --git a/src/java_tools/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..077342870d 100644
--- a/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/util/GoogleTestSecurityManagerTest.java
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/util/GoogleTestSecurityManagerTest.java
@@ -14,9 +14,8 @@
 
 package com.google.testing.junit.runner.util;
 
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 import static org.junit.Assert.fail;
 
 import java.security.Permission;
@@ -57,7 +56,7 @@ public class GoogleTestSecurityManagerTest {
 
   private void installTestSecurityManager() {
     SecurityManager previousSecurityManager = System.getSecurityManager();
-    assertNull(previousSecurityManager);
+    assertThat(previousSecurityManager).isNull();
 
     installedSecurityManager = new GoogleTestSecurityManager();
     System.setSecurityManager(installedSecurityManager);
@@ -96,7 +95,7 @@ public class GoogleTestSecurityManagerTest {
     // create a security manager to use, but don't install it.
     GoogleTestSecurityManager sm = new GoogleTestSecurityManager();
 
-    assertTrue(sm.isEnabled());
+    assertThat(sm.isEnabled()).isTrue();
     try {
       sm.checkExit(0);
       fail("GoogleTestSecurityManager allowed exit while enabled.");
@@ -105,12 +104,12 @@ public class GoogleTestSecurityManagerTest {
     }
 
     sm.setEnabled(false);
-    assertTrue(!sm.isEnabled());
+    assertThat(!sm.isEnabled()).isTrue();
 
     sm.checkExit(0); // should allow
 
     sm.setEnabled(true);
-    assertTrue(sm.isEnabled());
+    assertThat(sm.isEnabled()).isTrue();
     try {
       sm.checkExit(0);
       fail("GoogleTestSecurityManager allowed exit while enabled.");
@@ -123,16 +122,22 @@ public class GoogleTestSecurityManagerTest {
   public void testUninstallIfInstalled_whenInstalled() {
     installTestSecurityManager();
     GoogleTestSecurityManager.uninstallIfInstalled();
-    
-    assertTrue("Security manager should be enabled", installedSecurityManager.isEnabled());
-    assertNull("Security manager should be uninstalled", System.getSecurityManager());
+
+    assertWithMessage("Security manager should be enabled")
+        .that(installedSecurityManager.isEnabled())
+        .isTrue();
+    assertWithMessage("Security manager should be uninstalled")
+        .that(System.getSecurityManager())
+        .isNull();
   }
   
   @Test
   public void testUninstallIfInstalled_whenNoSecurityManagerInstalled() {
     GoogleTestSecurityManager.uninstallIfInstalled();
-    
-    assertNull("No security manager should be uninstalled", System.getSecurityManager());
+
+    assertWithMessage("No security manager should be uninstalled")
+        .that(System.getSecurityManager())
+        .isNull();
   }
   
   @Test
@@ -140,8 +145,8 @@ public class GoogleTestSecurityManagerTest {
     PermissiveSecurityManager otherSecurityManager = new PermissiveSecurityManager();
     System.setSecurityManager(otherSecurityManager);
     GoogleTestSecurityManager.uninstallIfInstalled();
-    
-    assertSame(otherSecurityManager, System.getSecurityManager());
+
+    assertThat(System.getSecurityManager()).isSameAs(otherSecurityManager);
     System.setSecurityManager(null);
   }