Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm
Date: 8 Sep 2003 21:44:08 -0000
Message-ID: <20030908214408.53972.qmail@minotaur.apache.org>
From: rdonkin@apache.org
To: jakarta-commons-cvs@apache.org
Subject: cvs commit:
 jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/strategy
 TestBadCharacterReplacingNMapper.java TestDefaultNameMapper.java

rdonkin     2003/09/08 14:44:08

  Modified:    betwixt/src/test/org/apache/commons/betwixt/strategy
                        TestDefaultNameMapper.java
  Added:       betwixt/src/test/org/apache/commons/betwixt/strategy
                        TestBadCharacterReplacingNMapper.java
  Log:
  Tests for new BadCharacterReplacingNameMapper for associated changes to DefaultNameMapper.
  
  Revision  Changes    Path
  1.3       +33 -6     jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/strategy/TestDefaultNameMapper.java
  
  Index: TestDefaultNameMapper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/strategy/TestDefaultNameMapper.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestDefaultNameMapper.java	30 Dec 2002 18:16:48 -0000	1.2
  +++ TestDefaultNameMapper.java	8 Sep 2003 21:44:08 -0000	1.3
  @@ -96,6 +96,33 @@
               assertEquals(values[i], result);
           }
       }
  -
  +    
  +    public void testBadCharBadFirstOne() {
  +        String name="$LoadsOfMoney";
  +        DefaultNameMapper mapper = new DefaultNameMapper();
  +        String out = mapper.mapTypeToElementName(name);
  +        assertEquals("Expected", "LoadsOfMoney", out);
  +    }
  +    
  +    public void testBadCharBadFirstTwo() {
  +        String name="$LOADS�OF$MONEY";
  +        DefaultNameMapper mapper = new DefaultNameMapper();        
  +        String out = mapper.mapTypeToElementName(name);
  +        assertEquals("Expected", "LOADSOFMONEY", out);
  +    }
  +    
  +    public void testBadCharGoodFirstOne() {
  +        String name="L$oads%OfMone$y$";
  +        DefaultNameMapper mapper = new DefaultNameMapper();        
  +        String out = mapper.mapTypeToElementName(name);
  +        assertEquals("Expected", "LoadsOfMoney", out);
  +    }
  +    
  +    public void testBadCharGoodFirstTwo() {
  +        String name="LOADSOFMONE$$Y";
  +        DefaultNameMapper mapper = new DefaultNameMapper();        
  +        String out = mapper.mapTypeToElementName(name);
  +        assertEquals("Expected", "LOADSOFMONEY", out);
  +    }
   }
   
  
  
  
  1.1                  jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/strategy/TestBadCharacterReplacingNMapper.java
  
  Index: TestBadCharacterReplacingNMapper.java
  ===================================================================
  /*
   * $Header: /home/cvs/jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/strategy/TestBadCharacterReplacingNMapper.java,v 1.1 2003/09/08 21:44:08 rdonkin Exp $
   * $Revision: 1.1 $
   * $Date: 2003/09/08 21:44:08 $
   *
   * ====================================================================
   *
   * 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", "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/>.
   * 
   * $Id: TestBadCharacterReplacingNMapper.java,v 1.1 2003/09/08 21:44:08 rdonkin Exp $
   */
  
  package org.apache.commons.betwixt.strategy;
  
  import java.beans.BeanDescriptor;
  import java.util.ArrayList;
  
  import junit.framework.Test;
  import junit.framework.TestCase;
  import junit.framework.TestSuite;
  
  import org.apache.commons.betwixt.XMLIntrospector;
  
  /** Test harness for the BadCharacterReplacingNMapper
    *
    * @author Robert Burrell Donkin
    * @version $Revision: 1.1 $
    */
  public class TestBadCharacterReplacingNMapper extends TestCase {
      
          
      public static Test suite() {
          return new TestSuite(TestBadCharacterReplacingNMapper.class);
      }
      
      public TestBadCharacterReplacingNMapper(String testName) {
          super(testName);
      }
      
      public void testNoReplacementBadFirstNoChainedMapper() {
          String name="$LoadsOfMoney";
          BadCharacterReplacingNMapper mapper = new BadCharacterReplacingNMapper(null);
          String out = mapper.mapTypeToElementName(name);
          assertEquals("Expected", "LoadsOfMoney", out);
      }
      
      public void testNoReplacementBadFirstWithChainedMapper() {
          String name="$LOADS�OF$MONEY";
          BadCharacterReplacingNMapper mapper = new BadCharacterReplacingNMapper(new PlainMapper());
          String out = mapper.mapTypeToElementName(name);
          assertEquals("Expected", "LOADSOFMONEY", out);
      }
      
      public void testNoReplacementGoodFirstNoChainedMapper() {
          String name="L$oads%OfMone$y$";
          BadCharacterReplacingNMapper mapper = new BadCharacterReplacingNMapper(null);
          String out = mapper.mapTypeToElementName(name);
          assertEquals("Expected", "LoadsOfMoney", out);
      }
      
      public void testNoReplacementGoodFirstWithChainedMapper() {
          String name="LOADSOFMONE$$Y";
          BadCharacterReplacingNMapper mapper = new BadCharacterReplacingNMapper(new PlainMapper());
          String out = mapper.mapTypeToElementName(name);
          assertEquals("Expected", "LOADSOFMONEY", out);
      }
      
      public void testReplacementBadFirstNoChainedMapper() {
          String name="$LoadsOfMoney$";
          BadCharacterReplacingNMapper mapper = new BadCharacterReplacingNMapper(null);
          mapper.setReplacement(new Character('_'));
          String out = mapper.mapTypeToElementName(name);
          assertEquals("Expected", "_LoadsOfMoney_", out);
      }
      
      public void testReplacementBadFirstWithChainedMapper() {
          String name="$LOADS�OF$MONEY";
          BadCharacterReplacingNMapper mapper = new BadCharacterReplacingNMapper(new PlainMapper());
          mapper.setReplacement(new Character('_'));
          String out = mapper.mapTypeToElementName(name);
          assertEquals("Expected", "_LOADS_OF_MONEY", out);
      }
      
      public void testReplacementGoodFirstNoChainedMapper() {
          String name="L$$$$$oads%OfMone$y$";
          BadCharacterReplacingNMapper mapper = new BadCharacterReplacingNMapper(null);
          mapper.setReplacement(new Character('_'));
          String out = mapper.mapTypeToElementName(name);
          assertEquals("Expected", "L_____oads_OfMone_y_", out);
      }
      
      public void testReplacementGoodFirstWithChainedMapper() {
          String name="L$OADSOFMONE$$$$$Y";
          BadCharacterReplacingNMapper mapper = new BadCharacterReplacingNMapper(new PlainMapper());
          mapper.setReplacement(new Character('_'));
          String out = mapper.mapTypeToElementName(name);
          assertEquals("Expected", "L_OADSOFMONE_____Y", out);
      }
      
      private class PlainMapper implements NameMapper {
          public String mapTypeToElementName(String typeName) {
              return typeName;
          }
      }
  }