[Httpunit-commit] CVS: httpunit/src/com/meterware/httpunit HttpUnitUtils.java,1.12,1.13 WebRequestSource.java,1.29,1.30 WebWindow.java,1.13,1.14

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

Update of /cvsroot/httpunit/httpunit/src/com/meterware/httpunit
In directory sc8-pr-cvs1:/tmp/cvs-serv32696/src/com/meterware/httpunit

Modified Files:
	HttpUnitUtils.java WebRequestSource.java WebWindow.java 
Log Message:
bug #734133: javascript URLs must handle prefix with mixed / upper case

Index: HttpUnitUtils.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/HttpUnitUtils.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- HttpUnitUtils.java	24 Mar 2003 03:22:09 -0000	1.12
+++ HttpUnitUtils.java	23 May 2003 03:24:49 -0000	1.13
@@ -172,4 +172,9 @@
             return string1.equals( string2 );
         }
     }
+
+
+    static boolean isJavaScriptURL( String urlString ) {
+        return urlString.toLowerCase().startsWith( "javascript:" );
+    }
 }

Index: WebRequestSource.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/WebRequestSource.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- WebRequestSource.java	23 May 2003 03:09:27 -0000	1.29
+++ WebRequestSource.java	23 May 2003 03:24:50 -0000	1.30
@@ -125,7 +125,7 @@
      */
     String getRelativePage() {
         final String url = getRelativeURL();
-        if (url.startsWith( "javascript:" )) return url;
+        if (HttpUnitUtils.isJavaScriptURL( url )) return url;
         final int questionMarkIndex = url.indexOf("?");
         if (questionMarkIndex >= 1 && questionMarkIndex < url.length() - 1) {
             return url.substring(0, questionMarkIndex);
@@ -142,7 +142,7 @@
 
 
     private String trimFragment( String href ) {
-        if (href.startsWith( "javascript:" )) return href;
+        if (HttpUnitUtils.isJavaScriptURL( href )) return href;
         final int hashIndex = href.indexOf( '#' );
         if (hashIndex < 0) {
             return href;
@@ -304,7 +304,7 @@
     private String getParametersString() {
         String url = trimFragment( getDestination() );
         if (url.trim().length() == 0) url = getBaseURL().toExternalForm();
-        if (url.startsWith( "javascript:" )) return "";
+        if (HttpUnitUtils.isJavaScriptURL( url )) return "";
         final int questionMarkIndex = url.indexOf("?");
         if (questionMarkIndex >= 1 && questionMarkIndex < url.length() - 1) {
             return url.substring( questionMarkIndex + 1 );

Index: WebWindow.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/WebWindow.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- WebWindow.java	4 Apr 2003 14:20:12 -0000	1.13
+++ WebWindow.java	23 May 2003 03:24:50 -0000	1.14
@@ -158,7 +158,7 @@
         String urlString = request.getURLString().trim();
         if (urlString.startsWith( "about:" )) {
             response = WebResponse.BLANK_RESPONSE;
-        } else if (!urlString.startsWith( "javascript:" )) {
+        } else if (!HttpUnitUtils.isJavaScriptURL( urlString )) {
             response = _client.newResponse( request, frameName );
         } else {
             WebRequestSource wrs = request.getWebRequestSource();