Author: jmitchell
Date: Fri Oct 15 18:49:29 2004
New Revision: 54903
Modified:
struts/trunk/web/test/test/org/apache/struts/taglib/html/TestFormTag1.jsp
Log:
Removing dependency on commons-lang
Modified: struts/trunk/web/test/test/org/apache/struts/taglib/html/TestFormTag1.jsp
==============================================================================
--- struts/trunk/web/test/test/org/apache/struts/taglib/html/TestFormTag1.jsp
(original)
+++ struts/trunk/web/test/test/org/apache/struts/taglib/html/TestFormTag1.jsp Fri
Oct 15 18:49:29 2004
@@ -1,5 +1,6 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<[EMAIL PROTECTED] import="junit.framework.Assert"%>
+<[EMAIL PROTECTED] import="org.apache.struts.taglib.TaglibTestBase"%>
+<[EMAIL PROTECTED] import="org.apache.oro.text.perl.Perl5Util"%>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
@@ -55,6 +56,7 @@
focusControl.focus();
}
// -->
+
</script>
</bean:define>
</logic:equal>
@@ -221,8 +223,8 @@
String compareTo = (String) pageContext.getAttribute("TEST_RESULTS");
if ((expected == null) || (expected == null)){
- Assert.fail("An invalid (or mispelled) test on this page was called. Please
verify that you've setup the tests (and spellings) correctly.");
+ TaglibTestBase.fail("An invalid (or mispelled) test on this page was called.
Please verify that you've setup the tests (and spellings) correctly.");
}
-
-Assert.assertEquals(expected, compareTo);
+
+TaglibTestBase.assertResults(expected, compareTo);
%>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
