Merge pull request apache#408 from apache/WW-4043-moves-test-utils

[WW-4043] Moves TestUtils into junit-plugin

Author: lukaszlenart

core/src/test/java/org/apache/struts2/TestUtils.java

@@ -21,6 +21,7 @@
 import org.apache.struts2.StrutsTestCase;
 import org.apache.struts2.json.annotations.JSONFieldBridge;
 import org.apache.struts2.json.bridge.StringBridge;
+import org.apache.struts2.util.TestUtils;
 import org.junit.Test;
 
 import java.net.URL;

plugins/json/src/test/java/org/apache/struts2/json/DefaultJSONWriterTest.java

@@ -24,6 +24,7 @@
 
 import org.apache.struts2.StrutsStatics;
 import org.apache.struts2.StrutsTestCase;
+import org.apache.struts2.util.TestUtils;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.mock.web.MockServletContext;

plugins/json/src/test/java/org/apache/struts2/json/JSONInterceptorTest.java

@@ -27,6 +27,7 @@
 import java.util.Map;
 
 import junit.framework.TestCase;
+import org.apache.struts2.util.TestUtils;
 
 public class JSONPopulatorTest extends TestCase {
 

plugins/json/src/test/java/org/apache/struts2/json/JSONPopulatorTest.java

@@ -35,10 +35,9 @@
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
 import org.apache.struts2.StrutsStatics;
 import org.apache.struts2.StrutsTestCase;
+import org.apache.struts2.util.TestUtils;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;

plugins/json/src/test/java/org/apache/struts2/json/JSONResultTest.java

@@ -32,6 +32,7 @@
 import org.apache.struts2.StrutsTestCase;
 import org.apache.struts2.interceptor.validation.AnnotationValidationInterceptor;
 import org.apache.struts2.interceptor.validation.SkipValidation;
+import org.apache.struts2.util.TestUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.PrintWriter;

plugins/json/src/test/java/org/apache/struts2/json/JSONValidationInterceptorTest.java

@@ -16,20 +16,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.json;
+package org.apache.struts2.util;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.Assert;
 
 import java.net.URL;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 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.
      */
@@ -39,21 +42,16 @@ public class TestUtils {
      * 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
-     * 
-     * @param obj
-     *            the object to be normalized. normalize will perform its
-     *            operation on obj.toString().trim() ;
-     * @param appendSpace
+     *
+     * @param json         the JSON to be normalized. normalize will trim before starting
+     * @param removeSpaces removes white spaces from the JSON or not
      * @return the normalized string
      */
-    public static String normalize(Object obj, boolean appendSpace) {
-        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(" ");
+    public static String normalize(String json, boolean removeSpaces) {
+        Matcher matcher = WHITESPACE_BLOCK.matcher(StringUtils.trim(json));
+        if (removeSpaces) {
+            return matcher.replaceAll("").replaceAll(" ", "");
         }
-        */
         return matcher.replaceAll("");
     }
 
@@ -64,17 +62,15 @@ public static String normalize(URL url) throws Exception {
     /**
      * Attempt to verify the contents of text against the contents of the URL
      * specified. Performs a trim on both ends
-     * 
-     * @param url
-     *            the HTML snippet that we want to validate against
-     * @throws Exception
-     *             if the validation failed
+     *
+     * @param url the HTML snippet that we want to validate against
+     * @throws Exception if the validation failed
      */
     public static boolean compare(URL url, String text) throws Exception {
-        /**
-         * compare the trimmed values of each buffer and make sure they're
-         * equivalent. however, let's make sure to normalize the strings first
-         * to account for line termination differences between platforms.
+        /*
+          compare the trimmed values of each buffer and make sure they're
+          equivalent. however, let's make sure to normalize the strings first
+          to account for line termination differences between platforms.
          */
         String writerString = TestUtils.normalize(text, true);
         String bufferString = TestUtils.normalize(readContent(url), true);
@@ -85,13 +81,23 @@ public static boolean compare(URL url, String text) throws Exception {
     public static void assertEquals(URL source, String text) throws Exception {
         String writerString = TestUtils.normalize(text, true);
         String bufferString = TestUtils.normalize(readContent(source), true);
-        Assert.assertEquals(bufferString,writerString);
+        Assert.assertEquals(bufferString, writerString);
     }
 
     public static String readContent(URL url) throws Exception {
-        if (url == null)
-            throw new Exception("unable to verify a null URL");
+        return readContent(url, StandardCharsets.UTF_8);
+    }
 
-        return IOUtils.toString(url.openStream());
+    public static String readContent(URL url, Charset encoding) throws Exception {
+        if (url == null) {
+            throw new IllegalArgumentException("Unable to verify a null URL");
+        }
+
+        if (encoding == null) {
+            throw new IllegalArgumentException("Unable to verify the URL using a null Charset");
+        }
+
+        return IOUtils.toString(url.openStream(), encoding);
     }
+
 }