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 PropertyUtilsTestCase.java
Date Mon, 12 May 2003 21:42:56 GMT
rdonkin     2003/05/12 14:42:56

  Modified:    beanutils/src/java/org/apache/commons/beanutils
                        PropertyUtilsBean.java
               beanutils/src/test/org/apache/commons/beanutils
                        PropertyUtilsTestCase.java
  Added:       beanutils/src/java/org/apache/commons/beanutils
                        BeanAccessLanguageException.java
                        NestedNullException.java
  Log:
  Created new exception so that problems with the bean access langauges can be trapped separately.
  
  Revision  Changes    Path
  1.7       +8 -8      jakarta-commons/beanutils/src/java/org/apache/commons/beanutils/PropertyUtilsBean.java
  
  Index: PropertyUtilsBean.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/beanutils/src/java/org/apache/commons/beanutils/PropertyUtilsBean.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- PropertyUtilsBean.java	6 May 2003 11:32:23 -0000	1.6
  +++ PropertyUtilsBean.java	12 May 2003 21:42:56 -0000	1.7
  @@ -662,10 +662,10 @@
        *  access to the property accessor method
        * @exception IllegalArgumentException if <code>bean</code> or
        *  <code>name</code> is null
  -     * @exception IllegalArgumentException if a nested reference to a
  +     * @exception NestedNullException if a nested reference to a
        *  property returns null
  -     * @exception InvocationTargetException if the property accessor method
  -     *  throws an exception
  +     * @exception InvocationTargetException 
  +     * if the property accessor method throws an exception
        * @exception NoSuchMethodException if an accessor method for this
        *  propety cannot be found
        */
  @@ -711,7 +711,7 @@
                   bean = getSimpleProperty(bean, next);
               }
               if (bean == null) {
  -                throw new IllegalArgumentException
  +                throw new NestedNullException
                           ("Null property value for '" +
                           name.substring(0, indexOfNESTED_DELIM) + "'");
               }
  
  
  
  1.1                  jakarta-commons/beanutils/src/java/org/apache/commons/beanutils/BeanAccessLanguageException.java
  
  Index: BeanAccessLanguageException.java
  ===================================================================
  /*
   * $Header: /home/cvs/jakarta-commons/beanutils/src/java/org/apache/commons/beanutils/BeanAccessLanguageException.java,v
1.1 2003/05/12 21:42:56 rdonkin Exp $
   * $Revision: 1.1 $
   * $Date: 2003/05/12 21:42:56 $
   *
   * ====================================================================
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 1999-2003 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;
  
  /** 
   * Thrown to indicate that the <em>Bean Access Language</em> cannot execute
query
   * against given bean. This is a runtime exception and access langauges are encouraged
   * to subclass to create custom exceptions whenever appropriate.
   *
   * @author Robert Burrell Donkin
   * @since 1.7
   */
  
  public class BeanAccessLanguageException extends IllegalArgumentException {
      
      // --------------------------------------------------------- Constuctors
      
      /** 
       * Constructs a <code>BeanAccessLanguageException</code> without a detail
message.
       */
      public BeanAccessLanguageException() {
          super();
      }
      
      /**
       * Constructs a <code>BeanAccessLanguageException</code> without a detail
message.
       * 
       * @param message the detail message explaining this exception
       */
      public BeanAccessLanguageException(String message) {
          super(message);
      }
  }
  
  
  
  1.1                  jakarta-commons/beanutils/src/java/org/apache/commons/beanutils/NestedNullException.java
  
  Index: NestedNullException.java
  ===================================================================
  /*
   * $Header: /home/cvs/jakarta-commons/beanutils/src/java/org/apache/commons/beanutils/NestedNullException.java,v
1.1 2003/05/12 21:42:56 rdonkin Exp $
   * $Revision: 1.1 $
   * $Date: 2003/05/12 21:42:56 $
   *
   * ====================================================================
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 1999-2003 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;
  
  /** 
   * Thrown to indicate that the <em>Bean Access Language</em> cannot execute
query
   * against given bean since a nested bean referenced is null.
   *
   * @author Robert Burrell Donkin
   * @since 1.7
   */
  
  public class NestedNullException extends BeanAccessLanguageException {
      
      // --------------------------------------------------------- Constuctors
      
      /** 
       * Constructs a <code>NestedNullException</code> without a detail message.
       */
      public NestedNullException() {
          super();
      }
      
      /**
       * Constructs a <code>NestedNullException</code> without a detail message.
       * 
       * @param message the detail message explaining this exception
       */
      public NestedNullException(String message) {
          super(message);
      }
  }
  
  
  
  1.30      +21 -4     jakarta-commons/beanutils/src/test/org/apache/commons/beanutils/PropertyUtilsTestCase.java
  
  Index: PropertyUtilsTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/beanutils/src/test/org/apache/commons/beanutils/PropertyUtilsTestCase.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- PropertyUtilsTestCase.java	26 Nov 2002 21:28:46 -0000	1.29
  +++ PropertyUtilsTestCase.java	12 May 2003 21:42:56 -0000	1.30
  @@ -1510,6 +1510,23 @@
   
       }
   
  +    /** 
  +     * When a bean has a null property which is reference by the standard access language,
  +     * this should throw a NestedNullException.
  +     */
  +    public void testThrowNestedNull() throws Exception {
  +        NestedTestBean nestedBean = new NestedTestBean("base");
  +        // don't init!
  +        
  +        try {
  +            NestedTestBean value = (NestedTestBean) PropertyUtils.getProperty(
  +                                nestedBean,
  +                                "simpleBeanProperty.indexedProperty[0]");
  +            fail("NestedNullException not thrown");
  +        } catch (NestedNullException e) {
  +            // that's what we wanted!
  +        }
  +    }
   
       /**
        * Test getNestedProperty on a write-only String property.
  
  
  

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


Mime
View raw message