[Httpunit-commit] CVS: httpunit/test/com/meterware/httpunit/parsing HTMLParserListenerTest.java,1.1,1.2

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/test/com/meterware/httpunit/parsing
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27137/test/com/meterware/httpunit/parsing

Modified Files:
	HTMLParserListenerTest.java 
Log Message:
upgrade dependent jars

Index: HTMLParserListenerTest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/httpunit/parsing/HTMLParserListenerTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HTMLParserListenerTest.java	28 Feb 2003 17:30:31 -0000	1.1
+++ HTMLParserListenerTest.java	9 Mar 2004 20:32:44 -0000	1.2
@@ -57,31 +57,38 @@
                         "<unknownTag>bla</unknownTag>" +
                         "</body></html>\n" );
 
-        WebConversation wc = new WebConversation();
-        final ErrorHandler errorHandler = new ErrorHandler();
-        HTMLParserFactory.addHTMLParserListener( errorHandler );
-        WebRequest request = new GetMethodWebRequest( getHostPath() + "/BadPage.html" );
-        wc.getResponse( request );
-        assertTrue( "Should have found problems", errorHandler.foundProblems() );
-        assertEquals( "Expected URL", request.getURL(), errorHandler.getBadURL() );
+        final ErrorHandler errorHandler = new ErrorHandler( /* expectProblems */ true );
+        try {
+            WebConversation wc = new WebConversation();
+            HTMLParserFactory.addHTMLParserListener( errorHandler );
+            WebRequest request = new GetMethodWebRequest( getHostPath() + "/BadPage.html" );
+            wc.getResponse( request );
+            assertTrue( "Should have found problems", errorHandler.foundProblems() );
+            assertEquals( "Expected URL", request.getURL(), errorHandler.getBadURL() );
+        } finally {
+            HTMLParserFactory.removeHTMLParserListener( errorHandler );
+        }
     }
 
 
     public void testGoodHTMLPage() throws Exception {
-        defineResource( "SimplePage.html",
-                        "<html>\n" +
-                        "<head><title>A Sample Page</title></head>\n" +
-                        "<body><p><b>Wrong embedded tags</b></p>\n" +
-                        "have <a blef=\"other.html?a=1&amp;b=2\">an invalid link</A>\n" +
-                        "<IMG SRC=\"/images/arrow.gif\" alt=\"\" WIDTH=1 HEIGHT=4>\n" +
-                        "</body></html>\n" );
-
-        WebConversation wc = new WebConversation();
-        final ErrorHandler errorHandler = new ErrorHandler();
-        HTMLParserFactory.addHTMLParserListener( errorHandler );
-        WebRequest request = new GetMethodWebRequest( getHostPath() + "/SimplePage.html" );
-        wc.getResponse( request );
-        assertFalse( "Should not have found problems", errorHandler.foundProblems() );
+        final ErrorHandler errorHandler = new ErrorHandler( /* expectProblems */ false );
+        try {
+            defineResource( "SimplePage.html",
+                            "<html>\n" +
+                            "<head><title>A Sample Page</title></head>\n" +
+                            "<body><p><b>OK embedded tags</b></p>\n" +
+                            "have <a href=\"other.html?a=1&amp;b=2\">an OK link</A>\n" +
+                            "<IMG SRC=\"/images/arrow.gif\" alt=\"\" WIDTH=1 HEIGHT=4>\n" +
+                            "</body></html>\n" );
+
+            WebConversation wc = new WebConversation();
+            HTMLParserFactory.addHTMLParserListener( errorHandler );
+            WebRequest request = new GetMethodWebRequest( getHostPath() + "/SimplePage.html" );
+            wc.getResponse( request );
+        } finally {
+            HTMLParserFactory.removeHTMLParserListener( errorHandler );
+        }
     }
 
 
@@ -98,15 +105,23 @@
 
     static private class ErrorHandler implements HTMLParserListener {
 
+        private boolean _expectProblems;
         private boolean _foundProblems;
         private URL     _badURL;
 
+
+        public ErrorHandler( boolean expectProblems ) {
+            _expectProblems = expectProblems;
+        }
+
+
         public void warning( URL url, String msg, int line, int column ) {
             _foundProblems = true;
             _badURL = url;
         }
 
         public void error( URL url, String msg, int line, int column ) {
+            assertTrue( msg + " at line " + line + ", column " + column, _expectProblems );
             _foundProblems = true;
             _badURL = url;
         }