This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch feature/GEODE-6267
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-6267 by this
push:
new 27ba430 GEODE-6267: Added annotations and cleaned up test code
27ba430 is described below
commit 27ba430047f73834c1959c13f5297f188550b855
Author: Barry Oglesby <[email protected]>
AuthorDate: Tue Jan 22 12:42:51 2019 -0800
GEODE-6267: Added annotations and cleaned up test code
---
...ientServerConnectDisconnectDistributedTest.java | 25 +++++++---------------
.../cache/tier/sockets/CacheClientProxy.java | 2 ++
.../cache/tier/sockets/ClientUserAuths.java | 2 ++
.../cache/tier/sockets/ServerConnection.java | 2 ++
4 files changed, 14 insertions(+), 17 deletions(-)
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientServerConnectDisconnectDistributedTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientServerConnectDisconnectDistributedTest.java
index 8e3176d..d86724b 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientServerConnectDisconnectDistributedTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientServerConnectDisconnectDistributedTest.java
@@ -14,14 +14,12 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static
org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANAGER;
import static org.apache.geode.test.awaitility.GeodeAwaitility.await;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import java.util.Properties;
import org.apache.shiro.subject.Subject;
import org.junit.BeforeClass;
@@ -59,20 +57,12 @@ public class ClientServerConnectDisconnectDistributedTest
implements Serializabl
private static List<ClientUserAuths> authorizations;
@BeforeClass
- public static void beforeClass() throws Exception {
- Properties locatorProps = new Properties();
- locatorProps.setProperty(SECURITY_MANAGER,
SimpleSecurityManager.class.getCanonicalName());
- locator = cluster.startLocatorVM(0, locatorProps);
-
- Properties serverProps = new Properties();
- serverProps.setProperty("security-username", "cluster");
- serverProps.setProperty("security-password", "cluster");
- server = cluster.startServerVM(1, serverProps, locator.getPort());
-
- server.invoke(() -> {
- Cache cache = ClusterStartupRule.getCache();
- cache.createRegionFactory(RegionShortcut.PARTITION).create("region");
- });
+ public static void beforeClass() {
+ locator = cluster.startLocatorVM(0, l ->
l.withSecurityManager(SimpleSecurityManager.class));
+ int locatorPort = locator.getPort();
+ server = cluster.startServerVM(1, s -> s.withCredential("cluster",
"cluster")
+
.withConnectionToLocator(locatorPort).withRegion(RegionShortcut.PARTITION,
+ "ClientServerConnectDisconnectDistributedTest_region"));
}
@Test
@@ -86,7 +76,8 @@ public class ClientServerConnectDisconnectDistributedTest
implements Serializabl
// Do some puts
client.invoke(() -> {
ClientCache cache = ClusterStartupRule.getClientCache();
- Region region =
cache.createClientRegionFactory(ClientRegionShortcut.PROXY).create("region");
+ Region region =
cache.createClientRegionFactory(ClientRegionShortcut.PROXY)
+ .create("ClientServerConnectDisconnectDistributedTest_region");
for (int i = 0; i < 10; i++) {
Object key = String.valueOf(i);
region.put(key, key);
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
index 8a1fd39..9d98313 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
@@ -45,6 +45,7 @@ import org.apache.shiro.util.ThreadState;
import org.apache.geode.CancelException;
import org.apache.geode.DataSerializer;
import org.apache.geode.StatisticsFactory;
+import org.apache.geode.annotations.VisibleForTesting;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.ClientSession;
@@ -1948,6 +1949,7 @@ public class CacheClientProxy implements ClientSession {
return this.clientVersion;
}
+ @VisibleForTesting
protected Subject getSubject() {
return this.subject;
}
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUserAuths.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUserAuths.java
index ecdb9be..5492e10 100755
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUserAuths.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUserAuths.java
@@ -24,6 +24,7 @@ import java.util.concurrent.ConcurrentHashMap;
import org.apache.logging.log4j.Logger;
import org.apache.shiro.subject.Subject;
+import org.apache.geode.annotations.VisibleForTesting;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.security.AuthorizeRequest;
import org.apache.geode.internal.security.AuthorizeRequestPP;
@@ -80,6 +81,7 @@ public class ClientUserAuths {
return uniqueIdVsUserAuth.get(userId);
}
+ @VisibleForTesting
protected Collection<Subject> getSubjects() {
return Collections.unmodifiableCollection(this.uniqueIdVsSubject.values());
}
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
index 56cd741..eae450a 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
@@ -45,6 +45,7 @@ import org.apache.shiro.util.ThreadState;
import org.apache.geode.CancelException;
import org.apache.geode.DataSerializer;
import org.apache.geode.SystemFailure;
+import org.apache.geode.annotations.VisibleForTesting;
import org.apache.geode.cache.UnsupportedVersionException;
import org.apache.geode.cache.client.internal.AbstractOp;
import org.apache.geode.cache.client.internal.Connection;
@@ -1102,6 +1103,7 @@ public abstract class ServerConnection implements
Runnable {
}
}
+ @VisibleForTesting
protected ClientUserAuths getClientUserAuths() {
return this.clientUserAuths;
}
