Merge pull request google#37 from cgruber/showunmatchedfile

cgruber · cgruber · commit 2f348490d7ed · 2014-02-24T14:56:38.000-08:00
Show found generated file on comparison failure.
diff --git a/src/main/java/com/google/testing/compile/JavaSourcesSubject.java b/src/main/java/com/google/testing/compile/JavaSourcesSubject.java
@@ -17,18 +17,6 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 
-import java.io.IOException;
-import java.util.Arrays;
-
-import javax.annotation.processing.Processor;
-import javax.tools.Diagnostic;
-import javax.tools.Diagnostic.Kind;
-import javax.tools.FileObject;
-import javax.tools.JavaFileObject;
-
-import org.truth0.FailureStrategy;
-import org.truth0.subjects.Subject;
-
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
 import com.google.common.base.Optional;
@@ -40,8 +28,21 @@
 import com.google.common.collect.Lists;
 import com.google.common.io.ByteStreams;
 import com.google.testing.compile.Compilation.Result;
+
 import com.sun.source.tree.CompilationUnitTree;
 
+import org.truth0.FailureStrategy;
+import org.truth0.subjects.Subject;
+
+import java.io.IOException;
+import java.util.Arrays;
+
+import javax.annotation.processing.Processor;
+import javax.tools.Diagnostic;
+import javax.tools.Diagnostic.Kind;
+import javax.tools.FileObject;
+import javax.tools.JavaFileObject;
+
 /**
  * A <a href="https://github.com/truth0/truth">Truth</a> {@link Subject} that evaluates the result
  * of a {@code javac} compilation.  See {@link com.google.testing.compile} for usage examples
@@ -88,6 +89,7 @@ private CompilationClause(Iterable<? extends Processor> processors) {
       this.processors = ImmutableSet.copyOf(processors);
     }
 
+    @Override
     public SuccessfulCompilationClause compilesWithoutError() {
       Compilation.Result result = Compilation.compile(processors, getSubject());
       if (!result.successful()) {
@@ -100,6 +102,7 @@ public SuccessfulCompilationClause compilesWithoutError() {
       return new SuccessfulCompilationBuilder(result);
     }
 
+    @Override
     public UnsuccessfulCompilationClause failsToCompile() {
       Result result = Compilation.compile(processors, getSubject());
       if (result.successful()) {
@@ -255,17 +258,35 @@ public SuccessfulCompilationClause generatesSources(JavaFileObject first,
       Iterable<? extends CompilationUnitTree> actualCompilationUnits =
           Compilation.parse(generatedSources);
       final EqualityScanner scanner = new EqualityScanner();
-      for (final CompilationUnitTree expected : Compilation.parse(Lists.asList(first, rest))) {
+      for (final CompilationUnitTree expectedTree : Compilation.parse(Lists.asList(first, rest))) {
         Optional<? extends CompilationUnitTree> found =
             Iterables.tryFind(actualCompilationUnits, new Predicate<CompilationUnitTree>() {
               @Override
-              public boolean apply(CompilationUnitTree input) {
-                return scanner.visitCompilationUnit(expected, input);
+              public boolean apply(CompilationUnitTree actualTree) {
+                return scanner.visitCompilationUnit(expectedTree, actualTree);
               }
             });
         if (!found.isPresent()) {
-          failureStrategy.fail("Did not find a source file coresponding to "
-              + expected.getSourceFile().getName());
+          final JavaFileObject expected = expectedTree.getSourceFile();
+          Optional<JavaFileObject> actual =
+              FluentIterable.from(generatedSources).firstMatch(new Predicate<JavaFileObject>() {
+                @Override public boolean apply(JavaFileObject generatedFile) {
+                  return generatedFile.toUri().getPath().endsWith(expected.toUri().getPath());
+                }
+              });
+          if (actual.isPresent()) {
+            CharSequence actualSource = null;
+            try {
+              actualSource = actual.get().getCharContent(false);
+            } catch (IOException e) {
+              throw new RuntimeException("Exception reading source content.", e);
+            }
+            failureStrategy.fail("Generated file " + expected.getName()
+                + " did not match expectation. Found:\n"
+                + (actualSource == null ? "no source found" : actualSource));
+          } else {
+            failureStrategy.fail("Did not find a source file named " + expected.getName());
+          }
         }
       }
       return this;
diff --git a/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java b/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java
@@ -19,6 +19,15 @@
 import static org.junit.Assert.fail;
 import static org.truth0.Truth.ASSERT;
 
+import com.google.common.collect.ImmutableSet;
+import com.google.common.io.Resources;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+import org.truth0.FailureStrategy;
+import org.truth0.TestVerb;
+
 import java.io.IOException;
 import java.io.Writer;
 import java.util.Arrays;
@@ -34,15 +43,6 @@
 import javax.tools.Diagnostic.Kind;
 import javax.tools.JavaFileObject;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-import org.truth0.FailureStrategy;
-import org.truth0.TestVerb;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.io.Resources;
-
 /**
  * Tests {@link JavaSourcesSubjectFactory} (and {@link JavaSourceSubjectFactory}).
  *
@@ -225,6 +225,24 @@ public void generates() {
             GeneratingProcessor.GENERATED_SOURCE));
   }
 
+  @Test
+  public void generatesUnexpectedSource() {
+    String failingExpectationSource = "abstract class Blah {}";
+    try {
+      VERIFY.about(javaSource())
+          .that(JavaFileObjects.forResource("HelloWorld.java"))
+          .processedWith(new GeneratingProcessor())
+          .compilesWithoutError()
+          .and().generatesSources(JavaFileObjects.forSourceString(
+              GeneratingProcessor.GENERATED_CLASS_NAME,
+              failingExpectationSource));
+    } catch (VerificationException expected) {
+      ASSERT.that(expected.getMessage()).contains(
+          "Generated file Blah.java did not match expectation. Found:");
+      ASSERT.that(expected.getMessage()).contains(GeneratingProcessor.GENERATED_SOURCE);
+    }
+  }
+
   @Test
   public void invokesMultipleProcesors() {
     NoOpProcessor noopProcessor1 = new NoOpProcessor();
@@ -256,7 +274,7 @@ public void invokesMultipleProcesors_asIterable() {
 
   private static final class GeneratingProcessor extends AbstractProcessor {
     static final String GENERATED_CLASS_NAME = "Blah";
-    static final String GENERATED_SOURCE = "final class Blah {}";
+    static final String GENERATED_SOURCE = "final class Blah {\n  String blah = \"blah\";\n}";
 
     @Override
     public synchronized void init(ProcessingEnvironment processingEnv) {
