Comments and fix tests

palantir · Jan 5, 2021 · aa6baf4 · aa6baf4
1 parent ccb6d69
commit aa6baf4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineEncoding.java b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineEncoding.java
@@ -24,8 +24,8 @@ public final class BaselineEncoding implements Plugin<Project> {
 
     @Override
     public void apply(Project project) {
-        project.getTasks().withType(JavaCompile.class).configureEach(t -> {
-            t.getOptions().setEncoding("UTF-8");
+        project.getTasks().withType(JavaCompile.class).configureEach(javaCompileTask -> {
+            javaCompileTask.getOptions().setEncoding("UTF-8");
         });
     }
 }
diff --git a/...aseline-java/src/test/groovy/com/palantir/baseline/BaselineEncodingIntegrationTest.groovy b/...aseline-java/src/test/groovy/com/palantir/baseline/BaselineEncodingIntegrationTest.groovy
@@ -68,6 +68,7 @@ class BaselineEncodingIntegrationTest extends AbstractPluginTest {
         then:
         BuildResult result = with('compileJava').build()
         result.task(":compileJava").outcome == TaskOutcome.SUCCESS
+        !result.output.contains("unmappable character")
     }
 
     def 'compileJava fails with other encoding'() {
@@ -76,7 +77,8 @@ class BaselineEncodingIntegrationTest extends AbstractPluginTest {
         file('src/main/java/test/Test.java').text = javaFile
 
         then:
-        BuildResult result = with('compileJava').buildAndFail()
-        result.task(":compileJava").outcome == TaskOutcome.FAILED
+        BuildResult result = with('compileJava').build()
+        result.task(":compileJava").outcome == TaskOutcome.SUCCESS
+        result.output.contains("unmappable character")
     }
 }