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 47C99200B27 for ; Wed, 8 Jun 2016 02:05:37 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 45DE3160A60; Wed, 8 Jun 2016 00:05:37 +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 BDD64160A5D for ; Wed, 8 Jun 2016 02:05:34 +0200 (CEST) Received: (qmail 11701 invoked by uid 500); 8 Jun 2016 00:05:33 -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 11692 invoked by uid 99); 8 Jun 2016 00:05:33 -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:33 +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 40AECC0D08 for ; Wed, 8 Jun 2016 00:05:33 +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 xLJgWSUJzQj5 for ; Wed, 8 Jun 2016 00:04:58 +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 770B160D53 for ; Wed, 8 Jun 2016 00:04:40 +0000 (UTC) Received: (qmail 3485 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 4874BE0200; 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:05:00 -0000 Message-Id: <694f40c1c8be40ff9c38b7da26117694@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [23/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:37 -0000 http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexOnEntrySetJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexOnEntrySetJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexOnEntrySetJUnitTest.java index e375b90..929b47f 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexOnEntrySetJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexOnEntrySetJUnitTest.java @@ -16,31 +16,22 @@ */ package com.gemstone.gemfire.cache.query.functional; -import java.text.ParseException; -import java.util.Collection; -import java.util.Iterator; - +import com.gemstone.gemfire.cache.*; +import com.gemstone.gemfire.cache.query.*; +import com.gemstone.gemfire.cache.query.internal.QueryObserverAdapter; +import com.gemstone.gemfire.cache.query.internal.QueryObserverHolder; +import com.gemstone.gemfire.cache.query.internal.index.IndexManager; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import org.junit.After; import org.junit.Assert; 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.DataPolicy; -import com.gemstone.gemfire.cache.PartitionAttributesFactory; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.query.CacheUtils; -import com.gemstone.gemfire.cache.query.Index; -import com.gemstone.gemfire.cache.query.QueryService; -import com.gemstone.gemfire.cache.query.SelectResults; -import com.gemstone.gemfire.cache.query.Struct; -import com.gemstone.gemfire.cache.query.internal.QueryObserverAdapter; -import com.gemstone.gemfire.cache.query.internal.QueryObserverHolder; -import com.gemstone.gemfire.cache.query.internal.index.IndexManager; -import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import java.text.ParseException; +import java.util.Collection; +import java.util.Iterator; @Category(IntegrationTest.class) public class IndexOnEntrySetJUnitTest { @@ -51,8 +42,8 @@ public class IndexOnEntrySetJUnitTest { private String newValue = "NEW VALUE"; @Before - public void setUp() throws Exception { - System.setProperty("gemfire.Query.VERBOSE", "true"); + public void setUp() throws Exception { + System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "Query.VERBOSE", "true"); CacheUtils.startCache(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MultiRegionIndexUsageJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MultiRegionIndexUsageJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MultiRegionIndexUsageJUnitTest.java index 4b6071c..af66b86 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MultiRegionIndexUsageJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MultiRegionIndexUsageJUnitTest.java @@ -21,42 +21,24 @@ */ package com.gemstone.gemfire.cache.query.functional; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Properties; -import java.util.Set; - -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.Region; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.query.CacheUtils; -import com.gemstone.gemfire.cache.query.Index; -import com.gemstone.gemfire.cache.query.IndexType; -import com.gemstone.gemfire.cache.query.Query; -import com.gemstone.gemfire.cache.query.QueryService; -import com.gemstone.gemfire.cache.query.SelectResults; -import com.gemstone.gemfire.cache.query.data.City; -import com.gemstone.gemfire.cache.query.data.Country; -import com.gemstone.gemfire.cache.query.data.District; -import com.gemstone.gemfire.cache.query.data.State; -import com.gemstone.gemfire.cache.query.data.Village; +import com.gemstone.gemfire.cache.*; +import com.gemstone.gemfire.cache.query.*; +import com.gemstone.gemfire.cache.query.data.*; import com.gemstone.gemfire.cache.query.internal.QueryObserverAdapter; import com.gemstone.gemfire.cache.query.internal.QueryObserverHolder; import com.gemstone.gemfire.cache.query.types.StructType; import com.gemstone.gemfire.distributed.DistributedSystem; 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.*; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; //TODO:TEST clean this up and add assertions /** @@ -131,11 +113,8 @@ public class MultiRegionIndexUsageJUnitTest { @Before public void setUp() throws Exception { Properties props = new Properties(); - props.setProperty("mcast-port", "0"); + props.setProperty(MCAST_PORT, "0"); ds = DistributedSystem.connect(props); - // if(!cache.isClosed()){ - // CacheUtils.log("111111111111 CACHE IS ALREADY OPEN 11111111111111"); - // } cache = CacheFactory.create(ds); /* create region containing Country objects */ AttributesFactory factory = new AttributesFactory(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NegativeNumberQueriesJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NegativeNumberQueriesJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NegativeNumberQueriesJUnitTest.java index 7111997..c202cc8 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NegativeNumberQueriesJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NegativeNumberQueriesJUnitTest.java @@ -22,27 +22,19 @@ package com.gemstone.gemfire.cache.query.functional; -import java.util.Properties; - +import com.gemstone.gemfire.cache.*; +import com.gemstone.gemfire.cache.query.*; +import com.gemstone.gemfire.cache.query.data.Numbers; +import com.gemstone.gemfire.distributed.DistributedSystem; +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.Region; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.query.CacheUtils; -import com.gemstone.gemfire.cache.query.Index; -import com.gemstone.gemfire.cache.query.IndexType; -import com.gemstone.gemfire.cache.query.Query; -import com.gemstone.gemfire.cache.query.QueryService; -import com.gemstone.gemfire.cache.query.SelectResults; -import com.gemstone.gemfire.cache.query.data.Numbers; -import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import java.util.Properties; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; // TODO:TEST clean this up and add assertions /** @@ -61,7 +53,7 @@ public class NegativeNumberQueriesJUnitTest { @Before public void setUp() throws Exception { Properties props = new Properties(); - props.setProperty("mcast-port", "0"); + props.setProperty(MCAST_PORT, "0"); ds = DistributedSystem.connect(props); cache = CacheFactory.create(ds); /* create region with to contain Portfolio objects */ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NumericQueryJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NumericQueryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NumericQueryJUnitTest.java index 3487ab9..017816d 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NumericQueryJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NumericQueryJUnitTest.java @@ -16,6 +16,21 @@ */ package com.gemstone.gemfire.cache.query.functional; +import com.gemstone.gemfire.cache.*; +import com.gemstone.gemfire.cache.query.CacheUtils; +import com.gemstone.gemfire.cache.query.Index; +import com.gemstone.gemfire.cache.query.QueryService; +import com.gemstone.gemfire.cache.query.SelectResults; +import com.gemstone.gemfire.cache.query.data.Numbers; +import com.gemstone.gemfire.cache.query.internal.QueryObserverAdapter; +import com.gemstone.gemfire.cache.query.internal.QueryObserverHolder; +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.Test; +import org.junit.experimental.categories.Category; + import java.math.BigDecimal; import java.math.BigInteger; import java.text.ParseException; @@ -24,30 +39,8 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import static org.junit.Assert.*; -import junit.framework.TestCase; - -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.Cache; -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.query.CacheUtils; -import com.gemstone.gemfire.cache.query.Index; -import com.gemstone.gemfire.cache.query.QueryService; -import com.gemstone.gemfire.cache.query.SelectResults; -import com.gemstone.gemfire.cache.query.data.Numbers; -import com.gemstone.gemfire.cache.query.internal.QueryObserverAdapter; -import com.gemstone.gemfire.cache.query.internal.QueryObserverHolder; -import com.gemstone.gemfire.test.junit.categories.IntegrationTest; - /** * * @@ -69,7 +62,7 @@ public class NumericQueryJUnitTest { @Before public void setUp() throws Exception { - System.setProperty("gemfire.Query.VERBOSE", "true"); + System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "Query.VERBOSE", "true"); CacheUtils.startCache(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/QueryUndefinedJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/QueryUndefinedJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/QueryUndefinedJUnitTest.java index f77c51a..aa3a134 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/QueryUndefinedJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/QueryUndefinedJUnitTest.java @@ -19,17 +19,6 @@ */ package com.gemstone.gemfire.cache.query.functional; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - -import java.io.Serializable; -import java.text.ParseException; - -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.Region; import com.gemstone.gemfire.cache.RegionShortcut; @@ -37,8 +26,19 @@ import com.gemstone.gemfire.cache.query.CacheUtils; import com.gemstone.gemfire.cache.query.Query; import com.gemstone.gemfire.cache.query.QueryService; import com.gemstone.gemfire.cache.query.SelectResults; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.pdx.JSONFormatter; 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.io.Serializable; +import java.text.ParseException; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; @Category(IntegrationTest.class) public class QueryUndefinedJUnitTest implements Serializable { @@ -47,7 +47,7 @@ public class QueryUndefinedJUnitTest implements Serializable { @Before public void setUp() throws Exception { - System.setProperty("gemfire.Query.VERBOSE", "true"); + System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "Query.VERBOSE", "true"); CacheUtils.startCache(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/SelectToDateJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/SelectToDateJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/SelectToDateJUnitTest.java index 40e1264..07293b9 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/SelectToDateJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/SelectToDateJUnitTest.java @@ -19,32 +19,25 @@ */ package com.gemstone.gemfire.cache.query.functional; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; - -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Iterator; - -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.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.query.CacheUtils; import com.gemstone.gemfire.cache.query.Query; import com.gemstone.gemfire.cache.query.QueryService; import com.gemstone.gemfire.cache.query.SelectResults; import com.gemstone.gemfire.cache.query.data.Portfolio; +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.Test; +import org.junit.experimental.categories.Category; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Iterator; + +import static org.junit.Assert.*; @Category(IntegrationTest.class) public class SelectToDateJUnitTest { @@ -59,7 +52,7 @@ public class SelectToDateJUnitTest { @Before public void setUp() throws Exception { - System.setProperty("gemfire.Query.VERBOSE", "true"); + System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "Query.VERBOSE", "true"); CacheUtils.startCache(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java index 8c3d09b..2b0df2e 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java @@ -19,23 +19,17 @@ */ package com.gemstone.gemfire.cache.query.internal.index; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; - -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.Region; -import com.gemstone.gemfire.cache.RegionFactory; -import com.gemstone.gemfire.cache.RegionShortcut; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.query.data.Portfolio; import com.gemstone.gemfire.cache.query.internal.index.IndexManager.IndexUpdaterThread; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.logging.LoggingThreadGroup; 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.*; /** * Test create a region (Replicated OR Partitioned) and sets index maintenance @@ -53,7 +47,7 @@ public class AsyncIndexUpdaterThreadShutdownJUnitTest { @Test public void testAsyncIndexUpdaterThreadShutdownForRR() { - Cache cache = new CacheFactory().set("mcast-port", "0").create(); + Cache cache = new CacheFactory().set(MCAST_PORT, "0").create(); RegionFactory rf = cache.createRegionFactory(RegionShortcut.REPLICATE); rf.setIndexMaintenanceSynchronous(false); @@ -88,7 +82,7 @@ public class AsyncIndexUpdaterThreadShutdownJUnitTest { @Test public void testAsyncIndexUpdaterThreadShutdownForPR() { - Cache cache = new CacheFactory().set("mcast-port", "0").create(); + Cache cache = new CacheFactory().set(MCAST_PORT, "0").create(); RegionFactory rf = cache.createRegionFactory(RegionShortcut.PARTITION); rf.setIndexMaintenanceSynchronous(false); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java index cb32555..49270bc 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java @@ -19,31 +19,28 @@ */ package com.gemstone.gemfire.cache.query.internal.index; -import java.util.concurrent.CyclicBarrier; - import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.query.Index; import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.query.CacheUtils; +import com.gemstone.gemfire.cache.query.Index; import com.gemstone.gemfire.cache.query.IndexType; import com.gemstone.gemfire.cache.query.QueryService; import com.gemstone.gemfire.cache.query.data.Portfolio; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.dunit.Wait; import com.gemstone.gemfire.test.dunit.WaitCriterion; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; - -import java.util.HashSet; -import java.util.Set; - import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -import static org.junit.Assert.*; +import java.util.HashSet; +import java.util.Set; +import java.util.concurrent.CyclicBarrier; -import junit.framework.TestCase; +import static org.junit.Assert.assertFalse; /** * @@ -95,8 +92,8 @@ public class AsynchIndexMaintenanceJUnitTest { @Test public void testIndexMaintenanceBasedOnThreshhold() throws Exception { - System.getProperties().put("gemfire.AsynchIndexMaintenanceThreshold", "50"); - System.getProperties().put("gemfire.AsynchIndexMaintenanceInterval", "0"); + System.getProperties().put(DistributionConfig.GEMFIRE_PREFIX + "AsynchIndexMaintenanceThreshold", "50"); + System.getProperties().put(DistributionConfig.GEMFIRE_PREFIX + "AsynchIndexMaintenanceInterval", "0"); final Index ri = qs.createIndex("statusIndex", IndexType.FUNCTIONAL, "p.getID", "/portfolio p"); for( int i=0; i< 49; ++i) { @@ -118,8 +115,8 @@ public class AsynchIndexMaintenanceJUnitTest { @Test public void testIndexMaintenanceBasedOnTimeInterval() throws Exception { - System.getProperties().put("gemfire.AsynchIndexMaintenanceThreshold", "-1"); - System.getProperties().put("gemfire.AsynchIndexMaintenanceInterval", "10000"); + System.getProperties().put(DistributionConfig.GEMFIRE_PREFIX + "AsynchIndexMaintenanceThreshold", "-1"); + System.getProperties().put(DistributionConfig.GEMFIRE_PREFIX + "AsynchIndexMaintenanceInterval", "10000"); final Index ri = (Index) qs.createIndex("statusIndex", IndexType.FUNCTIONAL, "p.getID", "/portfolio p"); @@ -166,8 +163,8 @@ public class AsynchIndexMaintenanceJUnitTest { @Test public void testIndexMaintenanceBasedOnThresholdAsZero() throws Exception { - System.getProperties().put("gemfire.AsynchIndexMaintenanceThreshold", "0"); - System.getProperties().put("gemfire.AsynchIndexMaintenanceInterval", "60000"); + System.getProperties().put(DistributionConfig.GEMFIRE_PREFIX + "AsynchIndexMaintenanceThreshold", "0"); + System.getProperties().put(DistributionConfig.GEMFIRE_PREFIX + "AsynchIndexMaintenanceInterval", "60000"); final Index ri = (Index) qs.createIndex("statusIndex", IndexType.FUNCTIONAL, "p.getID", "/portfolio p"); for( int i=0; i<3 ; ++i) { @@ -188,8 +185,8 @@ public class AsynchIndexMaintenanceJUnitTest { @Test public void testNoIndexMaintenanceBasedOnNegativeThresholdAndZeroSleepTime() throws Exception { - System.getProperties().put("gemfire.AsynchIndexMaintenanceThreshold", "-1"); - System.getProperties().put("gemfire.AsynchIndexMaintenanceInterval", "0"); + System.getProperties().put(DistributionConfig.GEMFIRE_PREFIX + "AsynchIndexMaintenanceThreshold", "-1"); + System.getProperties().put(DistributionConfig.GEMFIRE_PREFIX + "AsynchIndexMaintenanceInterval", "0"); Index ri = (Index) qs.createIndex("statusIndex", IndexType.FUNCTIONAL, "p.getID", "/portfolio p"); @@ -206,8 +203,8 @@ public class AsynchIndexMaintenanceJUnitTest { @Test public void testConcurrentIndexMaintenanceForNoDeadlocks() throws Exception { - System.getProperties().put("gemfire.AsynchIndexMaintenanceThreshold", "700"); - System.getProperties().put("gemfire.AsynchIndexMaintenanceInterval", "500"); + System.getProperties().put(DistributionConfig.GEMFIRE_PREFIX + "AsynchIndexMaintenanceThreshold", "700"); + System.getProperties().put(DistributionConfig.GEMFIRE_PREFIX + "AsynchIndexMaintenanceInterval", "500"); qs.createIndex("statusIndex", IndexType.FUNCTIONAL, "p.getID", "/portfolio p"); final int TOTAL_THREADS = 25; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CompactRangeIndexIndexMapJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CompactRangeIndexIndexMapJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CompactRangeIndexIndexMapJUnitTest.java index f4e68c5..3ad2e82 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CompactRangeIndexIndexMapJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CompactRangeIndexIndexMapJUnitTest.java @@ -16,30 +16,22 @@ */ package com.gemstone.gemfire.cache.query.internal.index; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.text.ParseException; -import java.util.HashMap; - +import com.gemstone.gemfire.cache.*; +import com.gemstone.gemfire.cache.query.*; +import com.gemstone.gemfire.cache.query.data.Portfolio; +import com.gemstone.gemfire.cache.query.data.Position; +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.Test; import org.junit.experimental.categories.Category; -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.query.CacheUtils; -import com.gemstone.gemfire.cache.query.Index; -import com.gemstone.gemfire.cache.query.Query; -import com.gemstone.gemfire.cache.query.QueryService; -import com.gemstone.gemfire.cache.query.SelectResults; -import com.gemstone.gemfire.cache.query.data.Portfolio; -import com.gemstone.gemfire.cache.query.data.Position; -import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import java.text.ParseException; +import java.util.HashMap; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; @Category(IntegrationTest.class) public class CompactRangeIndexIndexMapJUnitTest { @@ -47,13 +39,13 @@ public class CompactRangeIndexIndexMapJUnitTest { @Before public void setUp() throws Exception { - System.setProperty("gemfire.Query.VERBOSE", "true"); + System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "Query.VERBOSE", "true"); CacheUtils.startCache(); } @After public void tearDown() throws Exception { - System.setProperty("gemfire.Query.VERBOSE", "false"); + System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "Query.VERBOSE", "false"); CacheUtils.closeCache(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CompactRangeIndexJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CompactRangeIndexJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CompactRangeIndexJUnitTest.java index 4550e82..3a03cea 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CompactRangeIndexJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CompactRangeIndexJUnitTest.java @@ -16,26 +16,6 @@ */ package com.gemstone.gemfire.cache.query.internal.index; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - -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.Region; import com.gemstone.gemfire.cache.query.Index; import com.gemstone.gemfire.cache.query.QueryService; @@ -46,6 +26,18 @@ import com.gemstone.gemfire.cache.query.internal.DefaultQuery; import com.gemstone.gemfire.cache.query.internal.DefaultQuery.TestHook; import com.gemstone.gemfire.internal.cache.persistence.query.CloseableIterator; 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 util.TestException; + +import java.util.*; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static org.junit.Assert.*; /** * @@ -61,7 +53,7 @@ public class CompactRangeIndexJUnitTest { System.setProperty("index_elemarray_threshold", "3"); utils = new QueryTestUtils(); Properties props = new Properties(); - props.setProperty("mcast-port", "0"); + props.setProperty(MCAST_PORT, "0"); utils.initializeQueryMap(); utils.createCache(props); utils.createReplicateRegion("exampleRegion"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java index 6a49628..de87304 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java @@ -19,15 +19,7 @@ */ package com.gemstone.gemfire.cache.query.internal.index; -import java.util.Collection; - -import org.junit.experimental.categories.Category; - -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheException; -import com.gemstone.gemfire.cache.CacheExistsException; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.Region; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.query.Index; import com.gemstone.gemfire.cache.query.IndexStatistics; import com.gemstone.gemfire.cache.query.data.Portfolio; @@ -38,23 +30,14 @@ import com.gemstone.gemfire.cache.query.internal.index.MemoryIndexStore.MemoryIn import com.gemstone.gemfire.cache.query.partitioned.PRQueryDUnitHelper; import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.cache30.CacheTestCase; -import com.gemstone.gemfire.internal.cache.CachedDeserializable; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.internal.cache.LocalRegion; -import com.gemstone.gemfire.internal.cache.PartitionedRegion; -import com.gemstone.gemfire.internal.cache.RegionEntry; -import com.gemstone.gemfire.internal.cache.Token; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import com.gemstone.gemfire.internal.cache.*; import com.gemstone.gemfire.internal.cache.persistence.query.CloseableIterator; -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.Host; -import com.gemstone.gemfire.test.dunit.Invoke; -import com.gemstone.gemfire.test.dunit.LogWriterUtils; -import com.gemstone.gemfire.test.dunit.VM; -import com.gemstone.gemfire.test.dunit.SerializableRunnableIF; -import com.gemstone.gemfire.test.dunit.ThreadUtils; +import com.gemstone.gemfire.test.dunit.*; import com.gemstone.gemfire.test.junit.categories.FlakyTest; +import org.junit.experimental.categories.Category; + +import java.util.Collection; /** * This test is similar to {@link ConcurrentIndexUpdateWithoutWLDUnitTest} except @@ -93,7 +76,7 @@ public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest extends Dis try { Cache newCache = GemFireCacheImpl.getInstance(); if(null == newCache) { - System.setProperty("gemfire.DISABLE_DISCONNECT_DS_ON_CACHE_CLOSE", "true"); + System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "DISABLE_DISCONNECT_DS_ON_CACHE_CLOSE", "true"); newCache = CacheFactory.create(getSystem()); } PRQueryDUnitHelper.setCache(newCache); @@ -104,7 +87,7 @@ public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest extends Dis } catch (Exception ex) { Assert.fail("Checked exception while initializing cache??", ex); } finally { - System.clearProperty("gemfire.DISABLE_DISCONNECT_DS_ON_CACHE_CLOSE"); + System.clearProperty(DistributionConfig.GEMFIRE_PREFIX + "DISABLE_DISCONNECT_DS_ON_CACHE_CLOSE"); } } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java index 7aa3307..cd18314 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java @@ -19,14 +19,7 @@ */ package com.gemstone.gemfire.cache.query.internal.index; -import java.util.ArrayList; -import java.util.Collection; - -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheException; -import com.gemstone.gemfire.cache.CacheExistsException; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.Region; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.query.Index; import com.gemstone.gemfire.cache.query.IndexStatistics; import com.gemstone.gemfire.cache.query.data.Portfolio; @@ -37,22 +30,13 @@ import com.gemstone.gemfire.cache.query.internal.index.MemoryIndexStore.MemoryIn import com.gemstone.gemfire.cache.query.partitioned.PRQueryDUnitHelper; import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.cache30.CacheTestCase; -import com.gemstone.gemfire.internal.cache.CachedDeserializable; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.internal.cache.LocalRegion; -import com.gemstone.gemfire.internal.cache.PartitionedRegion; -import com.gemstone.gemfire.internal.cache.RegionEntry; -import com.gemstone.gemfire.internal.cache.Token; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import com.gemstone.gemfire.internal.cache.*; import com.gemstone.gemfire.internal.cache.persistence.query.CloseableIterator; -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.Host; -import com.gemstone.gemfire.test.dunit.Invoke; -import com.gemstone.gemfire.test.dunit.LogWriterUtils; -import com.gemstone.gemfire.test.dunit.VM; -import com.gemstone.gemfire.test.dunit.SerializableRunnableIF; -import com.gemstone.gemfire.test.dunit.ThreadUtils; +import com.gemstone.gemfire.test.dunit.*; + +import java.util.ArrayList; +import java.util.Collection; /** * @@ -99,7 +83,7 @@ public class ConcurrentIndexUpdateWithoutWLDUnitTest extends try { Cache newCache = GemFireCacheImpl.getInstance(); if(null == newCache) { - System.setProperty("gemfire.DISABLE_DISCONNECT_DS_ON_CACHE_CLOSE", "true"); + System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "DISABLE_DISCONNECT_DS_ON_CACHE_CLOSE", "true"); newCache = CacheFactory.create(getSystem()); } PRQueryDUnitHelper.setCache(newCache); @@ -110,7 +94,7 @@ public class ConcurrentIndexUpdateWithoutWLDUnitTest extends } catch (Exception ex) { Assert.fail("Checked exception while initializing cache??", ex); } finally { - System.clearProperty("gemfire.DISABLE_DISCONNECT_DS_ON_CACHE_CLOSE"); + System.clearProperty(DistributionConfig.GEMFIRE_PREFIX + "DISABLE_DISCONNECT_DS_ON_CACHE_CLOSE"); } } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java index 18c73dc..2b10bdc 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java @@ -16,42 +16,26 @@ */ package com.gemstone.gemfire.cache.query.internal.index; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Properties; - -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.CacheException; -import com.gemstone.gemfire.cache.CacheTransactionManager; -import com.gemstone.gemfire.cache.CommitConflictException; -import com.gemstone.gemfire.cache.Region; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.client.ClientCache; import com.gemstone.gemfire.cache.client.ClientCacheFactory; -import com.gemstone.gemfire.cache.query.Index; -import com.gemstone.gemfire.cache.query.Query; -import com.gemstone.gemfire.cache.query.QueryService; -import com.gemstone.gemfire.cache.query.QueryTestUtils; -import com.gemstone.gemfire.cache.query.SelectResults; -import com.gemstone.gemfire.cache.query.Struct; +import com.gemstone.gemfire.cache.query.*; import com.gemstone.gemfire.cache.query.data.Portfolio; import com.gemstone.gemfire.cache.query.data.Position; import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.cache30.CacheTestCase; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.cache.PartitionedRegion; -import com.gemstone.gemfire.test.dunit.Assert; -import com.gemstone.gemfire.test.dunit.DistributedTestUtils; -import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.Invoke; -import com.gemstone.gemfire.test.dunit.NetworkUtils; -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.HashMap; +import java.util.Iterator; +import java.util.Properties; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; public class CopyOnReadIndexDUnitTest extends CacheTestCase { @@ -621,14 +605,14 @@ public class CopyOnReadIndexDUnitTest extends CacheTestCase { protected Properties getClientProps() { Properties p = new Properties(); - p.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - p.setProperty(DistributionConfig.LOCATORS_NAME, ""); + p.setProperty(MCAST_PORT, "0"); + p.setProperty(LOCATORS, ""); return p; } protected Properties getServerProperties() { Properties p = new Properties(); - p.setProperty(DistributionConfig.LOCATORS_NAME, "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); + p.setProperty(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort() + "]"); return p; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexJUnitTest.java index 31f4dc1..df11c6d 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexJUnitTest.java @@ -16,24 +16,20 @@ */ package com.gemstone.gemfire.cache.query.internal.index; -import static org.junit.Assert.assertEquals; - -import java.util.HashMap; - +import com.gemstone.gemfire.cache.Region; +import com.gemstone.gemfire.cache.query.*; +import com.gemstone.gemfire.cache.query.data.Portfolio; +import com.gemstone.gemfire.cache.query.data.Position; +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.Region; -import com.gemstone.gemfire.cache.query.Query; -import com.gemstone.gemfire.cache.query.QueryService; -import com.gemstone.gemfire.cache.query.QueryTestUtils; -import com.gemstone.gemfire.cache.query.SelectResults; -import com.gemstone.gemfire.cache.query.Struct; -import com.gemstone.gemfire.cache.query.data.Portfolio; -import com.gemstone.gemfire.cache.query.data.Position; -import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import java.util.HashMap; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static org.junit.Assert.assertEquals; /** * @@ -73,7 +69,7 @@ public class CopyOnReadIndexJUnitTest { public void setUp() throws java.lang.Exception { utils = new QueryTestUtils(); java.util.Properties p = new java.util.Properties(); - p.put("mcast-port", "0"); + p.put(MCAST_PORT, "0"); utils.createCache(p); utils.getCache().setCopyOnRead(true); Portfolio.resetInstanceCount(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java index e22129c..55358f6 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java @@ -20,24 +20,25 @@ */ package com.gemstone.gemfire.cache.query.internal.index; -import java.util.Collection; -import java.util.Properties; - -import junit.framework.Assert; - -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.Region; import com.gemstone.gemfire.cache.RegionAttributes; import com.gemstone.gemfire.cache.query.CacheUtils; import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.util.test.TestUtil; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import com.gemstone.gemfire.util.test.TestUtil; +import junit.framework.Assert; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import java.util.Collection; +import java.util.Properties; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; /** * @@ -53,8 +54,8 @@ public class DeclarativeIndexCreationJUnitTest { @Before public void setUp() throws Exception { Properties props = new Properties(); - props.setProperty("cache-xml-file", TestUtil.getResourcePath(getClass(), "cachequeryindex.xml")); - props.setProperty("mcast-port", "0"); + props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, TestUtil.getResourcePath(getClass(), "cachequeryindex.xml")); + props.setProperty(MCAST_PORT, "0"); ds = DistributedSystem.connect(props); cache = CacheFactory.create(ds); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexHintJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexHintJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexHintJUnitTest.java index e64ceac..121a43d 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexHintJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexHintJUnitTest.java @@ -16,34 +16,25 @@ */ package com.gemstone.gemfire.cache.query.internal.index; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.util.ArrayList; -import java.util.Set; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.query.CacheUtils; -import com.gemstone.gemfire.cache.query.Index; -import com.gemstone.gemfire.cache.query.IndexExistsException; -import com.gemstone.gemfire.cache.query.IndexNameConflictException; -import com.gemstone.gemfire.cache.query.Query; -import com.gemstone.gemfire.cache.query.QueryService; -import com.gemstone.gemfire.cache.query.RegionNotFoundException; -import com.gemstone.gemfire.cache.query.SelectResults; +import com.gemstone.gemfire.cache.query.*; import com.gemstone.gemfire.cache.query.data.Portfolio; import com.gemstone.gemfire.cache.query.functional.StructSetOrResultsSet; import com.gemstone.gemfire.cache.query.internal.DefaultQuery; import com.gemstone.gemfire.cache.query.internal.QueryExecutionContext; import com.gemstone.gemfire.cache.query.internal.QueryObserverAdapter; import com.gemstone.gemfire.cache.query.internal.QueryObserverHolder; +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.Test; +import org.junit.experimental.categories.Category; + +import java.util.ArrayList; +import java.util.Set; + +import static org.junit.Assert.*; @Category(IntegrationTest.class) public class IndexHintJUnitTest { @@ -51,7 +42,7 @@ public class IndexHintJUnitTest { @Before public void setUp() throws Exception { - System.setProperty("gemfire.Query.VERBOSE", "true"); + System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "Query.VERBOSE", "true"); CacheUtils.startCache(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java index c993b93..f57c1ed 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java @@ -19,33 +19,28 @@ */ package com.gemstone.gemfire.cache.query.internal.index; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.util.Collection; - -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.PartitionAttributesFactory; import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.query.CacheUtils; -import com.gemstone.gemfire.cache.query.Index; -import com.gemstone.gemfire.cache.query.IndexType; -import com.gemstone.gemfire.cache.query.Query; -import com.gemstone.gemfire.cache.query.QueryService; -import com.gemstone.gemfire.cache.query.SelectResults; +import com.gemstone.gemfire.cache.query.*; import com.gemstone.gemfire.cache.query.data.Portfolio; import com.gemstone.gemfire.cache.query.internal.IndexTrackingQueryObserver; import com.gemstone.gemfire.cache.query.internal.IndexTrackingQueryObserver.IndexInfo; import com.gemstone.gemfire.cache.query.internal.QueryObserver; import com.gemstone.gemfire.cache.query.internal.QueryObserverHolder; import com.gemstone.gemfire.cache.query.internal.index.IndexTrackingQueryObserverDUnitTest.IndexTrackingTestHook; +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.Test; +import org.junit.experimental.categories.Category; + +import java.util.Collection; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; /** * @@ -63,7 +58,7 @@ public class IndexTrackingQueryObserverJUnitTest { @Before public void setUp() throws Exception { - System.setProperty("gemfire.Query.VERBOSE", "true"); + System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "Query.VERBOSE", "true"); CacheUtils.startCache(); QueryObserver observer = QueryObserverHolder.setInstance(new IndexTrackingQueryObserver()); } @@ -77,7 +72,7 @@ public class IndexTrackingQueryObserverJUnitTest { @Test public void testIndexInfoOnPartitionedRegion() throws Exception{ //Query VERBOSE has to be true for the test - assertEquals("true", System.getProperty("gemfire.Query.VERBOSE")); + assertEquals("true", System.getProperty(DistributionConfig.GEMFIRE_PREFIX + "Query.VERBOSE")); //Create Partition Region PartitionAttributesFactory paf = new PartitionAttributesFactory(); @@ -127,7 +122,7 @@ public class IndexTrackingQueryObserverJUnitTest { @Test public void testIndexInfoOnLocalRegion() throws Exception{ //Query VERBOSE has to be true for the test - assertEquals("true", System.getProperty("gemfire.Query.VERBOSE")); + assertEquals("true", System.getProperty(DistributionConfig.GEMFIRE_PREFIX + "Query.VERBOSE")); //Create Partition Region AttributesFactory af = new AttributesFactory(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java index b856007..457dcb3 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java @@ -19,25 +19,23 @@ */ package com.gemstone.gemfire.cache.query.internal.index; -import java.io.IOException; -import java.net.URISyntaxException; -import java.util.Collection; -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.test.junit.categories.IntegrationTest; +import com.gemstone.gemfire.util.test.TestUtil; import org.junit.After; import org.junit.Assert; 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.CacheXmlException; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.util.test.TestUtil; -import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import java.io.IOException; +import java.net.URISyntaxException; +import java.util.Collection; +import java.util.Properties; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; /** * @@ -52,8 +50,8 @@ public class NewDeclarativeIndexCreationJUnitTest { public void setUp() throws Exception { //Read the Cache.xml placed in test.lib folder Properties props = new Properties(); - props.setProperty("cache-xml-file", TestUtil.getResourcePath(getClass(), "cachequeryindex.xml")); - props.setProperty("mcast-port", "0"); + props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, TestUtil.getResourcePath(getClass(), "cachequeryindex.xml")); + props.setProperty(MCAST_PORT, "0"); DistributedSystem ds = DistributedSystem.connect(props); cache = CacheFactory.create(ds); } @@ -156,8 +154,8 @@ public class NewDeclarativeIndexCreationJUnitTest { public void testIndexCreationExceptionOnRegionWithNewDTD() throws IOException, URISyntaxException { if (cache != null && !cache.isClosed()) cache.close(); Properties props = new Properties(); - props.setProperty("cache-xml-file", TestUtil.getResourcePath(getClass(), "cachequeryindexwitherror.xml")); - props.setProperty("mcast-port", "0"); + props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, TestUtil.getResourcePath(getClass(), "cachequeryindexwitherror.xml")); + props.setProperty(MCAST_PORT, "0"); DistributedSystem ds = DistributedSystem.connect(props); try { Cache cache = CacheFactory.create(ds); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java index 74abe21..6d030af 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java @@ -16,18 +16,6 @@ */ package com.gemstone.gemfire.cache.query.internal.index; -import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.List; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.Region; @@ -38,6 +26,14 @@ import com.gemstone.gemfire.cache.query.SelectResults; import com.gemstone.gemfire.cache.query.data.PortfolioPdx; import com.gemstone.gemfire.pdx.ReflectionBasedAutoSerializer; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import java.util.ArrayList; +import java.util.List; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static org.junit.Assert.assertEquals; @Category(IntegrationTest.class) public class PdxCopyOnReadQueryJUnitTest { @@ -53,7 +49,7 @@ public class PdxCopyOnReadQueryJUnitTest { CacheFactory cf = new CacheFactory(); cf.setPdxSerializer(serializer); cf.setPdxReadSerialized(false); - cf.set("mcast-port", "0"); + cf.set(MCAST_PORT, "0"); cache = cf.create(); cache.setCopyOnRead(true); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java index cee26ef..27c0616 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java @@ -20,22 +20,19 @@ */ package com.gemstone.gemfire.cache.query.internal.index; -import static org.junit.Assert.fail; - -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.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.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import java.util.Properties; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static org.junit.Assert.fail; /** * @@ -61,8 +58,8 @@ public class ProgRegionCreationIndexUpdateTypeJUnitTest{ @Test public void testProgrammaticIndexUpdateType() throws Exception { Properties props = new Properties(); - props.setProperty("mcast-port", "0"); - props.setProperty("log-level", "config"); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "config"); DistributedSystem ds = DistributedSystem.connect(props); cache = CacheFactory.create(ds); //Create a Region with index maintenance type as explicit synchronous http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java index 02e805b..3e91e66 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java @@ -16,35 +16,26 @@ */ package com.gemstone.gemfire.cache.query.internal.index; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; - -import org.junit.Ignore; -import org.junit.experimental.categories.Category; - -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.Region; -import com.gemstone.gemfire.cache.Scope; +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.ClientRegionShortcut; import com.gemstone.gemfire.cache.query.data.PortfolioPdx; -import com.gemstone.gemfire.cache.query.dunit.RemoteQueryDUnitTest; import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.cache30.CacheTestCase; -import com.gemstone.gemfire.internal.AvailablePort; -import com.gemstone.gemfire.test.dunit.Assert; -import com.gemstone.gemfire.test.dunit.DistributedTestUtils; -import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.NetworkUtils; -import com.gemstone.gemfire.test.dunit.VM; +import com.gemstone.gemfire.test.dunit.*; import com.gemstone.gemfire.test.junit.categories.DistributedTest; +import org.junit.Ignore; +import org.junit.experimental.categories.Category; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; /** * @@ -83,7 +74,7 @@ public class PutAllWithIndexPerfDUnitTest extends CacheTestCase { vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") { public void run2() throws CacheException { Properties config = new Properties(); - config.put("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); + config.put(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort() + "]"); Cache cache = new CacheFactory(config).create(); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -108,7 +99,7 @@ public class PutAllWithIndexPerfDUnitTest extends CacheTestCase { vm1.invoke(new CacheSerializableRunnable("Create region") { public void run2() throws CacheException { Properties config = new Properties(); - config.setProperty("mcast-port", "0"); + config.setProperty(MCAST_PORT, "0"); ClientCache cache = new ClientCacheFactory().addPoolServer(host0, port).create(); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/RegionSnapshotJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/RegionSnapshotJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/RegionSnapshotJUnitTest.java index 99b8293..1749d43 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/RegionSnapshotJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/RegionSnapshotJUnitTest.java @@ -16,22 +16,6 @@ */ package com.gemstone.gemfire.cache.snapshot; -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.io.File; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.concurrent.atomic.AtomicBoolean; - -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import com.examples.snapshot.MyObject; import com.examples.snapshot.MyPdxSerializer; import com.gemstone.gemfire.cache.CacheFactory; @@ -42,7 +26,20 @@ import com.gemstone.gemfire.cache.snapshot.RegionGenerator.SerializationType; import com.gemstone.gemfire.cache.snapshot.SnapshotOptions.SnapshotFormat; import com.gemstone.gemfire.cache.util.CacheListenerAdapter; import com.gemstone.gemfire.cache.util.CacheWriterAdapter; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import java.io.File; +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; +import java.util.concurrent.atomic.AtomicBoolean; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static org.junit.Assert.*; @Category(IntegrationTest.class) public class RegionSnapshotJUnitTest extends SnapshotTestCase { @@ -246,10 +243,10 @@ public class RegionSnapshotJUnitTest extends SnapshotTestCase { public void testDSID() throws Exception { cache.close(); - CacheFactory cf = new CacheFactory().set("mcast-port", "0") - .set("log-level", "error") + CacheFactory cf = new CacheFactory().set(MCAST_PORT, "0") + .set(DistributionConfig.LOG_LEVEL_NAME, "error") .setPdxSerializer(new MyPdxSerializer()) - .set("distributed-system-id", "1"); + .set(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); cache = cf.create(); RegionType rt = RegionType.REPLICATE; @@ -266,10 +263,10 @@ public class RegionSnapshotJUnitTest extends SnapshotTestCase { cache.close(); // change the DSID from 1 -> 100 - CacheFactory cf2 = new CacheFactory().set("mcast-port", "0") - .set("log-level", "error") + CacheFactory cf2 = new CacheFactory().set(MCAST_PORT, "0") + .set(DistributionConfig.LOG_LEVEL_NAME, "error") .setPdxSerializer(new MyPdxSerializer()) - .set("distributed-system-id", "100"); + .set(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "100"); cache = cf2.create(); final Map read = new HashMap(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotTestCase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotTestCase.java index b67caa7..3804ee4 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotTestCase.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotTestCase.java @@ -16,20 +16,22 @@ */ package com.gemstone.gemfire.cache.snapshot; +import com.examples.snapshot.MyObject; +import com.gemstone.gemfire.cache.Cache; +import com.gemstone.gemfire.cache.CacheFactory; +import com.gemstone.gemfire.cache.DiskStore; +import com.gemstone.gemfire.cache.snapshot.RegionGenerator.SerializationType; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import org.junit.After; +import org.junit.Before; + import java.io.File; import java.io.FilenameFilter; import java.util.HashMap; import java.util.Map; import java.util.Random; -import org.junit.After; -import org.junit.Before; - -import com.examples.snapshot.MyObject; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.DiskStore; -import com.gemstone.gemfire.cache.snapshot.RegionGenerator.SerializationType; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; public class SnapshotTestCase { protected File store; @@ -49,8 +51,8 @@ public class SnapshotTestCase { rgen = new RegionGenerator(); CacheFactory cf = new CacheFactory() - .set("mcast-port", "0") - .set("log-level", "error"); + .set(MCAST_PORT, "0") + .set(DistributionConfig.LOG_LEVEL_NAME, "error"); cache = cf.create(); ds = cache.createDiskStoreFactory() http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java index f222609..0c9dfaa 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java @@ -16,46 +16,28 @@ */ package com.gemstone.gemfire.cache30; -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; -import java.util.Collection; -import java.util.Properties; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; - import com.gemstone.gemfire.CopyHelper; import com.gemstone.gemfire.DataSerializable; import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.CacheException; -import com.gemstone.gemfire.cache.InterestResultPolicy; -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.*; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.NanoTimer; -import com.gemstone.gemfire.internal.cache.CacheServerImpl; -import com.gemstone.gemfire.internal.cache.BucketRegion; +import com.gemstone.gemfire.internal.cache.*; import com.gemstone.gemfire.internal.cache.BucketRegion.RawValue; -import com.gemstone.gemfire.internal.cache.CachedDeserializable; -import com.gemstone.gemfire.internal.cache.EnumListenerEvent; -import com.gemstone.gemfire.internal.cache.EventID; -import com.gemstone.gemfire.internal.cache.KeyInfo; -import com.gemstone.gemfire.internal.cache.LocalRegion; -import com.gemstone.gemfire.internal.cache.PartitionedRegion; import com.gemstone.gemfire.internal.cache.PartitionedRegionDataStore.BucketVisitor; import com.gemstone.gemfire.internal.cache.ha.HARegionQueue; import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientProxy; import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID; import com.gemstone.gemfire.internal.cache.tier.sockets.ClientUpdateMessageImpl; -import com.gemstone.gemfire.test.dunit.Assert; -import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.NetworkUtils; -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.DataInput; +import java.io.DataOutput; +import java.io.IOException; +import java.util.Collection; +import java.util.Properties; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; /** * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40255JUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40255JUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40255JUnitTest.java index 771cd30..38e79cb 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40255JUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40255JUnitTest.java @@ -16,17 +16,6 @@ */ package com.gemstone.gemfire.cache30; -import static org.junit.Assert.*; - -import java.io.File; -import java.util.Properties; - -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -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.Region; @@ -34,6 +23,19 @@ import com.gemstone.gemfire.cache.RegionAttributes; import com.gemstone.gemfire.distributed.DistributedSystem; 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.Ignore; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +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; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; /** * @@ -69,8 +71,8 @@ public class Bug40255JUnitTest { @Test public void testResolveReplacePropertyStringForLonerCache(){ Properties props = new Properties(); - props.setProperty("mcast-port", "0"); - props.setProperty("locators", ""); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, ""); System.setProperty("gemfirePropertyFile", BUG_40255_PROPS); props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, BUG_40255_XML); System.setProperty(NESTED_ATTR_PROPERTY_STRING, NESTED_ATTR_PROPERTY_VALUE); @@ -99,8 +101,8 @@ public class Bug40255JUnitTest { @Test public void testResolveReplacePropertyStringForNonLonerCache(){ Properties props = new Properties(); - props.setProperty("mcast-port", "10333"); - props.setProperty("locators", ""); + props.setProperty(MCAST_PORT, "10333"); + props.setProperty(LOCATORS, ""); System.setProperty("gemfirePropertyFile", BUG_40255_PROPS); props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, BUG_40255_XML); System.setProperty(NESTED_ATTR_PROPERTY_STRING, NESTED_ATTR_PROPERTY_VALUE); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40662JUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40662JUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40662JUnitTest.java index 77e0d30..9e9b2f5 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40662JUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40662JUnitTest.java @@ -16,24 +16,20 @@ */ package com.gemstone.gemfire.cache30; -import static org.junit.Assert.*; - -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.test.junit.categories.IntegrationTest; import org.junit.After; import org.junit.Before; import org.junit.Ignore; import org.junit.experimental.categories.Category; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.EvictionAction; -import com.gemstone.gemfire.cache.EvictionAttributes; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import java.util.Properties; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static org.junit.Assert.assertEquals; /** * Test for Bug no. 40662. To verify the default action being set in eviction @@ -79,8 +75,8 @@ public class Bug40662JUnitTest { @Before protected void setUp() throws Exception { Properties props = new Properties(); - props.setProperty("mcast-port", "0"); - props.setProperty("locators", ""); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, ""); props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, BUG_40662_XML); this.ds = DistributedSystem.connect(props); this.cache = CacheFactory.create(this.ds); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug44418JUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug44418JUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug44418JUnitTest.java index d005aec..7a4f87c 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug44418JUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug44418JUnitTest.java @@ -19,30 +19,25 @@ */ package com.gemstone.gemfire.cache30; -import static org.junit.Assert.fail; - -import java.util.Properties; -import java.util.concurrent.TimeUnit; - -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.CustomExpiry; -import com.gemstone.gemfire.cache.ExpirationAttributes; -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.distributed.DistributedSystem; import com.gemstone.gemfire.internal.cache.LocalRegion; import com.gemstone.gemfire.test.junit.categories.FlakyTest; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import com.jayway.awaitility.core.ConditionTimeoutException; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; +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; import static com.jayway.awaitility.Awaitility.with; +import static org.junit.Assert.fail; /** * Test for Bug 44418. @@ -145,8 +140,8 @@ public class Bug44418JUnitTest { // TODO: rename this test to non-ticket descrip @Before public void setUp() throws Exception { Properties props = new Properties(); - props.setProperty("mcast-port", "0"); - props.setProperty("locators", ""); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, ""); this.ds = DistributedSystem.connect(props); this.cache = CacheFactory.create(this.ds); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java index ae14819..d595ab8 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java @@ -16,21 +16,16 @@ */ package com.gemstone.gemfire.cache30; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileReader; -import java.io.FilenameFilter; -import java.io.IOException; -import java.util.Properties; -import java.util.regex.Pattern; - -import org.junit.experimental.categories.Category; - 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.logging.InternalLogWriter; import com.gemstone.gemfire.test.junit.categories.FlakyTest; +import org.junit.experimental.categories.Category; + +import java.io.*; +import java.util.Properties; +import java.util.regex.Pattern; /** * Test to make sure cache close is working. @@ -223,10 +218,10 @@ public class CacheLogRollDUnitTest extends CacheTestCase { Properties props = new Properties(); String baseLogName = "diskarito"; String logfile = baseLogName+".log"; - props.put("log-file", logfile); - props.put("log-file-size-limit", "1"); + props.put(DistributionConfig.LOG_FILE_NAME, logfile); + props.put(DistributionConfig.LOG_FILE_SIZE_LIMIT_NAME, "1"); DistributedSystem ds = this.getSystem(props); - props.put("log-disk-space-limit", "200"); + props.put(DistributionConfig.LOG_DISK_SPACE_LIMIT_NAME, "200"); for(int i=0;i<10;i++) { ds = this.getSystem(props); ds.disconnect(); @@ -242,10 +237,10 @@ public class CacheLogRollDUnitTest extends CacheTestCase { Properties props = new Properties(); String baseLogName = "restarto"; String logfile = baseLogName+".log"; - props.put("log-file", logfile); - props.put("log-file-size-limit", "1"); - props.put("log-disk-space-limit", "200"); - props.put("log-level", "config"); + props.put(DistributionConfig.LOG_FILE_NAME, logfile); + props.put(DistributionConfig.LOG_FILE_SIZE_LIMIT_NAME, "1"); + props.put(DistributionConfig.LOG_DISK_SPACE_LIMIT_NAME, "200"); + props.put(DistributionConfig.LOG_LEVEL_NAME, "config"); InternalDistributedSystem ids = getSystem(props); assertEquals(InternalLogWriter.INFO_LEVEL, ((InternalLogWriter)ids.getLogWriter()).getLogWriterLevel()); ids.disconnect(); @@ -302,9 +297,9 @@ public class CacheLogRollDUnitTest extends CacheTestCase { Properties props = new Properties(); String baseLogName = "biscuits"; String logfile = baseLogName+".log"; - props.put("log-file", logfile); - props.put("log-file-size-limit", "1"); - props.put("log-level", "config"); + props.put(DistributionConfig.LOG_FILE_NAME, logfile); + props.put(DistributionConfig.LOG_FILE_SIZE_LIMIT_NAME, "1"); + props.put(DistributionConfig.LOG_LEVEL_NAME, "config"); DistributedSystem ds = getSystem(props); InternalDistributedSystem ids = (InternalDistributedSystem) ds; assertEquals(InternalLogWriter.INFO_LEVEL, ((InternalLogWriter)ids.getLogWriter()).getLogWriterLevel()); @@ -329,7 +324,7 @@ public class CacheLogRollDUnitTest extends CacheTestCase { * Ok now we have rolled and yada yada. Let's disconnect and reconnect with same name! */ int dsId = System.identityHashCode(ds); - props.put("log-disk-space-limit", "200"); + props.put(DistributionConfig.LOG_DISK_SPACE_LIMIT_NAME, "200"); File f1m = new File(logfile); assertTrue(f1m.exists()); @@ -379,9 +374,9 @@ public class CacheLogRollDUnitTest extends CacheTestCase { Properties props = new Properties(); String logfile = baseLogName+".log"; - props.put("log-file", logfile); - props.put("log-file-size-limit", "1"); - props.put("log-level", "config"); + props.put(DistributionConfig.LOG_FILE_NAME, logfile); + props.put(DistributionConfig.LOG_FILE_SIZE_LIMIT_NAME, "1"); + props.put(DistributionConfig.LOG_LEVEL_NAME, "config"); DistributedSystem ds = getSystem(props); InternalDistributedSystem ids = (InternalDistributedSystem) ds; @@ -414,11 +409,11 @@ public class CacheLogRollDUnitTest extends CacheTestCase { String logfile = baseLogName+".log"; String sec_logfile = "sec_"+baseLogName+".log"; - props.put("log-file", logfile); - props.put("log-file-size-limit", "1"); - props.put("log-level", "config"); - props.put("security-log-file", sec_logfile); - props.put("security-log-level", "config"); + props.put(DistributionConfig.LOG_FILE_NAME, logfile); + props.put(DistributionConfig.LOG_FILE_SIZE_LIMIT_NAME, "1"); + props.put(DistributionConfig.LOG_LEVEL_NAME, "config"); + props.put(DistributionConfig.SECURITY_LOG_FILE_NAME, sec_logfile); + props.put(DistributionConfig.SECURITY_LOG_LEVEL_NAME, "config"); DistributedSystem ds = getSystem(props); InternalDistributedSystem ids = (InternalDistributedSystem) ds; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java index 56f0261..af604f2 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java @@ -22,26 +22,13 @@ */ package com.gemstone.gemfire.cache30; +import com.gemstone.gemfire.cache.*; +import com.gemstone.gemfire.distributed.DistributedSystem; +import com.gemstone.gemfire.test.dunit.*; + 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.CacheTransactionManager; -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.UnsupportedOperationInTransactionException; -import com.gemstone.gemfire.distributed.DistributedSystem; -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.Host; -import com.gemstone.gemfire.test.dunit.ThreadUtils; -import com.gemstone.gemfire.test.dunit.VM; - public class CacheMapTxnDUnitTest extends DistributedTestCase{ protected static Cache cache; @@ -80,7 +67,7 @@ public class CacheMapTxnDUnitTest extends DistributedTestCase{ public static void createCache(){ try{ - // props.setProperty("mcast-port", "1234"); + // props.setProperty(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "1234"); // ds = DistributedSystem.connect(props); ds = (new CacheMapTxnDUnitTest("temp")).getSystem(props); cache = CacheFactory.create(ds);