Author: mcucchiara
Date: Wed Apr 10 09:33:04 2013
New Revision: 1466402
URL: http://svn.apache.org/r1466402
Log:
Fixed broken tests
Modified:
struts/struts2/trunk/plugins/json/src/test/java/org/apache/struts2/json/TestUtils.java
Modified:
struts/struts2/trunk/plugins/json/src/test/java/org/apache/struts2/json/TestUtils.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/json/src/test/java/org/apache/struts2/json/TestUtils.java?rev=1466402&r1=1466401&r2=1466402&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/json/src/test/java/org/apache/struts2/json/TestUtils.java
(original)
+++
struts/struts2/trunk/plugins/json/src/test/java/org/apache/struts2/json/TestUtils.java
Wed Apr 10 09:33:04 2013
@@ -25,12 +25,19 @@ import org.apache.commons.lang3.StringUt
import org.junit.Assert;
import java.net.URL;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
/**
* Utility methods for test classes
*/
public class TestUtils {
/**
+ * A regex pattern for recognizing blocks of whitespace characters.
+ */
+ private static final Pattern WHITESPACE_BLOCK = Pattern.compile("\\s+");
+
+ /**
* normalizes a string so that strings generated on different platforms can
* be compared. any group of one or more space, tab, \r, and \n characters
* are converted to a single space character
@@ -42,7 +49,14 @@ public class TestUtils {
* @return the normalized string
*/
public static String normalize(Object obj, boolean appendSpace) {
- return StringUtils.normalizeSpace(obj.toString());
+ Matcher matcher =
WHITESPACE_BLOCK.matcher(StringUtils.trim(obj.toString()));
+ /*
+ FIXME: appendSpace has been always ignored, uncommenting the following
line will cause dozen of test fails
+ if (appendSpace) {
+ return matcher.replaceAll(" ");
+ }
+ */
+ return matcher.replaceAll("");
}
public static String normalize(URL url) throws Exception {
