You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by tu...@apache.org on 2003/05/13 20:21:14 UTC
cvs commit: jakarta-struts/src/test/org/apache/struts/taglib/logic TestIterateTag.java
turner 2003/05/13 11:21:14
Modified: src/test/org/apache/struts/taglib/bean TestCookieTag.java
TestDefineTag.java TestHeaderTag.java
TestIncludeTag.java TestMessageTag.java
TestMessageTag1.java TestMessageTag1_fr.java
TestMessageTag2.java TestMessageTag2_fr.java
TestMessageTag3.java TestMessageTag3_fr.java
TestMessageTag4.java TestMessageTag4_fr.java
TestMessageTag_fr.java TestPageTag.java
TestParameterTag.java TestResourceTag.java
TestSizeTag.java TestStrutsTag.java
TestWriteTag.java
src/test/org/apache/struts/taglib/html TestBaseTag.java
src/test/org/apache/struts/taglib/logic TestIterateTag.java
Log:
Apply patch from bug report Bugzilla Bug 19525
Revision Changes Path
1.5 +6 -5 jakarta-struts/src/test/org/apache/struts/taglib/bean/TestCookieTag.java
Index: TestCookieTag.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestCookieTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestCookieTag.java 8 Mar 2003 19:31:56 -0000 1.4
+++ TestCookieTag.java 13 May 2003 18:21:13 -0000 1.5
@@ -65,6 +65,7 @@
import org.apache.cactus.JspTestCase;
import org.apache.cactus.WebRequest;
import org.apache.cactus.WebResponse;
+import org.apache.commons.lang.StringUtils;
/**
* Suite of unit tests for the
@@ -119,8 +120,8 @@
private void formatAndTest(String compare, String output) {
//fix for introduced carriage return / line feeds
- output = output.replaceAll("\r","");
- output = output.replaceAll("\n","");
+ output = StringUtils.replace(output,"\r","");
+ output = StringUtils.replace(output,"\n","");
output = output.trim();
//System.out.println("Testing [" + compare + "] == [" + output + "]");
assertEquals(compare, output);
1.5 +6 -5 jakarta-struts/src/test/org/apache/struts/taglib/bean/TestDefineTag.java
Index: TestDefineTag.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestDefineTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestDefineTag.java 8 Mar 2003 19:31:56 -0000 1.4
+++ TestDefineTag.java 13 May 2003 18:21:13 -0000 1.5
@@ -66,6 +66,7 @@
import org.apache.cactus.JspTestCase;
import org.apache.cactus.WebResponse;
import org.apache.struts.util.LabelValueBean;
+import org.apache.commons.lang.StringUtils;
/**
* Suite of unit tests for the
@@ -118,8 +119,8 @@
private void formatAndTest(String compare, String output) {
//fix for introduced carriage return / line feeds
- output = output.replaceAll("\r","");
- output = output.replaceAll("\n","");
+ output = StringUtils.replace(output,"\r","");
+ output = StringUtils.replace(output,"\n","");
output = output.trim();
assertEquals(compare, output);
}
1.5 +6 -5 jakarta-struts/src/test/org/apache/struts/taglib/bean/TestHeaderTag.java
Index: TestHeaderTag.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestHeaderTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestHeaderTag.java 8 Mar 2003 19:31:56 -0000 1.4
+++ TestHeaderTag.java 13 May 2003 18:21:13 -0000 1.5
@@ -65,6 +65,7 @@
import org.apache.cactus.JspTestCase;
import org.apache.cactus.WebRequest;
import org.apache.cactus.WebResponse;
+import org.apache.commons.lang.StringUtils;
/**
* Suite of unit tests for the
@@ -119,8 +120,8 @@
private void formatAndTest(String compare, String output) {
//fix for introduced carriage return / line feeds
- output = output.replaceAll("\r","");
- output = output.replaceAll("\n","");
+ output = StringUtils.replace(output,"\r","");
+ output = StringUtils.replace(output,"\n","");
output = output.trim();
assertEquals(compare, output);
}
1.5 +6 -5 jakarta-struts/src/test/org/apache/struts/taglib/bean/TestIncludeTag.java
Index: TestIncludeTag.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestIncludeTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestIncludeTag.java 8 Mar 2003 19:31:56 -0000 1.4
+++ TestIncludeTag.java 13 May 2003 18:21:13 -0000 1.5
@@ -64,6 +64,7 @@
import org.apache.cactus.JspTestCase;
import org.apache.cactus.WebResponse;
+import org.apache.commons.lang.StringUtils;
/**
* Suite of unit tests for the
@@ -117,8 +118,8 @@
private void formatAndTest(String compare, String output) {
//fix for introduced carriage return / line feeds
- output = output.replaceAll("\r","");
- output = output.replaceAll("\n","");
+ output = StringUtils.replace(output,"\r","");
+ output = StringUtils.replace(output,"\n","");
output = output.trim();
//System.out.println("Testing [" + compare + "] == [" + output + "]");
assertEquals(compare, output);
1.5 +6 -5 jakarta-struts/src/test/org/apache/struts/taglib/bean/TestMessageTag.java
Index: TestMessageTag.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestMessageTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestMessageTag.java 8 Mar 2003 19:31:56 -0000 1.4
+++ TestMessageTag.java 13 May 2003 18:21:13 -0000 1.5
@@ -69,6 +69,7 @@
import org.apache.cactus.WebResponse;
import org.apache.struts.Globals;
import org.apache.struts.taglib.SimpleBeanForTesting;
+import org.apache.commons.lang.StringUtils;
/**
* These tests attempt to cover every single possible configuration of the
@@ -123,8 +124,8 @@
private void formatAndTest(String compare, String output) {
//fix for introduced carriage return / line feeds
- output = output.replaceAll("\r","");
- output = output.replaceAll("\n","");
+ output = StringUtils.replace(output,"\r","");
+ output = StringUtils.replace(output,"\n","");
output = output.trim();
//System.out.println("Testing [" + compare + "] == [" + output + "]");
assertEquals(compare, output);
1.5 +6 -5 jakarta-struts/src/test/org/apache/struts/taglib/bean/TestMessageTag1.java
Index: TestMessageTag1.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestMessageTag1.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestMessageTag1.java 8 Mar 2003 19:31:56 -0000 1.4
+++ TestMessageTag1.java 13 May 2003 18:21:13 -0000 1.5
@@ -69,6 +69,7 @@
import org.apache.cactus.WebResponse;
import org.apache.struts.Globals;
import org.apache.struts.taglib.SimpleBeanForTesting;
+import org.apache.commons.lang.StringUtils;
/**
* These tests attempt to cover every single possible configuration of the
@@ -123,8 +124,8 @@
private void formatAndTest(String compare, String output) {
//fix for introduced carriage return / line feeds
- output = output.replaceAll("\r","");
- output = output.replaceAll("\n","");
+ output = StringUtils.replace(output,"\r","");
+ output = StringUtils.replace(output,"\n","");
output = output.trim();
//System.out.println("Testing [" + compare + "] == [" + output + "]");
assertEquals(compare, output);
1.5 +6 -5 jakarta-struts/src/test/org/apache/struts/taglib/bean/TestMessageTag1_fr.java
Index: TestMessageTag1_fr.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestMessageTag1_fr.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestMessageTag1_fr.java 8 Mar 2003 19:31:56 -0000 1.4
+++ TestMessageTag1_fr.java 13 May 2003 18:21:13 -0000 1.5
@@ -69,6 +69,7 @@
import org.apache.cactus.WebResponse;
import org.apache.struts.Globals;
import org.apache.struts.taglib.SimpleBeanForTesting;
+import org.apache.commons.lang.StringUtils;
/**
* These tests attempt to cover every single possible configuration of the
@@ -123,8 +124,8 @@
private void formatAndTest(String compare, String output) {
//fix for introduced carriage return / line feeds
- output = output.replaceAll("\r","");
- output = output.replaceAll("\n","");
+ output = StringUtils.replace(output,"\r","");
+ output = StringUtils.replace(output,"\n","");
output = output.trim();
//System.out.println("Testing [" + compare + "] == [" + output + "]");
assertEquals(compare, output);
1.5 +6 -5 jakarta-struts/src/test/org/apache/struts/taglib/bean/TestMessageTag2.java
Index: TestMessageTag2.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestMessageTag2.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestMessageTag2.java 8 Mar 2003 19:31:56 -0000 1.4
+++ TestMessageTag2.java 13 May 2003 18:21:13 -0000 1.5
@@ -69,6 +69,7 @@
import org.apache.cactus.WebResponse;
import org.apache.struts.Globals;
import org.apache.struts.taglib.SimpleBeanForTesting;
+import org.apache.commons.lang.StringUtils;
/**
* These tests attempt to cover every single possible configuration of the
@@ -123,8 +124,8 @@
private void formatAndTest(String compare, String output) {
//fix for introduced carriage return / line feeds
- output = output.replaceAll("\r","");
- output = output.replaceAll("\n","");
+ output = StringUtils.replace(output,"\r","");
+ output = StringUtils.replace(output,"\n","");
output = output.trim();
//System.out.println("Testing [" + compare + "] == [" + output + "]");
assertEquals(compare, output);
1.5 +6 -5 jakarta-struts/src/test/org/apache/struts/taglib/bean/TestMessageTag2_fr.java
Index: TestMessageTag2_fr.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestMessageTag2_fr.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestMessageTag2_fr.java 8 Mar 2003 19:31:56 -0000 1.4
+++ TestMessageTag2_fr.java 13 May 2003 18:21:13 -0000 1.5
@@ -69,6 +69,7 @@
import org.apache.cactus.WebResponse;
import org.apache.struts.Globals;
import org.apache.struts.taglib.SimpleBeanForTesting;
+import org.apache.commons.lang.StringUtils;
/**
* These tests attempt to cover every single possible configuration of the
@@ -123,8 +124,8 @@
private void formatAndTest(String compare, String output) {
//fix for introduced carriage return / line feeds
- output = output.replaceAll("\r","");
- output = output.replaceAll("\n","");
+ output = StringUtils.replace(output,"\r","");
+ output = StringUtils.replace(output,"\n","");
output = output.trim();
//System.out.println("Testing [" + compare + "] == [" + output + "]");
assertEquals(compare, output);
1.5 +6 -5 jakarta-struts/src/test/org/apache/struts/taglib/bean/TestMessageTag3.java
Index: TestMessageTag3.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestMessageTag3.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestMessageTag3.java 8 Mar 2003 19:31:56 -0000 1.4
+++ TestMessageTag3.java 13 May 2003 18:21:13 -0000 1.5
@@ -69,6 +69,7 @@
import org.apache.cactus.WebResponse;
import org.apache.struts.Globals;
import org.apache.struts.taglib.SimpleBeanForTesting;
+import org.apache.commons.lang.StringUtils;
/**
* These tests attempt to cover every single possible configuration of the
@@ -123,8 +124,8 @@
private void formatAndTest(String compare, String output) {
//fix for introduced carriage return / line feeds
- output = output.replaceAll("\r","");
- output = output.replaceAll("\n","");
+ output = StringUtils.replace(output,"\r","");
+ output = StringUtils.replace(output,"\r","");
output = output.trim();
//System.out.println("Testing [" + compare + "] == [" + output + "]");
assertEquals(compare, output);
1.5 +6 -5 jakarta-struts/src/test/org/apache/struts/taglib/bean/TestMessageTag3_fr.java
Index: TestMessageTag3_fr.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestMessageTag3_fr.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestMessageTag3_fr.java 8 Mar 2003 19:31:56 -0000 1.4
+++ TestMessageTag3_fr.java 13 May 2003 18:21:13 -0000 1.5
@@ -69,6 +69,7 @@
import org.apache.cactus.WebResponse;
import org.apache.struts.Globals;
import org.apache.struts.taglib.SimpleBeanForTesting;
+import org.apache.commons.lang.StringUtils;
/**
* These tests attempt to cover every single possible configuration of the
@@ -123,8 +124,8 @@
private void formatAndTest(String compare, String output) {
//fix for introduced carriage return / line feeds
- output = output.replaceAll("\r","");
- output = output.replaceAll("\n","");
+ output = StringUtils.replace(output,"\r","");
+ output = StringUtils.replace(output,"\n","");
output = output.trim();
//System.out.println("Testing [" + compare + "] == [" + output + "]");
assertEquals(compare, output);
1.5 +6 -5 jakarta-struts/src/test/org/apache/struts/taglib/bean/TestMessageTag4.java
Index: TestMessageTag4.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestMessageTag4.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestMessageTag4.java 8 Mar 2003 19:31:56 -0000 1.4
+++ TestMessageTag4.java 13 May 2003 18:21:13 -0000 1.5
@@ -69,6 +69,7 @@
import org.apache.cactus.WebResponse;
import org.apache.struts.Globals;
import org.apache.struts.taglib.SimpleBeanForTesting;
+import org.apache.commons.lang.StringUtils;
/**
* These tests attempt to cover every single possible configuration of the
@@ -123,8 +124,8 @@
private void formatAndTest(String compare, String output) {
//fix for introduced carriage return / line feeds
- output = output.replaceAll("\r","");
- output = output.replaceAll("\n","");
+ output = StringUtils.replace(output,"\r","");
+ output = StringUtils.replace(output,"\n","");
output = output.trim();
//System.out.println("Testing [" + compare + "] == [" + output + "]");
assertEquals(compare, output);
1.5 +6 -5 jakarta-struts/src/test/org/apache/struts/taglib/bean/TestMessageTag4_fr.java
Index: TestMessageTag4_fr.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestMessageTag4_fr.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestMessageTag4_fr.java 8 Mar 2003 19:31:56 -0000 1.4
+++ TestMessageTag4_fr.java 13 May 2003 18:21:13 -0000 1.5
@@ -69,6 +69,7 @@
import org.apache.cactus.WebResponse;
import org.apache.struts.Globals;
import org.apache.struts.taglib.SimpleBeanForTesting;
+import org.apache.commons.lang.StringUtils;
/**
* These tests attempt to cover every single possible configuration of the
@@ -123,8 +124,8 @@
private void formatAndTest(String compare, String output) {
//fix for introduced carriage return / line feeds
- output = output.replaceAll("\r","");
- output = output.replaceAll("\n","");
+ output = StringUtils.replace(output,"\r","");
+ output = StringUtils.replace(output,"\n","");
output = output.trim();
//System.out.println("Testing [" + compare + "] == [" + output + "]");
assertEquals(compare, output);
1.5 +6 -5 jakarta-struts/src/test/org/apache/struts/taglib/bean/TestMessageTag_fr.java
Index: TestMessageTag_fr.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestMessageTag_fr.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestMessageTag_fr.java 8 Mar 2003 19:31:56 -0000 1.4
+++ TestMessageTag_fr.java 13 May 2003 18:21:13 -0000 1.5
@@ -69,6 +69,7 @@
import org.apache.cactus.WebResponse;
import org.apache.struts.Globals;
import org.apache.struts.taglib.SimpleBeanForTesting;
+import org.apache.commons.lang.StringUtils;
/**
* These tests attempt to cover every single possible configuration of the
@@ -123,8 +124,8 @@
private void formatAndTest(String compare, String output) {
//fix for introduced carriage return / line feeds
- output = output.replaceAll("\r","");
- output = output.replaceAll("\n","");
+ output = StringUtils.replace(output,"\r","");
+ output = StringUtils.replace(output,"\n","");
output = output.trim();
//System.out.println("Testing [" + compare + "] == [" + output + "]");
assertEquals(compare, output);
1.5 +6 -5 jakarta-struts/src/test/org/apache/struts/taglib/bean/TestPageTag.java
Index: TestPageTag.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestPageTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestPageTag.java 8 Mar 2003 19:31:56 -0000 1.4
+++ TestPageTag.java 13 May 2003 18:21:13 -0000 1.5
@@ -65,6 +65,7 @@
import org.apache.cactus.JspTestCase;
import org.apache.cactus.WebResponse;
+import org.apache.commons.lang.StringUtils;
/**
* Suite of unit tests for the
@@ -117,8 +118,8 @@
private void formatAndTest(String compare, String output) {
//fix for introduced carriage return / line feeds
- output = output.replaceAll("\r","");
- output = output.replaceAll("\n","");
+ output = StringUtils.replace(output,"\r","");
+ output = StringUtils.replace(output,"\n","");
output = output.trim();
//System.out.println("Testing [" + compare + "] == [" + output + "]");
assertEquals(compare, output);
1.6 +6 -5 jakarta-struts/src/test/org/apache/struts/taglib/bean/TestParameterTag.java
Index: TestParameterTag.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestParameterTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestParameterTag.java 8 Mar 2003 19:31:56 -0000 1.5
+++ TestParameterTag.java 13 May 2003 18:21:13 -0000 1.6
@@ -68,6 +68,7 @@
import org.apache.cactus.JspTestCase;
import org.apache.cactus.WebRequest;
import org.apache.cactus.WebResponse;
+import org.apache.commons.lang.StringUtils;
/**
* Suite of unit tests for the
@@ -110,8 +111,8 @@
private void formatAndTest(String compare, String output) {
//fix for introduced carriage return / line feeds
- output = output.replaceAll("\r","");
- output = output.replaceAll("\n","");
+ output = StringUtils.replace(output,"\r","");
+ output = StringUtils.replace(output,"\n","");
output = output.trim();
//System.out.println("Testing [" + compare + "] == [" + output + "]");
assertEquals(compare, output);
1.5 +6 -5 jakarta-struts/src/test/org/apache/struts/taglib/bean/TestResourceTag.java
Index: TestResourceTag.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestResourceTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestResourceTag.java 8 Mar 2003 19:31:56 -0000 1.4
+++ TestResourceTag.java 13 May 2003 18:21:13 -0000 1.5
@@ -67,6 +67,7 @@
import org.apache.cactus.JspTestCase;
import org.apache.cactus.WebResponse;
+import org.apache.commons.lang.StringUtils;
/**
* Suite of unit tests for the
@@ -106,8 +107,8 @@
private void formatAndTest(String compare, String output) {
//fix for introduced carriage return / line feeds
- output = output.replaceAll("\r","");
- output = output.replaceAll("\n","");
+ output = StringUtils.replace(output,"\r","");
+ output = StringUtils.replace(output,"\n","");
output = output.trim();
//System.out.println("Testing [" + compare + "] == [" + output + "]");
assertEquals(compare, output);
1.5 +6 -5 jakarta-struts/src/test/org/apache/struts/taglib/bean/TestSizeTag.java
Index: TestSizeTag.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestSizeTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestSizeTag.java 8 Mar 2003 19:31:56 -0000 1.4
+++ TestSizeTag.java 13 May 2003 18:21:13 -0000 1.5
@@ -73,6 +73,7 @@
import org.apache.cactus.JspTestCase;
import org.apache.cactus.WebResponse;
import org.apache.struts.taglib.SimpleBeanForTesting;
+import org.apache.commons.lang.StringUtils;
/**
* Suite of unit tests for the
@@ -125,8 +126,8 @@
private void formatAndTest(String compare, String output) {
//fix for introduced carriage return / line feeds
- output = output.replaceAll("\r","");
- output = output.replaceAll("\n","");
+ output = StringUtils.replace(output,"\r","");
+ output = StringUtils.replace(output,"\n","");
output = output.trim();
//System.out.println("Testing [" + compare + "] == [" + output + "]");
assertEquals(compare, output);
1.5 +6 -5 jakarta-struts/src/test/org/apache/struts/taglib/bean/TestStrutsTag.java
Index: TestStrutsTag.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestStrutsTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestStrutsTag.java 8 Mar 2003 19:31:56 -0000 1.4
+++ TestStrutsTag.java 13 May 2003 18:21:13 -0000 1.5
@@ -67,6 +67,7 @@
import org.apache.cactus.JspTestCase;
import org.apache.cactus.WebResponse;
+import org.apache.commons.lang.StringUtils;
/**
* Suite of unit tests for the
@@ -107,8 +108,8 @@
private void formatAndTest(String compare, String output) {
//fix for introduced carriage return / line feeds
- output = output.replaceAll("\r","");
- output = output.replaceAll("\n","");
+ output = StringUtils.replace(output,"\r","");
+ output = StringUtils.replace(output,"\n","");
output = output.trim();
//System.out.println("Testing [" + compare + "] == [" + output + "]");
assertEquals(compare, output);
1.6 +6 -5 jakarta-struts/src/test/org/apache/struts/taglib/bean/TestWriteTag.java
Index: TestWriteTag.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestWriteTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestWriteTag.java 8 Mar 2003 19:31:56 -0000 1.5
+++ TestWriteTag.java 13 May 2003 18:21:13 -0000 1.6
@@ -70,6 +70,7 @@
import org.apache.struts.Globals;
import org.apache.struts.taglib.SimpleBeanForTesting;
import org.apache.struts.util.ResponseUtils;
+import org.apache.commons.lang.StringUtils;
/**
* Suite of unit tests for the
@@ -112,8 +113,8 @@
private void formatAndTest(String compare, String output) {
//fix for introduced carriage return / line feeds
- output = output.replaceAll("\r","");
- output = output.replaceAll("\n","");
+ output = StringUtils.replace(output,"\r","");
+ output = StringUtils.replace(output,"\n","");
output = output.trim();
//System.out.println("Testing [" + compare + "] == [" + output + "]");
assertEquals(compare, output);
1.6 +6 -5 jakarta-struts/src/test/org/apache/struts/taglib/html/TestBaseTag.java
Index: TestBaseTag.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/html/TestBaseTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestBaseTag.java 23 Mar 2003 04:08:28 -0000 1.5
+++ TestBaseTag.java 13 May 2003 18:21:14 -0000 1.6
@@ -63,6 +63,7 @@
import junit.framework.TestSuite;
import org.apache.cactus.JspTestCase;
+import org.apache.commons.lang.StringUtils;
/**
@@ -113,8 +114,8 @@
private void formatAndTest(String compare, String output) {
//fix for introduced carriage return / line feeds
- output = output.replaceAll("\r","");
- output = output.replaceAll("\n","");
+ output = StringUtils.replace(output,"\r","");
+ output = StringUtils.replace(output,"\n","");
output = output.trim();
assertEquals(compare, output);
}
1.5 +54 -53 jakarta-struts/src/test/org/apache/struts/taglib/logic/TestIterateTag.java
Index: TestIterateTag.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/logic/TestIterateTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestIterateTag.java 8 Mar 2003 19:45:04 -0000 1.4
+++ TestIterateTag.java 13 May 2003 18:21:14 -0000 1.5
@@ -73,6 +73,7 @@
import org.apache.cactus.JspTestCase;
import org.apache.cactus.WebResponse;
import org.apache.struts.taglib.SimpleBeanForTesting;
+import org.apache.commons.lang.StringUtils;
/**
@@ -164,8 +165,8 @@
}
//fix for introduced carriage return / line feeds
- output = compare.replaceAll("\r","");
- output = compare.replaceAll("\n","");
+ output = StringUtils.replace(output,"\r","");
+ output = StringUtils.replace(output,"\n","");
assertEquals(compare, output);
}
@@ -211,8 +212,8 @@
}
//fix for introduced carriage return / line feeds
- output = compare.replaceAll("\r","");
- output = compare.replaceAll("\n","");
+ output = StringUtils.replace(compare,"\r","");
+ output = StringUtils.replace(output,"\n","");
assertEquals(compare, output);
}
@@ -258,8 +259,8 @@
}
//fix for introduced carriage return / line feeds
- output = compare.replaceAll("\r","");
- output = compare.replaceAll("\n","");
+ output = StringUtils.replace(compare,"\r","");
+ output = StringUtils.replace(output,"\r","");
assertEquals(compare, output);
}
@@ -326,8 +327,8 @@
}
//fix for introduced carriage return / line feeds
- output = compare.replaceAll("\r","");
- output = compare.replaceAll("\n","");
+ output = StringUtils.replace(compare,"\r","");
+ output = StringUtils.replace(output,"\n","");
assertEquals(compare, output);
}
@@ -384,8 +385,8 @@
}
//fix for introduced carriage return / line feeds
- output = compare.replaceAll("\r","");
- output = compare.replaceAll("\n","");
+ output = StringUtils.replace(compare,"\r","");
+ output = StringUtils.replace(output,"\n","");
assertEquals(compare, output);
}
@@ -442,8 +443,8 @@
}
//fix for introduced carriage return / line feeds
- output = compare.replaceAll("\r","");
- output = compare.replaceAll("\n","");
+ output = StringUtils.replace(compare,"\r","");
+ output = StringUtils.replace(output,"\n","");
assertEquals(compare, output);
}
@@ -498,8 +499,8 @@
}
//fix for introduced carriage return / line feeds
- output = compare.replaceAll("\r","");
- output = compare.replaceAll("\n","");
+ output = StringUtils.replace(compare,"\r","");
+ output = StringUtils.replace(output,"\n","");
assertEquals(compare, output);
}
@@ -542,8 +543,8 @@
}
//fix for introduced carriage return / line feeds
- output = compare.replaceAll("\r","");
- output = compare.replaceAll("\n","");
+ output = StringUtils.replace(compare,"\r","");
+ output = StringUtils.replace(output,"\n","");
assertEquals(compare, output);
}
@@ -586,8 +587,8 @@
}
//fix for introduced carriage return / line feeds
- output = compare.replaceAll("\r","");
- output = compare.replaceAll("\n","");
+ output = StringUtils.replace(compare,"\r","");
+ output = StringUtils.replace(output,"\n","");
assertEquals(compare, output);
}
@@ -645,8 +646,8 @@
}
//fix for introduced carriage return / line feeds
- output = compare.replaceAll("\r","");
- output = compare.replaceAll("\n","");
+ output = StringUtils.replace(compare,"\r","");
+ output = StringUtils.replace(output,"\n","");
assertEquals(compare, output);
}
@@ -693,8 +694,8 @@
}
//fix for introduced carriage return / line feeds
- output = compare.replaceAll("\r","");
- output = compare.replaceAll("\n","");
+ output = StringUtils.replace(compare,"\r","");
+ output = StringUtils.replace(output,"\n","");
assertEquals(compare, output);
}
@@ -741,8 +742,8 @@
}
//fix for introduced carriage return / line feeds
- output = compare.replaceAll("\r","");
- output = compare.replaceAll("\n","");
+ output = StringUtils.replace(compare,"\r","");
+ output = StringUtils.replace(output,"\n","");
assertEquals(compare, output);
}
@@ -802,8 +803,8 @@
}
//fix for introduced carriage return / line feeds
- output = compare.replaceAll("\r","");
- output = compare.replaceAll("\n","");
+ output = StringUtils.replace(compare,"\r","");
+ output = StringUtils.replace(output,"\n","");
assertEquals(compare, output);
}
@@ -849,8 +850,8 @@
}
//fix for introduced carriage return / line feeds
- output = compare.replaceAll("\r","");
- output = compare.replaceAll("\n","");
+ output = StringUtils.replace(compare,"\r","");
+ output = StringUtils.replace(output,"\n","");
assertEquals(compare, output);
}
@@ -896,8 +897,8 @@
}
//fix for introduced carriage return / line feeds
- output = compare.replaceAll("\r","");
- output = compare.replaceAll("\n","");
+ output = StringUtils.replace(compare,"\r","");
+ output = StringUtils.replace(output,"\n","");
assertEquals(compare, output);
}
@@ -960,8 +961,8 @@
}
//fix for introduced carriage return / line feeds
- output = compare.replaceAll("\r","");
- output = compare.replaceAll("\n","");
+ output = StringUtils.replace(compare,"\r","");
+ output = StringUtils.replace(output,"\n","");
assertEquals(compare, output);
}
@@ -1011,8 +1012,8 @@
}
//fix for introduced carriage return / line feeds
- output = compare.replaceAll("\r","");
- output = compare.replaceAll("\n","");
+ output = StringUtils.replace(compare,"\r","");
+ output = StringUtils.replace(output,"\n","");
assertEquals(compare, output);
}
@@ -1062,8 +1063,8 @@
}
//fix for introduced carriage return / line feeds
- output = compare.replaceAll("\r","");
- output = compare.replaceAll("\n","");
+ output = StringUtils.replace(compare,"\r","");
+ output = StringUtils.replace(output,"\n","");
assertEquals(compare, output);
}
@@ -1128,9 +1129,9 @@
}
//fix for introduced carriage return / line feeds
- output = compare.replaceAll("\r","");
- output = compare.replaceAll("\n","");
-
+ output = StringUtils.replace(compare,"\r","");
+ output = StringUtils.replace(output,"\n","");
+
assertEquals(compare, output);
}
@@ -1180,8 +1181,8 @@
}
//fix for introduced carriage return / line feeds
- output = compare.replaceAll("\r","");
- output = compare.replaceAll("\n","");
+ output = StringUtils.replace(compare,"\r","");
+ output = StringUtils.replace(output,"\n","");
assertEquals(compare, output);
}
@@ -1232,8 +1233,8 @@
}
//fix for introduced carriage return / line feeds
- output = compare.replaceAll("\r","");
- output = compare.replaceAll("\n","");
+ output = StringUtils.replace(compare,"\r","");
+ output = StringUtils.replace(output,"\n","");
assertEquals(compare, output);
}
@@ -1298,8 +1299,8 @@
}
//fix for introduced carriage return / line feeds
- output = compare.replaceAll("\r","");
- output = compare.replaceAll("\n","");
+ output = StringUtils.replace(compare,"\r","");
+ output = StringUtils.replace(output,"\n","");
assertEquals(compare, output);
}
@@ -1354,9 +1355,9 @@
}
//fix for introduced carriage return / line feeds
- output = compare.replaceAll("\r","");
- output = compare.replaceAll("\n","");
-
+ output = StringUtils.replace(compare,"\r","");
+ output = StringUtils.replace(output,"\n","");
+
assertEquals(compare, output);
}
@@ -1410,8 +1411,8 @@
}
//fix for introduced carriage return / line feeds
- output = compare.replaceAll("\r","");
- output = compare.replaceAll("\n","");
+ output = StringUtils.replace(compare,"\r","");
+ output = StringUtils.replace(output,"\n","");
assertEquals(compare, output);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: struts-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: struts-dev-help@jakarta.apache.org