Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id AE691200B27 for ; Wed, 8 Jun 2016 02:05:34 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id AC8E9160A5C; Wed, 8 Jun 2016 00:05:34 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5BA31160A5D for ; Wed, 8 Jun 2016 02:05:32 +0200 (CEST) Received: (qmail 11127 invoked by uid 500); 8 Jun 2016 00:05:31 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 11118 invoked by uid 99); 8 Jun 2016 00:05:31 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Jun 2016 00:05:31 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id F14A1C0D08 for ; Wed, 8 Jun 2016 00:05:30 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id cIyhZiTVY9oZ for ; Wed, 8 Jun 2016 00:04:55 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 3BD8360D10 for ; Wed, 8 Jun 2016 00:04:40 +0000 (UTC) Received: (qmail 3463 invoked by uid 99); 8 Jun 2016 00:04:39 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Jun 2016 00:04:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1C2B7E0571; Wed, 8 Jun 2016 00:04:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: klund@apache.org To: commits@geode.incubator.apache.org Date: Wed, 08 Jun 2016 00:04:51 -0000 Message-Id: <916865fdf19c491dbd5e2904fbc66280@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [14/90] [abbrv] incubator-geode git commit: GEODE-1377: Initial move of system properties from private to public archived-at: Wed, 08 Jun 2016 00:05:34 -0000 http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PersistentPartitionedRegionJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PersistentPartitionedRegionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PersistentPartitionedRegionJUnitTest.java index 30e6d79..a7f24b6 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PersistentPartitionedRegionJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PersistentPartitionedRegionJUnitTest.java @@ -16,26 +16,20 @@ */ package com.gemstone.gemfire.internal.cache; -import static org.junit.Assert.assertEquals; - -import java.io.File; -import java.util.Properties; - +import com.gemstone.gemfire.cache.*; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import com.gemstone.gemfire.internal.FileUtil; +import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.ExpirationAction; -import com.gemstone.gemfire.cache.ExpirationAttributes; -import com.gemstone.gemfire.cache.PartitionAttributesFactory; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionFactory; -import com.gemstone.gemfire.internal.FileUtil; -import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import java.io.File; +import java.util.Properties; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static org.junit.Assert.assertEquals; @Category(IntegrationTest.class) public class PersistentPartitionedRegionJUnitTest { @@ -201,8 +195,8 @@ public class PersistentPartitionedRegionJUnitTest { private Region createRegion(int ttl) { Properties props = new Properties(); - props.setProperty("mcast-port", "0"); - props.setProperty("log-level", "info"); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info"); // props.setProperty("log-file", "junit.log"); cache = new CacheFactory(props).create(); cache.createDiskStoreFactory() http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RegionListenerJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RegionListenerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RegionListenerJUnitTest.java index e35016e..15abb22 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RegionListenerJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RegionListenerJUnitTest.java @@ -16,20 +16,16 @@ */ package com.gemstone.gemfire.internal.cache; -import static org.junit.Assert.*; - -import java.util.concurrent.atomic.AtomicBoolean; - +import com.gemstone.gemfire.cache.*; +import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import org.junit.Test; import org.junit.experimental.categories.Category; -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.RegionShortcut; -import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import java.util.concurrent.atomic.AtomicBoolean; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; @Category(IntegrationTest.class) public class RegionListenerJUnitTest { @@ -52,8 +48,8 @@ public class RegionListenerJUnitTest { afterCreateInvoked.set(true); } }; - - GemFireCacheImpl cache = (GemFireCacheImpl) new CacheFactory().set("mcast-port", "0").create(); + + GemFireCacheImpl cache = (GemFireCacheImpl) new CacheFactory().set(MCAST_PORT, "0").create(); cache.addRegionListener(listener); Region region = cache.createRegionFactory(RegionShortcut.REPLICATE).create("region"); assertEquals(DataPolicy.EMPTY, region.getAttributes().getDataPolicy()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java index 9b1f29e..0f78749 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java @@ -16,70 +16,15 @@ */ package com.gemstone.gemfire.internal.cache; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.CountDownLatch; - -import javax.naming.Context; -import javax.naming.NamingException; -import javax.transaction.RollbackException; -import javax.transaction.Status; -import javax.transaction.UserTransaction; - import com.gemstone.gemfire.TXExpiryJUnitTest; -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.AttributesMutator; -import com.gemstone.gemfire.cache.CacheEvent; -import com.gemstone.gemfire.cache.CacheListener; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheLoaderException; -import com.gemstone.gemfire.cache.CacheTransactionManager; -import com.gemstone.gemfire.cache.CacheWriter; -import com.gemstone.gemfire.cache.CacheWriterException; -import com.gemstone.gemfire.cache.CommitConflictException; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.EntryEvent; -import com.gemstone.gemfire.cache.EntryNotFoundException; -import com.gemstone.gemfire.cache.ExpirationAction; -import com.gemstone.gemfire.cache.ExpirationAttributes; -import com.gemstone.gemfire.cache.InterestPolicy; -import com.gemstone.gemfire.cache.InterestResultPolicy; -import com.gemstone.gemfire.cache.LoaderHelper; -import com.gemstone.gemfire.cache.PartitionAttributesFactory; -import com.gemstone.gemfire.cache.Region; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.Region.Entry; -import com.gemstone.gemfire.cache.RegionEvent; -import com.gemstone.gemfire.cache.RegionFactory; -import com.gemstone.gemfire.cache.RegionShortcut; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.SubscriptionAttributes; -import com.gemstone.gemfire.cache.TransactionDataNotColocatedException; -import com.gemstone.gemfire.cache.TransactionDataRebalancedException; -import com.gemstone.gemfire.cache.TransactionEvent; -import com.gemstone.gemfire.cache.TransactionException; -import com.gemstone.gemfire.cache.TransactionId; -import com.gemstone.gemfire.cache.TransactionListener; -import com.gemstone.gemfire.cache.TransactionWriter; -import com.gemstone.gemfire.cache.TransactionWriterException; -import com.gemstone.gemfire.cache.UnsupportedOperationInTransactionException; import com.gemstone.gemfire.cache.client.ClientCache; import com.gemstone.gemfire.cache.client.ClientCacheFactory; import com.gemstone.gemfire.cache.client.ClientRegionFactory; import com.gemstone.gemfire.cache.client.ClientRegionShortcut; -import com.gemstone.gemfire.cache.execute.Function; -import com.gemstone.gemfire.cache.execute.FunctionAdapter; -import com.gemstone.gemfire.cache.execute.FunctionContext; -import com.gemstone.gemfire.cache.execute.FunctionService; -import com.gemstone.gemfire.cache.execute.RegionFunctionContext; +import com.gemstone.gemfire.cache.execute.*; import com.gemstone.gemfire.cache.partition.PartitionRegionHelper; -import com.gemstone.gemfire.cache.query.CqAttributes; -import com.gemstone.gemfire.cache.query.CqAttributesFactory; import com.gemstone.gemfire.cache.query.CqEvent; import com.gemstone.gemfire.cache.query.CqListener; import com.gemstone.gemfire.cache.server.CacheServer; @@ -87,6 +32,7 @@ import com.gemstone.gemfire.cache.util.CacheListenerAdapter; import com.gemstone.gemfire.cache.util.CacheWriterAdapter; import com.gemstone.gemfire.cache30.CacheTestCase; import com.gemstone.gemfire.distributed.DistributedMember; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.cache.execute.CustomerIDPartitionResolver; @@ -96,15 +42,15 @@ import com.gemstone.gemfire.internal.cache.execute.data.Customer; import com.gemstone.gemfire.internal.cache.execute.data.Order; import com.gemstone.gemfire.internal.cache.execute.data.OrderId; import com.gemstone.gemfire.internal.cache.versions.VersionTag; -import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.dunit.Invoke; -import com.gemstone.gemfire.test.dunit.LogWriterUtils; -import com.gemstone.gemfire.test.dunit.SerializableCallable; -import com.gemstone.gemfire.test.dunit.SerializableRunnable; -import com.gemstone.gemfire.test.dunit.VM; -import com.gemstone.gemfire.test.dunit.Wait; -import com.gemstone.gemfire.test.dunit.WaitCriterion; +import com.gemstone.gemfire.test.dunit.*; + +import javax.naming.Context; +import javax.naming.NamingException; +import javax.transaction.RollbackException; +import javax.transaction.Status; +import javax.transaction.UserTransaction; +import java.util.*; +import java.util.concurrent.CountDownLatch; /** * @@ -3464,7 +3410,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase { ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolServer("localhost"/*getServerHostName(Host.getHost(0))*/, port); ccf.setPoolSubscriptionEnabled(true); - ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); + ccf.set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); ClientCache cCache = getClientCache(ccf); ClientRegionFactory crf = cCache .createClientRegionFactory(isEmpty ? ClientRegionShortcut.PROXY @@ -3676,7 +3622,7 @@ protected static class ClientListener extends CacheListenerAdapter { ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolServer("localhost"/*getServerHostName(Host.getHost(0))*/, port); ccf.setPoolSubscriptionEnabled(true); - ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); + ccf.set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); ClientCache cCache = getClientCache(ccf); ClientRegionFactory crf = cCache .createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RunCacheInOldGemfire.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RunCacheInOldGemfire.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RunCacheInOldGemfire.java index 7a0293a..988721b 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RunCacheInOldGemfire.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RunCacheInOldGemfire.java @@ -19,22 +19,18 @@ */ package com.gemstone.gemfire.internal.cache; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.DiskStore; -import com.gemstone.gemfire.cache.PartitionAttributesFactory; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionFactory; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.internal.admin.remote.ShutdownAllRequest; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import java.io.File; import java.util.Properties; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; + /** * */ @@ -50,8 +46,8 @@ public class RunCacheInOldGemfire { protected Cache createCache(String mcastPort) { Properties config = new Properties(); - config.setProperty(DistributionConfig.MCAST_PORT_NAME, mcastPort); - config.setProperty(DistributionConfig.LOCATORS_NAME, ""); + config.setProperty(MCAST_PORT, mcastPort); + config.setProperty(LOCATORS, ""); config.setProperty(DistributionConfig.LOG_FILE_NAME, "oldgemfire.log"); InternalDistributedSystem localsystem = (InternalDistributedSystem)DistributedSystem.connect(config); Cache cache = CacheFactory.create(localsystem); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java index 671bdf7..7cedbd0 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java @@ -17,7 +17,6 @@ package com.gemstone.gemfire.internal.cache; import com.gemstone.gemfire.cache.*; -import com.gemstone.gemfire.cache.client.ClientCache; import com.gemstone.gemfire.cache.client.Pool; import com.gemstone.gemfire.cache.client.PoolManager; import com.gemstone.gemfire.cache.client.internal.ClientMetadataService; @@ -39,6 +38,9 @@ import java.util.Map; import java.util.Properties; import java.util.concurrent.TimeUnit; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; + public class SingleHopStatsDUnitTest extends CacheTestCase { private final String Region_Name = "42010"; @@ -139,8 +141,8 @@ public class SingleHopStatsDUnitTest extends CacheTestCase { private void createClient(int port0, int port1, int port2, String colocation) { Properties props = new Properties(); props = new Properties(); - props.setProperty("mcast-port", "0"); - props.setProperty("locators", ""); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, ""); CacheTestCase test = new SingleHopStatsDUnitTest( "SingleHopStatsDUnitTest"); DistributedSystem distributedSystem = test.getSystem(props); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXManagerImplJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXManagerImplJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXManagerImplJUnitTest.java index 6150bff..ff00082 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXManagerImplJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXManagerImplJUnitTest.java @@ -16,16 +16,9 @@ */ package com.gemstone.gemfire.internal.cache; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import java.util.Properties; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - +import com.gemstone.gemfire.cache.*; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -33,15 +26,13 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.TestName; -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.CacheTransactionManager; -import com.gemstone.gemfire.cache.ExpirationAttributes; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionShortcut; -import com.gemstone.gemfire.cache.TransactionId; -import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import java.util.Properties; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static org.junit.Assert.*; /** * junit test for suspend and resume methods @@ -62,8 +53,8 @@ public class TXManagerImplJUnitTest { protected void createCache() { Properties props = new Properties(); - props.put("mcast-port", "0"); - props.put("locators", ""); + props.put(MCAST_PORT, "0"); + props.put(LOCATORS, ""); cache = new CacheFactory(props).create(); region = cache.createRegionFactory(RegionShortcut.REPLICATE).create("testRegion"); } @@ -314,7 +305,7 @@ public class TXManagerImplJUnitTest { @Test public void testSuspendTimeout() throws Exception { cache.close(); - System.setProperty("gemfire.suspendedTxTimeout", "1"); + System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "suspendedTxTimeout", "1"); createCache(); TXManagerImpl mgr = (TXManagerImpl) cache.getCacheTransactionManager(); assertEquals(1, mgr.getSuspendedTransactionTimeout()); @@ -328,7 +319,7 @@ public class TXManagerImplJUnitTest { } catch (IllegalStateException expected) { } assertNull(region.get("key")); - System.setProperty("gemfire.suspendedTxTimeout", ""); + System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "suspendedTxTimeout", ""); } @Test http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXReservationMgrJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXReservationMgrJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXReservationMgrJUnitTest.java index b1d1e64..c1688a7 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXReservationMgrJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXReservationMgrJUnitTest.java @@ -16,22 +16,20 @@ */ package com.gemstone.gemfire.internal.cache; -import java.util.Collections; -import java.util.Properties; - +import com.gemstone.gemfire.cache.*; +import com.gemstone.gemfire.distributed.DistributedSystem; +import com.gemstone.gemfire.test.dunit.ThreadUtils; +import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.CommitConflictException; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.test.dunit.ThreadUtils; -import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import java.util.Collections; +import java.util.Properties; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; @Category(IntegrationTest.class) public class TXReservationMgrJUnitTest { @@ -48,8 +46,8 @@ public class TXReservationMgrJUnitTest { @Before public void setUp() throws Exception { Properties p = new Properties(); - p.setProperty("mcast-port", "0"); - p.setProperty("locators", ""); + p.setProperty(MCAST_PORT, "0"); + p.setProperty(LOCATORS, ""); this.ds = DistributedSystem.connect(p); this.c = CacheFactory.create(this.ds); AttributesFactory af = new AttributesFactory(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TombstoneCreationJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TombstoneCreationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TombstoneCreationJUnitTest.java index 9bd99b1..91b0153 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TombstoneCreationJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TombstoneCreationJUnitTest.java @@ -16,20 +16,7 @@ */ package com.gemstone.gemfire.internal.cache; -import java.net.InetAddress; -import java.util.Properties; - -import org.junit.After; -import org.junit.Rule; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.junit.rules.TestName; - -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.EntryNotFoundException; -import com.gemstone.gemfire.cache.Operation; -import com.gemstone.gemfire.cache.RegionFactory; -import com.gemstone.gemfire.cache.RegionShortcut; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; @@ -37,6 +24,17 @@ import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedM import com.gemstone.gemfire.internal.Assert; import com.gemstone.gemfire.internal.cache.versions.VersionTag; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import org.junit.After; +import org.junit.Rule; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.rules.TestName; + +import java.net.InetAddress; +import java.util.Properties; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; @Category(IntegrationTest.class) public class TombstoneCreationJUnitTest { @@ -55,8 +53,8 @@ public class TombstoneCreationJUnitTest { public void testDestroyCreatesTombstone() throws Exception { String name = nameRule.getMethodName(); Properties props = new Properties(); - props.put(DistributionConfig.LOCATORS_NAME, ""); - props.put(DistributionConfig.MCAST_PORT_NAME, "0"); + props.put(LOCATORS, ""); + props.put(MCAST_PORT, "0"); props.put(DistributionConfig.LOG_LEVEL_NAME, "config"); GemFireCacheImpl cache = (GemFireCacheImpl)CacheFactory.create(DistributedSystem.connect(props)); RegionFactory f = cache.createRegionFactory(RegionShortcut.REPLICATE); @@ -92,8 +90,8 @@ public class TombstoneCreationJUnitTest { public void testConcurrentCreateAndDestroy() throws Exception { String name = nameRule.getMethodName(); Properties props = new Properties(); - props.put(DistributionConfig.LOCATORS_NAME, ""); - props.put(DistributionConfig.MCAST_PORT_NAME, "0"); + props.put(LOCATORS, ""); + props.put(MCAST_PORT, "0"); props.put(DistributionConfig.LOG_LEVEL_NAME, "config"); final GemFireCacheImpl cache = (GemFireCacheImpl)CacheFactory.create(DistributedSystem.connect(props)); RegionFactory f = cache.createRegionFactory(RegionShortcut.REPLICATE); @@ -167,8 +165,8 @@ public class TombstoneCreationJUnitTest { public void testOlderEventIgnoredEvenIfTombstoneHasExpired() throws Exception { String name = nameRule.getMethodName(); Properties props = new Properties(); - props.put(DistributionConfig.LOCATORS_NAME, ""); - props.put(DistributionConfig.MCAST_PORT_NAME, "0"); + props.put(LOCATORS, ""); + props.put(MCAST_PORT, "0"); props.put(DistributionConfig.LOG_LEVEL_NAME, "config"); final GemFireCacheImpl cache = (GemFireCacheImpl)CacheFactory.create(DistributedSystem.connect(props)); RegionFactory f = cache.createRegionFactory(RegionShortcut.REPLICATE); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TransactionsWithDeltaDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TransactionsWithDeltaDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TransactionsWithDeltaDUnitTest.java index 3f556e5..90ac6b8 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TransactionsWithDeltaDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TransactionsWithDeltaDUnitTest.java @@ -21,23 +21,14 @@ package com.gemstone.gemfire.internal.cache; import com.gemstone.gemfire.Delta; import com.gemstone.gemfire.InvalidDeltaException; -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.CacheTransactionManager; -import com.gemstone.gemfire.cache.CommitConflictException; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.InterestPolicy; -import com.gemstone.gemfire.cache.PartitionAttributesFactory; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.SubscriptionAttributes; -import com.gemstone.gemfire.cache.UnsupportedOperationInTransactionException; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.client.ClientCache; import com.gemstone.gemfire.cache.client.ClientCacheFactory; import com.gemstone.gemfire.cache.client.ClientRegionFactory; import com.gemstone.gemfire.cache.client.ClientRegionShortcut; import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.cache30.CacheTestCase; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.cache.execute.CustomerIDPartitionResolver; import com.gemstone.gemfire.internal.cache.execute.data.CustId; @@ -114,7 +105,7 @@ public class TransactionsWithDeltaDUnitTest extends CacheTestCase { ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolServer("localhost"/*getServerHostName(Host.getHost(0))*/, port); ccf.setPoolSubscriptionEnabled(false); - ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); + ccf.set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); ClientCache cCache = getClientCache(ccf); ClientRegionFactory crf = cCache .createClientRegionFactory(isEmpty ? ClientRegionShortcut.PROXY http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionJUnitTest.java index 8bb6bca..bff92ca 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionJUnitTest.java @@ -19,24 +19,20 @@ */ package com.gemstone.gemfire.internal.cache; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.Operation; -import com.gemstone.gemfire.cache.Region; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.Region.Entry; -import com.gemstone.gemfire.cache.RegionShortcut; import com.gemstone.gemfire.internal.cache.LocalRegion.NonTXEntry; import com.gemstone.gemfire.internal.cache.Token.Tombstone; import com.gemstone.gemfire.internal.cache.versions.VersionSource; import com.gemstone.gemfire.internal.cache.versions.VersionStamp; import com.gemstone.gemfire.internal.cache.versions.VersionTag; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; /** * This test creates an entry and verifies if {@link UpdateOperation} applies @@ -72,8 +68,8 @@ public class UpdateVersionJUnitTest { @Test public void testUpdateVersionAfterCreate() { - - Cache cache = new CacheFactory().set("mcast-port", "0").create(); + + Cache cache = new CacheFactory().set(MCAST_PORT, "0").create(); Region region = cache.createRegionFactory(RegionShortcut.REPLICATE).create(regionName); try { @@ -124,7 +120,7 @@ public class UpdateVersionJUnitTest { @Test public void testUpdateVersionAfterUpdate() { - Cache cache = new CacheFactory().set("mcast-port", "0").create(); + Cache cache = new CacheFactory().set(MCAST_PORT, "0").create(); Region region = cache.createRegionFactory(RegionShortcut.REPLICATE).create(regionName); try { @@ -180,7 +176,7 @@ public class UpdateVersionJUnitTest { @Test public void testUpdateVersionAfterDestroy() { - Cache cache = new CacheFactory().set("mcast-port", "0").create(); + Cache cache = new CacheFactory().set(MCAST_PORT, "0").create(); Region region = cache.createRegionFactory(RegionShortcut.REPLICATE).create(regionName); try { @@ -241,8 +237,8 @@ public class UpdateVersionJUnitTest { @Test public void testUpdateVersionAfterCreateOnPR() { - - Cache cache = new CacheFactory().set("mcast-port", "0").create(); + + Cache cache = new CacheFactory().set(MCAST_PORT, "0").create(); Region region = cache.createRegionFactory(RegionShortcut.PARTITION).create(regionName); try { @@ -293,7 +289,7 @@ public class UpdateVersionJUnitTest { @Test public void testUpdateVersionAfterUpdateOnPR() { - Cache cache = new CacheFactory().set("mcast-port", "0").create(); + Cache cache = new CacheFactory().set(MCAST_PORT, "0").create(); Region region = cache.createRegionFactory(RegionShortcut.PARTITION).create(regionName); try { @@ -349,7 +345,7 @@ public class UpdateVersionJUnitTest { @Test public void testUpdateVersionAfterDestroyOnPR() { - Cache cache = new CacheFactory().set("mcast-port", "0").create(); + Cache cache = new CacheFactory().set(MCAST_PORT, "0").create(); Region region = cache.createRegionFactory(RegionShortcut.PARTITION).create(regionName); try { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorJUnitTest.java index f4a0588..8a3ba0a 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorJUnitTest.java @@ -16,33 +16,7 @@ */ package com.gemstone.gemfire.internal.cache.control; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.lang.management.ManagementFactory; -import java.lang.management.MemoryPoolMXBean; -import java.util.Properties; -import java.util.Set; - -import javax.management.ListenerNotFoundException; -import javax.management.NotificationEmitter; - -import org.apache.logging.log4j.Logger; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import util.TestException; - -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.LowMemoryException; -import com.gemstone.gemfire.cache.PartitionAttributes; -import com.gemstone.gemfire.cache.PartitionAttributesFactory; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionFactory; -import com.gemstone.gemfire.cache.Scope; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.control.ResourceManager; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; @@ -50,6 +24,23 @@ import com.gemstone.gemfire.internal.cache.control.InternalResourceManager.Resou import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import org.apache.logging.log4j.Logger; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import util.TestException; + +import javax.management.ListenerNotFoundException; +import javax.management.NotificationEmitter; +import java.lang.management.ManagementFactory; +import java.lang.management.MemoryPoolMXBean; +import java.util.Properties; +import java.util.Set; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; /** * @@ -64,7 +55,7 @@ public class MemoryMonitorJUnitTest { @Before public void setUp() throws Exception { Properties p = new Properties(); - p.setProperty("mcast-port", "0"); + p.setProperty(MCAST_PORT, "0"); this.ds = DistributedSystem.connect(p); this.cache = (GemFireCacheImpl)CacheFactory.create(this.ds); HeapMemoryMonitor.setTestDisableMemoryUpdates(true); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java index 893bebe..e8f9864 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java @@ -16,24 +16,7 @@ */ package com.gemstone.gemfire.internal.cache.control; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import java.util.Properties; - -import org.apache.logging.log4j.Logger; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.EvictionAlgorithm; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionFactory; -import com.gemstone.gemfire.cache.RegionShortcut; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.cache.EvictionAttributesImpl; @@ -42,6 +25,16 @@ import com.gemstone.gemfire.internal.cache.control.InternalResourceManager.Resou import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import org.apache.logging.log4j.Logger; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import java.util.Properties; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static org.junit.Assert.*; /** */ @@ -56,7 +49,7 @@ public class MemoryMonitorOffHeapJUnitTest { @Before public void setUp() throws Exception { Properties p = new Properties(); - p.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + p.setProperty(MCAST_PORT, "0"); p.setProperty(DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "1m"); this.ds = DistributedSystem.connect(p); this.cache = (GemFireCacheImpl) CacheFactory.create(this.ds); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java index 05febda..7e355f3 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java @@ -16,44 +16,7 @@ */ package com.gemstone.gemfire.internal.cache.control; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.spy; - -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Random; -import java.util.Set; -import java.util.TreeSet; -import java.util.concurrent.CancellationException; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.CyclicBarrier; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheLoaderException; -import com.gemstone.gemfire.cache.CacheWriterException; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.DiskStore; -import com.gemstone.gemfire.cache.DiskStoreFactory; -import com.gemstone.gemfire.cache.EntryEvent; -import com.gemstone.gemfire.cache.EvictionAction; -import com.gemstone.gemfire.cache.EvictionAttributes; -import com.gemstone.gemfire.cache.LoaderHelper; -import com.gemstone.gemfire.cache.PartitionAttributes; -import com.gemstone.gemfire.cache.PartitionAttributesFactory; -import com.gemstone.gemfire.cache.Region; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.asyncqueue.AsyncEvent; import com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener; import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue; @@ -70,26 +33,19 @@ import com.gemstone.gemfire.distributed.DistributedMember; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.internal.cache.BucketRegion; -import com.gemstone.gemfire.internal.cache.ColocationHelper; -import com.gemstone.gemfire.internal.cache.DiskStoreImpl; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.internal.cache.PRHARedundancyProvider; -import com.gemstone.gemfire.internal.cache.PartitionedRegion; -import com.gemstone.gemfire.internal.cache.PartitionedRegionDataStore; +import com.gemstone.gemfire.internal.cache.*; import com.gemstone.gemfire.internal.cache.control.InternalResourceManager.ResourceObserverAdapter; import com.gemstone.gemfire.internal.cache.partitioned.BucketCountLoadProbe; import com.gemstone.gemfire.internal.cache.partitioned.LoadProbe; -import com.gemstone.gemfire.test.dunit.Assert; -import com.gemstone.gemfire.test.dunit.AsyncInvocation; -import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.Invoke; -import com.gemstone.gemfire.test.dunit.LogWriterUtils; -import com.gemstone.gemfire.test.dunit.SerializableCallable; -import com.gemstone.gemfire.test.dunit.SerializableRunnable; -import com.gemstone.gemfire.test.dunit.VM; -import com.gemstone.gemfire.test.dunit.Wait; -import com.gemstone.gemfire.test.dunit.WaitCriterion; +import com.gemstone.gemfire.test.dunit.*; + +import java.util.*; +import java.util.concurrent.*; +import java.util.concurrent.TimeoutException; + +import static org.mockito.Matchers.*; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; /** * @@ -104,11 +60,11 @@ public class RebalanceOperationDUnitTest extends CacheTestCase { Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { InternalResourceManager.setResourceObserver(null); - System.clearProperty("gemfire.resource.manager.threads"); + System.clearProperty(DistributionConfig.GEMFIRE_PREFIX + "resource.manager.threads"); } }); InternalResourceManager.setResourceObserver(null); - System.clearProperty("gemfire.resource.manager.threads"); + System.clearProperty(DistributionConfig.GEMFIRE_PREFIX + "resource.manager.threads"); } /** @@ -796,7 +752,7 @@ public class RebalanceOperationDUnitTest extends CacheTestCase { private DistributedMember setRedundancyZone(VM vm, final String zone) { return (DistributedMember) vm.invoke(new SerializableCallable("set redundancy zone") { public Object call() { - System.setProperty("gemfire.resource.manager.threads", "2"); + System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "resource.manager.threads", "2"); Properties props = new Properties(); props.setProperty(DistributionConfig.REDUNDANCY_ZONE_NAME, zone); DistributedSystem system = getSystem(props); @@ -1247,13 +1203,13 @@ public class RebalanceOperationDUnitTest extends CacheTestCase { @Override public void run () { - System.setProperty("gemfire.LOG_REBALANCE", "true"); + System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "LOG_REBALANCE", "true"); } }); try { recoverRedundancyParallelAsyncEventQueue(true); } finally { - System.setProperty("gemfire.LOG_REBALANCE", "false"); + System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "LOG_REBALANCE", "false"); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/diskPerf/DiskRegionPersistOnlySyncJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/diskPerf/DiskRegionPersistOnlySyncJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/diskPerf/DiskRegionPersistOnlySyncJUnitTest.java index 6dd9867..f086325 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/diskPerf/DiskRegionPersistOnlySyncJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/diskPerf/DiskRegionPersistOnlySyncJUnitTest.java @@ -16,24 +16,24 @@ */ package com.gemstone.gemfire.internal.cache.diskPerf; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import java.util.Arrays; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import com.gemstone.gemfire.LogWriter; import com.gemstone.gemfire.cache.RegionAttributes; import com.gemstone.gemfire.cache.Scope; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.cache.DiskRegionHelperFactory; import com.gemstone.gemfire.internal.cache.DiskRegionProperties; import com.gemstone.gemfire.internal.cache.DiskRegionTestingBase; import com.gemstone.gemfire.internal.cache.LocalRegion; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import java.util.Arrays; + +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * Disk region perf test for Persist only with sync writes. @@ -87,8 +87,8 @@ public class DiskRegionPersistOnlySyncJUnitTest extends DiskRegionTestingBase Arrays.fill(value, (byte)77); String config = "ENTRY_SIZE=" + ENTRY_SIZE + " OP_COUNT=" + OP_COUNT + " UNIQUE_KEYS=" + UNIQUE_KEYS + " opLogEnabled=" - + !Boolean.getBoolean("gemfire.disableOpLog") + " syncWrites=" - + Boolean.getBoolean("gemfire.syncWrites"); + + !Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "disableOpLog") + " syncWrites=" + + Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "syncWrites"); if (ra.getDiskStoreName() != null) { config += " diskStoreName="+ra.getDiskStoreName(); } else { @@ -190,8 +190,8 @@ public class DiskRegionPersistOnlySyncJUnitTest extends DiskRegionTestingBase Arrays.fill(value, (byte)77); String config = "ENTRY_SIZE=" + ENTRY_SIZE + " OP_COUNT=" + OP_COUNT + " UNIQUE_KEYS=" + UNIQUE_KEYS + " opLogEnabled=" - + !Boolean.getBoolean("gemfire.disableOpLog") + " syncWrites=" - + Boolean.getBoolean("gemfire.syncWrites"); + + !Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "disableOpLog") + " syncWrites=" + + Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "syncWrites"); if (ra.getDiskStoreName() != null) { config += " diskStoreName="+ra.getDiskStoreName(); } else { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java index 5e2da16..c4392ee 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java @@ -16,26 +16,22 @@ */ package com.gemstone.gemfire.internal.cache.diskPerf; -import java.io.File; -import java.util.Properties; - +import com.gemstone.gemfire.cache.*; +import com.gemstone.gemfire.distributed.DistributedSystem; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import com.gemstone.gemfire.internal.cache.DiskStoreFactoryImpl; +import com.gemstone.gemfire.test.dunit.ThreadUtils; +import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.TestName; -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.DiskStoreFactory; -import com.gemstone.gemfire.cache.EvictionAction; -import com.gemstone.gemfire.cache.EvictionAttributes; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.internal.cache.DiskStoreFactoryImpl; -import com.gemstone.gemfire.test.dunit.ThreadUtils; -import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import java.io.File; +import java.util.Properties; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; @Category(IntegrationTest.class) public class MultiThreadedOplogPerJUnitPerformanceTest @@ -103,9 +99,9 @@ public class MultiThreadedOplogPerJUnitPerformanceTest public void testPerf() { Properties props = new Properties(); - props.setProperty("mcast-port", "0"); - props.setProperty("locators", ""); - props.setProperty("log-level", "info"); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, ""); + props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info"); DistributedSystem ds = DistributedSystem.connect(props); Cache cache = null; try { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java index 9a7fb8b..f579a93 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java @@ -16,25 +16,14 @@ */ package com.gemstone.gemfire.internal.cache.execute; -import java.util.ArrayList; -import java.util.Properties; - -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.PartitionAttributesFactory; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionFactory; -import com.gemstone.gemfire.cache.RegionShortcut; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.client.ClientCacheFactory; import com.gemstone.gemfire.cache.client.ClientRegionFactory; import com.gemstone.gemfire.cache.client.ClientRegionShortcut; -import com.gemstone.gemfire.cache.execute.Execution; -import com.gemstone.gemfire.cache.execute.Function; -import com.gemstone.gemfire.cache.execute.FunctionAdapter; -import com.gemstone.gemfire.cache.execute.FunctionContext; -import com.gemstone.gemfire.cache.execute.FunctionService; -import com.gemstone.gemfire.cache.execute.ResultCollector; +import com.gemstone.gemfire.cache.execute.*; import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.distributed.DistributedSystem; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.cache.CacheServerImpl; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; @@ -46,6 +35,12 @@ import com.gemstone.gemfire.test.dunit.DistributedTestUtils; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.VM; +import java.util.ArrayList; +import java.util.Properties; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; + @SuppressWarnings("serial") public class Bug51193DUnitTest extends DistributedTestCase { @@ -76,7 +71,7 @@ public class Bug51193DUnitTest extends DistributedTestCase { } public static void closeCache() { - System.clearProperty("gemfire.CLIENT_FUNCTION_TIMEOUT"); + System.clearProperty(DistributionConfig.GEMFIRE_PREFIX + "CLIENT_FUNCTION_TIMEOUT"); if (cache != null && !cache.isClosed()) { cache.close(); cache.getDistributedSystem().disconnect(); @@ -88,12 +83,12 @@ public class Bug51193DUnitTest extends DistributedTestCase { Integer timeout) throws Exception { try { if (timeout > 0) { - System.setProperty("gemfire.CLIENT_FUNCTION_TIMEOUT", + System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "CLIENT_FUNCTION_TIMEOUT", String.valueOf(timeout)); } Properties props = new Properties(); - props.setProperty("locators", ""); - props.setProperty("mcast-port", "0"); + props.setProperty(LOCATORS, ""); + props.setProperty(MCAST_PORT, "0"); // props.setProperty("statistic-archive-file", "client_" + OSProcess.getId() // + ".gfs"); // props.setProperty("statistic-sampling-enabled", "true"); @@ -109,7 +104,7 @@ public class Bug51193DUnitTest extends DistributedTestCase { crf.create(REGION_NAME); } finally { - System.clearProperty("gemfire.CLIENT_FUNCTION_TIMEOUT"); + System.clearProperty(DistributionConfig.GEMFIRE_PREFIX + "CLIENT_FUNCTION_TIMEOUT"); } } @@ -117,7 +112,7 @@ public class Bug51193DUnitTest extends DistributedTestCase { public static Integer createServerCache(Boolean createPR) throws Exception { Properties props = new Properties(); - props.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); + props.setProperty(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort() + "]"); Bug51193DUnitTest test = new Bug51193DUnitTest("Bug51193DUnitTest"); DistributedSystem ds = test.getSystem(props); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java index fef088f..fc1cd6f 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java @@ -16,35 +16,13 @@ */ package com.gemstone.gemfire.internal.cache.execute; -import java.io.IOException; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Properties; -import java.util.Set; - -import org.junit.experimental.categories.Category; - -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.Scope; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.client.Pool; import com.gemstone.gemfire.cache.client.PoolManager; -import com.gemstone.gemfire.cache.execute.Execution; -import com.gemstone.gemfire.cache.execute.Function; -import com.gemstone.gemfire.cache.execute.FunctionAdapter; -import com.gemstone.gemfire.cache.execute.FunctionContext; -import com.gemstone.gemfire.cache.execute.FunctionInvocationTargetException; -import com.gemstone.gemfire.cache.execute.FunctionService; -import com.gemstone.gemfire.cache.execute.ResultCollector; +import com.gemstone.gemfire.cache.execute.*; import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.distributed.DistributedSystem; +import com.gemstone.gemfire.distributed.SystemConfigurationProperties; import com.gemstone.gemfire.distributed.internal.DM; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; @@ -56,17 +34,16 @@ import com.gemstone.gemfire.internal.cache.functions.TestFunction; import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil; import com.gemstone.gemfire.security.templates.DummyAuthenticator; import com.gemstone.gemfire.security.templates.UserPasswordAuthInit; -import com.gemstone.gemfire.test.dunit.Assert; -import com.gemstone.gemfire.test.dunit.AsyncInvocation; -import com.gemstone.gemfire.test.dunit.DistributedTestCase; -import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.dunit.LogWriterUtils; -import com.gemstone.gemfire.test.dunit.ThreadUtils; -import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.VM; -import com.gemstone.gemfire.test.dunit.Wait; -import com.gemstone.gemfire.test.dunit.WaitCriterion; +import com.gemstone.gemfire.test.dunit.*; import com.gemstone.gemfire.test.junit.categories.FlakyTest; +import org.junit.experimental.categories.Category; + +import java.io.IOException; +import java.io.Serializable; +import java.util.*; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; public class DistributedRegionFunctionExecutionDUnitTest extends DistributedTestCase { @@ -824,7 +801,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends DistributedTest assertNotNull(ds); ds.disconnect(); Properties props = new Properties(); - props.setProperty("mcast-port", "0"); + props.setProperty(MCAST_PORT, "0"); ds = (InternalDistributedSystem)DistributedSystem.connect(props); DM dm = ds.getDistributionManager(); @@ -912,25 +889,25 @@ public class DistributedRegionFunctionExecutionDUnitTest extends DistributedTest public static void createCacheInVm_41367() { Properties props = new Properties(); - props.put(DistributionConfig.NAME_NAME, "SecurityServer"); - props.put("security-client-authenticator", DummyAuthenticator.class.getName() + ".create"); + props.put(SystemConfigurationProperties.NAME, "SecurityServer"); + props.put(DistributionConfig.SECURITY_CLIENT_AUTHENTICATOR_NAME, DummyAuthenticator.class.getName() + ".create"); new DistributedRegionFunctionExecutionDUnitTest("temp").createCache(props); } public static void createCacheInClientVm() { Properties props = new Properties(); - props.put("mcast-port", "0"); - props.put("locators", ""); + props.put(MCAST_PORT, "0"); + props.put(LOCATORS, ""); new DistributedRegionFunctionExecutionDUnitTest("temp") .createCache(new Properties()); } public static void createCacheInClientVm_41367() { Properties props = new Properties(); - props.put("mcast-port", "0"); - props.put("locators", ""); - props.put(DistributionConfig.NAME_NAME, "SecurityClient"); - props.put("security-client-auth-init", UserPasswordAuthInit.class.getName() + ".create"); + props.put(MCAST_PORT, "0"); + props.put(LOCATORS, ""); + props.put(SystemConfigurationProperties.NAME, "SecurityClient"); + props.put(DistributionConfig.SECURITY_CLIENT_AUTH_INIT_NAME, UserPasswordAuthInit.class.getName() + ".create"); props.put("security-username", "reader1"); props.put("security-password", "reader1"); new DistributedRegionFunctionExecutionDUnitTest("temp").createCache(props); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java index 6db487b..1ff0a50 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java @@ -16,49 +16,27 @@ */ package com.gemstone.gemfire.internal.cache.execute; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.Scope; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.client.Pool; import com.gemstone.gemfire.cache.client.PoolManager; -import com.gemstone.gemfire.cache.execute.Execution; -import com.gemstone.gemfire.cache.execute.Function; -import com.gemstone.gemfire.cache.execute.FunctionAdapter; -import com.gemstone.gemfire.cache.execute.FunctionContext; -import com.gemstone.gemfire.cache.execute.FunctionException; -import com.gemstone.gemfire.cache.execute.FunctionService; -import com.gemstone.gemfire.cache.execute.ResultCollector; +import com.gemstone.gemfire.cache.execute.*; import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.distributed.DistributedMember; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.cache.PartitionAttributesImpl; import com.gemstone.gemfire.internal.cache.PartitionedRegion; import com.gemstone.gemfire.internal.cache.PartitionedRegionTestHelper; import com.gemstone.gemfire.internal.cache.functions.TestFunction; import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil; -import com.gemstone.gemfire.test.dunit.Assert; -import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.LogWriterUtils; -import com.gemstone.gemfire.test.dunit.SerializableCallable; -import com.gemstone.gemfire.test.dunit.VM; -import com.gemstone.gemfire.test.dunit.Wait; -import com.gemstone.gemfire.test.dunit.WaitCriterion; +import com.gemstone.gemfire.test.dunit.*; + +import java.io.IOException; +import java.util.*; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; /* * This is DUnite Test to test the Function Execution stats under various @@ -422,8 +400,8 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase{ public Object call() throws Exception { try { Properties props = new Properties(); - props.put("mcast-port", "0"); - props.put("locators", ""); + props.put(MCAST_PORT, "0"); + props.put(LOCATORS, ""); DistributedSystem ds = getSystem(props); assertNotNull(ds); ds.disconnect(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java index ada68c9..c37e01f 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java @@ -16,27 +16,8 @@ */ package com.gemstone.gemfire.internal.cache.execute; -import java.lang.reflect.Constructor; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.TimeUnit; - -import com.gemstone.gemfire.cache.CacheClosedException; import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.execute.Execution; -import com.gemstone.gemfire.cache.execute.Function; -import com.gemstone.gemfire.cache.execute.FunctionAdapter; -import com.gemstone.gemfire.cache.execute.FunctionContext; -import com.gemstone.gemfire.cache.execute.FunctionException; -import com.gemstone.gemfire.cache.execute.FunctionInvocationTargetException; -import com.gemstone.gemfire.cache.execute.FunctionService; -import com.gemstone.gemfire.cache.execute.ResultCollector; +import com.gemstone.gemfire.cache.execute.*; import com.gemstone.gemfire.cache30.CacheTestCase; import com.gemstone.gemfire.distributed.DistributedMember; import com.gemstone.gemfire.distributed.DistributedSystem; @@ -48,12 +29,13 @@ import com.gemstone.gemfire.i18n.LogWriterI18n; import com.gemstone.gemfire.internal.ClassBuilder; import com.gemstone.gemfire.internal.cache.functions.TestFunction; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.test.dunit.Assert; -import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.LogWriterUtils; -import com.gemstone.gemfire.test.dunit.SerializableCallable; -import com.gemstone.gemfire.test.dunit.SerializableRunnable; -import com.gemstone.gemfire.test.dunit.VM; +import com.gemstone.gemfire.test.dunit.*; + +import java.lang.reflect.Constructor; +import java.util.*; +import java.util.concurrent.TimeUnit; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; public class MemberFunctionExecutionDUnitTest extends CacheTestCase { private static final String TEST_FUNCTION6 = TestFunction.TEST_FUNCTION6; @@ -348,7 +330,7 @@ public class MemberFunctionExecutionDUnitTest extends CacheTestCase { assertNotNull(ds); ds.disconnect(); Properties props = new Properties(); - props.setProperty("mcast-port", "0"); + props.setProperty(MCAST_PORT, "0"); ds = (InternalDistributedSystem)DistributedSystem.connect(props); DM dm = ds.getDistributionManager(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java index 0d65dbb..4ad95fc 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java @@ -16,42 +16,24 @@ */ package com.gemstone.gemfire.internal.cache.execute; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Properties; - import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheClosedException; import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.RegionShortcut; import com.gemstone.gemfire.cache.client.ClientCache; import com.gemstone.gemfire.cache.client.ClientCacheFactory; -import com.gemstone.gemfire.cache.client.ClientRegionShortcut; -import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.cache.client.PoolFactory; -import com.gemstone.gemfire.cache.client.PoolManager; -import com.gemstone.gemfire.cache.execute.Execution; -import com.gemstone.gemfire.cache.execute.FunctionAdapter; -import com.gemstone.gemfire.cache.execute.FunctionContext; -import com.gemstone.gemfire.cache.execute.FunctionException; -import com.gemstone.gemfire.cache.execute.FunctionInvocationTargetException; -import com.gemstone.gemfire.cache.execute.FunctionService; +import com.gemstone.gemfire.cache.execute.*; import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.Locator; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.internal.AvailablePortHelper; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.test.dunit.DistributedTestCase; -import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.dunit.Invoke; -import com.gemstone.gemfire.test.dunit.LogWriterUtils; -import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.SerializableCallable; -import com.gemstone.gemfire.test.dunit.VM; -import com.gemstone.gemfire.test.dunit.Wait; -import com.gemstone.gemfire.test.dunit.WaitCriterion; +import com.gemstone.gemfire.test.dunit.*; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Properties; /** * @@ -112,7 +94,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { @Override public Object call() throws Exception { Properties props = new Properties(); - props.put("groups", groups); + props.put(DistributionConfig.GROUPS_NAME, groups); if (regionName != null) { Cache c = null; try { @@ -688,7 +670,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolLocator(hostName, locatorPort); ccf.setPoolServerGroup("mg"); - ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); + ccf.set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); ClientCache c = ccf.create(); c.getLogger().info("SWAP:invoking function from client on g0"); @@ -786,7 +768,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolLocator(hostName, locatorPort); ccf.setPoolServerGroup("mg"); - ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); + ccf.set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); ClientCache c = ccf.create(); c.getLogger().info("SWAP:invoking function from client on g0"); @@ -863,7 +845,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolLocator(hostName, locatorPort); ccf.setPoolServerGroup("mg"); - ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); + ccf.set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); ClientCache c = ccf.create(); IgnoredException ex = IgnoredException.addIgnoredException("No member found"); @@ -943,7 +925,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolLocator(hostName, locatorPort); ccf.setPoolServerGroup("mg"); - ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); + ccf.set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); ClientCache c = ccf.create(); IgnoredException expected = IgnoredException.addIgnoredException("No member found"); @@ -1020,7 +1002,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolLocator(hostName, locatorPort); ccf.setPoolServerGroup("mg"); - ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); + ccf.set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); ClientCache c = ccf.create(); Execution e = InternalFunctionService.onServers(c, "g1"); @@ -1069,7 +1051,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolLocator(hostName, locatorPort); ccf.setPoolServerGroup("mg"); - ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); + ccf.set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); ClientCache c = ccf.create(); Execution e = InternalFunctionService.onServers(c, "g1"); @@ -1118,7 +1100,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolLocator(hostName, locatorPort); ccf.setPoolServerGroup("mg"); - ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); + ccf.set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); ClientCache c = ccf.create(); Execution e = InternalFunctionService.onServers(c, "g1"); @@ -1185,7 +1167,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolLocator(hostName, locatorPort); ccf.setPoolServerGroup("mg"); - ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); + ccf.set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); ClientCache c = ccf.create(); c.getLogger().info("SWAP:invoking function from client on g0"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java index c3cc81a..cf22c97 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java @@ -16,18 +16,7 @@ */ package com.gemstone.gemfire.internal.cache.execute; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; - -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.PartitionAttributesFactory; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.client.Pool; import com.gemstone.gemfire.cache.client.PoolManager; import com.gemstone.gemfire.cache.execute.Execution; @@ -44,16 +33,16 @@ import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.cache.LocalRegion; import com.gemstone.gemfire.internal.cache.functions.TestFunction; import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil; -import com.gemstone.gemfire.test.dunit.Assert; -import com.gemstone.gemfire.test.dunit.AsyncInvocation; -import com.gemstone.gemfire.test.dunit.DistributedTestUtils; -import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.dunit.LogWriterUtils; -import com.gemstone.gemfire.test.dunit.NetworkUtils; -import com.gemstone.gemfire.test.dunit.SerializableRunnable; -import com.gemstone.gemfire.test.dunit.ThreadUtils; -import com.gemstone.gemfire.test.dunit.VM; +import com.gemstone.gemfire.test.dunit.*; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends PRClientServerTestBase { @@ -399,7 +388,7 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends "PRClientServerRegionFunctionExecutionFailoverDUnitTest"); Properties props = new Properties(); props = new Properties(); - props.setProperty("locators", locator); + props.setProperty(LOCATORS, locator); DistributedSystem ds = test.getSystem(props); cache = new CacheFactory(props).create(ds); @@ -433,8 +422,8 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends public static void createClientWithLocator(String host, int port0) { Properties props = new Properties(); props = new Properties(); - props.setProperty("mcast-port", "0"); - props.setProperty("locators", ""); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, ""); CacheTestCase test = new PRClientServerRegionFunctionExecutionFailoverDUnitTest( "PRClientServerRegionFunctionExecutionFailoverDUnitTest"); DistributedSystem ds = test.getSystem(props); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java index d69595a..7b56a60 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java @@ -16,49 +16,27 @@ */ package com.gemstone.gemfire.internal.cache.execute; -import java.io.IOException; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Properties; -import java.util.Set; - -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.EntryOperation; -import com.gemstone.gemfire.cache.PartitionAttributes; -import com.gemstone.gemfire.cache.PartitionAttributesFactory; -import com.gemstone.gemfire.cache.PartitionResolver; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.Scope; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.client.Pool; import com.gemstone.gemfire.cache.client.PoolManager; import com.gemstone.gemfire.cache.client.internal.PoolImpl; -import com.gemstone.gemfire.cache.execute.Execution; import com.gemstone.gemfire.cache.execute.Function; import com.gemstone.gemfire.cache.execute.FunctionService; import com.gemstone.gemfire.cache.execute.ResultCollector; import com.gemstone.gemfire.cache.server.CacheServer; -import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.cache30.CacheTestCase; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.cache.functions.TestFunction; import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil; -import com.gemstone.gemfire.test.dunit.Assert; -import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.LogWriterUtils; -import com.gemstone.gemfire.test.dunit.NetworkUtils; -import com.gemstone.gemfire.test.dunit.SerializableRunnable; -import com.gemstone.gemfire.test.dunit.VM; -import com.gemstone.gemfire.test.dunit.Wait; -import com.gemstone.gemfire.test.dunit.WaitCriterion; +import com.gemstone.gemfire.test.dunit.*; + +import java.io.IOException; +import java.io.Serializable; +import java.util.*; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; public class PRClientServerTestBase extends CacheTestCase { @@ -591,8 +569,8 @@ public class PRClientServerTestBase extends CacheTestCase { server3.invoke(() -> PRClientServerTestBase.createCacheInVm( props )); Properties props2 = new Properties(); - props2.setProperty("mcast-port", "0"); - props2.setProperty("locators", ""); + props2.setProperty(MCAST_PORT, "0"); + props2.setProperty(LOCATORS, ""); client.invoke(() -> PRClientServerTestBase.createCacheInVm( props2 )); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRCustomPartitioningDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRCustomPartitioningDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRCustomPartitioningDUnitTest.java index 12a143d..9462fab 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRCustomPartitioningDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRCustomPartitioningDUnitTest.java @@ -21,28 +21,8 @@ package com.gemstone.gemfire.internal.cache.execute; * for put and get functionality in case of Custom Partitioning. */ -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.Iterator; -import java.util.Properties; -import java.util.Set; - import com.gemstone.gemfire.DataSerializable; -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheException; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.EntryOperation; -import com.gemstone.gemfire.cache.PartitionAttributes; -import com.gemstone.gemfire.cache.PartitionAttributesFactory; -import com.gemstone.gemfire.cache.PartitionResolver; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.ReplyException; @@ -51,11 +31,13 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegion; import com.gemstone.gemfire.internal.cache.PartitionedRegionDUnitTestCase; import com.gemstone.gemfire.internal.cache.PartitionedRegionDataStore.BucketVisitor; import com.gemstone.gemfire.internal.cache.xmlcache.Declarable2; -import com.gemstone.gemfire.test.dunit.Assert; -import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.LogWriterUtils; -import com.gemstone.gemfire.test.dunit.SerializableRunnable; -import com.gemstone.gemfire.test.dunit.VM; +import com.gemstone.gemfire.test.dunit.*; + +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; +import java.io.Serializable; +import java.util.*; public class PRCustomPartitioningDUnitTest extends PartitionedRegionDUnitTestCase { @@ -86,7 +68,7 @@ public class PRCustomPartitioningDUnitTest extends public static void createCacheInVm() throws Exception{ Properties props = new Properties(); - //props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + //props.setProperty(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "0"); //props.setProperty(DistributionConfig.LOCATORS_NAME, ""); new PRCustomPartitioningDUnitTest("temp").createCache(props); }