You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/12/07 11:48:31 UTC
[isis] 03/06: ISIS-2218: fixes compile errors in unit tess
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 1b96aebe99ce7506b94e32b7b37576c55d30623e
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Dec 7 10:28:49 2019 +0000
ISIS-2218: fixes compile errors in unit tess
---
.../manager/AuthenticationManager.java | 2 ++
...AuthenticationManager_authenticators_Test.java} | 31 ++++++++--------------
...AuthenticatorOrAuthorizorTest_authenticate.java | 1 -
...ticatorOrAuthorizorTest_isVisibleInAnyRole.java | 1 -
4 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/manager/AuthenticationManager.java b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/manager/AuthenticationManager.java
index b66c992..636a3fe 100644
--- a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/manager/AuthenticationManager.java
+++ b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/manager/AuthenticationManager.java
@@ -19,6 +19,7 @@
package org.apache.isis.security.api.authentication.manager;
+import lombok.Getter;
import lombok.extern.log4j.Log4j2;
import lombok.val;
@@ -53,6 +54,7 @@ public class AuthenticationManager {
private final Map<String, String> userByValidationCode = _Maps.newHashMap();
private final RandomCodeGenerator randomCodeGenerator;
+ @Getter
private final List<Authenticator> authenticators;
private final List<Registrar> registrars;
diff --git a/core/security/api/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java b/core/security/api/src/test/java/org/apache/isis/security/authentication/standard/AuthenticationManager_authenticators_Test.java
similarity index 71%
rename from core/security/api/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java
rename to core/security/api/src/test/java/org/apache/isis/security/authentication/standard/AuthenticationManager_authenticators_Test.java
index 2912f7d..f7e35c9 100644
--- a/core/security/api/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java
+++ b/core/security/api/src/test/java/org/apache/isis/security/authentication/standard/AuthenticationManager_authenticators_Test.java
@@ -19,13 +19,17 @@
package org.apache.isis.security.authentication.standard;
+import java.util.Collections;
+
import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
import org.apache.isis.security.api.authentication.standard.Authenticator;
import org.apache.isis.security.api.authentication.standard.NoAuthenticatorException;
+import org.apache.isis.security.api.authentication.standard.RandomCodeGeneratorDefault;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -35,8 +39,9 @@ import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.assertThat;
@RunWith(JMock.class)
-public class StandardAuthenticationManager_AuthenticatorsTest {
+public class AuthenticationManager_authenticators_Test {
+ @Rule
private final Mockery mockery = new JUnit4Mockery();
private AuthenticationManager authenticationManager;
@@ -47,33 +52,19 @@ public class StandardAuthenticationManager_AuthenticatorsTest {
mockAuthenticator = mockery.mock(Authenticator.class);
}
- // @Test
- // public void shouldInitiallyHaveNoAuthenticators() throws Exception {
- // authenticationManager = new AuthenticationManagerStandard();
- // assertThat(authenticationManager.getAuthenticators().size(), is(0));
- // }
-
@Test(expected = NoAuthenticatorException.class)
public void shouldNotBeAbleToAuthenticateWithNoAuthenticators() throws Exception {
-
- authenticationManager = new AuthenticationManager(authenticators, randomCodeGenerator);
-
+
+ authenticationManager = new AuthenticationManager(Collections.emptyList(), new RandomCodeGeneratorDefault());
authenticationManager.authenticate(new AuthenticationRequestPassword("foo", "bar"));
}
@Test
public void shouldBeAbleToUseAuthenticators() throws Exception {
-
- authenticationManager = AuthenticationManager.instanceForTesting(mockAuthenticator);
-
+
+ authenticationManager = new AuthenticationManager(Collections.singletonList(mockAuthenticator), new RandomCodeGeneratorDefault());
assertThat(authenticationManager.getAuthenticators().size(), is(1));
- assertThat(authenticationManager.getAuthenticators().getFirst().get(), is(sameInstance(mockAuthenticator)));
+ assertThat(authenticationManager.getAuthenticators().get(0), is(sameInstance(mockAuthenticator)));
}
- // @Test(expected = UnsupportedOperationException.class)
- // public void shouldNotBeAbleToModifyReturnedAuthenticators() throws Exception {
- // val authenticators = authenticationManager.getAuthenticators();
- // authenticators.add(mockAuthenticator);
- // }
-
}
diff --git a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java b/core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
index 96fbf1d..5c0449a 100644
--- a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
+++ b/core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
@@ -65,7 +65,6 @@ public class ShiroAuthenticatorOrAuthorizorTest_authenticate {
authenticator = new AuthenticatorShiro(configuration);
authorizor = new ShiroAuthorizor();
- authenticator.init();
authorizor.init();
}
diff --git a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java b/core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
index 73da9c1..20ed8b2 100644
--- a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
+++ b/core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
@@ -67,7 +67,6 @@ public class ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole {
authenticator = new AuthenticatorShiro(configuration);
authorizor = new ShiroAuthorizor();
- authenticator.init();
authorizor.init();
}