craigmcc 2002/06/22 13:50:36
Modified: . build-tests.xml
Added: src/test/org/apache/struts/action TestActionMessage.java
TestActionMessages.java
Log:
Add test cases for o.a.s.a.ActionMessage and o.a.s.a.ActionMessages.
PR: Bugzilla #10129 (thanks for the tests!!!!!)
Submitted by: Dominique Plante <dplante at pacbell.net>
Revision Changes Path
1.4 +7 -3 jakarta-struts/build-tests.xml
Index: build-tests.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build-tests.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build-tests.xml 16 Jun 2002 04:02:38 -0000 1.3
+++ build-tests.xml 22 Jun 2002 20:50:36 -0000 1.4
@@ -227,9 +227,13 @@
<formatter type="plain" usefile="false"/>
- <!-- Suite of tests -->
- <test name="org.apache.struts.action.TestActionServlet"/>
-
+ <!-- org.apache.struts.action package Tests -->
+ <batchtest fork="yes">
+ <fileset dir="${out.test.dir}/classes">
+ <include name="org/apache/struts/action/Test*.class" />
+ </fileset>
+ </batchtest>
+
<!-- Logic Taglib Tests -->
<batchtest fork="yes">
<fileset dir="${out.test.dir}/classes">
1.1
jakarta-struts/src/test/org/apache/struts/action/TestActionMessage.java
Index: TestActionMessage.java
===================================================================
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2002 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.action;
import junit.framework.*;
/**
* Unit tests for the <code>org.apache.struts.action.ActionMessage</code> class.
*
* @author Dominique Plante
* @version $Revision: 1.1 $ $Date: 2002/06/22 20:50:36 $
*/
public class TestActionMessage extends TestCase
{
protected ActionMessage amWithNoValue = null;
protected ActionMessage amWithOneValue = null;
/**
* Defines the testcase name for JUnit.
*
* @param theName the testcase's name.
*/
public TestActionMessage(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[]
{TestActionMessage.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(TestActionMessage.class);
}
public void setUp()
{
amWithNoValue = new ActionMessage("amWithNoValue");
amWithOneValue = new ActionMessage("amWithOneValue", new
String("stringValue"));
}
public void tearDown()
{
amWithNoValue = null;
}
public void testActionMessageWithNoValue()
{
assertTrue("testActionMessageWithNoValue value is not null",
amWithNoValue.getValues() == null);
assertTrue("testActionMessageWithNoValue key is not amWithNoValue",
amWithNoValue.getKey() == "amWithNoValue");
}
public void testActionMessageWithAStringValue()
{
Object [] values = amWithOneValue.getValues();
assertTrue("testActionMessageWithAStringValue value is not null",
values != null);
assertTrue("testActionMessageWithAStringValue value[0] is not the
string stringValue",
values[0].equals("stringValue"));
assertTrue("testActionMessageWithAStringValue key is not
amWithOneValue",
amWithOneValue.getKey() == "amWithOneValue");
}
}
1.1
jakarta-struts/src/test/org/apache/struts/action/TestActionMessages.java
Index: TestActionMessages.java
===================================================================
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2002 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.action;
import junit.framework.*;
import java.util.Iterator;
/**
* Unit tests for the <code>org.apache.struts.action.ActionMessages</code> class.
*
* @author Dominique Plante
* @version $Revision: 1.1 $ $Date: 2002/06/22 20:50:36 $
*/
public class TestActionMessages extends TestCase
{
protected ActionMessages aMsgs = null;
protected ActionMessages anMsgs = null;
protected ActionMessage msg1 = null;
protected ActionMessage msg2 = null;
protected ActionMessage msg3 = null;
protected ActionMessage msg4 = null;
protected ActionMessage msg5 = null;
/**
* Defines the testcase name for JUnit.
*
* @param theName the testcase's name.
*/
public TestActionMessages(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[]
{TestActionMessages.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(TestActionMessages.class);
}
public void setUp()
{
aMsgs = new ActionMessages();
anMsgs = new ActionMessages();
Object [] objs1 = new Object [] { "a", "b", "c", "d", "e" };
Object [] objs2 = new Object [] { "f", "g", "h", "i", "j" };
msg1 = new ActionMessage("aMessage", objs1);
msg2 = new ActionMessage("anMessage", objs2);
msg3 = new ActionMessage("msg3", "value1");
msg4 = new ActionMessage("msg4", "value2");
msg5 = new ActionMessage("msg5", "value3", "value4");
}
public void tearDown()
{
aMsgs = null;
}
public void testEmpty()
{
assertTrue("aMsgs is not empty!", aMsgs.empty());
}
public void testNotEmpty()
{
aMsgs.add("myProp", msg1);
assertTrue("aMsgs is empty!", aMsgs.empty()== false);
}
public void testSizeWithOneProperty()
{
aMsgs.add("myProp", msg1);
aMsgs.add("myProp", msg2);
assertTrue("number of meesages is not 2", aMsgs.size("myProp") == 2);
}
public void testSizeWithManyProperties()
{
aMsgs.add("myProp1", msg1);
aMsgs.add("myProp2", msg2);
aMsgs.add("myProp3", msg3);
aMsgs.add("myProp3", msg4);
aMsgs.add("myProp4", msg5);
assertTrue("number of messages for myProp1 is not 1",
aMsgs.size("myProp1") == 1);
assertTrue("number of messages", aMsgs.size() == 5);
}
public void testSizeAndEmptyAfterClear()
{
testSizeWithOneProperty();
aMsgs.clear();
testEmpty();
assertTrue("number of meesages is not 0", aMsgs.size("myProp") == 0);
}
public void testGetWithNoProperty()
{
Iterator it = aMsgs.get("myProp");
assertTrue("iterator is not empty!", it.hasNext() == false);
}
public void testGetForAProperty()
{
testSizeWithOneProperty();
Iterator it = aMsgs.get("myProp");
assertTrue("iterator is empty!", it.hasNext() == true);
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>