Automated tests of output. Not part of apprunner, not built by default.

Fix Compare() function;
add lots of before and after files for testing various regressions;
add a TestOutSinks script which tests the known cases.

htmlparser/tests/outsinks/Convert.cpp

@@ -47,21 +47,42 @@ static NS_DEFINE_IID(kParserCID, NS_PARSER_IID);
 // Interface IID's
 static NS_DEFINE_IID(kIParserIID, NS_IPARSER_IID);
 
-nsresult
-Compare(nsString& str, nsString& filename)
+int
+Compare(nsString& str, nsString& aFileName)
 {
-  printf("Sorry, don't know how to compare yet\n");
-  char* charstar = str.ToNewUTF8String();
-  printf("Output string is: %s\n-------------------- \n", charstar);
-  delete[] charstar;
-  return NS_ERROR_NOT_IMPLEMENTED;
+  // Open the file in a Unix-centric way,
+  // until I find out how to use nsFileSpec:
+  char* filename = aFileName.ToNewCString();
+  FILE* file = fopen(filename, "r");
+  if (!file)
+  {
+    fprintf(stderr, "Can't open file %s", filename);
+    perror(" ");
+    delete[] filename;
+    return 2;
+  }
+  delete[] filename;
+
+  // Inefficiently read from the file:
+  nsString inString;
+  char c;
+  while ((c = getc(file)) != EOF)
+    inString += c;
+  if (file != stdin)
+    fclose(file);
+
+  if (str == inString)
+    return 0;
+  else
+    return 1;
 }
 
 //----------------------------------------------------------------------
 // Convert html on stdin to either plaintext or (if toHTML) html
 //----------------------------------------------------------------------
 nsresult
-HTML2text(nsString& inString, nsString& inType, nsString& outType, int wrapCol, nsString& compareAgainst)
+HTML2text(nsString& inString, nsString& inType, nsString& outType,
+          int flags, int wrapCol, nsString& compareAgainst)
 {
   nsresult rv = NS_OK;
 
@@ -81,10 +102,10 @@ HTML2text(nsString& inString, nsString& inType, nsString& outType, int wrapCol,
 
   // Create the appropriate output sink
   if (outType == "text/html")
-    rv = NS_New_HTML_ContentSinkStream(&sink, &outString, 0);
+    rv = NS_New_HTML_ContentSinkStream(&sink, &outString, flags);
 
   else  // default to plaintext
-    rv = NS_New_HTMLToTXT_SinkStream(&sink, &outString, wrapCol, 2);
+    rv = NS_New_HTMLToTXT_SinkStream(&sink, &outString, wrapCol, flags);
 
   if (NS_FAILED(rv))
   {
@@ -123,7 +144,7 @@ HTML2text(nsString& inString, nsString& inType, nsString& outType, int wrapCol,
     return Compare(outString, compareAgainst);
 
   char* charstar = outString.ToNewUTF8String();
-  printf("Output string is:\n--------------------\n%s\n--------------------\n",
+  printf("Output string is:\n--------------------\n%s--------------------\n",
          charstar);
   delete[] charstar;
 
@@ -137,6 +158,7 @@ int main(int argc, char** argv)
   nsString inType ("text/html");
   nsString outType ("text/plain");
   int wrapCol = 72;
+  int flags = 0;
   nsString compareAgainst;
 
 
@@ -151,11 +173,11 @@ int main(int argc, char** argv)
     {
       case 'h':
         printf("\
-Usage: %s [-i intype] [-o outtype] [-w wrapcol] [-c comparison_file] infile\n\
+Usage: %s [-i intype] [-o outtype] [-f flags] [-w wrapcol] [-c comparison_file] infile\n\
 \tIn/out types are mime types (e.g. text/html)\n\
 \tcomparison_file is a file against which to compare the output\n\
 \t  (not yet implemented\n\
-\tDefaults are -i text/html -o text/plain -w 72 [stdin]\n",
+\tDefaults are -i text/html -o text/plain -f 0 -w 72 [stdin]\n",
                progname);
         exit(0);
 
@@ -189,6 +211,16 @@ Usage: %s [-i intype] [-o outtype] [-w wrapcol] [-c comparison_file] infile\n\
         }
         break;
 
+      case 'f':
+        if (isdigit(argv[0][2]))
+          flags = atoi(argv[0]+2);
+        else {
+          flags = atoi(argv[1]);
+          --argc;
+          ++argv;
+        }
+        break;
+
       case 'c':
         if (argv[0][2] != '\0')
           compareAgainst = argv[0]+2;
@@ -230,14 +262,5 @@ Usage: %s [-i intype] [-o outtype] [-w wrapcol] [-c comparison_file] infile\n\
   if (file != stdin)
     fclose(file);
 
-#if 0
-  printf("Input string is: %s\n-------------------- \n",
-         inString.ToNewCString());
-  printf("------------------------------------\n");
-#endif
-
-  printf("inType = '%s', outType = '%s'\n", inType.ToNewCString(), outType.ToNewCString());
-  HTML2text(inString, inType, outType, wrapCol, compareAgainst);
-
-  return 0;
+  return HTML2text(inString, inType, outType, flags, wrapCol, compareAgainst);
 }

htmlparser/tests/outsinks/Makefile.in

@@ -30,19 +30,26 @@ CPPSRCS		= \
 		$(NULL)
 
 LIBS		= \
-		-lraptorhtmlpars \
 		-lxpcom \
 		$(NSPR_LIBS) \
 		$(NULL)
 
 TEST_FILES      = \
-		plainwrap.html \
+		plain.html \
+		plainwrap.out \
+		plainnowrap.out \
+		simple.html \
+		simplecopy.out \
 		entityxif.xif \
+		entityxif.out \
+		mailquote.html \
+		mailquote.out \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 install:: 
 	$(INSTALL) -m 555 $(PROGRAM) $(DIST)/bin
+	$(INSTALL) -m 555 TestOutSinks $(DIST)/bin
 	$(INSTALL) $(TEST_FILES) $(DIST)/bin/OutTestData
 

htmlparser/tests/outsinks/TestOutSinks

@@ -0,0 +1,69 @@
+#! /bin/tcsh -f
+
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#  
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#  
+# The Original Code is Mozilla Communicator client code, released
+# March 31, 1998.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation. Portions created by Netscape are
+# Copyright (C) 1998-1999 Netscape Communications Corporation. All
+# Rights Reserved.
+# 
+# Contributor(s): Akkana Peck.
+
+#
+# This is a collection of test files to guard against regressions
+# in the Gecko output system.
+#
+
+set errmsg = ""
+
+echo "Testing simple copy cases ..."
+TestOutput -i text/html -o text/plain -f 0 -w 0 -c OutTestData/simplecopy.out OutTestData/simple.html
+if ($status != 0) then
+  echo "Simple copy test failed.\n"
+  set errmsg = ($errmsg "simple.out")
+endif
+
+echo "Testing non-wrapped plaintext ..."
+TestOutput -i text/html -o text/plain -w 0 -c OutTestData/plainnowrap.out OutTestData/plain.html
+if ($status != 0) then
+  echo "Non-wrapped plaintext test failed."
+  set errmsg = ($errmsg "plainnowrap.out")
+endif
+
+echo "Testing wrapped plaintext ..."
+TestOutput -i text/html -o text/plain -f 32 -w 50 -c OutTestData/plainwrap.out OutTestData/plain.html
+if ($status != 0) then
+  echo "Wrapped plaintext test failed."
+  set errmsg = ($errmsg "plainwrap.out")
+endif
+
+echo "Testing mail quoting ..."
+TestOutput -i text/html -o text/plain -c OutTestData/mailquote.out OutTestData/mailquote.html
+if ($status != 0) then
+  echo "Mail quoting test failed."
+  set errmsg = ($errmsg "mailquote.out")
+endif
+
+echo "Testing conversion of XIF entities ..."
+TestOutput -i text/xif -o text/plain -c OutTestData/entityxif.out OutTestData/entityxif.xif
+if ($status != 0) then
+  echo "XIF entity convertsion test failed."
+  set errmsg = ($errmsg "entityxif.out")
+endif
+
+if (errmsg != "") then
+  echo " "
+  echo TESTS FAILED: $errmsg
+  exit 1
+endif

htmlparser/tests/outsinks/entityxif.out

@@ -0,0 +1,2 @@
+
+http://www.hotbot.com/?MT=Search+Engines&SM=MC&DV=0&LG=any&DC=10&DE=2&BT=H&Search.x=31&Search.y=7r

htmlparser/tests/outsinks/mailquote.html

@@ -0,0 +1,42 @@
+<html>
+<head><!--
+  -- The contents of this file are subject to the Netscape Public
+  -- License Version 1.1 (the "License"); you may not use this file
+  -- except in compliance with the License. You may obtain a copy of
+  -- the License at http://www.mozilla.org/NPL/
+  --  
+  -- Software distributed under the License is distributed on an "AS
+  -- IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  -- implied. See the License for the specific language governing
+  -- rights and limitations under the License.
+  --  
+  -- The Original Code is Mozilla Communicator client code, released
+  -- March 31, 1998.
+  -- 
+  -- The Initial Developer of the Original Code is Netscape
+  -- Communications Corporation. Portions created by Netscape are
+  -- Copyright (C) 1998-1999 Netscape Communications Corporation. All
+  -- Rights Reserved.
+  -- 
+  -- Contributor(s): 
+  -->
+<title>Ender Plain Text Test Page</title>
+</head>
+
+<body>
+
+This page is a text of mail quoting.
+<p>
+
+<blockquote type="cite">
+I hope you will enjoy this quote from <em>Hamlet</em>, introduced by a fairly long line to see how quotations get wrapped:
+<p>
+To be, or not to be, that is the question<br>
+Whether 'tis nobler in the mind to suffer<br>
+The slings and fortunes of outrageous fortune<br>
+Or to take arms against a sea of troubles<br>
+And by opposing end them.<br>
+</blockquote>
+
+</body>
+</html>

htmlparser/tests/outsinks/mailquote.out

@@ -0,0 +1,9 @@
+This page is a text of mail quoting.
+
+> I hope you will enjoy this quote from Hamlet, introduced by a fairly long line to see how quotations get wrapped:
+> 
+> To be, or not to be, that is the question
+> Whether 'tis nobler in the mind to suffer
+> The slings and fortunes of outrageous fortune
+> Or to take arms against a sea of troubles
+> And by opposing end them.

htmlparser/tests/outsinks/plain.html

@@ -0,0 +1,39 @@
+<html>
+<head><!--
+  -- The contents of this file are subject to the Netscape Public
+  -- License Version 1.1 (the "License"); you may not use this file
+  -- except in compliance with the License. You may obtain a copy of
+  -- the License at http://www.mozilla.org/NPL/
+  --  
+  -- Software distributed under the License is distributed on an "AS
+  -- IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  -- implied. See the License for the specific language governing
+  -- rights and limitations under the License.
+  --  
+  -- The Original Code is Mozilla Communicator client code, released
+  -- March 31, 1998.
+  -- 
+  -- The Initial Developer of the Original Code is Netscape
+  -- Communications Corporation. Portions created by Netscape are
+  -- Copyright (C) 1998-1999 Netscape Communications Corporation. All
+  -- Rights Reserved.
+  -- 
+  -- Contributor(s): 
+  -->
+<title>Ender Plain Text Test Page</title>
+</head>
+
+<body style="white-space: -moz-pre-wrap; width: 72ch; font-family: -moz-fixed; background-color: rgb(255,255,255); ">
+
+80 char width (for reference only):
+---------|---------|---------|---------|---------|---------|---------|---------|
+Here is a <a href="http://www.mozilla.org">link to mozilla.org</a>.
+Here is some <u>underlined and <b>bold</b>ened</u>ified text.
+This is a test to make sure the output converters pick up the moz-pre-wrap style.  They don't necessarily have to pick up the exact wrap setting.
+
+- This should be tested with wrapping on.
+- This should be tested with wrapping off.
+
+This is the end.
+</body>
+</html>

htmlparser/tests/outsinks/plainnowrap.out

@@ -0,0 +1,8 @@
+80 char width (for reference only):
+---------|---------|---------|---------|---------|---------|---------|---------|
+Here is a link to mozilla.org.
+Here is some underlined and boldenedified text.
+This is a test to make sure the output converters pick up the moz-pre-wrap style.  They don't necessarily have to pick up the exact wrap setting.
+- This should be tested with wrapping on.
+- This should be tested with wrapping off.
+This is the end.

htmlparser/tests/outsinks/plainwrap.html

@@ -18,7 +18,7 @@
   -- Copyright (C) 1998-1999 Netscape Communications Corporation. All
   -- Rights Reserved.
   -- 
-  -- Contributor(s): 
+  -- Contributor(s): Akkana Peck
   -->
 <title>Ender Plain Text Test Page</title>
 </head>

htmlparser/tests/outsinks/plainwrap.out

@@ -0,0 +1,14 @@
+80 char width (for reference only):
+---------|---------|---------|---------|---------|---------|---------|---------|
+Here is a 
+link to mozilla.org.
+Here is some underlined and boldenedified 
+text.
+This is a test to make sure the output converters
+pick up the moz-pre-wrap style.  They don't
+necessarily have to pick up the exact wrap
+setting.
+- This should be tested with wrapping on.
+- This should be tested with wrapping off.
+This is the end.
+

htmlparser/tests/outsinks/simple.html

@@ -0,0 +1,38 @@
+<html>
+<head><!--
+  -- The contents of this file are subject to the Netscape Public
+  -- License Version 1.1 (the "License"); you may not use this file
+  -- except in compliance with the License. You may obtain a copy of
+  -- the License at http://www.mozilla.org/NPL/
+  --  
+  -- Software distributed under the License is distributed on an "AS
+  -- IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  -- implied. See the License for the specific language governing
+  -- rights and limitations under the License.
+  --  
+  -- The Original Code is Mozilla Communicator client code, released
+  -- March 31, 1998.
+  -- 
+  -- The Initial Developer of the Original Code is Netscape
+  -- Communications Corporation. Portions created by Netscape are
+  -- Copyright (C) 1998-1999 Netscape Communications Corporation. All
+  -- Rights Reserved.
+  -- 
+  -- Contributor(s): Akkana Peck
+  -->
+<title>Simple html page</title>
+</head>
+
+<body>
+<h1>Simple html page</h1>
+
+Here is a <a href="http://www.mozilla.org">link to the mozilla.org</a> page.
+Here is some <u>underlined and <b>bold</b>ened</u>ified text.
+
+<p>
+Here is a line ending with a space
+followed by a line break.
+The output should contain only one space between "space" and "followed".
+
+</body>
+</html>

htmlparser/tests/outsinks/simplecopy.out

@@ -0,0 +1,3 @@
+Simple html page Here is a link to mozilla.org. Here is some underlined and boldenedified text.
+Here is a line ending with a space followed by a line break. The output should contain only one space between "space" and "followed".
+

parser/htmlparser/tests/outsinks/Convert.cpp

@@ -47,21 +47,42 @@ static NS_DEFINE_IID(kParserCID, NS_PARSER_IID);
 // Interface IID's
 static NS_DEFINE_IID(kIParserIID, NS_IPARSER_IID);
 
-nsresult
-Compare(nsString& str, nsString& filename)
+int
+Compare(nsString& str, nsString& aFileName)
 {
-  printf("Sorry, don't know how to compare yet\n");
-  char* charstar = str.ToNewUTF8String();
-  printf("Output string is: %s\n-------------------- \n", charstar);
-  delete[] charstar;
-  return NS_ERROR_NOT_IMPLEMENTED;
+  // Open the file in a Unix-centric way,
+  // until I find out how to use nsFileSpec:
+  char* filename = aFileName.ToNewCString();
+  FILE* file = fopen(filename, "r");
+  if (!file)
+  {
+    fprintf(stderr, "Can't open file %s", filename);
+    perror(" ");
+    delete[] filename;
+    return 2;
+  }
+  delete[] filename;
+
+  // Inefficiently read from the file:
+  nsString inString;
+  char c;
+  while ((c = getc(file)) != EOF)
+    inString += c;
+  if (file != stdin)
+    fclose(file);
+
+  if (str == inString)
+    return 0;
+  else
+    return 1;
 }
 
 //----------------------------------------------------------------------
 // Convert html on stdin to either plaintext or (if toHTML) html
 //----------------------------------------------------------------------
 nsresult
-HTML2text(nsString& inString, nsString& inType, nsString& outType, int wrapCol, nsString& compareAgainst)
+HTML2text(nsString& inString, nsString& inType, nsString& outType,
+          int flags, int wrapCol, nsString& compareAgainst)
 {
   nsresult rv = NS_OK;
 
@@ -81,10 +102,10 @@ HTML2text(nsString& inString, nsString& inType, nsString& outType, int wrapCol,
 
   // Create the appropriate output sink
   if (outType == "text/html")
-    rv = NS_New_HTML_ContentSinkStream(&sink, &outString, 0);
+    rv = NS_New_HTML_ContentSinkStream(&sink, &outString, flags);
 
   else  // default to plaintext
-    rv = NS_New_HTMLToTXT_SinkStream(&sink, &outString, wrapCol, 2);
+    rv = NS_New_HTMLToTXT_SinkStream(&sink, &outString, wrapCol, flags);
 
   if (NS_FAILED(rv))
   {
@@ -123,7 +144,7 @@ HTML2text(nsString& inString, nsString& inType, nsString& outType, int wrapCol,
     return Compare(outString, compareAgainst);
 
   char* charstar = outString.ToNewUTF8String();
-  printf("Output string is:\n--------------------\n%s\n--------------------\n",
+  printf("Output string is:\n--------------------\n%s--------------------\n",
          charstar);
   delete[] charstar;
 
@@ -137,6 +158,7 @@ int main(int argc, char** argv)
   nsString inType ("text/html");
   nsString outType ("text/plain");
   int wrapCol = 72;
+  int flags = 0;
   nsString compareAgainst;
 
 
@@ -151,11 +173,11 @@ int main(int argc, char** argv)
     {
       case 'h':
         printf("\
-Usage: %s [-i intype] [-o outtype] [-w wrapcol] [-c comparison_file] infile\n\
+Usage: %s [-i intype] [-o outtype] [-f flags] [-w wrapcol] [-c comparison_file] infile\n\
 \tIn/out types are mime types (e.g. text/html)\n\
 \tcomparison_file is a file against which to compare the output\n\
 \t  (not yet implemented\n\
-\tDefaults are -i text/html -o text/plain -w 72 [stdin]\n",
+\tDefaults are -i text/html -o text/plain -f 0 -w 72 [stdin]\n",
                progname);
         exit(0);
 
@@ -189,6 +211,16 @@ Usage: %s [-i intype] [-o outtype] [-w wrapcol] [-c comparison_file] infile\n\
         }
         break;
 
+      case 'f':
+        if (isdigit(argv[0][2]))
+          flags = atoi(argv[0]+2);
+        else {
+          flags = atoi(argv[1]);
+          --argc;
+          ++argv;
+        }
+        break;
+
       case 'c':
         if (argv[0][2] != '\0')
           compareAgainst = argv[0]+2;
@@ -230,14 +262,5 @@ Usage: %s [-i intype] [-o outtype] [-w wrapcol] [-c comparison_file] infile\n\
   if (file != stdin)
     fclose(file);
 
-#if 0
-  printf("Input string is: %s\n-------------------- \n",
-         inString.ToNewCString());
-  printf("------------------------------------\n");
-#endif
-
-  printf("inType = '%s', outType = '%s'\n", inType.ToNewCString(), outType.ToNewCString());
-  HTML2text(inString, inType, outType, wrapCol, compareAgainst);
-
-  return 0;
+  return HTML2text(inString, inType, outType, flags, wrapCol, compareAgainst);
 }

parser/htmlparser/tests/outsinks/Makefile.in

@@ -30,19 +30,26 @@ CPPSRCS		= \
 		$(NULL)
 
 LIBS		= \
-		-lraptorhtmlpars \
 		-lxpcom \
 		$(NSPR_LIBS) \
 		$(NULL)
 
 TEST_FILES      = \
-		plainwrap.html \
+		plain.html \
+		plainwrap.out \
+		plainnowrap.out \
+		simple.html \
+		simplecopy.out \
 		entityxif.xif \
+		entityxif.out \
+		mailquote.html \
+		mailquote.out \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 install:: 
 	$(INSTALL) -m 555 $(PROGRAM) $(DIST)/bin
+	$(INSTALL) -m 555 TestOutSinks $(DIST)/bin
 	$(INSTALL) $(TEST_FILES) $(DIST)/bin/OutTestData
 

parser/htmlparser/tests/outsinks/TestOutSinks

@@ -0,0 +1,69 @@
+#! /bin/tcsh -f
+
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#  
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#  
+# The Original Code is Mozilla Communicator client code, released
+# March 31, 1998.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation. Portions created by Netscape are
+# Copyright (C) 1998-1999 Netscape Communications Corporation. All
+# Rights Reserved.
+# 
+# Contributor(s): Akkana Peck.
+
+#
+# This is a collection of test files to guard against regressions
+# in the Gecko output system.
+#
+
+set errmsg = ""
+
+echo "Testing simple copy cases ..."
+TestOutput -i text/html -o text/plain -f 0 -w 0 -c OutTestData/simplecopy.out OutTestData/simple.html
+if ($status != 0) then
+  echo "Simple copy test failed.\n"
+  set errmsg = ($errmsg "simple.out")
+endif
+
+echo "Testing non-wrapped plaintext ..."
+TestOutput -i text/html -o text/plain -w 0 -c OutTestData/plainnowrap.out OutTestData/plain.html
+if ($status != 0) then
+  echo "Non-wrapped plaintext test failed."
+  set errmsg = ($errmsg "plainnowrap.out")
+endif
+
+echo "Testing wrapped plaintext ..."
+TestOutput -i text/html -o text/plain -f 32 -w 50 -c OutTestData/plainwrap.out OutTestData/plain.html
+if ($status != 0) then
+  echo "Wrapped plaintext test failed."
+  set errmsg = ($errmsg "plainwrap.out")
+endif
+
+echo "Testing mail quoting ..."
+TestOutput -i text/html -o text/plain -c OutTestData/mailquote.out OutTestData/mailquote.html
+if ($status != 0) then
+  echo "Mail quoting test failed."
+  set errmsg = ($errmsg "mailquote.out")
+endif
+
+echo "Testing conversion of XIF entities ..."
+TestOutput -i text/xif -o text/plain -c OutTestData/entityxif.out OutTestData/entityxif.xif
+if ($status != 0) then
+  echo "XIF entity convertsion test failed."
+  set errmsg = ($errmsg "entityxif.out")
+endif
+
+if (errmsg != "") then
+  echo " "
+  echo TESTS FAILED: $errmsg
+  exit 1
+endif

parser/htmlparser/tests/outsinks/entityxif.out

@@ -0,0 +1,2 @@
+
+http://www.hotbot.com/?MT=Search+Engines&SM=MC&DV=0&LG=any&DC=10&DE=2&BT=H&Search.x=31&Search.y=7r

parser/htmlparser/tests/outsinks/mailquote.html

@@ -0,0 +1,42 @@
+<html>
+<head><!--
+  -- The contents of this file are subject to the Netscape Public
+  -- License Version 1.1 (the "License"); you may not use this file
+  -- except in compliance with the License. You may obtain a copy of
+  -- the License at http://www.mozilla.org/NPL/
+  --  
+  -- Software distributed under the License is distributed on an "AS
+  -- IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  -- implied. See the License for the specific language governing
+  -- rights and limitations under the License.
+  --  
+  -- The Original Code is Mozilla Communicator client code, released
+  -- March 31, 1998.
+  -- 
+  -- The Initial Developer of the Original Code is Netscape
+  -- Communications Corporation. Portions created by Netscape are
+  -- Copyright (C) 1998-1999 Netscape Communications Corporation. All
+  -- Rights Reserved.
+  -- 
+  -- Contributor(s): 
+  -->
+<title>Ender Plain Text Test Page</title>
+</head>
+
+<body>
+
+This page is a text of mail quoting.
+<p>
+
+<blockquote type="cite">
+I hope you will enjoy this quote from <em>Hamlet</em>, introduced by a fairly long line to see how quotations get wrapped:
+<p>
+To be, or not to be, that is the question<br>
+Whether 'tis nobler in the mind to suffer<br>
+The slings and fortunes of outrageous fortune<br>
+Or to take arms against a sea of troubles<br>
+And by opposing end them.<br>
+</blockquote>
+
+</body>
+</html>

parser/htmlparser/tests/outsinks/mailquote.out

@@ -0,0 +1,9 @@
+This page is a text of mail quoting.
+
+> I hope you will enjoy this quote from Hamlet, introduced by a fairly long line to see how quotations get wrapped:
+> 
+> To be, or not to be, that is the question
+> Whether 'tis nobler in the mind to suffer
+> The slings and fortunes of outrageous fortune
+> Or to take arms against a sea of troubles
+> And by opposing end them.

parser/htmlparser/tests/outsinks/plain.html

@@ -0,0 +1,39 @@
+<html>
+<head><!--
+  -- The contents of this file are subject to the Netscape Public
+  -- License Version 1.1 (the "License"); you may not use this file
+  -- except in compliance with the License. You may obtain a copy of
+  -- the License at http://www.mozilla.org/NPL/
+  --  
+  -- Software distributed under the License is distributed on an "AS
+  -- IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  -- implied. See the License for the specific language governing
+  -- rights and limitations under the License.
+  --  
+  -- The Original Code is Mozilla Communicator client code, released
+  -- March 31, 1998.
+  -- 
+  -- The Initial Developer of the Original Code is Netscape
+  -- Communications Corporation. Portions created by Netscape are
+  -- Copyright (C) 1998-1999 Netscape Communications Corporation. All
+  -- Rights Reserved.
+  -- 
+  -- Contributor(s): 
+  -->
+<title>Ender Plain Text Test Page</title>
+</head>
+
+<body style="white-space: -moz-pre-wrap; width: 72ch; font-family: -moz-fixed; background-color: rgb(255,255,255); ">
+
+80 char width (for reference only):
+---------|---------|---------|---------|---------|---------|---------|---------|
+Here is a <a href="http://www.mozilla.org">link to mozilla.org</a>.
+Here is some <u>underlined and <b>bold</b>ened</u>ified text.
+This is a test to make sure the output converters pick up the moz-pre-wrap style.  They don't necessarily have to pick up the exact wrap setting.
+
+- This should be tested with wrapping on.
+- This should be tested with wrapping off.
+
+This is the end.
+</body>
+</html>

parser/htmlparser/tests/outsinks/plainnowrap.out

@@ -0,0 +1,8 @@
+80 char width (for reference only):
+---------|---------|---------|---------|---------|---------|---------|---------|
+Here is a link to mozilla.org.
+Here is some underlined and boldenedified text.
+This is a test to make sure the output converters pick up the moz-pre-wrap style.  They don't necessarily have to pick up the exact wrap setting.
+- This should be tested with wrapping on.
+- This should be tested with wrapping off.
+This is the end.

parser/htmlparser/tests/outsinks/plainwrap.html

@@ -18,7 +18,7 @@
   -- Copyright (C) 1998-1999 Netscape Communications Corporation. All
   -- Rights Reserved.
   -- 
-  -- Contributor(s): 
+  -- Contributor(s): Akkana Peck
   -->
 <title>Ender Plain Text Test Page</title>
 </head>

parser/htmlparser/tests/outsinks/plainwrap.out

@@ -0,0 +1,14 @@
+80 char width (for reference only):
+---------|---------|---------|---------|---------|---------|---------|---------|
+Here is a 
+link to mozilla.org.
+Here is some underlined and boldenedified 
+text.
+This is a test to make sure the output converters
+pick up the moz-pre-wrap style.  They don't
+necessarily have to pick up the exact wrap
+setting.
+- This should be tested with wrapping on.
+- This should be tested with wrapping off.
+This is the end.
+

parser/htmlparser/tests/outsinks/simple.html

@@ -0,0 +1,38 @@
+<html>
+<head><!--
+  -- The contents of this file are subject to the Netscape Public
+  -- License Version 1.1 (the "License"); you may not use this file
+  -- except in compliance with the License. You may obtain a copy of
+  -- the License at http://www.mozilla.org/NPL/
+  --  
+  -- Software distributed under the License is distributed on an "AS
+  -- IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  -- implied. See the License for the specific language governing
+  -- rights and limitations under the License.
+  --  
+  -- The Original Code is Mozilla Communicator client code, released
+  -- March 31, 1998.
+  -- 
+  -- The Initial Developer of the Original Code is Netscape
+  -- Communications Corporation. Portions created by Netscape are
+  -- Copyright (C) 1998-1999 Netscape Communications Corporation. All
+  -- Rights Reserved.
+  -- 
+  -- Contributor(s): Akkana Peck
+  -->
+<title>Simple html page</title>
+</head>
+
+<body>
+<h1>Simple html page</h1>
+
+Here is a <a href="http://www.mozilla.org">link to the mozilla.org</a> page.
+Here is some <u>underlined and <b>bold</b>ened</u>ified text.
+
+<p>
+Here is a line ending with a space
+followed by a line break.
+The output should contain only one space between "space" and "followed".
+
+</body>
+</html>

parser/htmlparser/tests/outsinks/simplecopy.out

@@ -0,0 +1,3 @@
+Simple html page Here is a link to mozilla.org. Here is some underlined and boldenedified text.
+Here is a line ending with a space followed by a line break. The output should contain only one space between "space" and "followed".
+