Author: angela
Date: Wed Jun 15 16:16:43 2016
New Revision: 1748605
URL: http://svn.apache.org/viewvc?rev=1748605&view=rev
Log:
OAK-4218 : Base SyncMBeanImpl on Oak API (also adjust oak-run)
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/AbstractExternalTest.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/SyncAllExternalUsersTest.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/SyncExternalUsersTest.java
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/AbstractExternalTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/AbstractExternalTest.java?rev=1748605&r1=1748604&r2=1748605&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/AbstractExternalTest.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/AbstractExternalTest.java
Wed Jun 15 16:16:43 2016
@@ -36,6 +36,7 @@ import com.google.common.collect.Immutab
import org.apache.jackrabbit.api.JackrabbitSession;
import org.apache.jackrabbit.api.security.user.UserManager;
import org.apache.jackrabbit.oak.Oak;
+import org.apache.jackrabbit.oak.api.ContentRepository;
import org.apache.jackrabbit.oak.benchmark.AbstractTest;
import org.apache.jackrabbit.oak.fixture.JcrCreator;
import org.apache.jackrabbit.oak.fixture.OakRepositoryFixture;
@@ -69,6 +70,7 @@ import org.apache.jackrabbit.oak.spi.whi
import org.apache.sling.testing.mock.osgi.context.OsgiContextImpl;
import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkState;
/**
* Base benchmark test for external authentication.
@@ -92,6 +94,9 @@ abstract class AbstractExternalTest exte
private final Random random = new Random();
private final ExternalPrincipalConfiguration
externalPrincipalConfiguration = new ExternalPrincipalConfiguration();
+ private ContentRepository contentRepository;
+ private final SecurityProvider securityProvider = new
TestSecurityProvider(ConfigurationParameters.EMPTY);
+
final DefaultSyncConfig syncConfig = new DefaultSyncConfig();
final SyncHandler syncHandler = new DefaultSyncHandler(syncConfig);
@@ -115,6 +120,15 @@ abstract class AbstractExternalTest exte
protected abstract Configuration createConfiguration();
+ protected ContentRepository getContentRepository() {
+ checkState(contentRepository != null);
+ return contentRepository;
+ }
+
+ protected SecurityProvider getSecurityProvider() {
+ return securityProvider;
+ }
+
protected String getRandomUserId() {
int index = random.nextInt(((TestIdentityProvider) idp).numberOfUsers);
return "u" + index;
@@ -199,9 +213,9 @@ abstract class AbstractExternalTest exte
SyncHandlerMapping.PARAM_SYNC_HANDLER_NAME,
syncConfig.getName());
context.registerService(SyncHandlerMapping.class, new
SyncHandlerMapping() {}, shMappingProps);
}
-
- SecurityProvider sp = new
TestSecurityProvider(ConfigurationParameters.EMPTY);
- return new Jcr(oak).with(sp);
+ Jcr jcr = new Jcr(oak).with(securityProvider);
+ contentRepository = jcr.createContentRepository();
+ return jcr;
}
});
} else {
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/SyncAllExternalUsersTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/SyncAllExternalUsersTest.java?rev=1748605&r1=1748604&r2=1748605&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/SyncAllExternalUsersTest.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/SyncAllExternalUsersTest.java
Wed Jun 15 16:16:43 2016
@@ -45,7 +45,7 @@ public class SyncAllExternalUsersTest ex
@Override
protected void beforeSuite() throws Exception {
super.beforeSuite();
- bean = new SyncMBeanImpl(getRepository(), syncManager, "default",
idpManager, idp.getName());
+ bean = new SyncMBeanImpl(getContentRepository(),
getSecurityProvider(), syncManager, "default", idpManager, idp.getName());
}
@Override
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/SyncExternalUsersTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/SyncExternalUsersTest.java?rev=1748605&r1=1748604&r2=1748605&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/SyncExternalUsersTest.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/SyncExternalUsersTest.java
Wed Jun 15 16:16:43 2016
@@ -49,7 +49,7 @@ public class SyncExternalUsersTest exten
@Override
protected void beforeSuite() throws Exception {
super.beforeSuite();
- bean = new SyncMBeanImpl(getRepository(), syncManager,
syncConfig.getName(), idpManager, idp.getName());
+ bean = new SyncMBeanImpl(getContentRepository(),
getSecurityProvider(), syncManager, syncConfig.getName(), idpManager,
idp.getName());
}
@Override
