commit 795895aff87cdb0a5a1e8850b17ccf3863547a1c
author Ulf Adams <ulfjack@google.com> Fri Mar 06 15:58:35 2015 +0000
committer Damien Martin-Guillerez <dmarting@google.com> Tue Mar 10 13:55:19 2015 +0000
tree fced9c8a2124bfcfb8dfe5de3ba89ae6a25065db
parent 0bacd7c86ceade660a10193645fc93d68606cffc

Some more cleanup.

--
MOS_MIGRATED_REVID=87942730

src/test/java/com/google/devtools/build/lib/vfs/PathFragmentTest.java

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 9ab9bfa..53dd7a2 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
@@ -13,6 +13,7 @@
 // limitations under the License.
 package com.google.devtools.build.lib.vfs;
 
+import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
@@ -260,8 +261,8 @@
     assertEquals("foo", new PathFragment("/foo/").getBaseName());
     assertEquals("foo", new PathFragment("foo").getBaseName());
     assertEquals("foo", new PathFragment("/foo").getBaseName());
-    assertEquals("", new PathFragment("/").getBaseName());
-    assertEquals("", new PathFragment("").getBaseName());
+    assertThat(new PathFragment("/").getBaseName()).isEmpty();
+    assertThat(new PathFragment("").getBaseName()).isEmpty();
   }
 
   private static void assertPath(String expected, PathFragment actual) {
@@ -277,10 +278,10 @@
     assertPath("/baz", new PathFragment("/foo/").replaceName("baz"));
     assertPath("baz", new PathFragment("foo").replaceName("baz"));
     assertPath("/baz", new PathFragment("/foo").replaceName("baz"));
-    assertEquals(null, new PathFragment("/").replaceName("baz"));
-    assertEquals(null, new PathFragment("/").replaceName(""));
-    assertEquals(null, new PathFragment("").replaceName("baz"));
-    assertEquals(null, new PathFragment("").replaceName(""));
+    assertNull(new PathFragment("/").replaceName("baz"));
+    assertNull(new PathFragment("/").replaceName(""));
+    assertNull(new PathFragment("").replaceName("baz"));
+    assertNull(new PathFragment("").replaceName(""));
 
     assertPath("foo/bar/baz", new PathFragment("foo/bar").replaceName("bar/baz"));
     assertPath("foo/bar/baz", new PathFragment("foo/bar").replaceName("bar/baz/"));