Author: angela
Date: Tue Mar 15 13:52:16 2016
New Revision: 1735076
URL: http://svn.apache.org/viewvc?rev=1735076&view=rev
Log:
minor improvement: move ExternalLoginModuleFactoryTest to external.impl package
where ExternalLoginModuleFactory resides
Added:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactoryTest.java
- copied, changed from r1734426,
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleFactoryTest.java
Removed:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleFactoryTest.java
Copied:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactoryTest.java
(from r1734426,
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/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?p2=jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactoryTest.java&p1=jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleFactoryTest.java&r1=1734426&r2=1735076&rev=1735076&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleFactoryTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactoryTest.java
Tue Mar 15 13:52:16 2016
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.jackrabbit.oak.spi.security.authentication.external;
+package org.apache.jackrabbit.oak.spi.security.authentication.external.impl;
import java.util.Collections;
import java.util.HashMap;
@@ -36,12 +36,13 @@ import org.apache.jackrabbit.api.securit
import org.apache.jackrabbit.oak.AbstractSecurityTest;
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.api.ContentSession;
+import
org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentityProvider;
+import
org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentityProviderManager;
+import
org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalUser;
+import
org.apache.jackrabbit.oak.spi.security.authentication.external.SyncHandler;
+import
org.apache.jackrabbit.oak.spi.security.authentication.external.SyncManager;
+import
org.apache.jackrabbit.oak.spi.security.authentication.external.TestIdentityProvider;
import
org.apache.jackrabbit.oak.spi.security.authentication.external.basic.DefaultSyncConfig;
-import
org.apache.jackrabbit.oak.spi.security.authentication.external.impl.DefaultSyncHandler;
-import
org.apache.jackrabbit.oak.spi.security.authentication.external.impl.ExternalIDPManagerImpl;
-import
org.apache.jackrabbit.oak.spi.security.authentication.external.impl.ExternalLoginModule;
-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.jackrabbit.oak.spi.whiteboard.Registration;
import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
import org.apache.sling.testing.mock.osgi.junit.OsgiContext;
@@ -148,25 +149,7 @@ public class ExternalLoginModuleFactoryT
};
}
- //~-------------------------------------------< tests >
-
- /**
- * Prepares the OSGi part with required services injected and configures
- * the factory in JAAS options which then delegates to
ExternalLoginModuleFactory
- */
- public void setUpJaasFactoryWithInjection() throws Exception{
- context.registerService(Repository.class,
EasyMock.createMock(Repository.class));
- context.registerService(SyncManager.class, new
SyncManagerImpl(whiteboard));
- context.registerService(ExternalIdentityProviderManager.class, new
ExternalIDPManagerImpl(whiteboard));
-
- final LoginModuleFactory lmf =
context.registerInjectActivateService(new ExternalLoginModuleFactory());
- options.put(ProxyLoginModule.PROP_LOGIN_MODULE_FACTORY, new
ProxyLoginModule.BootLoginModuleFactory() {
- @Override
- public LoginModule createLoginModule() {
- return lmf.createLoginModule();
- }
- });
- }
+ //~-------------------------------------------------------------< tests
>---
@Test
public void testSyncCreateUser() throws Exception {
@@ -195,4 +178,21 @@ public class ExternalLoginModuleFactoryT
}
}
+ /**
+ * Prepares the OSGi part with required services injected and configures
+ * the factory in JAAS options which then delegates to
ExternalLoginModuleFactory
+ */
+ private void setUpJaasFactoryWithInjection() throws Exception{
+ context.registerService(Repository.class,
EasyMock.createMock(Repository.class));
+ context.registerService(SyncManager.class, new
SyncManagerImpl(whiteboard));
+ context.registerService(ExternalIdentityProviderManager.class, new
ExternalIDPManagerImpl(whiteboard));
+
+ final LoginModuleFactory lmf =
context.registerInjectActivateService(new ExternalLoginModuleFactory());
+ options.put(ProxyLoginModule.PROP_LOGIN_MODULE_FACTORY, new
ProxyLoginModule.BootLoginModuleFactory() {
+ @Override
+ public LoginModule createLoginModule() {
+ return lmf.createLoginModule();
+ }
+ });
+ }
}
