[Httpunit-commit] CVS: httpunit/test/com/meterware/httpunit WebPageTest.java,1.18,1.19 WebResource.j
Brought to you by:
russgold
|
From: Russell G. <rus...@us...> - 2001-11-14 17:28:28
|
Update of /cvsroot/httpunit/httpunit/test/com/meterware/httpunit
In directory usw-pr-cvs1:/tmp/cvs-serv1796/test/com/meterware/httpunit
Modified Files:
WebPageTest.java WebResource.java
Log Message:
Handle quoted character set names
Index: WebPageTest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/httpunit/WebPageTest.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- WebPageTest.java 2001/10/26 15:41:04 1.18
+++ WebPageTest.java 2001/11/14 17:28:25 1.19
@@ -142,6 +142,23 @@
}
+ public void testQuotedEncoding() throws Exception {
+ String hebrewTitle = "\u05d0\u05d1\u05d2\u05d3";
+ String page = "<html><head><title>" + hebrewTitle + "</title></head>\n" +
+ "<body>This has no data\n" +
+ "</body></html>\n";
+ defineResource( "SimplePage.html", page );
+ setResourceCharSet( "SimplePage.html", "\"iso-8859-8\"", true );
+
+ WebConversation wc = new WebConversation();
+ WebRequest request = new GetMethodWebRequest( getHostPath() + "/SimplePage.html" );
+ WebResponse simplePage = wc.getResponse( request );
+
+ assertEquals( "Title", hebrewTitle, simplePage.getTitle() );
+ assertEquals( "Character set", "iso-8859-8", simplePage.getCharacterSet() );
+ }
+
+
public void testUnspecifiedEncoding() throws Exception {
String hebrewTitle = "\u05d0\u05d1\u05d2\u05d3";
String page = "<html><head><title>" + hebrewTitle + "</title></head>\n" +
Index: WebResource.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/httpunit/WebResource.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- WebResource.java 2001/11/09 18:35:14 1.6
+++ WebResource.java 2001/11/14 17:28:25 1.7
@@ -105,7 +105,7 @@
String getCharacterSet() {
- return _characterSet;
+ return HttpUnitUtils.stripQuotes( _characterSet );
}
|