Fix NPE thrown on FileClauses when there are Diagnostics that aren't associated with any element.

cgruber · cgruber · commit 30eeb19bec3e · 2014-07-17T13:46:01.000-07:00
------------- Created by MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=66118534
diff --git a/src/main/java/com/google/testing/compile/JavaSourcesSubject.java b/src/main/java/com/google/testing/compile/JavaSourcesSubject.java
@@ -164,7 +164,8 @@ public LineClause in(final JavaFileObject file) {
               diagnosticsWithMessage.filter(new Predicate<Diagnostic<? extends FileObject>>() {
                 @Override
                 public boolean apply(Diagnostic<? extends FileObject> input) {
-                  return file.toUri().getPath().equals(input.getSource().toUri().getPath());
+                  return ((input.getSource() != null)
+                      && file.toUri().getPath().equals(input.getSource().toUri().getPath()));
                 }
               });
           if (diagnosticsInFile.isEmpty()) {
@@ -173,9 +174,11 @@ public boolean apply(Diagnostic<? extends FileObject> input) {
                 diagnosticsWithMessage.transform(
                     new Function<Diagnostic<? extends FileObject>, String>() {
                       @Override public String apply(Diagnostic<? extends FileObject> input) {
-                        return input.getSource().getName();
+                        return (input.getSource() != null) ? input.getSource().getName()
+                            : "(no associated file)";
                       }
-                    })));
+                    })
+                .toSet()));
           }
           return new LineClause() {
             @Override public UnsuccessfulCompilationClause and() {
@@ -194,11 +197,14 @@ public boolean apply(Diagnostic<?> input) {
                 failureStrategy.fail(String.format(
                     "Expected an error on line %d of %s, but only found errors on line(s) %s",
                     lineNumber, file.getName(), diagnosticsInFile.transform(
-                        new Function<Diagnostic<?>, Long>() {
-                          @Override public Long apply(Diagnostic<?> input) {
-                            return input.getLineNumber();
+                        new Function<Diagnostic<?>, String>() {
+                          @Override public String apply(Diagnostic<?> input) {
+                            long errLine = input.getLineNumber();
+                            return (errLine != Diagnostic.NOPOS) ? errLine + ""
+                                : "(no associated position)";
                           }
-                        })));
+                        })
+                    .toSet()));
               }
               return new ColumnClause() {
                 @Override
@@ -220,11 +226,14 @@ public boolean apply(Diagnostic<?> input) {
                     failureStrategy.fail(String.format(
                         "Expected an error at %d:%d of %s, but only found errors at column(s) %s",
                         lineNumber, columnNumber, file.getName(), diagnosticsOnLine.transform(
-                            new Function<Diagnostic<?>, Long>() {
-                              @Override public Long apply(Diagnostic<?> input) {
-                                return input.getColumnNumber();
+                            new Function<Diagnostic<?>, String>() {
+                              @Override public String apply(Diagnostic<?> input) {
+                                long errCol = input.getColumnNumber();
+                                return (errCol != Diagnostic.NOPOS) ? errCol + ""
+                                    : "(no associated position)";
                               }
-                            })));
+                            })
+                        .toSet()));
                   }
                   return new ChainingClause<UnsuccessfulCompilationClause>() {
                     @Override public UnsuccessfulCompilationClause and() {
diff --git a/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java b/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java
@@ -40,6 +40,7 @@
 import javax.lang.model.SourceVersion;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
+import javax.tools.Diagnostic;
 import javax.tools.Diagnostic.Kind;
 import javax.tools.JavaFileObject;
 
@@ -157,8 +158,9 @@ public void failsToCompile_throwsNotInFile() {
       fail();
     } catch (VerificationException expected) {
       ASSERT.that(expected.getMessage())
-          .isEqualTo(String.format("Expected an error in %s, but only found errors in [%s]",
-              otherFileObject.getName(), fileObject.getName()));
+          .isEqualTo(String.format("Expected an error in %s, but only found errors in %s",
+              otherFileObject.getName(), ImmutableSet.of(fileObject.getName(),
+                  "(no associated file)")));
     }
   }
 
@@ -365,6 +367,7 @@ public synchronized void init(ProcessingEnvironment processingEnv) {
     public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
       for (Element element : roundEnv.getRootElements()) {
         messager.printMessage(Kind.ERROR, "expected error!", element);
+        messager.printMessage(Kind.ERROR, "another expected error!");
       }
       return false;
     }

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@`
`40`	`40`	`import javax.lang.model.SourceVersion;`
`41`	`41`	`import javax.lang.model.element.Element;`
`42`	`42`	`import javax.lang.model.element.TypeElement;`
	`43`	`+import javax.tools.Diagnostic;`
`43`	`44`	`import javax.tools.Diagnostic.Kind;`
`44`	`45`	`import javax.tools.JavaFileObject;`
`45`	`46`
`@@ -157,8 +158,9 @@ public void failsToCompile_throwsNotInFile() {`
`157`	`158`	`fail();`
`158`	`159`	`} catch (VerificationException expected) {`
`159`	`160`	`ASSERT.that(expected.getMessage())`
`160`		`- .isEqualTo(String.format("Expected an error in %s, but only found errors in [%s]",`
`161`		`- otherFileObject.getName(), fileObject.getName()));`
	`161`	`+ .isEqualTo(String.format("Expected an error in %s, but only found errors in %s",`
	`162`	`+ otherFileObject.getName(), ImmutableSet.of(fileObject.getName(),`
	`163`	`+ "(no associated file)")));`
`162`	`164`	`}`
`163`	`165`	`}`
`164`	`166`
`@@ -365,6 +367,7 @@ public synchronized void init(ProcessingEnvironment processingEnv) {`
`365`	`367`	`public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {`
`366`	`368`	`for (Element element : roundEnv.getRootElements()) {`
`367`	`369`	`messager.printMessage(Kind.ERROR, "expected error!", element);`
	`370`	`+ messager.printMessage(Kind.ERROR, "another expected error!");`
`368`	`371`	`}`
`369`	`372`	`return false;`
`370`	`373`	`}`