You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2007/09/20 11:32:23 UTC
svn commit: r577652 - in
/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support:
MaxImmSubFilterTest.java MaxValueCountFilterTest.java
MicroOperationFilterTest.java RelatedUserClassFilterTest.java
Author: elecharny
Date: Thu Sep 20 02:32:21 2007
New Revision: 577652
URL: http://svn.apache.org/viewvc?rev=577652&view=rev
Log:
Rmoved one more hundre warnings using generics
Modified:
directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java
directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MicroOperationFilterTest.java
directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java
Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java?rev=577652&r1=577651&r2=577652&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java Thu Sep 20 02:32:21 2007
@@ -45,7 +45,9 @@
import org.apache.directory.server.core.partition.PartitionNexusProxy;
import org.apache.directory.shared.ldap.aci.ACITuple;
import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
+import org.apache.directory.shared.ldap.aci.MicroOperation;
import org.apache.directory.shared.ldap.aci.ProtectedItem;
+import org.apache.directory.shared.ldap.aci.UserClass;
import org.apache.directory.shared.ldap.message.AttributesImpl;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -58,12 +60,15 @@
*/
public class MaxImmSubFilterTest extends TestCase
{
- private static final Collection EMPTY_COLLECTION = Collections.unmodifiableCollection( new ArrayList() );
- private static final Set EMPTY_SET = Collections.unmodifiableSet( new HashSet() );
+ private static final Collection<ACITuple> EMPTY_ACI_TUPLE_COLLECTION = Collections.unmodifiableCollection( new ArrayList<ACITuple>() );
+ private static final Collection<UserClass> EMPTY_USER_CLASS_COLLECTION = Collections.unmodifiableCollection( new ArrayList<UserClass>() );
+ private static final Collection<ProtectedItem> EMPTY_PROTECTED_ITEM_COLLECTION = Collections.unmodifiableCollection( new ArrayList<ProtectedItem>() );
+
+ private static final Set<MicroOperation> EMPTY_MICRO_OPERATION_SET = Collections.unmodifiableSet( new HashSet<MicroOperation>() );
private static final LdapDN ROOTDSE_NAME = new LdapDN();
private static final LdapDN ENTRY_NAME;
- private static final Collection PROTECTED_ITEMS = new ArrayList();
+ private static final Collection<ProtectedItem> PROTECTED_ITEMS = new ArrayList<ProtectedItem>();
private static final Attributes ENTRY = new AttributesImpl();
static
@@ -84,8 +89,9 @@
public void testWrongScope() throws Exception
{
MaxImmSubFilter filter = new MaxImmSubFilter();
- Collection tuples = new ArrayList();
- tuples.add( new ACITuple( EMPTY_COLLECTION, AuthenticationLevel.NONE, EMPTY_COLLECTION, EMPTY_SET, true, 0 ) );
+ Collection<ACITuple> tuples = new ArrayList<ACITuple>();
+ tuples.add( new ACITuple( EMPTY_USER_CLASS_COLLECTION, AuthenticationLevel.NONE,
+ EMPTY_PROTECTED_ITEM_COLLECTION, EMPTY_MICRO_OPERATION_SET, true, 0 ) );
tuples = Collections.unmodifiableCollection( tuples );
@@ -101,8 +107,9 @@
{
MaxImmSubFilter filter = new MaxImmSubFilter();
- Collection tuples = new ArrayList();
- tuples.add( new ACITuple( EMPTY_COLLECTION, AuthenticationLevel.NONE, EMPTY_COLLECTION, EMPTY_SET, true, 0 ) );
+ Collection<ACITuple> tuples = new ArrayList<ACITuple>();
+ tuples.add( new ACITuple( EMPTY_USER_CLASS_COLLECTION, AuthenticationLevel.NONE,
+ EMPTY_PROTECTED_ITEM_COLLECTION, EMPTY_MICRO_OPERATION_SET, true, 0 ) );
tuples = Collections.unmodifiableCollection( tuples );
@@ -115,7 +122,7 @@
{
MaxImmSubFilter filter = new MaxImmSubFilter();
- Assert.assertEquals( 0, filter.filter( EMPTY_COLLECTION, OperationScope.ENTRY, null, null, null, null, null,
+ Assert.assertEquals( 0, filter.filter( EMPTY_ACI_TUPLE_COLLECTION, OperationScope.ENTRY, null, null, null, null, null,
ENTRY_NAME, null, null, ENTRY, null ).size() );
}
@@ -123,8 +130,9 @@
public void testDenialTuple() throws Exception
{
MaxImmSubFilter filter = new MaxImmSubFilter();
- Collection tuples = new ArrayList();
- tuples.add( new ACITuple( EMPTY_COLLECTION, AuthenticationLevel.NONE, PROTECTED_ITEMS, EMPTY_SET, false, 0 ) );
+ Collection<ACITuple> tuples = new ArrayList<ACITuple>();
+ tuples.add( new ACITuple( EMPTY_USER_CLASS_COLLECTION, AuthenticationLevel.NONE,
+ PROTECTED_ITEMS, EMPTY_MICRO_OPERATION_SET, false, 0 ) );
tuples = Collections.unmodifiableCollection( tuples );
@@ -136,8 +144,9 @@
public void testGrantTuple() throws Exception
{
MaxImmSubFilter filter = new MaxImmSubFilter();
- Collection tuples = new ArrayList();
- tuples.add( new ACITuple( EMPTY_COLLECTION, AuthenticationLevel.NONE, PROTECTED_ITEMS, EMPTY_SET, true, 0 ) );
+ Collection<ACITuple> tuples = new ArrayList<ACITuple>();
+ tuples.add( new ACITuple( EMPTY_USER_CLASS_COLLECTION, AuthenticationLevel.NONE,
+ PROTECTED_ITEMS, EMPTY_MICRO_OPERATION_SET, true, 0 ) );
Assert.assertEquals( 1, filter.filter( tuples, OperationScope.ENTRY, new MockProxy( 1 ), null, null, null,
null, ENTRY_NAME, null, null, ENTRY, null ).size() );
@@ -236,6 +245,7 @@
}
ii++;
+
return new Object();
}
@@ -266,6 +276,7 @@
}
ii++;
+
return new Object();
}
}
Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java?rev=577652&r1=577651&r2=577652&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java Thu Sep 20 02:32:21 2007
@@ -36,7 +36,9 @@
import org.apache.directory.server.core.authz.support.OperationScope;
import org.apache.directory.shared.ldap.aci.ACITuple;
import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
+import org.apache.directory.shared.ldap.aci.MicroOperation;
import org.apache.directory.shared.ldap.aci.ProtectedItem;
+import org.apache.directory.shared.ldap.aci.UserClass;
import org.apache.directory.shared.ldap.aci.ProtectedItem.MaxValueCountItem;
import org.apache.directory.shared.ldap.message.AttributeImpl;
import org.apache.directory.shared.ldap.message.AttributesImpl;
@@ -50,16 +52,19 @@
*/
public class MaxValueCountFilterTest extends TestCase
{
- private static final Collection EMPTY_COLLECTION = Collections.unmodifiableCollection( new ArrayList() );
- private static final Set EMPTY_SET = Collections.unmodifiableSet( new HashSet() );
+ private static final Collection<ACITuple> EMPTY_ACI_TUPLE_COLLECTION = Collections.unmodifiableCollection( new ArrayList<ACITuple>() );
+ private static final Collection<UserClass> EMPTY_USER_CLASS_COLLECTION = Collections.unmodifiableCollection( new ArrayList<UserClass>() );
+ private static final Collection<ProtectedItem> EMPTY_PROTECTED_ITEM_COLLECTION = Collections.unmodifiableCollection( new ArrayList<ProtectedItem>() );
- private static final Collection PROTECTED_ITEMS = new ArrayList();
+ private static final Set<MicroOperation> EMPTY_MICRO_OPERATION_SET = Collections.unmodifiableSet( new HashSet<MicroOperation>() );
+
+ private static final Collection<ProtectedItem> PROTECTED_ITEMS = new ArrayList<ProtectedItem>();
private static final Attributes ENTRY = new AttributesImpl();
private static final Attributes FULL_ENTRY = new AttributesImpl();
static
{
- Collection mvcItems = new ArrayList();
+ Collection<MaxValueCountItem> mvcItems = new ArrayList<MaxValueCountItem>();
mvcItems.add( new MaxValueCountItem( "testAttr", 2 ) );
PROTECTED_ITEMS.add( new ProtectedItem.MaxValueCount( mvcItems ) );
@@ -75,8 +80,9 @@
public void testWrongScope() throws Exception
{
MaxValueCountFilter filter = new MaxValueCountFilter();
- Collection tuples = new ArrayList();
- tuples.add( new ACITuple( EMPTY_COLLECTION, AuthenticationLevel.NONE, EMPTY_COLLECTION, EMPTY_SET, true, 0 ) );
+ Collection<ACITuple> tuples = new ArrayList<ACITuple>();
+ tuples.add( new ACITuple( EMPTY_USER_CLASS_COLLECTION, AuthenticationLevel.NONE, EMPTY_PROTECTED_ITEM_COLLECTION,
+ EMPTY_MICRO_OPERATION_SET, true, 0 ) );
tuples = Collections.unmodifiableCollection( tuples );
@@ -92,16 +98,17 @@
{
MaxValueCountFilter filter = new MaxValueCountFilter();
- Assert.assertEquals( 0, filter.filter( EMPTY_COLLECTION, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null,
- null, null, null, null, null, null, null, null ).size() );
+ Assert.assertEquals( 0, filter.filter( EMPTY_ACI_TUPLE_COLLECTION, OperationScope.ATTRIBUTE_TYPE_AND_VALUE,
+ null, null, null, null, null, null, null, null, null, null ).size() );
}
public void testDenialTuple() throws Exception
{
MaxValueCountFilter filter = new MaxValueCountFilter();
- Collection tuples = new ArrayList();
- tuples.add( new ACITuple( EMPTY_COLLECTION, AuthenticationLevel.NONE, PROTECTED_ITEMS, EMPTY_SET, false, 0 ) );
+ Collection<ACITuple> tuples = new ArrayList<ACITuple>();
+ tuples.add( new ACITuple( EMPTY_USER_CLASS_COLLECTION, AuthenticationLevel.NONE, PROTECTED_ITEMS,
+ EMPTY_MICRO_OPERATION_SET, false, 0 ) );
tuples = Collections.unmodifiableCollection( tuples );
@@ -115,8 +122,9 @@
public void testGrantTuple() throws Exception
{
MaxValueCountFilter filter = new MaxValueCountFilter();
- Collection tuples = new ArrayList();
- tuples.add( new ACITuple( EMPTY_COLLECTION, AuthenticationLevel.NONE, PROTECTED_ITEMS, EMPTY_SET, true, 0 ) );
+ Collection<ACITuple> tuples = new ArrayList<ACITuple>();
+ tuples.add( new ACITuple( EMPTY_USER_CLASS_COLLECTION, AuthenticationLevel.NONE, PROTECTED_ITEMS,
+ EMPTY_MICRO_OPERATION_SET, true, 0 ) );
Assert.assertEquals( 1, filter.filter( tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, null, null,
null, null, "testAttr", null, ENTRY, null ).size() );
Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MicroOperationFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MicroOperationFilterTest.java?rev=577652&r1=577651&r2=577652&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MicroOperationFilterTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MicroOperationFilterTest.java Thu Sep 20 02:32:21 2007
@@ -34,6 +34,8 @@
import org.apache.directory.shared.ldap.aci.ACITuple;
import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
import org.apache.directory.shared.ldap.aci.MicroOperation;
+import org.apache.directory.shared.ldap.aci.ProtectedItem;
+import org.apache.directory.shared.ldap.aci.UserClass;
/**
@@ -44,12 +46,13 @@
*/
public class MicroOperationFilterTest extends TestCase
{
- private static final Collection EMPTY_COLLECTION = Collections.unmodifiableCollection( new ArrayList() );
- private static final Set EMPTY_SET = Collections.unmodifiableSet( new HashSet() );
-
- private static final Set USER_OPERATIONS_A = new HashSet();
- private static final Set USER_OPERATIONS_B = new HashSet();
- private static final Set TUPLE_OPERATIONS = new HashSet();
+ private static final Collection<ACITuple> EMPTY_ACI_TUPLE_COLLECTION = Collections.unmodifiableCollection( new ArrayList<ACITuple>() );
+ private static final Collection<UserClass> EMPTY_USER_CLASS_COLLECTION = Collections.unmodifiableCollection( new ArrayList<UserClass>() );
+ private static final Collection<ProtectedItem> EMPTY_PROTECTED_ITEM_COLLECTION = Collections.unmodifiableCollection( new ArrayList<ProtectedItem>() );
+
+ private static final Set<MicroOperation> USER_OPERATIONS_A = new HashSet<MicroOperation>();
+ private static final Set<MicroOperation> USER_OPERATIONS_B = new HashSet<MicroOperation>();
+ private static final Set<MicroOperation> TUPLE_OPERATIONS = new HashSet<MicroOperation>();
static
{
@@ -67,16 +70,18 @@
{
MicroOperationFilter filter = new MicroOperationFilter();
- Assert.assertEquals( 0, filter.filter( EMPTY_COLLECTION, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null,
- null, null, null, null, null, null, null, null ).size() );
+ Assert.assertEquals( 0, filter.filter( EMPTY_ACI_TUPLE_COLLECTION, OperationScope.ATTRIBUTE_TYPE_AND_VALUE,
+ null, null, null, null, null, null, null, null, null, null ).size() );
}
public void testOneTuple() throws Exception
{
MicroOperationFilter filter = new MicroOperationFilter();
- Collection tuples = new ArrayList();
- tuples.add( new ACITuple( EMPTY_COLLECTION, AuthenticationLevel.NONE, EMPTY_SET, TUPLE_OPERATIONS, true, 0 ) );
+ Collection<ACITuple> tuples = new ArrayList<ACITuple>();
+
+ tuples.add( new ACITuple( EMPTY_USER_CLASS_COLLECTION, AuthenticationLevel.NONE, EMPTY_PROTECTED_ITEM_COLLECTION,
+ TUPLE_OPERATIONS, true, 0 ) );
Assert.assertEquals( 1, filter.filter( tuples, OperationScope.ENTRY, null, null, null, null, null, null, null,
null, null, USER_OPERATIONS_A ).size() );
Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java?rev=577652&r1=577651&r2=577652&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java Thu Sep 20 02:32:21 2007
@@ -26,6 +26,7 @@
import java.util.HashSet;
import java.util.Set;
+import javax.naming.Name;
import javax.naming.NamingException;
import junit.framework.Assert;
@@ -36,6 +37,8 @@
import org.apache.directory.server.core.subtree.SubtreeEvaluator;
import org.apache.directory.shared.ldap.aci.ACITuple;
import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
+import org.apache.directory.shared.ldap.aci.MicroOperation;
+import org.apache.directory.shared.ldap.aci.ProtectedItem;
import org.apache.directory.shared.ldap.aci.UserClass;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -48,13 +51,15 @@
*/
public class RelatedUserClassFilterTest extends TestCase
{
- private static final Collection EMPTY_COLLECTION = Collections.unmodifiableCollection( new ArrayList() );
- private static final Set EMPTY_SET = Collections.unmodifiableSet( new HashSet() );
+ private static final Collection<ACITuple> EMPTY_ACI_TUPLE_COLLECTION = Collections.unmodifiableCollection( new ArrayList<ACITuple>() );
+ private static final Collection<ProtectedItem> EMPTY_PROTECTED_ITEM_COLLECTION = Collections.unmodifiableCollection( new ArrayList<ProtectedItem>() );
+
+ private static final Set<MicroOperation> EMPTY_MICRO_OPERATION_SET = Collections.unmodifiableSet( new HashSet<MicroOperation>() );
private static final LdapDN GROUP_NAME;
private static final LdapDN USER_NAME;
- private static final Set USER_NAMES = new HashSet();
- private static final Set GROUP_NAMES = new HashSet();
+ private static final Set<Name> USER_NAMES = new HashSet<Name>();
+ private static final Set<Name> GROUP_NAMES = new HashSet<Name>();
private static final SubtreeEvaluator SUBTREE_EVALUATOR;
@@ -82,14 +87,14 @@
public void testZeroTuple() throws Exception
{
- Assert.assertEquals( 0, filter.filter( EMPTY_COLLECTION, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null,
+ Assert.assertEquals( 0, filter.filter( EMPTY_ACI_TUPLE_COLLECTION, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null,
null, null, null, null, null, null, null, null ).size() );
}
public void testAllUsers() throws Exception
{
- Collection tuples = getTuples( UserClass.ALL_USERS );
+ Collection<ACITuple> tuples = getTuples( UserClass.ALL_USERS );
Assert.assertEquals( 1, filter.filter( tuples, OperationScope.ENTRY, null, null, null, null,
AuthenticationLevel.NONE, null, null, null, null, null ).size() );
@@ -98,7 +103,7 @@
public void testThisEntry() throws Exception
{
- Collection tuples = getTuples( UserClass.THIS_ENTRY );
+ Collection<ACITuple> tuples = getTuples( UserClass.THIS_ENTRY );
Assert.assertEquals( 1, filter.filter( tuples, OperationScope.ENTRY, null, null, USER_NAME, null,
AuthenticationLevel.NONE, USER_NAME, null, null, null, null ).size() );
@@ -109,7 +114,7 @@
public void testName() throws Exception
{
- Collection tuples = getTuples( new UserClass.Name( USER_NAMES ) );
+ Collection<ACITuple> tuples = getTuples( new UserClass.Name( USER_NAMES ) );
Assert.assertEquals( 1, filter.filter( tuples, OperationScope.ENTRY, null, null, USER_NAME, null,
AuthenticationLevel.NONE, null, null, null, null, null ).size() );
Assert.assertEquals( 0, filter.filter( tuples, OperationScope.ENTRY, null, null,
@@ -120,11 +125,11 @@
public void testUserGroup() throws Exception
{
- Collection tuples = getTuples( new UserClass.UserGroup( GROUP_NAMES ) );
+ Collection<ACITuple> tuples = getTuples( new UserClass.UserGroup( GROUP_NAMES ) );
Assert.assertEquals( 1, filter.filter( tuples, OperationScope.ENTRY, null, GROUP_NAMES, USER_NAME, null,
AuthenticationLevel.NONE, null, null, null, null, null ).size() );
- Set wrongGroupNames = new HashSet();
+ Set<Name> wrongGroupNames = new HashSet<Name>();
wrongGroupNames.add( new LdapDN( "ou=unrelatedgroup" ) );
Assert.assertEquals( 0, filter.filter( tuples, OperationScope.ENTRY, null, wrongGroupNames, USER_NAME, null,
@@ -140,7 +145,7 @@
public void testAuthenticationLevel() throws Exception
{
- Collection tuples = getTuples( AuthenticationLevel.SIMPLE, true );
+ Collection<ACITuple> tuples = getTuples( AuthenticationLevel.SIMPLE, true );
Assert.assertEquals( 1, filter.filter( tuples, OperationScope.ENTRY, null, null, null, null,
AuthenticationLevel.STRONG, null, null, null, null, null ).size() );
@@ -164,28 +169,31 @@
}
- private static Collection getTuples( UserClass userClass )
+ private static Collection<ACITuple> getTuples( UserClass userClass )
{
- Collection classes = new ArrayList();
+ Collection<UserClass> classes = new ArrayList<UserClass>();
classes.add( userClass );
- Collection tuples = new ArrayList();
- tuples.add( new ACITuple( classes, AuthenticationLevel.NONE, EMPTY_COLLECTION, EMPTY_SET, true, 0 ) );
+ Collection<ACITuple> tuples = new ArrayList<ACITuple>();
+ tuples.add( new ACITuple( classes, AuthenticationLevel.NONE, EMPTY_PROTECTED_ITEM_COLLECTION,
+ EMPTY_MICRO_OPERATION_SET, true, 0 ) );
return tuples;
}
- private static Collection getTuples( AuthenticationLevel level, boolean grant )
+ private static Collection<ACITuple> getTuples( AuthenticationLevel level, boolean grant )
{
- Collection classes = new ArrayList();
+ Collection<UserClass> classes = new ArrayList<UserClass>();
+
if ( grant )
{
classes.add( UserClass.ALL_USERS );
}
else
{
- Set names = new HashSet();
+ Set<Name> names = new HashSet<Name>();
+
try
{
names.add( new LdapDN( "dummy=dummy" ) );
@@ -198,8 +206,8 @@
classes.add( new UserClass.Name( names ) );
}
- Collection tuples = new ArrayList();
- tuples.add( new ACITuple( classes, level, EMPTY_COLLECTION, EMPTY_SET, grant, 0 ) );
+ Collection<ACITuple> tuples = new ArrayList<ACITuple>();
+ tuples.add( new ACITuple( classes, level, EMPTY_PROTECTED_ITEM_COLLECTION, EMPTY_MICRO_OPERATION_SET, grant, 0 ) );
return tuples;
}