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:35 UTC
[10/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/DurableResponseMatrixDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java
index 2163610..3f2f162 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.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.*;
@@ -44,7 +53,8 @@ import com.gemstone.gemfire.cache.client.internal.PoolImpl;
* @since 5.1
*
*/
-public class DurableResponseMatrixDUnitTest extends DistributedTestCase
+@Category(DistributedTest.class)
+public class DurableResponseMatrixDUnitTest extends JUnit4DistributedTestCase
{
protected static Cache cache = null;
@@ -58,8 +68,8 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase
public static final String KEY = "KeyMatrix1" ;
/** constructor */
- public DurableResponseMatrixDUnitTest(String name) {
- super(name);
+ public DurableResponseMatrixDUnitTest() {
+ super();
}
@Override
@@ -73,6 +83,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase
IgnoredException.addIgnoredException("Connection reset||Unexpected IOException");
}
+ @Test
public void testRegisterInterestResponse_NonExistent_Invalid()
throws Exception
{
@@ -83,6 +94,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase
assertEquals(null, r.getEntry(KEY).getValue()); // invalidate
}
+ @Test
public void testRegisterInterestResponse_NonExistent_Valid() throws Exception
{
server1.invoke(() -> DurableResponseMatrixDUnitTest.updateEntry( KEY, "ValueMatrix1" ));
@@ -100,6 +112,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase
assertEquals("ValueMatrix1", r.getEntry(KEY).getValue());
}
+ @Test
public void testRegisterInterestResponse_Valid_Valid() throws Exception
{
Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME);
@@ -108,6 +121,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase
assertEquals("ValueMatrix1", r.getEntry(KEY).getValue());
}
+ @Test
public void testRegisterInterestResponse_Invalid_Invalid() throws Exception
{
Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME);
@@ -127,6 +141,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase
assertEquals("ValueMatrix1", r.getEntry(KEY).getValue());
}
+ @Test
public void testRegisterInterestResponse_Destroyed_Invalid() throws Exception
{
Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME);
@@ -138,6 +153,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase
assertEquals(null, r.getEntry(KEY).getValue()); // invalidate
}
+ @Test
public void testRegisterInterestResponse_Destroyed_Valid() throws Exception
{
Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME);
@@ -147,6 +163,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase
r.registerInterest(KEY, InterestResultPolicy.KEYS_VALUES);
assertEquals("ValueMatrix1", r.getEntry(KEY).getValue());
}
+ @Test
public void testRegisterInterest_Destroy_Concurrent() throws Exception
{
PoolImpl.BEFORE_REGISTER_CALLBACK_FLAG = true;
@@ -193,6 +210,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase
Wait.waitForCriterion(ev, 120 * 1000, 200, true);
}
+ @Test
public void testNotification_NonExistent_Create() throws Exception
{
Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME);
@@ -201,6 +219,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase
waitForValue(r, KEY, "ValueMatrix1");
}
+ @Test
public void testNotification_NonExistent_Update() throws Exception
{
Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME);
@@ -210,6 +229,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase
waitForValue(r, KEY, "ValueMatrix2");
}
+ @Test
public void testNotification_NonExistent_Invalid() throws Exception
{
Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME);
@@ -219,6 +239,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase
waitForValue(r, KEY, null); // invalidate
}
+ @Test
public void testNotification_NonExistent_Destroy() throws Exception
{
Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME);
@@ -228,6 +249,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase
waitForValue(r, KEY, null); // destroyed
}
+ @Test
public void testNotification_Valid_Create() throws Exception
{
Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME);
@@ -237,6 +259,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase
waitForValue(r, KEY, "ValueMatrix1");
}
+ @Test
public void testNotification_Valid_Update() throws Exception
{
Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME);
@@ -255,6 +278,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase
waitForValue(r, KEY, null); // invalidate
}
+ @Test
public void testNotification_Valid_Destroy() throws Exception
{
Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME);
@@ -264,6 +288,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase
waitForValue(r, KEY, null); // destroyed
}
+ @Test
public void testNotification_Invalid_Create() throws Exception
{
Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME);
@@ -273,6 +298,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase
waitForValue(r, KEY, "ValueMatrix1");
}
+ @Test
public void testNotification_Invalid_Update() throws Exception
{
Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME);
@@ -291,6 +317,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase
waitForValue(r, KEY, null); // invalidate
}
+ @Test
public void testNotification_Invalid_Destroy() throws Exception
{
Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME);
@@ -300,6 +327,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase
waitForValue(r, KEY, null); // destroyed
}
+ @Test
public void testNotification_LocalInvalid_Create() throws Exception
{
Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME);
@@ -309,6 +337,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase
waitForValue(r, KEY, "ValueMatrix1");
}
+ @Test
public void testNotification_LocalInvalid_Update() throws Exception
{
Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME);
@@ -327,6 +356,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase
waitForValue(r, KEY, null); // invalidate
}
+ @Test
public void testNotification_LocalInvalid_Destroy() throws Exception
{
Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME);
@@ -420,7 +450,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase
final int durableClientTimeout = 60; // keep the client alive for 60 s
Properties props = getClientDistributedSystemProperties(durableClientId,
durableClientTimeout);
- new DurableResponseMatrixDUnitTest("temp").createCache(props);
+ new DurableResponseMatrixDUnitTest().createCache(props);
Pool p = PoolManager.createFactory()
.addServer(host, PORT1.intValue())
.setSubscriptionEnabled(true)
@@ -450,7 +480,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase
public static Integer createServerCache() throws Exception
{
Properties props = new Properties();
- new DurableResponseMatrixDUnitTest("temp").createCache(props);
+ new DurableResponseMatrixDUnitTest().createCache(props);
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/EventIDVerificationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
index 058dbb7..6a62950 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.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;
@@ -56,7 +65,8 @@ import com.gemstone.gemfire.test.dunit.VM;
*
*/
-public class EventIDVerificationDUnitTest extends DistributedTestCase
+@Category(DistributedTest.class)
+public class EventIDVerificationDUnitTest extends JUnit4DistributedTestCase
{
private static Cache cache = null;
@@ -78,8 +88,8 @@ public class EventIDVerificationDUnitTest extends DistributedTestCase
/* Constructor */
- public EventIDVerificationDUnitTest(String name) {
- super(name);
+ public EventIDVerificationDUnitTest() {
+ super();
}
@Override
@@ -98,6 +108,7 @@ public class EventIDVerificationDUnitTest extends DistributedTestCase
CacheObserverHolder.setInstance(new CacheObserverAdapter());
}
+ @Test
public void testEventIDOnServer()
{
createEntry();
@@ -123,6 +134,7 @@ public class EventIDVerificationDUnitTest extends DistributedTestCase
* also checks that peer nodes also get the same EventID.
*
*/
+ @Test
public void testEventIDPrapogationOnServerDuringRegionDestroy()
{
destroyRegion();
@@ -137,6 +149,7 @@ public class EventIDVerificationDUnitTest extends DistributedTestCase
* also checks that peer nodes also get the same EventID.
*/
+ @Test
public void testEventIDPrapogationOnServerDuringRegionClear()
{
clearRegion();
@@ -165,7 +178,7 @@ public class EventIDVerificationDUnitTest extends DistributedTestCase
Properties props = new Properties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "");
- new EventIDVerificationDUnitTest("temp").createCache(props);
+ new EventIDVerificationDUnitTest().createCache(props);
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
factory.setMirrorType(MirrorType.NONE);
@@ -280,7 +293,7 @@ public class EventIDVerificationDUnitTest extends DistributedTestCase
public static Integer createServerCache() throws Exception
{
- new EventIDVerificationDUnitTest("temp").createCache(new Properties());
+ new EventIDVerificationDUnitTest().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/EventIDVerificationInP2PDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java
index 08467b0..7feb77c 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.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;
@@ -46,7 +55,8 @@ import com.gemstone.gemfire.test.dunit.VM;
*
*/
-public class EventIDVerificationInP2PDUnitTest extends DistributedTestCase
+@Category(DistributedTest.class)
+public class EventIDVerificationInP2PDUnitTest extends JUnit4DistributedTestCase
{
private static Cache cache = null;
@@ -66,8 +76,8 @@ public class EventIDVerificationInP2PDUnitTest extends DistributedTestCase
/* Constructor */
- public EventIDVerificationInP2PDUnitTest(String name) {
- super(name);
+ public EventIDVerificationInP2PDUnitTest() {
+ super();
}
@Override
@@ -77,6 +87,7 @@ public class EventIDVerificationInP2PDUnitTest extends DistributedTestCase
receiver = false;
}
+ @Test
public void testEventIDsDACK() throws Exception
{
createServerCache(new Integer(DISTRIBUTED_ACK));
@@ -84,6 +95,7 @@ public class EventIDVerificationInP2PDUnitTest extends DistributedTestCase
verifyOperations();
}
+ @Test
public void testEventIDsGLOBAL() throws Exception
{
createServerCache(new Integer(GLOBAL));
@@ -122,7 +134,7 @@ public class EventIDVerificationInP2PDUnitTest extends DistributedTestCase
public static void createServerCache(Integer type) throws Exception
{
- new EventIDVerificationInP2PDUnitTest("temp").createCache(new Properties());
+ new EventIDVerificationInP2PDUnitTest().createCache(new Properties());
AttributesFactory factory = new AttributesFactory();
if (type.intValue() == DISTRIBUTED_ACK)
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/ForceInvalidateEvictionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java
index 901d837..9cf6095 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.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.io.IOException;
import java.io.Serializable;
import java.util.Map;
@@ -54,12 +63,13 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
/**
*
*/
-public class ForceInvalidateEvictionDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class ForceInvalidateEvictionDUnitTest extends JUnit4CacheTestCase {
private static final long serialVersionUID = -11364213547039967L;
- public ForceInvalidateEvictionDUnitTest(String name) {
- super(name);
+ public ForceInvalidateEvictionDUnitTest() {
+ super();
}
private void doPropagationTest(VM sourceVM, VM destinationVm, boolean validateCallbacks, boolean validateContent) {
@@ -95,6 +105,7 @@ public class ForceInvalidateEvictionDUnitTest extends CacheTestCase {
removeListener(destinationVm);
}
+ @Test
public void testPRToAccessor() {
Host host = Host.getHost(0);
@@ -113,6 +124,7 @@ public class ForceInvalidateEvictionDUnitTest extends CacheTestCase {
doPropagationTest(vm1, vm2, true, false);
}
+ @Test
public void testBridgeClientWithPR() {
Host host = Host.getHost(0);
@@ -132,6 +144,7 @@ public class ForceInvalidateEvictionDUnitTest extends CacheTestCase {
doPropagationTest(vm1, vm3, true, true);
}
+ @Test
public void testBridgeClientWithAccessorServer() {
Host host = Host.getHost(0);
@@ -149,6 +162,7 @@ public class ForceInvalidateEvictionDUnitTest extends CacheTestCase {
doPropagationTest(vm0, vm3, true, true);
}
+ @Test
public void testBridgeClientWithAccessorSource() {
Host host = Host.getHost(0);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java
index c4fdded..54d705e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.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.distributed.internal.DistributionConfig;
@@ -27,11 +36,12 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
* Runs force invalidate eviction tests with off-heap regions.
* @since 9.0
*/
+@Category(DistributedTest.class)
public class ForceInvalidateOffHeapEvictionDUnitTest extends
ForceInvalidateEvictionDUnitTest {
- public ForceInvalidateOffHeapEvictionDUnitTest(String name) {
- super(name);
+ public ForceInvalidateOffHeapEvictionDUnitTest() {
+ super();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HABug36738DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HABug36738DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HABug36738DUnitTest.java
index a82061e..7180fda 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HABug36738DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HABug36738DUnitTest.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 static com.gemstone.gemfire.test.dunit.Invoke.*;
import static com.jayway.awaitility.Awaitility.*;
import static com.jayway.awaitility.Duration.*;
@@ -47,7 +56,8 @@ import com.gemstone.gemfire.test.dunit.VM;
* 3. Create server2 and HARegion in it so that GII will happen.
* 4. Perform get operations from server2.
*/
-public class HABug36738DUnitTest extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class HABug36738DUnitTest extends JUnit4DistributedTestCase {
private static final String REGION_NAME = "HABug36738DUnitTest_Region";
private static final String HAREGION_NAME = "haRegion";
@@ -57,8 +67,8 @@ public class HABug36738DUnitTest extends DistributedTestCase {
private Region haRegion;
- public HABug36738DUnitTest(String name) {
- super(name);
+ public HABug36738DUnitTest() {
+ super();
}
@Override
@@ -67,6 +77,7 @@ public class HABug36738DUnitTest extends DistributedTestCase {
invokeInEveryVM( () -> cache = null );
}
+ @Test
public void testBug36768() throws Exception {
final VM server1 = Host.getHost(0).getVM(0);
final VM server2 = Host.getHost(0).getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java
index d236bc5..9ca8e40 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java
@@ -16,20 +16,31 @@
*/
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.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.VM;
@SuppressWarnings("serial")
+@Category(DistributedTest.class)
public class HAInterestPart1DUnitTest extends HAInterestTestCase {
- public HAInterestPart1DUnitTest(String name) {
- super(name);
+ public HAInterestPart1DUnitTest() {
+ super();
}
/**
* Tests whether interest is registered or not on both primary and secondaries
*/
+ @Test
public void testInterestRegistrationOnBothPrimaryAndSecondary() throws Exception {
createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost()));
createEntriesK1andK2();
@@ -47,6 +58,7 @@ public class HAInterestPart1DUnitTest extends HAInterestTestCase {
* Tests whether interest is registered on both primary and secondaries and
* verify their responses
*/
+ @Test
public void testInterestRegistrationResponseOnBothPrimaryAndSecondary() throws Exception {
createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost()));
createEntriesK1andK2();
@@ -61,6 +73,7 @@ public class HAInterestPart1DUnitTest extends HAInterestTestCase {
* Tests whether re-registration of interest causes duplicates on server side
* interest map
*/
+ @Test
public void testRERegistrationWillNotCreateDuplicateKeysOnServerInterstMaps() throws Exception {
createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost()));
createEntriesK1andK2();
@@ -80,6 +93,7 @@ public class HAInterestPart1DUnitTest extends HAInterestTestCase {
* failover and should pick new primary and get server keys in response of
* registerInterest
*/
+ @Test
public void testPrimaryFailureInRegisterInterest() throws Exception {
createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost()));
createEntriesK1andK2();
@@ -101,6 +115,7 @@ public class HAInterestPart1DUnitTest extends HAInterestTestCase {
* Tests if Secondary fails during interest registration should add to dead Ep
* list
*/
+ @Test
public void testSecondaryFailureInRegisterInterest() throws Exception {
createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost()));
createEntriesK1andK2();
@@ -123,6 +138,7 @@ public class HAInterestPart1DUnitTest extends HAInterestTestCase {
* server to dead ep list and expect serverKeys as a response from
* registration on newly selected primary
*/
+ @Test
public void testBothPrimaryAndSecondaryFailureInRegisterInterest() throws Exception {
createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost()));
createEntriesK1andK2();
@@ -147,6 +163,7 @@ public class HAInterestPart1DUnitTest extends HAInterestTestCase {
* expect serverKeys as a response from registration on newly selected primary
*
*/
+ @Test
public void testProbablePrimaryFailureInRegisterInterest() throws Exception {
createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost()));
createEntriesK1andK2();
@@ -167,6 +184,7 @@ public class HAInterestPart1DUnitTest extends HAInterestTestCase {
* Tests if DeadServerMonitor on detecting an EP as alive should register
* client ( create CCP) as welll as register IL
*/
+ @Test
public void testInterstRegistrationOnRecoveredEPbyDSM() throws Exception {
IgnoredException.addIgnoredException("SocketException");
IgnoredException.addIgnoredException("Unexpected IOException");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
index 8a30f08..67f3c41 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.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.cache.EntryDestroyedException;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.client.ServerConnectivityException;
@@ -26,16 +35,18 @@ import com.gemstone.gemfire.test.dunit.Wait;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
@SuppressWarnings({"rawtypes", "serial"})
+@Category(DistributedTest.class)
public class HAInterestPart2DUnitTest extends HAInterestTestCase {
- public HAInterestPart2DUnitTest(String name) {
- super(name);
+ public HAInterestPart2DUnitTest() {
+ super();
}
/**
* Tests if Primary fails during interest un registration should initiate
* failover should pick new primary
*/
+ @Test
public void testPrimaryFailureInUNregisterInterest() throws Exception {
createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost()));
createEntriesK1andK2();
@@ -62,6 +73,7 @@ public class HAInterestPart2DUnitTest extends HAInterestTestCase {
* Tests if Secondary fails during interest un registration should add to dead
* Ep list
*/
+ @Test
public void testSecondaryFailureInUNRegisterInterest() throws Exception {
createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost()));
createEntriesK1andK2();
@@ -84,6 +96,7 @@ public class HAInterestPart2DUnitTest extends HAInterestTestCase {
* before interest registration then interest should be registered on the newly
* detected live server as well
*/
+ @Test
public void testDSMDetectsServerLiveJustBeforeInterestRegistration() throws Exception {
createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost()));
createEntriesK1andK2();
@@ -110,6 +123,7 @@ public class HAInterestPart2DUnitTest extends HAInterestTestCase {
* After interest registration then interest should be registered on the newly
* detected live server as well
*/
+ @Test
public void testDSMDetectsServerLiveJustAfterInterestRegistration() throws Exception {
createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost()));
@@ -142,6 +156,7 @@ public class HAInterestPart2DUnitTest extends HAInterestTestCase {
* part of recovery it refreshes registered entries from the server, because it
* is primary
*/
+ @Test
public void testRefreshEntriesFromPrimaryWhenDSMDetectsServerLive() throws Exception {
IgnoredException.addIgnoredException(ServerConnectivityException.class.getName());
@@ -214,6 +229,7 @@ public class HAInterestPart2DUnitTest extends HAInterestTestCase {
* this live server and verify that as a part of recovery it does not
* refreshes registered entries from the server, because it is secondary
*/
+ @Test
public void testGIIFromSecondaryWhenDSMDetectsServerLive() throws Exception {
server1.invoke(() -> HAInterestTestCase.closeCache());
server2.invoke(() -> HAInterestTestCase.closeCache());
@@ -249,6 +265,7 @@ public class HAInterestPart2DUnitTest extends HAInterestTestCase {
*
* @throws Exception
*/
+ @Test
public void testBug35945() throws Exception {
PORT1 = ((Integer) server1.invoke(() -> HAInterestTestCase.createServerCache())).intValue();
server1.invoke(() -> HAInterestTestCase.createEntriesK1andK2());
@@ -315,6 +332,7 @@ public class HAInterestPart2DUnitTest extends HAInterestTestCase {
* Tests if failure occurred in Interest recovery thread, then it should select
* new endpoint to register interest
*/
+ @Test
public void testInterestRecoveryFailure() throws Exception {
IgnoredException.addIgnoredException("Server unreachable");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java
index c86c473..baff89f 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.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.cache.AttributesFactory;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheFactory;
@@ -61,7 +70,8 @@ import org.junit.experimental.categories.Category;
* Tests Interest Registration Functionality
*/
@SuppressWarnings({"deprecation", "rawtypes", "serial", "unchecked"})
-public class HAInterestTestCase extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class HAInterestTestCase extends JUnit4DistributedTestCase {
protected static final int TIMEOUT_MILLIS = 60 * 1000;
protected static final int INTERVAL_MILLIS = 10;
@@ -95,8 +105,8 @@ public class HAInterestTestCase extends DistributedTestCase {
protected volatile static boolean exceptionOccured = false;
- public HAInterestTestCase(String name) {
- super(name);
+ public HAInterestTestCase() {
+ super();
}
@Override
@@ -892,7 +902,7 @@ public class HAInterestTestCase extends DistributedTestCase {
Properties props = new Properties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "");
- new HAInterestTestCase("temp").createCache(props);
+ new HAInterestTestCase().createCache(props);
CacheServerTestUtil.disableShufflingOfEndpoints();
PoolImpl p;
try {
@@ -926,7 +936,7 @@ public class HAInterestTestCase extends DistributedTestCase {
Properties props = new Properties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "");
- new HAInterestTestCase("temp").createCache(props);
+ new HAInterestTestCase().createCache(props);
CacheServerTestUtil.disableShufflingOfEndpoints();
PoolImpl p;
try {
@@ -961,7 +971,7 @@ public class HAInterestTestCase extends DistributedTestCase {
Properties props = new Properties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "");
- new HAInterestTestCase("temp").createCache(props);
+ new HAInterestTestCase().createCache(props);
PoolImpl p = (PoolImpl) PoolManager.createFactory()
.addServer(hostName, PORT1)
.setSubscriptionEnabled(true)
@@ -982,7 +992,7 @@ public class HAInterestTestCase extends DistributedTestCase {
}
public static Integer createServerCache() throws Exception {
- new HAInterestTestCase("temp").createCache(new Properties());
+ new HAInterestTestCase().createCache(new Properties());
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
factory.setEnableBridgeConflation(true);
@@ -1001,7 +1011,7 @@ public class HAInterestTestCase extends DistributedTestCase {
}
public static Integer createServerCacheWithLocalRegion() throws Exception {
- new HAInterestTestCase("temp").createCache(new Properties());
+ new HAInterestTestCase().createCache(new Properties());
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
factory.setConcurrencyChecksEnabled(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/HAStartupAndFailoverDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
index 1068534..99dbebb 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.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.Collection;
import java.util.Iterator;
import java.util.Properties;
@@ -56,7 +65,8 @@ import com.jayway.awaitility.Awaitility;
/**
* Test to verify Startup. and failover during startup.
*/
-public class HAStartupAndFailoverDUnitTest extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class HAStartupAndFailoverDUnitTest extends JUnit4DistributedTestCase {
protected static Cache cache = null;
VM server1 = null;
VM server2 = null;
@@ -76,8 +86,8 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase {
private static final String REGION_NAME = "HAStartupAndFailoverDUnitTest_region";
/** constructor */
- public HAStartupAndFailoverDUnitTest(String name) {
- super(name);
+ public HAStartupAndFailoverDUnitTest() {
+ super();
}
@Override
@@ -101,7 +111,8 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase {
* Stops primary server one by one to ensure new primary is selected
*
*/
- public void testPrimaryFailover() throws Exception
+ @Test
+ public void testPrimaryFailover() throws Exception
{
createClientCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost()));
@@ -149,7 +160,8 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase {
* new primary will be selected
*
*/
- public void testExceptionWhileMakingPrimary()throws Exception
+ @Test
+ public void testExceptionWhileMakingPrimary()throws Exception
{
createClientCacheWithIncorrectPrimary(this.getName(), NetworkUtils.getServerHostName(server1.getHost()));
@@ -178,7 +190,8 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase {
* new primary will be selected
*
*/
- public void testTwoPrimaryFailedOneAfterTheAnother() throws Exception
+ @Test
+ public void testTwoPrimaryFailedOneAfterTheAnother() throws Exception
{
createClientCacheWithLargeRetryInterval(this.getName(), NetworkUtils.getServerHostName(server1.getHost()));
@@ -207,7 +220,8 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase {
* verify that Primary Should Be Null And EPList Should Be Empty When All Servers Are Dead
*/
@Category(FlakyTest.class) // GEODE-1045: random ports, time senstive, waitForCriterion
- public void testPrimaryShouldBeNullAndEPListShouldBeEmptyWhenAllServersAreDead() throws Exception {
+ @Test
+ public void testPrimaryShouldBeNullAndEPListShouldBeEmptyWhenAllServersAreDead() throws Exception {
createClientCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost()));
verifyPrimaryShouldNotBeNullAndEPListShouldNotBeEmpty();
server1.invoke(() -> HAStartupAndFailoverDUnitTest.stopServer());
@@ -221,7 +235,8 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase {
* Tests failover initialization by cacheClientUpdater Thread
* on failure in Primary Server
*/
- public void testCacheClientUpdatersInitiatesFailoverOnPrimaryFailure() throws Exception
+ @Test
+ public void testCacheClientUpdatersInitiatesFailoverOnPrimaryFailure() throws Exception
{
createClientCacheWithLargeRetryInterval(this.getName(), NetworkUtils.getServerHostName(server1.getHost()));
server1.invoke(() -> HAStartupAndFailoverDUnitTest.verifyDispatcherIsAlive());
@@ -239,7 +254,8 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase {
* Tests failover initialization by cacheClientUpdater
* Thread on failure on Secondary server
*/
- public void testCacheClientUpdaterInitiatesFailoverOnSecondaryFailure() throws Exception
+ @Test
+ public void testCacheClientUpdaterInitiatesFailoverOnSecondaryFailure() throws Exception
{
createClientCacheWithLargeRetryInterval(this.getName(), NetworkUtils.getServerHostName(server1.getHost()));
server1.invoke(() -> HAStartupAndFailoverDUnitTest.verifyDispatcherIsAlive());
@@ -257,7 +273,8 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase {
* Tests failover initialization by cacheClientUpdater Thread failure on both
* Primary and Secondary server
*/
- public void testCacheClientUpdaterInitiatesFailoverOnBothPrimaryAndSecondaryFailure() throws Exception
+ @Test
+ public void testCacheClientUpdaterInitiatesFailoverOnBothPrimaryAndSecondaryFailure() throws Exception
{
createClientCacheWithLargeRetryInterval(this.getName(), NetworkUtils.getServerHostName(server1.getHost()));
@@ -275,7 +292,8 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase {
/**
* Tests failover initialization by cacheClientUpdater Thread
*/
- public void testCacheClientUpdaterInitiatesFailoverOnBothPrimaryAndSecondaryFailureWithServerMonitors() throws Exception
+ @Test
+ public void testCacheClientUpdaterInitiatesFailoverOnBothPrimaryAndSecondaryFailureWithServerMonitors() throws Exception
{
createClientCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost()));
@@ -291,7 +309,8 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase {
/**
* Tests failover initialization by cache operation Threads on secondary
*/
- public void testInitiateFailoverByCacheOperationThreads_Secondary() throws Exception {
+ @Test
+ public void testInitiateFailoverByCacheOperationThreads_Secondary() throws Exception {
//Stop the 3rd server to guarantee the client put will go to the first server
server3.invoke(() -> HAStartupAndFailoverDUnitTest.stopServer());
// create a client with no client updater thread
@@ -550,7 +569,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase {
Properties props = new Properties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "");
- new HAStartupAndFailoverDUnitTest("temp").createCache(props);
+ new HAStartupAndFailoverDUnitTest().createCache(props);
PoolImpl p = (PoolImpl)PoolManager.createFactory()
.addServer(host, PORT1.intValue())
.addServer(host, PORT2.intValue())
@@ -579,7 +598,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase {
Properties props = new Properties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "");
- new HAStartupAndFailoverDUnitTest("temp").createCache(props);
+ new HAStartupAndFailoverDUnitTest().createCache(props);
PoolImpl p = (PoolImpl)PoolManager.createFactory()
.addServer(host, PORT1.intValue())
.addServer(host, PORT2.intValue())
@@ -610,7 +629,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase {
Properties props = new Properties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "");
- new HAStartupAndFailoverDUnitTest("temp").createCache(props);
+ new HAStartupAndFailoverDUnitTest().createCache(props);
CacheServerTestUtil.disableShufflingOfEndpoints();
PoolImpl p;
@@ -648,7 +667,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase {
Properties props = new Properties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "");
- new HAStartupAndFailoverDUnitTest("temp").createCache(props);
+ new HAStartupAndFailoverDUnitTest().createCache(props);
final int INCORRECT_PORT = 1;
PoolImpl p = (PoolImpl)PoolManager.createFactory()
.addServer(host, INCORRECT_PORT)
@@ -675,7 +694,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase {
public static Integer createServerCache() throws Exception
{
- new HAStartupAndFailoverDUnitTest("temp").createCache(new Properties());
+ new HAStartupAndFailoverDUnitTest().createCache(new Properties());
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
factory.setEnableBridgeConflation(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/InstantiatorPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java
index 36ba531..f431613 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.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 static com.gemstone.gemfire.test.dunit.DistributedTestUtils.*;
import java.io.DataInput;
@@ -56,7 +65,8 @@ import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.Wait;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
-public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class InstantiatorPropagationDUnitTest extends JUnit4DistributedTestCase {
private static Cache cache = null;
private static VM client1 = null;
@@ -86,8 +96,8 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
- public InstantiatorPropagationDUnitTest(String name) {
- super(name);
+ public InstantiatorPropagationDUnitTest() {
+ super();
// TODO Auto-generated constructor stub
}
@@ -114,7 +124,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
Properties props = new Properties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "");
- new InstantiatorPropagationDUnitTest("temp").createCache(props);
+ new InstantiatorPropagationDUnitTest().createCache(props);
Pool p = PoolManager.createFactory().addServer(host, port1.intValue())
.setMinConnections(1).setSubscriptionEnabled(true).setPingInterval(200)
.create("ClientServerInstantiatorRegistrationDUnitTestPool");
@@ -136,7 +146,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
}
public static Integer createServerCache(Integer maxThreads) throws Exception {
- new InstantiatorPropagationDUnitTest("temp").createCache(new Properties());
+ new InstantiatorPropagationDUnitTest().createCache(new Properties());
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
factory.setMirrorType(MirrorType.KEYS_VALUES);
@@ -464,6 +474,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
* Verified if the 2 instantiators get propagated to client when client gets
* connected.
*/
+ @Test
public void testServerUpFirstClientLater() throws Exception {
PORT1 = initServerCache(server1);
@@ -533,6 +544,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
* the client is connected to(server1), to the other server(server2) in the DS
* and the client(client2) that is connected to server2.
*/
+ @Test
public void testInstantiatorsWith2ClientsN2Servers() throws Exception {
PORT1 = initServerCache(server1);
PORT2 = initServerCache(server2);
@@ -572,6 +584,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
* instantiators. Client1 should have only 1 instantiator since the server1
* was stopped when 2 instantiators were added on it.
*/
+ @Test
public void testInstantiatorsWithServerKill() throws Exception {
PORT1 = initServerCache(server1);
PORT2 = initServerCache(server2);
@@ -618,6 +631,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
* stopped.So registering an instantiator on server should propagate that to
* client as well.
*/
+ @Test
public void testInstantiators() throws Exception {
PORT1 = initServerCache(server1);
PORT2 = initServerCache(server2);
@@ -711,6 +725,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
* server(server2) in the DS and the client that is connected to server2.
*
*/
+ @Test
public void testInstantiatorCount() throws Exception {
PORT1 = initServerCache(server1);
PORT2 = initServerCache(server2);
@@ -748,7 +763,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
Properties props = new Properties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "");
- new InstantiatorPropagationDUnitTest("temp").createCache(props);
+ new InstantiatorPropagationDUnitTest().createCache(props);
Pool p = PoolManager.createFactory()
.addServer(host, port1.intValue())
.setSubscriptionEnabled(true)
@@ -789,6 +804,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
}
+ @Test
public void testLazyRegistrationOfInstantiators()
throws Exception {
try {
@@ -873,7 +889,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
public static Integer createServerCacheTwo(Integer maxThreads)
throws Exception
{
- new InstantiatorPropagationDUnitTest("temp")
+ new InstantiatorPropagationDUnitTest()
.createCache(new Properties());
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
@@ -900,7 +916,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
public static Integer createServerCacheOne(Integer maxThreads)
throws Exception
{
- new InstantiatorPropagationDUnitTest("temp")
+ new InstantiatorPropagationDUnitTest()
.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/InterestListDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
index 2f374d7..f13e46e 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.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.List;
import java.util.Properties;
@@ -99,7 +108,8 @@ import com.gemstone.gemfire.cache.NoSubscriptionServersAvailableException;
*
*
*/
-public class InterestListDUnitTest extends DistributedTestCase
+@Category(DistributedTest.class)
+public class InterestListDUnitTest extends JUnit4DistributedTestCase
{
static Cache cache = null;
@@ -128,8 +138,8 @@ public class InterestListDUnitTest extends DistributedTestCase
static InterestListener interestListener;
/** constructor */
- public InterestListDUnitTest(String name) {
- super(name);
+ public InterestListDUnitTest() {
+ super();
}
@Override
@@ -161,7 +171,8 @@ public class InterestListDUnitTest extends DistributedTestCase
* c1 : validate (k1 == vm1-k1-again) AND (k2 == vm1-k2-again)// as both are not registered
*
*/
- public void testInterestListRegistration()
+ @Test
+ public void testInterestListRegistration()
{
vm1.invoke(() -> InterestListDUnitTest.createClientCache(
@@ -217,6 +228,7 @@ public class InterestListDUnitTest extends DistributedTestCase
* c1: put k1->k1 (old value)
* c2: validate k1 == vm-k1 (no interest, so missing update)
*/
+ @Test
public void testValueRefresh()
{
@@ -263,6 +275,7 @@ public class InterestListDUnitTest extends DistributedTestCase
* register ALL_KEYS and verifies that updates are receiving to all the keys
*
*/
+ @Test
public void testInterestListRegistration_ALL_KEYS()
{
@@ -290,6 +303,7 @@ public class InterestListDUnitTest extends DistributedTestCase
* then verify that updates has occured as a result of interest registration.
*
*/
+ @Test
public void testInitializationOfRegionFromInterestList()
{
// directly put on server
@@ -328,7 +342,8 @@ public class InterestListDUnitTest extends DistributedTestCase
* c1 : validate (k1 == vm1-k1-again) AND (k2 == vm1-k2-again)// as both are not registered
*
*/
- public void testInterestListRegistrationOnServer()
+ @Test
+ public void testInterestListRegistrationOnServer()
{
DistributedMember c1 = (DistributedMember)vm1
@@ -379,7 +394,8 @@ public class InterestListDUnitTest extends DistributedTestCase
* are properly invoked
* @throws Exception
*/
- public void testInterestRegistrationListeners() throws Exception {
+ @Test
+ public void testInterestRegistrationListeners() throws Exception {
int port2;
createCache();
@@ -444,6 +460,7 @@ public class InterestListDUnitTest extends DistributedTestCase
* This tests whether an exception is thrown in register/unregister when no
* server is available.
*/
+ @Test
public void testNoAvailableServer() {
// Register interest in key1.
@@ -460,10 +477,12 @@ public class InterestListDUnitTest extends DistributedTestCase
vm1.invoke(() -> InterestListDUnitTest.registerKeyEx( key2 ));
}
+ @Test
public void testRegisterInterestOnReplicatedRegionWithCacheLoader() {
runRegisterInterestWithCacheLoaderTest(true);
}
+ @Test
public void testRegisterInterestOnPartitionedRegionWithCacheLoader() {
runRegisterInterestWithCacheLoaderTest(false);
}
@@ -524,7 +543,7 @@ public class InterestListDUnitTest extends DistributedTestCase
props.setProperty(DistributionConfig.LOCATORS_NAME, "");
props.setProperty(DistributionConfig.DELTA_PROPAGATION_PROP_NAME, "false");
- new InterestListDUnitTest("temp").createCache(props);
+ new InterestListDUnitTest().createCache(props);
PoolFactory pfactory = PoolManager.createFactory()
.addServer(host, port)
.setThreadLocalConnections(true)
@@ -556,7 +575,7 @@ public class InterestListDUnitTest extends DistributedTestCase
private static void createCache(boolean addReplicatedRegion) throws Exception {
Properties props = new Properties();
props.setProperty(DistributionConfig.DELTA_PROPAGATION_PROP_NAME, "false");
- new InterestListDUnitTest("temp").createCache(props);
+ new InterestListDUnitTest().createCache(props);
if (addReplicatedRegion) {
addReplicatedRegion();
} else {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
index eddffcb..9b1f0e6 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.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.io.IOException;
import java.util.Iterator;
@@ -57,7 +66,8 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
*
*
*/
-public class InterestListEndpointDUnitTest extends DistributedTestCase
+@Category(DistributedTest.class)
+public class InterestListEndpointDUnitTest extends JUnit4DistributedTestCase
{
VM server1 = null;
@@ -84,8 +94,8 @@ public class InterestListEndpointDUnitTest extends DistributedTestCase
static InterestListEndpointDUnitTest impl;
/** constructor */
- public InterestListEndpointDUnitTest(String name) {
- super(name);
+ public InterestListEndpointDUnitTest() {
+ super();
}
@Override
@@ -114,7 +124,7 @@ public class InterestListEndpointDUnitTest extends DistributedTestCase
/** subclass support */
public static void createImpl() {
- impl = new InterestListEndpointDUnitTest("temp");
+ impl = new InterestListEndpointDUnitTest();
}
private void createCache(Properties props) throws Exception
@@ -128,6 +138,7 @@ public class InterestListEndpointDUnitTest extends DistributedTestCase
* tests wheteher upadets are sent to clients if put on server directly
*
*/
+ @Test
public void testDirectPutOnServer()
{
client1.invoke(() -> impl.createEntriesK1andK2());
@@ -143,6 +154,7 @@ public class InterestListEndpointDUnitTest extends DistributedTestCase
* put on non interest list ep and verify updates
*
*/
+ @Test
public void testInterestListEndpoint()
{
client1.invoke(() -> createEntriesK1andK2());
@@ -156,6 +168,7 @@ public class InterestListEndpointDUnitTest extends DistributedTestCase
client1.invoke(() -> verifyPut());
}
+ @Test
public void testInterestListEndpointAfterFailover() throws Exception
{
final long maxWaitTime = 20000;
@@ -228,7 +241,8 @@ public class InterestListEndpointDUnitTest extends DistributedTestCase
}
- public void testUpdaterThreadIsAliveForFailedEndPoint(){
+ @Test
+ public void testUpdaterThreadIsAliveForFailedEndPoint(){
client1.invoke(() -> acquirePoolConnection());
client1.invoke(() -> processException());
client1.invoke(() -> verifyUpdaterThreadIsAlive());
@@ -323,7 +337,7 @@ public class InterestListEndpointDUnitTest extends DistributedTestCase
Properties props = new Properties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "");
- new InterestListEndpointDUnitTest("temp").createCache(props);
+ new InterestListEndpointDUnitTest().createCache(props);
Pool p;
try {
p = PoolManager.createFactory()
@@ -362,7 +376,7 @@ public class InterestListEndpointDUnitTest extends DistributedTestCase
public static Integer createServerCache(Integer maxThreads) throws Exception
{
- new InterestListEndpointDUnitTest("temp").createCache(new Properties());
+ new InterestListEndpointDUnitTest().createCache(new Properties());
RegionAttributes attrs = impl.createServerCacheAttributes();
cache.createRegion(REGION_NAME, attrs);
CacheServer server1 = cache.addCacheServer();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointPRDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointPRDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointPRDUnitTest.java
index e08202d..30f91a1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointPRDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointPRDUnitTest.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 InterestListEndpointDUnitTest to exercise partitioned regions
*
*/
+@Category(DistributedTest.class)
public class InterestListEndpointPRDUnitTest extends InterestListEndpointDUnitTest {
- public InterestListEndpointPRDUnitTest(String name) {
- super(name);
+ public InterestListEndpointPRDUnitTest() {
+ super();
}
public static void createImpl() {
- impl = new InterestListEndpointPRDUnitTest("temp");
+ impl = new InterestListEndpointPRDUnitTest();
}
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/InterestListEndpointSelectorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointSelectorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointSelectorDUnitTest.java
index 2a5d32e..5bfa0c7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointSelectorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointSelectorDUnitTest.java
@@ -16,16 +16,26 @@
*/
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;
+
/**
* Just like InterestListEndpointDUnitTest but uses thread pool (i.e. selector)
* in bridge servers
*
*/
+@Category(DistributedTest.class)
public class InterestListEndpointSelectorDUnitTest
extends InterestListEndpointDUnitTest
{
- public InterestListEndpointSelectorDUnitTest(String name) {
- super(name);
+ public InterestListEndpointSelectorDUnitTest() {
+ super();
}
protected int getMaxThreads() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
index 66527d0..54e2520 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.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;
@@ -50,7 +59,8 @@ import com.gemstone.gemfire.cache.client.internal.PoolImpl;
*
*
*/
-public class InterestListFailoverDUnitTest extends DistributedTestCase
+@Category(DistributedTest.class)
+public class InterestListFailoverDUnitTest extends JUnit4DistributedTestCase
{
VM vm0 = null;
@@ -66,8 +76,8 @@ public class InterestListFailoverDUnitTest extends DistributedTestCase
private static final String REGION_NAME = "InterestListFailoverDUnitTest_region";
/** constructor */
- public InterestListFailoverDUnitTest(String name) {
- super(name);
+ public InterestListFailoverDUnitTest() {
+ super();
}
@Override
@@ -113,11 +123,13 @@ public class InterestListFailoverDUnitTest extends DistributedTestCase
*
*/
+ @Test
public void testInterestListRecoveryHA()
{
doTestInterestListRecovery(-1);
}
+ @Test
public void testInterestListRecoveryNonHA()
{
doTestInterestListRecovery(0);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
index d202a19..3c2f980 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.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.io.EOFException;
import java.net.SocketException;
import java.util.HashSet;
@@ -65,7 +74,8 @@ import com.gemstone.gemfire.cache.client.internal.RegisterInterestTracker;
* see only k4 and k5 are registerd on s1
*
*/
-public class InterestListRecoveryDUnitTest extends DistributedTestCase
+@Category(DistributedTest.class)
+public class InterestListRecoveryDUnitTest extends JUnit4DistributedTestCase
{
private static Cache cache = null;
@@ -82,8 +92,8 @@ public class InterestListRecoveryDUnitTest extends DistributedTestCase
private static final String REGION_NAME = "InterestListRecoveryDUnitTest_region";
/** constructor */
- public InterestListRecoveryDUnitTest(String name) {
- super(name);
+ public InterestListRecoveryDUnitTest() {
+ super();
}
@Override
@@ -122,6 +132,7 @@ public class InterestListRecoveryDUnitTest extends DistributedTestCase
}
+ @Test
public void testKeyInterestRecoveryWhileProcessException() throws Exception {
VM serverFirstRegistered = null;
VM serverSecondRegistered = null;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java
index c87e33d..01de907 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.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.io.IOException;
import java.net.InetAddress;
import java.util.HashMap;
@@ -49,7 +58,8 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
* Written to test fix for Bug #47132
*
*/
-public class InterestRegrListenerDUnitTest extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class InterestRegrListenerDUnitTest extends JUnit4DistributedTestCase {
private Cache cache;
private DistributedSystem ds;
@@ -63,11 +73,11 @@ public class InterestRegrListenerDUnitTest extends DistributedTestCase {
private static final String REGISTER_INTEREST = "RegisterInterest";
private static final int DURABLE_CLIENT_TIMEOUT=20;
- private static InterestRegrListenerDUnitTest instance = new InterestRegrListenerDUnitTest("InterestRegrListenerDUnitTest");
+ private static InterestRegrListenerDUnitTest instance = new InterestRegrListenerDUnitTest();
- public InterestRegrListenerDUnitTest(String name) {
- super(name);
+ public InterestRegrListenerDUnitTest() {
+ super();
}
private static final long serialVersionUID = 1L;
@@ -250,6 +260,7 @@ public class InterestRegrListenerDUnitTest extends DistributedTestCase {
instance.doClientRegionRegisterInterest(isDurable);
}
+ @Test
public void testDurableClientExit_ClientExpressedInterest() throws Exception {
final Host host = Host.getHost(0);
VM serverVM = host.getVM(0);
@@ -315,6 +326,7 @@ public class InterestRegrListenerDUnitTest extends DistributedTestCase {
}
+ @Test
public void testDurableClientExit_ServerExpressedInterest() throws Exception {
final Host host = Host.getHost(0);
VM serverVM = host.getVM(0);
@@ -379,6 +391,7 @@ public class InterestRegrListenerDUnitTest extends DistributedTestCase {
+ @Test
public void testDurableClientExit_ServerExpressedInterest_NonDurableInterest() throws Exception {
final Host host = Host.getHost(0);
final VM serverVM = host.getVM(0);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
index ac2b1ee..362d3c8 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.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.List;
import java.util.Properties;
@@ -47,7 +56,8 @@ import com.gemstone.gemfire.cache.client.*;
*
*
*/
-public class InterestResultPolicyDUnitTest extends DistributedTestCase
+@Category(DistributedTest.class)
+public class InterestResultPolicyDUnitTest extends JUnit4DistributedTestCase
{
/** test VM */
VM vm0, vm1 = null;
@@ -70,8 +80,8 @@ public class InterestResultPolicyDUnitTest extends DistributedTestCase
* @param name -
* name of test instance
*/
- public InterestResultPolicyDUnitTest(String name) {
- super(name);
+ public InterestResultPolicyDUnitTest() {
+ super();
}
/**
@@ -117,6 +127,7 @@ public class InterestResultPolicyDUnitTest extends DistributedTestCase
* 3)At the end of registerInterest call, verify that no entries are created
* in the client cache<br>
*/
+ @Test
public void testPolicyNone()
{
LogWriter logger = getSystem().getLogWriter();
@@ -140,6 +151,7 @@ public class InterestResultPolicyDUnitTest extends DistributedTestCase
* 3)At the end of registerInterest call, verify that entries are created in
* the client cache with value null<br>
*/
+ @Test
public void testPolicyKeys()
{
LogWriter logger = getSystem().getLogWriter();
@@ -163,6 +175,7 @@ public class InterestResultPolicyDUnitTest extends DistributedTestCase
* 3)At the end of registerInterest call, verify that all entries are created
* in the client cache with values<br>
*/
+ @Test
public void testPolicyKeysValues()
{
LogWriter logger = getSystem().getLogWriter();
@@ -188,6 +201,7 @@ public class InterestResultPolicyDUnitTest extends DistributedTestCase
* in the keylist which are not on the server should not be created on the
* client as a result of registerInterest call)<br>
*/
+ @Test
public void testBug35358()
{
Host host = Host.getHost(0);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java
index 0f78c66..75735e1 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.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.List;
import java.util.Properties;
@@ -39,7 +48,8 @@ import com.gemstone.gemfire.test.dunit.Wait;
* configured with newly added RegionAttributes in a P2P environment.
*
*/
-public class NewRegionAttributesDUnitTest extends DistributedTestCase
+@Category(DistributedTest.class)
+public class NewRegionAttributesDUnitTest extends JUnit4DistributedTestCase
{
/** test VM */
@@ -59,8 +69,8 @@ public class NewRegionAttributesDUnitTest extends DistributedTestCase
* @param name -
* name of test instance
*/
- public NewRegionAttributesDUnitTest(String name) {
- super(name);
+ public NewRegionAttributesDUnitTest() {
+ super();
}
/**
@@ -124,7 +134,7 @@ public class NewRegionAttributesDUnitTest extends DistributedTestCase
public static void createServerCache(Boolean enableWan, Boolean setPublisher,
Boolean enableConflation, Boolean enableAsyncConflation) throws Exception
{
- NewRegionAttributesDUnitTest test = new NewRegionAttributesDUnitTest("temp");
+ NewRegionAttributesDUnitTest test = new NewRegionAttributesDUnitTest();
cache = test.createCache(new Properties());
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
@@ -182,6 +192,7 @@ public class NewRegionAttributesDUnitTest extends DistributedTestCase
* @see AttributesFactory#setEnableConflation(boolean)
* @see AttributesFactory#setEnableAsyncConflation(boolean)
*/
+ @Test
public void testEntryOperationsWithNewAttributesEnabled()
{
vm0.invoke(() -> NewRegionAttributesDUnitTest.checkAttributes());
@@ -202,6 +213,7 @@ public class NewRegionAttributesDUnitTest extends DistributedTestCase
* test-region (which does not have any bridge-client or bridge-server) and
* verifies that <code>UnsupportedOperationException</code> occurs as expected
*/
+ @Test
public void testRegisterInterestUseCases()
{
vm1.invoke(() -> NewRegionAttributesDUnitTest.registerInterest());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
index f1fba88..178e314 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.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.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
@@ -28,11 +37,12 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
*
*
*/
+@Category(DistributedTest.class)
public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
{
/** constructor */
- public RedundancyLevelPart1DUnitTest(String name) {
- super(name);
+ public RedundancyLevelPart1DUnitTest() {
+ super();
}
public static void caseSetUp() throws Exception {
@@ -56,6 +66,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
* Redundancy level not specifed, an EP which dies of should be removed from
* the fail over set as well as the live server map
*/
+ @Test
public void testRedundancyNotSpecifiedNonPrimaryServerFail()
{
try {
@@ -91,6 +102,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
* then the EP should be removed from the live server map, added to dead
* server map.
*/
+ @Test
public void testRedundancyNotSpecifiedPrimaryServerFails()
{
/*ClientServerObserver oldBo = ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() {
@@ -145,6 +157,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
* added to dead server map. It should not change the current failover set.
* Failover detection by LSM
*/
+ @Test
public void testRedundancySpecifiedNonFailoverEPFails()
{
try {
@@ -299,6 +312,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
* added to dead server map. It should not change the current failover set.
* Failover detection by Put operation.
*/
+ @Test
public void testRedundancySpecifiedNonFailoverEPFailsDetectionByPut()
{
try {
@@ -339,6 +353,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
* Failure Detection by LSM.
*/
+ @Test
public void testRedundancySpecifiedNonPrimaryEPFails()
{
try {
@@ -377,6 +392,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
* Failure Detection by CCU.
*/
+ @Test
public void testRedundancySpecifiedNonPrimaryEPFailsDetectionByCCU()
{
try {
@@ -417,6 +433,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
* Failure Detection by Register Interest.
*/
+ @Test
public void testRedundancySpecifiedNonPrimaryEPFailsDetectionByRegisterInterest()
{
try {
@@ -457,6 +474,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
* Failure Detection by Unregister Interest.
*/
+ @Test
public void testRedundancySpecifiedNonPrimaryEPFailsDetectionByUnregisterInterest()
{
try {
@@ -497,6 +515,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
* Failure Detection by Put operation.
*/
+ @Test
public void testRedundancySpecifiedNonPrimaryEPFailsDetectionByPut()
{
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/RedundancyLevelPart2DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java
index 0499847..cb865a5 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.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.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
@@ -23,13 +32,14 @@ import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.Wait;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
+@Category(DistributedTest.class)
public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
{
/** constructor */
- public RedundancyLevelPart2DUnitTest(String name) {
- super(name);
+ public RedundancyLevelPart2DUnitTest() {
+ super();
}
public static void caseSetUp() throws Exception {
@@ -59,6 +69,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
* registartion.
* Failure Detection by LSM
*/
+ @Test
public void testRedundancySpecifiedPrimaryEPFails()
{
try {
@@ -99,6 +110,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
* registartion.
* Failure Detection by CCU
*/
+ @Test
public void testRedundancySpecifiedPrimaryEPFailsDetectionByCCU()
{
try {
@@ -140,6 +152,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
* registartion.
* Failure Detection by Register Interest
*/
+ @Test
public void testRedundancySpecifiedPrimaryEPFailsDetectionByRegisterInterest()
{
try {
@@ -181,6 +194,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
* registartion.
* Failure Detection by Unregister Interest
*/
+ @Test
public void testRedundancySpecifiedPrimaryEPFailsDetectionByUnregisterInterest()
{
try {
@@ -221,6 +235,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
* registartion.
* Failure Detection by put operation
*/
+ @Test
public void testRedundancySpecifiedPrimaryEPFailsDetectionByPut()
{
try {
@@ -257,6 +272,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
* existing EP in the set should be the new primary and make sure that CCP is
* created on both the server with relevant interest registartion.
*/
+ @Test
public void testRedundancySpecifiedPrimarySecondaryEPFails()
{
try {
@@ -296,6 +312,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
* sure that CCP is created on the server with relevant interest registartion.
* Bringing the 4th EP alive should simply add it to Live server map.
*/
+ @Test
public void testRedundancySpecifiedEPFails()
{
try {
@@ -350,6 +367,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
* should be added in Live server map as well as failover set and make sure
* that CCP is created on the server with relevant interest registartion.
*/
+ @Test
public void testRedundancyLevelSpecifiedButNotSatisfied()
{
try {
@@ -408,6 +426,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
* added only in Live server map and make sure that no CCP is created on the
* server.
*/
+ @Test
public void testRedundancyLevelSpecifiedAndSatisfied()
{
try {
@@ -448,6 +467,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
* live server map as well as failover set and make sure that CCP is created
* on the server with relevant interest registartion.
*/
+ @Test
public void testRedundancyLevelNotSpecified()
{
try {
@@ -491,6 +511,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
* robin. 4 Explicit calls to proxy.acquireConnection should given Connections to all
* the 4 end points & not just the Eps satisfying redundancy.
+ @Test
public void testAcquireConnectionWithRedundancy()
{
try {
@@ -514,6 +535,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
* Redundancy level specified is more than the total EndPoints. In such situation there should
* not be any exception & all the EPs should has CacheClientProxy created.
*/
+ @Test
public void testRedundancySpecifiedMoreThanEPs()
{
try {