You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2008/08/24 11:01:28 UTC
svn commit: r688468 - in /directory/studio/trunk: test-integration-core/
test-integration-core/META-INF/ test-integration-ui/
test-integration-ui/META-INF/
test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/
Author: seelmann
Date: Sun Aug 24 02:01:28 2008
New Revision: 688468
URL: http://svn.apache.org/viewvc?rev=688468&view=rev
Log:
Use apacheds 1.5.4-SNAPSHOT for tests
Modified:
directory/studio/trunk/test-integration-core/META-INF/MANIFEST.MF
directory/studio/trunk/test-integration-core/pom.xml
directory/studio/trunk/test-integration-ui/META-INF/MANIFEST.MF
directory/studio/trunk/test-integration-ui/pom.xml
directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/ReferralDialogTest.java
Modified: directory/studio/trunk/test-integration-core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-core/META-INF/MANIFEST.MF?rev=688468&r1=688467&r2=688468&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-core/META-INF/MANIFEST.MF (original)
+++ directory/studio/trunk/test-integration-core/META-INF/MANIFEST.MF Sun Aug 24 02:01:28 2008
@@ -11,27 +11,32 @@
org.junit
Bundle-ClassPath: .,
lib/antlr-2.7.7.jar,
- lib/apacheds-bootstrap-extract-1.5.3.jar,
- lib/apacheds-bootstrap-partition-1.5.3.jar,
- lib/apacheds-btree-base-1.5.3.jar,
- lib/apacheds-core-1.5.3.jar,
- lib/apacheds-core-constants-1.5.3.jar,
- lib/apacheds-core-entry-1.5.3.jar,
- lib/apacheds-core-integ-1.5.3.jar,
- lib/apacheds-core-shared-1.5.3.jar,
- lib/apacheds-core-unit-1.5.3.jar,
- lib/apacheds-interceptor-kerberos-1.5.3.jar,
- lib/apacheds-jdbm-1.5.3.jar,
- lib/apacheds-jdbm-store-1.5.3.jar,
- lib/apacheds-kerberos-shared-1.5.3.jar,
- lib/apacheds-protocol-ldap-1.5.3.jar,
- lib/apacheds-protocol-shared-1.5.3.jar,
- lib/apacheds-schema-bootstrap-1.5.3.jar,
- lib/apacheds-schema-extras-1.5.3.jar,
- lib/apacheds-schema-registries-1.5.3.jar,
- lib/apacheds-server-jndi-1.5.3.jar,
- lib/apacheds-server-unit-1.5.3.jar,
- lib/apacheds-utils-1.5.3.jar,
+ lib/apacheds-bootstrap-extract-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-bootstrap-partition-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-btree-base-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-core-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-core-avl-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-core-constants-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-core-cursor-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-core-entry-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-core-integ-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-core-jndi-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-core-shared-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-core-unit-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-interceptor-kerberos-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-jdbm-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-jdbm-store-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-kerberos-shared-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-protocol-ldap-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-protocol-shared-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-schema-bootstrap-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-schema-extras-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-schema-registries-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-server-jndi-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-server-unit-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-utils-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-xdbm-search-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-xdbm-tools-1.5.4-SNAPSHOT.jar,
lib/commons-collections-3.2.jar,
lib/commons-io-1.3.2.jar,
lib/commons-lang-2.3.jar,
@@ -39,8 +44,8 @@
lib/mina-filter-ssl-1.1.6.jar,
lib/nlog4j-1.2.25.jar,
lib/shared-asn1-0.9.12-SNAPSHOT.jar,
- lib/shared-asn1-codec-0.9.11.jar,
- lib/shared-bouncycastle-reduced-0.9.11.jar,
+ lib/shared-asn1-codec-0.9.12-SNAPSHOT.jar,
+ lib/shared-bouncycastle-reduced-0.9.12-SNAPSHOT.jar,
lib/shared-ldap-0.9.12-SNAPSHOT.jar,
lib/shared-ldap-constants-0.9.12-SNAPSHOT.jar,
lib/slf4j-api-1.4.3.jar
Modified: directory/studio/trunk/test-integration-core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-core/pom.xml?rev=688468&r1=688467&r2=688468&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-core/pom.xml (original)
+++ directory/studio/trunk/test-integration-core/pom.xml Sun Aug 24 02:01:28 2008
@@ -282,12 +282,12 @@
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-server-unit</artifactId>
- <version>1.5.3</version>
+ <version>1.5.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-integ</artifactId>
- <version>1.5.3</version>
+ <version>1.5.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: directory/studio/trunk/test-integration-ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/META-INF/MANIFEST.MF?rev=688468&r1=688467&r2=688468&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-ui/META-INF/MANIFEST.MF (original)
+++ directory/studio/trunk/test-integration-ui/META-INF/MANIFEST.MF Sun Aug 24 02:01:28 2008
@@ -18,27 +18,32 @@
net.sf.swtbot.eclipse.finder
Bundle-ClassPath: .,
lib/antlr-2.7.7.jar,
- lib/apacheds-bootstrap-extract-1.5.3.jar,
- lib/apacheds-bootstrap-partition-1.5.3.jar,
- lib/apacheds-btree-base-1.5.3.jar,
- lib/apacheds-core-1.5.3.jar,
- lib/apacheds-core-constants-1.5.3.jar,
- lib/apacheds-core-entry-1.5.3.jar,
- lib/apacheds-core-integ-1.5.3.jar,
- lib/apacheds-core-shared-1.5.3.jar,
- lib/apacheds-core-unit-1.5.3.jar,
- lib/apacheds-interceptor-kerberos-1.5.3.jar,
- lib/apacheds-jdbm-1.5.3.jar,
- lib/apacheds-jdbm-store-1.5.3.jar,
- lib/apacheds-kerberos-shared-1.5.3.jar,
- lib/apacheds-protocol-ldap-1.5.3.jar,
- lib/apacheds-protocol-shared-1.5.3.jar,
- lib/apacheds-schema-bootstrap-1.5.3.jar,
- lib/apacheds-schema-extras-1.5.3.jar,
- lib/apacheds-schema-registries-1.5.3.jar,
- lib/apacheds-server-jndi-1.5.3.jar,
- lib/apacheds-server-unit-1.5.3.jar,
- lib/apacheds-utils-1.5.3.jar,
+ lib/apacheds-bootstrap-extract-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-bootstrap-partition-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-btree-base-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-core-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-core-avl-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-core-constants-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-core-cursor-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-core-entry-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-core-integ-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-core-jndi-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-core-shared-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-core-unit-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-interceptor-kerberos-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-jdbm-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-jdbm-store-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-kerberos-shared-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-protocol-ldap-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-protocol-shared-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-schema-bootstrap-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-schema-extras-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-schema-registries-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-server-jndi-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-server-unit-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-utils-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-xdbm-search-1.5.4-SNAPSHOT.jar,
+ lib/apacheds-xdbm-tools-1.5.4-SNAPSHOT.jar,
lib/commons-collections-3.2.jar,
lib/commons-io-1.3.2.jar,
lib/commons-lang-2.3.jar,
@@ -46,8 +51,8 @@
lib/mina-filter-ssl-1.1.6.jar,
lib/nlog4j-1.2.25.jar,
lib/shared-asn1-0.9.12-SNAPSHOT.jar,
- lib/shared-asn1-codec-0.9.11.jar,
- lib/shared-bouncycastle-reduced-0.9.11.jar,
+ lib/shared-asn1-codec-0.9.12-SNAPSHOT.jar,
+ lib/shared-bouncycastle-reduced-0.9.12-SNAPSHOT.jar,
lib/shared-ldap-0.9.12-SNAPSHOT.jar,
lib/shared-ldap-constants-0.9.12-SNAPSHOT.jar,
lib/slf4j-api-1.4.3.jar
Modified: directory/studio/trunk/test-integration-ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/pom.xml?rev=688468&r1=688467&r2=688468&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-ui/pom.xml (original)
+++ directory/studio/trunk/test-integration-ui/pom.xml Sun Aug 24 02:01:28 2008
@@ -290,12 +290,12 @@
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-server-unit</artifactId>
- <version>1.5.3</version>
+ <version>1.5.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-integ</artifactId>
- <version>1.5.3</version>
+ <version>1.5.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/ReferralDialogTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/ReferralDialogTest.java?rev=688468&r1=688467&r2=688468&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/ReferralDialogTest.java (original)
+++ directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/ReferralDialogTest.java Sun Aug 24 02:01:28 2008
@@ -21,18 +21,15 @@
package org.apache.directory.studio.test.integration.ui;
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.BasicAttribute;
-import javax.naming.directory.BasicAttributes;
-
import net.sf.swtbot.eclipse.finder.SWTEclipseBot;
import net.sf.swtbot.finder.UIThreadRunnable;
import net.sf.swtbot.widgets.SWTBotTree;
import net.sf.swtbot.widgets.SWTBotTreeItem;
+import org.apache.directory.server.core.entry.DefaultServerEntry;
+import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.unit.AbstractServerTest;
+import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.Connection.ReferralHandlingMethod;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
@@ -217,16 +214,13 @@
}
- private void createReferralEntry() throws NamingException
+ private void createReferralEntry() throws Exception
{
- Attributes attrs = new BasicAttributes();
- Attribute ocAttr = new BasicAttribute( "objectClass" );
- ocAttr.add( "top" );
- ocAttr.add( "referral" );
- ocAttr.add( "extensibleObject" );
- attrs.put( ocAttr );
- attrs.put( "cn", "referralDialogTest" );
- attrs.put( "ref", "ldap://localhost:" + ldapServer.getIpPort() + "/ou=users,ou=system" );
- rootDSE.createSubcontext( "cn=referralDialogTest,ou=system", attrs );
+ ServerEntry entry = new DefaultServerEntry(rootDSE.getDirectoryService().getRegistries());
+ entry.setDn( new LdapDN("cn=referralDialogTest,ou=system" ) );
+ entry.add( "objectClass", "top", "referral", "extensibleObject" );
+ entry.add( "cn", "referralDialogTest" );
+ entry.add( "ref", "ldap://localhost:" + ldapServer.getIpPort() + "/ou=users,ou=system" );
+ rootDSE.add( entry );
}
}