commit 78cfa8d1977036452f45838f739cc53debf8a615
author lberki <lberki@google.com> Tue May 30 17:00:48 2017 +0200
committer László Csomor <laszlocsomor@google.com> Wed May 31 09:18:22 2017 +0200
tree 1a7aa946715e7d1b764955f3ee857ef435295ec0
parent a1fb6f26cfeaa712f447e5d41d2a98565e9ab478

Migrate most of the assertions to Truth that the auto-migration tool did not catch.

IntelliJ's "replace structurally" command was surprisingly useful.

RELNOTES: None.
PiperOrigin-RevId: 157463734

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 c6ed9bf..0b09fa6 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
@@ -18,7 +18,6 @@
 import static com.google.devtools.build.lib.util.StringUtilities.joinLines;
 import static com.google.devtools.build.lib.util.StringUtilities.layoutTable;
 import static com.google.devtools.build.lib.util.StringUtilities.prettyPrintBytes;
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
 import com.google.common.collect.Maps;
@@ -42,13 +41,13 @@
 
   @Test
   public void twoLinesGetjoinedNicely() {
-    assertEquals("line 1\nline 2", joinLines("line 1", "line 2"));
+    assertThat(joinLines("line 1", "line 2")).isEqualTo("line 1\nline 2");
   }
 
   @Test
   public void aTrailingNewlineIsAvailableWhenYouNeedIt() {
-    assertEquals("two lines\nwith trailing newline\n",
-        joinLines("two lines", "with trailing newline", ""));
+    assertThat(joinLines("two lines", "with trailing newline", ""))
+        .isEqualTo("two lines\nwith trailing newline\n");
   }
 
   // Tests of StringUtilities.combineKeys()
@@ -56,7 +55,7 @@
   /** Simple sanity test of format */
   @Test
   public void combineKeysFormat() {
-    assertEquals("<a><b!!c><!<d!>>", combineKeys("a", "b!c", "<d>"));
+    assertThat(combineKeys("a", "b!c", "<d>")).isEqualTo("<a><b!!c><!<d!>>");
   }
 
   /**
@@ -112,11 +111,9 @@
 
   @Test
   public void replaceAllLiteral() throws Exception {
-    assertEquals("ababab",
-                 StringUtilities.replaceAllLiteral("bababa", "ba", "ab"));
+    assertThat(StringUtilities.replaceAllLiteral("bababa", "ba", "ab")).isEqualTo("ababab");
     assertThat(StringUtilities.replaceAllLiteral("bababa", "ba", "")).isEmpty();
-    assertEquals("bababa",
-        StringUtilities.replaceAllLiteral("bababa", "", "ab"));
+    assertThat(StringUtilities.replaceAllLiteral("bababa", "", "ab")).isEqualTo("bababa");
   }
 
   @Test
@@ -126,9 +123,8 @@
     data.put("bang", "baz");
     data.put("lengthy key", "lengthy value");
 
-    assertEquals(joinLines("bang: baz",
-                           "foo: bar",
-                           "lengthy key: lengthy value"), layoutTable(data));
+    assertThat(layoutTable(data))
+        .isEqualTo(joinLines("bang: baz", "foo: bar", "lengthy key: lengthy value"));
   }
 
   @Test
@@ -151,17 +147,17 @@
     };
     double x = 2.3456;
     for (int ii = 0; ii < expected.length; ++ii) {
-      assertEquals(expected[ii], prettyPrintBytes((long) x));
+      assertThat(prettyPrintBytes((long) x)).isEqualTo(expected[ii]);
       x = x * 10.0;
     }
   }
 
   @Test
   public void sanitizeControlChars() {
-    assertEquals("<?>", StringUtilities.sanitizeControlChars("\000"));
-    assertEquals("<?>", StringUtilities.sanitizeControlChars("\001"));
-    assertEquals("\\r", StringUtilities.sanitizeControlChars("\r"));
-    assertEquals(" abc123", StringUtilities.sanitizeControlChars(" abc123"));
+    assertThat(StringUtilities.sanitizeControlChars("\000")).isEqualTo("<?>");
+    assertThat(StringUtilities.sanitizeControlChars("\001")).isEqualTo("<?>");
+    assertThat(StringUtilities.sanitizeControlChars("\r")).isEqualTo("\\r");
+    assertThat(StringUtilities.sanitizeControlChars(" abc123")).isEqualTo(" abc123");
   }
 
   @Test
@@ -187,9 +183,9 @@
 
   @Test
   public void toPythonStyleFunctionName() {
-    assertEquals("a", StringUtilities.toPythonStyleFunctionName("a"));
-    assertEquals("a_b", StringUtilities.toPythonStyleFunctionName("aB"));
-    assertEquals("a_b_c", StringUtilities.toPythonStyleFunctionName("aBC"));
-    assertEquals("a_bc_d", StringUtilities.toPythonStyleFunctionName("aBcD"));
+    assertThat(StringUtilities.toPythonStyleFunctionName("a")).isEqualTo("a");
+    assertThat(StringUtilities.toPythonStyleFunctionName("aB")).isEqualTo("a_b");
+    assertThat(StringUtilities.toPythonStyleFunctionName("aBC")).isEqualTo("a_b_c");
+    assertThat(StringUtilities.toPythonStyleFunctionName("aBcD")).isEqualTo("a_bc_d");
   }
 }