You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2021/02/28 00:32:59 UTC
[directory-fortress-core] branch master updated: loop == 1 op
This is an automated email from the ASF dual-hosted git repository.
smckinney pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-fortress-core.git
The following commit(s) were added to refs/heads/master by this push:
new 7358d38 loop == 1 op
7358d38 is described below
commit 7358d38f87ef2e9cff4c6d45a25e89780deda0da
Author: Shawn McKinney <sm...@symas.com>
AuthorDate: Sat Feb 27 18:32:53 2021 -0600
loop == 1 op
---
.../java/org/apache/directory/fortress/core/jmeter/AddUser.java | 7 +------
.../java/org/apache/directory/fortress/core/jmeter/CheckUser.java | 6 +-----
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/src/test/java/org/apache/directory/fortress/core/jmeter/AddUser.java b/src/test/java/org/apache/directory/fortress/core/jmeter/AddUser.java
index 24debbe..94aab05 100644
--- a/src/test/java/org/apache/directory/fortress/core/jmeter/AddUser.java
+++ b/src/test/java/org/apache/directory/fortress/core/jmeter/AddUser.java
@@ -44,7 +44,6 @@ public class AddUser extends UserBase
*/
public SampleResult runTest( JavaSamplerContext samplerContext )
{
- int opCtr = 0;
String userId = hostname + '-' + qualifier + '-' + getKey();
SampleResult sampleResult = new SampleResult();
try
@@ -57,24 +56,20 @@ public class AddUser extends UserBase
user.setOu( ou );
write( "threadid: " + getThreadId() + ", userId: " + userId );
User outUser = adminMgr.addUser( user );
- opCtr++;
assertNotNull( outUser );
if( update )
{
user.setDescription( "updated: " + user.getUserId() );
outUser = adminMgr.updateUser( user );
- opCtr++;
}
if(StringUtil.isNotEmpty( role ) )
{
adminMgr.assignUser( new UserRole( user.getUserId(), role ));
- opCtr++;
}
assertNotNull( outUser );
if ( verify )
{
assertTrue( verify( userId, Op.ADD ) );
- opCtr++;
}
if( sleep > 0 )
{
@@ -87,7 +82,7 @@ public class AddUser extends UserBase
Thread.currentThread().interrupt();
}
}
- sampleResult.setSampleCount( opCtr );
+ sampleResult.setSampleCount( 1 );
sampleResult.sampleEnd();
sampleResult.setBytes(1);
sampleResult.setResponseMessage("test completed TID: " + getThreadId() + " UID: " + userId);
diff --git a/src/test/java/org/apache/directory/fortress/core/jmeter/CheckUser.java b/src/test/java/org/apache/directory/fortress/core/jmeter/CheckUser.java
index f6ccd82..f2fad09 100644
--- a/src/test/java/org/apache/directory/fortress/core/jmeter/CheckUser.java
+++ b/src/test/java/org/apache/directory/fortress/core/jmeter/CheckUser.java
@@ -43,7 +43,6 @@ public class CheckUser extends UserBase
*/
public SampleResult runTest( JavaSamplerContext samplerContext )
{
- int opCtr = 0;
String userId = hostname + '-' + qualifier + '-' + getKey();
SampleResult sampleResult = new SampleResult();
try
@@ -60,13 +59,11 @@ public class CheckUser extends UserBase
}
// This method performs both an ldap bind and a search:
Session session = accessMgr.createSession( user, false );
- opCtr+=2;
assertNotNull( session );
if ( verify )
{
// perform an ldap 'read':
assertTrue( verify( userId, Op.CHECK ) );
- opCtr++;
}
if(StringUtil.isNotEmpty( perm ) )
{
@@ -81,7 +78,6 @@ public class CheckUser extends UserBase
p.setOpName( perm.substring( indx + 1 ) + i );
// This method performs an ldap 'read':
accessMgr.checkAccess( session, p );
- opCtr++;
}
}
}
@@ -97,7 +93,7 @@ public class CheckUser extends UserBase
Thread.currentThread().interrupt();
}
}
- sampleResult.setSampleCount( opCtr );
+ sampleResult.setSampleCount( 1 );
sampleResult.sampleEnd();
sampleResult.setBytes(1);
sampleResult.setResponseMessage("test completed TID: " + getThreadId() + " UID: " + userId);