hrmmmm.....now this is getting more interesting by the minute. Think I'll try to force the issue.
-- James Mitchell ----- Original Message ----- From: <[EMAIL PROTECTED]> To: <[EMAIL PROTECTED]> Sent: Wednesday, February 05, 2003 12:27 AM Subject: cvs commit: jakarta-struts/src/test/org/apache/struts/taglib/logic TestPresentTag.java > jmitchell 2003/02/04 21:27:21 > > Modified: src/test/org/apache/struts/taglib/logic TestPresentTag.java > Log: > Added 2 new tests: > testApplicationScopeParameterPresent > testApplicationScopeParameterNotPresent > > Revision Changes Path > 1.7 +1 -1 jakarta-struts/src/test/org/apache/struts/taglib/logic/TestPresentTag.java > > Index: TestPresentTag.java > =================================================================== > RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/logic/TestPresent Tag.java,v > retrieving revision 1.6 > retrieving revision 1.7 > diff -u -r1.6 -r1.7 > --- TestPresentTag.java 5 Feb 2003 05:20:45 -0000 1.6 > +++ TestPresentTag.java 5 Feb 2003 05:27:21 -0000 1.7 > @@ -1 +1 @@ > -/* * The Apache Software License, Version 1.1 * * Copyright (c) 1999-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. * * 3. The end-user documentation included with the redistribution, if * any, must include the following acknowlegement: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowlegement may appear in the software itself, * if and wherever such third-party acknowlegements normally appear. * * 4. The names "The Jakarta Project", "Struts", and "Apache Software * Foundation" must not be used to endorse or promote products derived * from this software without prior written permission. For written * permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called "Apache" * nor may "Apache" appear in their names without prior written * permission of the Apache Group. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * ==================================================================== * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * <http://www.apache.org/>. * */package org.apache.struts.taglib.logic;import javax.servlet.ServletException;import javax.servlet.jsp.PageContext;import junit.framework.Test;import junit.framework.TestSuite;import org.apache.cactus.JspTestCase;import org.apache.cactus.WebRequest;/** * Suite of unit tests for the * <code>org.apache.struts.taglib.logic.PresentTag</code> class. * * @author David Winterfeldt */public class TestPresentTag extends JspTestCase { protected final static String COOKIE_KEY = "org.apache.struts.taglib.logic.COOKIE_KEY"; protected final static String HEADER_KEY = "org.apache.struts.taglib.logic.HEADER_KEY"; protected final static String PARAMETER_KEY = "org.apache.struts.taglib.logic.PARAMETER_KEY"; /** * Defines the testcase name for JUnit. * * @param theName the testcase's name. */ public TestPresentTag(String theName) { super(theName); } /** * Start the tests. * * @param theArgs the arguments. Not used */ public static void main(String[] theArgs) { junit.awtui.TestRunner.main(new String[] stPresentTag.class.getName()}); } /** * @return a test suite (<code>TestSuite</code>) that includes all methods * starting with "test" */ public static Test suite() { // All methods starting with "test" will be executed in the test suite. return new TestSuite(TestPresentTag.class); } //----- Test initApplication() method -------------------------------------- /** * Verify that there is an application scope object in scope using the <code>PresentTag</code>. */ public void testApplicationScopeObjectPresent() throws ServletException, javax.servlet.jsp.JspException { PresentTag pt = new PresentTag(); String testKey = "testApplicationScopePresent"; String testStringValue = "abc"; pageContext.setAttribute(testKey, testStringValue, PageContext.APPLICATION_SCOPE); pt.setPageContext(pageContext); pt.setName(testKey); pt.setScope("application"); assertEquals("Value present (not null)", true, pt.condition(true)); } /** * Verify that there is an application scope object is not in scope using the <code>PresentTag</code>. */ public void testApplicationScopeObjectNotPresent() throws ServletException, javax.servlet.jsp.JspException { PresentTag pt = new PresentTag(); String testKey = "testApplicationScopeNotPresent"; pt.setPageContext(pageContext); pt.setName(testKey); pt.setScope("application"); assertEquals("Value not present (null)", false, pt.condition(true)); } /** * Verify that there is an session scope object in scope using the <code>PresentTag</code>. */ public void testSessionScopeObjectPresent() throws ServletException, javax.servlet.jsp.JspException { PresentTag pt = new PresentTag(); String testKey = "testSessionScopePresent"; String testStringValue = "abc"; pageContext.setAttribute(testKey, testStringValue, PageContext.SESSION_SCOPE); pt.setPageContext(pageContext); pt.setName(testKey); pt.setScope("session"); assertEquals("Value present (not null)", true, pt.condition(true)); } /** * Verify that there is an session scope object is not in scope using the <code>PresentTag</code>. */ public void testSessionScopeObjectNotPresent() throws ServletException, javax.servlet.jsp.JspException { PresentTag pt = new PresentTag(); String testKey = "testSessionScopeNotPresent"; pt.setPageContext(pageContext); pt.setName(testKey); pt.setScope("session"); assertEquals("Value present (not null)", false, pt.condition(true)); } /** * Verify that there is an request scope object in scope using the <code>PresentTag</code>. */ public void testRequestScopeObjectPresent() throws ServletException, javax.servlet.jsp.JspException { PresentTag pt = new PresentTag(); String testKey = "testRequestScopePresent"; String testStringValue = "abc"; pt.setScope("request"); pageContext.setAttribute(testKey, testStringValue, PageContext.REQUEST_SCOPE); pt.setPageContext(pageContext); pt.setName(testKey); assertEquals("Value present (not null)", true, pt.condition(true)); } /** * Verify that there is an request scope object is not in scope using the <code>PresentTag</code>. */ public void testRequestScopeObjectNotPresent() throws ServletException, javax.servlet.jsp.JspException { PresentTag pt = new PresentTag(); String testKey = "testRequestScopeNotPresent"; pt.setPageContext(pageContext); pt.setName(testKey); pt.setScope("request"); assertEquals("Value not present (null)", false, pt.condition(true)); } /** * Verify that there is an page scope object in scope using the <code>PresentTag</code>. */ public void testPageScopeObjectPresent() throws ServletException, javax.servlet.jsp.JspException { PresentTag pt = new PresentTag(); String testKey = "testPageScopePresent"; String testStringValue = "abc"; pt.setScope("page"); pageContext.setAttribute(testKey, testStringValue, PageContext.PAGE_SCOPE); pt.setPageContext(pageContext); pt.setName(testKey); assertEquals("Value present (not null)", true, pt.condition(true)); } /** * Verify that there is an page scope object is not in scope using the <code>PresentTag</code>. */ public void testPageScopeObjectNotPresent() throws ServletException, javax.servlet.jsp.JspException { PresentTag pt = new PresentTag(); String testKey = "testPageScopeNotPresent"; pt.setPageContext(pageContext); pt.setName(testKey); pt.setScope("page"); assertEquals("Value not present (null)", false, pt.condition(true)); } /** * Create cookie for testCookiePresent method test. */ public void beginCookiePresent(WebRequest testRequest) { testRequest.addCookie(COOKIE_KEY, "cookie value"); } /** * Verify that there is an cookie using the <code>PresentTag</code>. */ public void testCookiePresent() throws ServletException, javax.servlet.jsp.JspException { PresentTag pt = new PresentTag(); pt.setPageContext(pageContext); pt.setCookie(COOKIE_KEY); assertEquals("Cookie present", true, pt.condition(true)); } /** * Verify that there isn't an cookie using the <code>PresentTag</code>. */ public void testCookieNotPresent() throws ServletException, javax.servlet.jsp.JspException { PresentTag pt = new PresentTag(); pt.setPageContext(pageContext); pt.setCookie(COOKIE_KEY); assertEquals("Cookie not present", false, pt.condition(true)); } /** * Create header for testHeaderPresent method test. */ public void beginHeaderPresent(WebRequest testRequest) { testRequest.addHeader(HEADER_KEY, "header value"); } /** * Verify that there is an header using the <code>PresentTag</code>. */ public void testHeaderPresent() throws ServletException, javax.servlet.jsp.JspException { PresentTag pt = new PresentTag(); pt.setPageContext(pageContext); pt.setHeader(HEADER_KEY); assertEquals("Header present", true, pt.condition(true)); } /** * Verify that there isn't an header using the <code>PresentTag</code>. */ public void testHeaderNotPresent() throws ServletException, javax.servlet.jsp.JspException { PresentTag pt = new PresentTag(); pt.setPageContext(pageContext); pt.setHeader(HEADER_KEY); assertEquals("Header not present", false, pt.condition(true)); } /** * Create parameter for testParameterPresent method test. */ public void beginParameterPresent(WebRequest testRequest) { testRequest.addParameter(PARAMETER_KEY, "parameter value"); } /** * Verify that there is an parameter using the <code>PresentTag</code>. */ public void testParameterPresent() throws ServletException, javax.servlet.jsp.JspException { PresentTag pt = new PresentTag(); pt.setPageContext(pageContext); pt.setParameter(PARAMETER_KEY); assertEquals("Parameter present", true, pt.condition(true)); } /** * Verify that there isn't an parameter using the <code>PresentTag</code>. */ public void testParameterNotPresent() throws ServletException, javax.servlet.jsp.JspException { PresentTag pt = new PresentTag(); pt.setPageContext(pageContext); pt.setParameter(PARAMETER_KEY); assertEquals("Parameter not present", false, ition(true)); } } > \ No newline at end of file > +/* * The Apache Software License, Version 1.1 * * Copyright (c) 1999-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. * * 3. The end-user documentation included with the redistribution, if * any, must include the following acknowlegement: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowlegement may appear in the software itself, * if and wherever such third-party acknowlegements normally appear. * * 4. The names "The Jakarta Project", "Struts", and "Apache Software * Foundation" must not be used to endorse or promote products derived * from this software without prior written permission. For written * permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called "Apache" * nor may "Apache" appear in their names without prior written * permission of the Apache Group. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * ==================================================================== * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * <http://www.apache.org/>. * */package org.apache.struts.taglib.logic;import javax.servlet.ServletException;import javax.servlet.jsp.PageContext;import junit.framework.Test;import junit.framework.TestSuite;import org.apache.cactus.JspTestCase;import org.apache.cactus.WebRequest;import org.apache.struts.util.LabelValueBean;/** * Suite of unit tests for the * <code>org.apache.struts.taglib.logic.PresentTag</code> class. * * @author David Winterfeldt */public class TestPresentTag extends JspTestCase { protected final static String COOKIE_KEY = "org.apache.struts.taglib.logic.COOKIE_KEY"; protected final static String HEADER_KEY = "org.apache.struts.taglib.logic.HEADER_KEY"; protected final static String PARAMETER_KEY = "org.apache.struts.taglib.logic.PARAMETER_KEY"; /** * Defines the testcase name for JUnit. * * @param theName the testcase's name. */ public TestPresentTag(String theName) { super(theName); } /** * Start the tests. * * @param theArgs the arguments. Not used */ public static void main(String[] theArgs) { junit.awtui.TestRunner.main(new String[] stPresentTag.class.getName()}); } /** * @return a test suite (<code>TestSuite</code>) that includes all methods * starting with "test" */ public static Test suite() { // All methods starting with "test" will be executed in the test suite. return new TestSuite(TestPresentTag.class); } //----- Test initApplication() method -------------------------------------- /** * Verify that there is an application scope object in scope using the <code>PresentTag</code>. */ public void testApplicationScopeObjectPresent() throws ServletException, javax.servlet.jsp.JspException { PresentTag pt = new PresentTag(); String testKey = "testApplicationScopePresent"; String testStringValue = "abc"; pageContext.setAttribute(testKey, testStringValue, PageContext.APPLICATION_SCOPE); pt.setPageContext(pageContext); pt.setName(testKey); pt.setScope("application"); assertEquals("Value present (not null)", true, pt.condition(true)); } /** * Verify that there is an application scope object is not in scope using the <code>PresentTag</code>. */ public void testApplicationScopeObjectNotPresent() throws ServletException, javax.servlet.jsp.JspException { PresentTag pt = new PresentTag(); String testKey = "testApplicationScopeNotPresent"; pt.setPageContext(pageContext); pt.setName(testKey); pt.setScope("application"); assertEquals("Value not present (null)", false, pt.condition(true)); } /** * Verify that there is an session scope object in scope using the <code>PresentTag</code>. */ public void testSessionScopeObjectPresent() throws ServletException, javax.servlet.jsp.JspException { PresentTag pt = new PresentTag(); String testKey = "testSessionScopePresent"; String testStringValue = "abc"; pageContext.setAttribute(testKey, testStringValue, PageContext.SESSION_SCOPE); pt.setPageContext(pageContext); pt.setName(testKey); pt.setScope("session"); assertEquals("Value present (not null)", true, pt.condition(true)); } /** * Verify that there is an session scope object is not in scope using the <code>PresentTag</code>. */ public void testSessionScopeObjectNotPresent() throws ServletException, javax.servlet.jsp.JspException { PresentTag pt = new PresentTag(); String testKey = "testSessionScopeNotPresent"; pt.setPageContext(pageContext); pt.setName(testKey); pt.setScope("session"); assertEquals("Value present (not null)", false, pt.condition(true)); } /** * Verify that there is an request scope object in scope using the <code>PresentTag</code>. */ public void testRequestScopeObjectPresent() throws ServletException, javax.servlet.jsp.JspException { PresentTag pt = new PresentTag(); String testKey = "testRequestScopePresent"; String testStringValue = "abc"; pt.setScope("request"); pageContext.setAttribute(testKey, testStringValue, PageContext.REQUEST_SCOPE); pt.setPageContext(pageContext); pt.setName(testKey); assertEquals("Value present (not null)", true, pt.condition(true)); } /** * Verify that there is an request scope object is not in scope using the <code>PresentTag</code>. */ public void testRequestScopeObjectNotPresent() throws ServletException, javax.servlet.jsp.JspException { PresentTag pt = new PresentTag(); String testKey = "testRequestScopeNotPresent"; pt.setPageContext(pageContext); pt.setName(testKey); pt.setScope("request"); assertEquals("Value not present (null)", false, pt.condition(true)); } /** * Verify that there is an page scope object in scope using the <code>PresentTag</code>. */ public void testPageScopeObjectPresent() throws ServletException, javax.servlet.jsp.JspException { PresentTag pt = new PresentTag(); String testKey = "testPageScopePresent"; String testStringValue = "abc"; pt.setScope("page"); pageContext.setAttribute(testKey, testStringValue, PageContext.PAGE_SCOPE); pt.setPageContext(pageContext); pt.setName(testKey); assertEquals("Value present (not null)", true, pt.condition(true)); } /** * Verify that there is an page scope object is not in scope using the <code>PresentTag</code>. */ public void testPageScopeObjectNotPresent() throws ServletException, javax.servlet.jsp.JspException { PresentTag pt = new PresentTag(); String testKey = "testPageScopeNotPresent"; pt.setPageContext(pageContext); pt.setName(testKey); pt.setScope("page"); assertEquals("Value not present (null)", false, pt.condition(true)); } /** * Verify that there is a LabelValueBean in application scope * and test to see if it has a getValue() using the <code>PresentTag</code>. */ public void testApplicationScopeParameterPresent() throws ServletException, javax.servlet.jsp.JspException { PresentTag pt = new PresentTag(); String testKey = "testApplicationScopeParameterPresent"; String testStringValue = "The Value"; LabelValueBean lvb = new LabelValueBean("The Key", testStringValue); pageContext.setAttribute( testKey, lvb, PageContext.APPLICATION_SCOPE); pt.setPageContext(pageContext); pt.setName(testKey); pt.setScope("application"); pt.setParameter("value"); assertEquals("Parameter Value present (not null)", true, pt.condition(true)); } /** * Verify that there is an application scope object is not in scope using the <code>PresentTag</code>. */ public void testApplicationScopeParameterNotPresent() throws ServletException, javax.servlet.jsp.JspException { PresentTag pt = new PresentTag(); String testKey = "testApplicationScopeParameterNotPresent"; String testStringValue = null; //"The Value"; LabelValueBean lvb = new LabelValueBean("The Key", testStringValue); pageContext.setAttribute( testKey, lvb, PageContext.APPLICATION_SCOPE); pt.setPageContext(pageContext); pt.setName(testKey); pt.setScope("application"); pt.setParameter("value"); assertEquals("Parameter Value not present (null)", true, pt.condition(true)); } /** * Create cookie for testCookiePresent method test. */ public void beginCookiePresent(WebRequest testRequest) { testRequest.addCookie(COOKIE_KEY, "cookie value"); } /** * Verify that there is an cookie using the <code>PresentTag</code>. */ public void testCookiePresent() throws ServletException, javax.servlet.jsp.JspException { PresentTag pt = new PresentTag(); pt.setPageContext(pageContext); pt.setCookie(COOKIE_KEY); assertEquals("Cookie present", true, pt.condition(true)); } /** * Verify that there isn't an cookie using the <code>PresentTag</code>. */ public void testCookieNotPresent() throws ServletException, javax.servlet.jsp.JspException { PresentTag pt = new PresentTag(); pt.setPageContext(pageContext); pt.setCookie(COOKIE_KEY); assertEquals("Cookie not present", false, pt.condition(true)); } /** * Create header for testHeaderPresent method test. */ public void beginHeaderPresent(WebRequest testRequest) { testRequest.addHeader(HEADER_KEY, "header value"); } /** * Verify that there is an header using the <code>PresentTag</code>. */ public void testHeaderPresent() throws ServletException, javax.servlet.jsp.JspException { PresentTag pt = new PresentTag(); pt.setPageContext(pageContext); pt.setHeader(HEADER_KEY); assertEquals("Header present", true, pt.condition(true)); } /** * Verify that there isn't an header using the <code>PresentTag</code>. */ public void testHeaderNotPresent() throws ServletException, javax.servlet.jsp.JspException { PresentTag pt = new PresentTag(); pt.setPageContext(pageContext); pt.setHeader(HEADER_KEY); assertEquals("Header not present", false, pt.condition(true)); } /** * Create parameter for testParameterPresent method test. */ public void beginParameterPresent(WebRequest testRequest) { testRequest.addParameter(PARAMETER_KEY, "parameter value"); } /** * Verify that there is an parameter using the <code>PresentTag</code>. */ public void testParameterPresent() throws ServletException, javax.servlet.jsp.JspException { PresentTag pt = new PresentTag(); pt.setPageContext(pageContext); pt.setParameter(PARAMETER_KEY); assertEquals("Parameter present", true, pt.condition(true)); } /** * Verify that there isn't an parameter using the <code>PresentTag</code>. */ public void testParameterNotPresent() throws ServletException, javax.servlet.jsp.JspException { PresentTag pt = new PresentTag(); pt.setPageContext(pageContext); pt.setParameter(PARAMETER_KEY); assertEquals("Parameter not present", false, ition(true)); } } > \ No newline at end of file > > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] > > --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
