Got tests to run.

Author: crazybob

mask.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# Call your program here instead of cat.
+cat

run.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# Passes test data through mask.sh and verifies the output.
+java -jar tests/target/luhnybin-1.0-SNAPSHOT.jar $@
+
+

tests/pom.xml

@@ -12,11 +12,36 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.8.2</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
       <version>10.0.1</version>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>1.5</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>com.squareup.luhnybin.Main</mainClass>
+                </transformer>
+              </transformers>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>

tests/src/main/java/com/squareup/luhnybin/LuhnTests.java

@@ -135,8 +135,6 @@ private void testOverlappingMatches() {
     StringBuilder output = new StringBuilder(randomNumber(MAX_LENGTH));
     for (int i = 0; i < 1000 - MAX_LENGTH; i++) {
       output.append(computeLast(output.subSequence(i + 1, i + MAX_LENGTH)));
-      if (random.nextInt(20) == 0) output.append(' ');
-      if (random.nextInt(20) == 0) output.append('-');
     }
 
     test("sequence of overlapping, valid #s")

tests/src/main/java/com/squareup/luhnybin/Main.java

@@ -16,9 +16,12 @@
 package com.squareup.luhnybin;
 
 import com.google.common.io.ByteStreams;
+import java.io.ByteArrayOutputStream;
+import java.io.EOFException;
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.util.Arrays;
 
 /**
  * Runs the test suite against mask.sh.
@@ -33,8 +36,9 @@ public static void main(String[] args) throws IOException {
       System.exit(1);
     }
 
-    int iterations = 1;
+    final int iterations;
     if (args.length > 0) {
+      System.out.println(Arrays.toString(args));
       if (args.length > 1) {
         System.err.println("Usage: ./run.sh [iterations]");
         System.exit(1);
@@ -45,18 +49,24 @@ public static void main(String[] args) throws IOException {
         System.err.println("Iterations must be >= 1.");
         System.exit(1);
       }
+    } else {
+      iterations = 1;
     }
 
     final LuhnTests luhnTests = new LuhnTests();
-    final Process process = new ProcessBuilder("mask.sh").start();
+    final Process process = new ProcessBuilder("sh", "mask.sh").start();
+
+    // Buffer output for maximum efficiency.
+    final ByteArrayOutputStream bout = new ByteArrayOutputStream();
+    luhnTests.writeTo(bout);
 
     long start = System.nanoTime();
 
     new Thread() {
       @Override public void run() {
         try {
           OutputStream out = process.getOutputStream();
-          luhnTests.writeTo(out);
+          for (int i = 0; i < iterations; i++) bout.writeTo(out);
           out.close();
         } catch (IOException e) {
           e.printStackTrace();
@@ -76,14 +86,17 @@ public static void main(String[] args) throws IOException {
 
     try {
       for (int i = 0; i < iterations; i++) luhnTests.check(process.getInputStream());
-      // TODO: Check for extraneous output.
       long elapsed = (System.nanoTime() - start) / 1000000;
       System.out.println("Tests passed! (" + elapsed + "ms)");
+    } catch (EOFException e) {
+      System.err.println("mask.sh didn't send enough output.");
     } catch (TestFailure testFailure) {
-      System.err.println("Test failed: " + testFailure.testCase.description);
-      System.err.println("Output:          " + testFailure.testCase.output);
-      System.err.println("Expected result: " + testFailure.testCase.expectedInput);
-      System.err.println("Actual result:   " + testFailure.actualInput);
+      System.err.println("Test failed:"
+          + "\n  Description:     " + testFailure.testCase.description
+          + "\n  Input:           " + testFailure.testCase.output
+          + "\n  Expected result: " + testFailure.testCase.expectedInput
+          + "\n  Actual result:   " + testFailure.actualInput
+          + "\n");
     }
   }
 }

tests/src/test/java/com/squareup/luhnybin/LuhnTest.java tests/src/test/java/com/squareup/luhnybin/LastDigitTest.java

@@ -18,7 +18,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-public class LuhnTest {
+public class LastDigitTest {
 
   @Test public void computeLastDigit() {
     Assert.assertEquals('1', LuhnTests.computeLast("411111111111111"));