You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/12/03 17:56:05 UTC
[isis] branch master updated: ISIS-2464: minor test cleanup
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new b90b19d ISIS-2464: minor test cleanup
b90b19d is described below
commit b90b19df9ec1d5162aa85b5adb9293bbed114ebd
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Dec 3 18:55:52 2020 +0100
ISIS-2464: minor test cleanup
---
.../isis/core/runtimeservices/sudo/SudoServiceDefault.java | 14 +++++++++-----
...actoryForTesting.java => AuthenticatorsForTesting.java} | 5 +----
.../AuthenticationManager_authenticators_Test.java | 4 ++--
.../StandardAuthenticationManager_AuthenticationTest.java | 4 ++--
4 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sudo/SudoServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sudo/SudoServiceDefault.java
index c26b4a0..c8dfac5 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sudo/SudoServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sudo/SudoServiceDefault.java
@@ -53,8 +53,17 @@ public class SudoServiceDefault implements SudoService {
private final IsisInteractionFactory interactionFactory;
+ // -- LISTENERS
+
private Can<SudoService.Listener> sudoListeners = Can.empty();
+ @PostConstruct @Inject
+ public void init(final ServiceRegistry serviceRegistry) {
+ this.sudoListeners = serviceRegistry.select(SudoService.Listener.class);
+ }
+
+ // -- IMPLEMENTATION
+
@Override
public <T> T call(final @NonNull UserMemento user, final @NonNull Callable<T> callable) {
@@ -66,11 +75,6 @@ public class SudoServiceDefault implements SudoService {
}
}
- @PostConstruct @Inject
- public void init(final ServiceRegistry serviceRegistry) {
- this.sudoListeners = serviceRegistry.select(SudoService.Listener.class);
- }
-
// -- HELPER
private void beforeCall(final @NonNull UserMemento user) {
diff --git a/core/security/src/test/java/org/apache/isis/security/SecurityFactoryForTesting.java b/core/security/src/test/java/org/apache/isis/security/AuthenticatorsForTesting.java
similarity index 93%
rename from core/security/src/test/java/org/apache/isis/security/SecurityFactoryForTesting.java
rename to core/security/src/test/java/org/apache/isis/security/AuthenticatorsForTesting.java
index 719d85c..79be745 100644
--- a/core/security/src/test/java/org/apache/isis/security/SecurityFactoryForTesting.java
+++ b/core/security/src/test/java/org/apache/isis/security/AuthenticatorsForTesting.java
@@ -24,7 +24,7 @@ import org.apache.isis.core.security.authentication.standard.AuthenticatorAbstra
import lombok.experimental.UtilityClass;
@UtilityClass
-public class SecurityFactoryForTesting {
+public class AuthenticatorsForTesting {
public static AuthenticatorAbstract authenticatorAllwaysValid() {
return new AuthenticatorAbstract() {
@@ -66,9 +66,6 @@ public class SecurityFactoryForTesting {
if(!"foo".equals(request.getName())) {
return false;
}
-// if(!request.streamRoles().anyMatch(roleName->"bar".equals(roleName))) {
-// return false;
-// }
return true;
}
};
diff --git a/core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticationManager_authenticators_Test.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticationManager_authenticators_Test.java
index b46c3a6..558eaeb 100644
--- a/core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticationManager_authenticators_Test.java
+++ b/core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticationManager_authenticators_Test.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.security.authentication.AuthenticationRequestPasswor
import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
import org.apache.isis.core.security.authentication.standard.NoAuthenticatorException;
import org.apache.isis.core.security.authentication.standard.RandomCodeGeneratorDefault;
-import org.apache.isis.security.SecurityFactoryForTesting;
+import org.apache.isis.security.AuthenticatorsForTesting;
import lombok.val;
@@ -51,7 +51,7 @@ public class AuthenticationManager_authenticators_Test {
@Test
public void shouldBeAbleToUseAuthenticators() throws Exception {
- val auth = SecurityFactoryForTesting.authenticatorAllwaysValid();
+ val auth = AuthenticatorsForTesting.authenticatorAllwaysValid();
authenticationManager = new AuthenticationManager(
Collections.singletonList(auth),
diff --git a/core/security/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
index 40fee5c..b3ab1f0 100644
--- a/core/security/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
+++ b/core/security/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.security.authentication.AuthenticationRequestPasswor
import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
import org.apache.isis.core.security.authentication.standard.RandomCodeGeneratorDefault;
-import org.apache.isis.security.SecurityFactoryForTesting;
+import org.apache.isis.security.AuthenticatorsForTesting;
public class StandardAuthenticationManager_AuthenticationTest {
@@ -41,7 +41,7 @@ public class StandardAuthenticationManager_AuthenticationTest {
public void setUp() throws Exception {
authenticationManager = new AuthenticationManager(
- Collections.singletonList(SecurityFactoryForTesting.authenticatorValidForFoo()),
+ Collections.singletonList(AuthenticatorsForTesting.authenticatorValidForFoo()),
new RandomCodeGeneratorDefault());
}