Author: jmitchell
Date: Fri Oct 15 18:39:50 2004
New Revision: 54901
Modified:
struts/trunk/src/test/org/apache/struts/taglib/bean/TestDefineTag.java
struts/trunk/src/test/org/apache/struts/taglib/bean/TestHeaderTag.java
struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag_fr.java
struts/trunk/src/test/org/apache/struts/taglib/bean/TestResourceTag.java
struts/trunk/src/test/org/apache/struts/taglib/bean/TestWriteTag.java
Log:
Removing dependency on commons-lang
Modified: struts/trunk/src/test/org/apache/struts/taglib/bean/TestDefineTag.java
==============================================================================
--- struts/trunk/src/test/org/apache/struts/taglib/bean/TestDefineTag.java
(original)
+++ struts/trunk/src/test/org/apache/struts/taglib/bean/TestDefineTag.java Fri
Oct 15 18:39:50 2004
@@ -1,7 +1,7 @@
/*
* $Header:
/home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestDefineTag.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.
*
@@ -20,20 +20,20 @@
package org.apache.struts.taglib.bean;
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.util.LabelValueBean;
-import org.apache.commons.lang.StringUtils;
+import org.apache.struts.taglib.TaglibTestBase;
/**
* Suite of unit tests for the
* <code>org.apache.struts.taglib.bean.DefineTag</code> class.
*
*/
-public class TestDefineTag extends JspTestCase {
+public class TestDefineTag extends TaglibTestBase {
protected final static String TEST_KEY = "TestDefineTag";
protected final static String TEST_VALUE = "Test Value";
@@ -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();
assertEquals(compare, output);
}
Modified: struts/trunk/src/test/org/apache/struts/taglib/bean/TestHeaderTag.java
==============================================================================
--- struts/trunk/src/test/org/apache/struts/taglib/bean/TestHeaderTag.java
(original)
+++ struts/trunk/src/test/org/apache/struts/taglib/bean/TestHeaderTag.java Fri
Oct 15 18:39:50 2004
@@ -1,7 +1,7 @@
/*
* $Header:
/home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestHeaderTag.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,17 +22,16 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.cactus.JspTestCase;
import org.apache.cactus.WebRequest;
import org.apache.cactus.WebResponse;
-import org.apache.commons.lang.StringUtils;
+import org.apache.struts.taglib.TaglibTestBase;
/**
* Suite of unit tests for the
* <code>org.apache.struts.taglib.bean.HeaderTag</code> class.
*
*/
-public class TestHeaderTag extends JspTestCase {
+public class TestHeaderTag extends TaglibTestBase {
protected final static String HEADER_KEY = "HEADER_KEY";
protected final static String HEADER_VAL = "HEADER_VAL";
@@ -71,8 +70,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();
assertEquals(compare, output);
}
Modified: struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag_fr.java
==============================================================================
--- struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag_fr.java
(original)
+++ struts/trunk/src/test/org/apache/struts/taglib/bean/TestMessageTag_fr.java Fri
Oct 15 18:39:50 2004
@@ -1,7 +1,7 @@
/*
* $Header:
/home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestMessageTag_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 TestMessageTag_fr extends JspTestCase {
+public class TestMessageTag_fr extends TaglibTestBase {
protected final static String TEST_KEY = "BeanKey";
protected final static String TEST_VAL_FR = "Message D'Essai";
@@ -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/TestResourceTag.java
==============================================================================
--- struts/trunk/src/test/org/apache/struts/taglib/bean/TestResourceTag.java
(original)
+++ struts/trunk/src/test/org/apache/struts/taglib/bean/TestResourceTag.java Fri
Oct 15 18:39:50 2004
@@ -1,7 +1,7 @@
/*
* $Header:
/home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestResourceTag.java,v
1.8 2004/03/14 06:23:48 sraeburn Exp $
* $Revision: 1.8 $
- * $Date: 2004/03/14 06:23:48 $
+ * $Date$
*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -22,19 +22,19 @@
import java.io.IOException;
import javax.servlet.ServletException;
+
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.cactus.JspTestCase;
import org.apache.cactus.WebResponse;
-import org.apache.commons.lang.StringUtils;
+import org.apache.struts.taglib.TaglibTestBase;
/**
* Suite of unit tests for the
* <code>org.apache.struts.taglib.bean.ResourceTag</code> class.
*
*/
-public class TestResourceTag extends JspTestCase {
+public class TestResourceTag extends TaglibTestBase {
/**
* Defines the testcase name for JUnit.
@@ -66,8 +66,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/TestWriteTag.java
==============================================================================
--- struts/trunk/src/test/org/apache/struts/taglib/bean/TestWriteTag.java
(original)
+++ struts/trunk/src/test/org/apache/struts/taglib/bean/TestWriteTag.java Fri
Oct 15 18:39:50 2004
@@ -1,7 +1,7 @@
/*
* $Header:
/home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestWriteTag.java,v
1.12 2004/03/14 06:23:48 sraeburn Exp $
* $Revision: 1.12 $
- * $Date: 2004/03/14 06:23:48 $
+ * $Date$
*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -22,22 +22,22 @@
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.struts.taglib.TagUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.struts.taglib.TaglibTestBase;
/**
* Suite of unit tests for the
* <code>org.apache.struts.taglib.bean.WriteTag</code> class.
*
*/
-public class TestWriteTag extends JspTestCase {
+public class TestWriteTag extends TaglibTestBase {
protected final static String TEST_STRING_VAL = "Test Value";
protected final static Integer TEST_INTEGER_VAL = new Integer("1234");
protected final static Double TEST_DOUBLE_VAL = new Double("1234.5961");
@@ -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);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
