Migrate blaze from their own duplicated copy of MoreAsserts and use Truth instead.

--
MOS_MIGRATED_REVID=107480889

10 files changed, 28 insertions, 36 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java
index 70d2b70708..6781cdb01c 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java
@@ -13,6 +13,7 @@
 // limitations under the License.
 package com.google.devtools.build.lib.analysis.actions;
 
+import static com.google.common.truth.Truth.assertThat;
 import static com.google.devtools.build.lib.actions.util.ActionsTestUtil.NULL_ACTION_OWNER;
 
 import com.google.common.collect.Sets;
@@ -22,7 +23,6 @@ import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.actions.Executor;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
 import com.google.devtools.build.lib.exec.util.TestExecutorBuilder;
-import com.google.devtools.build.lib.testutil.MoreAsserts;
 import com.google.devtools.build.lib.vfs.FileSystemUtils;
 import com.google.devtools.build.lib.vfs.Path;
 
@@ -83,7 +83,7 @@ public class SymlinkActionTest extends BuildViewTestCase {
       action.execute(actionExecutionContext);
       fail("Expected ActionExecutionException");
     } catch (ActionExecutionException e) {
-      MoreAsserts.assertContainsRegex("'input.txt' is not executable", e.getMessage());
+      assertThat(e.getMessage()).containsMatch("'input.txt' is not executable");
     }
     input.setExecutable(true);
     action.execute(actionExecutionContext);
diff --git a/src/test/java/com/google/devtools/build/lib/cmdline/LabelTest.java b/src/test/java/com/google/devtools/build/lib/cmdline/LabelTest.java
index 90df2722f9..df7d2bdce9 100644
--- a/src/test/java/com/google/devtools/build/lib/cmdline/LabelTest.java
+++ b/src/test/java/com/google/devtools/build/lib/cmdline/LabelTest.java
@@ -14,7 +14,6 @@
 package com.google.devtools.build.lib.cmdline;
 
 import static com.google.common.truth.Truth.assertThat;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.assertContainsRegex;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.fail;
@@ -185,7 +184,7 @@ public class LabelTest {
       Label.parseAbsolute(label);
       fail("Label '" + label + "' did not contain a syntax error");
     } catch (LabelSyntaxException e) {
-      assertContainsRegex(Pattern.quote(expectedError), e.getMessage());
+      assertThat(e.getMessage()).containsMatch(Pattern.quote(expectedError));
     }
   }
 
diff --git a/src/test/java/com/google/devtools/build/lib/packages/SubincludePreprocessorTest.java b/src/test/java/com/google/devtools/build/lib/packages/SubincludePreprocessorTest.java
index 5a945a7851..2670d68f3b 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/SubincludePreprocessorTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/SubincludePreprocessorTest.java
@@ -13,7 +13,7 @@
 // limitations under the License.
 package com.google.devtools.build.lib.packages;
 
-import static com.google.devtools.build.lib.testutil.MoreAsserts.assertContainsRegex;
+import static com.google.common.truth.Truth.assertThat;
 import static com.google.devtools.build.lib.vfs.FileSystemUtils.writeIsoLatin1;
 
 import com.google.devtools.build.lib.events.Event;
@@ -89,17 +89,17 @@ public class SubincludePreprocessorTest extends PackageLoadingTestCase {
     scratch.file("foo/baz", "genrule('turtle2')");
 
     String out = assertPreprocessingSucceeds(in);
-    assertContainsRegex("turtle1", out);
-    assertContainsRegex("turtle2", out);
-    assertContainsRegex("mocksubinclude\\('//foo:bar', *'/workspace/foo/bar'\\)", out);
-    assertContainsRegex("mocksubinclude\\('//foo:baz', *'/workspace/foo/baz'\\)", out);
+    assertThat(out).containsMatch("turtle1");
+    assertThat(out).containsMatch("turtle2");
+    assertThat(out).containsMatch("mocksubinclude\\('//foo:bar', *'/workspace/foo/bar'\\)");
+    assertThat(out).containsMatch("mocksubinclude\\('//foo:baz', *'/workspace/foo/baz'\\)");
   }
 
   public void testSubincludeNotFound() throws Exception {
     ParserInputSource in = createInputSource("subinclude('//nonexistent:bar')");
     scratch.file("foo/BUILD");
     String out = assertPreprocessingSucceeds(in);
-    assertContainsRegex("mocksubinclude\\('//nonexistent:bar', *''\\)", out);
+    assertThat(out).containsMatch("mocksubinclude\\('//nonexistent:bar', *''\\)");
     assertContainsEvent("Cannot find subincluded file");
   }
 
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ActionExecutionInactivityWatchdogTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ActionExecutionInactivityWatchdogTest.java
index 42934a0356..e6e912d7a2 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ActionExecutionInactivityWatchdogTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ActionExecutionInactivityWatchdogTest.java
@@ -14,11 +14,11 @@
 package com.google.devtools.build.lib.skyframe;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 import static org.junit.Assert.assertEquals;
 
 import com.google.devtools.build.lib.skyframe.ActionExecutionInactivityWatchdog.InactivityMonitor;
 import com.google.devtools.build.lib.skyframe.ActionExecutionInactivityWatchdog.InactivityReporter;
-import com.google.devtools.build.lib.testutil.MoreAsserts;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -132,10 +132,9 @@ public class ActionExecutionInactivityWatchdogTest {
           try {
             monitorFinishedIndicator.wait(5000);
             done = true;
-            MoreAsserts.assertLessThan(
-                "test didn't finish under 5 seconds",
-                5000L,
-                System.currentTimeMillis() - startTime);
+            assertWithMessage("test didn't finish under 5 seconds")
+                .that(System.currentTimeMillis() - startTime)
+                .isLessThan(5000L);
           } catch (InterruptedException ie) {
             // so-called Spurious Wakeup; ignore
           }
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/FileSystemTest.java b/src/test/java/com/google/devtools/build/lib/vfs/FileSystemTest.java
index 3e433ac82d..db20108ff7 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/FileSystemTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/FileSystemTest.java
@@ -23,7 +23,6 @@ import static org.junit.Assert.fail;
 
 import com.google.common.base.Preconditions;
 import com.google.common.io.BaseEncoding;
-import com.google.devtools.build.lib.testutil.MoreAsserts;
 import com.google.devtools.build.lib.testutil.TestUtils;
 import com.google.devtools.build.lib.util.Fingerprint;
 
@@ -555,7 +554,7 @@ public abstract class FileSystemTest {
       newPath.createDirectory();
       fail();
     } catch (FileNotFoundException e) {
-      MoreAsserts.assertEndsWith(" (No such file or directory)", e.getMessage());
+      assertThat(e.getMessage()).endsWith(" (No such file or directory)");
     }
   }
 
@@ -578,7 +577,7 @@ public abstract class FileSystemTest {
       FileSystemUtils.createEmptyFile(newPath);
       fail();
     } catch (FileNotFoundException e) {
-      MoreAsserts.assertEndsWith(" (No such file or directory)", e.getMessage());
+      assertThat(e.getMessage()).endsWith(" (No such file or directory)");
     }
   }
 
@@ -603,7 +602,7 @@ public abstract class FileSystemTest {
       FileSystemUtils.createEmptyFile(wrongPath);
       fail();
     } catch (IOException e) {
-      MoreAsserts.assertEndsWith(" (Not a directory)", e.getMessage());
+      assertThat(e.getMessage()).endsWith(" (Not a directory)");
     }
   }
 
@@ -616,7 +615,7 @@ public abstract class FileSystemTest {
       wrongPath.createDirectory();
       fail();
     } catch (IOException e) {
-      MoreAsserts.assertEndsWith(" (Not a directory)", e.getMessage());
+      assertThat(e.getMessage()).endsWith(" (Not a directory)");
     }
   }
 
@@ -992,7 +991,7 @@ public abstract class FileSystemTest {
       xEmptyDirectory.renameTo(xNonEmptyDirectory);
       fail();
     } catch (IOException e) {
-      MoreAsserts.assertEndsWith(" (Directory not empty)", e.getMessage());
+      assertThat(e.getMessage()).endsWith(" (Directory not empty)");
     }
   }
 
@@ -1065,7 +1064,7 @@ public abstract class FileSystemTest {
       nonExistingPath.renameTo(targetPath);
       fail();
     } catch (FileNotFoundException e) {
-      MoreAsserts.assertEndsWith(" (No such file or directory)", e.getMessage());
+      assertThat(e.getMessage()).endsWith(" (No such file or directory)");
     }
   }
 
@@ -1189,7 +1188,7 @@ public abstract class FileSystemTest {
       xNonEmptyDirectoryFoo.isWritable(); // i.e. stat
       fail();
     } catch (IOException e) {
-      MoreAsserts.assertEndsWith(" (Permission denied)", e.getMessage());
+      assertThat(e.getMessage()).endsWith(" (Permission denied)");
     }
   }
 
@@ -1251,7 +1250,7 @@ public abstract class FileSystemTest {
       xFile.renameTo(xNonEmptyDirectoryBar);
       fail("No exception thrown.");
     } catch (IOException e) {
-      MoreAsserts.assertEndsWith(" (Permission denied)", e.getMessage());
+      assertThat(e.getMessage()).endsWith(" (Permission denied)");
     }
   }
 
@@ -1263,7 +1262,7 @@ public abstract class FileSystemTest {
       xNonEmptyDirectoryFoo.renameTo(xNothing);
       fail("No exception thrown.");
     } catch (IOException e) {
-      MoreAsserts.assertEndsWith(" (Permission denied)", e.getMessage());
+      assertThat(e.getMessage()).endsWith(" (Permission denied)");
     }
   }
 
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/GlobTest.java b/src/test/java/com/google/devtools/build/lib/vfs/GlobTest.java
index 33b26d546d..2b54531b8b 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/GlobTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/GlobTest.java
@@ -364,7 +364,7 @@ public class GlobTest {
           .globInterruptible();
       fail();
     } catch (IllegalArgumentException e) {
-      MoreAsserts.assertContainsRegex("in glob pattern", e.getMessage());
+      assertThat(e.getMessage()).containsMatch("in glob pattern");
     }
   }
 
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/PathFragmentTest.java b/src/test/java/com/google/devtools/build/lib/vfs/PathFragmentTest.java
index d648ba8e75..26e15cb93a 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/PathFragmentTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/PathFragmentTest.java
@@ -24,7 +24,6 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
 import com.google.common.testing.EqualsTester;
-import com.google.devtools.build.lib.testutil.MoreAsserts;
 import com.google.devtools.build.lib.testutil.TestUtils;
 import com.google.devtools.build.lib.vfs.inmemoryfs.InMemoryFileSystem;
 
@@ -477,7 +476,7 @@ public class PathFragmentTest {
                        -1 * Integer.signum(y.compareTo(x)));
           // Transitivity
           if (x.compareTo(y) > 0 && y.compareTo(z) > 0) {
-            MoreAsserts.assertGreaterThan(0, x.compareTo(z));
+            assertThat(x.compareTo(z)).isGreaterThan(0);
           }
           // "Substitutability"
           if (x.compareTo(y) == 0) {
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/RecursiveGlobTest.java b/src/test/java/com/google/devtools/build/lib/vfs/RecursiveGlobTest.java
index 298ad24eea..0c3eed22f7 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/RecursiveGlobTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/RecursiveGlobTest.java
@@ -20,7 +20,6 @@ import static org.junit.Assert.fail;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Ordering;
-import com.google.devtools.build.lib.testutil.MoreAsserts;
 import com.google.devtools.build.lib.util.BlazeClock;
 import com.google.devtools.build.lib.vfs.inmemoryfs.InMemoryFileSystem;
 
@@ -219,7 +218,7 @@ public class RecursiveGlobTest {
           .globInterruptible();
       fail();
     } catch (IllegalArgumentException e) {
-      MoreAsserts.assertContainsRegex("recursive wildcard must be its own segment", e.getMessage());
+      assertThat(e.getMessage()).containsMatch("recursive wildcard must be its own segment");
     }
   }
 
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/SymlinkAwareFileSystemTest.java b/src/test/java/com/google/devtools/build/lib/vfs/SymlinkAwareFileSystemTest.java
index 3a49995515..f8145e09c3 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/SymlinkAwareFileSystemTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/SymlinkAwareFileSystemTest.java
@@ -16,7 +16,6 @@ package com.google.devtools.build.lib.vfs;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.*;
 
-import com.google.devtools.build.lib.testutil.MoreAsserts;
 import com.google.devtools.build.lib.vfs.FileSystem.NotASymlinkException;
 
 import org.junit.Before;
@@ -410,7 +409,7 @@ public abstract class SymlinkAwareFileSystemTest extends FileSystemTest {
         xChildOfMissingDir.createSymbolicLink(xFile);
         fail();
       } catch (FileNotFoundException e) {
-        MoreAsserts.assertEndsWith(" (No such file or directory)", e.getMessage());
+        assertThat(e.getMessage()).endsWith(" (No such file or directory)");
       }
     }
   }
diff --git a/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java b/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java
index 5fe22a278d..55b3bb982f 100644
--- a/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java
+++ b/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java
@@ -18,8 +18,6 @@ import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 import static com.google.devtools.build.lib.testutil.MoreAsserts.assertContainsEvent;
 import static com.google.devtools.build.lib.testutil.MoreAsserts.assertEventCount;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.assertGreaterThan;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.assertLessThan;
 import static com.google.devtools.build.lib.testutil.MoreAsserts.assertNoEvents;
 import static com.google.devtools.build.skyframe.GraphTester.CONCATENATE;
 import static org.junit.Assert.assertEquals;
@@ -1069,8 +1067,8 @@ public class ParallelEvaluatorTest {
    * topKey, if {@code selfEdge} is true.
    */
   private static void assertManyCycles(ErrorInfo errorInfo, SkyKey topKey, boolean selfEdge) {
-    assertGreaterThan(1, Iterables.size(errorInfo.getCycleInfo()));
-    assertLessThan(50, Iterables.size(errorInfo.getCycleInfo()));
+    assertThat(Iterables.size(errorInfo.getCycleInfo())).isGreaterThan(1);
+    assertThat(Iterables.size(errorInfo.getCycleInfo())).isLessThan(50);
     boolean foundSelfEdge = false;
     for (CycleInfo cycle : errorInfo.getCycleInfo()) {
       assertEquals(1, cycle.getCycle().size()); // Self-edge.