Author: angela
Date: Thu Mar 10 18:35:01 2016
New Revision: 1734441
URL: http://svn.apache.org/viewvc?rev=1734441&view=rev
Log:
minor improvement: refactor benchmarks replacing setup by beforeSuite to
avoidhaving test-setup reflected in the profiling
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractLoginTest.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/GetGroupPrincipalsTest.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginImpersonateTest.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginSystemTest.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginWithMembersTest.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginWithMembershipTest.java
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractLoginTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractLoginTest.java?rev=1734441&r1=1734440&r2=1734441&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractLoginTest.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractLoginTest.java
Thu Mar 10 18:35:01 2016
@@ -77,6 +77,11 @@ abstract class AbstractLoginTest extends
@Override
public void setUp(Repository repository, Credentials credentials) throws
Exception {
super.setUp(repository, buildCredentials(repository, credentials));
+
+ }
+
+ @Override
+ public void beforeSuite() throws Exception {
Session s = loginAdministrative();
try {
AccessControlUtils.addAccessControlEntry(s, "/",
EveryonePrincipal.getInstance(), new String[]{Privilege.JCR_READ}, true);
@@ -90,7 +95,7 @@ abstract class AbstractLoginTest extends
}
@Override
- public void tearDown() throws Exception {
+ public void afterSuite() throws Exception {
Session s = loginAdministrative();
try {
Authorizable authorizable = ((JackrabbitSession)
s).getUserManager().getAuthorizable(USER);
@@ -100,7 +105,6 @@ abstract class AbstractLoginTest extends
}
} finally {
s.logout();
- super.tearDown();
}
}
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/GetGroupPrincipalsTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/GetGroupPrincipalsTest.java?rev=1734441&r1=1734440&r2=1734441&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/GetGroupPrincipalsTest.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/GetGroupPrincipalsTest.java
Thu Mar 10 18:35:01 2016
@@ -17,9 +17,7 @@
package org.apache.jackrabbit.oak.benchmark;
import java.security.Principal;
-import javax.jcr.Credentials;
import javax.jcr.Node;
-import javax.jcr.Repository;
import javax.jcr.Session;
import org.apache.jackrabbit.api.JackrabbitSession;
@@ -48,8 +46,8 @@ public class GetGroupPrincipalsTest exte
}
@Override
- public void setUp(Repository repository, Credentials credentials) throws
Exception {
- super.setUp(repository, credentials);
+ public void beforeSuite() throws Exception {
+ super.beforeSuite();
session = loginAdministrative();
@@ -77,24 +75,19 @@ public class GetGroupPrincipalsTest exte
}
@Override
- public void tearDown() throws Exception {
- try {
- UserManager userMgr = ((JackrabbitSession)
session).getUserManager();
- Authorizable authorizable = userMgr.getAuthorizable(USER);
- if (authorizable != null) {
- authorizable.remove();
- }
-
- authorizable = userMgr.getAuthorizable(GROUP);
- if (authorizable != null) {
- Node n =
session.getNode(Text.getRelativeParent(authorizable.getPath(), 1));
- n.remove();
- }
+ public void afterSuite() throws Exception {
+ UserManager userMgr = ((JackrabbitSession) session).getUserManager();
+ Authorizable authorizable = userMgr.getAuthorizable(USER);
+ if (authorizable != null) {
+ authorizable.remove();
+ }
- session.save();
- } finally {
- super.tearDown();
+ authorizable = userMgr.getAuthorizable(GROUP);
+ if (authorizable != null) {
+ Node n =
session.getNode(Text.getRelativeParent(authorizable.getPath(), 1));
+ n.remove();
}
+ session.save();
}
@Override
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginImpersonateTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginImpersonateTest.java?rev=1734441&r1=1734440&r2=1734441&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginImpersonateTest.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginImpersonateTest.java
Thu Mar 10 18:35:01 2016
@@ -16,8 +16,6 @@
*/
package org.apache.jackrabbit.oak.benchmark;
-import javax.jcr.Credentials;
-import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.SimpleCredentials;
@@ -28,8 +26,8 @@ public class LoginImpersonateTest extend
private SimpleCredentials creds;
@Override
- public void setUp(Repository repository, Credentials credentials) throws
Exception {
- super.setUp(repository, credentials);
+ public void beforeSuite() throws Exception {
+ super.beforeSuite();
// will be close upon super.tearDown
admin = loginAdministrative();
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginSystemTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginSystemTest.java?rev=1734441&r1=1734440&r2=1734441&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginSystemTest.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginSystemTest.java
Thu Mar 10 18:35:01 2016
@@ -19,8 +19,6 @@ package org.apache.jackrabbit.oak.benchm
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.Collections;
-import javax.jcr.Credentials;
-import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.security.auth.Subject;
@@ -35,9 +33,9 @@ public class LoginSystemTest extends Abs
private Subject subject;
@Override
- public void setUp(Repository repository, Credentials credentials) throws
Exception {
- super.setUp(repository, credentials);
- if (repository instanceof RepositoryImpl) {
+ public void beforeSuite() throws Exception {
+ super.beforeSuite();
+ if (getRepository() instanceof RepositoryImpl) {
subject = SystemSubject.INSTANCE;
} else {
subject = new Subject(true, ImmutableSet.of(new
SystemPrincipal()), Collections.emptySet(), Collections.emptySet());
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginWithMembersTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginWithMembersTest.java?rev=1734441&r1=1734440&r2=1734441&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginWithMembersTest.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginWithMembersTest.java
Thu Mar 10 18:35:01 2016
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.benchmark;
-import javax.jcr.Credentials;
import javax.jcr.Node;
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
@@ -46,8 +45,8 @@ public class LoginWithMembersTest extend
}
@Override
- public void setUp(Repository repository, Credentials credentials) throws
Exception {
- super.setUp(repository, credentials);
+ public void beforeSuite() throws Exception {
+ super.beforeSuite();
Session s = loginAdministrative();
try {
@@ -62,28 +61,24 @@ public class LoginWithMembersTest extend
Group g = userManager.createGroup(new PrincipalImpl(GROUP +
i), "test");
gr.addMember(g);
}
- } finally {
s.save();
+ } finally {
s.logout();
}
}
@Override
- public void tearDown() throws Exception {
+ public void afterSuite() throws Exception {
+ Session s = loginAdministrative();
try {
- Session s = loginAdministrative();
-
Authorizable authorizable = ((JackrabbitSession)
s).getUserManager().getAuthorizable(GROUP);
if (authorizable != null) {
Node n =
s.getNode(Text.getRelativeParent(authorizable.getPath(), 1));
n.remove();
}
-
s.save();
- s.logout();
-
} finally {
- super.tearDown();
+ s.logout();
}
}
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginWithMembershipTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginWithMembershipTest.java?rev=1734441&r1=1734440&r2=1734441&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginWithMembershipTest.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginWithMembershipTest.java
Thu Mar 10 18:35:01 2016
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.benchmark;
-import javax.jcr.Credentials;
import javax.jcr.Node;
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
@@ -50,8 +49,8 @@ public class LoginWithMembershipTest ext
}
@Override
- public void setUp(Repository repository, Credentials credentials) throws
Exception {
- super.setUp(repository, credentials);
+ public void beforeSuite() throws Exception {
+ super.beforeSuite();
Session s = loginAdministrative();
try {
@@ -78,9 +77,9 @@ public class LoginWithMembershipTest ext
}
@Override
- public void tearDown() throws Exception {
+ public void afterSuite() throws Exception {
+ Session s = loginAdministrative();
try {
- Session s = loginAdministrative();
Authorizable authorizable = ((JackrabbitSession)
s).getUserManager().getAuthorizable(GROUP);
if (authorizable != null) {
@@ -89,10 +88,8 @@ public class LoginWithMembershipTest ext
}
s.save();
- s.logout();
-
} finally {
- super.tearDown();
+ s.logout();
}
}
