epugh 2003/11/05 08:35:33
Modified: security/src/test/org/apache/fulcrum/security/util
SecuritySetTest.java
security/src/java/org/apache/fulcrum/security/util
SecuritySet.java
Log:
deal with containsName is null
Revision Changes Path
1.2 +65 -39
jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/util/SecuritySetTest.java
Index: SecuritySetTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/util/SecuritySetTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SecuritySetTest.java 5 Nov 2003 15:39:53 -0000 1.1
+++ SecuritySetTest.java 5 Nov 2003 16:35:33 -0000 1.2
@@ -1,46 +1,60 @@
package org.apache.fulcrum.security.util;
-/*
- * ==================================================================== The
- * Apache Software License, Version 1.1
- *
- * Copyright (c) 2001-2002 The Apache Software Foundation. All rights reserved.
- *
+/* ====================================================================
+ * 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-group 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.
+ * 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/> .
+ *
+ * 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.Group;
+import org.apache.fulcrum.security.model.simple.entity.SimpleGroup;
import org.apache.fulcrum.testcontainer.BaseUnitTest;
/**
* Test using a securitySet. Useing various subclasses since it is
@@ -69,6 +83,18 @@
public void testNull() throws Exception {
SecuritySet securitySet = new GroupSet();
assertFalse(securitySet.contains(null));
+ }
+
+ public void testContainsName() {
+ SecuritySet securitySet = new GroupSet();
+ assertFalse(securitySet.containsName(null));
+ Group g = new SimpleGroup();
+ g.setName("BOB");
+
+ ((GroupSet)securitySet).add(g);
+ assertTrue(((GroupSet)securitySet).containsName("bob"));
+ assertTrue(((GroupSet)securitySet).containsName("BOB"));
+
}
1.6 +3 -4
jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/util/SecuritySet.java
Index: SecuritySet.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/util/SecuritySet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SecuritySet.java 5 Nov 2003 15:39:53 -0000 1.5
+++ SecuritySet.java 5 Nov 2003 16:35:33 -0000 1.6
@@ -122,10 +122,9 @@
* match.
*/
public boolean containsName(String name)
- {
- name = name.toLowerCase();
+ {
return (StringUtils.isNotEmpty(name))
- ? nameMap.containsKey(name)
+ ? nameMap.containsKey(name.toLowerCase())
: false;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
