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 2012/03/21 19:11:01 UTC
svn commit: r1303480 - in
/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations:
lookup/LookupPerfIT.java modify/ModifyPerfIT.java
Author: elecharny
Date: Wed Mar 21 18:11:01 2012
New Revision: 1303480
URL: http://svn.apache.org/viewvc?rev=1303480&view=rev
Log:
o Removed the @Ignore, as the perf test is filtered by Maven, and not executed unless a special Perf profile is used
o Some refactoring
Modified:
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupPerfIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupPerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupPerfIT.java?rev=1303480&r1=1303479&r2=1303480&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupPerfIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupPerfIT.java Wed Mar 21 18:11:01 2012
@@ -52,7 +52,6 @@ public class LookupPerfIT extends Abstra
* A lookup performance test
*/
@Test
- //@Ignore("Ignore atm, this is a perf test")
public void testPerfLookup() throws Exception
{
LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );
@@ -111,12 +110,23 @@ public class LookupPerfIT extends Abstra
Dn dn = new Dn( "cn=test,ou=system" );
LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );
- createAccessControlSubentry( "anybodySearch", "{ " + " identificationTag \"searchAci\", "
- + " precedence 14, " + " authenticationLevel none, " + " itemOrUserFirst userFirst: " + " { "
- + " userClasses { allUsers }, " + " userPermissions " + " { " + " { "
- + " protectedItems {entry, allUserAttributeTypesAndValues}, "
- + " grantsAndDenials { grantRead, grantReturnDN, grantBrowse } " + " } " + " } " + " } "
- + "}" );
+ createAccessControlSubentry(
+ "anybodySearch", "{ " +
+ " identificationTag \"searchAci\", " +
+ " precedence 14, " +
+ " authenticationLevel none, " +
+ " itemOrUserFirst userFirst: " +
+ " { " +
+ " userClasses { allUsers }, " +
+ " userPermissions " +
+ " { " +
+ " { " +
+ " protectedItems {entry, allUserAttributeTypesAndValues}, " +
+ " grantsAndDenials { grantRead, grantReturnDN, grantBrowse } " +
+ " } " +
+ " } " +
+ " } " +
+ "}" );
Entry entry = connection.lookup( "cn=test,ou=system", "+" );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java?rev=1303480&r1=1303479&r2=1303480&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java Wed Mar 21 18:11:01 2012
@@ -38,7 +38,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.message.ModifyRequest;
import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.model.name.Dn;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -51,16 +50,16 @@ import org.junit.runner.RunWith;
*/
@RunWith(FrameworkRunner.class)
@CreateDS(
- name = "ModifyPerfDS",
+ name = "ModifyPerfDS",
partitions =
- {
+ {
@CreatePartition(
- name = "example",
- suffix = "dc=example,dc=com",
+ name = "example",
+ suffix = "dc=example,dc=com",
contextEntry = @ContextEntry(entryLdif = "dn: dc=example,dc=com\n"
+ "dc: example\n" + "objectClass: top\n" + "objectClass: domain\n\n"), indexes =
- {
- @CreateIndex(attribute = "objectClass"),
+ {
+ @CreateIndex(attribute = "objectClass"),
@CreateIndex(attribute = "sn"),
@CreateIndex(attribute = "cn") })
@@ -71,7 +70,6 @@ public class ModifyPerfIT extends Abstra
* Test an modify operation performance
*/
@Test
- @Ignore ( "We should not have performance tests mixed with integration tests" )
public void testModifyPerf() throws Exception
{
LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );