Author: jmitchell
Date: Fri Oct 15 18:36:38 2004
New Revision: 54894
Modified:
struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag1.java
struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag1_fr.java
struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag2.java
struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag2_fr.java
struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag3.java
struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag3_fr.java
struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag4.java
struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag4_fr.java
Log:
Removing dependency on commons-lang
Modified: struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag1.java
==============================================================================
--- struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag1.java
(original)
+++ struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag1.java Fri
Oct 15 18:36:38 2004
@@ -1,7 +1,7 @@
/*
* $Header:
/home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestMessageTag1.java,v
1.10 2004/03/14 06:23:48 sraeburn Exp $
* $Revision: 1.10 $
- * $Date: 2004/03/14 06:23:48 $
+ * $Date$
*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -22,14 +22,14 @@
import java.util.Locale;
import javax.servlet.jsp.PageContext;
+
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.cactus.JspTestCase;
import org.apache.cactus.WebResponse;
import org.apache.struts.Globals;
import org.apache.struts.taglib.SimpleBeanForTesting;
-import org.apache.commons.lang.StringUtils;
+import org.apache.struts.taglib.TaglibTestBase;
/**
* These tests attempt to cover every single possible configuration of the
@@ -42,7 +42,7 @@
* checked here in endXXX method.
*
*/
-public class TestMessageTag1 extends JspTestCase {
+public class TestMessageTag1 extends TaglibTestBase {
protected final static String TEST_KEY = "BeanKey";
protected final static String TEST_VAL = "Testing Message 1";
@@ -72,8 +72,8 @@
private void formatAndTest(String compare, String output) {
//fix for introduced carriage return / line feeds
- output = StringUtils.replace(output,"\r","");
- output = StringUtils.replace(output,"\n","");
+ output = replace(output,"\r","");
+ output = replace(output,"\n","");
output = output.trim();
//System.out.println("Testing [" + compare + "] == [" + output + "]");
assertEquals(compare, output);
Modified: struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag1_fr.java
==============================================================================
--- struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag1_fr.java
(original)
+++ struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag1_fr.java Fri
Oct 15 18:36:38 2004
@@ -1,7 +1,7 @@
/*
* $Header:
/home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestMessageTag1_fr.java,v
1.10 2004/03/14 06:23:48 sraeburn Exp $
* $Revision: 1.10 $
- * $Date: 2004/03/14 06:23:48 $
+ * $Date$
*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -22,14 +22,14 @@
import java.util.Locale;
import javax.servlet.jsp.PageContext;
+
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.cactus.JspTestCase;
import org.apache.cactus.WebResponse;
import org.apache.struts.Globals;
import org.apache.struts.taglib.SimpleBeanForTesting;
-import org.apache.commons.lang.StringUtils;
+import org.apache.struts.taglib.TaglibTestBase;
/**
* These tests attempt to cover every single possible configuration of the
@@ -42,7 +42,7 @@
* checked here in endXXX method.
*
*/
-public class TestMessageTag1_fr extends JspTestCase {
+public class TestMessageTag1_fr extends TaglibTestBase {
protected final static String TEST_KEY = "BeanKey";
protected final static String TEST_VAL_FR = "Message D'Essai 1";
@@ -76,8 +76,8 @@
private void formatAndTest(String compare, String output) {
//fix for introduced carriage return / line feeds
- output = StringUtils.replace(output,"\r","");
- output = StringUtils.replace(output,"\n","");
+ output = replace(output,"\r","");
+ output = replace(output,"\n","");
output = output.trim();
//System.out.println("Testing [" + compare + "] == [" + output + "]");
assertEquals(compare, output);
Modified: struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag2.java
==============================================================================
--- struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag2.java
(original)
+++ struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag2.java Fri
Oct 15 18:36:38 2004
@@ -1,7 +1,7 @@
/*
* $Header:
/home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestMessageTag2.java,v
1.10 2004/03/14 06:23:48 sraeburn Exp $
* $Revision: 1.10 $
- * $Date: 2004/03/14 06:23:48 $
+ * $Date$
*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -22,14 +22,14 @@
import java.util.Locale;
import javax.servlet.jsp.PageContext;
+
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.cactus.JspTestCase;
import org.apache.cactus.WebResponse;
import org.apache.struts.Globals;
import org.apache.struts.taglib.SimpleBeanForTesting;
-import org.apache.commons.lang.StringUtils;
+import org.apache.struts.taglib.TaglibTestBase;
/**
* These tests attempt to cover every single possible configuration of the
@@ -42,7 +42,7 @@
* checked here in endXXX method.
*
*/
-public class TestMessageTag2 extends JspTestCase {
+public class TestMessageTag2 extends TaglibTestBase {
protected final static String TEST_KEY = "BeanKey";
protected final static String TEST_VAL = "Testing Message 1 2";
@@ -77,8 +77,8 @@
private void formatAndTest(String compare, String output) {
//fix for introduced carriage return / line feeds
- output = StringUtils.replace(output,"\r","");
- output = StringUtils.replace(output,"\n","");
+ output = replace(output,"\r","");
+ output = replace(output,"\n","");
output = output.trim();
//System.out.println("Testing [" + compare + "] == [" + output + "]");
assertEquals(compare, output);
Modified: struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag2_fr.java
==============================================================================
--- struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag2_fr.java
(original)
+++ struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag2_fr.java Fri
Oct 15 18:36:38 2004
@@ -1,7 +1,7 @@
/*
* $Header:
/home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestMessageTag2_fr.java,v
1.10 2004/03/14 06:23:48 sraeburn Exp $
* $Revision: 1.10 $
- * $Date: 2004/03/14 06:23:48 $
+ * $Date$
*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -22,14 +22,14 @@
import java.util.Locale;
import javax.servlet.jsp.PageContext;
+
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.cactus.JspTestCase;
import org.apache.cactus.WebResponse;
import org.apache.struts.Globals;
import org.apache.struts.taglib.SimpleBeanForTesting;
-import org.apache.commons.lang.StringUtils;
+import org.apache.struts.taglib.TaglibTestBase;
/**
* These tests attempt to cover every single possible configuration of the
@@ -42,7 +42,7 @@
* checked here in endXXX method.
*
*/
-public class TestMessageTag2_fr extends JspTestCase {
+public class TestMessageTag2_fr extends TaglibTestBase {
protected final static String TEST_KEY = "BeanKey";
protected final static String TEST_VAL_FR = "Message D'Essai 1 2";
@@ -77,8 +77,8 @@
private void formatAndTest(String compare, String output) {
//fix for introduced carriage return / line feeds
- output = StringUtils.replace(output,"\r","");
- output = StringUtils.replace(output,"\n","");
+ output = replace(output,"\r","");
+ output = replace(output,"\n","");
output = output.trim();
//System.out.println("Testing [" + compare + "] == [" + output + "]");
assertEquals(compare, output);
Modified: struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag3.java
==============================================================================
--- struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag3.java
(original)
+++ struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag3.java Fri
Oct 15 18:36:38 2004
@@ -1,7 +1,7 @@
/*
* $Header:
/home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestMessageTag3.java,v
1.10 2004/03/14 06:23:48 sraeburn Exp $
* $Revision: 1.10 $
- * $Date: 2004/03/14 06:23:48 $
+ * $Date$
*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -22,14 +22,14 @@
import java.util.Locale;
import javax.servlet.jsp.PageContext;
+
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.cactus.JspTestCase;
import org.apache.cactus.WebResponse;
import org.apache.struts.Globals;
import org.apache.struts.taglib.SimpleBeanForTesting;
-import org.apache.commons.lang.StringUtils;
+import org.apache.struts.taglib.TaglibTestBase;
/**
* These tests attempt to cover every single possible configuration of the
@@ -42,7 +42,7 @@
* checked here in endXXX method.
*
*/
-public class TestMessageTag3 extends JspTestCase {
+public class TestMessageTag3 extends TaglibTestBase {
protected final static String TEST_KEY = "BeanKey";
protected final static String TEST_VAL = "Testing Message 1 2 3";
@@ -77,8 +77,8 @@
private void formatAndTest(String compare, String output) {
//fix for introduced carriage return / line feeds
- output = StringUtils.replace(output,"\r","");
- output = StringUtils.replace(output,"\r","");
+ output = replace(output,"\r","");
+ output = replace(output,"\r","");
output = output.trim();
//System.out.println("Testing [" + compare + "] == [" + output + "]");
assertEquals(compare, output);
Modified: struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag3_fr.java
==============================================================================
--- struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag3_fr.java
(original)
+++ struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag3_fr.java Fri
Oct 15 18:36:38 2004
@@ -1,7 +1,7 @@
/*
* $Header:
/home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestMessageTag3_fr.java,v
1.10 2004/03/14 06:23:48 sraeburn Exp $
* $Revision: 1.10 $
- * $Date: 2004/03/14 06:23:48 $
+ * $Date$
*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -22,14 +22,14 @@
import java.util.Locale;
import javax.servlet.jsp.PageContext;
+
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.cactus.JspTestCase;
import org.apache.cactus.WebResponse;
import org.apache.struts.Globals;
import org.apache.struts.taglib.SimpleBeanForTesting;
-import org.apache.commons.lang.StringUtils;
+import org.apache.struts.taglib.TaglibTestBase;
/**
* These tests attempt to cover every single possible configuration of the
@@ -42,7 +42,7 @@
* checked here in endXXX method.
*
*/
-public class TestMessageTag3_fr extends JspTestCase {
+public class TestMessageTag3_fr extends TaglibTestBase {
protected final static String TEST_KEY = "BeanKey";
protected final static String TEST_VAL_FR = "Message D'Essai 1 2 3";
@@ -77,8 +77,8 @@
private void formatAndTest(String compare, String output) {
//fix for introduced carriage return / line feeds
- output = StringUtils.replace(output,"\r","");
- output = StringUtils.replace(output,"\n","");
+ output = replace(output,"\r","");
+ output = replace(output,"\n","");
output = output.trim();
//System.out.println("Testing [" + compare + "] == [" + output + "]");
assertEquals(compare, output);
Modified: struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag4.java
==============================================================================
--- struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag4.java
(original)
+++ struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag4.java Fri
Oct 15 18:36:38 2004
@@ -1,7 +1,7 @@
/*
* $Header:
/home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestMessageTag4.java,v
1.10 2004/03/14 06:23:48 sraeburn Exp $
* $Revision: 1.10 $
- * $Date: 2004/03/14 06:23:48 $
+ * $Date$
*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -22,14 +22,14 @@
import java.util.Locale;
import javax.servlet.jsp.PageContext;
+
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.cactus.JspTestCase;
import org.apache.cactus.WebResponse;
import org.apache.struts.Globals;
import org.apache.struts.taglib.SimpleBeanForTesting;
-import org.apache.commons.lang.StringUtils;
+import org.apache.struts.taglib.TaglibTestBase;
/**
* These tests attempt to cover every single possible configuration of the
@@ -42,7 +42,7 @@
* checked here in endXXX method.
*
*/
-public class TestMessageTag4 extends JspTestCase {
+public class TestMessageTag4 extends TaglibTestBase {
protected final static String TEST_KEY = "BeanKey";
protected final static String TEST_VAL = "Testing Message 1 2 3 4";
@@ -77,8 +77,8 @@
private void formatAndTest(String compare, String output) {
//fix for introduced carriage return / line feeds
- output = StringUtils.replace(output,"\r","");
- output = StringUtils.replace(output,"\n","");
+ output = replace(output,"\r","");
+ output = replace(output,"\n","");
output = output.trim();
//System.out.println("Testing [" + compare + "] == [" + output + "]");
assertEquals(compare, output);
Modified: struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag4_fr.java
==============================================================================
--- struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag4_fr.java
(original)
+++ struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag4_fr.java Fri
Oct 15 18:36:38 2004
@@ -1,7 +1,7 @@
/*
* $Header:
/home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestMessageTag4_fr.java,v
1.10 2004/03/14 06:23:48 sraeburn Exp $
* $Revision: 1.10 $
- * $Date: 2004/03/14 06:23:48 $
+ * $Date$
*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -22,14 +22,14 @@
import java.util.Locale;
import javax.servlet.jsp.PageContext;
+
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.cactus.JspTestCase;
import org.apache.cactus.WebResponse;
import org.apache.struts.Globals;
import org.apache.struts.taglib.SimpleBeanForTesting;
-import org.apache.commons.lang.StringUtils;
+import org.apache.struts.taglib.TaglibTestBase;
/**
* These tests attempt to cover every single possible configuration of the
@@ -42,7 +42,7 @@
* checked here in endXXX method.
*
*/
-public class TestMessageTag4_fr extends JspTestCase {
+public class TestMessageTag4_fr extends TaglibTestBase {
protected final static String TEST_KEY = "BeanKey";
protected final static String TEST_VAL_FR = "Message D'Essai 1 2 3 4";
@@ -77,8 +77,8 @@
private void formatAndTest(String compare, String output) {
//fix for introduced carriage return / line feeds
- output = StringUtils.replace(output,"\r","");
- output = StringUtils.replace(output,"\n","");
+ output = replace(output,"\r","");
+ output = replace(output,"\n","");
output = output.trim();
//System.out.println("Testing [" + compare + "] == [" + output + "]");
assertEquals(compare, output);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
