epugh 2003/11/04 06:14:59
Modified: security/src/java/org/apache/fulcrum/security/entity/impl
SecurityEntityImpl.java
security/xdocs changes.xml
Added: security/src/test/org/apache/fulcrum/security/entity/impl
SecurityEntityImplTest.java
Log:
Fix for passing in null name
Revision Changes Path
1.5 +6 -2
jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/entity/impl/SecurityEntityImpl.java
Index: SecurityEntityImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/entity/impl/SecurityEntityImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SecurityEntityImpl.java 26 Aug 2003 21:16:26 -0000 1.4
+++ SecurityEntityImpl.java 4 Nov 2003 14:14:59 -0000 1.5
@@ -90,11 +90,15 @@
return name;
}
/**
+ * Pass in the name for this entity. Also lowercases it.
* @param name
*/
public void setName(String name)
{
- this.name = name.toLowerCase();
+ if (name !=null){
+ name = name.toLowerCase();
+ }
+ this.name = name;
}
public String toString()
{
1.7 +4 -1 jakarta-turbine-fulcrum/security/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/xdocs/changes.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- changes.xml 30 Oct 2003 14:25:37 -0000 1.6
+++ changes.xml 4 Nov 2003 14:14:59 -0000 1.7
@@ -6,7 +6,10 @@
</properties>
<body>
- <release version="1.0-alpha-3" date="in cvs">
+ <release version="1.0-alpha-3" date="in cvs">
+ <action dev="epugh" type="fix">
+ For a SecurityEntityImpl, if the name is null, don't lowercase it.
+ </action>
<action dev="epugh" type="add">
Add ModelManager interface and SimpleModelManager and
TurbineModelManager
component that explicitly contains the relationship between the
various
1.1
jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/entity/impl/SecurityEntityImplTest.java
Index: SecurityEntityImplTest.java
===================================================================
package org.apache.fulcrum.security.entity.impl;
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-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 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 Turbine" 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",
* "Apache Turbine", 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/>.
*/
import org.apache.fulcrum.security.entity.SecurityEntity;
import org.apache.fulcrum.testcontainer.BaseUnitTest;
/**
* Test the SecurityEntityImple
*
* @author <a href="mailto:[EMAIL PROTECTED]">Eric Pugh</a>
* @version $Id: SecurityEntityImplTest.java,v 1.1 2003/11/04 14:14:59 epugh Exp $
*/
public class SecurityEntityImplTest extends BaseUnitTest
{
/**
* Constructor for SecurityEntityImplTest.
* @param arg0
*/
public SecurityEntityImplTest(String arg0)
{
super(arg0);
}
/**
* Make sure lowercasing logic works properly.
* @throws Exception
*/
public void testSettingGettingName() throws Exception
{
SecurityEntity se = new SecurityEntityImpl();
se.setName("hello");
assertEquals("hello",se.getName());
se.setName("HelLo");
assertEquals("hello",se.getName());
se.setName(null);
assertEquals(null,se.getName());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
