You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2019/10/30 16:38:16 UTC
svn commit: r1869188 - in /jackrabbit/oak/trunk/oak-auth-external: pom.xml
src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactoryTest.java
Author: angela
Date: Wed Oct 30 16:38:15 2019
New Revision: 1869188
URL: http://svn.apache.org/viewvc?rev=1869188&view=rev
Log:
OAK-8723 : oak-auth-external: replace usage of easymock by mockito
Modified:
jackrabbit/oak/trunk/oak-auth-external/pom.xml
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactoryTest.java
Modified: jackrabbit/oak/trunk/oak-auth-external/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/pom.xml?rev=1869188&r1=1869187&r2=1869188&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-auth-external/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-auth-external/pom.xml Wed Oct 30 16:38:15 2019
@@ -175,11 +175,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
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=1869188&r1=1869187&r2=1869188&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 Wed Oct 30 16:38:15 2019
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.spi.security.authentication.external.impl;
import javax.jcr.Repository;
@@ -35,13 +34,13 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalLoginModuleTestBase;
import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalUser;
import org.apache.jackrabbit.oak.spi.security.authentication.external.SyncManager;
-import org.easymock.EasyMock;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
public class ExternalLoginModuleFactoryTest extends ExternalLoginModuleTestBase {
@@ -103,7 +102,7 @@ public class ExternalLoginModuleFactoryT
* the factory in JAAS options which then delegates to ExternalLoginModuleFactory
*/
private void setUpJaasFactoryWithInjection() {
- context.registerService(Repository.class, EasyMock.createMock(Repository.class));
+ context.registerService(Repository.class, mock(Repository.class));
context.registerService(SyncManager.class, new SyncManagerImpl(whiteboard));
context.registerService(ExternalIdentityProviderManager.class, new ExternalIDPManagerImpl(whiteboard));