http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java index e5eeba3..5ddf457 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java @@ -16,51 +16,17 @@ */ package com.gemstone.gemfire.cache.management; -import java.io.Serializable; -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.CountDownLatch; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; - -import org.junit.experimental.categories.Category; -import util.TestException; - -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.AttributesMutator; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheException; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheLoaderException; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.LoaderHelper; -import com.gemstone.gemfire.cache.LowMemoryException; -import com.gemstone.gemfire.cache.PartitionAttributesFactory; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionShortcut; -import com.gemstone.gemfire.cache.Scope; +import com.gemstone.gemfire.cache.*; 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.client.ServerOperationException; import com.gemstone.gemfire.cache.control.ResourceManager; -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.FunctionService; -import com.gemstone.gemfire.cache.execute.RegionFunctionContext; +import com.gemstone.gemfire.cache.execute.*; import com.gemstone.gemfire.cache.server.CacheServer; -import com.gemstone.gemfire.cache30.ClientServerTestCase; import com.gemstone.gemfire.cache30.CacheSerializableRunnable; +import com.gemstone.gemfire.cache30.ClientServerTestCase; import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; import com.gemstone.gemfire.internal.AvailablePortHelper; @@ -71,30 +37,23 @@ import com.gemstone.gemfire.internal.cache.DistributedRegion; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.cache.PartitionedRegion; import com.gemstone.gemfire.internal.cache.PartitionedRegionHelper; -import com.gemstone.gemfire.internal.cache.control.HeapMemoryMonitor; -import com.gemstone.gemfire.internal.cache.control.InternalResourceManager; +import com.gemstone.gemfire.internal.cache.control.*; import com.gemstone.gemfire.internal.cache.control.InternalResourceManager.ResourceType; -import com.gemstone.gemfire.internal.cache.control.MemoryEvent; import com.gemstone.gemfire.internal.cache.control.MemoryThresholds.MemoryState; -import com.gemstone.gemfire.internal.cache.control.ResourceAdvisor; -import com.gemstone.gemfire.internal.cache.control.ResourceListener; -import com.gemstone.gemfire.internal.cache.control.TestMemoryThresholdListener; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -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.DistributedTestUtils; -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.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 com.gemstone.gemfire.test.junit.categories.FlakyTest; +import org.junit.experimental.categories.Category; +import util.TestException; + +import java.io.Serializable; +import java.util.*; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; /** * Tests the Heap Memory thresholds of {@link ResourceManager} @@ -1572,14 +1531,14 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase { 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/management/MemoryThresholdsOffHeapDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java index f9c8e8a..824192d 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java @@ -16,75 +16,35 @@ */ package com.gemstone.gemfire.cache.management; -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.atomic.AtomicInteger; - -import org.junit.experimental.categories.Category; - -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.AttributesMutator; -import com.gemstone.gemfire.cache.CacheException; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheLoaderException; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.LoaderHelper; -import com.gemstone.gemfire.cache.LowMemoryException; -import com.gemstone.gemfire.cache.PartitionAttributesFactory; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionShortcut; -import com.gemstone.gemfire.cache.Scope; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.client.PoolFactory; import com.gemstone.gemfire.cache.client.PoolManager; import com.gemstone.gemfire.cache.client.ServerOperationException; import com.gemstone.gemfire.cache.control.ResourceManager; import com.gemstone.gemfire.cache.management.MemoryThresholdsDUnitTest.Range; import com.gemstone.gemfire.cache.server.CacheServer; -import com.gemstone.gemfire.cache30.ClientServerTestCase; import com.gemstone.gemfire.cache30.CacheSerializableRunnable; +import com.gemstone.gemfire.cache30.ClientServerTestCase; import com.gemstone.gemfire.distributed.DistributedMember; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.internal.AvailablePortHelper; -import com.gemstone.gemfire.internal.cache.DistributedRegion; -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.PartitionedRegionHelper; -import com.gemstone.gemfire.internal.cache.ProxyBucketRegion; -import com.gemstone.gemfire.internal.cache.control.InternalResourceManager; +import com.gemstone.gemfire.internal.cache.*; +import com.gemstone.gemfire.internal.cache.control.*; import com.gemstone.gemfire.internal.cache.control.InternalResourceManager.ResourceType; -import com.gemstone.gemfire.internal.cache.control.MemoryEvent; import com.gemstone.gemfire.internal.cache.control.MemoryThresholds.MemoryState; -import com.gemstone.gemfire.internal.cache.control.OffHeapMemoryMonitor; import com.gemstone.gemfire.internal.cache.control.OffHeapMemoryMonitor.OffHeapMemoryMonitorObserver; -import com.gemstone.gemfire.internal.cache.control.ResourceAdvisor; -import com.gemstone.gemfire.internal.cache.control.ResourceListener; -import com.gemstone.gemfire.internal.cache.control.TestMemoryThresholdListener; import com.gemstone.gemfire.internal.cache.partitioned.RegionAdvisor; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -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.DistributedTestUtils; -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.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 com.gemstone.gemfire.test.junit.categories.FlakyTest; +import org.junit.experimental.categories.Category; + +import java.util.*; +import java.util.concurrent.atomic.AtomicInteger; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; /** * Tests the Off-Heap Memory thresholds of {@link ResourceManager} @@ -1800,15 +1760,15 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase { private Properties getOffHeapProperties() { Properties p = new Properties(); - p.setProperty(DistributionConfig.LOCATORS_NAME, "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); + p.setProperty(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort() + "]"); p.setProperty(DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "1m"); return p; } 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; } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/ExceptionHandlingJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/ExceptionHandlingJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/ExceptionHandlingJUnitTest.java index fc3c35c..6544bab 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/ExceptionHandlingJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/ExceptionHandlingJUnitTest.java @@ -16,26 +16,18 @@ */ package com.gemstone.gemfire.cache.mapInterface; -import static org.junit.Assert.fail; +import com.gemstone.gemfire.cache.*; +import com.gemstone.gemfire.distributed.DistributedSystem; +import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import org.junit.*; +import org.junit.experimental.categories.Category; import java.util.HashMap; import java.util.Properties; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -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.cache.Scope; -import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static org.junit.Assert.fail; @Category(IntegrationTest.class) public class ExceptionHandlingJUnitTest { @@ -48,8 +40,8 @@ public class ExceptionHandlingJUnitTest { @BeforeClass public static void caseSetUp() throws Exception { Properties properties = new Properties(); - properties.setProperty("mcast-port", "0"); - properties.setProperty("locators", ""); + properties.setProperty(MCAST_PORT, "0"); + properties.setProperty(LOCATORS, ""); distributedSystem = DistributedSystem.connect(properties); Cache cache = CacheFactory.create(distributedSystem); 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/mapInterface/MapFunctionalJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/MapFunctionalJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/MapFunctionalJUnitTest.java index 8adc027..97ec027 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/MapFunctionalJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/MapFunctionalJUnitTest.java @@ -16,26 +16,18 @@ */ package com.gemstone.gemfire.cache.mapInterface; -import static org.junit.Assert.fail; +import com.gemstone.gemfire.cache.*; +import com.gemstone.gemfire.distributed.DistributedSystem; +import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import org.junit.*; +import org.junit.experimental.categories.Category; import java.util.HashMap; import java.util.Properties; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -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.cache.Scope; -import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static org.junit.Assert.fail; @Category(IntegrationTest.class) public class MapFunctionalJUnitTest { @@ -48,8 +40,8 @@ public class MapFunctionalJUnitTest { @BeforeClass public static void caseSetUp() throws Exception { Properties properties = new Properties(); - properties.setProperty("mcast-port", "0"); - properties.setProperty("locators", ""); + properties.setProperty(MCAST_PORT, "0"); + properties.setProperty(LOCATORS, ""); distributedSystem = DistributedSystem.connect(properties); Cache cache = CacheFactory.create(distributedSystem); 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/mapInterface/PutAllGlobalLockJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/PutAllGlobalLockJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/PutAllGlobalLockJUnitTest.java index 2f9be54..50bb9f9 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/PutAllGlobalLockJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/PutAllGlobalLockJUnitTest.java @@ -16,28 +16,22 @@ */ package com.gemstone.gemfire.cache.mapInterface; -import static org.junit.Assert.*; - -import java.util.Properties; -import java.util.TreeMap; - +import com.gemstone.gemfire.cache.*; +import com.gemstone.gemfire.cache.util.CacheListenerAdapter; +import com.gemstone.gemfire.distributed.DistributedSystem; +import com.gemstone.gemfire.test.dunit.ThreadUtils; +import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -import junit.framework.TestCase; +import java.util.Properties; +import java.util.TreeMap; -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.EntryEvent; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.util.CacheListenerAdapter; -import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.test.dunit.ThreadUtils; -import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; @Category(IntegrationTest.class) public class PutAllGlobalLockJUnitTest { @@ -54,8 +48,8 @@ public class PutAllGlobalLockJUnitTest { public void setUp() throws Exception { try { Properties properties = new Properties(); - properties.setProperty("mcast-port", "0"); - properties.setProperty("locators", ""); + properties.setProperty(MCAST_PORT, "0"); + properties.setProperty(LOCATORS, ""); DistributedSystem distributedSystem = DistributedSystem .connect(properties); Cache cache = CacheFactory.create(distributedSystem); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/PutOperationContextJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/PutOperationContextJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/PutOperationContextJUnitTest.java index 8df44ea..71861d6 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/PutOperationContextJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/PutOperationContextJUnitTest.java @@ -16,14 +16,6 @@ */ package com.gemstone.gemfire.cache.operations; -import java.io.ByteArrayOutputStream; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.junit.Assert; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import com.gemstone.gemfire.DataSerializer; import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheFactory; @@ -32,6 +24,16 @@ import com.gemstone.gemfire.pdx.PdxReader; import com.gemstone.gemfire.pdx.PdxSerializable; import com.gemstone.gemfire.pdx.PdxWriter; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import org.junit.Assert; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import java.io.ByteArrayOutputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; @Category(IntegrationTest.class) public class PutOperationContextJUnitTest { @@ -70,7 +72,8 @@ public class PutOperationContextJUnitTest { { // create a loner cache so that pdx serialization will work - Cache c = (new CacheFactory()).set("locators", "").set("mcast-port", "0").setPdxReadSerialized(true).create(); + Cache c = (new CacheFactory()).set(LOCATORS, "") + .set(MCAST_PORT, "0").setPdxReadSerialized(true).create(); try { ByteArrayOutputStream baos = new ByteArrayOutputStream(); DataOutputStream dos = new DataOutputStream(baos); @@ -120,7 +123,7 @@ public class PutOperationContextJUnitTest { { // create a loner cache so that pdx serialization will work - Cache c = (new CacheFactory()).set("locators", "").set("mcast-port", "0").setPdxReadSerialized(true).create(); + Cache c = (new CacheFactory()).set(LOCATORS, "").set(MCAST_PORT, "0").setPdxReadSerialized(true).create(); try { ByteArrayOutputStream baos = new ByteArrayOutputStream(); DataOutputStream dos = new DataOutputStream(baos); @@ -171,7 +174,7 @@ public class PutOperationContextJUnitTest { { // create a loner cache so that pdx serialization will work - Cache c = (new CacheFactory()).set("locators", "").set("mcast-port", "0").setPdxReadSerialized(true).create(); + Cache c = (new CacheFactory()).set(LOCATORS, "").set(MCAST_PORT, "0").setPdxReadSerialized(true).create(); try { ByteArrayOutputStream baos = new ByteArrayOutputStream(); DataOutputStream dos = new DataOutputStream(baos); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/internal/GetOperationContextImplJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/internal/GetOperationContextImplJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/internal/GetOperationContextImplJUnitTest.java index 57b481f..86d2566 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/internal/GetOperationContextImplJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/internal/GetOperationContextImplJUnitTest.java @@ -16,20 +16,22 @@ */ package com.gemstone.gemfire.cache.operations.internal; -import java.io.ByteArrayOutputStream; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.junit.Assert; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import com.gemstone.gemfire.DataSerializer; import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.operations.PutOperationContextJUnitTest; import com.gemstone.gemfire.pdx.PdxInstance; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import org.junit.Assert; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import java.io.ByteArrayOutputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; @Category(IntegrationTest.class) public class GetOperationContextImplJUnitTest { @@ -72,7 +74,8 @@ public class GetOperationContextImplJUnitTest { { // create a loner cache so that pdx serialization will work - Cache c = (new CacheFactory()).set("locators", "").set("mcast-port", "0").setPdxReadSerialized(true).create(); + Cache c = (new CacheFactory()).set(LOCATORS, "") + .set(MCAST_PORT, "0").setPdxReadSerialized(true).create(); try { ByteArrayOutputStream baos = new ByteArrayOutputStream(); DataOutputStream dos = new DataOutputStream(baos); @@ -127,7 +130,7 @@ public class GetOperationContextImplJUnitTest { { // create a loner cache so that pdx serialization will work - Cache c = (new CacheFactory()).set("locators", "").set("mcast-port", "0").setPdxReadSerialized(true).create(); + Cache c = (new CacheFactory()).set(LOCATORS, "").set(MCAST_PORT, "0").setPdxReadSerialized(true).create(); try { ByteArrayOutputStream baos = new ByteArrayOutputStream(); DataOutputStream dos = new DataOutputStream(baos); @@ -183,7 +186,7 @@ public class GetOperationContextImplJUnitTest { { // create a loner cache so that pdx serialization will work - Cache c = (new CacheFactory()).set("locators", "").set("mcast-port", "0").setPdxReadSerialized(true).create(); + Cache c = (new CacheFactory()).set(LOCATORS, "").set(MCAST_PORT, "0").setPdxReadSerialized(true).create(); try { ByteArrayOutputStream baos = new ByteArrayOutputStream(); DataOutputStream dos = new DataOutputStream(baos); @@ -238,7 +241,7 @@ public class GetOperationContextImplJUnitTest { { // create a loner cache so that pdx serialization will work - Cache c = (new CacheFactory()).set("locators", "").set("mcast-port", "0").setPdxReadSerialized(true).create(); + Cache c = (new CacheFactory()).set(LOCATORS, "").set(MCAST_PORT, "0").setPdxReadSerialized(true).create(); try { ByteArrayOutputStream baos = new ByteArrayOutputStream(); DataOutputStream dos = new DataOutputStream(baos); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/query/Bug32947ValueConstraintJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/Bug32947ValueConstraintJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/Bug32947ValueConstraintJUnitTest.java index dbc45f0..bce7e3f 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/Bug32947ValueConstraintJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/Bug32947ValueConstraintJUnitTest.java @@ -16,31 +16,22 @@ */ package com.gemstone.gemfire.cache.query; -import static org.junit.Assert.*; - -import java.util.Properties; - -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.cache.*; +import com.gemstone.gemfire.cache.query.data.*; import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.cache.query.data.Address; -import com.gemstone.gemfire.cache.query.data.Portfolio; -import com.gemstone.gemfire.cache.query.data.Data; -import com.gemstone.gemfire.cache.query.data.Employee; -import com.gemstone.gemfire.cache.query.data.Manager; 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 java.util.HashSet; +import java.util.Properties; +import java.util.Set; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static org.junit.Assert.fail; + /** * Junit test for checking the value constraint region attributes. */ @@ -53,7 +44,7 @@ public class Bug32947ValueConstraintJUnitTest { @Before public void setUp() throws java.lang.Exception { Properties properties = new Properties(); - properties.setProperty("mcast-port", "0"); + properties.setProperty(MCAST_PORT, "0"); distributedSystem = DistributedSystem.connect(properties); cache = CacheFactory.create(distributedSystem); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/query/CacheUtils.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/CacheUtils.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/CacheUtils.java index 78ec8b6..63e4dbd 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/CacheUtils.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/CacheUtils.java @@ -21,26 +21,21 @@ */ package com.gemstone.gemfire.cache.query; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - -import java.util.Iterator; -import java.util.Properties; -import java.util.Set; - import com.gemstone.gemfire.LogWriter; -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.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.Scope; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.query.types.CollectionType; import com.gemstone.gemfire.cache.query.types.ObjectType; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; +import java.util.Iterator; +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.fail; + /** * */ @@ -61,7 +56,7 @@ public class CacheUtils { static void init() throws Exception { if (GemFireCacheImpl.getInstance() == null) { - props.setProperty("mcast-port", "0"); + props.setProperty(MCAST_PORT, "0"); cache = new CacheFactory(props).create(); } else { cache = GemFireCacheImpl.getInstance(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/query/PdxStringQueryJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/PdxStringQueryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/PdxStringQueryJUnitTest.java index f088170..2289061 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/PdxStringQueryJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/PdxStringQueryJUnitTest.java @@ -16,21 +16,6 @@ */ package com.gemstone.gemfire.cache.query; -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.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -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; @@ -49,6 +34,15 @@ import com.gemstone.gemfire.pdx.internal.PdxInstanceFactoryImpl; import com.gemstone.gemfire.pdx.internal.PdxInstanceImpl; import com.gemstone.gemfire.pdx.internal.PdxString; 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.*; /** * @@ -69,7 +63,7 @@ public class PdxStringQueryJUnitTest { @Before public void setUp() { - this.c = new CacheFactory().set("mcast-port", "0").create(); + this.c = new CacheFactory().set(MCAST_PORT, "0").create(); r = c.createRegionFactory().create(regName); qs = c.getQueryService(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/query/QueryTestUtils.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/QueryTestUtils.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/QueryTestUtils.java index c50e3b5..75acbb4 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/QueryTestUtils.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/QueryTestUtils.java @@ -16,37 +16,20 @@ */ package com.gemstone.gemfire.cache.query; +import com.gemstone.gemfire.LogWriter; +import com.gemstone.gemfire.cache.*; +import com.gemstone.gemfire.cache30.CacheSerializableRunnable; +import com.gemstone.gemfire.test.dunit.SerializableRunnable; +import com.gemstone.gemfire.test.dunit.VM; + import java.io.File; import java.io.IOException; import java.io.Serializable; -import java.util.Collection; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import java.util.Properties; -import java.util.Set; -import junit.framework.Assert; - -import com.gemstone.gemfire.LogWriter; -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.ExpirationAttributes; -import com.gemstone.gemfire.cache.PartitionAttributesFactory; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.RegionFactory; -import com.gemstone.gemfire.cache.RegionShortcut; -import com.gemstone.gemfire.cache.client.ClientCacheFactory; -import com.gemstone.gemfire.cache.query.data.Numbers; -import com.gemstone.gemfire.cache.query.data.Portfolio; -import com.gemstone.gemfire.cache.query.types.CollectionType; -import com.gemstone.gemfire.cache.query.types.ObjectType; -import com.gemstone.gemfire.cache30.CacheSerializableRunnable; -import com.gemstone.gemfire.test.dunit.SerializableRunnable; -import com.gemstone.gemfire.test.dunit.VM; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; /** * Utility class for testing supported queries @@ -1068,7 +1051,7 @@ public class QueryTestUtils implements Serializable { cache = new CacheFactory(prop).create(); } else{ - cache = new CacheFactory().set("mcast-port", "0").create(); + cache = new CacheFactory().set(MCAST_PORT, "0").create(); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HelperTestCase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HelperTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HelperTestCase.java index f4132da..a13b11d 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HelperTestCase.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HelperTestCase.java @@ -16,40 +16,24 @@ */ package com.gemstone.gemfire.cache.query.dunit; -import java.util.Iterator; -import java.util.Properties; - -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheException; -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.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.query.CqAttributes; -import com.gemstone.gemfire.cache.query.CqAttributesFactory; -import com.gemstone.gemfire.cache.query.CqEvent; -import com.gemstone.gemfire.cache.query.CqException; -import com.gemstone.gemfire.cache.query.CqExistsException; -import com.gemstone.gemfire.cache.query.CqListener; -import com.gemstone.gemfire.cache.query.IndexExistsException; -import com.gemstone.gemfire.cache.query.IndexNameConflictException; -import com.gemstone.gemfire.cache.query.QueryTestUtils; -import com.gemstone.gemfire.cache.query.RegionNotFoundException; +import com.gemstone.gemfire.cache.query.*; import com.gemstone.gemfire.cache.query.internal.index.CompactRangeIndex; 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.cache.GemFireCacheImpl; -import com.gemstone.gemfire.test.dunit.AsyncInvocation; -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.*; + +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 HelperTestCase extends CacheTestCase { @@ -252,15 +236,15 @@ public class HelperTestCase extends CacheTestCase { protected Properties getClientProperties() { 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(int mcastPort) { Properties p = new Properties(); - p.setProperty(DistributionConfig.MCAST_PORT_NAME, mcastPort+""); - p.setProperty(DistributionConfig.LOCATORS_NAME, ""); + p.setProperty(MCAST_PORT, mcastPort + ""); + p.setProperty(LOCATORS, ""); return p; } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java index 3e746e7..6edc675 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java @@ -16,30 +16,25 @@ */ package com.gemstone.gemfire.cache.query.dunit; -import java.io.File; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; -import java.util.stream.IntStream; - -import org.junit.Test; -import org.junit.experimental.categories.Category; - 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.data.Portfolio; import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.test.dunit.DistributedTestCase; -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.Invoke; -import com.gemstone.gemfire.test.dunit.SerializableRunnable; -import com.gemstone.gemfire.test.dunit.VM; +import com.gemstone.gemfire.test.dunit.*; import com.gemstone.gemfire.test.junit.categories.DistributedTest; import com.gemstone.gemfire.util.test.TestUtil; +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.Properties; +import java.util.stream.IntStream; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; @Category(DistributedTest.class) public class PartitionedRegionCompactRangeIndexDUnitTest extends DistributedTestCase { @@ -50,8 +45,8 @@ public class PartitionedRegionCompactRangeIndexDUnitTest extends DistributedTest private Properties getSystemProperties(String cacheXML) { Properties props = new Properties(); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); - props.setProperty("cache-xml-file", TestUtil.getResourcePath(getClass(), cacheXML)); + props.setProperty(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort() + "]"); + props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, TestUtil.getResourcePath(getClass(), cacheXML)); return props; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java index 6e4ed11..16ff4cf 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java @@ -16,34 +16,13 @@ */ package com.gemstone.gemfire.cache.query.dunit; -import java.io.File; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - import com.gemstone.gemfire.LogWriter; -import com.gemstone.gemfire.cache.AttributesFactory; 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.DataPolicy; -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.cache.Scope; -import com.gemstone.gemfire.cache.client.ClientCacheFactory; -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.IndexType; import com.gemstone.gemfire.cache.query.Query; -import com.gemstone.gemfire.cache.query.QueryException; import com.gemstone.gemfire.cache.query.QueryService; import com.gemstone.gemfire.cache.query.SelectResults; import com.gemstone.gemfire.cache.query.data.Portfolio; @@ -54,27 +33,21 @@ import com.gemstone.gemfire.cache.query.internal.index.IndexManager; import com.gemstone.gemfire.cache.query.internal.index.PartitionedIndex; import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.cache30.CacheTestCase; -import com.gemstone.gemfire.cache30.CertifiableTestCacheListener; -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.FileUtil; 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.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.Invoke; -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.Wait; -import com.gemstone.gemfire.test.dunit.WaitCriterion; +import com.gemstone.gemfire.test.dunit.*; import com.gemstone.gemfire.util.test.TestUtil; +import java.io.File; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Map; +import java.util.Properties; + public class QueryIndexUsingXMLDUnitTest extends CacheTestCase { static private final String WAIT_PROPERTY = "QueryIndexBuckets.maxWaitTime"; @@ -950,7 +923,7 @@ public class QueryIndexUsingXMLDUnitTest extends CacheTestCase { Cache cache = basicGetCache(); if (cache == null) { try { - System.setProperty("gemfire.DISABLE_DISCONNECT_DS_ON_CACHE_CLOSE", "true"); + System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "DISABLE_DISCONNECT_DS_ON_CACHE_CLOSE", "true"); cache = CacheFactory.create(system); } catch (CacheExistsException e) { Assert.fail("the cache already exists", e); @@ -961,7 +934,7 @@ public class QueryIndexUsingXMLDUnitTest extends CacheTestCase { } 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"); } } return cache; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java index cf55579..a35ef27 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java @@ -28,6 +28,7 @@ import com.gemstone.gemfire.cache.query.SelectResults; import com.gemstone.gemfire.cache.query.data.Portfolio; 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.AvailablePortHelper; import com.gemstone.gemfire.security.templates.DummyAuthenticator; import com.gemstone.gemfire.security.templates.UserPasswordAuthInit; @@ -37,6 +38,8 @@ import com.gemstone.gemfire.test.dunit.SerializableCallable; import com.gemstone.gemfire.test.dunit.VM; import org.junit.Ignore; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; + /** * Test for accessing query bind parameters from authorization callbacks * @@ -64,10 +67,10 @@ public class QueryParamsAuthorizationDUnitTest extends CacheTestCase { @Override public Object call() throws Exception { CacheFactory cf = new CacheFactory() - .set("mcast-port", "0") - .set("security-client-accessor", + .set(MCAST_PORT, "0") + .set(DistributionConfig.SECURITY_CLIENT_ACCESSOR_NAME, "com.gemstone.gemfire.cache.query.dunit.QueryAuthorization.create") - .set("security-client-authenticator", DummyAuthenticator.class.getName() + ".create"); + .set(DistributionConfig.SECURITY_CLIENT_AUTHENTICATOR_NAME, DummyAuthenticator.class.getName() + ".create"); Cache cache = getCache(cf); cache.createRegionFactory(RegionShortcut.REPLICATE).create(regName); CacheServer server = cache.addCacheServer(); @@ -84,7 +87,7 @@ public class QueryParamsAuthorizationDUnitTest extends CacheTestCase { public Object call() throws Exception { ClientCacheFactory ccf = new ClientCacheFactory() .addPoolServer(NetworkUtils.getServerHostName(server1.getHost()), port) - .set("security-client-auth-init", UserPasswordAuthInit.class.getName() + ".create") + .set(DistributionConfig.SECURITY_CLIENT_AUTH_INIT_NAME, UserPasswordAuthInit.class.getName() + ".create") .set("security-username", "root") .set("security-password", "root"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java index b79d695..a1f4262 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java @@ -47,6 +47,8 @@ import java.util.Properties; import java.util.Set; import java.util.concurrent.TimeUnit; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; + /** * Tests remote (client/server) query execution. * @@ -526,7 +528,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { private int createAndStartBridgeServer() { Properties config = new Properties(); - config.setProperty("locators", "localhost[" + DistributedTestUtils.getDUnitLocatorPort() + "]"); + config.setProperty(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort() + "]"); getSystem(config); try { return startBridgeServer(0, false); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java index 7f2dce7..4a8faa6 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java @@ -16,19 +16,11 @@ */ package com.gemstone.gemfire.cache.query.dunit; -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; -import java.util.Comparator; -import java.util.Properties; - +import cacheRunner.Portfolio; +import cacheRunner.Position; import com.gemstone.gemfire.DataSerializable; import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheException; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.Scope; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.client.PoolManager; import com.gemstone.gemfire.cache.query.QueryInvocationTargetException; import com.gemstone.gemfire.cache.query.SelectResults; @@ -40,22 +32,20 @@ import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.cache30.CacheTestCase; import com.gemstone.gemfire.cache30.ClientServerTestCase; -import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; -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.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.*; import com.gemstone.gemfire.test.junit.categories.FlakyTest; - -import cacheRunner.Portfolio; -import cacheRunner.Position; import org.junit.experimental.categories.Category; +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; +import java.util.Comparator; +import java.util.Properties; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; + /** * Tests remote (client/server) query execution. * @@ -97,7 +87,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase { vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") { public void run2() throws CacheException { Properties config = new Properties(); - config.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); + config.setProperty(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort() + "]"); InternalDistributedSystem system = getSystem(config); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -127,7 +117,7 @@ public class RemoteQueryDUnitTest 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"); getSystem(config); getCache(); AttributesFactory factory = new AttributesFactory(); @@ -240,7 +230,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase { vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") { public void run2() throws CacheException { Properties config = new Properties(); - config.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); + config.setProperty(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort() + "]"); getSystem(config); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -270,7 +260,7 @@ public class RemoteQueryDUnitTest 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"); getSystem(config); getCache(); AttributesFactory factory = new AttributesFactory(); @@ -368,7 +358,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase { vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") { public void run2() throws CacheException { Properties config = new Properties(); - config.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); + config.setProperty(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort() + "]"); getSystem(config); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -398,7 +388,7 @@ public class RemoteQueryDUnitTest 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"); getSystem(config); getCache(); AttributesFactory factory = new AttributesFactory(); @@ -494,7 +484,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase { vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") { public void run2() throws CacheException { Properties config = new Properties(); - config.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); + config.setProperty(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort() + "]"); getSystem(config); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -631,7 +621,7 @@ public class RemoteQueryDUnitTest 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"); getSystem(config); getCache(); AttributesFactory factory = new AttributesFactory(); @@ -688,7 +678,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase { vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") { public void run2() throws CacheException { Properties config = new Properties(); - config.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); + config.setProperty(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort() + "]"); getSystem(config); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -718,7 +708,7 @@ public class RemoteQueryDUnitTest 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"); getSystem(config); getCache(); AttributesFactory factory = new AttributesFactory(); @@ -853,7 +843,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase { vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") { public void run2() throws CacheException { Properties config = new Properties(); - config.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); + config.setProperty(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort() + "]"); getSystem(config); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -888,7 +878,7 @@ public class RemoteQueryDUnitTest 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"); getSystem(config); getCache(); AttributesFactory factory = new AttributesFactory(); @@ -955,7 +945,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase { vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") { public void run2() throws CacheException { Properties config = new Properties(); - config.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); + config.setProperty(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort() + "]"); getSystem(config); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -985,7 +975,7 @@ public class RemoteQueryDUnitTest 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"); getSystem(config); PoolManager.createFactory().addServer(host0, port).setSubscriptionEnabled(true).create("clientPool"); getCache(); @@ -1000,7 +990,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase { vm2.invoke(new CacheSerializableRunnable("Create region") { public void run2() throws CacheException { Properties config = new Properties(); - config.setProperty("mcast-port", "0"); + config.setProperty(MCAST_PORT, "0"); getSystem(config); PoolManager.createFactory().addServer(host0, port).setSubscriptionEnabled(true).create("clientPool"); getCache(); @@ -1114,7 +1104,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase { vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") { public void run2() throws CacheException { Properties config = new Properties(); - config.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); + config.setProperty(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort() + "]"); getSystem(config); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -1144,7 +1134,7 @@ public class RemoteQueryDUnitTest 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"); getSystem(config); PoolManager.createFactory().addServer(host0, port).setSubscriptionEnabled(true).create("clientPool"); getCache(); @@ -1218,7 +1208,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase { vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") { public void run2() throws CacheException { Properties config = new Properties(); - config.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); + config.setProperty(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort() + "]"); getSystem(config); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -1255,7 +1245,7 @@ public class RemoteQueryDUnitTest 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"); getSystem(config); PoolManager.createFactory().addServer(host0, port).setSubscriptionEnabled(true).create("clientPool"); getCache(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java index 8b392cb..b54e5d6 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java @@ -16,64 +16,34 @@ */ package com.gemstone.gemfire.cache.query.dunit; -import java.util.Iterator; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - -import util.TestException; - -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.CacheException; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.PartitionAttributesFactory; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.cache.client.ClientCacheFactory; -import com.gemstone.gemfire.cache.client.PoolFactory; -import com.gemstone.gemfire.cache.client.PoolManager; -import com.gemstone.gemfire.cache.client.ServerOperationException; -import com.gemstone.gemfire.cache.query.FunctionDomainException; -import com.gemstone.gemfire.cache.query.Index; -import com.gemstone.gemfire.cache.query.IndexInvalidException; -import com.gemstone.gemfire.cache.query.NameResolutionException; -import com.gemstone.gemfire.cache.query.Query; -import com.gemstone.gemfire.cache.query.QueryException; -import com.gemstone.gemfire.cache.query.QueryExecutionLowMemoryException; -import com.gemstone.gemfire.cache.query.QueryExecutionTimeoutException; -import com.gemstone.gemfire.cache.query.QueryInvocationTargetException; -import com.gemstone.gemfire.cache.query.QueryService; -import com.gemstone.gemfire.cache.query.SelectResults; -import com.gemstone.gemfire.cache.query.TypeMismatchException; +import com.gemstone.gemfire.cache.*; +import com.gemstone.gemfire.cache.client.*; +import com.gemstone.gemfire.cache.query.*; import com.gemstone.gemfire.cache.query.data.Portfolio; import com.gemstone.gemfire.cache.query.internal.DefaultQuery; import com.gemstone.gemfire.cache.query.internal.QueryMonitor; import com.gemstone.gemfire.cache.server.CacheServer; -import com.gemstone.gemfire.cache30.ClientServerTestCase; import com.gemstone.gemfire.cache30.CacheSerializableRunnable; +import com.gemstone.gemfire.cache30.ClientServerTestCase; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.internal.cache.DistributedRegion; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.cache.PartitionedRegion; -import com.gemstone.gemfire.internal.cache.control.HeapMemoryMonitor; -import com.gemstone.gemfire.internal.cache.control.InternalResourceManager; +import com.gemstone.gemfire.internal.cache.control.*; import com.gemstone.gemfire.internal.cache.control.InternalResourceManager.ResourceType; -import com.gemstone.gemfire.internal.cache.control.MemoryEvent; -import com.gemstone.gemfire.internal.cache.control.ResourceListener; -import com.gemstone.gemfire.internal.cache.control.TestMemoryThresholdListener; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -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.Invoke; -import com.gemstone.gemfire.test.dunit.NetworkUtils; -import com.gemstone.gemfire.test.dunit.SerializableCallable; -import com.gemstone.gemfire.test.dunit.ThreadUtils; -import com.gemstone.gemfire.test.dunit.VM; +import com.gemstone.gemfire.test.dunit.*; +import util.TestException; + +import java.util.Iterator; +import java.util.Properties; +import java.util.Set; +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; public class ResourceManagerWithQueryMonitorDUnitTest extends ClientServerTestCase { @@ -963,10 +933,10 @@ public class ResourceManagerWithQueryMonitorDUnitTest extends ClientServerTestCa public Object call() throws Exception { getSystem(getServerProperties(disableQueryMonitorForLowMemory, queryTimeout)); if (disableQueryMonitorForLowMemory == true) { - System.setProperty("gemfire.Cache.DISABLE_QUERY_MONITOR_FOR_LOW_MEMORY", "true"); + System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "Cache.DISABLE_QUERY_MONITOR_FOR_LOW_MEMORY", "true"); } else { - System.clearProperty("gemfire.Cache.DISABLE_QUERY_MONITOR_FOR_LOW_MEMORY"); + System.clearProperty(DistributionConfig.GEMFIRE_PREFIX + "Cache.DISABLE_QUERY_MONITOR_FOR_LOW_MEMORY"); } GemFireCacheImpl cache = (GemFireCacheImpl)getCache(); @@ -1052,14 +1022,14 @@ public class ResourceManagerWithQueryMonitorDUnitTest extends ClientServerTestCa 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(boolean disableQueryMonitorForMemory, int queryTimeout) { 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/functional/CountStarJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/CountStarJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/CountStarJUnitTest.java index 7b28cae..f58d4bd 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/CountStarJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/CountStarJUnitTest.java @@ -19,31 +19,20 @@ */ package com.gemstone.gemfire.cache.query.functional; -import java.util.ArrayList; -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.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 static org.junit.Assert.*; +import java.util.ArrayList; +import java.util.HashMap; -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.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.Portfolio; -import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import static org.junit.Assert.*; /** * This test runs {Select COUNT(*) from /regionName [where clause]} queries @@ -63,7 +52,7 @@ public class CountStarJUnitTest { @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/DistinctResultsWithDupValuesInRegionJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/DistinctResultsWithDupValuesInRegionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/DistinctResultsWithDupValuesInRegionJUnitTest.java index 3137581..6770a74 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/DistinctResultsWithDupValuesInRegionJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/DistinctResultsWithDupValuesInRegionJUnitTest.java @@ -19,29 +19,22 @@ */ 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.util.List; - -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.util.List; + +import static org.junit.Assert.*; /** * @@ -57,7 +50,7 @@ public class DistinctResultsWithDupValuesInRegionJUnitTest { @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/IUMRSingleRegionJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IUMRSingleRegionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IUMRSingleRegionJUnitTest.java index 03e90f2..12724ea 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IUMRSingleRegionJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IUMRSingleRegionJUnitTest.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; /** */ @@ -128,7 +110,7 @@ public class IUMRSingleRegionJUnitTest { @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 containing Country objects */ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java index 654a6c9..ca2fe2f 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java @@ -26,41 +26,8 @@ */ package com.gemstone.gemfire.cache.query.functional; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import java.io.File; -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 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.AttributesFactory; -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.query.CacheUtils; -import com.gemstone.gemfire.cache.query.Index; -import com.gemstone.gemfire.cache.query.IndexStatistics; -import com.gemstone.gemfire.cache.query.IndexType; -import com.gemstone.gemfire.cache.query.Query; -import com.gemstone.gemfire.cache.query.QueryInvalidException; -import com.gemstone.gemfire.cache.query.QueryService; -import com.gemstone.gemfire.cache.query.SelectResults; -import com.gemstone.gemfire.cache.query.Utils; +import com.gemstone.gemfire.cache.*; +import com.gemstone.gemfire.cache.query.*; import com.gemstone.gemfire.cache.query.data.ComparableWrapper; import com.gemstone.gemfire.cache.query.data.Portfolio; import com.gemstone.gemfire.cache.query.internal.DefaultQueryService; @@ -75,12 +42,23 @@ import com.gemstone.gemfire.cache.query.internal.types.StructTypeImpl; import com.gemstone.gemfire.cache.query.types.ObjectType; import com.gemstone.gemfire.cache.query.types.StructType; import com.gemstone.gemfire.distributed.DistributedSystem; +import com.gemstone.gemfire.distributed.SystemConfigurationProperties; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; -import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.FileUtil; import com.gemstone.gemfire.internal.cache.LocalRegion; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import junit.framework.Assert; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import java.io.File; +import java.util.*; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static org.junit.Assert.*; @Category(IntegrationTest.class) public class IndexCreationJUnitTest{ @@ -869,9 +847,9 @@ public class IndexCreationJUnitTest{ { Properties props = new Properties(); - props.setProperty(DistributionConfig.NAME_NAME, "test"); - props.setProperty("mcast-port", "0"); - props.setProperty("cache-xml-file", IndexCreationJUnitTest.class.getResource("index-creation-with-eviction.xml").toURI().getPath()); + props.setProperty(SystemConfigurationProperties.NAME, "test"); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, IndexCreationJUnitTest.class.getResource("index-creation-with-eviction.xml").toURI().getPath()); DistributedSystem ds = DistributedSystem.connect(props); // Create the cache which causes the cache-xml-file to be parsed @@ -893,11 +871,12 @@ public class IndexCreationJUnitTest{ { Properties props = new Properties(); - props.setProperty(DistributionConfig.NAME_NAME, "test"); - props.setProperty("mcast-port", "0"); + props.setProperty(SystemConfigurationProperties.NAME, "test"); + props.setProperty(MCAST_PORT, "0"); //Using a different cache.xml that changes some region properties //That will force the disk code to copy the region entries. - props.setProperty("cache-xml-file", IndexCreationJUnitTest.class.getResource("index-creation-without-eviction.xml").toURI().getPath()); + props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, + IndexCreationJUnitTest.class.getResource("index-creation-without-eviction.xml").toURI().getPath()); DistributedSystem ds = DistributedSystem.connect(props); Cache cache = CacheFactory.create(ds); QueryService qs = cache.getQueryService(); @@ -918,9 +897,10 @@ public class IndexCreationJUnitTest{ file.mkdir(); Properties props = new Properties(); - props.setProperty(DistributionConfig.NAME_NAME, "test"); - props.setProperty("mcast-port", "0"); - props.setProperty("cache-xml-file", IndexCreationJUnitTest.class.getResource("index-creation-without-eviction.xml").toURI().getPath()); + props.setProperty(SystemConfigurationProperties.NAME, "test"); + props.setProperty(MCAST_PORT, "0"); + props + .setProperty(DistributionConfig.CACHE_XML_FILE_NAME, IndexCreationJUnitTest.class.getResource("index-creation-without-eviction.xml").toURI().getPath()); DistributedSystem ds = DistributedSystem.connect(props); Cache cache = CacheFactory.create(ds); Region localRegion = cache.getRegion("localRegion"); @@ -945,9 +925,10 @@ public class IndexCreationJUnitTest{ file.mkdir(); Properties props = new Properties(); - props.setProperty(DistributionConfig.NAME_NAME, "test"); - props.setProperty("mcast-port", "0"); - props.setProperty("cache-xml-file", IndexCreationJUnitTest.class.getResource("index-creation-without-eviction.xml").toURI().getPath()); + props.setProperty(SystemConfigurationProperties.NAME, "test"); + props.setProperty(MCAST_PORT, "0"); + props + .setProperty(DistributionConfig.CACHE_XML_FILE_NAME, IndexCreationJUnitTest.class.getResource("index-creation-without-eviction.xml").toURI().getPath()); DistributedSystem ds = DistributedSystem.connect(props); Cache cache = CacheFactory.create(ds); Region localDiskRegion = cache.getRegion("localDiskRegion"); @@ -973,11 +954,11 @@ public class IndexCreationJUnitTest{ { Properties props = new Properties(); - props.setProperty(DistributionConfig.NAME_NAME, "test"); - props.setProperty("mcast-port", "0"); - props.setProperty("statistic-sampling-enabled", "true"); - props.setProperty("enable-time-statistics", "true"); - props.setProperty("cache-xml-file", IndexCreationJUnitTest.class.getResource("index-recovery-overflow.xml").toURI().getPath()); + props.setProperty(SystemConfigurationProperties.NAME, "test"); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true"); + props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true"); + props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, IndexCreationJUnitTest.class.getResource("index-recovery-overflow.xml").toURI().getPath()); DistributedSystem ds = DistributedSystem.connect(props); // Create the cache which causes the cache-xml-file to be parsed @@ -1007,11 +988,11 @@ public class IndexCreationJUnitTest{ { Properties props = new Properties(); - props.setProperty(DistributionConfig.NAME_NAME, "test"); - props.setProperty("mcast-port", "0"); - props.setProperty("statistic-sampling-enabled", "true"); - props.setProperty("enable-time-statistics", "true"); - props.setProperty("cache-xml-file", IndexCreationJUnitTest.class.getResource("index-recovery-overflow.xml").toURI().getPath()); + props.setProperty(SystemConfigurationProperties.NAME, "test"); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true"); + props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true"); + props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, IndexCreationJUnitTest.class.getResource("index-recovery-overflow.xml").toURI().getPath()); DistributedSystem ds = DistributedSystem.connect(props); Cache cache = CacheFactory.create(ds); QueryService qs = cache.getQueryService();
