diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/vfs')
5 files changed, 13 insertions, 17 deletions
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)"); } } } |