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 2020/11/24 12:08:06 UTC
svn commit: r1883784 [1/2] - in
/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak:
plugins/tree/ spi/security/ spi/security/authentication/
spi/security/authentication/credentials/ spi/security/authentication/token/
spi/sec...
Author: angela
Date: Tue Nov 24 12:08:05 2020
New Revision: 1883784
URL: http://svn.apache.org/viewvc?rev=1883784&view=rev
Log:
OAK-9280 : Missing assertions/verification with tests
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/plugins/tree/AbstractTreeTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/plugins/tree/NullLocationTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/plugins/tree/TreeLocationTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/MillisecondsTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/SecurityConfigurationTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModuleTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthInfoImplTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/GuestLoginModuleTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/JaasLoginContextTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/OpenAuthenticationConfigurationTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/ThrowingCallbackHandler.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/AbstractCredentialsTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CompositeCredentialsSupportTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/SimpleCredentialsSupportTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/token/CompositeTokenProviderTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ACETest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlListTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManagerTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ImmutableACLTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/PermissionAwareTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ReadPolicyTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/EmptyPermissionProviderTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionsTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProviderTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositePatternTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositeRestrictionProviderTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/EmptyRestrictionProviderTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinitionImplTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionImplTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfigurationTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/EmptyPrincipalProviderTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/EveryonePrincipalTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalImplTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalManagerImplTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalProviderTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/SystemPrincipalTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/ImmutablePrivilegeDefinitionTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeUtilTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/AbstractAuthorizableActionTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/AbstractGroupActionTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/AccessControlActionTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/ClearMembershipActionTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/CompositeActionProviderTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordChangeActionTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationActionTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/util/PasswordUtilTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/util/UserUtilTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/xml/NodeInfoTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/xml/PropInfoTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/xml/ReferenceChangeTrackerTest.java
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/plugins/tree/AbstractTreeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/plugins/tree/AbstractTreeTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/plugins/tree/AbstractTreeTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/plugins/tree/AbstractTreeTest.java Tue Nov 24 12:08:05 2020
@@ -31,7 +31,7 @@ import org.mockito.Mockito;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.withSettings;
-public class AbstractTreeTest {
+public abstract class AbstractTreeTest {
static final String NON_EXISTING_PATH = "/nonExisting";
static final String CHILD_PATH = "/z/child";
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/plugins/tree/NullLocationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/plugins/tree/NullLocationTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/plugins/tree/NullLocationTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/plugins/tree/NullLocationTest.java Tue Nov 24 12:08:05 2020
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.plugins.tree;
-import org.apache.jackrabbit.util.Text;
import org.junit.Before;
import org.junit.Test;
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/plugins/tree/TreeLocationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/plugins/tree/TreeLocationTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/plugins/tree/TreeLocationTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/plugins/tree/TreeLocationTest.java Tue Nov 24 12:08:05 2020
@@ -26,10 +26,8 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java Tue Nov 24 12:08:05 2020
@@ -233,10 +233,10 @@ public class ConfigurationParametersTest
assertEquals(testObject, options.getConfigValue("TEST", testObject));
assertEquals("t", options.getConfigValue("TEST", "defaultString"));
- assertTrue(1000 == options.getConfigValue("String", 10, int.class));
- assertTrue(1000 == options.getConfigValue("String", 10));
+ assertEquals(1000, (int) options.getConfigValue("String", 10, int.class));
+ assertEquals(1000, (int) options.getConfigValue("String", 10));
assertEquals(int1000, options.getConfigValue("String", 10));
- assertEquals(new Long(1000), options.getConfigValue("String", 10l));
+ assertEquals(Long.valueOf(1000), options.getConfigValue("String", 10l));
assertEquals("1000", options.getConfigValue("String", "10"));
assertEquals(int1000, options.getConfigValue("Int2", 10));
@@ -279,8 +279,8 @@ public class ConfigurationParametersTest
assertEquals(int1000, options.getConfigValue("String", 10, null));
assertEquals(int1000, options.getConfigValue("String", 10, Integer.class));
- assertEquals(new Long(1000), options.getConfigValue("String", 10l, null));
- assertEquals(new Long(1000), options.getConfigValue("String", 10l, Long.class));
+ assertEquals(Long.valueOf(1000), options.getConfigValue("String", 10l, null));
+ assertEquals(Long.valueOf(1000), options.getConfigValue("String", 10l, Long.class));
assertEquals("1000", options.getConfigValue("String", "10", null));
assertEquals("1000", options.getConfigValue("String", "10", String.class));
@@ -310,14 +310,14 @@ public class ConfigurationParametersTest
impossible.put("int", TestObject.class);
impossible.put("int", Calendar.class);
- for (String key : impossible.keySet()) {
+ impossible.forEach((key, value) -> {
try {
- options.getConfigValue(key, null, impossible.get(key));
- fail("Impossible conversion for " + key + " to " + impossible.get(key));
+ options.getConfigValue(key, null, value);
+ fail("Impossible conversion for " + key + " to " + value);
} catch (IllegalArgumentException e) {
// success
}
- }
+ });
}
@Test
@@ -344,7 +344,7 @@ public class ConfigurationParametersTest
Set<String> defaultStrings = ImmutableSet.of("abc", "def", "ghi");
Set<TestObject> defaultObjects = ImmutableSet.of(new TestObject("abc"), new TestObject("def"));
- for (Object value : configValues.keySet()) {
+ configValues.forEach((value, expected) -> {
ConfigurationParameters config;
if (value instanceof ConfigurationParameters) {
config = ConfigurationParameters.of((ConfigurationParameters) value);
@@ -352,7 +352,6 @@ public class ConfigurationParametersTest
config = ConfigurationParameters.of("key", value);
}
- Set<?> expected = configValues.get(value);
assertEquals(expected, config.getConfigValue("key", Collections.emptySet()));
assertEquals(expected, config.getConfigValue("key", Collections.<String>emptySet()));
assertEquals(expected, config.getConfigValue("key", ImmutableSet.of()));
@@ -365,7 +364,7 @@ public class ConfigurationParametersTest
if (!config.containsKey("key")) {
assertEquals(defaultStrings, config.getConfigValue("key", defaultStrings, Set.class));
assertEquals(defaultObjects, config.getConfigValue("key", defaultObjects, Set.class));
- assertEquals(null, config.getConfigValue("key", null, Set.class));
+ assertNull(config.getConfigValue("key", null, Set.class));
assertEquals(defaultStrings, config.getConfigValue("key", defaultStrings));
assertEquals(defaultObjects, config.getConfigValue("key", defaultObjects));
} else {
@@ -381,7 +380,7 @@ public class ConfigurationParametersTest
assertEquals(defaultStrings, config.getConfigValue("nonexisting", defaultStrings, Set.class));
assertEquals(defaultObjects, config.getConfigValue("nonexisting", defaultObjects));
assertEquals(defaultObjects, config.getConfigValue("nonexisting", defaultObjects, Set.class));
- }
+ });
}
@Test(expected = IllegalArgumentException.class)
@@ -486,14 +485,13 @@ public class ConfigurationParametersTest
configValues.put(new ArrayList<>(), new String[0]);
configValues.put(ConfigurationParameters.EMPTY, new String[0]);
- for (Object value : configValues.keySet()) {
+ configValues.forEach((value, expected) -> {
ConfigurationParameters config;
if (value instanceof ConfigurationParameters) {
config = ConfigurationParameters.of((ConfigurationParameters) value);
} else {
config = ConfigurationParameters.of("key", value);
}
- Object[] expected = configValues.get(value);
assertArrayEquals(expected, config.getConfigValue("key", new String[0]));
assertArrayEquals(expected, config.getConfigValue("key", new String[0], String[].class));
@@ -512,7 +510,7 @@ public class ConfigurationParametersTest
// non existing kez with default values
assertArrayEquals(defaultStrings, config.getConfigValue("nonexisting", defaultStrings));
assertArrayEquals(defaultStrings, config.getConfigValue("nonexisting", defaultStrings, String[].class));
- }
+ });
}
@Test
@@ -606,7 +604,7 @@ public class ConfigurationParametersTest
options.clear();
}
- private class TestObject {
+ private static class TestObject {
private final String name;
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/MillisecondsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/MillisecondsTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/MillisecondsTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/MillisecondsTest.java Tue Nov 24 12:08:05 2020
@@ -22,7 +22,6 @@ import static org.apache.jackrabbit.oak.
import static org.apache.jackrabbit.oak.spi.security.ConfigurationParameters.Milliseconds.NEVER;
import static org.apache.jackrabbit.oak.spi.security.ConfigurationParameters.Milliseconds.NULL;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
@@ -97,8 +96,8 @@ public class MillisecondsTest {
assertNotEquals(milliseconds, FOREVER);
assertNotEquals(milliseconds, ConfigurationParameters.Milliseconds.of("1h", NULL));
- assertFalse(NEVER.equals(null));
- assertFalse(NULL.equals(NULL.value));
+ assertNotEquals(null, NEVER);
+ assertNotEquals(NULL, NULL.value);
}
@Test
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/SecurityConfigurationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/SecurityConfigurationTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/SecurityConfigurationTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/SecurityConfigurationTest.java Tue Nov 24 12:08:05 2020
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertTru
public class SecurityConfigurationTest {
- private SecurityConfiguration configuration = new SecurityConfiguration.Default();
+ private final SecurityConfiguration configuration = new SecurityConfiguration.Default();
@Test
public void testGetName() {
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModuleTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModuleTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModuleTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModuleTest.java Tue Nov 24 12:08:05 2020
@@ -907,7 +907,7 @@ public class AbstractLoginModuleTest {
//--------------------------------------------------------------------------
- private class TestCredentials implements Credentials {}
+ private static class TestCredentials implements Credentials {}
private static final class TestLoginModule extends AbstractLoginModule {
@@ -949,7 +949,7 @@ public class AbstractLoginModuleTest {
}
}
- private final class TestCallbackHandler implements CallbackHandler {
+ private static final class TestCallbackHandler implements CallbackHandler {
private Whiteboard whiteboard = null;
private UserManager userManager = null;
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthInfoImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthInfoImplTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthInfoImplTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthInfoImplTest.java Tue Nov 24 12:08:05 2020
@@ -59,9 +59,7 @@ public class AuthInfoImplTest {
@Test
public void testGetAttribute() {
- for (String attrName : ATTRIBUTES.keySet()) {
- assertEquals(ATTRIBUTES.get(attrName), authInfo.getAttribute(attrName));
- }
+ ATTRIBUTES.forEach((key, value) -> assertEquals(value, authInfo.getAttribute(key)));
}
@Test
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/GuestLoginModuleTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/GuestLoginModuleTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/GuestLoginModuleTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/GuestLoginModuleTest.java Tue Nov 24 12:08:05 2020
@@ -42,9 +42,9 @@ import static org.junit.Assert.assertTru
*/
public class GuestLoginModuleTest {
- private Subject subject = new Subject();
- private Map<String, ?> sharedState = new HashMap<>();
- private LoginModule guestLoginModule = new GuestLoginModule();
+ private final Subject subject = new Subject();
+ private final Map<String, ?> sharedState = new HashMap<>();
+ private final LoginModule guestLoginModule = new GuestLoginModule();
@Test
public void testNullLogin() throws LoginException {
@@ -173,7 +173,7 @@ public class GuestLoginModuleTest {
//--------------------------------------------------------------------------
- private class TestCallbackHandler implements CallbackHandler {
+ private static class TestCallbackHandler implements CallbackHandler {
private final Credentials creds;
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/JaasLoginContextTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/JaasLoginContextTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/JaasLoginContextTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/JaasLoginContextTest.java Tue Nov 24 12:08:05 2020
@@ -29,6 +29,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verifyNoInteractions;
public class JaasLoginContextTest {
@@ -77,6 +78,7 @@ public class JaasLoginContextTest {
public void testNameCallbackHandler() throws Exception {
CallbackHandler cbh = mock(CallbackHandler.class);
JaasLoginContext ctx = new JaasLoginContext("name", cbh);
+ verifyNoInteractions(cbh);
}
@Test(expected = LoginException.class)
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/OpenAuthenticationConfigurationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/OpenAuthenticationConfigurationTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/OpenAuthenticationConfigurationTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/OpenAuthenticationConfigurationTest.java Tue Nov 24 12:08:05 2020
@@ -27,6 +27,8 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verifyNoInteractions;
public class OpenAuthenticationConfigurationTest {
@@ -66,12 +68,16 @@ public class OpenAuthenticationConfigura
@Test
public void testLogin() throws LoginException {
// nop => must not throw
- lcp.getLoginContext(new Credentials() {}, null).login();
+ Credentials credentials = mock(Credentials.class);
+ lcp.getLoginContext(credentials, null).login();
+ verifyNoInteractions(credentials);
}
@Test
public void testLogout() throws LoginException {
// nop => must not throw
+ Credentials credentials = mock(Credentials.class);
lcp.getLoginContext(new Credentials() {}, null).logout();
+ verifyNoInteractions(credentials);
}
}
\ No newline at end of file
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/ThrowingCallbackHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/ThrowingCallbackHandler.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/ThrowingCallbackHandler.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/ThrowingCallbackHandler.java Tue Nov 24 12:08:05 2020
@@ -26,7 +26,7 @@ import javax.security.auth.callback.Unsu
*/
class ThrowingCallbackHandler implements CallbackHandler {
- private boolean throwIOException;
+ private final boolean throwIOException;
ThrowingCallbackHandler(boolean throwIOException) {
this.throwIOException = throwIOException;
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/AbstractCredentialsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/AbstractCredentialsTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/AbstractCredentialsTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/AbstractCredentialsTest.java Tue Nov 24 12:08:05 2020
@@ -32,7 +32,7 @@ public class AbstractCredentialsTest {
private static final String USER_ID = "userId";
- private AbstractCredentials credentials = new AbstractCredentials(USER_ID) {
+ private final AbstractCredentials credentials = new AbstractCredentials(USER_ID) {
};
@Test
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CompositeCredentialsSupportTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CompositeCredentialsSupportTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CompositeCredentialsSupportTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CompositeCredentialsSupportTest.java Tue Nov 24 12:08:05 2020
@@ -73,9 +73,7 @@ public class CompositeCredentialsSupport
assertTrue(attributes.isEmpty());
Map<String, ?> expected = ImmutableMap.of("a", "a", "b", Boolean.TRUE, "c", new TestCredentials());
- for (Map.Entry<String, ?> entry : expected.entrySet()) {
- sc.setAttribute(entry.getKey(), entry.getValue());
- }
+ expected.forEach((key, value) -> sc.setAttribute(key, value));
attributes = credentialsSupport.getAttributes(sc);
assertNotNull(attributes);
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/SimpleCredentialsSupportTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/SimpleCredentialsSupportTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/SimpleCredentialsSupportTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/SimpleCredentialsSupportTest.java Tue Nov 24 12:08:05 2020
@@ -62,9 +62,7 @@ public class SimpleCredentialsSupportTes
assertTrue(attributes.isEmpty());
Map<String, ?> expected = ImmutableMap.of("a", "a", "b", Boolean.TRUE, "c", new TestCredentials());
- for (Map.Entry<String, ?> entry : expected.entrySet()) {
- sc.setAttribute(entry.getKey(), entry.getValue());
- }
+ expected.forEach((key, value) -> sc.setAttribute(key, value));
attributes = credentialsSupport.getAttributes(sc);
assertNotNull(attributes);
@@ -83,9 +81,7 @@ public class SimpleCredentialsSupportTes
Map<String, ?> expected = ImmutableMap.of("a", "a", "b", Boolean.TRUE, "c", new TestCredentials());
credentialsSupport.setAttributes(sc, expected);
- for (Map.Entry<String, ?> entry : expected.entrySet()) {
- assertEquals(entry.getValue(), sc.getAttribute(entry.getKey()));
- }
+ expected.forEach((key, value) -> assertEquals(value, sc.getAttribute(key)));
attributes = credentialsSupport.getAttributes(sc);
assertNotNull(attributes);
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/token/CompositeTokenProviderTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/token/CompositeTokenProviderTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/token/CompositeTokenProviderTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/token/CompositeTokenProviderTest.java Tue Nov 24 12:08:05 2020
@@ -16,18 +16,17 @@
*/
package org.apache.jackrabbit.oak.spi.security.authentication.token;
-import java.util.Map;
-import javax.jcr.Credentials;
-import javax.jcr.GuestCredentials;
-import javax.jcr.SimpleCredentials;
-
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.junit.Before;
import org.junit.Test;
-import org.mockito.Mockito;
+
+import javax.jcr.Credentials;
+import javax.jcr.GuestCredentials;
+import javax.jcr.SimpleCredentials;
+import java.util.Map;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ACETest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ACETest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ACETest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ACETest.java Tue Nov 24 12:08:05 2020
@@ -16,16 +16,6 @@
*/
package org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol;
-import java.util.Collections;
-import java.util.Set;
-import javax.jcr.PropertyType;
-import javax.jcr.RepositoryException;
-import javax.jcr.Value;
-import javax.jcr.ValueFactory;
-import javax.jcr.ValueFormatException;
-import javax.jcr.security.AccessControlException;
-import javax.jcr.security.Privilege;
-
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
@@ -42,7 +32,16 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
import org.junit.Before;
import org.junit.Test;
-import org.mockito.Mockito;
+
+import javax.jcr.PropertyType;
+import javax.jcr.RepositoryException;
+import javax.jcr.Value;
+import javax.jcr.ValueFactory;
+import javax.jcr.ValueFormatException;
+import javax.jcr.security.AccessControlException;
+import javax.jcr.security.Privilege;
+import java.util.Collections;
+import java.util.Set;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
@@ -53,7 +52,6 @@ import static org.junit.Assert.assertNot
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
/**
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlListTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlListTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlListTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlListTest.java Tue Nov 24 12:08:05 2020
@@ -150,10 +150,10 @@ public class AbstractAccessControlListTe
paths.put("/jr:testPath", "/jr:testPath");
paths.put("/{http://jackrabbit.apache.org}testPath", "/jr:testPath");
- for (String path : paths.keySet()) {
- AbstractAccessControlList acl = createACL(path, Collections.<JackrabbitAccessControlEntry>emptyList(), npMapper);
- assertEquals(paths.get(path), acl.getPath());
- }
+ paths.forEach((key, value) -> {
+ AbstractAccessControlList acl = createACL(key, Collections.<JackrabbitAccessControlEntry>emptyList(), npMapper);
+ assertEquals(value, acl.getPath());
+ });
}
@Test
@@ -170,10 +170,10 @@ public class AbstractAccessControlListTe
paths.put("/{http://jackrabbit.apache.org}testPath", oakPath);
// test if oak-path is properly set.
- for (String path : paths.keySet()) {
- AbstractAccessControlList acl = createACL(path, Collections.<JackrabbitAccessControlEntry>emptyList(), npMapper);
- assertEquals(paths.get(path), acl.getOakPath());
- }
+ paths.forEach((key, value) -> {
+ AbstractAccessControlList acl = createACL(key, Collections.<JackrabbitAccessControlEntry>emptyList(), npMapper);
+ assertEquals(value, acl.getOakPath());
+ });
}
private static NamePathMapper mockNamePathMapper(String testPath) {
@@ -198,7 +198,7 @@ public class AbstractAccessControlListTe
assertNotNull(acl.getAccessControlEntries());
assertNotNull(acl.getEntries());
- assertTrue(acl.getAccessControlEntries().length == 0);
+ assertEquals(0, acl.getAccessControlEntries().length);
assertEquals(acl.getAccessControlEntries().length, acl.getEntries().size());
assertEquals(0, acl.size());
assertTrue(acl.isEmpty());
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManagerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManagerTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManagerTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManagerTest.java Tue Nov 24 12:08:05 2020
@@ -443,7 +443,7 @@ public class AbstractAccessControlManage
assertArrayEquals(new Privilege[0], acMgr.getPrivileges(null, ImmutableSet.<Principal>of()));
}
- private class TestAcMgr extends AbstractAccessControlManager {
+ private static class TestAcMgr extends AbstractAccessControlManager {
protected TestAcMgr(@NotNull Root root, @NotNull NamePathMapper namePathMapper, @NotNull SecurityProvider securityProvider) {
super(root, namePathMapper, securityProvider);
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ImmutableACLTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ImmutableACLTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ImmutableACLTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ImmutableACLTest.java Tue Nov 24 12:08:05 2020
@@ -40,6 +40,7 @@ import java.util.List;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -163,8 +164,8 @@ public class ImmutableACLTest extends Ab
assertEquals(acl, createEmptyACL());
ACE entry = createEntry(true, PrivilegeConstants.JCR_READ, PrivilegeConstants.JCR_ADD_CHILD_NODES);
- assertFalse(acl.equals(createACL(entry)));
- assertFalse(acl.equals(new TestACL(getTestPath(), getRestrictionProvider(), getNamePathMapper(), Collections.<JackrabbitAccessControlEntry>emptyList())));
+ assertNotEquals(acl, createACL(entry));
+ assertNotEquals(acl, new TestACL(getTestPath(), getRestrictionProvider(), getNamePathMapper(), Collections.<JackrabbitAccessControlEntry>emptyList()));
}
@Test
@@ -187,14 +188,14 @@ public class ImmutableACLTest extends Ab
assertEquals(repoAcl, createACL((String) null, ace1, ace2b));
- assertFalse(acl.equals(createACL(ace2, ace1)));
- assertFalse(acl.equals(repoAcl));
- assertFalse(acl.equals(createEmptyACL()));
- assertFalse(acl.equals(createACL("/anotherPath", ace1, ace2)));
- assertFalse(acl.equals(new TestACL("/anotherPath", rp, getNamePathMapper(), ace1, ace2)));
- assertFalse(acl.equals(new TestACL("/anotherPath", rp, getNamePathMapper(), ace1, ace2)));
- assertFalse(acl.equals(new TestACL("/anotherPath", rp, getNamePathMapper())));
- assertFalse(acl.equals(new TestACL(getTestPath(), rp, getNamePathMapper(), ace1, ace2)));
+ assertNotEquals(acl, createACL(ace2, ace1));
+ assertNotEquals(acl, repoAcl);
+ assertNotEquals(acl, createEmptyACL());
+ assertNotEquals(acl, createACL("/anotherPath", ace1, ace2));
+ assertNotEquals(acl, new TestACL("/anotherPath", rp, getNamePathMapper(), ace1, ace2));
+ assertNotEquals(acl, new TestACL("/anotherPath", rp, getNamePathMapper(), ace1, ace2));
+ assertNotEquals(acl, new TestACL("/anotherPath", rp, getNamePathMapper()));
+ assertNotEquals(acl, new TestACL(getTestPath(), rp, getNamePathMapper(), ace1, ace2));
}
@Test
@@ -208,19 +209,19 @@ public class ImmutableACLTest extends Ab
JackrabbitAccessControlList repoAcl = createACL((String) null, ace1, ace2);
int hc = acl.hashCode();
- assertTrue(hc == createACL(ace1, ace2).hashCode());
- assertTrue(hc == createACL(ace1, ace2b).hashCode());
+ assertEquals(hc, createACL(ace1, ace2).hashCode());
+ assertEquals(hc, createACL(ace1, ace2b).hashCode());
- assertTrue(repoAcl.hashCode() == createACL((String) null, ace1, ace2b).hashCode());
+ assertEquals(repoAcl.hashCode(), createACL((String) null, ace1, ace2b).hashCode());
- assertFalse(hc == createACL(ace2, ace1).hashCode());
- assertFalse(hc == repoAcl.hashCode());
- assertFalse(hc == createEmptyACL().hashCode());
- assertFalse(hc == createACL("/anotherPath", ace1, ace2).hashCode());
- assertFalse(hc == new TestACL("/anotherPath", rp, getNamePathMapper(), ace1, ace2).hashCode());
- assertFalse(hc == new TestACL("/anotherPath", rp, getNamePathMapper(), ace1, ace2).hashCode());
- assertFalse(hc == new TestACL("/anotherPath", rp, getNamePathMapper()).hashCode());
- assertFalse(hc == new TestACL(getTestPath(), rp, getNamePathMapper(), ace1, ace2).hashCode());
+ assertNotEquals(hc, createACL(ace2, ace1).hashCode());
+ assertNotEquals(hc, repoAcl.hashCode());
+ assertNotEquals(hc, createEmptyACL().hashCode());
+ assertNotEquals(hc, createACL("/anotherPath", ace1, ace2).hashCode());
+ assertNotEquals(hc, new TestACL("/anotherPath", rp, getNamePathMapper(), ace1, ace2).hashCode());
+ assertNotEquals(hc, new TestACL("/anotherPath", rp, getNamePathMapper(), ace1, ace2).hashCode());
+ assertNotEquals(hc, new TestACL("/anotherPath", rp, getNamePathMapper()).hashCode());
+ assertNotEquals(hc, new TestACL(getTestPath(), rp, getNamePathMapper(), ace1, ace2).hashCode());
}
@Test
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/PermissionAwareTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/PermissionAwareTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/PermissionAwareTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/PermissionAwareTest.java Tue Nov 24 12:08:05 2020
@@ -44,7 +44,7 @@ import static org.mockito.Mockito.withSe
public class PermissionAwareTest extends AbstractAccessControlTest {
- private PermissionProvider permissionProvider = mock(PermissionProvider.class);
+ private final PermissionProvider permissionProvider = mock(PermissionProvider.class);
private Root awareRoot;
private Root unawareRoot;
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ReadPolicyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ReadPolicyTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ReadPolicyTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ReadPolicyTest.java Tue Nov 24 12:08:05 2020
@@ -18,8 +18,6 @@ package org.apache.jackrabbit.oak.spi.se
import org.junit.Test;
-import javax.jcr.RepositoryException;
-
import static org.junit.Assert.assertEquals;
public class ReadPolicyTest {
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/EmptyPermissionProviderTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/EmptyPermissionProviderTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/EmptyPermissionProviderTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/EmptyPermissionProviderTest.java Tue Nov 24 12:08:05 2020
@@ -16,15 +16,14 @@
*/
package org.apache.jackrabbit.oak.spi.security.authorization.permission;
-import javax.jcr.Session;
-
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
import org.junit.Test;
import org.mockito.Mockito;
-import static org.junit.Assert.assertEquals;
+import javax.jcr.Session;
+
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionsTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionsTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionsTest.java Tue Nov 24 12:08:05 2020
@@ -126,13 +126,13 @@ public class PermissionsTest {
ImmutableSet.of(Permissions.NAMESPACE_MANAGEMENT,Permissions.WORKSPACE_MANAGEMENT,Permissions.NODE_TYPE_DEFINITION_MANAGEMENT,Permissions.PRIVILEGE_MANAGEMENT)
);
- for (long permissions : test.keySet()) {
+ test.forEach((key, value) -> {
Set<String> expected = new HashSet<>();
- for (long p : test.get(permissions)) {
+ for (long p : value) {
expected.add(Permissions.PERMISSION_NAMES.get(p));
}
- assertEquals(expected, Permissions.getNames(permissions));
- }
+ assertEquals(expected, Permissions.getNames(key));
+ });
}
@Test
@@ -148,13 +148,13 @@ public class PermissionsTest {
ImmutableSet.of(Permissions.WRITE, Permissions.VERSION_MANAGEMENT, Permissions.REMOVE_NODE, Permissions.ADD_PROPERTY, Permissions.MODIFY_PROPERTY, Permissions.ADD_NODE, Permissions.REMOVE_PROPERTY, Permissions.SET_PROPERTY, Permissions.REMOVE)
);
- for (long permissions : test.keySet()) {
+ test.forEach((key, value) -> {
Set<String> expected = new HashSet<>();
- for (long p : test.get(permissions)) {
+ for (long p : value) {
expected.add(Permissions.PERMISSION_NAMES.get(p));
}
- assertEquals(expected, Permissions.getNames(permissions));
- }
+ assertEquals(expected, Permissions.getNames(key));
+ });
}
@Test
@@ -179,13 +179,13 @@ public class PermissionsTest {
@Test
public void testGetStringMultiple() {
- for (long permissions : TEST.keySet()) {
+ TEST.forEach((key, value) -> {
Set<String> expected = new HashSet<>();
- for (long p : TEST.get(permissions)) {
+ for (long p : value) {
expected.add(Permissions.PERMISSION_NAMES.get(p));
}
- assertEquals(expected, Sets.newHashSet(Splitter.on(',').split(Permissions.getString(permissions))));
- }
+ assertEquals(expected, Sets.newHashSet(Splitter.on(',').split(Permissions.getString(key))));
+ });
}
@Test
@@ -201,13 +201,13 @@ public class PermissionsTest {
ImmutableSet.of(Permissions.WRITE, Permissions.VERSION_MANAGEMENT, Permissions.REMOVE_NODE, Permissions.ADD_PROPERTY, Permissions.MODIFY_PROPERTY, Permissions.ADD_NODE, Permissions.REMOVE_PROPERTY, Permissions.SET_PROPERTY, Permissions.REMOVE)
);
- for (long permissions : test.keySet()) {
+ test.forEach((key, value) -> {
Set<String> expected = new HashSet<>();
- for (long p : test.get(permissions)) {
+ for (long p : value) {
expected.add(Permissions.PERMISSION_NAMES.get(p));
}
- assertEquals(expected, Sets.newHashSet(Splitter.on(',').split(Permissions.getString(permissions))));
- }
+ assertEquals(expected, Sets.newHashSet(Splitter.on(',').split(Permissions.getString(key))));
+ });
}
@Test
@@ -234,9 +234,7 @@ public class PermissionsTest {
Permissions.SET_PROPERTY, ImmutableSet.of(Permissions.ADD_PROPERTY, Permissions.MODIFY_PROPERTY, Permissions.REMOVE_PROPERTY),
Permissions.WRITE, ImmutableSet.of(Permissions.ADD_NODE, Permissions.REMOVE_NODE, Permissions.ADD_PROPERTY, Permissions.REMOVE_PROPERTY,Permissions.MODIFY_PROPERTY)
);
- for (long permission : aggregation.keySet()) {
- assertEquals(aggregation.get(permission), ImmutableSet.copyOf(Permissions.aggregates(permission)));
- }
+ aggregation.forEach((key, value) -> assertEquals(value, ImmutableSet.copyOf(Permissions.aggregates(key))));
}
@Test
@@ -348,9 +346,7 @@ public class PermissionsTest {
Session.ACTION_READ + "," + Session.ACTION_REMOVE, Permissions.READ_NODE|Permissions.REMOVE_NODE
);
- for (Map.Entry<String, Long> entry : map.entrySet()) {
- assertEquals(entry.getValue().longValue(), Permissions.getPermissions(entry.getKey(), tl, false));
- }
+ map.forEach((key, value) -> assertEquals(value.longValue(), Permissions.getPermissions(key, tl, false)));
}
@Test
@@ -395,9 +391,7 @@ public class PermissionsTest {
map.put(JackrabbitSession.ACTION_MODIFY_ACCESS_CONTROL, Permissions.MODIFY_ACCESS_CONTROL);
map.put(JackrabbitSession.ACTION_USER_MANAGEMENT, Permissions.USER_MANAGEMENT);
- for (Map.Entry<String, Long> entry : map.entrySet()) {
- assertEquals(entry.getValue().longValue(), Permissions.getPermissions(entry.getKey(), tl, false));
- }
+ map.forEach((key, value) -> assertEquals(value.longValue(), Permissions.getPermissions(key, tl, false)));
}
@Test
@@ -427,9 +421,7 @@ public class PermissionsTest {
map.put(JackrabbitSession.ACTION_VERSIONING, Permissions.VERSION_MANAGEMENT);
map.put(JackrabbitSession.ACTION_USER_MANAGEMENT, Permissions.USER_MANAGEMENT);
- for (Map.Entry<String, Long> entry : map.entrySet()) {
- assertEquals(entry.getKey(), entry.getValue().longValue(), Permissions.getPermissions(entry.getKey(), tl, true));
- }
+ map.forEach((key, value) -> assertEquals(key, value.longValue(), Permissions.getPermissions(key, tl, true)));
}
@Test
@@ -519,22 +511,20 @@ public class PermissionsTest {
@Test
public void testGetPermissionsSingleName() {
- for (Map.Entry<Long, String> entry : Permissions.PERMISSION_NAMES.entrySet()) {
- assertEquals(entry.getKey().longValue(), Permissions.getPermissions(entry.getValue()));
- }
+ Permissions.PERMISSION_NAMES.forEach((key, value) -> assertEquals(key.longValue(), Permissions.getPermissions(value)));
}
@Test
public void testGetPermissionsMultipleNames() {
- for (Map.Entry<Long, Set<Long>> entry : TEST.entrySet()) {
+ TEST.forEach((key, value) -> {
Set<String> names = new HashSet<>();
- for (long p : entry.getValue()) {
+ for (long p : value) {
names.add(Permissions.PERMISSION_NAMES.get(p));
}
String s = Joiner.on(',').join(names);
- assertEquals(entry.getKey().longValue(), Permissions.getPermissions(s));
- }
+ assertEquals(key.longValue(), Permissions.getPermissions(s));
+ });
}
@Test
@@ -551,11 +541,11 @@ public class PermissionsTest {
PrivilegeConstants.PRIVILEGES_PATH, Permissions.PRIVILEGE_MANAGEMENT
);
- for (String path : mapping.keySet()) {
+ mapping.forEach((key, value) -> {
for (long defaultPermission : Permissions.PERMISSION_NAMES.keySet()) {
- assertEquals(mapping.get(path).longValue(), Permissions.getPermission(path, defaultPermission));
+ assertEquals(value.longValue(), Permissions.getPermission(key, defaultPermission));
}
- }
+ });
}
@Test
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProviderTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProviderTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProviderTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProviderTest.java Tue Nov 24 12:08:05 2020
@@ -16,15 +16,6 @@
*/
package org.apache.jackrabbit.oak.spi.security.authorization.restriction;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import javax.jcr.PropertyType;
-import javax.jcr.Value;
-import javax.jcr.security.AccessControlException;
-
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
import org.apache.jackrabbit.JcrConstants;
@@ -41,21 +32,30 @@ import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
+import javax.jcr.PropertyType;
+import javax.jcr.Value;
+import javax.jcr.security.AccessControlException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.when;
public class AbstractRestrictionProviderTest implements AccessControlConstants {
- private String unsupportedPath = null;
- private String testPath = "/testRoot";
+ private final String unsupportedPath = null;
+ private final String testPath = "/testRoot";
private Value globValue;
private Value[] nameValues;
@@ -261,6 +261,9 @@ public class AbstractRestrictionProvider
@Test
public void testCreatedUndefinedType() throws Exception {
Restriction r = restrictionProvider.createRestriction(testPath, "undefined", valueFactory.createValue(23));
+ assertNotNull(r);
+ assertEquals(Type.UNDEFINED, r.getDefinition().getRequiredType());
+ assertEquals(Type.LONG, r.getProperty().getType());
}
@Test(expected = AccessControlException.class)
@@ -345,7 +348,9 @@ public class AbstractRestrictionProvider
@Test
public void testWriteEmptyRestrictions() throws Exception {
- restrictionProvider.writeRestrictions(null, getAceTree(), Collections.emptySet());
+ Tree aceTree = getAceTree();
+ restrictionProvider.writeRestrictions(null, aceTree, Collections.emptySet());
+ verifyNoInteractions(aceTree);
}
@Test
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositePatternTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositePatternTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositePatternTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositePatternTest.java Tue Nov 24 12:08:05 2020
@@ -88,8 +88,8 @@ public class CompositePatternTest {
private static final class TestRestrictionPatter implements RestrictionPattern {
- private static RestrictionPattern INSTANCE_TRUE = new TestRestrictionPatter(true);
- private static RestrictionPattern INSTANCE_FALSE = new TestRestrictionPatter(false);
+ private static final RestrictionPattern INSTANCE_TRUE = new TestRestrictionPatter(true);
+ private static final RestrictionPattern INSTANCE_FALSE = new TestRestrictionPatter(false);
private final boolean matches;
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositeRestrictionProviderTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositeRestrictionProviderTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositeRestrictionProviderTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositeRestrictionProviderTest.java Tue Nov 24 12:08:05 2020
@@ -16,20 +16,9 @@
*/
package org.apache.jackrabbit.oak.spi.security.authorization.restriction;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import javax.jcr.RepositoryException;
-import javax.jcr.Value;
-import javax.jcr.ValueFactory;
-import javax.jcr.security.AccessControlException;
-
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Root;
@@ -42,16 +31,28 @@ import org.apache.jackrabbit.oak.spi.sec
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.junit.Test;
-import org.mockito.Mockito;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.Value;
+import javax.jcr.ValueFactory;
+import javax.jcr.security.AccessControlException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.when;
public class CompositeRestrictionProviderTest implements AccessControlConstants {
@@ -65,17 +66,17 @@ public class CompositeRestrictionProvide
private static final Restriction LONGS_RESTRICTION = new RestrictionImpl(PropertyStates.createProperty(NAME_LONGS, ImmutableList.of(Long.MAX_VALUE), Type.LONGS), false);
private static final Restriction UNKNOWN_RESTRICTION = new RestrictionImpl(PropertyStates.createProperty("unknown", "string"), false);
- private RestrictionProvider rp1 = spy(createRestrictionProvider(GLOB_RESTRICTION.getDefinition(), NT_PREFIXES_RESTRICTION.getDefinition()));
- private RestrictionProvider rp2 = spy(createRestrictionProvider(MANDATORY_BOOLEAN_RESTRICTION.getDefinition(), LONGS_RESTRICTION.getDefinition()));
+ private final RestrictionProvider rp1 = spy(createRestrictionProvider(GLOB_RESTRICTION.getDefinition(), NT_PREFIXES_RESTRICTION.getDefinition()));
+ private final RestrictionProvider rp2 = spy(createRestrictionProvider(MANDATORY_BOOLEAN_RESTRICTION.getDefinition(), LONGS_RESTRICTION.getDefinition()));
- private Set<String> supported = ImmutableSet.of(
+ private final Set<String> supported = ImmutableSet.of(
MANDATORY_BOOLEAN_RESTRICTION.getDefinition().getName(),
LONGS_RESTRICTION.getDefinition().getName(),
REP_PREFIXES,
REP_GLOB);
- private RestrictionProvider provider = CompositeRestrictionProvider.newInstance(rp1, rp2);
+ private final RestrictionProvider provider = CompositeRestrictionProvider.newInstance(rp1, rp2);
- private ValueFactory vf = new ValueFactoryImpl(mock(Root.class), NamePathMapper.DEFAULT);
+ private final ValueFactory vf = new ValueFactoryImpl(mock(Root.class), NamePathMapper.DEFAULT);
@NotNull
private AbstractRestrictionProvider createRestrictionProvider(@NotNull RestrictionDefinition... supportedDefinitions) {
@@ -179,9 +180,11 @@ public class CompositeRestrictionProvide
NAME_LONGS, vf.createValue(10),
REP_GLOB, vf.createValue("*")
);
- for (String name : valid.keySet()) {
- provider.createRestriction("/testPath", name, valid.get(name));
+ for (Map.Entry<String, Value> entry : valid.entrySet()) {
+ provider.createRestriction("/testPath", entry.getKey(), entry.getValue());
}
+ verify(rp1, times(1)).createRestriction(anyString(), anyString(), any(Value.class));
+ verify(rp2, times(2)).createRestriction(anyString(), anyString(), any(Value.class));
}
@Test(expected = AccessControlException.class)
@@ -195,9 +198,10 @@ public class CompositeRestrictionProvide
NAME_BOOLEAN, vf.createValue("wrong_type"),
REP_GLOB, vf.createValue(true)
);
- for (String name : invalid.keySet()) {
+ for (Map.Entry<String, Value> entry : invalid.entrySet()) {
+ String name = entry.getKey();
try {
- provider.createRestriction("/testPath", name, invalid.get(name));
+ provider.createRestriction("/testPath", name, entry.getValue());
fail("invalid restriction " + name);
} catch (AccessControlException e) {
// success
@@ -211,9 +215,11 @@ public class CompositeRestrictionProvide
NAME_LONGS, new Value[] {vf.createValue(100)},
REP_PREFIXES, new Value[] {vf.createValue("prefix"), vf.createValue("prefix2")}
);
- for (String name : valid.keySet()) {
- provider.createRestriction("/testPath", name, valid.get(name));
+ for (Map.Entry<String, Value[]> entry : valid.entrySet()) {
+ provider.createRestriction("/testPath", entry.getKey(), entry.getValue());
}
+ verify(rp1, times(1)).createRestriction("/testPath", REP_PREFIXES, valid.get(REP_PREFIXES));
+ verify(rp2, times(1)).createRestriction("/testPath", NAME_LONGS, valid.get(NAME_LONGS));
}
@Test(expected = AccessControlException.class)
@@ -228,9 +234,10 @@ public class CompositeRestrictionProvide
NAME_LONGS, new Value[] {vf.createValue("wrong_type")},
REP_PREFIXES, new Value[] {vf.createValue(true)}
);
- for (String name : invalid.keySet()) {
+ for (Map.Entry<String, Value[]> entry : invalid.entrySet()) {
+ String name = entry.getKey();
try {
- provider.createRestriction("/testPath", name, invalid.get(name));
+ provider.createRestriction("/testPath", name, entry.getValue());
fail("invalid restriction " + name);
} catch (AccessControlException e) {
// success
@@ -254,7 +261,9 @@ public class CompositeRestrictionProvide
@Test
public void testWriteEmptyRestrictions() throws Exception {
- provider.writeRestrictions("/test", getAceTree(), Collections.emptySet());
+ Tree acTree = getAceTree();
+ provider.writeRestrictions("/test", acTree, Collections.emptySet());
+ verifyNoInteractions(rp1, rp2);
}
@Test
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/EmptyRestrictionProviderTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/EmptyRestrictionProviderTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/EmptyRestrictionProviderTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/EmptyRestrictionProviderTest.java Tue Nov 24 12:08:05 2020
@@ -16,17 +16,18 @@
*/
package org.apache.jackrabbit.oak.spi.security.authorization.restriction;
-import javax.jcr.RepositoryException;
-import javax.jcr.Value;
-import javax.jcr.security.AccessControlException;
-
import com.google.common.collect.ImmutableSet;
import org.apache.jackrabbit.oak.api.Tree;
import org.junit.Test;
-import org.mockito.Mockito;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.Value;
+import javax.jcr.security.AccessControlException;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verifyNoInteractions;
public class EmptyRestrictionProviderTest {
@@ -38,13 +39,13 @@ public class EmptyRestrictionProviderTes
@Test(expected = AccessControlException.class)
public void testCreateRestrictionSingleValue() throws RepositoryException {
- Value v = Mockito.mock(Value.class);
+ Value v = mock(Value.class);
RestrictionProvider.EMPTY.createRestriction(null, "name", v);
}
@Test(expected = AccessControlException.class)
public void testCreateRestrictionMvValues() throws RepositoryException {
- Value v = Mockito.mock(Value.class);
+ Value v = mock(Value.class);
RestrictionProvider.EMPTY.createRestriction(null, "name", v, v);
}
@@ -55,33 +56,36 @@ public class EmptyRestrictionProviderTes
@Test
public void testReadRestrictions() {
- assertTrue(RestrictionProvider.EMPTY.readRestrictions(null, Mockito.mock(Tree.class)).isEmpty());
- assertTrue(RestrictionProvider.EMPTY.readRestrictions("/any/path", Mockito.mock(Tree.class)).isEmpty());
+ assertTrue(RestrictionProvider.EMPTY.readRestrictions(null, mock(Tree.class)).isEmpty());
+ assertTrue(RestrictionProvider.EMPTY.readRestrictions("/any/path", mock(Tree.class)).isEmpty());
}
@Test
public void testWriteRestrictions() throws Exception {
- Restriction r = Mockito.mock(Restriction.class);
- RestrictionProvider.EMPTY.writeRestrictions(null, Mockito.mock(Tree.class), ImmutableSet.of(r));
- RestrictionProvider.EMPTY.writeRestrictions("/any/path", Mockito.mock(Tree.class), ImmutableSet.of(r));
+ Restriction r = mock(Restriction.class);
+ RestrictionProvider.EMPTY.writeRestrictions(null, mock(Tree.class), ImmutableSet.of(r));
+ RestrictionProvider.EMPTY.writeRestrictions("/any/path", mock(Tree.class), ImmutableSet.of(r));
+ verifyNoInteractions(r);
}
@Test
public void testValidateRestrictions() throws Exception {
- RestrictionProvider.EMPTY.validateRestrictions(null, Mockito.mock(Tree.class));
- RestrictionProvider.EMPTY.validateRestrictions("/any/path", Mockito.mock(Tree.class));
+ Tree t = mock(Tree.class);
+ RestrictionProvider.EMPTY.validateRestrictions(null, t);
+ RestrictionProvider.EMPTY.validateRestrictions("/any/path", t);
+ verifyNoInteractions(t);
}
@Test
public void testGetPattern() {
- Restriction r = Mockito.mock(Restriction.class);
+ Restriction r = mock(Restriction.class);
assertSame(RestrictionPattern.EMPTY, RestrictionProvider.EMPTY.getPattern(null, ImmutableSet.of(r)));
assertSame(RestrictionPattern.EMPTY, RestrictionProvider.EMPTY.getPattern("/any/path", ImmutableSet.of(r)));
}
@Test
public void testGetPatternFromTree() {
- assertSame(RestrictionPattern.EMPTY, RestrictionProvider.EMPTY.getPattern(null, Mockito.mock(Tree.class)));
- assertSame(RestrictionPattern.EMPTY, RestrictionProvider.EMPTY.getPattern("/any/path", Mockito.mock(Tree.class)));
+ assertSame(RestrictionPattern.EMPTY, RestrictionProvider.EMPTY.getPattern(null, mock(Tree.class)));
+ assertSame(RestrictionPattern.EMPTY, RestrictionProvider.EMPTY.getPattern("/any/path", mock(Tree.class)));
}
}
\ No newline at end of file
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinitionImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinitionImplTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinitionImplTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinitionImplTest.java Tue Nov 24 12:08:05 2020
@@ -16,18 +16,17 @@
*/
package org.apache.jackrabbit.oak.spi.security.authorization.restriction;
-import java.util.ArrayList;
-import java.util.List;
import org.apache.jackrabbit.oak.api.Type;
import org.jetbrains.annotations.NotNull;
import org.junit.Before;
import org.junit.Test;
+import java.util.ArrayList;
+import java.util.List;
+
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
/**
* Tests for {@link RestrictionDefinitionImpl}.
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionImplTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionImplTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionImplTest.java Tue Nov 24 12:08:05 2020
@@ -16,8 +16,6 @@
*/
package org.apache.jackrabbit.oak.spi.security.authorization.restriction;
-import java.util.ArrayList;
-import java.util.List;
import com.google.common.collect.ImmutableList;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
@@ -26,11 +24,12 @@ import org.jetbrains.annotations.NotNull
import org.junit.Before;
import org.junit.Test;
+import java.util.ArrayList;
+import java.util.List;
+
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
/**
* Tests for {@link RestrictionImpl}
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfigurationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfigurationTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfigurationTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfigurationTest.java Tue Nov 24 12:08:05 2020
@@ -147,16 +147,17 @@ public class CompositePrincipalConfigura
assertSame(sp, cpc.getSecurityProvider());
}
- private final class TestComposite extends CompositePrincipalConfiguration {
+ private static final class TestComposite extends CompositePrincipalConfiguration {
TestComposite(@NotNull SecurityProvider securityProvider) {
super(securityProvider);
}
+ @NotNull
public SecurityProvider getSecurityProvider() {
return super.getSecurityProvider();
}
}
- private final class TestPrincipalConfiguration extends ConfigurationBase implements PrincipalConfiguration {
+ private static final class TestPrincipalConfiguration extends ConfigurationBase implements PrincipalConfiguration {
@NotNull
@Override
@@ -210,7 +211,7 @@ public class CompositePrincipalConfigura
}
}
- private final class TestEmptyConfiguration extends ConfigurationBase implements PrincipalConfiguration {
+ private static final class TestEmptyConfiguration extends ConfigurationBase implements PrincipalConfiguration {
@NotNull
@Override
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/EmptyPrincipalProviderTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/EmptyPrincipalProviderTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/EmptyPrincipalProviderTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/EmptyPrincipalProviderTest.java Tue Nov 24 12:08:05 2020
@@ -27,9 +27,8 @@ import org.junit.Test;
public class EmptyPrincipalProviderTest {
- private PrincipalProvider principalProvider = EmptyPrincipalProvider.INSTANCE;
- private Principal testPrincipal = new PrincipalImpl("testUser");
-
+ private final PrincipalProvider principalProvider = EmptyPrincipalProvider.INSTANCE;
+ private final Principal testPrincipal = new PrincipalImpl("testUser");
@Test
public void testGetPrincipal() {
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/EveryonePrincipalTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/EveryonePrincipalTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/EveryonePrincipalTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/EveryonePrincipalTest.java Tue Nov 24 12:08:05 2020
@@ -100,7 +100,7 @@ public class EveryonePrincipalTest {
//--------------------------------------------------------------------------
- private class OtherEveryone implements JackrabbitPrincipal {
+ private static class OtherEveryone implements JackrabbitPrincipal {
public String getName() {
return EveryonePrincipal.NAME;
}
@@ -117,7 +117,7 @@ public class EveryonePrincipalTest {
}
}
- private class OtherEveryoneGroup extends OtherEveryone implements GroupPrincipal {
+ private static class OtherEveryoneGroup extends OtherEveryone implements GroupPrincipal {
@Override
public boolean isMember(@NotNull Principal principal) {
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalImplTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalImplTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalImplTest.java Tue Nov 24 12:08:05 2020
@@ -16,15 +16,15 @@
*/
package org.apache.jackrabbit.oak.spi.security.principal;
+import org.apache.jackrabbit.api.security.principal.JackrabbitPrincipal;
+import org.junit.Test;
+
import java.security.Principal;
import java.util.ArrayList;
import java.util.List;
-import org.apache.jackrabbit.api.security.principal.JackrabbitPrincipal;
-import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertTru
*/
public class PrincipalImplTest {
- private Principal principal = new PrincipalImpl("name");
+ private final Principal principal = new PrincipalImpl("name");
@Test
public void testGetName() {
@@ -42,7 +42,7 @@ public class PrincipalImplTest {
@Test
public void testEqualsSame() {
- assertTrue(principal.equals(principal));
+ assertEquals(principal, principal);
}
@Test
@@ -50,12 +50,7 @@ public class PrincipalImplTest {
List<Principal> principals = new ArrayList<>();
principals.add(new PrincipalImpl("name"));
principals.add(new TestPrincipal("name"));
- principals.add(new JackrabbitPrincipal() {
- @Override
- public String getName() {
- return "name";
- }
- });
+ principals.add((JackrabbitPrincipal) () -> "name");
for (Principal p : principals) {
assertEquals(principal, p);
@@ -74,7 +69,7 @@ public class PrincipalImplTest {
});
for (Principal p : principals) {
- assertFalse(principal.equals(p));
+ assertNotEquals(principal, p);
}
}
@@ -87,7 +82,7 @@ public class PrincipalImplTest {
//--------------------------------------------------------------------------
- private class TestPrincipal extends PrincipalImpl {
+ private static class TestPrincipal extends PrincipalImpl {
private TestPrincipal(String name) {
super(name);
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalManagerImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalManagerImplTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalManagerImplTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalManagerImplTest.java Tue Nov 24 12:08:05 2020
@@ -47,7 +47,7 @@ public class PrincipalManagerImplTest {
private final TestPrincipalProvider provider = new TestPrincipalProvider();
private final PrincipalManagerImpl principalMgr = new PrincipalManagerImpl(provider);
- private Iterable<Principal> testPrincipals = provider.getTestPrincipals();
+ private final Iterable<Principal> testPrincipals = provider.getTestPrincipals();
private static boolean isGroup(Principal p) {
return p instanceof GroupPrincipal;
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalProviderTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalProviderTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalProviderTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalProviderTest.java Tue Nov 24 12:08:05 2020
@@ -31,7 +31,7 @@ import org.junit.Test;
public class PrincipalProviderTest {
- private PrincipalProvider pp = new PrincipalProvider() {
+ private final PrincipalProvider pp = new PrincipalProvider() {
@Override
public @Nullable Principal getPrincipal(@NotNull String principalName) {
throw new RuntimeException();
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/SystemPrincipalTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/SystemPrincipalTest.java?rev=1883784&r1=1883783&r2=1883784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/SystemPrincipalTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/SystemPrincipalTest.java Tue Nov 24 12:08:05 2020
@@ -16,17 +16,15 @@
*/
package org.apache.jackrabbit.oak.spi.security.principal;
-import java.security.Principal;
-
import org.apache.jackrabbit.api.security.principal.JackrabbitPrincipal;
import org.junit.Test;
+import java.security.Principal;
+
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
public class SystemPrincipalTest {
@@ -47,7 +45,7 @@ public class SystemPrincipalTest {
@Test
public void testHashCode() {
- assertTrue(SystemPrincipal.INSTANCE.hashCode() == SystemPrincipal.INSTANCE.hashCode());
+ assertEquals(SystemPrincipal.INSTANCE.hashCode(), SystemPrincipal.INSTANCE.hashCode());
}
@Test
@@ -57,13 +55,13 @@ public class SystemPrincipalTest {
return SystemPrincipal.INSTANCE.getName();
}
};
- assertFalse(SystemPrincipal.INSTANCE.equals(another));
+ assertNotEquals(SystemPrincipal.INSTANCE, another);
}
@Test
public void testEqualsOtherJackrabbitPrincipal() {
Principal another = new OtherSystem();
- assertFalse(SystemPrincipal.INSTANCE.equals(another));
+ assertNotEquals(SystemPrincipal.INSTANCE, another);
}
@Test
@@ -74,7 +72,7 @@ public class SystemPrincipalTest {
//--------------------------------------------------------------------------
- private class OtherSystem implements JackrabbitPrincipal {
+ private static class OtherSystem implements JackrabbitPrincipal {
public String getName() {
return SystemPrincipal.INSTANCE.getName();
}