Author: angela
Date: Fri Nov 24 11:58:08 2017
New Revision: 1816232
URL: http://svn.apache.org/viewvc?rev=1816232&view=rev
Log:
OAK-6981 : move OsgiContext defined in derived tests to AbstractExternalAuthTest
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/AbstractExternalAuthTest.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleAutoMembershipTest.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleDynamicMembershipTest.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactoryTest.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SynMBeanImplOSGiTest.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/AbstractExternalAuthTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/AbstractExternalAuthTest.java?rev=1816232&r1=1816231&r2=1816232&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/AbstractExternalAuthTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/AbstractExternalAuthTest.java
Fri Nov 24 11:58:08 2017
@@ -47,14 +47,19 @@ import org.apache.jackrabbit.oak.spi.sec
import
org.apache.jackrabbit.oak.spi.security.authentication.external.basic.DefaultSyncConfig;
import
org.apache.jackrabbit.oak.spi.security.authentication.external.impl.ExternalIdentityConstants;
import
org.apache.jackrabbit.oak.spi.security.authentication.external.impl.principal.ExternalPrincipalConfiguration;
+import org.apache.sling.testing.mock.osgi.junit.OsgiContext;
import org.junit.After;
import org.junit.Before;
+import org.junit.Rule;
/**
* Abstract base test for external-authentication tests.
*/
public abstract class AbstractExternalAuthTest extends AbstractSecurityTest {
+ @Rule
+ public final OsgiContext context = new OsgiContext();
+
protected static final String USER_ID = TestIdentityProvider.ID_TEST_USER;
protected static final String TEST_CONSTANT_PROPERTY_NAME =
"profile/constantProperty";
protected static final String TEST_CONSTANT_PROPERTY_VALUE =
"constant-value";
@@ -132,6 +137,9 @@ public abstract class AbstractExternalAu
protected SecurityProvider getSecurityProvider() {
if (securityProvider == null) {
securityProvider = new
TestSecurityProvider(getSecurityConfigParameters(),
externalPrincipalConfiguration);
+
+ // register PrincipalConfiguration with OSGi context
+
context.registerInjectActivateService(externalPrincipalConfiguration);
}
return securityProvider;
}
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleAutoMembershipTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleAutoMembershipTest.java?rev=1816232&r1=1816231&r2=1816232&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleAutoMembershipTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleAutoMembershipTest.java
Fri Nov 24 11:58:08 2017
@@ -45,7 +45,6 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.whiteboard.Registration;
import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils;
import org.apache.sling.testing.mock.osgi.junit.OsgiContext;
-import org.junit.Rule;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -58,9 +57,6 @@ public class ExternalLoginModuleAutoMemb
private static final String NON_EXISTING_NAME = "nonExisting";
- @Rule
- public final OsgiContext context = new OsgiContext();
-
private Root r;
private UserManager userManager;
private ValueFactory valueFactory;
@@ -81,10 +77,6 @@ public class ExternalLoginModuleAutoMemb
syncConfig.user().setDynamicMembership(true);
- // register the ExternalPrincipal configuration in order to have it's
- // activate method invoked.
- context.registerInjectActivateService(externalPrincipalConfiguration);
-
// first configuration based on test base-setup with
// - dynamic membership = true
// - auto-membership = 'gr_default' and 'nonExisting'
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleDynamicMembershipTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleDynamicMembershipTest.java?rev=1816232&r1=1816231&r2=1816232&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleDynamicMembershipTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleDynamicMembershipTest.java
Fri Nov 24 11:58:08 2017
@@ -37,8 +37,6 @@ import org.apache.jackrabbit.oak.spi.sec
import
org.apache.jackrabbit.oak.spi.security.authentication.external.impl.ExternalIdentityConstants;
import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils;
-import org.apache.sling.testing.mock.osgi.junit.OsgiContext;
-import org.junit.Rule;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -49,19 +47,12 @@ import static org.junit.Assert.assertTru
public class ExternalLoginModuleDynamicMembershipTest extends
ExternalLoginModuleTest {
- @Rule
- public final OsgiContext context = new OsgiContext();
-
@Override
public void before() throws Exception {
super.before();
syncConfig.user().setDynamicMembership(true);
- // register the ExternalPrincipal configuration in order to have it's
- // activate method invoked.
- context.registerInjectActivateService(externalPrincipalConfiguration);
-
// now register the sync-handler with the dynamic membership config
// in order to enable dynamic membership with the external principal
configuration
Map props =
ImmutableMap.of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP,
syncConfig.user().getDynamicMembership());
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactoryTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactoryTest.java?rev=1816232&r1=1816231&r2=1816232&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactoryTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactoryTest.java
Fri Nov 24 11:58:08 2017
@@ -47,9 +47,6 @@ import static org.junit.Assert.assertTru
public class ExternalLoginModuleFactoryTest extends
ExternalLoginModuleTestBase {
- @Rule
- public final OsgiContext context = new OsgiContext();
-
@Override
protected Oak withEditors(Oak oak) {
super.withEditors(oak);
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SynMBeanImplOSGiTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SynMBeanImplOSGiTest.java?rev=1816232&r1=1816231&r2=1816232&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SynMBeanImplOSGiTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SynMBeanImplOSGiTest.java
Fri Nov 24 11:58:08 2017
@@ -31,8 +31,6 @@ import org.apache.jackrabbit.oak.spi.sec
import
org.apache.jackrabbit.oak.spi.security.authentication.external.impl.ExternalLoginModuleFactory;
import
org.apache.jackrabbit.oak.spi.security.authentication.external.impl.SyncManagerImpl;
import org.apache.sling.testing.mock.osgi.MockOsgi;
-import org.apache.sling.testing.mock.osgi.junit.OsgiContext;
-import org.junit.Rule;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
@@ -40,9 +38,6 @@ import static org.junit.Assert.assertNul
public class SynMBeanImplOSGiTest extends ExternalLoginModuleTestBase {
- @Rule
- public final OsgiContext context = new OsgiContext();
-
private ExternalLoginModuleFactory externalLoginModuleFactory;
@Override
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java?rev=1816232&r1=1816231&r2=1816232&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java
Fri Nov 24 11:58:08 2017
@@ -21,7 +21,6 @@ import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-
import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import javax.jcr.ValueFactory;
@@ -50,12 +49,9 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.principal.PrincipalConfiguration;
import org.apache.jackrabbit.oak.spi.security.principal.PrincipalProvider;
import org.apache.jackrabbit.oak.spi.xml.ProtectedItemImporter;
-import org.apache.sling.testing.mock.osgi.junit.OsgiContext;
import org.junit.Ignore;
-import org.junit.Rule;
import org.junit.Test;
import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
import static org.junit.Assert.assertEquals;
@@ -66,19 +62,6 @@ import static org.junit.Assert.assertTru
public class ExternalPrincipalConfigurationTest extends
AbstractExternalAuthTest {
- @Rule
- public final OsgiContext context = new OsgiContext();
-
- private ExternalPrincipalConfiguration principalConfiguration;
-
- @Override
- public void before() throws Exception {
- super.before();
-
- principalConfiguration = new
ExternalPrincipalConfiguration(getSecurityProvider());
- context.registerInjectActivateService(principalConfiguration);
- }
-
private void enable() {
context.registerService(SyncHandler.class, new DefaultSyncHandler(),
ImmutableMap.<String,
Object>of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, true));
}
@@ -90,18 +73,18 @@ public class ExternalPrincipalConfigurat
@Test
public void testGetPrincipalManager() {
- assertNotNull(principalConfiguration.getPrincipalManager(root,
NamePathMapper.DEFAULT));
+ assertNotNull(externalPrincipalConfiguration.getPrincipalManager(root,
NamePathMapper.DEFAULT));
}
@Test
public void testGetPrincipalManagerEnabled() {
enable();
- assertNotNull(principalConfiguration.getPrincipalManager(root,
NamePathMapper.DEFAULT));
+ assertNotNull(externalPrincipalConfiguration.getPrincipalManager(root,
NamePathMapper.DEFAULT));
}
@Test
public void testGetPrincipalProvider() throws Exception {
- PrincipalProvider pp =
principalConfiguration.getPrincipalProvider(root, NamePathMapper.DEFAULT);
+ PrincipalProvider pp =
externalPrincipalConfiguration.getPrincipalProvider(root,
NamePathMapper.DEFAULT);
assertNotNull(pp);
assertFalse(pp instanceof ExternalGroupPrincipalProvider);
@@ -110,60 +93,60 @@ public class ExternalPrincipalConfigurat
@Test
public void testGetPrincipalProviderEnabled() {
enable();
- PrincipalProvider pp =
principalConfiguration.getPrincipalProvider(root, NamePathMapper.DEFAULT);
+ PrincipalProvider pp =
externalPrincipalConfiguration.getPrincipalProvider(root,
NamePathMapper.DEFAULT);
assertNotNull(pp);
assertTrue(pp instanceof ExternalGroupPrincipalProvider);
}
@Test
public void testGetName() {
- assertEquals(PrincipalConfiguration.NAME,
principalConfiguration.getName());
+ assertEquals(PrincipalConfiguration.NAME,
externalPrincipalConfiguration.getName());
enable();
- assertEquals(PrincipalConfiguration.NAME,
principalConfiguration.getName());
+ assertEquals(PrincipalConfiguration.NAME,
externalPrincipalConfiguration.getName());
}
@Test
public void testGetContext() {
- assertSame(Context.DEFAULT, principalConfiguration.getContext());
+ assertSame(Context.DEFAULT,
externalPrincipalConfiguration.getContext());
enable();
- assertSame(Context.DEFAULT, principalConfiguration.getContext());
+ assertSame(Context.DEFAULT,
externalPrincipalConfiguration.getContext());
}
@Test
public void testGetWorkspaceInitializer() {
- assertSame(WorkspaceInitializer.DEFAULT,
principalConfiguration.getWorkspaceInitializer());
+ assertSame(WorkspaceInitializer.DEFAULT,
externalPrincipalConfiguration.getWorkspaceInitializer());
enable();
- assertSame(WorkspaceInitializer.DEFAULT,
principalConfiguration.getWorkspaceInitializer());
+ assertSame(WorkspaceInitializer.DEFAULT,
externalPrincipalConfiguration.getWorkspaceInitializer());
}
@Test
public void testGetRepositoryInitializer() {
- assertTrue(principalConfiguration.getRepositoryInitializer()
instanceof ExternalIdentityRepositoryInitializer);
+ assertTrue(externalPrincipalConfiguration.getRepositoryInitializer()
instanceof ExternalIdentityRepositoryInitializer);
enable();
- assertTrue(principalConfiguration.getRepositoryInitializer()
instanceof ExternalIdentityRepositoryInitializer);
+ assertTrue(externalPrincipalConfiguration.getRepositoryInitializer()
instanceof ExternalIdentityRepositoryInitializer);
}
@Test
public void testGetValidators() {
ContentSession cs = root.getContentSession();
- List<? extends ValidatorProvider> validatorProviders =
principalConfiguration.getValidators(cs.getWorkspaceName(),
cs.getAuthInfo().getPrincipals(), new MoveTracker());
+ List<? extends ValidatorProvider> validatorProviders =
externalPrincipalConfiguration.getValidators(cs.getWorkspaceName(),
cs.getAuthInfo().getPrincipals(), new MoveTracker());
assertFalse(validatorProviders.isEmpty());
assertEquals(1, validatorProviders.size());
assertTrue(validatorProviders.get(0) instanceof
ExternalIdentityValidatorProvider);
- validatorProviders =
principalConfiguration.getValidators(cs.getWorkspaceName(),
cs.getAuthInfo().getPrincipals(), new MoveTracker());
+ validatorProviders =
externalPrincipalConfiguration.getValidators(cs.getWorkspaceName(),
cs.getAuthInfo().getPrincipals(), new MoveTracker());
assertFalse(validatorProviders.isEmpty());
assertEquals(1, validatorProviders.size());
assertTrue(validatorProviders.get(0) instanceof
ExternalIdentityValidatorProvider);
enable();
- validatorProviders =
principalConfiguration.getValidators(cs.getWorkspaceName(),
cs.getAuthInfo().getPrincipals(), new MoveTracker());
+ validatorProviders =
externalPrincipalConfiguration.getValidators(cs.getWorkspaceName(),
cs.getAuthInfo().getPrincipals(), new MoveTracker());
assertFalse(validatorProviders.isEmpty());
assertEquals(1, validatorProviders.size());
assertTrue(validatorProviders.get(0) instanceof
ExternalIdentityValidatorProvider);
@@ -171,17 +154,17 @@ public class ExternalPrincipalConfigurat
@Test
public void testGetValidatorsOmitIdProtection() throws Exception {
-
principalConfiguration.setParameters(ConfigurationParameters.of(ExternalIdentityConstants.PARAM_PROTECT_EXTERNAL_IDS,
false));
+
externalPrincipalConfiguration.setParameters(ConfigurationParameters.of(ExternalIdentityConstants.PARAM_PROTECT_EXTERNAL_IDS,
false));
ContentSession cs = root.getContentSession();
- List<? extends ValidatorProvider> validatorProviders =
principalConfiguration.getValidators(cs.getWorkspaceName(),
cs.getAuthInfo().getPrincipals(), new MoveTracker());
+ List<? extends ValidatorProvider> validatorProviders =
externalPrincipalConfiguration.getValidators(cs.getWorkspaceName(),
cs.getAuthInfo().getPrincipals(), new MoveTracker());
assertFalse(validatorProviders.isEmpty());
assertEquals(1, validatorProviders.size());
assertTrue(validatorProviders.get(0) instanceof
ExternalIdentityValidatorProvider);
enable();
- validatorProviders =
principalConfiguration.getValidators(cs.getWorkspaceName(),
cs.getAuthInfo().getPrincipals(), new MoveTracker());
+ validatorProviders =
externalPrincipalConfiguration.getValidators(cs.getWorkspaceName(),
cs.getAuthInfo().getPrincipals(), new MoveTracker());
assertFalse(validatorProviders.isEmpty());
assertEquals(1, validatorProviders.size());
assertTrue(validatorProviders.get(0) instanceof
ExternalIdentityValidatorProvider);
@@ -189,7 +172,7 @@ public class ExternalPrincipalConfigurat
@Test
public void testGetProtectedItemImporters() {
- List<? extends ProtectedItemImporter> importers =
principalConfiguration.getProtectedItemImporters();
+ List<? extends ProtectedItemImporter> importers =
externalPrincipalConfiguration.getProtectedItemImporters();
assertFalse(importers.isEmpty());
assertEquals(1, importers.size());
@@ -197,7 +180,7 @@ public class ExternalPrincipalConfigurat
enable();
- importers = principalConfiguration.getProtectedItemImporters();
+ importers = externalPrincipalConfiguration.getProtectedItemImporters();
assertFalse(importers.isEmpty());
assertEquals(1, importers.size());
assertTrue(importers.get(0) instanceof ExternalIdentityImporter);
@@ -210,16 +193,16 @@ public class ExternalPrincipalConfigurat
SyncHandler sh = new DefaultSyncHandler();
context.registerService(SyncHandler.class, sh, ImmutableMap.<String,
Object>of());
- assertIsEnabled(principalConfiguration, false);
+ assertIsEnabled(externalPrincipalConfiguration, false);
context.registerService(SyncHandler.class, sh, disableProps);
- assertIsEnabled(principalConfiguration, false);
+ assertIsEnabled(externalPrincipalConfiguration, false);
context.registerService(SyncHandler.class, sh, enableProps);
- assertIsEnabled(principalConfiguration, true);
+ assertIsEnabled(externalPrincipalConfiguration, true);
context.registerService(DefaultSyncHandler.class, new
DefaultSyncHandler(), enableProps);
- assertIsEnabled(principalConfiguration, true);
+ assertIsEnabled(externalPrincipalConfiguration, true);
}
@Test
@@ -228,10 +211,10 @@ public class ExternalPrincipalConfigurat
SyncHandler sh = new TestSyncHandler();
context.registerService(SyncHandler.class, sh, ImmutableMap.<String,
Object>of());
- assertIsEnabled(principalConfiguration, false);
+ assertIsEnabled(externalPrincipalConfiguration, false);
context.registerService(SyncHandler.class, sh, enableProps);
- assertIsEnabled(principalConfiguration, true);
+ assertIsEnabled(externalPrincipalConfiguration, true);
}
@Ignore("TODO: mock doesn't reflect property-changes on the registration.")
@@ -244,13 +227,13 @@ public class ExternalPrincipalConfigurat
BundleContext bundleContext = context.bundleContext();
ServiceRegistration registration =
bundleContext.registerService(DefaultSyncHandler.class.getName(), sh,
disableProps);
- assertIsEnabled(principalConfiguration, false);
+ assertIsEnabled(externalPrincipalConfiguration, false);
registration.setProperties(enableProps);
- assertIsEnabled(principalConfiguration, true);
+ assertIsEnabled(externalPrincipalConfiguration, true);
registration.setProperties(disableProps);
- assertIsEnabled(principalConfiguration, false);
+ assertIsEnabled(externalPrincipalConfiguration, false);
}
@Test
@@ -265,16 +248,16 @@ public class ExternalPrincipalConfigurat
ServiceRegistration registration2 =
bundleContext.registerService(SyncHandler.class.getName(), sh, enableProps);
ServiceRegistration registration3 =
bundleContext.registerService(SyncHandler.class.getName(), sh, disableProps);
- assertIsEnabled(principalConfiguration, true);
+ assertIsEnabled(externalPrincipalConfiguration, true);
registration2.unregister();
- assertIsEnabled(principalConfiguration, true);
+ assertIsEnabled(externalPrincipalConfiguration, true);
registration1.unregister();
- assertIsEnabled(principalConfiguration, false);
+ assertIsEnabled(externalPrincipalConfiguration, false);
registration3.unregister();
- assertIsEnabled(principalConfiguration, false);
+ assertIsEnabled(externalPrincipalConfiguration, false);
}
private static final class TestSyncHandler implements SyncHandler {
