From f116754656b534e1a44e797e21b06290dfcf8ad8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20K=C3=BChne?= <lakuehne@gmail.com>
Date: Wed, 20 Nov 2002 21:53:45 +0000
Subject: [PATCH] added test for PackageHtmlCheck

---
 .../tools/checkstyle/BaseCheckTestCase.java   | 15 +++++++++----
 .../checkstyle/PackageHtmlCheckTest.java      | 22 +++++++++++++++++--
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/tests/com/puppycrawl/tools/checkstyle/BaseCheckTestCase.java b/src/tests/com/puppycrawl/tools/checkstyle/BaseCheckTestCase.java
index 5c5f6e942..13d0d7989 100644
--- a/src/tests/com/puppycrawl/tools/checkstyle/BaseCheckTestCase.java
+++ b/src/tests/com/puppycrawl/tools/checkstyle/BaseCheckTestCase.java
@@ -29,7 +29,7 @@ public abstract class BaseCheckTestCase
     }
 
     private final ByteArrayOutputStream mBAOS = new ByteArrayOutputStream();
-    private final PrintStream mStream = new PrintStream(mBAOS);
+    protected final PrintStream mStream = new PrintStream(mBAOS);
     protected final Properties mProps = new Properties();
 
     protected Checker createChecker(CheckConfiguration aCheckConfig)
@@ -50,11 +50,18 @@ public abstract class BaseCheckTestCase
         return f.getCanonicalPath();
     }
 
-    protected void verify(Checker aC, String aFilename, String[] aExpected)
+    protected void verify(Checker aC, String aFileName, String[] aExpected)
+            throws Exception
+    {
+        verify(aC, aFileName, aFileName, aExpected);
+    }
+
+    protected void verify(Checker aC, String aProcessedFilename,
+            String aMessageFileName, String[] aExpected)
         throws Exception
     {
         mStream.flush();
-        final int errs = aC.process(new File[] {new File(aFilename)});
+        final int errs = aC.process(new File[] {new File(aProcessedFilename)});
 
         // process each of the lines
         final ByteArrayInputStream bais =
@@ -63,7 +70,7 @@ public abstract class BaseCheckTestCase
             new LineNumberReader(new InputStreamReader(bais));
 
         for (int i = 0; i < aExpected.length; i++) {
-            assertEquals(aFilename + ":" + aExpected[i], lnr.readLine());
+            assertEquals(aMessageFileName + ":" + aExpected[i], lnr.readLine());
         }
         assertEquals(aExpected.length, errs);
         aC.destroy();
diff --git a/src/tests/com/puppycrawl/tools/checkstyle/PackageHtmlCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/PackageHtmlCheckTest.java
index ed688a571..ae4b5683d 100644
--- a/src/tests/com/puppycrawl/tools/checkstyle/PackageHtmlCheckTest.java
+++ b/src/tests/com/puppycrawl/tools/checkstyle/PackageHtmlCheckTest.java
@@ -6,16 +6,34 @@ import com.puppycrawl.tools.checkstyle.checks.PackageHtmlCheck;
 public class PackageHtmlCheckTest
     extends BaseCheckTestCase
 {
+    protected Checker createChecker(CheckConfiguration aCheckConfig)
+        throws Exception
+    {
+        final Checker c = new Checker(new GlobalProperties(mProps, mStream),
+                                      new CheckConfiguration[0]);
+        final AuditListener listener = new BriefLogger(mStream);
+        c.addListener(listener);
+        return c;
+    }
+
     public void testPackageHtml()
          throws Exception
     {
+        CheckConfiguration checkConfig = new CheckConfiguration();
+        // no Checks in config, but register new PackageHtml as a FileSetCheck
+        Checker c = createChecker(checkConfig);
         final FileSetCheck fsc = new PackageHtmlCheck();
+        c.addFileSetCheck(fsc);
+
         final String packageHtmlPath = getPath("package.html");
+        // final String filepath = packageHtmlPath;
+        // TODO: should really be a java file like
         final String filepath = getPath("InputScopeAnonInner.java");
+
         final String[] expected = {
-            packageHtmlPath + ":0: Missing package documentation file.",
+            "0: Missing package documentation file.",
         };
-        // TODO: verify(fsc, filepath, expected);
+        verify(c, filepath, packageHtmlPath, expected);
     }