geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject cvs commit: incubator-geronimo/modules/common/src/test/org/apache/geronimo/common/propertyeditor ArrayPropertyEditorAdapterTest.java URLArrayEditorTest.java
Date Sat, 30 Aug 2003 21:08:08 GMT
jdillon     2003/08/30 14:08:08

  Modified:    modules/common/src/java/org/apache/geronimo/common/propertyeditor
                        PropertyEditors.java
  Added:       modules/common/src/test/org/apache/geronimo/common/propertyeditor
                        ArrayPropertyEditorAdapterTest.java
  Removed:     modules/common/src/java/org/apache/geronimo/common/propertyeditor
                        StringArrayEditor.java URLArrayEditor.java
               modules/common/src/test/org/apache/geronimo/common/propertyeditor
                        URLArrayEditorTest.java
  Log:
   o ArrayPropertyEditorAdapter obsoletes the need for individual editors
     for array types
  
  Revision  Changes    Path
  1.4       +1 -6      incubator-geronimo/modules/common/src/java/org/apache/geronimo/common/propertyeditor/PropertyEditors.java
  
  Index: PropertyEditors.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/common/src/java/org/apache/geronimo/common/propertyeditor/PropertyEditors.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PropertyEditors.java	29 Aug 2003 21:40:49 -0000	1.3
  +++ PropertyEditors.java	30 Aug 2003 21:08:08 -0000	1.4
  @@ -82,11 +82,6 @@
       {
           // Append our package to the serach path
           appendEditorSearchPath("org.apache.geronimo.common.propertyeditor");
  -        
  -        // Have to explicity register this because it does not follow the
  -        // naming convention used by PropertyManagerEditor to discover editors
  -        registerEditor(String[].class, StringArrayEditor.class);
  -        registerEditor(java.net.URL[].class, URLArrayEditor.class);
       }
       
       /**
  
  
  
  1.1                  incubator-geronimo/modules/common/src/test/org/apache/geronimo/common/propertyeditor/ArrayPropertyEditorAdapterTest.java
  
  Index: ArrayPropertyEditorAdapterTest.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 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 acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" and
   *    "Apache Geronimo" 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",
   *    "Apache Geronimo", nor may "Apache" appear in their name, without
   *    prior written permission of the Apache Software Foundation.
   *
   * 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.geronimo.common.propertyeditor;
  
  import java.net.URL;
  
  import java.beans.PropertyEditor;
  
  import junit.framework.TestCase;
  
  /**
   * Unit test for {@link ArrayPropertyEditorAdapter} class.
   *
   * @version $Revision: 1.1 $ $Date: 2003/08/30 21:08:08 $
   */
  public class ArrayPropertyEditorAdapterTest
      extends TestCase
  {
      PropertyEditor editor;
      
      protected void setUp()
      {
          editor = PropertyEditors.findEditor(URL[].class);
      }
      
      public void testGetValue_Simple()
      {
          String input = "http://apache.org";
          
          editor.setAsText(input);
          Object output = editor.getValue();
          
          assertNotNull(output);
          assertEquals(URL[].class, output.getClass());
          
          URL[] urls = (URL[])output;
          assertEquals(1, urls.length);
          assertEquals(input, urls[0].toString());
      }
      
      public void testGetValue_2URLs()
      {
          String input = "http://apache.org, http://google.com";
          
          editor.setAsText(input);
          Object output = editor.getValue();
          
          assertNotNull(output);
          assertEquals(URL[].class, output.getClass());
          
          URL[] urls = (URL[])output;
          assertEquals(2, urls.length);
          assertEquals("http://apache.org", urls[0].toString());
          assertEquals("http://google.com", urls[1].toString());
      }
  }
  
  
  

Mime
View raw message