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/util/StringUtilitiesTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/util/StringUtilitiesTest.java b/src/test/java/com/google/devtools/build/lib/util/StringUtilitiesTest.java
index c8ed641..548d10f 100644
--- a/src/test/java/com/google/devtools/build/lib/util/StringUtilitiesTest.java
+++ b/src/test/java/com/google/devtools/build/lib/util/StringUtilitiesTest.java
@@ -13,6 +13,7 @@
 // limitations under the License.
 package com.google.devtools.build.lib.util;
 
+import static com.google.common.truth.Truth.assertThat;
 import static com.google.devtools.build.lib.util.StringUtilities.combineKeys;
 import static com.google.devtools.build.lib.util.StringUtilities.joinLines;
 import static com.google.devtools.build.lib.util.StringUtilities.layoutTable;
@@ -42,7 +43,7 @@
 
   @Test
   public void emptyLinesYieldsEmptyString() {
-    assertEquals("", joinLines());
+    assertThat(joinLines()).isEmpty();
   }
 
   @Test
@@ -88,11 +89,11 @@
       String combined_key = combineKeys(keys_copy);
       String[] prev_keys = map.put(combined_key, keys_copy);
       if (prev_keys != null) {
-        fail("combineKeys collision:\n" +
-              "key sequence 1: " + Arrays.deepToString(prev_keys) + "\n" +
-              "key sequence 2: " + Arrays.deepToString(keys_copy) + "\n" +
-              "combined key sequence 1: " + combineKeys(prev_keys) + "\n" +
-              "combined key sequence 2: " + combineKeys(keys_copy) + "\n");
+        fail("combineKeys collision:\n"
+            + "key sequence 1: " + Arrays.toString(prev_keys) + "\n"
+            + "key sequence 2: " + Arrays.toString(keys_copy) + "\n"
+            + "combined key sequence 1: " + combineKeys(prev_keys) + "\n"
+            + "combined key sequence 2: " + combineKeys(keys_copy) + "\n");
       }
     } else {
       for (String key : test_keys) {
@@ -119,8 +120,7 @@
   public void replaceAllLiteral() throws Exception {
     assertEquals("ababab",
                  StringUtilities.replaceAllLiteral("bababa", "ba", "ab"));
-    assertEquals("",
-        StringUtilities.replaceAllLiteral("bababa", "ba", ""));
+    assertThat(StringUtilities.replaceAllLiteral("bababa", "ba", "")).isEmpty();
     assertEquals("bababa",
         StringUtilities.replaceAllLiteral("bababa", "", "ab"));
   }