You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by js...@apache.org on 2017/03/30 23:00:51 UTC
[3/3] geode git commit: GEODE-2730: Refactor ServerStarterRule and
LocatorStarterRule
GEODE-2730: Refactor ServerStarterRule and LocatorStarterRule
- Introduced LocalServerStarterRule and LocalLocatorStarterRule to eventually replace LocatorStarterRule and ServerStarterRule.
- The new rules will *only* start a member through the rule's before() method. Members will *never* be started on Rule instantiation.
- The new rules are backed by Builders that use AvailablePort.Keeper to reserve the ports that a member will use when it eventually starts. The Keepers are released just before starting the member, with the goal of minimizing test flakiness caused by BindExceptions when a port is already in use.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/50f6d1e3
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/50f6d1e3
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/50f6d1e3
Branch: refs/heads/develop
Commit: 50f6d1e39213ed64f5cc38b0438c63bd21482e60
Parents: f3a2ef4
Author: Jared Stewart <js...@pivotal.io>
Authored: Mon Mar 27 16:32:33 2017 -0700
Committer: Jared Stewart <js...@pivotal.io>
Committed: Thu Mar 30 15:59:16 2017 -0700
----------------------------------------------------------------------
.../web/RestSecurityIntegrationTest.java | 15 +-
.../web/RestSecurityPostProcessorTest.java | 14 +-
.../internal/web/RestSecurityWithSSLTest.java | 39 ++--
.../rest/internal/web/RestServersJUnitTest.java | 9 +-
.../internal/web/SwaggerVerificationTest.java | 7 +-
.../geode/test/dunit/rules/HttpClientRule.java | 9 +
.../geode/tools/pulse/PulseDataExportTest.java | 7 +-
.../tools/pulse/PulseVerificationTest.java | 10 +-
.../apache/geode/internal/AvailablePort.java | 5 +-
.../geode/cache/ConnectionPoolDUnitTest.java | 4 +-
.../org/apache/geode/cache/ProxyJUnitTest.java | 4 +-
.../PartitionRegionHelperDUnitTest.java | 16 +-
.../BaseLineAndCompareQueryPerfJUnitTest.java | 4 +-
.../cache/query/dunit/QueryIndexDUnitTest.java | 2 +-
.../cache/query/dunit/RemoteQueryDUnitTest.java | 4 +-
...ndexWithSngleFrmAndMultCondQryJUnitTest.java | 6 +-
.../query/functional/LimitClauseJUnitTest.java | 6 +-
.../query/internal/QueryUtilsJUnitTest.java | 4 +-
.../index/IndexMaintenanceJUnitTest.java | 2 +-
.../query/partitioned/PRQueryDUnitHelper.java | 2 +-
.../geode/cache30/CacheLoaderTestCase.java | 4 +-
.../geode/cache30/CacheXml66DUnitTest.java | 4 +-
.../geode/cache30/DiskRegionDUnitTest.java | 8 +-
.../geode/cache30/DiskRegionTestImpl.java | 2 +-
.../DistributedAckRegionCCEDUnitTest.java | 2 +-
.../DistributedMulticastRegionDUnitTest.java | 4 +-
.../geode/cache30/GlobalRegionCCEDUnitTest.java | 2 +-
.../geode/cache30/MultiVMRegionTestCase.java | 17 +-
.../apache/geode/cache30/RegionTestCase.java | 4 +-
.../distributed/internal/Bug40751DUnitTest.java | 4 +-
.../geode/disttx/DistTXDebugDUnitTest.java | 4 +-
.../internal/cache/CacheAdvisorDUnitTest.java | 6 +-
.../internal/cache/DeltaSizingDUnitTest.java | 4 +-
.../internal/cache/EventTrackerDUnitTest.java | 2 +-
.../geode/internal/cache/PRTXJUnitTest.java | 4 +-
.../cache/PartitionListenerDUnitTest.java | 2 +-
.../cache/PartitionedRegionHADUnitTest.java | 2 +-
...artitionedRegionRedundancyZoneDUnitTest.java | 2 +-
.../cache/PartitionedRegionStatsDUnitTest.java | 8 +-
.../PartitionedRegionTestUtilsDUnitTest.java | 2 +-
.../control/RebalanceOperationDUnitTest.java | 38 ++--
.../cache/ha/HARQueueNewImplDUnitTest.java | 2 +-
.../cache/partitioned/Bug39356DUnitTest.java | 2 +-
.../cache/partitioned/ShutdownAllDUnitTest.java | 8 +-
.../RollingUpgrade2DUnitTest.java | 4 +-
.../rollingupgrade/RollingUpgradeDUnitTest.java | 2 +-
.../cache/tier/sockets/Bug36829DUnitTest.java | 2 +-
.../DataSerializerPropogationDUnitTest.java | 2 +-
.../sockets/HAStartupAndFailoverDUnitTest.java | 4 +-
.../InstantiatorPropagationDUnitTest.java | 2 +-
.../tier/sockets/RedundancyLevelTestBase.java | 2 +-
.../cli/commands/ExportLogsIntegrationTest.java | 9 +-
.../ExportLogsFunctionIntegrationTest.java | 4 +-
.../cli/shell/GfshMultilineCommandTest.java | 6 +-
.../cli/util/LogExporterIntegrationTest.java | 86 +++++----
.../security/AccessControlMBeanJUnitTest.java | 6 +-
...CacheServerMBeanAuthenticationJUnitTest.java | 6 +-
.../CacheServerMBeanAuthorizationJUnitTest.java | 6 +-
.../CacheServerMBeanShiroJUnitTest.java | 6 +-
.../security/CliCommandsSecurityTest.java | 7 +-
.../security/DataCommandsSecurityTest.java | 7 +-
.../security/DeployCommandsSecurityTest.java | 7 +-
.../DiskStoreMXBeanSecurityJUnitTest.java | 7 +-
.../GatewayReceiverMBeanSecurityTest.java | 7 +-
.../GatewaySenderMBeanSecurityTest.java | 7 +-
.../security/GfshCommandsPostProcessorTest.java | 13 +-
.../security/GfshCommandsSecurityTest.java | 7 +-
.../security/JavaRmiServerNameTest.java | 7 +-
.../LockServiceMBeanAuthorizationJUnitTest.java | 7 +-
.../security/MBeanSecurityJUnitTest.java | 7 +-
.../ManagerMBeanAuthorizationJUnitTest.java | 7 +-
.../security/MemberMBeanSecurityJUnitTest.java | 7 +-
.../geode/security/ClientAuthDUnitTest.java | 22 ++-
.../ClientContainsKeyAuthDUnitTest.java | 13 +-
.../ClientDestroyInvalidateAuthDUnitTest.java | 13 +-
.../ClientDestroyRegionAuthDUnitTest.java | 24 ++-
.../ClientExecuteFunctionAuthDUnitTest.java | 21 ++-
...lientExecuteRegionFunctionAuthDUnitTest.java | 13 +-
.../security/ClientGetAllAuthDUnitTest.java | 13 +-
.../security/ClientGetEntryAuthDUnitTest.java | 17 +-
.../security/ClientGetPutAuthDUnitTest.java | 15 +-
.../ClientRegionClearAuthDUnitTest.java | 13 +-
.../ClientRegisterInterestAuthDUnitTest.java | 27 +--
.../security/ClientRemoveAllAuthDUnitTest.java | 13 +-
.../ClientUnregisterInterestAuthDUnitTest.java | 11 +-
.../NoShowValue1PostProcessorDUnitTest.java | 11 +-
.../security/PDXPostProcessorDUnitTest.java | 25 +--
.../geode/security/PostProcessorDUnitTest.java | 17 +-
.../dunit/rules/LocalLocatorStarterRule.java | 99 ++++++++++
.../dunit/rules/LocalServerStarterRule.java | 159 ++++++++++++++++
.../test/dunit/rules/LocatorStarterBuilder.java | 121 ++++++++++++
.../test/dunit/rules/LocatorStarterRule.java | 2 +-
.../test/dunit/rules/ServerStarterBuilder.java | 185 +++++++++++++++++++
.../geode/codeAnalysis/excludedClasses.txt | 1 +
.../query/dunit/QueryMonitorDUnitTest.java | 44 ++---
.../internal/cache/ha/CQListGIIDUnitTest.java | 4 +-
.../CacheServerManagementDUnitTest.java | 2 +-
.../geode/security/CQClientAuthDUnitTest.java | 11 +-
.../security/CQPDXPostProcessorDUnitTest.java | 16 +-
.../security/CQPostProcessorDunitTest.java | 13 +-
.../security/ClientQueryAuthDUnitTest.java | 17 +-
.../commands/QueryNamesOverHttpDUnitTest.java | 4 +-
102 files changed, 1074 insertions(+), 422 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
index 819315f..cbd83e3 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.rest.internal.web;
-import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANAGER;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -22,7 +21,8 @@ import static org.junit.Assert.assertTrue;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.security.TestSecurityManager;
-import org.apache.geode.test.dunit.rules.ServerStarterRule;
+import org.apache.geode.test.dunit.rules.LocalServerStarterRule;
+import org.apache.geode.test.dunit.rules.ServerStarterBuilder;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.http.HttpResponse;
@@ -41,11 +41,12 @@ public class RestSecurityIntegrationTest {
protected static final String REGION_NAME = "AuthRegion";
@ClassRule
- public static ServerStarterRule serverStarter = new ServerStarterRule()
- .withProperty(TestSecurityManager.SECURITY_JSON,
- "org/apache/geode/management/internal/security/clientServer.json")
- .withProperty(SECURITY_MANAGER, TestSecurityManager.class.getName()).withRestService()
- .startServer();
+ public static LocalServerStarterRule serverStarter =
+ new ServerStarterBuilder().withSecurityManager(TestSecurityManager.class)
+ .withProperty(TestSecurityManager.SECURITY_JSON,
+ "org/apache/geode/management/internal/security/clientServer.json")
+ .withRestService().buildInThisVM();
+
private final GeodeRestClient restClient =
new GeodeRestClient("localhost", serverStarter.getHttpPort());
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityPostProcessorTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityPostProcessorTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityPostProcessorTest.java
index 3da514f..e93561c 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityPostProcessorTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityPostProcessorTest.java
@@ -28,6 +28,8 @@ import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.rest.internal.web.controllers.Customer;
import org.apache.geode.rest.internal.web.controllers.RedactingPostProcessor;
import org.apache.geode.security.TestSecurityManager;
+import org.apache.geode.test.dunit.rules.LocalServerStarterRule;
+import org.apache.geode.test.dunit.rules.ServerStarterBuilder;
import org.apache.geode.test.dunit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SecurityTest;
@@ -47,12 +49,12 @@ import java.net.URLEncoder;
public class RestSecurityPostProcessorTest {
@ClassRule
- public static ServerStarterRule serverStarter = new ServerStarterRule()
- .withProperty(TestSecurityManager.SECURITY_JSON,
- "org/apache/geode/management/internal/security/clientServer.json")
- .withProperty(SECURITY_MANAGER, TestSecurityManager.class.getName())
- .withProperty(SECURITY_POST_PROCESSOR, RedactingPostProcessor.class.getName())
- .withRestService().startServer();
+ public static LocalServerStarterRule serverStarter =
+ new ServerStarterBuilder().withSecurityManager(TestSecurityManager.class)
+ .withProperty(TestSecurityManager.SECURITY_JSON,
+ "org/apache/geode/management/internal/security/clientServer.json")
+ .withProperty(SECURITY_POST_PROCESSOR, RedactingPostProcessor.class.getName())
+ .withRestService().buildInThisVM();
private final GeodeRestClient restClient =
new GeodeRestClient("localhost", serverStarter.getHttpPort());
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityWithSSLTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityWithSSLTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityWithSSLTest.java
index 4d142bd..14113c0 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityWithSSLTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityWithSSLTest.java
@@ -16,7 +16,6 @@
package org.apache.geode.rest.internal.web;
import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_BIND_ADDRESS;
-import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_PORT;
import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANAGER;
import static org.apache.geode.distributed.ConfigurationProperties.SSL_ENABLED_COMPONENTS;
import static org.apache.geode.distributed.ConfigurationProperties.SSL_KEYSTORE;
@@ -28,10 +27,10 @@ import static org.apache.geode.distributed.ConfigurationProperties.SSL_TRUSTSTOR
import static org.apache.geode.distributed.ConfigurationProperties.START_DEV_REST_API;
import static org.junit.Assert.assertEquals;
-import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.security.SecurableCommunicationChannel;
import org.apache.geode.security.SimpleTestSecurityManager;
-import org.apache.geode.test.dunit.rules.ServerStarterRule;
+import org.apache.geode.test.dunit.rules.LocalServerStarterRule;
+import org.apache.geode.test.dunit.rules.ServerStarterBuilder;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.http.HttpResponse;
@@ -40,36 +39,26 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import java.net.URL;
-import java.util.Properties;
@Category({IntegrationTest.class, SecurityTest.class})
public class RestSecurityWithSSLTest {
+ private static URL KEYSTORE_URL =
+ RestSecurityWithSSLTest.class.getClassLoader().getResource("ssl/trusted.keystore");
- private static int restPort = AvailablePortHelper.getRandomAvailableTCPPort();
@Rule
- public ServerStarterRule serverStarter = new ServerStarterRule();
+ public LocalServerStarterRule serverStarter = new ServerStarterBuilder().withRestService()
+ .withProperty(SECURITY_MANAGER, SimpleTestSecurityManager.class.getName())
+ .withProperty(SSL_ENABLED_COMPONENTS, SecurableCommunicationChannel.WEB.getConstant())
+ .withProperty(SSL_KEYSTORE, KEYSTORE_URL.getPath())
+ .withProperty(SSL_KEYSTORE_PASSWORD, "password").withProperty(SSL_KEYSTORE_TYPE, "JKS")
+ .withProperty(SSL_TRUSTSTORE, KEYSTORE_URL.getPath())
+ .withProperty(SSL_TRUSTSTORE_PASSWORD, "password")
+ .withProperty(SSL_PROTOCOLS, "TLSv1.2,TLSv1.1").buildInThisVM();
@Test
public void testRestSecurityWithSSL() throws Exception {
- URL keystoreUrl =
- RestSecurityWithSSLTest.class.getClassLoader().getResource("ssl/trusted.keystore");
-
- Properties properties = new Properties();
- properties.setProperty(SECURITY_MANAGER, SimpleTestSecurityManager.class.getName());
- properties.setProperty(START_DEV_REST_API, "true");
- properties.setProperty(HTTP_SERVICE_BIND_ADDRESS, "localhost");
- properties.setProperty(HTTP_SERVICE_PORT, restPort + "");
- properties.setProperty(SSL_ENABLED_COMPONENTS, SecurableCommunicationChannel.WEB.getConstant());
- properties.setProperty(SSL_KEYSTORE, keystoreUrl.getPath());
- properties.setProperty(SSL_KEYSTORE_PASSWORD, "password");
- properties.setProperty(SSL_KEYSTORE_TYPE, "JKS");
- properties.setProperty(SSL_TRUSTSTORE, keystoreUrl.getPath());
- properties.setProperty(SSL_TRUSTSTORE_PASSWORD, "password");
- properties.setProperty(SSL_PROTOCOLS, "TLSv1.2,TLSv1.1");
-
- serverStarter.withProperties(properties).startServer();
-
- GeodeRestClient restClient = new GeodeRestClient("localhost", restPort, true);
+ GeodeRestClient restClient =
+ new GeodeRestClient("localhost", serverStarter.getHttpPort(), true);
HttpResponse response = restClient.doGet("/servers", "cluster", "cluster");
assertEquals(200, GeodeRestClient.getCode(response));
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersJUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersJUnitTest.java
index a6ba2b0..2a3a036 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersJUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersJUnitTest.java
@@ -17,6 +17,8 @@ package org.apache.geode.rest.internal.web;
import static org.assertj.core.api.Assertions.assertThat;
+import org.apache.geode.test.dunit.rules.LocalServerStarterRule;
+import org.apache.geode.test.dunit.rules.ServerStarterBuilder;
import org.apache.geode.test.dunit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.RestAPITest;
@@ -31,14 +33,13 @@ import org.junit.experimental.categories.Category;
public class RestServersJUnitTest {
@ClassRule
- public static ServerStarterRule serverStarter =
- new ServerStarterRule().withRestService(true).startServer();
+ public static LocalServerStarterRule serverStarter =
+ new ServerStarterBuilder().withRestService().buildInThisVM();
private static GeodeRestClient restClient;
@BeforeClass
public static void before() throws Exception {
- assertThat(serverStarter.getHttpPort()).isEqualTo(7070);
restClient = new GeodeRestClient("localhost", serverStarter.getHttpPort());
}
@@ -53,6 +54,6 @@ public class RestServersJUnitTest {
HttpResponse response = restClient.doGet("/servers", null, null);
JSONArray body = GeodeRestClient.getJsonArray(response);
assertThat(body.length()).isEqualTo(1);
- assertThat(body.getString(0)).isEqualTo("http://localhost:7070");
+ assertThat(body.getString(0)).isEqualTo("http://localhost:" + serverStarter.getHttpPort());
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java
index b163d5c..a8ab19c 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java
@@ -21,6 +21,8 @@ import static org.junit.Assert.assertThat;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.security.SimpleTestSecurityManager;
+import org.apache.geode.test.dunit.rules.LocalServerStarterRule;
+import org.apache.geode.test.dunit.rules.ServerStarterBuilder;
import org.apache.geode.test.dunit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.RestAPITest;
@@ -34,9 +36,8 @@ import org.junit.experimental.categories.Category;
public class SwaggerVerificationTest {
@ClassRule
- public static ServerStarterRule serverStarter = new ServerStarterRule()
- .withProperty(SECURITY_MANAGER, SimpleTestSecurityManager.class.getName()).withRestService()
- .startServer();
+ public static LocalServerStarterRule serverStarter = new ServerStarterBuilder()
+ .withSecurityManager(SimpleTestSecurityManager.class).withRestService().buildInThisVM();
private GeodeRestClient restClient;
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-assembly/src/test/java/org/apache/geode/test/dunit/rules/HttpClientRule.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/test/dunit/rules/HttpClientRule.java b/geode-assembly/src/test/java/org/apache/geode/test/dunit/rules/HttpClientRule.java
index d0b54b9..49351d9 100644
--- a/geode-assembly/src/test/java/org/apache/geode/test/dunit/rules/HttpClientRule.java
+++ b/geode-assembly/src/test/java/org/apache/geode/test/dunit/rules/HttpClientRule.java
@@ -41,6 +41,11 @@ public class HttpClientRule extends ExternalResource {
private HttpHost host;
private HttpClient httpClient;
private HttpContext context;
+ private LocalLocatorStarterRule locatorStarterRule;
+
+ public HttpClientRule(LocalLocatorStarterRule locatorStarterRule) {
+ this.locatorStarterRule = locatorStarterRule;
+ }
public HttpClientRule(int port) {
this("localhost", port);
@@ -53,6 +58,10 @@ public class HttpClientRule extends ExternalResource {
@Before
protected void before() {
+ if (locatorStarterRule != null) {
+ this.hostName = "localhost";
+ this.port = locatorStarterRule.getHttpPort();
+ }
host = new HttpHost(hostName, port);
httpClient = HttpClients.createDefault();
context = new BasicHttpContext();
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseDataExportTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseDataExportTest.java b/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseDataExportTest.java
index 5d716f3..10ca43b 100644
--- a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseDataExportTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseDataExportTest.java
@@ -21,7 +21,8 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.test.dunit.rules.HttpClientRule;
-import org.apache.geode.test.dunit.rules.ServerStarterRule;
+import org.apache.geode.test.dunit.rules.LocalServerStarterRule;
+import org.apache.geode.test.dunit.rules.ServerStarterBuilder;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.http.HttpResponse;
import org.apache.http.util.EntityUtils;
@@ -34,8 +35,8 @@ import org.junit.experimental.categories.Category;
public class PulseDataExportTest {
@Rule
- public ServerStarterRule server = new ServerStarterRule().withJMXManager().startServer()
- .createRegion(RegionShortcut.REPLICATE, "regionA");
+ public LocalServerStarterRule server = new ServerStarterBuilder().withJMXManager()
+ .withRegion(RegionShortcut.REPLICATE, "regionA").buildInThisVM();
@Rule
public HttpClientRule client = new HttpClientRule(server.getHttpPort());
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseVerificationTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseVerificationTest.java b/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseVerificationTest.java
index 0b3b1ce..64eaab7 100644
--- a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseVerificationTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseVerificationTest.java
@@ -15,12 +15,12 @@
package org.apache.geode.tools.pulse;
-import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANAGER;
import static org.assertj.core.api.Assertions.assertThat;
import org.apache.geode.security.SimpleTestSecurityManager;
import org.apache.geode.test.dunit.rules.HttpClientRule;
-import org.apache.geode.test.dunit.rules.LocatorStarterRule;
+import org.apache.geode.test.dunit.rules.LocatorStarterBuilder;
+import org.apache.geode.test.dunit.rules.LocalLocatorStarterRule;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.http.HttpResponse;
import org.junit.ClassRule;
@@ -33,11 +33,11 @@ import org.junit.experimental.categories.Category;
public class PulseVerificationTest {
@ClassRule
- public static LocatorStarterRule locator = new LocatorStarterRule()
- .withProperty(SECURITY_MANAGER, SimpleTestSecurityManager.class.getName()).startLocator();
+ public static LocalLocatorStarterRule locator = new LocatorStarterBuilder()
+ .withSecurityManager(SimpleTestSecurityManager.class).buildInThisVM();
@Rule
- public HttpClientRule client = new HttpClientRule(locator.getHttpPort());
+ public HttpClientRule client = new HttpClientRule(locator);
@Test
public void loginWithIncorrectPassword() throws Exception {
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/main/java/org/apache/geode/internal/AvailablePort.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/AvailablePort.java b/geode-core/src/main/java/org/apache/geode/internal/AvailablePort.java
index 41efc18..f22872f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/AvailablePort.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/AvailablePort.java
@@ -20,6 +20,7 @@ import org.apache.geode.internal.net.SocketCreator;
import java.io.IOException;
import java.io.PrintStream;
+import java.io.Serializable;
import java.net.*;
import java.util.Enumeration;
import java.util.Random;
@@ -448,8 +449,8 @@ public class AvailablePort {
* smaller that can cause bug 46690
*
*/
- public static class Keeper {
- private final ServerSocket ss;
+ public static class Keeper implements Serializable {
+ private transient final ServerSocket ss;
private final int port;
public Keeper(ServerSocket ss, int port) {
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java
index 2d5a71b..2ac5120 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java
@@ -5040,7 +5040,7 @@ public class ConnectionPoolDUnitTest extends JUnit4CacheTestCase {
// vm0.invoke(new CacheSerializableRunnable("Create Cache Server") {
// public void run2() throws CacheException {
// AttributesFactory factory = getBridgeServerRegionAttributes(null,null);
- // Region region = createRegion(name, factory.create());
+ // Region region = withRegion(name, factory.create());
// pause(1000);
// try {
// startBridgeServer(0);
@@ -5064,7 +5064,7 @@ public class ConnectionPoolDUnitTest extends JUnit4CacheTestCase {
// ClientServerTestCase.configureConnectionPool(factory,host0,port,-1,true,-1,-1, null);
- // createRegion(name, factory.create());
+ // withRegion(name, factory.create());
// }
// };
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/cache/ProxyJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ProxyJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/ProxyJUnitTest.java
index 8cd68dc..05228ad 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/ProxyJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/ProxyJUnitTest.java
@@ -1031,7 +1031,7 @@ public class ProxyJUnitTest {
// // on a non-proxy lru
// {
// af.setDataPolicy(DataPolicy.NORMAL);
- // Region r = this.c.createRegion("rLRU", af.create());
+ // Region r = this.c.withRegion("rLRU", af.create());
// clearCallbackState();
// assertTrue(clInvokeCount == 0);
// for (int i=0; i < 10; i++) {
@@ -1048,7 +1048,7 @@ public class ProxyJUnitTest {
fail("expected IllegalStateException");
} catch (IllegalStateException expected) {
}
- // Region r = this.c.createRegion("rEMPTY", af.create());
+ // Region r = this.c.withRegion("rEMPTY", af.create());
// clearCallbackState();
// assertTrue(clInvokeCount == 0);
// for (int i=0; i < 10; i++) {
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/cache/partition/PartitionRegionHelperDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/partition/PartitionRegionHelperDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/partition/PartitionRegionHelperDUnitTest.java
index 4236799..c57ce5b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/partition/PartitionRegionHelperDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/partition/PartitionRegionHelperDUnitTest.java
@@ -74,7 +74,7 @@ public class PartitionRegionHelperDUnitTest extends JUnit4CacheTestCase {
VM vm1 = host.getVM(1);
VM vm2 = host.getVM(2);
- SerializableRunnable createPrRegion = new SerializableRunnable("createRegion") {
+ SerializableRunnable createPrRegion = new SerializableRunnable("withRegion") {
public void run() {
Cache cache = getCache();
AttributesFactory attr = new AttributesFactory();
@@ -143,7 +143,7 @@ public class PartitionRegionHelperDUnitTest extends JUnit4CacheTestCase {
VM vm2 = host.getVM(2);
VM vm3 = host.getVM(3);
- SerializableRunnable createPrRegion1 = new SerializableRunnable("createRegion") {
+ SerializableRunnable createPrRegion1 = new SerializableRunnable("withRegion") {
public void run() {
Cache cache = getCache();
FixedPartitionAttributes fpa1 =
@@ -163,7 +163,7 @@ public class PartitionRegionHelperDUnitTest extends JUnit4CacheTestCase {
}
};
vm0.invoke(createPrRegion1);
- SerializableRunnable createPrRegion2 = new SerializableRunnable("createRegion") {
+ SerializableRunnable createPrRegion2 = new SerializableRunnable("withRegion") {
public void run() {
Cache cache = getCache();
FixedPartitionAttributes fpa1 =
@@ -183,7 +183,7 @@ public class PartitionRegionHelperDUnitTest extends JUnit4CacheTestCase {
}
};
vm1.invoke(createPrRegion2);
- SerializableRunnable createPrRegion3 = new SerializableRunnable("createRegion") {
+ SerializableRunnable createPrRegion3 = new SerializableRunnable("withRegion") {
public void run() {
Cache cache = getCache();
FixedPartitionAttributes fpa1 =
@@ -240,7 +240,7 @@ public class PartitionRegionHelperDUnitTest extends JUnit4CacheTestCase {
vm0.invoke(checkAssignment);
- SerializableRunnable createPrRegion4 = new SerializableRunnable("createRegion") {
+ SerializableRunnable createPrRegion4 = new SerializableRunnable("withRegion") {
public void run() {
Cache cache = getCache();
AttributesFactory attr = new AttributesFactory();
@@ -269,7 +269,7 @@ public class PartitionRegionHelperDUnitTest extends JUnit4CacheTestCase {
};
vm3.invoke(createPrRegion4);
- SerializableRunnable checkMembers = new SerializableRunnable("createRegion") {
+ SerializableRunnable checkMembers = new SerializableRunnable("withRegion") {
public void run() {
Cache cache = getCache();
Region region = cache.getRegion("region1");
@@ -550,7 +550,7 @@ public class PartitionRegionHelperDUnitTest extends JUnit4CacheTestCase {
VM vm1 = host.getVM(1);
VM vm2 = host.getVM(2);
- SerializableCallable createPrRegion = new SerializableCallable("createRegion") {
+ SerializableCallable createPrRegion = new SerializableCallable("withRegion") {
public Object call() {
Cache cache = getCache();
AttributesFactory attr = new AttributesFactory();
@@ -647,7 +647,7 @@ public class PartitionRegionHelperDUnitTest extends JUnit4CacheTestCase {
VM vm1 = host.getVM(1);
VM vm2 = host.getVM(2);
- SerializableCallable createPrRegion = new SerializableCallable("createRegion") {
+ SerializableCallable createPrRegion = new SerializableCallable("withRegion") {
public Object call() {
Cache cache = getCache();
AttributesFactory attr = new AttributesFactory();
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/cache/query/BaseLineAndCompareQueryPerfJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/BaseLineAndCompareQueryPerfJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/BaseLineAndCompareQueryPerfJUnitTest.java
index a46e1c4..de2f8d3 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/BaseLineAndCompareQueryPerfJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/BaseLineAndCompareQueryPerfJUnitTest.java
@@ -318,7 +318,7 @@ public class BaseLineAndCompareQueryPerfJUnitTest {
/*
* ds = DistributedSystem.connect(props); cache = CacheFactory.create(ds); AttributesFactory
* factory = new AttributesFactory(); factory.setScope(Scope.DISTRIBUTED_ACK);
- * factory.setValueConstraint(Country.class); region = cache.createRegion("Countries",
+ * factory.setValueConstraint(Country.class); region = cache.withRegion("Countries",
* factory.create());
*/
region = CacheUtils.createRegion("Countries", Country.class);
@@ -331,7 +331,7 @@ public class BaseLineAndCompareQueryPerfJUnitTest {
e.printStackTrace();
}
- }// end of createRegion
+ }// end of withRegion
public static void populateData() throws Exception {
/*
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexDUnitTest.java
index 2938800..d121fe9 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexDUnitTest.java
@@ -70,7 +70,7 @@ public class QueryIndexDUnitTest extends JUnit4CacheTestCase {
@Override
public final void postSetUp() throws Exception {
int hostCount = Host.getHostCount();
- SerializableRunnable createRegion = new SerializableRunnable("createRegion") {
+ SerializableRunnable createRegion = new SerializableRunnable("withRegion") {
public void run() {
Cache cache = getCache();
Region region = cache.getRegion("portfolios");
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java
index 7d0b469..5f48dae 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java
@@ -521,7 +521,7 @@ public class RemoteQueryDUnitTest extends JUnit4CacheTestCase {
* void run2() throws CacheException { Properties config = new Properties();
* config.setProperty(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort() +
* "]"); getSystem(config); AttributesFactory factory = new AttributesFactory();
- * factory.setScope(Scope.LOCAL); createRegion(name, factory.create()); Wait.pause(1000); try {
+ * factory.setScope(Scope.LOCAL); withRegion(name, factory.create()); Wait.pause(1000); try {
* startBridgeServer(0, false); } catch (Exception ex) {
* Assert.fail("While starting CacheServer", ex); } } });
*
@@ -602,7 +602,7 @@ public class RemoteQueryDUnitTest extends JUnit4CacheTestCase {
* Properties config = new Properties(); config.setProperty(MCAST_PORT, "0"); getSystem(config);
* getCache(); AttributesFactory factory = new AttributesFactory();
* factory.setScope(Scope.LOCAL); ClientServerTestCase.configureConnectionPool(factory, host0,
- * port,-1, true, -1, -1, null); createRegion(name, factory.create()); } });
+ * port,-1, true, -1, -1, null); withRegion(name, factory.create()); } });
*
* // Execute client queries vm1.invoke(new CacheSerializableRunnable("Execute queries") {
* public void run2() throws CacheException { Region region =
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexWithSngleFrmAndMultCondQryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexWithSngleFrmAndMultCondQryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexWithSngleFrmAndMultCondQryJUnitTest.java
index 2da970f..d5195a6 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexWithSngleFrmAndMultCondQryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexWithSngleFrmAndMultCondQryJUnitTest.java
@@ -638,7 +638,7 @@ public class IndexWithSngleFrmAndMultCondQryJUnitTest {
private void executeQuery_1(Region region, boolean checkReferentialIntegrity) throws Exception {
- // Region region = CacheUtils.createRegion("pos", Portfolio.class);
+ // Region region = CacheUtils.withRegion("pos", Portfolio.class);
QueryService qs;
qs = CacheUtils.getQueryService();
@@ -861,7 +861,7 @@ public class IndexWithSngleFrmAndMultCondQryJUnitTest {
}
private void executeQuery_2(Region region, boolean checkReferentialIntegrity) throws Exception {
- // Region region = CacheUtils.createRegion("pos", Portfolio.class);
+ // Region region = CacheUtils.withRegion("pos", Portfolio.class);
QueryService qs;
qs = CacheUtils.getQueryService();
@@ -1073,7 +1073,7 @@ public class IndexWithSngleFrmAndMultCondQryJUnitTest {
}
private void executeQuery_3(Region region, boolean checkReferentialIntegrity) throws Exception {
- // Region region = CacheUtils.createRegion("pos", Portfolio.class);
+ // Region region = CacheUtils.withRegion("pos", Portfolio.class);
QueryService qs;
qs = CacheUtils.getQueryService();
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/cache/query/functional/LimitClauseJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/LimitClauseJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/LimitClauseJUnitTest.java
index ef2aa3e..1661cc8 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/LimitClauseJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/LimitClauseJUnitTest.java
@@ -1205,9 +1205,9 @@ public class LimitClauseJUnitTest {
*
* @Test public void testNotApplyingLimitAtIndexLevelForMultiIndexAndClauseUsageWithOrderBy()
* throws Exception { //try { Query query; SelectResults result; int limit = 25; Region region =
- * CacheUtils.createRegion("portfolios1", Portfolio.class); for (int i = 30; i > 0; i--) {
- * Portfolio p = new Portfolio(i); p.positions.clear(); p.positions.put("IBM", new Position("IBM",
- * i)); region.put("KEY" + i, p); }
+ * CacheUtils.withRegion("portfolios1", Portfolio.class); for (int i = 30; i > 0; i--) { Portfolio
+ * p = new Portfolio(i); p.positions.clear(); p.positions.put("IBM", new Position("IBM", i));
+ * region.put("KEY" + i, p); }
*
* String queryString =
* "<trace>SELECT distinct P FROM /portfolios1 P, P.positions.values POS WHERE P.ID > 5 AND POS.secId = 'IBM' ORDER BY P.ID"
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryUtilsJUnitTest.java
index bb13665..8530556 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryUtilsJUnitTest.java
@@ -212,12 +212,12 @@ public class QueryUtilsJUnitTest {
/*
* @Test public void testCutDownAndExpandIndexResultsWithManyFinalIters() { region =
- * CacheUtils.createRegion("portfolio", Portfolio.class); Portfolio[] po = new Portfolio[] { new
+ * CacheUtils.withRegion("portfolio", Portfolio.class); Portfolio[] po = new Portfolio[] { new
* Portfolio(0), new Portfolio(1), new Portfolio(2), new Portfolio(3)}; region.put("0", new
* Portfolio(0)); region.put("1", new Portfolio(1)); region.put("2", new Portfolio(2));
* region.put("3", new Portfolio(3));
*
- * Region r3 = CacheUtils.createRegion("employees", Employee.class); Set add1 = new HashSet();
+ * Region r3 = CacheUtils.withRegion("employees", Employee.class); Set add1 = new HashSet();
* add1.add(new Address("411045", "Baner")); add1.add(new Address("411001", "DholePatilRd"));
* for(int i=0;i<4;i++){ r3.put(i+"", new Employee("empName",(20+i),i,"Mr.",(5000+i),add1)); } //
* compileFromClause returns a List<CompiledIteratorDef> QCompiler compiler = new
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexMaintenanceJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexMaintenanceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexMaintenanceJUnitTest.java
index 3f4b304..b7b590a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexMaintenanceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexMaintenanceJUnitTest.java
@@ -1005,7 +1005,7 @@ public class IndexMaintenanceJUnitTest {
//
// QueryService qs;
// qs = CacheUtils.getQueryService();
- // LocalRegion testRgn = (LocalRegion)CacheUtils.createRegion("testRgn", null);
+ // LocalRegion testRgn = (LocalRegion)CacheUtils.withRegion("testRgn", null);
// int ID = 1;
// // Add some test data now
// // Add 5 main objects. 1 will contain key1, 2 will contain key1 & key2
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java
index 0f63df5..e07990d 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java
@@ -414,7 +414,7 @@ public class PRQueryDUnitHelper implements Serializable {
attr.setPartitionAttributes(paf.create());
// skip parent region creation
- // partitionedregion = cache.createRegion(regionName, attr.create());
+ // partitionedregion = cache.withRegion(regionName, attr.create());
// child region
attr.setValueConstraint(constraint);
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/cache30/CacheLoaderTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheLoaderTestCase.java b/geode-core/src/test/java/org/apache/geode/cache30/CacheLoaderTestCase.java
index 6822c89..1642217 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/CacheLoaderTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/CacheLoaderTestCase.java
@@ -142,7 +142,7 @@ public abstract class CacheLoaderTestCase extends CacheWriterTestCase {
// };
//
// Region region =
- // createRegion(name);
+ // withRegion(name);
// loader.wasInvoked();
//
// Region.Entry entry = region.getEntry(key);
@@ -170,7 +170,7 @@ public abstract class CacheLoaderTestCase extends CacheWriterTestCase {
//// AttributesFactory factory =
//// new AttributesFactory(getRegionAttributes());
//// factory.setCacheLoader(remoteloader);
- // Region rgn = createRegion(name);
+ // Region rgn = withRegion(name);
// rgn.put(key, value);
// flushIfNecessary(rgn);
// }
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
index 01143ff..738ef3f 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
@@ -3766,7 +3766,7 @@ public abstract class CacheXml66DUnitTest extends CacheXmlTestCase {
// factory.setScope(Scope.LOCAL);
// factory.setCapacityController(new HeapLRUCapacityController(42, 32,
// LRUAlgorithm.OVERFLOW_TO_DISK));
- // createRegion(name, factory.create());
+ // withRegion(name, factory.create());
// finishCacheXml(getUniqueName());
//
// Region r = getRootRegion().getSubregion(name);
@@ -3795,7 +3795,7 @@ public abstract class CacheXml66DUnitTest extends CacheXmlTestCase {
// CacheCreation cache = new CacheCreation();
// RegionAttributesCreation attrs = new RegionAttributesCreation(cache);
// attrs.setPublisher(true);
- // cache.createRegion("root", attrs);
+ // cache.withRegion("root", attrs);
// testXml(cache);
// assertIndexDetailsEquals(true, cache.getRegion("root").getAttributes().getPublisher());
}
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/cache30/DiskRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DiskRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DiskRegionDUnitTest.java
index 81f3c78..c3553b7 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/DiskRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/DiskRegionDUnitTest.java
@@ -1473,7 +1473,7 @@ public class DiskRegionDUnitTest extends JUnit4CacheTestCase {
// DiskStoreFactory dsf = getCache().createDiskStoreFactory();
// factory.setDiskSynchronous(true);
// factory.setDiskWriteAttributes(dwaf.create());
- // Region rgn = createRegion(name, factory.create());
+ // Region rgn = withRegion(name, factory.create());
// for (int i = 0; i < NB1_NUM_ENTRIES; i++) {
// rgn.put(new Integer(i), values[i]);
// }
@@ -1481,7 +1481,7 @@ public class DiskRegionDUnitTest extends JUnit4CacheTestCase {
// //close and create to ensure that all data will go to htree
// //TODO: Mitul : remove this later to fine tune test to also take oplogs recovery into account
// rgn.close();
- // rgn = createRegion(name, factory.createRegionAttributes());
+ // rgn = withRegion(name, factory.createRegionAttributes());
// closeCache();
// getCache();
// getLogWriter().info("DEBUG nbput: finished phase one");
@@ -1498,7 +1498,7 @@ public class DiskRegionDUnitTest extends JUnit4CacheTestCase {
// factory.setScope(Scope.DISTRIBUTED_ACK);
// factory.setEarlyAck(false);
// factory.setPersistBackup(false);
- // Region region = createRegion(name, factory.create());
+ // Region region = withRegion(name, factory.create());
// // keep putting until told to stop
// getLogWriter().info("DEBUG nbput: started async putter");
// int putCount = 0;
@@ -1557,7 +1557,7 @@ public class DiskRegionDUnitTest extends JUnit4CacheTestCase {
// DiskRegion.recoverDelay = 10; // artificially slow down recovery
// getLogWriter().info("DEBUG nbput: started recovery");
// try {
- // createRegion(name, factory.create());
+ // withRegion(name, factory.create());
// }
// finally {
// DiskRegion.recoverDelay = 0;
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/cache30/DiskRegionTestImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DiskRegionTestImpl.java b/geode-core/src/test/java/org/apache/geode/cache30/DiskRegionTestImpl.java
index 6fefb55..301c232 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/DiskRegionTestImpl.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/DiskRegionTestImpl.java
@@ -144,7 +144,7 @@ public class DiskRegionTestImpl implements Serializable {
// // set mirror KEYS
// factory.setMirrorType(MirrorType.KEYS);
// RegionAttributes attrs2 = factory.create();
- // Region rgn = DiskRegionTestImpl.this.rtc.createRegion(name, attrs2);
+ // Region rgn = DiskRegionTestImpl.this.rtc.withRegion(name, attrs2);
// }
// });
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java
index 2687f34..dcb6cf3 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java
@@ -325,7 +325,7 @@ public class DistributedAckRegionCCEDUnitTest extends DistributedAckRegionDUnitT
};
vm0.invoke(createRegion);
vm1.invoke(createRegion);
- // vm2.invoke(createRegion);
+ // vm2.invoke(withRegion);
vm1.invoke(new SerializableRunnable("Create local tombstone and adjust time") {
public void run() {
// make the entry for cckey0 a tombstone in this VM and set its modification time to be
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/cache30/DistributedMulticastRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedMulticastRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DistributedMulticastRegionDUnitTest.java
index 6b425f3..f22886b 100755
--- a/geode-core/src/test/java/org/apache/geode/cache30/DistributedMulticastRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/DistributedMulticastRegionDUnitTest.java
@@ -154,11 +154,11 @@ public class DistributedMulticastRegionDUnitTest extends JUnit4CacheTestCase {
vm1.invoke("setSysProps", () -> setSysProps());
// 1. start locator with mcast port
- vm0.invoke("createRegion", () -> {
+ vm0.invoke("withRegion", () -> {
createRegion(name, getRegionAttributes());
return "";
});
- vm1.invoke("createRegion", () -> {
+ vm1.invoke("withRegion", () -> {
createRegion(name, getRegionAttributes());
return "";
});
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionCCEDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionCCEDUnitTest.java
index a5b3cf6..6c3f952 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionCCEDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionCCEDUnitTest.java
@@ -180,7 +180,7 @@ public class GlobalRegionCCEDUnitTest extends GlobalRegionDUnitTest {
};
vm0.invoke(createRegion);
vm1.invoke(createRegion);
- // vm2.invoke(createRegion);
+ // vm2.invoke(withRegion);
vm1.invoke(new SerializableRunnable("Create local tombstone and adjust time") {
public void run() {
// make the entry for cckey0 a tombstone in this VM and set its
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java b/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
index 28ef7ff..c51c9cc 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
@@ -160,7 +160,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
*/
@Test
public void testConcurrentOperations() throws Exception {
- SerializableRunnable createRegion = new CacheSerializableRunnable("createRegion") {
+ SerializableRunnable createRegion = new CacheSerializableRunnable("withRegion") {
@Override
public void run2() throws CacheException {
@@ -2696,7 +2696,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
} catch (Exception e) {
CacheFactory.getInstance(getSystem()).close();
- getSystem().getLogWriter().fine("testDistributedPut: Caused exception in createRegion");
+ getSystem().getLogWriter().fine("testDistributedPut: Caused exception in withRegion");
throw e;
}
@@ -2736,7 +2736,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
// new AttributesFactory(getRegionAttributes());
// factory.setMirrorType(MirrorType.KEYS);
// try {
- // createRegion(name, factory.create());
+ // withRegion(name, factory.create());
// if (persistBackup) fail("Should have thrown an IllegalStateException");
// }
// catch (IllegalStateException e) {
@@ -6252,7 +6252,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
} catch (Exception e) {
CacheFactory.getInstance(getSystem()).close();
- getSystem().getLogWriter().fine("testTXSimpleOps: Caused exception in createRegion");
+ getSystem().getLogWriter().fine("testTXSimpleOps: Caused exception in withRegion");
throw e;
}
@@ -6509,8 +6509,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
assertSame(localCmtValue, rgn.getEntry("key").getValue());
} catch (Exception e) {
CacheFactory.getInstance(getSystem()).close();
- getSystem().getLogWriter()
- .fine("testTXUpdateLoadNoConflict: Caused exception in createRegion");
+ getSystem().getLogWriter().fine("testTXUpdateLoadNoConflict: Caused exception in withRegion");
throw e;
}
}
@@ -7268,7 +7267,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
rgn3.destroyRegion();
} catch (Exception e) {
CacheFactory.getInstance(getSystem()).close();
- getSystem().getLogWriter().fine("testTXMultiRegion: Caused exception in createRegion");
+ getSystem().getLogWriter().fine("testTXMultiRegion: Caused exception in withRegion");
throw e;
}
}
@@ -7406,7 +7405,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
// done in a tx is dropped in a remote mirror that does not have the entry.
} catch (Exception e) {
CacheFactory.getInstance(getSystem()).close();
- getSystem().getLogWriter().fine("textTXRmtMirror: Caused exception in createRegion");
+ getSystem().getLogWriter().fine("textTXRmtMirror: Caused exception in withRegion");
throw e;
}
}
@@ -7879,7 +7878,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
} catch (Exception e) {
CacheFactory.getInstance(getSystem()).close();
- getSystem().getLogWriter().fine("testTXAlgebra: Caused exception in createRegion");
+ getSystem().getLogWriter().fine("testTXAlgebra: Caused exception in withRegion");
throw e;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/cache30/RegionTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RegionTestCase.java b/geode-core/src/test/java/org/apache/geode/cache30/RegionTestCase.java
index d87cbd8..c4cca34 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/RegionTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/RegionTestCase.java
@@ -2477,7 +2477,7 @@ public abstract class RegionTestCase extends JUnit4CacheTestCase {
// Region region = null;
// System.setProperty(LocalRegion.EXPIRY_MS_PROPERTY", "true");
// try {
- // region = createRegion(name, attrs);
+ // region = withRegion(name, attrs);
// } finally {
// System.getProperties().remove(LocalRegion.EXPIRY_MS_PROPERTY);
// }
@@ -3197,7 +3197,7 @@ public abstract class RegionTestCase extends JUnit4CacheTestCase {
// Region region = null;
// System.setProperty(LocalRegion.EXPIRY_MS_PROPERTY, "true");
// try {
- // region = createRegion(name, attrs);
+ // region = withRegion(name, attrs);
// } finally {
// System.getProperties().remove(LocalRegion.EXPIRY_MS_PROPERTY);
// }
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/distributed/internal/Bug40751DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/Bug40751DUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/Bug40751DUnitTest.java
index b9a601d..008c03e 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/Bug40751DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/Bug40751DUnitTest.java
@@ -57,7 +57,7 @@ public class Bug40751DUnitTest extends JUnit4CacheTestCase {
VM vm0 = host.getVM(1);
VM vm1 = host.getVM(2);
- SerializableRunnable createDataRegion = new SerializableRunnable("createRegion") {
+ SerializableRunnable createDataRegion = new SerializableRunnable("withRegion") {
public void run() {
Cache cache = getCache();
AttributesFactory attr = new AttributesFactory();
@@ -70,7 +70,7 @@ public class Bug40751DUnitTest extends JUnit4CacheTestCase {
vm0.invoke(createDataRegion);
- SerializableRunnable createEmptyRegion = new SerializableRunnable("createRegion") {
+ SerializableRunnable createEmptyRegion = new SerializableRunnable("withRegion") {
public void run() {
Cache cache = getCache();
AttributesFactory attr = new AttributesFactory();
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/disttx/DistTXDebugDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/disttx/DistTXDebugDUnitTest.java b/geode-core/src/test/java/org/apache/geode/disttx/DistTXDebugDUnitTest.java
index 0d2f2b6..7415f40 100644
--- a/geode-core/src/test/java/org/apache/geode/disttx/DistTXDebugDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/disttx/DistTXDebugDUnitTest.java
@@ -126,7 +126,7 @@ public class DistTXDebugDUnitTest extends JUnit4CacheTestCase {
attr.setPartitionAttributes(prAttr);
attr.setConcurrencyChecksEnabled(concurrencyChecks);
// assertNotNull(basicGetCache());
- // Region pr = basicGetCache().createRegion(partitionedRegionName,
+ // Region pr = basicGetCache().withRegion(partitionedRegionName,
// attr.create());
assertNotNull(basicGetCache());
Region pr = basicGetCache().createRegion(partitionedRegionName, attr.create());
@@ -163,7 +163,7 @@ public class DistTXDebugDUnitTest extends JUnit4CacheTestCase {
} else {
af.setDataPolicy(DataPolicy.REPLICATE);
}
- // Region rr = basicGetCache().createRegion(replicatedRegionName,
+ // Region rr = basicGetCache().withRegion(replicatedRegionName,
// af.create());
Region rr = basicGetCache().createRegion(replicatedRegionName, af.create());
assertNotNull(rr);
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/internal/cache/CacheAdvisorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheAdvisorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/CacheAdvisorDUnitTest.java
index 2dcf8e9..6ac85d9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheAdvisorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/CacheAdvisorDUnitTest.java
@@ -99,7 +99,7 @@ public class CacheAdvisorDUnitTest extends JUnit4CacheTestCase {
final String rgnName = getUniqueName();
for (int i = 0; i < vms.length; i++) {
vms[i].invoke(
- new CacheSerializableRunnable("CacheAdvisorDUnitTest.testGenericAdvice;createRegion") {
+ new CacheSerializableRunnable("CacheAdvisorDUnitTest.testGenericAdvice;withRegion") {
public void run2() throws CacheException {
createRegion(rgnName, attrs);
}
@@ -189,7 +189,7 @@ public class CacheAdvisorDUnitTest extends JUnit4CacheTestCase {
DistributedRegion rgn = (DistributedRegion) createRegion(rgnName, attrs);
Invoke.invokeInEveryVM(new CacheSerializableRunnable(
- "CachAdvisorTest.testNetLoadAdviceWithAttributesMutator;createRegion") {
+ "CachAdvisorTest.testNetLoadAdviceWithAttributesMutator;withRegion") {
public void run2() throws CacheException {
AttributesFactory f = new AttributesFactory();
f.setScope(Scope.DISTRIBUTED_ACK);
@@ -233,7 +233,7 @@ public class CacheAdvisorDUnitTest extends JUnit4CacheTestCase {
final String rgnName = getUniqueName();
for (int i = 0; i < vms.length; i++) {
vms[i].invoke(
- new CacheSerializableRunnable("CacheAdvisorDUnitTest.basicTestClose; createRegion") {
+ new CacheSerializableRunnable("CacheAdvisorDUnitTest.basicTestClose; withRegion") {
public void run2() throws CacheException {
createRegion(rgnName, attrs);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaSizingDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaSizingDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaSizingDUnitTest.java
index be21fa3..a879b77 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaSizingDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaSizingDUnitTest.java
@@ -146,7 +146,7 @@ public class DeltaSizingDUnitTest extends JUnit4CacheTestCase {
VM vm1 = host.getVM(1);
VM vm2 = host.getVM(2);
- SerializableCallable createDataRegion = new SerializableCallable("createRegion") {
+ SerializableCallable createDataRegion = new SerializableCallable("withRegion") {
public Object call() throws Exception {
Cache cache = getCache();
cache.setCopyOnRead(copyOnRead);
@@ -186,7 +186,7 @@ public class DeltaSizingDUnitTest extends JUnit4CacheTestCase {
final Integer port1 = (Integer) vm0.invoke(createDataRegion);
final Integer port2 = (Integer) vm1.invoke(createDataRegion);
- SerializableRunnable createEmptyRegion = new SerializableRunnable("createRegion") {
+ SerializableRunnable createEmptyRegion = new SerializableRunnable("withRegion") {
public void run() {
Cache cache = getCache();
cache.setCopyOnRead(copyOnRead);
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/internal/cache/EventTrackerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/EventTrackerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/EventTrackerDUnitTest.java
index 3faf41f..219949b 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/EventTrackerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/EventTrackerDUnitTest.java
@@ -273,7 +273,7 @@ public class EventTrackerDUnitTest extends JUnit4CacheTestCase {
VM vm1 = host.getVM(1);
VM vm2 = host.getVM(2);
- SerializableRunnable createRegion = new SerializableRunnable("createRegion") {
+ SerializableRunnable createRegion = new SerializableRunnable("withRegion") {
public void run() {
Cache cache = getCache();
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/internal/cache/PRTXJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PRTXJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PRTXJUnitTest.java
index d2bad64..1bca936 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PRTXJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PRTXJUnitTest.java
@@ -45,14 +45,14 @@ public class PRTXJUnitTest extends TXJUnitTest {
/*
* (non-Javadoc)
*
- * @see org.apache.geode.TXTest#createRegion()
+ * @see org.apache.geode.TXTest#withRegion()
*/
@Override
protected void createRegion() throws Exception {
AttributesFactory af = new AttributesFactory();
af.setConcurrencyChecksEnabled(false); // test validation expects this behavior
af.setPartitionAttributes(new PartitionAttributesFactory().setTotalNumBuckets(3).create());
- // this.region = this.cache.createRegion("PRTXJUnitTest", af.create());
+ // this.region = this.cache.withRegion("PRTXJUnitTest", af.create());
this.region = new PRWithLocalOps("PRTXJUnitTest", af.create(), null, this.cache,
new InternalRegionArguments().setDestroyLockFlag(true).setRecreateFlag(false)
.setSnapshotInputStream(null).setImageTarget(null));
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionListenerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionListenerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionListenerDUnitTest.java
index 7fd470f..9c38948 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionListenerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionListenerDUnitTest.java
@@ -162,7 +162,7 @@ public class PartitionListenerDUnitTest extends JUnit4CacheTestCase {
protected DistributedMember createPR(VM vm, final String regionName, final boolean isAccessor)
throws Throwable {
- SerializableCallable createPrRegion = new SerializableCallable("createRegion") {
+ SerializableCallable createPrRegion = new SerializableCallable("withRegion") {
public Object call() {
Cache cache = getCache();
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionHADUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionHADUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionHADUnitTest.java
index 304861b..2b3a5a9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionHADUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionHADUnitTest.java
@@ -90,7 +90,7 @@ public class PartitionedRegionHADUnitTest extends PartitionedRegionDUnitTestCase
VM vm1 = host.getVM(1);
VM vm2 = host.getVM(2);
VM vm3 = host.getVM(3);
- CacheSerializableRunnable createPR = new CacheSerializableRunnable("createRegion") {
+ CacheSerializableRunnable createPR = new CacheSerializableRunnable("withRegion") {
public void run2() throws CacheException {
Cache cache = getCache();
final CountDownLatch rebalancingFinished = new CountDownLatch(1);
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java
index 11ecae5..404bf27 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java
@@ -109,7 +109,7 @@ public class PartitionedRegionRedundancyZoneDUnitTest extends JUnit4CacheTestCas
}
protected DistributedMember createPR(VM vm, int redundancy) throws Exception {
- SerializableCallable createPrRegion = new SerializableCallable("createRegion") {
+ SerializableCallable createPrRegion = new SerializableCallable("withRegion") {
public Object call() {
Cache cache = getCache();
AttributesFactory attr = new AttributesFactory();
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionStatsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionStatsDUnitTest.java
index e2328a4..ce09d11 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionStatsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionStatsDUnitTest.java
@@ -333,7 +333,7 @@ public class PartitionedRegionStatsDUnitTest extends PartitionedRegionDUnitTestC
final VM vm0 = host.getVM(0);
final VM vm1 = host.getVM(1);
- SerializableRunnable createPrRegion = new SerializableRunnable("createRegion") {
+ SerializableRunnable createPrRegion = new SerializableRunnable("withRegion") {
public void run() {
Cache cache = getCache();
AttributesFactory attr = new AttributesFactory();
@@ -379,7 +379,7 @@ public class PartitionedRegionStatsDUnitTest extends PartitionedRegionDUnitTestC
final VM vm0 = host.getVM(0);
final VM vm1 = host.getVM(1);
- SerializableRunnable createPrRegion = new SerializableRunnable("createRegion") {
+ SerializableRunnable createPrRegion = new SerializableRunnable("withRegion") {
public void run() {
Cache cache = getCache();
AttributesFactory attr = new AttributesFactory();
@@ -435,7 +435,7 @@ public class PartitionedRegionStatsDUnitTest extends PartitionedRegionDUnitTestC
final VM vm1 = host.getVM(1);
final VM vm2 = host.getVM(2);
- SerializableRunnable createPrRegion = new SerializableRunnable("createRegion") {
+ SerializableRunnable createPrRegion = new SerializableRunnable("withRegion") {
public void run() {
Cache cache = getCache();
AttributesFactory attr = new AttributesFactory();
@@ -545,7 +545,7 @@ public class PartitionedRegionStatsDUnitTest extends PartitionedRegionDUnitTestC
final VM vm0 = host.getVM(0);
final VM vm1 = host.getVM(1);
- SerializableRunnable createPrRegion = new SerializableRunnable("createRegion") {
+ SerializableRunnable createPrRegion = new SerializableRunnable("withRegion") {
public void run() {
Cache cache = getCache();
AttributesFactory attr = new AttributesFactory();
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionTestUtilsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
index e769b4c..358bece 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
@@ -272,7 +272,7 @@ public class PartitionedRegionTestUtilsDUnitTest extends PartitionedRegionDUnitT
// .setLocalProperties(lp)
// .createPartitionAttributes());
//
- // PartitionedRegion p = (PartitionedRegion) cache.createRegion(r, attr.create());
+ // PartitionedRegion p = (PartitionedRegion) cache.withRegion(r, attr.create());
// assertNotNull(p);
//
// final String key1 = "lcKey1"; final String val1 = "lcVal1";
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/internal/cache/control/RebalanceOperationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/control/RebalanceOperationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/control/RebalanceOperationDUnitTest.java
index 5f1c7fe..694fc61 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/control/RebalanceOperationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/control/RebalanceOperationDUnitTest.java
@@ -128,7 +128,7 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
- SerializableRunnable createPrRegion = new SerializableRunnable("createRegion") {
+ SerializableRunnable createPrRegion = new SerializableRunnable("withRegion") {
public void run() {
Cache cache = getCache();
AttributesFactory attr = new AttributesFactory();
@@ -244,7 +244,7 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
VM vm2 = host.getVM(2);
VM vm3 = host.getVM(3);
- SerializableRunnable createPrRegion = new SerializableRunnable("createRegion") {
+ SerializableRunnable createPrRegion = new SerializableRunnable("withRegion") {
public void run() {
Cache cache = getCache();
AttributesFactory attr = new AttributesFactory();
@@ -289,7 +289,7 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
// make sure we can tell that the buckets have low redundancy
vm0.invoke(checkLowRedundancy);
- SerializableRunnable closePrRegion = new SerializableRunnable("createRegion") {
+ SerializableRunnable closePrRegion = new SerializableRunnable("withRegion") {
public void run() {
disconnectFromDS();
// Cache cache = getCache();
@@ -346,7 +346,7 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
- SerializableRunnable createPrRegion = new SerializableRunnable("createRegion") {
+ SerializableRunnable createPrRegion = new SerializableRunnable("withRegion") {
public void run() {
Cache cache = getCache();
AttributesFactory attr = new AttributesFactory();
@@ -467,7 +467,7 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
setRedundancyZone(vm1, "A");
final DistributedMember zoneBMember = setRedundancyZone(vm2, "B");
- SerializableRunnable createPrRegion = new SerializableRunnable("createRegion") {
+ SerializableRunnable createPrRegion = new SerializableRunnable("withRegion") {
public void run() {
Cache cache = getCache();
AttributesFactory attr = new AttributesFactory();
@@ -667,7 +667,7 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
}
};
- SerializableRunnable createPrRegion = new SerializableRunnable("createRegion") {
+ SerializableRunnable createPrRegion = new SerializableRunnable("withRegion") {
public void run() {
ParallelRecoveryObserver ob =
(ParallelRecoveryObserver) InternalResourceManager.getResourceObserver();
@@ -958,7 +958,7 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
private DistributedMember createPrRegion(VM vm, final String region, final int localMaxMemory,
final String colocatedWith) {
- SerializableCallable createPrRegion = new SerializableCallable("createRegion") {
+ SerializableCallable createPrRegion = new SerializableCallable("withRegion") {
public Object call() {
Cache cache = getCache();
AttributesFactory attr = new AttributesFactory();
@@ -1399,7 +1399,7 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
}
private DistributedMember createPRRegionWithAsyncQueue(VM vm0, final int localMaxMemory) {
- SerializableCallable createPrRegion = new SerializableCallable("createRegion") {
+ SerializableCallable createPrRegion = new SerializableCallable("withRegion") {
public Object call() {
Cache cache = getCache();
@@ -1446,7 +1446,7 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
- SerializableRunnable createPrRegion = new SerializableRunnable("createRegion") {
+ SerializableRunnable createPrRegion = new SerializableRunnable("withRegion") {
public void run() {
Cache cache = getCache();
AttributesFactory attr = new AttributesFactory();
@@ -1559,7 +1559,7 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
VM vm1 = host.getVM(1);
final VM vm2 = host.getVM(2);
- final SerializableRunnable createPrRegion = new SerializableRunnable("createRegion") {
+ final SerializableRunnable createPrRegion = new SerializableRunnable("withRegion") {
public void run() {
Cache cache = getCache();
AttributesFactory attr = new AttributesFactory();
@@ -1669,7 +1669,7 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
- SerializableRunnable createPrRegion = new SerializableRunnable("createRegion") {
+ SerializableRunnable createPrRegion = new SerializableRunnable("withRegion") {
public void run() {
Cache cache = getCache();
AttributesFactory attr = new AttributesFactory();
@@ -1812,7 +1812,7 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
EXPECTED_REBALANCED.add("/region0");
EXPECTED_REBALANCED.add("/region1");
- SerializableRunnable createPrRegion = new SerializableRunnable("createRegion") {
+ SerializableRunnable createPrRegion = new SerializableRunnable("withRegion") {
public void run() {
Cache cache = getCache();
AttributesFactory attr = new AttributesFactory();
@@ -1943,7 +1943,7 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
VM vm1 = host.getVM(1);
VM vm2 = host.getVM(2);
- SerializableRunnable createPrRegion = new SerializableRunnable("createRegion") {
+ SerializableRunnable createPrRegion = new SerializableRunnable("withRegion") {
public void run() {
Cache cache = getCache();
AttributesFactory attr = new AttributesFactory();
@@ -2058,7 +2058,7 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
VM vm2 = host.getVM(2);
VM vm3 = host.getVM(3);
- SerializableRunnable createPrRegion = new SerializableRunnable("createRegion") {
+ SerializableRunnable createPrRegion = new SerializableRunnable("withRegion") {
public void run() {
Cache cache = getCache();
AttributesFactory attr = new AttributesFactory();
@@ -2268,7 +2268,7 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
VM vm1 = host.getVM(1);
VM vm2 = host.getVM(2);
- SerializableRunnable createPrRegion = new SerializableRunnable("createRegion") {
+ SerializableRunnable createPrRegion = new SerializableRunnable("withRegion") {
public void run() {
Region parent;
Cache cache = getCache();
@@ -2575,7 +2575,7 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
- SerializableRunnable createPrRegion = new SerializableRunnable("createRegion") {
+ SerializableRunnable createPrRegion = new SerializableRunnable("withRegion") {
public void run() {
Cache cache = getCache();
AttributesFactory attr = new AttributesFactory();
@@ -2741,7 +2741,7 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
VM vm2 = host.getVM(2);
VM vm3 = host.getVM(3);
- SerializableRunnable createPrRegion = new SerializableRunnable("createRegion") {
+ SerializableRunnable createPrRegion = new SerializableRunnable("withRegion") {
public void run() {
Cache cache = getCache();
DiskStoreFactory dsf = cache.createDiskStoreFactory();
@@ -3009,7 +3009,7 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
LoadProbe oldProbe = setLoadProbe(vm0, new BucketCountLoadProbe());
try {
- SerializableRunnable createPrRegion = new SerializableRunnable("createRegion") {
+ SerializableRunnable createPrRegion = new SerializableRunnable("withRegion") {
public void run() {
Cache cache = getCache();
AttributesFactory attr = new AttributesFactory();
@@ -3131,7 +3131,7 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
- SerializableRunnable createPrRegion = new SerializableRunnable("createRegion") {
+ SerializableRunnable createPrRegion = new SerializableRunnable("withRegion") {
public void run() {
System.setProperty(DiskStoreImpl.RECOVER_VALUE_PROPERTY_NAME, "false");
try {
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQueueNewImplDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQueueNewImplDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQueueNewImplDUnitTest.java
index 12e5819..83f3b3f 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQueueNewImplDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQueueNewImplDUnitTest.java
@@ -1036,7 +1036,7 @@ public class HARQueueNewImplDUnitTest extends JUnit4DistributedTestCase {
server.start();
}
} catch (Exception e) {
- fail("failed in startServer()" + e);
+ fail("failed in buildInThisVM()" + e);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug39356DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug39356DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug39356DUnitTest.java
index 5705c09..1d41291 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug39356DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug39356DUnitTest.java
@@ -181,7 +181,7 @@ public class Bug39356DUnitTest extends JUnit4CacheTestCase {
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
- SerializableRunnable createPrRegion = new SerializableRunnable("createRegion") {
+ SerializableRunnable createPrRegion = new SerializableRunnable("withRegion") {
public void run() {
Cache cache = getCache();
AttributesFactory attr = new AttributesFactory();
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java
index 11254e7..2cdd23b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java
@@ -416,15 +416,15 @@ public class ShutdownAllDUnitTest extends JUnit4CacheTestCase {
/*
* @Test public void testStopNonPersistRegions() throws Throwable { Host host = Host.getHost(0);
- * VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); VM vm2 = host.getVM(2); createRegion(vm0,
- * "region", null, true, 1); createRegion(vm1, "region", "disk", true, 1);
+ * VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); VM vm2 = host.getVM(2); withRegion(vm0,
+ * "region", null, true, 1); withRegion(vm1, "region", "disk", true, 1);
*
* createData(vm0, 0, 1, "a", "region");
*
* shutDownAllMembers(vm2, 2);
*
- * // restart vms, and let vm0 to do GII from vm0 createRegion(vm1, "region", "disk", true, 1);
- * createRegion(vm0, "region", null, true, 1);
+ * // restart vms, and let vm0 to do GII from vm0 withRegion(vm1, "region", "disk", true, 1);
+ * withRegion(vm0, "region", null, true, 1);
*
* checkData(vm0, 0, 1, "a", "region"); checkData(vm1, 0, 1, "a", "region");
*
http://git-wip-us.apache.org/repos/asf/geode/blob/50f6d1e3/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java
index beb3a9a..6d96471 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java
@@ -1456,12 +1456,12 @@ public class RollingUpgrade2DUnitTest extends JUnit4DistributedTestCase {
private CacheSerializableRunnable invokeCreateRegion(final String regionName,
final RegionShortcut shortcut) {
- return new CacheSerializableRunnable("execute: createRegion") {
+ return new CacheSerializableRunnable("execute: withRegion") {
public void run2() {
try {
createRegion(RollingUpgrade2DUnitTest.cache, regionName, shortcut);
} catch (Exception e) {
- fail("Error createRegion", e);
+ fail("Error withRegion", e);
}
}
};