commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject cvs commit: jakarta-commons/beanutils/src/test/org/apache/commons/beanutils/locale/converters DateLocaleConverterTestCase.java
Date Sun, 12 Jan 2003 21:07:45 GMT
rdonkin     2003/01/12 13:07:45

  Modified:    beanutils build.xml
               beanutils/src/java/org/apache/commons/beanutils/locale/converters
                        DateLocaleConverter.java
  Added:       beanutils/src/test/org/apache/commons/beanutils/locale/converters
                        DateLocaleConverterTestCase.java
  Log:
  Fix for bug#15888. A lenient property was added to DateLocaleConverter that allows the lenient
property to be set on the DateFormat used to parse the convertion. Also added a test case.
  
  Revision  Changes    Path
  1.43      +19 -3     jakarta-commons/beanutils/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/beanutils/build.xml,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- build.xml	9 Jan 2003 03:16:29 -0000	1.42
  +++ build.xml	12 Jan 2003 21:07:45 -0000	1.43
  @@ -261,7 +261,8 @@
                                   test.method,
                                   test.dyna.result,
                                   test.dyna.row,
  -                                test.bean.comparator
  +                                test.bean.comparator,
  +                                test.locale.converters
                                  "
      description="Run all unit test cases">
     </target>
  @@ -417,7 +418,7 @@
       </java>
     </target>
   
  -	<target name="test.bean.comparator" depends="compile.tests">
  +  <target name="test.bean.comparator" depends="compile.tests">
       <echo message="Running BeanComparator tests ..."/>
       <java classname="${test.runner}" fork="yes"
           failonerror="${test.failonerror}">
  @@ -428,6 +429,21 @@
         <sysproperty key="org.apache.commons.logging.simplelog.defaultlog"
                    value="${test.level}"/>
         <arg value="org.apache.commons.beanutils.BeanComparatorTestCase"/>
  +      <classpath refid="test.classpath"/>
  +    </java>
  +  </target>
  +  
  +  <target name="test.locale.converters" depends="compile.tests">
  +    <echo message="Running Locale converters tests ..."/>
  +    <java classname="${test.runner}" fork="yes"
  +        failonerror="${test.failonerror}">
  +      <sysproperty key="org.apache.commons.logging.LogFactory"
  +                 value="${test.factory}"/>
  +      <sysproperty key="org.apache.commons.logging.Log"
  +                 value="${test.log}"/>
  +      <sysproperty key="org.apache.commons.logging.simplelog.defaultlog"
  +                 value="${test.level}"/>
  +      <arg value="org.apache.commons.beanutils.locale.converters.DateLocaleConverterTestCase"/>
         <classpath refid="test.classpath"/>
       </java>
     </target>
  
  
  
  1.3       +26 -6     jakarta-commons/beanutils/src/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverter.java
  
  Index: DateLocaleConverter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/beanutils/src/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DateLocaleConverter.java	11 Jan 2003 22:06:23 -0000	1.2
  +++ DateLocaleConverter.java	12 Jan 2003 21:07:45 -0000	1.3
  @@ -253,6 +253,28 @@
       }
   
       // --------------------------------------------------------- Methods
  +    
  +    /**
  +     * Returns whether date formatting is lenient.
  +     *
  +     * @return true if the <code>DateFormat</code> used for formatting is lenient
  +     * @see java.text.DateFormat#isLenient
  +     */
  +    public boolean isLenient() {
  +        return formatter.isLenient();
  +    }
  +    
  +    /**
  +     * Specify whether or not date-time parsing should be lenient.
  +     * 
  +     * @param lenient true if the <code>DateFormat</code> used for formatting
should be lenient
  +     * @see java.text.DateFormat#setLenient
  +     */
  +    public void setLenient(boolean lenient) {
  +        formatter.setLenient(lenient);
  +    }	
  +
  +    // --------------------------------------------------------- Methods
   
       /**
        * Convert the specified locale-sensitive input object into an output object of the
  @@ -265,14 +287,12 @@
        *  successfully
        */
       protected Object parse(Object value, String pattern) throws ParseException {
  -
           if (locPattern) {
               formatter.applyLocalizedPattern(pattern);
           }
           else {
               formatter.applyPattern(pattern);
           }
  -
  -        return formatter.parse((String) value, new ParsePosition(0));
  +        return formatter.parse((String) value);
       }
   }
  
  
  
  1.1                  jakarta-commons/beanutils/src/test/org/apache/commons/beanutils/locale/converters/DateLocaleConverterTestCase.java
  
  Index: DateLocaleConverterTestCase.java
  ===================================================================
  /*
   * $Header: /home/cvs/jakarta-commons/beanutils/src/test/org/apache/commons/beanutils/locale/converters/DateLocaleConverterTestCase.java,v
1.1 2003/01/12 21:07:45 rdonkin Exp $
   * $Revision: 1.1 $
   * $Date: 2003/01/12 21:07:45 $
   *
   * ====================================================================
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 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", "Commons", 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 apache@apache.org.
   *
   * 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.commons.beanutils.locale.converters;
  
  import junit.framework.TestSuite;
  import junit.framework.TestCase;
  
  import java.text.SimpleDateFormat;
  import java.text.ParseException;
  
  import java.util.Locale;
  
  import org.apache.commons.beanutils.Converter;
  import org.apache.commons.beanutils.ConversionException;
  
  /**
   * Test Case for the DateLocaleConverter class.
   *
   * @author Robert Burrell Donkin
   * @version $Revision: 1.1 $ $Date: 2003/01/12 21:07:45 $
   */
  
  public class DateLocaleConverterTestCase extends TestCase {
  
      // ------------------------------------------------------------------------
  
      public DateLocaleConverterTestCase(String name) {
          super(name);
      }
      
      // ------------------------------------------------------------------------
  
      public static TestSuite suite() {
          return new TestSuite(DateLocaleConverterTestCase.class);        
      }
  
  
      // ------------------------------------------------------------------------
  
      public void testSetLenient() {
          // make sure that date format works as expected
          SimpleDateFormat dateFormat = new SimpleDateFormat("MMM dd, yyyy", Locale.UK);
          
          // test with no leniency
          dateFormat.setLenient(false);
          
          try {
              
              dateFormat.parse("Feb 10, 2001");
              
          } catch (ParseException e) {
              fail("Could not parse date (1) - " + e.getMessage());
          }
          
          try {
          
              dateFormat.parse("Feb 31, 2001");
              fail("Parsed illegal date (1)");
          
          } catch (ParseException e) {
              // that's what we expected
          }	
          
          // test with leniency
          dateFormat.setLenient(true);
          
          try {
              
              dateFormat.parse("Feb 10, 2001");
              
          } catch (ParseException e) {
              fail("Could not parse date (2) - " + e.getMessage());
          }
          
          try {
          
              dateFormat.parse("Feb 31, 2001");
          
          } catch (ParseException e) {
              fail("Could not parse date (3) - " + e.getMessage());
          }
          
          // now repeat tests for converter
          DateLocaleConverter converter = new DateLocaleConverter(Locale.UK, "MMM dd, yyyy");
          
          // test with no leniency
          converter.setLenient(false);
          assertEquals("Set lenient failed", converter.isLenient(), false);
          
          try {
              
              converter.convert("Feb 10, 2001");
              
          } catch (ConversionException e) {
              fail("Could not parse date (4) - " + e.getMessage());
          }
          
          try {
          
              converter.convert("Feb 31, 2001");
              assertEquals("Set lenient failed", converter.isLenient(), false);
              fail("Parsed illegal date (2)");
          
          } catch (ConversionException e) {
              // that's what we expected
          }	
          
          // test with leniency
          converter.setLenient(true);
          assertEquals("Set lenient failed", converter.isLenient(), true);
          
          try {
              
              converter.convert("Feb 10, 2001");
              
          } catch (ConversionException e) {
              fail("Could not parse date (5) - " + e.getMessage());
          }
          
          try {
          
              converter.convert("Feb 31, 2001");
          
          } catch (ConversionException e) {
              fail("Could not parse date (6) - " + e.getMessage());
          }
      }
  }
  
  
  
  

--
To unsubscribe, e-mail:   <mailto:commons-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@jakarta.apache.org>


Mime
View raw message