Author: jdonnerstag
Date: Tue Apr 7 13:32:59 2009
New Revision: 762769
URL: http://svn.apache.org/viewvc?rev=762769&view=rev
Log:
fixed WICKET-2197 BaseWicketTester should not hardcode UTF-8 in
isComponentOnAjaxResponse
Issue: WICKET-2197
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?rev=762769&r1=762768&r2=762769&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
Tue Apr 7 13:32:59 2009
@@ -23,6 +23,7 @@
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
+import java.util.regex.Pattern;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
@@ -1049,14 +1050,16 @@
}
}
-
// Get the AJAX response
String ajaxResponse = getServletResponse().getDocument();
// Test that the previous response was actually a AJAX response
failMessage = "The Previous response was not an AJAX response. "
+ "You need to execute an AJAX event, using clickLink,
before using this assert";
- boolean isAjaxResponse = ajaxResponse.startsWith("<?xml
version=\"1.0\" encoding=\"UTF-8\"?><ajax-response>");
+ boolean isAjaxResponse = Pattern.compile(
+ "^<\\?xml version=\"1.0\"
encoding=\".*?\"\\?><ajax-response>")
+ .matcher(ajaxResponse)
+ .find();
result = isTrue(failMessage, isAjaxResponse);
if (result.wasFailed())
{
