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/shell/CommandTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/shell/CommandTest.java b/src/test/java/com/google/devtools/build/lib/shell/CommandTest.java
index 694972e..ef45a63 100644
--- a/src/test/java/com/google/devtools/build/lib/shell/CommandTest.java
+++ b/src/test/java/com/google/devtools/build/lib/shell/CommandTest.java
@@ -13,6 +13,7 @@
 // limitations under the License.
 package com.google.devtools.build.lib.shell;
 
+import static com.google.common.truth.Truth.assertThat;
 import static com.google.devtools.build.lib.shell.TestUtil.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -100,7 +101,7 @@
     final Command command = new Command(commandArgs, env, workingDir);
     assertArrayEquals(commandArgs, command.getCommandLineElements());
     for (final String key : env.keySet()) {
-      assertEquals(env.get(key), command.getEnvironmentVariables().get(key));
+      assertThat(command.getEnvironmentVariables()).containsEntry(key, env.get(key));
     }
     assertEquals(workingDir, command.getWorkingDirectory());
   }
@@ -112,8 +113,8 @@
     final Command command = new Command(new String[] {"ls"});
     final CommandResult result = command.execute();
     assertTrue(result.getTerminationStatus().success());
-    assertTrue(result.getStderr().length == 0);
-    assertTrue(result.getStdout().length > 0);
+    assertEquals(0, result.getStderr().length);
+    assertThat(result.getStdout().length).isGreaterThan(0);
   }
 
   @Test
@@ -149,8 +150,8 @@
                                                        "print 'a'x100000" });
     final CommandResult result = command.execute();
     assertTrue(result.getTerminationStatus().success());
-    assertTrue(result.getStderr().length == 0);
-    assertTrue(result.getStdout().length > 0);
+    assertEquals(0, result.getStderr().length);
+    assertThat(result.getStdout().length).isGreaterThan(0);
   }
 
   @Test
@@ -199,8 +200,8 @@
     CommandResult result = command.execute(emptyInput,
                                            Command.NO_OBSERVER, out, err);
     assertTrue(result.getTerminationStatus().success());
-    assertEquals("", out.toString("UTF-8"));
-    assertEquals("", err.toString("UTF-8"));
+    assertThat(out.toString("UTF-8")).isEmpty();
+    assertThat(err.toString("UTF-8")).isEmpty();
   }
 
   @Test
@@ -208,8 +209,8 @@
     final Command command = new Command(new String[]{"/bin/cat"});
     CommandResult result = command.execute();
     assertTrue(result.getTerminationStatus().success());
-    assertEquals("", new String(result.getStdout(), "UTF-8"));
-    assertEquals("", new String(result.getStderr(), "UTF-8"));
+    assertThat(new String(result.getStdout(), "UTF-8")).isEmpty();
+    assertThat(new String(result.getStderr(), "UTF-8")).isEmpty();
   }
 
   @Test
@@ -355,7 +356,7 @@
         new Command(args).execute();
         fail("Should have exited with status " + exit);
       } catch (BadExitStatusException e) {
-        assertEquals("Process exited with status " + exit, e.getMessage());
+        assertThat(e).hasMessage("Process exited with status " + exit);
         checkCommandElements(e, "/bin/sh", "-c", "exit " + exit);
         TerminationStatus status = e.getResult().getTerminationStatus();
         assertFalse(status.success());
@@ -373,7 +374,7 @@
         new Command(args).execute();
         fail("Should have exited with status " + expected);
       } catch (BadExitStatusException e) {
-        assertEquals("Process exited with status " + expected, e.getMessage());
+        assertThat(e).hasMessage("Process exited with status " + expected);
         checkCommandElements(e, "/bin/sh", "-c", "exit " + exit);
         TerminationStatus status = e.getResult().getTerminationStatus();
         assertFalse(status.success());
@@ -398,7 +399,7 @@
         new Command(args).execute();
         fail("Expected signal " + signal);
       } catch (AbnormalTerminationException e) {
-        assertEquals("Process terminated by signal " + signal, e.getMessage());
+        assertThat(e).hasMessage("Process terminated by signal " + signal);
         checkCommandElements(e, killmyself, "" + signal);
         TerminationStatus status = e.getResult().getTerminationStatus();
         assertFalse(status.success());
@@ -535,8 +536,8 @@
 
     final CommandResult result = resultContainer[0];
     assertTrue(result.getTerminationStatus().success());
-    assertTrue(result.getStderr().length == 0);
-    assertTrue(result.getStdout().length == 0);
+    assertEquals(0, result.getStderr().length);
+    assertEquals(0, result.getStdout().length);
   }
 
   @Test
@@ -554,7 +555,7 @@
     } catch (AbnormalTerminationException e) {
       // Good.
       checkCommandElements(e, "/bin/echo", "foo");
-      assertEquals("java.io.IOException", e.getMessage());
+      assertThat(e).hasMessage("java.io.IOException");
     }
   }
 
@@ -681,7 +682,7 @@
   private static void checkSuccess(final CommandResult result,
                                    final String expectedOutput) {
     assertTrue(result.getTerminationStatus().success());
-    assertTrue(result.getStderr().length == 0);
+    assertEquals(0, result.getStderr().length);
     assertEquals(expectedOutput, new String(result.getStdout()));
   }
 }