From 756c2f6774ee49ca606729ad44a722361eaa9f1f Mon Sep 17 00:00:00 2001
From: Andreas Dangel <adangel@users.sourceforge.net>
Date: Sat, 21 Jan 2017 13:43:04 +0100
Subject: [PATCH] Fix build

---
 .../java/net/sourceforge/pmd/ant/PMDTaskTest.java  | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java
index d92d3b929b..3a5097af00 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java
@@ -11,6 +11,7 @@ import java.util.Locale;
 import java.util.Objects;
 
 import org.apache.commons.io.FileUtils;
+import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.contrib.java.lang.system.RestoreSystemProperties;
@@ -115,19 +116,22 @@ public class PMDTaskTest extends AbstractAntTestHelper {
             System.setProperty("file.encoding", charsetName);
             Field charset = Charset.class.getDeclaredField("defaultCharset");
             charset.setAccessible(true);
-            charset.set(null,null);
+            charset.set(null, null);
             Objects.requireNonNull(Charset.defaultCharset());
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
     }
+
     @Rule
     public final TestRule restoreDefaultCharset = new ExternalResource() {
         private Charset defaultCharset;
+
         @Override
         protected void before() throws Throwable {
             defaultCharset = Charset.defaultCharset();
         }
+
         @Override
         protected void after() {
             setDefaultCharset(defaultCharset.name());
@@ -141,7 +145,7 @@ public class PMDTaskTest extends AbstractAntTestHelper {
 
         executeTarget("testFormatterEncodingWithXML");
         String report = FileUtils.readFileToString(new File("target/testFormatterEncodingWithXML-pmd.xml"), "UTF-8");
-        assertTrue(report.contains("unusedVariableWithÜmlaut"));
+        Assert.assertTrue(report.contains("unusedVariableWithÜmlaut"));
     }
 
     @Test
@@ -149,8 +153,8 @@ public class PMDTaskTest extends AbstractAntTestHelper {
         setDefaultCharset("cp1252");
 
         executeTarget("testFormatterEncodingWithXMLConsole");
-        String report = getOutput();
-        assertTrue(report.startsWith("<?xml version=\"1.0\" encoding=\"windows-1252\"?>"));
-        assertTrue(report.contains("unusedVariableWith&#xdc;mlaut"));
+        String report = buildRule.getOutput();
+        Assert.assertTrue(report.startsWith("<?xml version=\"1.0\" encoding=\"windows-1252\"?>"));
+        Assert.assertTrue(report.contains("unusedVariableWith&#xdc;mlaut"));
     }
 }