svn commit: r1602180 - /jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractLoginTest.java

[an...@apache.org]

Author: angela
Date: Thu Jun 12 14:43:17 2014
New Revision: 1602180

URL: http://svn.apache.org/r1602180
Log:
improve login tests

Modified:
    jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractLoginTest.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=1602180&r1=1602179&r2=1602180&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 Jun 12 14:43:17 2014
@@ -40,6 +40,7 @@ import org.apache.jackrabbit.oak.securit
 import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
 import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
 import org.apache.jackrabbit.oak.spi.security.authentication.ConfigurationUtil;
+import org.apache.jackrabbit.oak.spi.security.authentication.token.TokenConfiguration;
 import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
 import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration;
 import org.apache.jackrabbit.oak.spi.security.user.UserConstants;
@@ -123,12 +124,13 @@ abstract class AbstractLoginTest extends
     protected Repository[] createRepository(RepositoryFixture fixture) throws Exception {
         if (noIterations != -1) {
             if (fixture instanceof OakRepositoryFixture) {
+                final String configName = (runWithToken) ? TokenConfiguration.NAME : UserConfiguration.NAME;
                 return ((OakRepositoryFixture) fixture).setUpCluster(1, new JcrCustomizer() {
                     @Override
                     public Jcr customize(Jcr jcr) {
                         Map<String, Integer> map = Collections.singletonMap(UserConstants.PARAM_PASSWORD_HASH_ITERATIONS, noIterations);
-                        ConfigurationParameters userConfig = ConfigurationParameters.of(map);
-                        SecurityProvider sp = new SecurityProviderImpl(ConfigurationParameters.of(ImmutableMap.of(UserConfiguration.NAME, userConfig)));
+                        ConfigurationParameters conf = ConfigurationParameters.of(map);
+                        SecurityProvider sp = new SecurityProviderImpl(ConfigurationParameters.of(ImmutableMap.of(configName, conf)));
                         jcr.with(sp);
                         return jcr;
                     }