Author: akarasulu
Date: Tue Nov 9 00:14:51 2004
New Revision: 57005
Modified:
incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/jndi/EveContextFactory.java
incubator/directory/eve/trunk/jndi-provider/src/test/org/apache/eve/jndi/DestroyContextTest.java
incubator/directory/eve/trunk/jndi-provider/src/test/org/apache/eve/jndi/SearchContextTest.java
Log:
fixed a couple of broken test cases
Modified:
incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/jndi/EveContextFactory.java
==============================================================================
---
incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/jndi/EveContextFactory.java
(original)
+++
incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/jndi/EveContextFactory.java
Tue Nov 9 00:14:51 2004
@@ -194,7 +194,11 @@
try
{
this.provider.shutdown();
- this.fe.stop();
+
+ if ( this.fe != null )
+ {
+ this.fe.stop();
+ }
}
catch( Throwable t )
{
Modified:
incubator/directory/eve/trunk/jndi-provider/src/test/org/apache/eve/jndi/DestroyContextTest.java
==============================================================================
---
incubator/directory/eve/trunk/jndi-provider/src/test/org/apache/eve/jndi/DestroyContextTest.java
(original)
+++
incubator/directory/eve/trunk/jndi-provider/src/test/org/apache/eve/jndi/DestroyContextTest.java
Tue Nov 9 00:14:51 2004
@@ -18,9 +18,9 @@
import javax.naming.NamingException;
+import javax.naming.directory.*;
import org.apache.ldap.common.exception.LdapNameNotFoundException;
-import org.apache.ldap.common.exception.LdapNameNotFoundException;
/**
@@ -35,9 +35,99 @@
{
super.setUp();
- CreateContextTest createTest = new CreateContextTest();
- createTest.setUp();
- createTest.testCreateContexts();
+ /*
+ * create ou=testing00,ou=system
+ */
+ Attributes attributes = new BasicAttributes();
+ Attribute attribute = new BasicAttribute( "objectClass" );
+ attribute.add( "top" );
+ attribute.add( "organizationalUnit" );
+ attributes.put( attribute );
+ attributes.put( "ou", "testing00" );
+ DirContext ctx = sysRoot.createSubcontext( "ou=testing00", attributes
);
+ assertNotNull( ctx );
+
+ ctx = ( DirContext ) sysRoot.lookup( "ou=testing00" );
+ assertNotNull( ctx );
+
+ attributes = ctx.getAttributes( "" );
+ assertNotNull( attributes );
+ assertEquals( "testing00", attributes.get( "ou" ).get() );
+ attribute = attributes.get( "objectClass" );
+ assertNotNull( attribute );
+ assertTrue( attribute.contains( "top" ) );
+ assertTrue( attribute.contains( "organizationalUnit" ) );
+
+ /*
+ * create ou=testing01,ou=system
+ */
+ attributes = new BasicAttributes();
+ attribute = new BasicAttribute( "objectClass" );
+ attribute.add( "top" );
+ attribute.add( "organizationalUnit" );
+ attributes.put( attribute );
+ attributes.put( "ou", "testing01" );
+ ctx = sysRoot.createSubcontext( "ou=testing01", attributes );
+ assertNotNull( ctx );
+
+ ctx = ( DirContext ) sysRoot.lookup( "ou=testing01" );
+ assertNotNull( ctx );
+
+ attributes = ctx.getAttributes( "" );
+ assertNotNull( attributes );
+ assertEquals( "testing01", attributes.get( "ou" ).get() );
+ attribute = attributes.get( "objectClass" );
+ assertNotNull( attribute );
+ assertTrue( attribute.contains( "top" ) );
+ assertTrue( attribute.contains( "organizationalUnit" ) );
+
+ /*
+ * create ou=testing02,ou=system
+ */
+ attributes = new BasicAttributes();
+ attribute = new BasicAttribute( "objectClass" );
+ attribute.add( "top" );
+ attribute.add( "organizationalUnit" );
+ attributes.put( attribute );
+ attributes.put( "ou", "testing02" );
+ ctx = sysRoot.createSubcontext( "ou=testing02", attributes );
+ assertNotNull( ctx );
+
+ ctx = ( DirContext ) sysRoot.lookup( "ou=testing02" );
+ assertNotNull( ctx );
+
+ attributes = ctx.getAttributes( "" );
+ assertNotNull( attributes );
+ assertEquals( "testing02", attributes.get( "ou" ).get() );
+ attribute = attributes.get( "objectClass" );
+ assertNotNull( attribute );
+ assertTrue( attribute.contains( "top" ) );
+ assertTrue( attribute.contains( "organizationalUnit" ) );
+
+ /*
+ * create ou=subtest,ou=testing01,ou=system
+ */
+ ctx = ( DirContext ) sysRoot.lookup( "ou=testing01" );
+
+ attributes = new BasicAttributes();
+ attribute = new BasicAttribute( "objectClass" );
+ attribute.add( "top" );
+ attribute.add( "organizationalUnit" );
+ attributes.put( attribute );
+ attributes.put( "ou", "subtest" );
+ ctx = ctx.createSubcontext( "ou=subtest", attributes );
+ assertNotNull( ctx );
+
+ ctx = ( DirContext ) sysRoot.lookup( "ou=subtest,ou=testing01" );
+ assertNotNull( ctx );
+
+ attributes = ctx.getAttributes( "" );
+ assertNotNull( attributes );
+ assertEquals( "subtest", attributes.get( "ou" ).get() );
+ attribute = attributes.get( "objectClass" );
+ assertNotNull( attribute );
+ assertTrue( attribute.contains( "top" ) );
+ assertTrue( attribute.contains( "organizationalUnit" ) );
}
Modified:
incubator/directory/eve/trunk/jndi-provider/src/test/org/apache/eve/jndi/SearchContextTest.java
==============================================================================
---
incubator/directory/eve/trunk/jndi-provider/src/test/org/apache/eve/jndi/SearchContextTest.java
(original)
+++
incubator/directory/eve/trunk/jndi-provider/src/test/org/apache/eve/jndi/SearchContextTest.java
Tue Nov 9 00:14:51 2004
@@ -20,8 +20,7 @@
import java.util.HashMap;
import javax.naming.NamingException;
import javax.naming.NamingEnumeration;
-import javax.naming.directory.SearchControls;
-import javax.naming.directory.SearchResult;
+import javax.naming.directory.*;
import org.apache.ldap.common.message.DerefAliasesEnum;
@@ -38,16 +37,99 @@
{
super.setUp();
- try
- {
- CreateContextTest createContextTest = new CreateContextTest();
- createContextTest.setUp();
- createContextTest.testCreateContexts();
- }
- catch( Exception e )
- {
- // do nothing
- }
+ /*
+ * create ou=testing00,ou=system
+ */
+ Attributes attributes = new BasicAttributes();
+ Attribute attribute = new BasicAttribute( "objectClass" );
+ attribute.add( "top" );
+ attribute.add( "organizationalUnit" );
+ attributes.put( attribute );
+ attributes.put( "ou", "testing00" );
+ DirContext ctx = sysRoot.createSubcontext( "ou=testing00", attributes
);
+ assertNotNull( ctx );
+
+ ctx = ( DirContext ) sysRoot.lookup( "ou=testing00" );
+ assertNotNull( ctx );
+
+ attributes = ctx.getAttributes( "" );
+ assertNotNull( attributes );
+ assertEquals( "testing00", attributes.get( "ou" ).get() );
+ attribute = attributes.get( "objectClass" );
+ assertNotNull( attribute );
+ assertTrue( attribute.contains( "top" ) );
+ assertTrue( attribute.contains( "organizationalUnit" ) );
+
+ /*
+ * create ou=testing01,ou=system
+ */
+ attributes = new BasicAttributes();
+ attribute = new BasicAttribute( "objectClass" );
+ attribute.add( "top" );
+ attribute.add( "organizationalUnit" );
+ attributes.put( attribute );
+ attributes.put( "ou", "testing01" );
+ ctx = sysRoot.createSubcontext( "ou=testing01", attributes );
+ assertNotNull( ctx );
+
+ ctx = ( DirContext ) sysRoot.lookup( "ou=testing01" );
+ assertNotNull( ctx );
+
+ attributes = ctx.getAttributes( "" );
+ assertNotNull( attributes );
+ assertEquals( "testing01", attributes.get( "ou" ).get() );
+ attribute = attributes.get( "objectClass" );
+ assertNotNull( attribute );
+ assertTrue( attribute.contains( "top" ) );
+ assertTrue( attribute.contains( "organizationalUnit" ) );
+
+ /*
+ * create ou=testing02,ou=system
+ */
+ attributes = new BasicAttributes();
+ attribute = new BasicAttribute( "objectClass" );
+ attribute.add( "top" );
+ attribute.add( "organizationalUnit" );
+ attributes.put( attribute );
+ attributes.put( "ou", "testing02" );
+ ctx = sysRoot.createSubcontext( "ou=testing02", attributes );
+ assertNotNull( ctx );
+
+ ctx = ( DirContext ) sysRoot.lookup( "ou=testing02" );
+ assertNotNull( ctx );
+
+ attributes = ctx.getAttributes( "" );
+ assertNotNull( attributes );
+ assertEquals( "testing02", attributes.get( "ou" ).get() );
+ attribute = attributes.get( "objectClass" );
+ assertNotNull( attribute );
+ assertTrue( attribute.contains( "top" ) );
+ assertTrue( attribute.contains( "organizationalUnit" ) );
+
+ /*
+ * create ou=subtest,ou=testing01,ou=system
+ */
+ ctx = ( DirContext ) sysRoot.lookup( "ou=testing01" );
+
+ attributes = new BasicAttributes();
+ attribute = new BasicAttribute( "objectClass" );
+ attribute.add( "top" );
+ attribute.add( "organizationalUnit" );
+ attributes.put( attribute );
+ attributes.put( "ou", "subtest" );
+ ctx = ctx.createSubcontext( "ou=subtest", attributes );
+ assertNotNull( ctx );
+
+ ctx = ( DirContext ) sysRoot.lookup( "ou=subtest,ou=testing01" );
+ assertNotNull( ctx );
+
+ attributes = ctx.getAttributes( "" );
+ assertNotNull( attributes );
+ assertEquals( "subtest", attributes.get( "ou" ).get() );
+ attribute = attributes.get( "objectClass" );
+ assertNotNull( attribute );
+ assertTrue( attribute.contains( "top" ) );
+ assertTrue( attribute.contains( "organizationalUnit" ) );
}
@@ -60,7 +142,7 @@
DerefAliasesEnum.NEVERDEREFALIASES.getName() );
HashMap map = new HashMap();
- NamingEnumeration list = sysRoot.search( "", "(ou = *)", controls );
+ NamingEnumeration list = sysRoot.search( "", "(ou=*)", controls );
while ( list.hasMore() )
{
SearchResult result = ( SearchResult ) list.next();
@@ -83,7 +165,7 @@
DerefAliasesEnum.NEVERDEREFALIASES.getName() );
HashMap map = new HashMap();
- NamingEnumeration list = sysRoot.search( "", "(ou = *)", controls );
+ NamingEnumeration list = sysRoot.search( "", "(ou=*)", controls );
while ( list.hasMore() )
{
SearchResult result = ( SearchResult ) list.next();
