You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/05/24 00:31:34 UTC
[09/29] incubator-geode git commit: Converting dunits to junit 4
using dunits_to_junit4.sh
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
index 484d7e9..3d34a29 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.internal.cache.tier.sockets;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
import com.gemstone.gemfire.test.dunit.Assert;
@@ -29,11 +38,12 @@ import com.gemstone.gemfire.cache.client.internal.PoolImpl;
*
*
*/
+@Category(DistributedTest.class)
public class RedundancyLevelPart3DUnitTest extends RedundancyLevelTestBase
{
/** constructor */
- public RedundancyLevelPart3DUnitTest(String name) {
- super(name);
+ public RedundancyLevelPart3DUnitTest() {
+ super();
}
public static void caseSetUp() throws Exception {
@@ -47,6 +57,7 @@ public class RedundancyLevelPart3DUnitTest extends RedundancyLevelTestBase
* whichever occurs first
*
*/
+ @Test
public void testRegisterInterestAndMakePrimaryWithFullRedundancy()
{
try {
@@ -151,6 +162,7 @@ public class RedundancyLevelPart3DUnitTest extends RedundancyLevelTestBase
*
*/
+ @Test
public void testRegisterInterestAndMakePrimaryWithZeroRedundancy()
{
try {
@@ -202,6 +214,7 @@ public class RedundancyLevelPart3DUnitTest extends RedundancyLevelTestBase
* whichever occurs first
*
*/
+ @Test
public void testRegisterInterestAndMakePrimaryWithRedundancyOne()
{
try {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
index 285d200..980c4c8 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.internal.cache.tier.sockets;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -55,7 +64,8 @@ import com.gemstone.gemfire.internal.cache.CacheServerImpl;
*
*
*/
-public class RedundancyLevelTestBase extends DistributedTestCase
+@Category(DistributedTest.class)
+public class RedundancyLevelTestBase extends JUnit4DistributedTestCase
{
static Cache cache = null;
@@ -93,8 +103,8 @@ public class RedundancyLevelTestBase extends DistributedTestCase
static boolean FailOverDetectionByCCU = false;
/** constructor */
- public RedundancyLevelTestBase(String name) {
- super(name);
+ public RedundancyLevelTestBase() {
+ super();
}
public static void caseSetUp() throws Exception {
@@ -549,7 +559,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase
Properties props = new Properties();
props.setProperty("mcast-port", "0");
props.setProperty("locators", "");
- new RedundancyLevelTestBase("temp").createCache(props);
+ new RedundancyLevelTestBase().createCache(props);
PoolImpl p = (PoolImpl)PoolManager.createFactory()
.addServer(host, PORT1)
@@ -577,7 +587,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase
public static Integer createServerCache() throws Exception
{
- new RedundancyLevelTestBase("temp").createCache(new Properties());
+ new RedundancyLevelTestBase().createCache(new Properties());
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
factory.setEnableConflation(true);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java
index 65b46d5..6fc9a35 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.internal.cache.tier.sockets;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import java.util.*;
import com.gemstone.gemfire.cache.AttributesFactory;
@@ -47,7 +56,8 @@ import com.gemstone.gemfire.cache.client.*;
*
*/
-public class RegionCloseDUnitTest extends DistributedTestCase
+@Category(DistributedTest.class)
+public class RegionCloseDUnitTest extends JUnit4DistributedTestCase
{
VM server1 = null;
@@ -63,8 +73,8 @@ public class RegionCloseDUnitTest extends DistributedTestCase
private static Cache cache = null;
/** constructor */
- public RegionCloseDUnitTest(String name) {
- super(name);
+ public RegionCloseDUnitTest() {
+ super();
}
@Override
@@ -91,6 +101,7 @@ public class RegionCloseDUnitTest extends DistributedTestCase
}
+ @Test
public void testCloseRegionOnClient()
{
server1.invoke(() -> RegionCloseDUnitTest.VerifyClientProxyOnServerBeforeClose());
@@ -105,7 +116,7 @@ public class RegionCloseDUnitTest extends DistributedTestCase
Properties props = new Properties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "");
- new RegionCloseDUnitTest("temp").createCache(props);
+ new RegionCloseDUnitTest().createCache(props);
Pool p = PoolManager.createFactory()
.addServer(host, PORT1)
.setSubscriptionEnabled(true)
@@ -128,7 +139,7 @@ public class RegionCloseDUnitTest extends DistributedTestCase
public static Integer createServerCache() throws Exception
{
- new RegionCloseDUnitTest("temp").createCache(new Properties());
+ new RegionCloseDUnitTest().createCache(new Properties());
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
factory.setDataPolicy(DataPolicy.REPLICATE);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java
index b1d4a8a..672261f 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.internal.cache.tier.sockets;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import java.util.Properties;
import com.gemstone.gemfire.cache.AttributesFactory;
@@ -61,7 +70,8 @@ import com.gemstone.gemfire.cache.client.*;
*
*/
-public class RegisterInterestBeforeRegionCreationDUnitTest extends DistributedTestCase
+@Category(DistributedTest.class)
+public class RegisterInterestBeforeRegionCreationDUnitTest extends JUnit4DistributedTestCase
{
/** Server1 VM **/
@@ -81,8 +91,8 @@ public class RegisterInterestBeforeRegionCreationDUnitTest extends DistributedTe
/** Server2 VM **/
protected static Cache cache = null;
- public RegisterInterestBeforeRegionCreationDUnitTest(String name) {
- super(name);
+ public RegisterInterestBeforeRegionCreationDUnitTest() {
+ super();
}
@Override
@@ -127,6 +137,7 @@ public class RegisterInterestBeforeRegionCreationDUnitTest extends DistributedTe
server2.invoke(verifyIfAllPutsGot());
client2.invoke(verifyIfAllPutsGot());
}
+ @Test
public void testDummyAsThereIsNoOtherTestInThisClass(){
//DO NOTHING
}
@@ -205,7 +216,7 @@ public class RegisterInterestBeforeRegionCreationDUnitTest extends DistributedTe
public static Integer createServer(Boolean createRegion) throws Exception
{
- new RegisterInterestBeforeRegionCreationDUnitTest("temp").createCache(new Properties());
+ new RegisterInterestBeforeRegionCreationDUnitTest().createCache(new Properties());
boolean isCreateRegion = createRegion.booleanValue();
if (isCreateRegion) {
AttributesFactory factory = new AttributesFactory();
@@ -239,7 +250,7 @@ public class RegisterInterestBeforeRegionCreationDUnitTest extends DistributedTe
Properties props = new Properties();
props.setProperty("mcast-port", "0");
props.setProperty("locators", "");
- new RegisterInterestBeforeRegionCreationDUnitTest("temp").createCache(props);
+ new RegisterInterestBeforeRegionCreationDUnitTest().createCache(props);
Pool p = PoolManager.createFactory()
.addServer(host, PORT1)
.setSubscriptionEnabled(true)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
index 1a3d81f..42d5990 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.internal.cache.tier.sockets;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import java.util.*;
import com.gemstone.gemfire.cache.*;
@@ -39,7 +48,8 @@ import com.gemstone.gemfire.cache.client.*;
*
*/
-public class RegisterInterestKeysDUnitTest extends DistributedTestCase
+@Category(DistributedTest.class)
+public class RegisterInterestKeysDUnitTest extends JUnit4DistributedTestCase
{
VM server1 = null;
@@ -61,8 +71,8 @@ public class RegisterInterestKeysDUnitTest extends DistributedTestCase
static RegisterInterestKeysDUnitTest impl;
/** constructor */
- public RegisterInterestKeysDUnitTest(String name) {
- super(name);
+ public RegisterInterestKeysDUnitTest() {
+ super();
}
@Override
@@ -101,7 +111,7 @@ public class RegisterInterestKeysDUnitTest extends DistributedTestCase
/** subclass support */
public static void createImpl() {
- impl = new RegisterInterestKeysDUnitTest("temp");
+ impl = new RegisterInterestKeysDUnitTest();
}
private void createCache(Properties props) throws Exception
@@ -117,6 +127,7 @@ public class RegisterInterestKeysDUnitTest extends DistributedTestCase
* situation of Interest List fail over
*
*/
+ @Test
public void testRegisterCreatesInvalidEntry()
{
// First create entries on both servers via the two client
@@ -149,7 +160,7 @@ public class RegisterInterestKeysDUnitTest extends DistributedTestCase
Properties props = new Properties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "");
- new RegisterInterestKeysDUnitTest("temp").createCache(props);
+ new RegisterInterestKeysDUnitTest().createCache(props);
CacheServerTestUtil.disableShufflingOfEndpoints();
Pool p;
try {
@@ -177,7 +188,7 @@ public class RegisterInterestKeysDUnitTest extends DistributedTestCase
public static Integer createServerCache() throws Exception
{
- new RegisterInterestKeysDUnitTest("temp").createCache(new Properties());
+ new RegisterInterestKeysDUnitTest().createCache(new Properties());
RegionAttributes attrs = impl.createServerCacheAttributes();
cache.createRegion(REGION_NAME, attrs);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysPRDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysPRDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysPRDUnitTest.java
index 310112c..62d41e5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysPRDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysPRDUnitTest.java
@@ -16,19 +16,29 @@
*/
package com.gemstone.gemfire.internal.cache.tier.sockets;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import com.gemstone.gemfire.cache.*;
/**
* subclass of UpdatePropagationDUnitTest to exercise partitioned regions
*
*/
+@Category(DistributedTest.class)
public class RegisterInterestKeysPRDUnitTest extends RegisterInterestKeysDUnitTest {
- public RegisterInterestKeysPRDUnitTest(String name) {
- super(name);
+ public RegisterInterestKeysPRDUnitTest() {
+ super();
}
public static void createImpl() {
- impl = new RegisterInterestKeysPRDUnitTest("temp");
+ impl = new RegisterInterestKeysPRDUnitTest();
}
protected RegionAttributes createServerCacheAttributes()
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
index 26cfdfa..a045edd 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.internal.cache.tier.sockets;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
@@ -57,7 +66,8 @@ import com.gemstone.gemfire.test.junit.categories.FlakyTest;
* Tests the reliable messaging functionality - Client sends a periodic
* ack to the primary server for the messages received.
*/
-public class ReliableMessagingDUnitTest extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class ReliableMessagingDUnitTest extends JUnit4DistributedTestCase {
static VM server1 = null;
@@ -87,14 +97,15 @@ public class ReliableMessagingDUnitTest extends DistributedTestCase {
/**
* Constructor
*/
- public ReliableMessagingDUnitTest(String name) {
- super(name);
+ public ReliableMessagingDUnitTest() {
+ super();
}
/*
* Test verifies that client is sending periodic ack to the primary
* server for messages received.
*/
+ @Test
public void testPeriodicAckSendByClient() throws Exception
{
createEntries();
@@ -111,6 +122,7 @@ public class ReliableMessagingDUnitTest extends DistributedTestCase {
* QRM to other redundant servers.
*/
@Category(FlakyTest.class) // GEODE-694: async queuing
+ @Test
public void testPeriodicAckSendByClientPrimaryFailover() throws Exception {
IgnoredException.addIgnoredException("java.net.ConnectException");
createEntries();
@@ -354,7 +366,7 @@ public class ReliableMessagingDUnitTest extends DistributedTestCase {
public static Integer createServerCache() throws Exception
{
- ReliableMessagingDUnitTest test = new ReliableMessagingDUnitTest("temp");
+ ReliableMessagingDUnitTest test = new ReliableMessagingDUnitTest();
Properties props = new Properties();
cache = test.createCache(props);
AttributesFactory factory = new AttributesFactory();
@@ -378,7 +390,7 @@ public class ReliableMessagingDUnitTest extends DistributedTestCase {
public static void createClientCache(int port1, int port2) throws Exception
{
- ReliableMessagingDUnitTest test = new ReliableMessagingDUnitTest("temp");
+ ReliableMessagingDUnitTest test = new ReliableMessagingDUnitTest();
Properties props = new Properties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
index b7980d4..2b970ed 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
@@ -19,6 +19,15 @@
*/
package com.gemstone.gemfire.internal.cache.tier.sockets;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import java.util.ArrayList;
import java.util.Properties;
@@ -47,7 +56,8 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
/**
*/
-public class UnregisterInterestDUnitTest extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class UnregisterInterestDUnitTest extends JUnit4DistributedTestCase {
private VM server0 = null;
private VM client1 = null;
@@ -65,8 +75,8 @@ public class UnregisterInterestDUnitTest extends DistributedTestCase {
/**
* @param name
*/
- public UnregisterInterestDUnitTest(String name) {
- super(name);
+ public UnregisterInterestDUnitTest() {
+ super();
}
@Override
@@ -105,6 +115,7 @@ public class UnregisterInterestDUnitTest extends DistributedTestCase {
*
* @throws Exception
*/
+ @Test
public void testUnregisterInterestAllKeys() throws Exception {
server0.invoke(() -> UnregisterInterestDUnitTest.checkRIArtifacts(all_keys, 0, 0));
client1.invoke(() -> UnregisterInterestDUnitTest.registerInterest(all_keys, receiveValuesConstant, null));
@@ -124,6 +135,7 @@ public class UnregisterInterestDUnitTest extends DistributedTestCase {
*
* @throws Exception
*/
+ @Test
public void testUnregisterInterestKeys() throws Exception {
server0.invoke(() -> UnregisterInterestDUnitTest.checkRIArtifacts(list, 0, 0));
client1.invoke(UnregisterInterestDUnitTest.class, "registerInterest", new Object[] {list, receiveValuesConstant, new String[]{"key_1", "key_2", "key_3", "key_4", "key_5"}});
@@ -144,6 +156,7 @@ public class UnregisterInterestDUnitTest extends DistributedTestCase {
*
* @throws Exception
*/
+ @Test
public void testUnregisterInterestPatterns() throws Exception {
server0.invoke(() -> UnregisterInterestDUnitTest.checkRIArtifacts(regex, 0, 0));
client1.invoke(UnregisterInterestDUnitTest.class, "registerInterest", new Object[] {regex, receiveValuesConstant, new String[] {"[a-z]*[0-9]"}});
@@ -165,6 +178,7 @@ public class UnregisterInterestDUnitTest extends DistributedTestCase {
*
* @throws Exception
*/
+ @Test
public void testUnregisterInterestKeysInvForOneClientDoesNotAffectOtherClient() throws Exception {
server0.invoke(() -> UnregisterInterestDUnitTest.checkRIArtifacts(list, 0, 0));
client1.invoke(UnregisterInterestDUnitTest.class, "registerInterest", new Object[] {list, !receiveValuesConstant, new String[] {"key_1", "key_2", "key_3", "key_4", "key_5"}});
@@ -188,6 +202,7 @@ public class UnregisterInterestDUnitTest extends DistributedTestCase {
*
* @throws Exception
*/
+ @Test
public void testUnregisterInterestRegexInvForOneClientDoesNotAffectOtherClient() throws Exception {
server0.invoke(() -> UnregisterInterestDUnitTest.checkRIArtifacts(regex, 0, 0));
client1.invoke(UnregisterInterestDUnitTest.class, "registerInterest", new Object[] {regex, !receiveValuesConstant, new String[] {"[a-z]*[0-9]"}});
@@ -310,7 +325,7 @@ public class UnregisterInterestDUnitTest extends DistributedTestCase {
}
public static Integer createCacheAndStartServer() throws Exception {
- DistributedSystem ds = new UnregisterInterestDUnitTest("UnregisterInterestDUnitTest").getSystem();
+ DistributedSystem ds = new UnregisterInterestDUnitTest().getSystem();
ds.disconnect();
Properties props = new Properties();
props.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]");
@@ -325,7 +340,7 @@ public class UnregisterInterestDUnitTest extends DistributedTestCase {
}
public static void createClientCache(Host host, Integer port) throws Exception {
- DistributedSystem ds = new UnregisterInterestDUnitTest("UnregisterInterestDUnitTest").getSystem();
+ DistributedSystem ds = new UnregisterInterestDUnitTest().getSystem();
ds.disconnect();
Properties props = new Properties();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java
index 167063e..90c3412 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.internal.cache.tier.sockets;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import java.util.Properties;
import com.gemstone.gemfire.cache.AttributesFactory;
@@ -44,7 +53,8 @@ import com.gemstone.gemfire.test.dunit.VM;
*
*/
-public class VerifyEventIDGenerationInP2PDUnitTest extends DistributedTestCase
+@Category(DistributedTest.class)
+public class VerifyEventIDGenerationInP2PDUnitTest extends JUnit4DistributedTestCase
{
private static Cache cache = null;
@@ -62,8 +72,8 @@ public class VerifyEventIDGenerationInP2PDUnitTest extends DistributedTestCase
/* Constructor */
- public VerifyEventIDGenerationInP2PDUnitTest(String name) {
- super(name);
+ public VerifyEventIDGenerationInP2PDUnitTest() {
+ super();
}
@Override
@@ -84,6 +94,7 @@ public class VerifyEventIDGenerationInP2PDUnitTest extends DistributedTestCase
assertFalse(pass.booleanValue());
}
+ @Test
public void testDummy() throws Exception
{
@@ -106,7 +117,7 @@ public class VerifyEventIDGenerationInP2PDUnitTest extends DistributedTestCase
public static void createServerCache() throws Exception
{
- new VerifyEventIDGenerationInP2PDUnitTest("temp")
+ new VerifyEventIDGenerationInP2PDUnitTest()
.createCache(new Properties());
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
index 639fb33..7974607 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.internal.cache.tier.sockets;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import java.util.Properties;
@@ -52,7 +61,8 @@ import com.gemstone.gemfire.cache.client.internal.ServerRegionProxy;
*
*/
-public class VerifyUpdatesFromNonInterestEndPointDUnitTest extends DistributedTestCase
+@Category(DistributedTest.class)
+public class VerifyUpdatesFromNonInterestEndPointDUnitTest extends JUnit4DistributedTestCase
{
VM vm0 = null;
@@ -67,8 +77,8 @@ public class VerifyUpdatesFromNonInterestEndPointDUnitTest extends DistributedTe
private static Cache cache = null;
/** constructor */
- public VerifyUpdatesFromNonInterestEndPointDUnitTest(String name) {
- super(name);
+ public VerifyUpdatesFromNonInterestEndPointDUnitTest() {
+ super();
}
@Override
@@ -98,6 +108,7 @@ public class VerifyUpdatesFromNonInterestEndPointDUnitTest extends DistributedTe
}
+ @Test
public void testVerifyUpdatesFromNonInterestEndPoint()
{
vm2.invoke(() -> VerifyUpdatesFromNonInterestEndPointDUnitTest.createEntries());
@@ -158,7 +169,7 @@ public class VerifyUpdatesFromNonInterestEndPointDUnitTest extends DistributedTe
public static void createClientCache(String host, Integer port1, Integer port2) throws Exception
{
- VerifyUpdatesFromNonInterestEndPointDUnitTest test = new VerifyUpdatesFromNonInterestEndPointDUnitTest("temp");
+ VerifyUpdatesFromNonInterestEndPointDUnitTest test = new VerifyUpdatesFromNonInterestEndPointDUnitTest();
Properties props = new Properties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "");
@@ -190,7 +201,7 @@ public class VerifyUpdatesFromNonInterestEndPointDUnitTest extends DistributedTe
public static Integer createServerCache() throws Exception
{
- cache = new VerifyUpdatesFromNonInterestEndPointDUnitTest("temp").createCache(new Properties());
+ cache = new VerifyUpdatesFromNonInterestEndPointDUnitTest().createCache(new Properties());
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
factory.setDataPolicy(DataPolicy.REPLICATE);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java
index 7da8d90..361f0cd 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.internal.cache.wan;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import java.io.DataInput;
import java.io.DataOutput;
import java.io.File;
@@ -87,7 +96,8 @@ import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.Wait;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
-public class AsyncEventQueueTestBase extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class AsyncEventQueueTestBase extends JUnit4DistributedTestCase {
protected static Cache cache;
@@ -116,8 +126,8 @@ public class AsyncEventQueueTestBase extends DistributedTestCase {
// list
protected static int numDispatcherThreadsForTheRun = 1;
- public AsyncEventQueueTestBase(String name) {
- super(name);
+ public AsyncEventQueueTestBase() {
+ super();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
index a099617..3aded28 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.internal.cache.wan.asyncqueue;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
@@ -42,18 +51,20 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnableIF;
import com.gemstone.gemfire.test.dunit.Wait;
import com.gemstone.gemfire.test.junit.categories.FlakyTest;
+@Category(DistributedTest.class)
public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
private static final long serialVersionUID = 1L;
- public AsyncEventListenerDUnitTest(String name) {
- super(name);
+ public AsyncEventListenerDUnitTest() {
+ super();
}
/**
* Test to verify that AsyncEventQueue can not be created when null listener
* is passed.
*/
+ @Test
public void testCreateAsyncEventQueueWithNullListener() {
AsyncEventQueueTestBase test = new AsyncEventQueueTestBase(getTestMethodName());
Properties props = new Properties();
@@ -73,6 +84,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
}
+ @Test
public void testSerialAsyncEventQueueAttributes() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -84,6 +96,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
vm1.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventQueueAttributes( "ln", 100, 150, AsyncEventQueueFactoryImpl.DEFAULT_BATCH_TIME_INTERVAL, true, "testDS", true, true ));
}
+ @Test
public void testSerialAsyncEventQueueSize() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -142,6 +155,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
* Added to reproduce defect #50366:
* NullPointerException with AsyncEventQueue#size() when number of dispatchers is more than 1
*/
+ @Test
public void testConcurrentSerialAsyncEventQueueSize() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -183,6 +197,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
* channel persistence enabled: false
*/
+ @Test
public void testReplicatedSerialAsyncEventQueue() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -214,6 +229,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
* Verify that the events loaded by CacheLoader reach the AsyncEventListener
* with correct operation detail (added for defect #50237).
*/
+ @Test
public void testReplicatedSerialAsyncEventQueueWithCacheLoader() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -257,6 +273,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
* Added to test the fix done for defect #45152.
*/
+ @Test
public void testReplicatedSerialAsyncEventQueue_ExceptionScenario() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -309,6 +326,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
* Region: Replicated WAN: Serial Region persistence enabled: false Async
* channel persistence enabled: false AsyncEventQueue conflation enabled: true
*/
+ @Test
public void testReplicatedSerialAsyncEventQueueWithConflationEnabled() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -431,6 +449,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
* No VM is restarted.
*/
+ @Test
public void testReplicatedSerialAsyncEventQueueWithPeristenceEnabled() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -554,6 +573,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
* Dispatcher threads: more than 1
* Order policy: key based ordering
*/
+ @Test
public void testConcurrentSerialAsyncEventQueueWithReplicatedRegion() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -592,6 +612,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
* Region persistence enabled: false
* Async queue persistence enabled: false
*/
+ @Test
public void testConcurrentSerialAsyncEventQueueWithReplicatedRegion_2() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -632,6 +653,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
* Dispatcher threads set to more than 1 but no order policy set.
* Added for defect #50514.
*/
+ @Test
public void testConcurrentSerialAsyncEventQueueWithoutOrderPolicy() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -668,6 +690,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
* Region: Partitioned WAN: Serial Region persistence enabled: false Async
* channel persistence enabled: false
*/
+ @Test
public void testPartitionedSerialAsyncEventQueue() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -702,6 +725,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
* Region: Partitioned WAN: Serial Region persistence enabled: false Async
* channel persistence enabled: false AsyncEventQueue conflation enabled: true
*/
+ @Test
public void testPartitionedSerialAsyncEventQueueWithConflationEnabled() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -786,6 +810,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
*
* No VM is restarted.
*/
+ @Test
public void testPartitionedSerialAsyncEventQueueWithPeristenceEnabled() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -826,6 +851,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
*
* There is only one vm in the site and that vm is restarted
*/
+ @Test
public void testPartitionedSerialAsyncEventQueueWithPeristenceEnabled_Restart() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -858,6 +884,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
vm1.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 1000 ));// primary sender
}
+ @Test
public void testParallelAsyncEventQueueWithReplicatedRegion() {
try {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -887,6 +914,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
}
}
+ @Test
public void testParallelAsyncEventQueue() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -925,6 +953,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
assertEquals(vm1size + vm2size + vm3size + vm4size, 256);
}
+ @Test
public void testParallelAsyncEventQueueWithSubstitutionFilter() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -944,6 +973,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
vm1.invoke(() -> verifySubstitutionFilterInvocations( "ln" ,numPuts ));
}
+ @Test
public void testParallelAsyncEventQueueWithSubstitutionFilterNoSubstituteValueToDataInvocations() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -967,6 +997,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
* Verify that the events reaching the AsyncEventListener have correct operation detail.
* (added for defect #50237).
*/
+ @Test
public void testParallelAsyncEventQueueWithCacheLoader() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -997,6 +1028,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
vm4.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventForOperationDetail( "ln", 250, false, true ));
}
+ @Test
public void testParallelAsyncEventQueueSize() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -1043,6 +1075,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
* Added to reproduce defect #50366:
* NullPointerException with AsyncEventQueue#size() when number of dispatchers is more than 1
*/
+ @Test
public void testConcurrentParallelAsyncEventQueueSize() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -1085,6 +1118,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
assertEquals("Size of AsyncEventQueue is incorrect", 1000, vm2size);
}
+ @Test
public void testParallelAsyncEventQueueWithConflationEnabled() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -1169,6 +1203,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
/**
* Added to reproduce defect #47213
*/
+ @Test
public void testParallelAsyncEventQueueWithConflationEnabled_bug47213() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -1246,6 +1281,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
}
+ @Test
public void testParallelAsyncEventQueueWithOneAccessor() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -1286,6 +1322,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
}
+ @Test
public void testParallelAsyncEventQueueWithPersistence() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -1382,6 +1419,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
* between vm1 & vm3.
*/
@Category(FlakyTest.class) // GEODE-688 & GEODE-713: random ports, thread sleeps, async actions
+ @Test
public void testParallelAsyncEventQueueHA_Scenario2() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -1448,6 +1486,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
* vm1, vm2 & vm3.
*/
@Ignore("Depends on hydra code. See bug ")
+ @Test
public void testParallelAsyncEventQueueHA_Scenario3() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -1506,6 +1545,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
/**
* Added for defect #50364 Can't colocate region that has AEQ with a region that does not have that same AEQ
*/
+ @Test
public void testParallelAsyncEventQueueAttachedToChildRegionButNotToParentRegion() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerOffHeapDUnitTest.java
index e78dd6b..170383d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerOffHeapDUnitTest.java
@@ -16,11 +16,21 @@
*/
package com.gemstone.gemfire.internal.cache.wan.asyncqueue;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
@SuppressWarnings("serial")
+@Category(DistributedTest.class)
public class AsyncEventListenerOffHeapDUnitTest extends AsyncEventListenerDUnitTest {
- public AsyncEventListenerOffHeapDUnitTest(String name) {
- super(name);
+ public AsyncEventListenerOffHeapDUnitTest() {
+ super();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java
index 8972595..ef1137b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.internal.cache.wan.asyncqueue;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import java.util.HashMap;
import java.util.Map;
@@ -23,17 +32,19 @@ import com.gemstone.gemfire.internal.cache.wan.AsyncEventQueueTestBase;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
import com.gemstone.gemfire.test.dunit.Wait;
+@Category(DistributedTest.class)
public class AsyncEventQueueStatsDUnitTest extends AsyncEventQueueTestBase {
private static final long serialVersionUID = 1L;
- public AsyncEventQueueStatsDUnitTest(String name) {
- super(name);
+ public AsyncEventQueueStatsDUnitTest() {
+ super();
}
/**
* Normal replication scenario
*/
+ @Test
public void testReplicatedSerialPropagation() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -73,6 +84,7 @@ public class AsyncEventQueueStatsDUnitTest extends AsyncEventQueueTestBase {
/**
* Two listeners added to the same RR.
*/
+ @Test
public void testAsyncStatsTwoListeners() throws Exception {
Integer lnPort = createFirstLocatorWithDSId(1);
@@ -128,6 +140,7 @@ public class AsyncEventQueueStatsDUnitTest extends AsyncEventQueueTestBase {
/**
* HA scenario: kill one vm when puts are in progress on the other vm.
*/
+ @Test
public void testReplicatedSerialPropagationHA() throws Exception {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -174,6 +187,7 @@ public class AsyncEventQueueStatsDUnitTest extends AsyncEventQueueTestBase {
/**
* Two regions attached to same AsyncEventQueue
*/
+ @Test
public void testReplicatedSerialPropagationUNPorcessedEvents() throws Exception {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -228,6 +242,7 @@ public class AsyncEventQueueStatsDUnitTest extends AsyncEventQueueTestBase {
/**
* Test with conflation enabled
*/
+ @Test
public void testSerialPropagationConflation() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueDUnitTest.java
index 3e52393..e0216f1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.internal.cache.wan.concurrent;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import com.gemstone.gemfire.cache.asyncqueue.internal.AsyncEventQueueFactoryImpl;
import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
import com.gemstone.gemfire.internal.cache.wan.AsyncEventQueueTestBase;
@@ -25,14 +34,16 @@ import com.gemstone.gemfire.test.dunit.AsyncInvocation;
/**
*
*/
+@Category(DistributedTest.class)
public class ConcurrentAsyncEventQueueDUnitTest extends AsyncEventQueueTestBase {
private static final long serialVersionUID = 1L;
- public ConcurrentAsyncEventQueueDUnitTest(String name) {
- super(name);
+ public ConcurrentAsyncEventQueueDUnitTest() {
+ super();
}
+ @Test
public void testConcurrentSerialAsyncEventQueueAttributes() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -45,6 +56,7 @@ public class ConcurrentAsyncEventQueueDUnitTest extends AsyncEventQueueTestBase
}
+ @Test
public void testConcurrentParallelAsyncEventQueueAttributesOrderPolicyKey() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -56,6 +68,7 @@ public class ConcurrentAsyncEventQueueDUnitTest extends AsyncEventQueueTestBase
vm1.invoke(() -> AsyncEventQueueTestBase.validateConcurrentAsyncEventQueueAttributes( "ln", 100, 150, AsyncEventQueueFactoryImpl.DEFAULT_BATCH_TIME_INTERVAL, true, "testDS", true, true, 5, OrderPolicy.KEY ));
}
+ @Test
public void testConcurrentParallelAsyncEventQueueAttributesOrderPolicyPartition() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -76,6 +89,7 @@ public class ConcurrentAsyncEventQueueDUnitTest extends AsyncEventQueueTestBase
* Order policy: key based ordering
*/
+ @Test
public void testReplicatedSerialAsyncEventQueueWithMultipleDispatcherThreadsOrderPolicyKey() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -121,6 +135,7 @@ public class ConcurrentAsyncEventQueueDUnitTest extends AsyncEventQueueTestBase
* Order policy: Thread ordering
*/
+ @Test
public void testReplicatedSerialAsyncEventQueueWithMultipleDispatcherThreadsOrderPolicyThread() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -180,6 +195,7 @@ public class ConcurrentAsyncEventQueueDUnitTest extends AsyncEventQueueTestBase
* Order policy: key based ordering
*/
// Disabling test for bug #48323
+ @Test
public void testPartitionedParallelAsyncEventQueueWithMultipleDispatcherThreadsOrderPolicyKey() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
@@ -229,6 +245,7 @@ public class ConcurrentAsyncEventQueueDUnitTest extends AsyncEventQueueTestBase
* Order policy: PARTITION based ordering
*/
// Disabled test for bug #48323
+ @Test
public void testPartitionedParallelAsyncEventQueueWithMultipleDispatcherThreadsOrderPolicyPartition() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueOffHeapDUnitTest.java
index ac6472e..8e5034f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueOffHeapDUnitTest.java
@@ -16,12 +16,22 @@
*/
package com.gemstone.gemfire.internal.cache.wan.concurrent;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
@SuppressWarnings("serial")
+@Category(DistributedTest.class)
public class ConcurrentAsyncEventQueueOffHeapDUnitTest extends
ConcurrentAsyncEventQueueDUnitTest {
- public ConcurrentAsyncEventQueueOffHeapDUnitTest(String name) {
- super(name);
+ public ConcurrentAsyncEventQueueOffHeapDUnitTest() {
+ super();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelAsyncEventQueueDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelAsyncEventQueueDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelAsyncEventQueueDUnitTest.java
index 8a88d43..0261620 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelAsyncEventQueueDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelAsyncEventQueueDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.internal.cache.wan.misc;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import com.gemstone.gemfire.internal.cache.wan.AsyncEventQueueTestBase;
import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.IgnoredException;
@@ -23,14 +32,16 @@ import com.gemstone.gemfire.test.dunit.IgnoredException;
/**
*
*/
+@Category(DistributedTest.class)
public class CommonParallelAsyncEventQueueDUnitTest extends AsyncEventQueueTestBase {
private static final long serialVersionUID = 1L;
- public CommonParallelAsyncEventQueueDUnitTest(String name) {
- super(name);
+ public CommonParallelAsyncEventQueueDUnitTest() {
+ super();
}
+ @Test
public void testSameSenderWithNonColocatedRegions() throws Exception {
IgnoredException.addIgnoredException("cannot have the same parallel async");
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelAsyncEventQueueOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelAsyncEventQueueOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelAsyncEventQueueOffHeapDUnitTest.java
index bceae58..f570cfb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelAsyncEventQueueOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelAsyncEventQueueOffHeapDUnitTest.java
@@ -16,12 +16,22 @@
*/
package com.gemstone.gemfire.internal.cache.wan.misc;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
@SuppressWarnings("serial")
+@Category(DistributedTest.class)
public class CommonParallelAsyncEventQueueOffHeapDUnitTest extends
CommonParallelAsyncEventQueueDUnitTest {
- public CommonParallelAsyncEventQueueOffHeapDUnitTest(String name) {
- super(name);
+ public CommonParallelAsyncEventQueueOffHeapDUnitTest() {
+ super();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheConfigDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheConfigDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheConfigDUnitTest.java
index 5aa9278..3393fc5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheConfigDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheConfigDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.internal.compression;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import java.io.File;
import java.io.IOException;
import java.io.PrintStream;
@@ -37,7 +46,8 @@ import com.gemstone.gemfire.test.dunit.VM;
* Tests configured and badly configured cache.xml files with regards to compression.
*
*/
-public class CompressionCacheConfigDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class CompressionCacheConfigDUnitTest extends JUnit4CacheTestCase {
/**
* The name of our test region.
*/
@@ -57,8 +67,8 @@ public class CompressionCacheConfigDUnitTest extends CacheTestCase {
* Create a new CompressionCacheConfigDUnitTest.
* @param name test name.
*/
- public CompressionCacheConfigDUnitTest(String name) {
- super(name);
+ public CompressionCacheConfigDUnitTest() {
+ super();
}
/**
@@ -66,6 +76,7 @@ public class CompressionCacheConfigDUnitTest extends CacheTestCase {
* a compressor is included in the region attributes.
* @throws Exception
*/
+ @Test
public void testCreateCacheWithGoodCompressor() throws Exception {
try {
SnappyCompressor.getDefaultInstance();
@@ -85,6 +96,7 @@ public class CompressionCacheConfigDUnitTest extends CacheTestCase {
* cache.xml.
* @throws Exception
*/
+ @Test
public void testCreateCacheWithBadCompressor() throws Exception {
IgnoredException.addIgnoredException("Unable to load class BAD_COMPRESSOR");
File cacheXml = createCacheXml(BAD_COMPRESSOR);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheListenerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheListenerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheListenerDUnitTest.java
index f6f7eac..f649d9a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheListenerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheListenerDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.internal.compression;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
@@ -40,7 +49,8 @@ import com.gemstone.gemfire.test.dunit.VM;
* Asserts that values received in EntryEvents for CacheWriters and CacheListeners are not compressed.
*
*/
-public class CompressionCacheListenerDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class CompressionCacheListenerDUnitTest extends JUnit4CacheTestCase {
/**
* The name of our test region.
*/
@@ -156,8 +166,8 @@ public class CompressionCacheListenerDUnitTest extends CacheTestCase {
* @param name
* a test name.
*/
- public CompressionCacheListenerDUnitTest(String name) {
- super(name);
+ public CompressionCacheListenerDUnitTest() {
+ super();
}
@Override
@@ -219,6 +229,7 @@ public class CompressionCacheListenerDUnitTest extends CacheTestCase {
/**
* Tests CacheWriter and CacheListener events on the test vm.
*/
+ @Test
public void testCacheListenerAndWriter() {
testCacheListenerAndWriterWithVM(getVM(TEST_VM));
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheListenerOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheListenerOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheListenerOffHeapDUnitTest.java
index 0100a05..564d882 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheListenerOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheListenerOffHeapDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.internal.compression;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import java.util.Properties;
import com.gemstone.gemfire.compression.SnappyCompressor;
@@ -25,11 +34,12 @@ import com.gemstone.gemfire.test.dunit.Invoke;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
@SuppressWarnings("serial")
+@Category(DistributedTest.class)
public class CompressionCacheListenerOffHeapDUnitTest extends
CompressionCacheListenerDUnitTest {
- public CompressionCacheListenerOffHeapDUnitTest(String name) {
- super(name);
+ public CompressionCacheListenerOffHeapDUnitTest() {
+ super();
}
public static void caseSetUp() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionConfigDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionConfigDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionConfigDUnitTest.java
index 58cb117..93c8c00 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionConfigDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionConfigDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.internal.compression;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import java.io.IOException;
import com.gemstone.gemfire.cache.DataPolicy;
@@ -41,7 +50,8 @@ import com.gemstone.gemfire.test.dunit.standalone.DUnitLauncher;
* Sanity checks on a number of basic cluster configurations with compression turned on.
*
*/
-public class CompressionRegionConfigDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class CompressionRegionConfigDUnitTest extends JUnit4CacheTestCase {
/**
* The name of our test region.
*/
@@ -66,14 +76,15 @@ public class CompressionRegionConfigDUnitTest extends CacheTestCase {
* Creates a new CompressionRegionOperationsDUnitTest.
* @param name a test name.
*/
- public CompressionRegionConfigDUnitTest(String name) {
- super(name);
+ public CompressionRegionConfigDUnitTest() {
+ super();
}
/**
* Sanity check using two peers sharing a replicated region.
* @throws Exception
*/
+ @Test
public void testReplicateRegion() throws Exception {
Compressor compressor = null;
try {
@@ -94,6 +105,7 @@ public class CompressionRegionConfigDUnitTest extends CacheTestCase {
* Sanity check for two peers sharing a persisted replicated region.
* @throws Exception
*/
+ @Test
public void testReplicatePersistentRegion() throws Exception {
Compressor compressor = null;
try {
@@ -116,6 +128,7 @@ public class CompressionRegionConfigDUnitTest extends CacheTestCase {
/**
* Sanity check for two peers hosting a partitioned region.
*/
+ @Test
public void testPartitionedRegion() {
Compressor compressor = null;
try {
@@ -135,6 +148,7 @@ public class CompressionRegionConfigDUnitTest extends CacheTestCase {
/**
* Sanity check for two peers hosting a persistent partitioned region.
*/
+ @Test
public void testPartitionedPersistentRegion() {
Compressor compressor = null;
try {
@@ -157,6 +171,7 @@ public class CompressionRegionConfigDUnitTest extends CacheTestCase {
/**
* Sanity check for a non caching client and a cache server.
*/
+ @Test
public void testClientProxyRegion() {
Compressor compressor = null;
try {
@@ -177,6 +192,7 @@ public class CompressionRegionConfigDUnitTest extends CacheTestCase {
/**
* Sanity check for a caching client and a cache server.
*/
+ @Test
public void testCachingClientProxyRegion() {
Compressor compressor = null;
try {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionFactoryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionFactoryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionFactoryDUnitTest.java
index 9f8d228..43f7d23 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionFactoryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionFactoryDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.internal.compression;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import com.gemstone.gemfire.cache.DataPolicy;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache30.CacheTestCase;
@@ -29,7 +38,8 @@ import com.gemstone.gemfire.test.dunit.VM;
/**
* Tests that the compressor region attribute is properly set or rejected by a RegionFactory.
*/
-public class CompressionRegionFactoryDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class CompressionRegionFactoryDUnitTest extends JUnit4CacheTestCase {
/**
* Compressed region name.
*/
@@ -49,14 +59,15 @@ public class CompressionRegionFactoryDUnitTest extends CacheTestCase {
* Creates a new CompressionRegionFactoryDUnitTest.
* @param name test name.
*/
- public CompressionRegionFactoryDUnitTest(String name) {
- super(name);
+ public CompressionRegionFactoryDUnitTest() {
+ super();
}
/**
* Asserts that a region is created when a valid compressor is used.
* Asserts that the region attributes contain the correct compressor value.
*/
+ @Test
public void testRegionFactoryCompressor() {
Compressor compressor = null;
try {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionOperationsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionOperationsDUnitTest.java
index dedf3eb..f8ff937 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionOperationsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionOperationsDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.internal.compression;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
@@ -37,7 +46,8 @@ import com.gemstone.gemfire.test.dunit.VM;
* Tests basic region operations with compression enabled.
*
*/
-public class CompressionRegionOperationsDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class CompressionRegionOperationsDUnitTest extends JUnit4CacheTestCase {
/**
* The name of our test region.
*/
@@ -123,8 +133,8 @@ public class CompressionRegionOperationsDUnitTest extends CacheTestCase {
* Creates a new CompressionRegionOperationsDUnitTest.
* @param name a test name.
*/
- public CompressionRegionOperationsDUnitTest(String name) {
- super(name);
+ public CompressionRegionOperationsDUnitTest() {
+ super();
}
@Override
@@ -177,6 +187,7 @@ public class CompressionRegionOperationsDUnitTest extends CacheTestCase {
/**
* Invokes basic get/put operations tests on the test vm.
*/
+ @Test
public void testGetPutOperations() {
testGetPutOperationsOnVM(getVM(TEST_VM));
}
@@ -244,6 +255,7 @@ public class CompressionRegionOperationsDUnitTest extends CacheTestCase {
/**
* Invokes key, value operations using the test VM.
*/
+ @Test
public void testKeysAndValuesOperations() {
testKeysAndValuesOperationsOnVM(getVM(TEST_VM));
}
@@ -334,6 +346,7 @@ public class CompressionRegionOperationsDUnitTest extends CacheTestCase {
* Tests compressed put/get region operations using CachedDeserializable values.
* @see CompressionRegionOperationsDUnitTest#testGetPutOperations()
*/
+ @Test
public void testGetPutOperationsWithCachedDeserializable() {
testGetPutOperationsWithCachedDeserializableOnVM(getVM(TEST_VM));
}
@@ -403,6 +416,7 @@ public class CompressionRegionOperationsDUnitTest extends CacheTestCase {
* Tests compressed put/get region operations using byte[] values.
* @see CompressionRegionOperationsDUnitTest#testGetPutOperations()
*/
+ @Test
public void testGetPutOperationsWithByteArrays() {
testGetPutOperationsWithByteArraysOnVM(getVM(TEST_VM));
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionOperationsOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionOperationsOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionOperationsOffHeapDUnitTest.java
index 0cc3bdf..3c8bf91 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionOperationsOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionOperationsOffHeapDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.internal.compression;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import java.util.Properties;
import com.gemstone.gemfire.compression.Compressor;
@@ -25,11 +34,12 @@ import com.gemstone.gemfire.internal.cache.OffHeapTestUtil;
import com.gemstone.gemfire.test.dunit.Invoke;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+@Category(DistributedTest.class)
public class CompressionRegionOperationsOffHeapDUnitTest extends
CompressionRegionOperationsDUnitTest {
- public CompressionRegionOperationsOffHeapDUnitTest(String name) {
- super(name);
+ public CompressionRegionOperationsOffHeapDUnitTest() {
+ super();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionStatsDUnitTest.java
index d91234a..0f7be5e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionStatsDUnitTest.java
@@ -17,6 +17,15 @@
package com.gemstone.gemfire.internal.compression;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import java.io.Serializable;
import com.gemstone.gemfire.cache.DataPolicy;
@@ -35,7 +44,8 @@ import com.gemstone.gemfire.test.dunit.VM;
* Tests compression statistics.
* @since 8.0
*/
-public class CompressionStatsDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class CompressionStatsDUnitTest extends JUnit4CacheTestCase {
/**
* The name of our test region.
*/
@@ -62,8 +72,8 @@ public class CompressionStatsDUnitTest extends CacheTestCase {
* Creates a new CompressionStatsDUnitTest.
* @param name test name.
*/
- public CompressionStatsDUnitTest(String name) {
- super(name);
+ public CompressionStatsDUnitTest() {
+ super();
}
/**
@@ -270,6 +280,7 @@ public class CompressionStatsDUnitTest extends CacheTestCase {
/**
* Asserts that compression stats are functioning properly.
*/
+ @Test
public void testCompressionStats() {
VM vm = Host.getHost(0).getVM(TEST_VM);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java
index e94ddf6..df8411b 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.internal.jta.dunit;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
@@ -42,7 +51,8 @@ import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.util.test.TestUtil;
-public class ExceptionsDUnitTest extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class ExceptionsDUnitTest extends JUnit4DistributedTestCase {
static DistributedSystem ds;
static Cache cache;
@@ -65,8 +75,8 @@ public class ExceptionsDUnitTest extends DistributedTestCase {
return sb.toString();
}
- public ExceptionsDUnitTest(String name) {
- super(name);
+ public ExceptionsDUnitTest() {
+ super();
}
private static String modifyFile(String str) throws IOException {
@@ -137,7 +147,7 @@ public class ExceptionsDUnitTest extends DistributedTestCase {
// props.setProperty("mcast-port", "10339");
try {
// ds = DistributedSystem.connect(props);
- ds = (new ExceptionsDUnitTest("temp")).getSystem(props);
+ ds = (new ExceptionsDUnitTest()).getSystem(props);
cache = CacheFactory.create(ds);
}
catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java
index c66f57a..3f8a375 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.internal.jta.dunit;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
@@ -46,7 +55,8 @@ import com.gemstone.gemfire.test.dunit.ThreadUtils;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.util.test.TestUtil;
-public class IdleTimeOutDUnitTest extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class IdleTimeOutDUnitTest extends JUnit4DistributedTestCase {
static DistributedSystem ds;
static Cache cache;
@@ -69,8 +79,8 @@ public class IdleTimeOutDUnitTest extends DistributedTestCase {
return sb.toString();
}
- public IdleTimeOutDUnitTest(String name) {
- super(name);
+ public IdleTimeOutDUnitTest() {
+ super();
}
private static String modifyFile(String str) throws IOException {
@@ -145,7 +155,7 @@ public class IdleTimeOutDUnitTest extends DistributedTestCase {
// props.setProperty("mcast-port", "10339");
try {
// ds = DistributedSystem.connect(props);
- ds = (new IdleTimeOutDUnitTest("temp")).getSystem(props);
+ ds = (new IdleTimeOutDUnitTest()).getSystem(props);
cache = CacheFactory.create(ds);
if (className != null && !className.equals("")) {
String time = new Long(System.currentTimeMillis()).toString();
@@ -259,6 +269,7 @@ public class IdleTimeOutDUnitTest extends DistributedTestCase {
vm0.invoke(() -> IdleTimeOutDUnitTest.closeCache());
}
+ @Test
public void testIdleTimeOut() throws Throwable {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/LoginTimeOutDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/LoginTimeOutDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/LoginTimeOutDUnitTest.java
index fb617d9..bbe5f20 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/LoginTimeOutDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/LoginTimeOutDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.internal.jta.dunit;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
@@ -51,7 +60,8 @@ import com.gemstone.gemfire.test.dunit.Wait;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
import com.gemstone.gemfire.util.test.TestUtil;
-public class LoginTimeOutDUnitTest extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class LoginTimeOutDUnitTest extends JUnit4DistributedTestCase {
private static final Logger logger = LogService.getLogger();
protected static volatile boolean runTest1Ready = false;
@@ -60,8 +70,8 @@ public class LoginTimeOutDUnitTest extends DistributedTestCase {
private static Cache cache;
private static String tblName;
- public LoginTimeOutDUnitTest(String name) {
- super(name);
+ public LoginTimeOutDUnitTest() {
+ super();
}
private static String readFile(String filename) throws IOException {
@@ -241,6 +251,7 @@ public class LoginTimeOutDUnitTest extends DistributedTestCase {
}
}
+ @Test
public void testBug52206() {
// reenable setUp and testLoginTimeout to work on bug 52206
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java
index 3845587..0eeb970 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.internal.jta.dunit;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
@@ -46,7 +55,8 @@ import com.gemstone.gemfire.test.dunit.ThreadUtils;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.util.test.TestUtil;
-public class MaxPoolSizeDUnitTest extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class MaxPoolSizeDUnitTest extends JUnit4DistributedTestCase {
static DistributedSystem ds;
static Cache cache;
@@ -69,8 +79,8 @@ public class MaxPoolSizeDUnitTest extends DistributedTestCase {
return sb.toString();
}
- public MaxPoolSizeDUnitTest(String name) {
- super(name);
+ public MaxPoolSizeDUnitTest() {
+ super();
}
private static String modifyFile(String str) throws IOException {
@@ -143,7 +153,7 @@ public class MaxPoolSizeDUnitTest extends DistributedTestCase {
// props.setProperty("mcast-port", "10339");
try {
// ds = DistributedSystem.connect(props);
- ds = (new MaxPoolSizeDUnitTest("temp")).getSystem(props);
+ ds = (new MaxPoolSizeDUnitTest()).getSystem(props);
cache = CacheFactory.create(ds);
if (className != null && !className.equals("")) {
String time = new Long(System.currentTimeMillis()).toString();