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/12/26 16:30:06 UTC
svn commit: r606912 - in
/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core:
./ jndi/ normalization/ operational/ prefs/ schema/ sp/ subtree/ trigger/
Author: elecharny
Date: Wed Dec 26 07:30:04 2007
New Revision: 606912
URL: http://svn.apache.org/viewvc?rev=606912&view=rev
Log:
Replaced some import ...*; by the explicit declaration of the imported elements.
Removed some warnings with generics
Modified:
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/StockCoreISuite.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/RFC2713IT.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/RootDSEIT.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchIT.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchWithIndicesITest.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceIT.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/prefs/PreferencesIT.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/sp/LdapClassLoaderIT.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceIT.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceEntryModificationHandlingIT.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceObjectClassChangeHandlingIT.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/trigger/SubentryServiceForTriggersIT.java
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/StockCoreISuite.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/StockCoreISuite.java?rev=606912&r1=606911&r2=606912&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/StockCoreISuite.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/StockCoreISuite.java Wed Dec 26 07:30:04 2007
@@ -29,7 +29,22 @@
import org.apache.directory.server.core.integ.SetupMode;
import org.apache.directory.server.core.integ.annotations.Mode;
import org.apache.directory.server.core.integ.annotations.CleanupLevel;
-import org.apache.directory.server.core.jndi.*;
+import org.apache.directory.server.core.jndi.AddIT;
+import org.apache.directory.server.core.jndi.CreateContextIT;
+import org.apache.directory.server.core.jndi.DIRSERVER169IT;
+import org.apache.directory.server.core.jndi.DIRSERVER759IT;
+import org.apache.directory.server.core.jndi.DIRSERVER783IT;
+import org.apache.directory.server.core.jndi.DIRSERVER791IT;
+import org.apache.directory.server.core.jndi.DestroyContextIT;
+import org.apache.directory.server.core.jndi.ExtensibleObjectIT;
+import org.apache.directory.server.core.jndi.ListIT;
+import org.apache.directory.server.core.jndi.ModifyContextIT;
+import org.apache.directory.server.core.jndi.ObjStateFactoryIT;
+import org.apache.directory.server.core.jndi.RFC2713IT;
+import org.apache.directory.server.core.jndi.ReferralIT;
+import org.apache.directory.server.core.jndi.RootDSEIT;
+import org.apache.directory.server.core.jndi.SearchIT;
+import org.apache.directory.server.core.jndi.UniqueMemberIT;
import org.apache.directory.server.core.normalization.NormalizationServiceIT;
import org.apache.directory.server.core.operational.OperationalAttributeServiceIT;
import org.apache.directory.server.core.prefs.PreferencesIT;
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java?rev=606912&r1=606911&r2=606912&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java Wed Dec 26 07:30:04 2007
@@ -36,13 +36,21 @@
import org.apache.directory.shared.ldap.message.AttributeImpl;
import org.apache.directory.shared.ldap.message.AttributesImpl;
import org.apache.directory.shared.ldap.message.ModificationItemImpl;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
import org.junit.Test;
import org.junit.runner.RunWith;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
-import javax.naming.directory.*;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
import javax.naming.ldap.LdapContext;
import java.util.HashSet;
import java.util.Set;
@@ -108,10 +116,10 @@
SearchControls sc = new SearchControls();
sc.setSearchScope( SearchControls.SUBTREE_SCOPE );
- NamingEnumeration ne = ctxRoot.search( "", "(objectClass=*)", sc );
+ NamingEnumeration<SearchResult> ne = ctxRoot.search( "", "(objectClass=*)", sc );
assertTrue( "Search should return at least one entry.", ne.hasMore() );
- SearchResult sr = ( SearchResult ) ne.next();
+ SearchResult sr = ne.next();
assertEquals( "The entry returned should be the root entry.", SUFFIX, sr.getName() );
assertFalse( "Search should return no more entries.", ne.hasMore() );
}
@@ -137,10 +145,10 @@
SearchControls sc = new SearchControls();
sc.setSearchScope( SearchControls.OBJECT_SCOPE );
- NamingEnumeration ne = ctxRoot.search( dn, "(objectClass=*)", sc );
+ NamingEnumeration<SearchResult> ne = ctxRoot.search( dn, "(objectClass=*)", sc );
assertTrue( "Search should return at least one entry.", ne.hasMore() );
- SearchResult sr = ( SearchResult ) ne.next();
+ SearchResult sr = ne.next();
assertEquals( "The entry returned should be the entry added earlier.", dn + "," + SUFFIX, sr.getName() );
assertFalse( "Search should return no more entries.", ne.hasMore() );
}
@@ -173,7 +181,7 @@
SearchControls sc = new SearchControls();
sc.setSearchScope( SearchControls.OBJECT_SCOPE );
- NamingEnumeration ne = ctxRoot.search( dn, "(objectClass=*)", sc );
+ NamingEnumeration<SearchResult> ne = ctxRoot.search( dn, "(objectClass=*)", sc );
assertTrue( "Search should return at least one entry.", ne.hasMore() );
SearchResult sr = ( SearchResult ) ne.next();
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java?rev=606912&r1=606911&r2=606912&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java Wed Dec 26 07:30:04 2007
@@ -29,7 +29,11 @@
import org.apache.directory.shared.ldap.ldif.Entry;
import org.apache.directory.shared.ldap.message.AttributeImpl;
import org.apache.directory.shared.ldap.message.AttributesImpl;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java?rev=606912&r1=606911&r2=606912&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java Wed Dec 26 07:30:04 2007
@@ -29,7 +29,9 @@
import org.apache.directory.shared.ldap.message.AttributesImpl;
import org.apache.directory.shared.ldap.util.ArrayUtils;
import org.apache.directory.shared.ldap.ldif.Entry;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNull;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/RFC2713IT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/RFC2713IT.java?rev=606912&r1=606911&r2=606912&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/RFC2713IT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/RFC2713IT.java Wed Dec 26 07:30:04 2007
@@ -23,7 +23,9 @@
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.integ.CiRunner;
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java?rev=606912&r1=606911&r2=606912&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java Wed Dec 26 07:30:04 2007
@@ -33,15 +33,29 @@
import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.naming.*;
-import javax.naming.directory.*;
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.NameAlreadyBoundException;
+import javax.naming.NameNotFoundException;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.ReferralException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
import javax.naming.ldap.LdapContext;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
@@ -75,7 +89,6 @@
LdapContext rootCtx;
Name ctxDn;
LdapContext refCtx;
- List refs;
}
@@ -157,7 +170,7 @@
/**
- * Checks for correct core behavoir when Context.REFERRAL is set to <b>throw</b>
+ * Checks for correct core behavior when Context.REFERRAL is set to <b>throw</b>
* for an add operation with the parent context being a referral.
*
* @throws Exception if something goes wrong.
@@ -967,11 +980,12 @@
SearchControls controls = new SearchControls();
controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
- NamingEnumeration list = td.rootCtx.search( "", "(objectClass=*)", controls );
+ NamingEnumeration<SearchResult> list = td.rootCtx.search( "", "(objectClass=*)", controls );
Map<String, SearchResult> results = new HashMap<String, SearchResult>();
+
while ( list.hasMore() )
{
- SearchResult result = ( SearchResult ) list.next();
+ SearchResult result = list.next();
results.put( result.getName(), result );
}
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/RootDSEIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/RootDSEIT.java?rev=606912&r1=606911&r2=606912&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/RootDSEIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/RootDSEIT.java Wed Dec 26 07:30:04 2007
@@ -24,7 +24,10 @@
import org.apache.directory.server.core.integ.CiRunner;
import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
import org.apache.directory.shared.ldap.message.ModificationItemImpl;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchIT.java?rev=606912&r1=606911&r2=606912&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchIT.java Wed Dec 26 07:30:04 2007
@@ -34,13 +34,22 @@
import org.apache.directory.shared.ldap.message.AttributeImpl;
import org.apache.directory.shared.ldap.message.AttributesImpl;
import org.apache.directory.shared.ldap.message.ModificationItemImpl;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
import org.junit.Test;
import org.junit.runner.RunWith;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
-import javax.naming.directory.*;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
import javax.naming.ldap.LdapContext;
import java.util.HashMap;
import java.util.Set;
@@ -238,10 +247,11 @@
AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
HashMap<String,Attributes> map = new HashMap<String,Attributes>();
- NamingEnumeration list = sysRoot.search( "", "(ou=*)", controls );
+ NamingEnumeration<SearchResult> list = sysRoot.search( "", "(ou=*)", controls );
+
while ( list.hasMore() )
{
- SearchResult result = ( SearchResult ) list.next();
+ SearchResult result = list.next();
map.put( result.getName(), result.getAttributes() );
}
@@ -265,10 +275,11 @@
AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
HashMap<String, Attributes> map = new HashMap<String, Attributes>();
- NamingEnumeration list = sysRoot.search( "", "(ou=*)", controls );
+ NamingEnumeration<SearchResult> list = sysRoot.search( "", "(ou=*)", controls );
+
while ( list.hasMore() )
{
- SearchResult result = ( SearchResult ) list.next();
+ SearchResult result = list.next();
map.put( result.getName(), result.getAttributes() );
}
@@ -296,11 +307,11 @@
AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
HashMap<String, Attributes> map = new HashMap<String, Attributes>();
- NamingEnumeration list = sysRoot.search( "", "(ou=testing02)", controls );
+ NamingEnumeration<SearchResult> list = sysRoot.search( "", "(ou=testing02)", controls );
while ( list.hasMore() )
{
- SearchResult result = ( SearchResult ) list.next();
+ SearchResult result = list.next();
map.put( result.getName(), result.getAttributes() );
}
@@ -325,10 +336,11 @@
AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
HashMap<String, Attributes> map = new HashMap<String, Attributes>();
- NamingEnumeration list = sysRoot.search( "", "(objectClass=organ*)", controls );
+ NamingEnumeration<SearchResult> list = sysRoot.search( "", "(objectClass=organ*)", controls );
+
while ( list.hasMore() )
{
- SearchResult result = ( SearchResult ) list.next();
+ SearchResult result = list.next();
map.put( result.getName(), result.getAttributes() );
}
@@ -355,11 +367,12 @@
AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
HashMap<String, Attributes> map = new HashMap<String, Attributes>();
- NamingEnumeration list = sysRoot.search( "", "(|(ou={0})(ou={1}))", new Object[]
+ NamingEnumeration<SearchResult> list = sysRoot.search( "", "(|(ou={0})(ou={1}))", new Object[]
{ "testing00", "testing01" }, controls );
+
while ( list.hasMore() )
{
- SearchResult result = ( SearchResult ) list.next();
+ SearchResult result = list.next();
map.put( result.getName(), result.getAttributes() );
}
@@ -383,15 +396,16 @@
AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
HashMap<String, Attributes> map = new HashMap<String, Attributes>();
- NamingEnumeration list = sysRoot.search( "", "(ou=*)", controls );
+ NamingEnumeration<SearchResult> list = sysRoot.search( "", "(ou=*)", controls );
try
{
while ( list.hasMore() )
{
- SearchResult result = ( SearchResult ) list.next();
+ SearchResult result = list.next();
map.put( result.getName(), result.getAttributes() );
}
+
fail( "Should not get here due to a SizeLimitExceededException" );
}
catch ( LdapSizeLimitExceededException e )
@@ -415,7 +429,7 @@
AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
HashMap<String, Attributes> map = new HashMap<String, Attributes>();
- NamingEnumeration list = sysRoot.search( "", "(ou=*)", controls );
+ NamingEnumeration<SearchResult> list = sysRoot.search( "", "(ou=*)", controls );
SearchResultFilteringEnumeration srfe = ( SearchResultFilteringEnumeration ) list;
srfe.addResultFilter( new SearchResultFilter()
{
@@ -463,12 +477,14 @@
AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
HashMap<String, Attributes> map = new HashMap<String, Attributes>();
- NamingEnumeration list = sysRoot.search( "", "(name=testing00)", controls );
+ NamingEnumeration<SearchResult> list = sysRoot.search( "", "(name=testing00)", controls );
+
while ( list.hasMore() )
{
- SearchResult result = ( SearchResult ) list.next();
+ SearchResult result = list.next();
map.put( result.getName(), result.getAttributes() );
}
+
assertEquals( "size of results", 1, map.size() );
assertTrue( "contains ou=testing00,ou=system", map.containsKey( "ou=testing00,ou=system" ) );
}
@@ -487,12 +503,14 @@
AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
HashMap<String, Attributes> map = new HashMap<String, Attributes>();
- NamingEnumeration list = sysRoot.search( "", "(name=*)", controls );
+ NamingEnumeration<SearchResult> list = sysRoot.search( "", "(name=*)", controls );
+
while ( list.hasMore() )
{
- SearchResult result = ( SearchResult ) list.next();
+ SearchResult result = list.next();
map.put( result.getName(), result.getAttributes() );
}
+
assertEquals( "size of results", 19, map.size() );
assertTrue( "contains ou=testing00,ou=system", map.containsKey( "ou=testing00,ou=system" ) );
assertTrue( "contains ou=testing01,ou=system", map.containsKey( "ou=testing01,ou=system" ) );
@@ -523,12 +541,14 @@
AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
HashMap<String, Attributes> map = new HashMap<String, Attributes>();
- NamingEnumeration list = sysRoot.search( "", "(|(name=testing00)(name=testing01))", controls );
+ NamingEnumeration<SearchResult> list = sysRoot.search( "", "(|(name=testing00)(name=testing01))", controls );
+
while ( list.hasMore() )
{
- SearchResult result = ( SearchResult ) list.next();
+ SearchResult result = list.next();
map.put( result.getName(), result.getAttributes() );
}
+
assertEquals( "size of results", 2, map.size() );
assertTrue( "contains ou=testing00,ou=system", map.containsKey( "ou=testing00,ou=system" ) );
assertTrue( "contains ou=testing01,ou=system", map.containsKey( "ou=testing01,ou=system" ) );
@@ -548,12 +568,14 @@
AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
HashMap<String, Attributes> map = new HashMap<String, Attributes>();
- NamingEnumeration list = sysRoot.search( "", "(name=testing*)", controls );
+ NamingEnumeration<SearchResult> list = sysRoot.search( "", "(name=testing*)", controls );
+
while ( list.hasMore() )
{
- SearchResult result = ( SearchResult ) list.next();
+ SearchResult result = list.next();
map.put( result.getName(), result.getAttributes() );
}
+
assertEquals( "size of results", 3, map.size() );
assertTrue( "contains ou=testing00,ou=system", map.containsKey( "ou=testing00,ou=system" ) );
assertTrue( "contains ou=testing01,ou=system", map.containsKey( "ou=testing01,ou=system" ) );
@@ -579,12 +601,14 @@
"(2.5.4.44=testing*)(2.5.4.11=testing*)(2.5.4.4=testing*)(2.5.4.8.1=testing*)" +
"(2.5.4.12=testing*)(1.3.6.1.4.1.18060.0.4.1.2.3=testing*)" +
"(2.5.4.7=testing*)(2.5.4.3=testing*)(2.5.4.8=testing*)(2.5.4.42=testing*))";
- NamingEnumeration list = sysRoot.search( "", filter, controls );
+ NamingEnumeration<SearchResult> list = sysRoot.search( "", filter, controls );
+
while ( list.hasMore() )
{
- SearchResult result = ( SearchResult ) list.next();
+ SearchResult result = list.next();
map.put( result.getName(), result.getAttributes() );
}
+
assertEquals( "size of results", 3, map.size() );
assertTrue( "contains ou=testing00,ou=system", map.containsKey( "ou=testing00,ou=system" ) );
assertTrue( "contains ou=testing01,ou=system", map.containsKey( "ou=testing01,ou=system" ) );
@@ -606,10 +630,11 @@
AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
HashMap<String, Attributes> map = new HashMap<String, Attributes>();
- NamingEnumeration list = sysRoot.search( "", "(ou=testing00)", controls );
+ NamingEnumeration<SearchResult> list = sysRoot.search( "", "(ou=testing00)", controls );
+
while ( list.hasMore() )
{
- SearchResult result = ( SearchResult ) list.next();
+ SearchResult result = list.next();
map.put( result.getName(), result.getAttributes() );
}
@@ -636,10 +661,11 @@
AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
HashMap<String, Attributes> map = new HashMap<String, Attributes>();
- NamingEnumeration list = sysRoot.search( "", "(ou=testing00)", controls );
+ NamingEnumeration<SearchResult> list = sysRoot.search( "", "(ou=testing00)", controls );
+
while ( list.hasMore() )
{
- SearchResult result = ( SearchResult ) list.next();
+ SearchResult result = list.next();
map.put( result.getName(), result.getAttributes() );
}
@@ -722,10 +748,11 @@
AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
HashMap<String, Attributes> map = new HashMap<String, Attributes>();
- NamingEnumeration list = sysRoot.search( "", "(ou=testing01)", controls );
+ NamingEnumeration<SearchResult> list = sysRoot.search( "", "(ou=testing01)", controls );
+
while ( list.hasMore() )
{
- SearchResult result = ( SearchResult ) list.next();
+ SearchResult result = list.next();
map.put( result.getName(), result.getAttributes() );
}
@@ -754,10 +781,11 @@
AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
HashMap<String, Attributes> map = new HashMap<String, Attributes>();
- NamingEnumeration list = sysRoot.search( "", "(ou=testing01)", controls );
+ NamingEnumeration<SearchResult> list = sysRoot.search( "", "(ou=testing01)", controls );
+
while ( list.hasMore() )
{
- SearchResult result = ( SearchResult ) list.next();
+ SearchResult result = list.next();
map.put( result.getName(), result.getAttributes() );
}
@@ -786,10 +814,11 @@
AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
HashMap<String, Attributes> map = new HashMap<String, Attributes>();
- NamingEnumeration list = sysRoot.search( "", "(ou=testing01)", controls );
+ NamingEnumeration<SearchResult> list = sysRoot.search( "", "(ou=testing01)", controls );
+
while ( list.hasMore() )
{
- SearchResult result = ( SearchResult ) list.next();
+ SearchResult result = list.next();
map.put( result.getName(), result.getAttributes() );
}
@@ -818,10 +847,11 @@
AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
HashMap<String, Attributes> map = new HashMap<String, Attributes>();
- NamingEnumeration list = sysRoot.search( "", "(ou=testing01)", controls );
+ NamingEnumeration<SearchResult> list = sysRoot.search( "", "(ou=testing01)", controls );
+
while ( list.hasMore() )
{
- SearchResult result = ( SearchResult ) list.next();
+ SearchResult result = list.next();
map.put( result.getName(), result.getAttributes() );
}
@@ -850,10 +880,11 @@
AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
HashMap<String, Attributes> map = new HashMap<String, Attributes>();
- NamingEnumeration list = sysRoot.search( "", "(ou=testing01)", controls );
+ NamingEnumeration<SearchResult> list = sysRoot.search( "", "(ou=testing01)", controls );
+
while ( list.hasMore() )
{
- SearchResult result = ( SearchResult ) list.next();
+ SearchResult result = list.next();
map.put( result.getName(), result.getAttributes() );
}
@@ -882,11 +913,12 @@
AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
HashMap<String, Attributes> map = new HashMap<String, Attributes>();
- NamingEnumeration list = sysRoot.search( "", "(ou=testing01)", controls );
+ NamingEnumeration<SearchResult> list = sysRoot.search( "", "(ou=testing01)", controls );
+
while ( list.hasMore() )
{
- SearchResult result = ( SearchResult ) list.next();
+ SearchResult result = list.next();
map.put( result.getName(), result.getAttributes() );
}
@@ -916,11 +948,11 @@
ctls.setReturningAttributes( new String[]
{ "cn", "sn;unknownOption" } );
- NamingEnumeration result = sysRoot.search( RDN, FILTER, ctls );
+ NamingEnumeration<SearchResult> result = sysRoot.search( RDN, FILTER, ctls );
if ( result.hasMore() )
{
- SearchResult entry = ( SearchResult ) result.next();
+ SearchResult entry = result.next();
Attributes attrs = entry.getAttributes();
Attribute cn = attrs.get( "cn" );
@@ -954,11 +986,11 @@
ctls.setReturningAttributes( new String[]
{ "cn", "cn" } );
- NamingEnumeration result = sysRoot.search( RDN, FILTER, ctls );
+ NamingEnumeration<SearchResult> result = sysRoot.search( RDN, FILTER, ctls );
if ( result.hasMore() )
{
- SearchResult entry = ( SearchResult ) result.next();
+ SearchResult entry = result.next();
Attributes attrs = entry.getAttributes();
Attribute cn = attrs.get( "cn" );
@@ -1025,11 +1057,11 @@
}
Set<String> results = new HashSet<String>();
- NamingEnumeration list = getSystemContext( service ).search( "ou=groups", filter, controls );
+ NamingEnumeration<SearchResult> list = getSystemContext( service ).search( "ou=groups", filter, controls );
while( list.hasMore() )
{
- SearchResult result = ( SearchResult ) list.next();
+ SearchResult result = list.next();
results.add( result.getName() );
}
@@ -1057,7 +1089,7 @@
LdapContext sysRoot = getSystemContext( service );
createData( sysRoot );
- Set results = searchGroups( "(objectClass=posixGroup)" );
+ Set<String> results = searchGroups( "(objectClass=posixGroup)" );
assertTrue( results.contains( "cn=testGroup0,ou=groups,ou=system" ) );
assertTrue( results.contains( "cn=testGroup1,ou=groups,ou=system" ) );
assertTrue( results.contains( "cn=testGroup2,ou=groups,ou=system" ) );
@@ -1073,7 +1105,7 @@
LdapContext sysRoot = getSystemContext( service );
createData( sysRoot );
- Set results = searchGroups( "(gidNumber<=5)" );
+ Set<String> results = searchGroups( "(gidNumber<=5)" );
assertTrue( results.contains( "cn=testGroup0,ou=groups,ou=system" ) );
assertTrue( results.contains( "cn=testGroup1,ou=groups,ou=system" ) );
assertTrue( results.contains( "cn=testGroup2,ou=groups,ou=system" ) );
@@ -1121,7 +1153,7 @@
LdapContext sysRoot = getSystemContext( service );
createData( sysRoot );
- Set results = searchGroups( "(gidNumber>=0)" );
+ Set<String> results = searchGroups( "(gidNumber>=0)" );
assertTrue( results.contains( "cn=testGroup0,ou=groups,ou=system" ) );
assertTrue( results.contains( "cn=testGroup1,ou=groups,ou=system" ) );
assertTrue( results.contains( "cn=testGroup2,ou=groups,ou=system" ) );
@@ -1161,7 +1193,7 @@
LdapContext sysRoot = getSystemContext( service );
createData( sysRoot );
- Set results = searchGroups( "(!(gidNumber=4))" );
+ Set<String> results = searchGroups( "(!(gidNumber=4))" );
assertTrue( results.contains( "cn=testGroup0,ou=groups,ou=system" ) );
assertTrue( results.contains( "cn=testGroup1,ou=groups,ou=system" ) );
assertTrue( results.contains( "cn=testGroup2,ou=groups,ou=system" ) );
@@ -1180,7 +1212,7 @@
SearchControls controls = new SearchControls();
controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
- Set results = searchGroups( "(!(gidNumber=4))", controls );
+ Set<String> results = searchGroups( "(!(gidNumber=4))", controls );
assertTrue( results.contains( "cn=testGroup0,ou=groups,ou=system" ) );
assertTrue( results.contains( "cn=testGroup1,ou=groups,ou=system" ) );
assertTrue( results.contains( "cn=testGroup2,ou=groups,ou=system" ) );
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchWithIndicesITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchWithIndicesITest.java?rev=606912&r1=606911&r2=606912&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchWithIndicesITest.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchWithIndicesITest.java Wed Dec 26 07:30:04 2007
@@ -42,7 +42,11 @@
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
-import javax.naming.directory.*;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
import javax.naming.ldap.LdapContext;
import java.util.HashSet;
import java.util.Set;
@@ -156,11 +160,11 @@
}
Set<String> results = new HashSet<String>();
- NamingEnumeration list = getSystemContext( service ).search( "ou=groups", filter, controls );
+ NamingEnumeration<SearchResult> list = getSystemContext( service ).search( "ou=groups", filter, controls );
while( list.hasMore() )
{
- SearchResult result = ( SearchResult ) list.next();
+ SearchResult result = list.next();
results.add( result.getName() );
}
@@ -186,7 +190,7 @@
public void testLessThanSearchWithIndices() throws Exception
{
createData();
- Set results = searchGroups( "(gidNumber<=5)" );
+ Set<String> results = searchGroups( "(gidNumber<=5)" );
assertTrue( results.contains( "cn=testGroup0,ou=groups,ou=system" ) );
assertTrue( results.contains( "cn=testGroup1,ou=groups,ou=system" ) );
assertTrue( results.contains( "cn=testGroup2,ou=groups,ou=system" ) );
@@ -232,7 +236,7 @@
public void testGreaterThanSearchWithIndices() throws Exception
{
createData();
- Set results = searchGroups( "(gidNumber>=0)" );
+ Set<String> results = searchGroups( "(gidNumber>=0)" );
assertTrue( results.contains( "cn=testGroup0,ou=groups,ou=system" ) );
assertTrue( results.contains( "cn=testGroup1,ou=groups,ou=system" ) );
assertTrue( results.contains( "cn=testGroup2,ou=groups,ou=system" ) );
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java?rev=606912&r1=606911&r2=606912&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java Wed Dec 26 07:30:04 2007
@@ -27,7 +27,11 @@
import org.apache.directory.shared.ldap.message.AliasDerefMode;
import org.apache.directory.shared.ldap.message.AttributeImpl;
import org.apache.directory.shared.ldap.message.AttributesImpl;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -89,11 +93,11 @@
Attributes returned = sysRoot.getAttributes( "cn=kevin Spacey" );
- NamingEnumeration attrList = returned.getAll();
+ NamingEnumeration<? extends Attribute> attrList = returned.getAll();
while ( attrList.hasMore() )
{
- Attribute attr = ( Attribute ) attrList.next();
+ Attribute attr = attrList.next();
if ( attr.getID().equalsIgnoreCase( "cn" ) )
{
@@ -103,7 +107,7 @@
if ( attr.getID().equalsIgnoreCase( "objectClass" ) )
{
- NamingEnumeration values = attr.getAll();
+ NamingEnumeration<?> values = attr.getAll();
Set<String> expectedValues = new HashSet<String>();
expectedValues.add( "top" );
@@ -161,11 +165,11 @@
Attributes returned = sysRoot.getAttributes( "cn=kevin Spacey 2" );
- NamingEnumeration attrList = returned.getAll();
+ NamingEnumeration<? extends Attribute> attrList = returned.getAll();
while ( attrList.hasMore() )
{
- Attribute attr = ( Attribute ) attrList.next();
+ Attribute attr = attrList.next();
if ( attr.getID().equalsIgnoreCase( "cn" ) )
{
@@ -175,7 +179,7 @@
if ( attr.getID().equalsIgnoreCase( "objectClass" ) )
{
- NamingEnumeration values = attr.getAll();
+ NamingEnumeration<?> values = attr.getAll();
Set<String> expectedValues = new HashSet<String>();
expectedValues.add( "top" );
@@ -302,11 +306,11 @@
AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
HashMap<String, Attributes> map = new HashMap<String, Attributes>();
- NamingEnumeration list = sysRoot.search( "", "(uniqueMember=cn = kevin spacey, dc=example, dc=org)", controls );
+ NamingEnumeration<SearchResult> list = sysRoot.search( "", "(uniqueMember=cn = kevin spacey, dc=example, dc=org)", controls );
while ( list.hasMore() )
{
- SearchResult result = ( SearchResult ) list.next();
+ SearchResult result = list.next();
map.put( result.getName().toLowerCase(), result.getAttributes() );
}
@@ -354,11 +358,11 @@
AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
HashMap<String, Attributes> map = new HashMap<String, Attributes>();
- NamingEnumeration list = sysRoot.search( "", "(uniqueMember=cn = Kevin Spacey , dc = example , dc = ORG)", controls );
+ NamingEnumeration<SearchResult> list = sysRoot.search( "", "(uniqueMember=cn = Kevin Spacey , dc = example , dc = ORG)", controls );
while ( list.hasMore() )
{
- SearchResult result = ( SearchResult ) list.next();
+ SearchResult result = list.next();
map.put( result.getName().toLowerCase(), result.getAttributes() );
}
@@ -405,7 +409,7 @@
sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES,
AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
- NamingEnumeration list = sysRoot.search( "", "(uniqueMember=cn=cevin spacey,dc=example,dc=org)", controls );
+ NamingEnumeration<SearchResult> list = sysRoot.search( "", "(uniqueMember=cn=cevin spacey,dc=example,dc=org)", controls );
assertFalse( list.hasMore() );
}
@@ -445,11 +449,11 @@
AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
HashMap<String, Attributes> map = new HashMap<String, Attributes>();
- NamingEnumeration list = sysRoot.search( "", "(uniqueMember=cn= Kevin Spacey, dc=example, dc=org #'010101'B)", controls );
+ NamingEnumeration<SearchResult> list = sysRoot.search( "", "(uniqueMember=cn= Kevin Spacey, dc=example, dc=org #'010101'B)", controls );
while ( list.hasMore() )
{
- SearchResult result = ( SearchResult ) list.next();
+ SearchResult result = list.next();
map.put( result.getName().toLowerCase(), result.getAttributes() );
}
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceIT.java?rev=606912&r1=606911&r2=606912&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceIT.java Wed Dec 26 07:30:04 2007
@@ -24,7 +24,9 @@
import org.apache.directory.server.core.integ.CiRunner;
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
import org.apache.directory.shared.ldap.message.AttributesImpl;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java?rev=606912&r1=606911&r2=606912&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java Wed Dec 26 07:30:04 2007
@@ -32,14 +32,27 @@
import org.apache.directory.shared.ldap.message.AttributesImpl;
import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.util.StringTools;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
import org.junit.Test;
import org.junit.runner.RunWith;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.NoPermissionException;
-import javax.naming.directory.*;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.BasicAttribute;
+import javax.naming.directory.BasicAttributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.InvalidAttributeValueException;
+import javax.naming.directory.ModificationItem;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
import javax.naming.ldap.LdapContext;
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/prefs/PreferencesIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/prefs/PreferencesIT.java?rev=606912&r1=606911&r2=606912&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/prefs/PreferencesIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/prefs/PreferencesIT.java Wed Dec 26 07:30:04 2007
@@ -22,7 +22,9 @@
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.integ.CiRunner;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java?rev=606912&r1=606911&r2=606912&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java Wed Dec 26 07:30:04 2007
@@ -34,7 +34,10 @@
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.fail;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java?rev=606912&r1=606911&r2=606912&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java Wed Dec 26 07:30:04 2007
@@ -40,7 +40,10 @@
import org.apache.directory.shared.ldap.schema.MatchingRule;
import org.apache.directory.shared.ldap.schema.Normalizer;
import org.apache.directory.shared.ldap.schema.Syntax;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.fail;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -124,7 +127,7 @@
assertTrue( getComparatorRegistry().hasComparator( OID ) );
assertEquals( getComparatorRegistry().getSchemaName( OID ), "apachemeta" );
- Class clazz = getComparatorRegistry().lookup( OID ).getClass();
+ Class<?> clazz = getComparatorRegistry().lookup( OID ).getClass();
assertEquals( clazz, StringComparator.class );
}
@@ -155,7 +158,7 @@
assertTrue( getComparatorRegistry().hasComparator( OID ) );
assertEquals( getComparatorRegistry().getSchemaName( OID ), "apachemeta" );
- Class clazz = getComparatorRegistry().lookup( OID ).getClass();
+ Class<?> clazz = getComparatorRegistry().lookup( OID ).getClass();
assertEquals( clazz.getName(), "DummyComparator" );
}
@@ -207,7 +210,7 @@
}
assertTrue( getComparatorRegistry().hasComparator( NEW_OID ) );
- Class clazz = getComparatorRegistry().lookup( NEW_OID ).getClass();
+ Class<?> clazz = getComparatorRegistry().lookup( NEW_OID ).getClass();
assertEquals( clazz, StringComparator.class );
}
@@ -231,7 +234,7 @@
assertEquals( "comparator schema should be set to apache not apachemeta",
getComparatorRegistry().getSchemaName( OID ), "apache" );
- Class clazz = getComparatorRegistry().lookup( OID ).getClass();
+ Class<?> clazz = getComparatorRegistry().lookup( OID ).getClass();
assertEquals( clazz, StringComparator.class );
}
@@ -258,7 +261,7 @@
assertEquals( "comparator with new oid should have schema set to apache NOT apachemeta",
getComparatorRegistry().getSchemaName( NEW_OID ), "apache" );
- Class clazz = getComparatorRegistry().lookup( NEW_OID ).getClass();
+ Class<?> clazz = getComparatorRegistry().lookup( NEW_OID ).getClass();
assertEquals( clazz, StringComparator.class );
}
@@ -282,7 +285,7 @@
assertEquals( "comparator schema should be set to apachemeta",
getComparatorRegistry().getSchemaName( OID ), "apachemeta" );
- Class clazz = getComparatorRegistry().lookup( OID ).getClass();
+ Class<?> clazz = getComparatorRegistry().lookup( OID ).getClass();
assertEquals( clazz, IntegerComparator.class );
}
@@ -305,7 +308,7 @@
assertEquals( "comparator schema should be set to apachemeta",
getComparatorRegistry().getSchemaName( OID ), "apachemeta" );
- Class clazz = getComparatorRegistry().lookup( OID ).getClass();
+ Class<?> clazz = getComparatorRegistry().lookup( OID ).getClass();
assertEquals( clazz, IntegerComparator.class );
}
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java?rev=606912&r1=606911&r2=606912&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java Wed Dec 26 07:30:04 2007
@@ -33,7 +33,10 @@
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.MatchingRule;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.fail;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java?rev=606912&r1=606911&r2=606912&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java Wed Dec 26 07:30:04 2007
@@ -35,8 +35,16 @@
import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.schema.*;
-import static org.junit.Assert.*;
+import org.apache.directory.shared.ldap.schema.DeepTrimNormalizer;
+import org.apache.directory.shared.ldap.schema.MatchingRule;
+import org.apache.directory.shared.ldap.schema.NoOpNormalizer;
+import org.apache.directory.shared.ldap.schema.Normalizer;
+import org.apache.directory.shared.ldap.schema.Syntax;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.fail;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -120,7 +128,7 @@
assertTrue( getNormalizerRegistry().hasNormalizer( OID ) );
assertEquals( getNormalizerRegistry().getSchemaName( OID ), "apachemeta" );
- Class clazz = getNormalizerRegistry().lookup( OID ).getClass();
+ Class<?> clazz = getNormalizerRegistry().lookup( OID ).getClass();
assertEquals( clazz, NoOpNormalizer.class );
}
@@ -151,7 +159,7 @@
assertTrue( getNormalizerRegistry().hasNormalizer( OID ) );
assertEquals( getNormalizerRegistry().getSchemaName( OID ), "apachemeta" );
- Class clazz = getNormalizerRegistry().lookup( OID ).getClass();
+ Class<?> clazz = getNormalizerRegistry().lookup( OID ).getClass();
assertEquals( clazz.getName(), "DummyNormalizer" );
}
@@ -205,7 +213,7 @@
}
assertTrue( getNormalizerRegistry().hasNormalizer( NEW_OID ) );
- Class clazz = getNormalizerRegistry().lookup( NEW_OID ).getClass();
+ Class<?> clazz = getNormalizerRegistry().lookup( NEW_OID ).getClass();
assertEquals( clazz, NoOpNormalizer.class );
}
@@ -229,7 +237,7 @@
assertEquals( "normalizer schema should be set to apache not apachemeta",
getNormalizerRegistry().getSchemaName( OID ), "apache" );
- Class clazz = getNormalizerRegistry().lookup( OID ).getClass();
+ Class<?> clazz = getNormalizerRegistry().lookup( OID ).getClass();
assertEquals( clazz, NoOpNormalizer.class );
}
@@ -256,7 +264,7 @@
assertEquals( "normalizer with new oid should have schema set to apache NOT apachemeta",
getNormalizerRegistry().getSchemaName( NEW_OID ), "apache" );
- Class clazz = getNormalizerRegistry().lookup( NEW_OID ).getClass();
+ Class<?> clazz = getNormalizerRegistry().lookup( NEW_OID ).getClass();
assertEquals( clazz, NoOpNormalizer.class );
}
@@ -280,7 +288,7 @@
assertEquals( "normalizer schema should be set to apachemeta",
getNormalizerRegistry().getSchemaName( OID ), "apachemeta" );
- Class clazz = getNormalizerRegistry().lookup( OID ).getClass();
+ Class<?> clazz = getNormalizerRegistry().lookup( OID ).getClass();
assertEquals( clazz, DeepTrimNormalizer.class );
}
@@ -303,7 +311,7 @@
assertEquals( "normalizer schema should be set to apachemeta",
getNormalizerRegistry().getSchemaName( OID ), "apachemeta" );
- Class clazz = getNormalizerRegistry().lookup( OID ).getClass();
+ Class<?> clazz = getNormalizerRegistry().lookup( OID ).getClass();
assertEquals( clazz, DeepTrimNormalizer.class );
}
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java?rev=606912&r1=606911&r2=606912&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java Wed Dec 26 07:30:04 2007
@@ -35,7 +35,10 @@
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.ObjectClass;
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.fail;
import org.junit.runner.RunWith;
import javax.naming.NamingException;
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java?rev=606912&r1=606911&r2=606912&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java Wed Dec 26 07:30:04 2007
@@ -33,7 +33,12 @@
import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java?rev=606912&r1=606911&r2=606912&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java Wed Dec 26 07:30:04 2007
@@ -38,7 +38,10 @@
import org.apache.directory.shared.ldap.schema.Syntax;
import org.apache.directory.shared.ldap.schema.syntax.AcceptAllSyntaxChecker;
import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.fail;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -121,7 +124,7 @@
assertTrue( getSyntaxCheckerRegistry().hasSyntaxChecker( OID ) );
assertEquals( getSyntaxCheckerRegistry().getSchemaName( OID ), "apachemeta" );
- Class clazz = getSyntaxCheckerRegistry().lookup( OID ).getClass();
+ Class<?> clazz = getSyntaxCheckerRegistry().lookup( OID ).getClass();
assertEquals( clazz, AcceptAllSyntaxChecker.class );
}
@@ -152,7 +155,7 @@
assertTrue( getSyntaxCheckerRegistry().hasSyntaxChecker( OID ) );
assertEquals( getSyntaxCheckerRegistry().getSchemaName( OID ), "apachemeta" );
- Class clazz = getSyntaxCheckerRegistry().lookup( OID ).getClass();
+ Class<?> clazz = getSyntaxCheckerRegistry().lookup( OID ).getClass();
assertEquals( clazz.getName(), "DummySyntaxChecker" );
}
@@ -206,7 +209,7 @@
}
assertTrue( getSyntaxCheckerRegistry().hasSyntaxChecker( NEW_OID ) );
- Class clazz = getSyntaxCheckerRegistry().lookup( NEW_OID ).getClass();
+ Class<?> clazz = getSyntaxCheckerRegistry().lookup( NEW_OID ).getClass();
assertEquals( clazz, AcceptAllSyntaxChecker.class );
}
@@ -230,7 +233,7 @@
assertEquals( "syntaxChecker schema should be set to apache not apachemeta",
getSyntaxCheckerRegistry().getSchemaName( OID ), "apache" );
- Class clazz = getSyntaxCheckerRegistry().lookup( OID ).getClass();
+ Class<?> clazz = getSyntaxCheckerRegistry().lookup( OID ).getClass();
assertEquals( clazz, AcceptAllSyntaxChecker.class );
}
@@ -257,7 +260,7 @@
assertEquals( "syntaxChecker with new oid should have schema set to apache NOT apachemeta",
getSyntaxCheckerRegistry().getSchemaName( NEW_OID ), "apache" );
- Class clazz = getSyntaxCheckerRegistry().lookup( NEW_OID ).getClass();
+ Class<?> clazz = getSyntaxCheckerRegistry().lookup( NEW_OID ).getClass();
assertEquals( clazz, AcceptAllSyntaxChecker.class );
}
@@ -281,7 +284,7 @@
assertEquals( "syntaxChecker schema should be set to apachemeta",
getSyntaxCheckerRegistry().getSchemaName( OID ), "apachemeta" );
- Class clazz = getSyntaxCheckerRegistry().lookup( OID ).getClass();
+ Class<?> clazz = getSyntaxCheckerRegistry().lookup( OID ).getClass();
assertEquals( clazz, BogusSyntaxChecker.class );
}
@@ -304,7 +307,7 @@
assertEquals( "syntaxChecker schema should be set to apachemeta",
getSyntaxCheckerRegistry().getSchemaName( OID ), "apachemeta" );
- Class clazz = getSyntaxCheckerRegistry().lookup( OID ).getClass();
+ Class<?> clazz = getSyntaxCheckerRegistry().lookup( OID ).getClass();
assertEquals( clazz, BogusSyntaxChecker.class );
}
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java?rev=606912&r1=606911&r2=606912&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java Wed Dec 26 07:30:04 2007
@@ -37,13 +37,21 @@
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.Syntax;
import org.apache.directory.shared.ldap.schema.syntax.AcceptAllSyntaxChecker;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.fail;
import org.junit.Test;
import org.junit.runner.RunWith;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
-import javax.naming.directory.*;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
+
import java.util.ArrayList;
import java.util.List;
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java?rev=606912&r1=606911&r2=606912&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java Wed Dec 26 07:30:04 2007
@@ -30,13 +30,23 @@
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.syntax.AttributeTypeDescription;
import org.apache.directory.shared.ldap.schema.syntax.parser.AttributeTypeDescriptionSchemaParser;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
import org.junit.Test;
import org.junit.runner.RunWith;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
-import javax.naming.directory.*;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
+
import java.util.ArrayList;
import java.util.List;
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java?rev=606912&r1=606911&r2=606912&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java Wed Dec 26 07:30:04 2007
@@ -30,7 +30,12 @@
import org.apache.directory.shared.ldap.ldif.LdifReader;
import org.apache.directory.shared.ldap.message.AttributesImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/sp/LdapClassLoaderIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/sp/LdapClassLoaderIT.java?rev=606912&r1=606911&r2=606912&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/sp/LdapClassLoaderIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/sp/LdapClassLoaderIT.java Wed Dec 26 07:30:04 2007
@@ -82,7 +82,7 @@
// load the class
LdapClassLoader loader = new LdapClassLoader( ( ServerLdapContext ) ( root.lookup( "" ) ) );
- Class clazz = loader.loadClass( "HelloWorld" );
+ Class<?> clazz = loader.loadClass( "HelloWorld" );
// assert class loaded successfully
assertEquals( clazz.getName(), "HelloWorld" );
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceIT.java?rev=606912&r1=606911&r2=606912&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceIT.java Wed Dec 26 07:30:04 2007
@@ -28,13 +28,19 @@
import org.apache.directory.shared.ldap.message.AttributeImpl;
import org.apache.directory.shared.ldap.message.AttributesImpl;
import org.apache.directory.shared.ldap.message.ModificationItemImpl;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
import org.junit.Test;
import org.junit.runner.RunWith;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
-import javax.naming.directory.*;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
import javax.naming.ldap.LdapContext;
import java.util.HashMap;
import java.util.Map;
@@ -143,12 +149,14 @@
SearchControls controls = new SearchControls();
controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
controls.setReturningAttributes( new String[] { "+", "*" } );
- NamingEnumeration results = sysRoot.search( "", "(objectClass=*)", controls );
+ NamingEnumeration<SearchResult> results = sysRoot.search( "", "(objectClass=*)", controls );
+
while ( results.hasMore() )
{
- SearchResult result = ( SearchResult ) results.next();
+ SearchResult result = results.next();
resultMap.put( result.getName(), result.getAttributes() );
}
+
return resultMap;
}
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceEntryModificationHandlingIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceEntryModificationHandlingIT.java?rev=606912&r1=606911&r2=606912&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceEntryModificationHandlingIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceEntryModificationHandlingIT.java Wed Dec 26 07:30:04 2007
@@ -35,7 +35,11 @@
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
-import javax.naming.directory.*;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
import javax.naming.ldap.LdapContext;
import java.util.HashMap;
import java.util.Map;
@@ -104,12 +108,14 @@
controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
controls.setReturningAttributes( new String[]
{ "+", "*" } );
- NamingEnumeration results = sysRoot.search( "", "(objectClass=*)", controls );
+ NamingEnumeration<SearchResult> results = sysRoot.search( "", "(objectClass=*)", controls );
+
while ( results.hasMore() )
{
- SearchResult result = ( SearchResult ) results.next();
+ SearchResult result = results.next();
resultMap.put( result.getName(), result.getAttributes() );
}
+
return resultMap;
}
@@ -125,8 +131,8 @@
//----------------------------------------------------------------------
- Map results = getAllEntries();
- Attributes testEntry = ( Attributes ) results.get( "cn=testEntry,ou=system" );
+ Map<String, Attributes> results = getAllEntries();
+ Attributes testEntry = results.get( "cn=testEntry,ou=system" );
Attribute collectiveAttributeSubentries = testEntry.get( "collectiveAttributeSubentries" );
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java?rev=606912&r1=606911&r2=606912&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java Wed Dec 26 07:30:04 2007
@@ -28,14 +28,23 @@
import org.apache.directory.shared.ldap.message.AttributesImpl;
import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.message.SubentriesControl;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
-import javax.naming.directory.*;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
import javax.naming.ldap.Control;
import javax.naming.ldap.LdapContext;
import java.util.HashMap;
@@ -118,12 +127,14 @@
controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
controls.setReturningAttributes( new String[]
{ "+", "*" } );
- NamingEnumeration results = sysRoot.search( "", "(objectClass=*)", controls );
+ NamingEnumeration<SearchResult> results = sysRoot.search( "", "(objectClass=*)", controls );
+
while ( results.hasMore() )
{
- SearchResult result = ( SearchResult ) results.next();
+ SearchResult result = results.next();
resultMap.put( result.getName(), result.getAttributes() );
}
+
return resultMap;
}
@@ -874,12 +885,14 @@
// perform the search without the control
Map<String, SearchResult> entries = new HashMap<String, SearchResult>();
- NamingEnumeration list = sysRoot.search( "", "(objectClass=*)", searchControls );
+ NamingEnumeration<SearchResult> list = sysRoot.search( "", "(objectClass=*)", searchControls );
+
while ( list.hasMore() )
{
SearchResult result = ( SearchResult ) list.next();
entries.put( result.getName(), result );
}
+
assertTrue( entries.size() > 1 );
assertNull( entries.get( "cn=testsubentry,ou=system" ) );
@@ -905,12 +918,14 @@
searchControls.setSearchScope( SearchControls.OBJECT_SCOPE );
Map<String, SearchResult> entries = new HashMap<String, SearchResult>();
- NamingEnumeration list = sysRoot.search( "cn=testsubentry", "(objectClass=subentry)", searchControls );
+ NamingEnumeration<SearchResult> list = sysRoot.search( "cn=testsubentry", "(objectClass=subentry)", searchControls );
+
while ( list.hasMore() )
{
- SearchResult result = ( SearchResult ) list.next();
+ SearchResult result = list.next();
entries.put( result.getName(), result );
}
+
assertEquals( 1, entries.size() );
assertNotNull( entries.get( "cn=testsubentry,ou=system" ) );
}
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceObjectClassChangeHandlingIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceObjectClassChangeHandlingIT.java?rev=606912&r1=606911&r2=606912&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceObjectClassChangeHandlingIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceObjectClassChangeHandlingIT.java Wed Dec 26 07:30:04 2007
@@ -35,7 +35,11 @@
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
-import javax.naming.directory.*;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
import javax.naming.ldap.LdapContext;
import java.util.HashMap;
import java.util.Map;
@@ -113,10 +117,11 @@
controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
controls.setReturningAttributes( new String[]
{ "+", "*" } );
- NamingEnumeration results = sysRoot.search( "", "(objectClass=*)", controls );
+ NamingEnumeration<SearchResult> results = sysRoot.search( "", "(objectClass=*)", controls );
+
while ( results.hasMore() )
{
- SearchResult result = ( SearchResult ) results.next();
+ SearchResult result = results.next();
resultMap.put( result.getName(), result.getAttributes() );
}
return resultMap;
@@ -134,8 +139,8 @@
//----------------------------------------------------------------------
- Map results = getAllEntries();
- Attributes testEntry = ( Attributes ) results.get( "cn=testEntry,ou=system" );
+ Map<String, Attributes> results = getAllEntries();
+ Attributes testEntry = results.get( "cn=testEntry,ou=system" );
Attribute collectiveAttributeSubentries = testEntry.get( "collectiveAttributeSubentries" );
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/trigger/SubentryServiceForTriggersIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/trigger/SubentryServiceForTriggersIT.java?rev=606912&r1=606911&r2=606912&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/trigger/SubentryServiceForTriggersIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/trigger/SubentryServiceForTriggersIT.java Wed Dec 26 07:30:04 2007
@@ -29,14 +29,21 @@
import org.apache.directory.shared.ldap.message.AttributeImpl;
import org.apache.directory.shared.ldap.message.AttributesImpl;
import org.apache.directory.shared.ldap.message.ModificationItemImpl;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
-import javax.naming.directory.*;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
import javax.naming.ldap.LdapContext;
import java.util.HashMap;
import java.util.Map;
@@ -118,10 +125,11 @@
controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
controls.setReturningAttributes( new String[]
{ "+", "*" } );
- NamingEnumeration results = sysRoot.search( "", "(objectClass=*)", controls );
+ NamingEnumeration<SearchResult> results = sysRoot.search( "", "(objectClass=*)", controls );
+
while ( results.hasMore() )
{
- SearchResult result = ( SearchResult ) results.next();
+ SearchResult result = results.next();
resultMap.put( result.getName(), result.getAttributes() );
}
return resultMap;