Print out warnings as well as errors in describeFailureDiagnostics.

Chang-Eric · ronshapiro · commit 7d31b5338559 · 2018-12-14T11:35:02.000-05:00
RELNOTES=`CompilationSubject.succeeded()` now shows warnings as well as errors on failure. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=225420368
diff --git a/src/main/java/com/google/testing/compile/Compilation.java b/src/main/java/com/google/testing/compile/Compilation.java
@@ -220,16 +220,12 @@ public String toString() {
 
   /** Returns a description of the why the compilation failed. */
   String describeFailureDiagnostics() {
-    ImmutableList<Diagnostic<? extends JavaFileObject>> errors = errors();
-    if (errors.isEmpty()) {
-      return "Compilation produced no errors.\n";
-    }
-    StringBuilder message = new StringBuilder("Compilation produced the following errors:\n");
-    errors.stream().forEach(error -> message.append(error).append('\n'));
-    // If we compiled with -Werror we should output the warnings too
-    if (compiler.options().contains("-Werror")) {
-      warnings().stream().forEach(warning -> message.append(warning).append('\n'));
+    ImmutableList<Diagnostic<? extends JavaFileObject>> diagnostics = diagnostics();
+    if (diagnostics.isEmpty()) {
+      return "Compilation produced no diagnostics.\n";
     }
+    StringBuilder message = new StringBuilder("Compilation produced the following diagnostics:\n");
+    diagnostics.forEach(diagnostic -> message.append(diagnostic).append('\n'));
     return message.toString();
   }
 
diff --git a/src/test/java/com/google/testing/compile/CompilationSubjectTest.java b/src/test/java/com/google/testing/compile/CompilationSubjectTest.java
@@ -99,7 +99,8 @@ public void succeeded_failureReportsGeneratedFiles() {
           .that(compilerWithGeneratorAndError().compile(HELLO_WORLD_RESOURCE))
           .succeeded();
       AssertionError expected = expectFailure.getFailure();
-      assertThat(expected.getMessage()).contains("Compilation produced the following errors:\n");
+      assertThat(expected.getMessage()).contains(
+          "Compilation produced the following diagnostics:\n");
       assertThat(expected.getMessage()).contains(FailingGeneratingProcessor.GENERATED_CLASS_NAME);
       assertThat(expected.getMessage()).contains(FailingGeneratingProcessor.GENERATED_SOURCE);
     }
@@ -112,7 +113,8 @@ public void succeeded_failureReportsNoGeneratedFiles() {
           .that(javac().compile(HELLO_WORLD_BROKEN_RESOURCE))
           .succeeded();
       AssertionError expected = expectFailure.getFailure();
-      assertThat(expected.getMessage()).startsWith("Compilation produced the following errors:\n");
+      assertThat(expected.getMessage()).startsWith(
+          "Compilation produced the following diagnostics:\n");
       assertThat(expected.getMessage()).contains("No files were generated.");
     }
 
@@ -132,6 +134,22 @@ public void succeeded_exceptionCreatedOrPassedThrough() {
       }
     }
 
+    @Test
+    public void succeeded_failureReportsWarnings() {
+      expectFailure
+          .whenTesting()
+          .about(compilations())
+          .that(compilerWithWarning().compile(HELLO_WORLD_BROKEN))
+          .succeeded();
+      AssertionError expected = expectFailure.getFailure();
+      assertThat(expected.getMessage())
+          .startsWith("Compilation produced the following diagnostics:\n");
+      assertThat(expected.getMessage()).contains("No files were generated.");
+      // "this is a message" is output by compilerWithWarning() since the source has
+      // @DiagnosticMessage
+      assertThat(expected.getMessage()).contains("warning: this is a message");
+    }
+
     @Test
     public void succeededWithoutWarnings() {
       assertThat(javac().compile(HELLO_WORLD)).succeededWithoutWarnings();
diff --git a/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java b/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java
@@ -337,7 +337,7 @@ public void compilesWithoutError_failureReportsFiles() {
         .processedWith(new FailingGeneratingProcessor())
         .compilesWithoutError();
     AssertionError expected = expectFailure.getFailure();
-    assertThat(expected.getMessage()).contains("Compilation produced the following errors:\n");
+    assertThat(expected.getMessage()).contains("Compilation produced the following diagnostics:\n");
     assertThat(expected.getMessage()).contains(FailingGeneratingProcessor.GENERATED_CLASS_NAME);
     assertThat(expected.getMessage()).contains(FailingGeneratingProcessor.GENERATED_SOURCE);
   }
@@ -350,7 +350,7 @@ public void compilesWithoutError_throws() {
         .that(JavaFileObjects.forResource("HelloWorld-broken.java"))
         .compilesWithoutError();
     AssertionError expected = expectFailure.getFailure();
-    assertThat(expected.getMessage()).startsWith("Compilation produced the following errors:\n");
+    assertThat(expected.getMessage()).startsWith("Compilation produced the following diagnostics:\n");
     assertThat(expected.getMessage()).contains("No files were generated.");
   }
 
