You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2007/12/04 08:47:10 UTC
svn commit: r600820 - in /directory/apacheds/branches/bigbang:
core-integ/src/test/java/org/apache/directory/server/core/
core-integ/src/test/java/org/apache/directory/server/core/jndi/
core-unit/src/test/java/org/apache/directory/server/core/jndi/
Author: akarasulu
Date: Mon Dec 3 23:47:06 2007
New Revision: 600820
URL: http://svn.apache.org/viewvc?rev=600820&view=rev
Log:
convert another itest to new framework
Added:
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER759IT.java
- copied, changed from r600818, directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER759ITest.java
Removed:
directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER759ITest.java
Modified:
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/StockCoreISuite.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=600820&r1=600819&r2=600820&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 Mon Dec 3 23:47:06 2007
@@ -28,10 +28,7 @@
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.Scope;
-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.DestroyContextIT;
+import org.apache.directory.server.core.jndi.*;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -52,6 +49,7 @@
CreateContextIT.class,
DestroyContextIT.class,
DIRSERVER169IT.class,
+ DIRSERVER759IT.class,
PartitionConfigurationIT.class // Leaves the server in a bad state (partition removal is incomplete)
} )
@Scope ( ServiceScope.TESTSUITE )
Copied: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER759IT.java (from r600818, directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER759ITest.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER759IT.java?p2=directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER759IT.java&p1=directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER759ITest.java&r1=600818&r2=600820&rev=600820&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER759ITest.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER759IT.java Mon Dec 3 23:47:06 2007
@@ -20,6 +20,16 @@
package org.apache.directory.server.core.jndi;
+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 org.apache.directory.shared.ldap.constants.JndiPropertyConstants;
+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 org.junit.Test;
+import org.junit.runner.RunWith;
import javax.naming.NameNotFoundException;
import javax.naming.NamingException;
@@ -27,12 +37,7 @@
import javax.naming.directory.Attributes;
import javax.naming.directory.DirContext;
import javax.naming.directory.SearchControls;
-
-import org.apache.directory.server.core.unit.AbstractAdminTestCase;
-import org.apache.directory.shared.ldap.constants.JndiPropertyConstants;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
-import org.apache.directory.shared.ldap.message.AliasDerefMode;
+import javax.naming.ldap.LdapContext;
/**
@@ -41,16 +46,20 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev: 493916 $
*/
-public class DIRSERVER759ITest extends AbstractAdminTestCase
+@RunWith ( CiRunner.class )
+public class DIRSERVER759IT
{
- protected void setUp() throws Exception
+ public static DirectoryService service;
+
+
+ /**
+ * @todo replace with ldif annotations
+ *
+ * @throws NamingException on errors
+ */
+ protected void createData() throws NamingException
{
- if ( this.getName().equals( "testOpAttrDenormalizationOn" ) )
- {
- super.service.setDenormalizeOpAttrsEnabled( true );
- }
-
- super.setUp();
+ LdapContext sysRoot = getSystemContext( service );
/*
* create ou=testing00,ou=system
@@ -151,8 +160,11 @@
}
+ @Test
public void testSearchBadDN() throws NamingException
{
+ LdapContext sysRoot = getSystemContext( service );
+
SearchControls controls = new SearchControls();
controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
controls.setDerefLinkFlag( false );