cvs commit: jakarta-struts/src/test/org/apache/struts/action TestActionMessage.java

2003-11-15 Thread dgraham 
dgraham 2003/11/15 13:25:05

  Modified:src/test/org/apache/struts/action TestActionMessage.java
  Log:
  Fixed bad message for PR#24190.  In fact, just removed the error 
  messages because they don't provide anything that the test doesn't 
  tell you.
  
  Revision  ChangesPath
  1.5   +9 -19 
jakarta-struts/src/test/org/apache/struts/action/TestActionMessage.java
  
  Index: TestActionMessage.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/test/org/apache/struts/action/TestActionMessage.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TestActionMessage.java15 Nov 2003 21:22:33 -  1.4
  +++ TestActionMessage.java15 Nov 2003 21:25:05 -  1.5
  @@ -116,24 +116,14 @@
   }
   
   public void testActionMessageWithNoValue() {
  -assertTrue(
  -"testActionMessageWithNoValue value is not null",
  -amWithNoValue.getValues() == null);
  -assertTrue(
  -"testActionMessageWithNoValue key is not amWithNoValue",
  -amWithNoValue.getKey() == "amWithNoValue");
  +assertTrue(amWithNoValue.getValues() == null);
  +assertTrue(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");
  +assertTrue(values != null);
  +assertTrue(values[0].equals("stringValue"));
  +assertTrue(amWithOneValue.getKey() == "amWithOneValue");
   }
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-struts/src/test/org/apache/struts/action TestActionMessage.java

2003-11-15 Thread dgraham 
dgraham 2003/11/15 13:22:33

  Modified:src/test/org/apache/struts/action TestActionMessage.java
  Log:
  Formatting changes only.
  
  Revision  ChangesPath
  1.4   +54 -44
jakarta-struts/src/test/org/apache/struts/action/TestActionMessage.java
  
  Index: TestActionMessage.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/test/org/apache/struts/action/TestActionMessage.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TestActionMessage.java7 Feb 2003 00:29:21 -   1.3
  +++ TestActionMessage.java15 Nov 2003 21:22:33 -  1.4
  @@ -1,7 +1,13 @@
   /*
  + * $Header$
  + * $Revision$
  + * $Date$
  + *
  + * 
  + * 
* The Apache Software License, Version 1.1
*
  - * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
  @@ -52,7 +58,9 @@
* .
*
*/
  +
   package org.apache.struts.action;
  +
   import junit.framework.Test;
   import junit.framework.TestCase;
   import junit.framework.TestSuite;
  @@ -63,67 +71,69 @@
* @author Dominique Plante
* @version $Revision$ $Date$
*/
  -
  -public class TestActionMessage extends TestCase
  -{
  - protected ActionMessage amWithNoValue = null;
  - protected ActionMessage amWithOneValue = null;
  +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);
  - }
  +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()});
  +public static void main(String[] theArgs) {
  +junit.awtui.TestRunner.main(
  +new String[] { TestActionMessage.class.getName()});
   }
   
   /**
* @return a test suite (TestSuite) that includes all methods
* starting with "test"
*/
  -public static Test suite()
  -{
  +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");
  - }
  +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(
  +"test

cvs commit: jakarta-struts/src/test/org/apache/struts/action TestActionMessage.java

2003-02-06 Thread jmitchell 
jmitchell2003/02/06 16:29:21

  Modified:src/test/org/apache/struts/action TestActionMessage.java
  Log:
  Fix \r\n problem
  
  Revision  ChangesPath
  1.3   +129 -129  
jakarta-struts/src/test/org/apache/struts/action/TestActionMessage.java
  
  Index: TestActionMessage.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/test/org/apache/struts/action/TestActionMessage.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestActionMessage.java16 Nov 2002 04:58:47 -  1.2
  +++ TestActionMessage.java7 Feb 2003 00:29:21 -   1.3
  @@ -1,129 +1,129 @@
  -/*
  - * 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
  - * .
  - *
  - */
  -
  -package org.apache.struts.action;
  -
  -import junit.framework.Test;
import junit.framework.TestCase;
import 
junit.framework.TestSuite;
  -
  -/**
  - * Unit tests for the org.apache.struts.action.ActionMessage class.
  - *
  - * @author Dominique Plante
  - * @version $Revision$ $Date$
  - */
  -
  -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 (TestSuite) 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 ActionMess

cvs commit: jakarta-struts/src/test/org/apache/struts/action TestActionMessage.java TestActionMessages.java

2002-06-22 Thread craigmcc 

craigmcc2002/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 
  
  Revision  ChangesPath
  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 -  1.3
  +++ build-tests.xml   22 Jun 2002 20:50:36 -  1.4
  @@ -227,9 +227,13 @@
   
   
   
  -
  -
  -
  +
  +
  +  
  +
  +  
  +
  +
   
   
 
  
  
  
  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
   * .
   *
   */
  
  package org.apache.struts.action;
  
  import junit.framework.*;
  
  /**
   * Unit tests for the org.apache.struts.action.ActionMessage 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 (TestSuite) that i