commit 3c2d42fdd4ba7020d340120e6f74f59e0ee826ae
author Michael Marucheck <mmarucheck@fb.com> Fri Nov 08 15:39:50 2013 -0800
committer Michael Bolin <mbolin@fb.com> Tue Nov 12 17:53:39 2013 -0800
tree f3a7476c6d667630054164c24062f4d81e1da842
parent 9f3133a9ac46e0161a04c7510784a2cdb4fe4c7a

Pull out common constant in `DxStepTest`.

test/com/facebook/buck/android/DxStepTest.java

diff --git a/test/com/facebook/buck/android/DxStepTest.java b/test/com/facebook/buck/android/DxStepTest.java
index 939a04c..b9549b6 100644
--- a/test/com/facebook/buck/android/DxStepTest.java
+++ b/test/com/facebook/buck/android/DxStepTest.java
@@ -46,6 +46,10 @@
 
 public class DxStepTest extends EasyMockSupport {
 
+  private static final String EXPECTED_DX_PREFIX =
+      "/usr/bin/dx" +
+          " --dex";
+
   private static Path SAMPLE_OUTPUT_PATH = Paths.get("buck-out/gen/classes.dex");
 
   private static ImmutableSet<Path> SAMPLE_FILES_TO_DEX = ImmutableSet.of(
@@ -72,7 +76,8 @@
         SAMPLE_FILES_TO_DEX,
         EnumSet.of(Option.NO_OPTIMIZE));
 
-    String expected = String.format("/usr/bin/dx --dex --no-optimize --output %s %s",
+    String expected = String.format("%s --no-optimize --output %s %s",
+        EXPECTED_DX_PREFIX,
         SAMPLE_OUTPUT_PATH,
         Joiner.on(' ').join(Iterables.transform(SAMPLE_FILES_TO_DEX, pathAbsolutifier)));
     MoreAsserts.assertShellCommands(
@@ -91,7 +96,8 @@
 
     DxStep dx = new DxStep(SAMPLE_OUTPUT_PATH.toString(), SAMPLE_FILES_TO_DEX);
 
-    String expected = String.format("/usr/bin/dx --dex --output %s %s",
+    String expected = String.format("%s --output %s %s",
+        EXPECTED_DX_PREFIX,
         SAMPLE_OUTPUT_PATH,
         Joiner.on(' ').join(Iterables.transform(SAMPLE_FILES_TO_DEX, pathAbsolutifier)));
     MoreAsserts.assertShellCommands(
@@ -112,7 +118,9 @@
         SAMPLE_FILES_TO_DEX,
         EnumSet.of(DxStep.Option.NO_OPTIMIZE, DxStep.Option.FORCE_JUMBO));
 
-    String expected = String.format("/usr/bin/dx --dex --no-optimize --force-jumbo --output %s %s",
+    String expected = String.format(
+        "%s --no-optimize --force-jumbo --output %s %s",
+        EXPECTED_DX_PREFIX,
         SAMPLE_OUTPUT_PATH,
         Joiner.on(' ').join(Iterables.transform(SAMPLE_FILES_TO_DEX, pathAbsolutifier)));
     MoreAsserts.assertShellCommands(
@@ -131,7 +139,8 @@
 
     DxStep dx = new DxStep(SAMPLE_OUTPUT_PATH.toString(), SAMPLE_FILES_TO_DEX);
 
-    String expected = String.format("/usr/bin/dx --dex --statistics --output %s %s",
+    String expected = String.format("%s --statistics --output %s %s",
+        EXPECTED_DX_PREFIX,
         SAMPLE_OUTPUT_PATH,
         Joiner.on(' ').join(Iterables.transform(SAMPLE_FILES_TO_DEX, pathAbsolutifier)));
     MoreAsserts.assertShellCommands(
@@ -155,7 +164,9 @@
 
     DxStep dx = new DxStep(SAMPLE_OUTPUT_PATH.toString(), SAMPLE_FILES_TO_DEX);
 
-    String expected = String.format("/usr/bin/dx --dex --statistics --verbose --output %s %s",
+    String expected = String.format(
+        "%s --statistics --verbose --output %s %s",
+        EXPECTED_DX_PREFIX,
         SAMPLE_OUTPUT_PATH,
         Joiner.on(' ').join(Iterables.transform(SAMPLE_FILES_TO_DEX, pathAbsolutifier)));
     MoreAsserts.assertShellCommands(