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/02/02 21:21:24 UTC
[17/44] incubator-geode git commit: Refactor dunit
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
index 3583d7c..19ed454 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
@@ -46,9 +46,12 @@ import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.Invoke;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
public class ManagementTestBase extends DistributedTestCase {
@@ -144,7 +147,7 @@ public class ManagementTestBase extends DistributedTestCase {
* Enable system property gemfire.disableManagement false in each VM.
*/
public void enableManagement() {
- invokeInEveryVM(new SerializableRunnable("Enable Management") {
+ Invoke.invokeInEveryVM(new SerializableRunnable("Enable Management") {
public void run() {
System.setProperty(InternalDistributedSystem.DISABLE_MANAGEMENT_PROPERTY, "false");
}
@@ -156,7 +159,7 @@ public class ManagementTestBase extends DistributedTestCase {
* Disable system property gemfire.disableManagement true in each VM.
*/
public void disableManagement() {
- invokeInEveryVM(new SerializableRunnable("Disable Management") {
+ Invoke.invokeInEveryVM(new SerializableRunnable("Disable Management") {
public void run() {
System.setProperty(InternalDistributedSystem.DISABLE_MANAGEMENT_PROPERTY, "true");
}
@@ -291,7 +294,7 @@ public class ManagementTestBase extends DistributedTestCase {
protected void waitForProxy(final ObjectName objectName,
final Class interfaceClass) {
- waitForCriterion(new WaitCriterion() {
+ Wait.waitForCriterion(new WaitCriterion() {
public String description() {
return "Waiting for the proxy of " + objectName.getCanonicalName()
+ " to get propagated to Manager";
@@ -555,7 +558,7 @@ public class ManagementTestBase extends DistributedTestCase {
RegionFactory rf = cache
.createRegionFactory(RegionShortcut.LOCAL);
- getLogWriter().info("Creating Local Region");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Creating Local Region");
rf.create(localRegionName);
}
@@ -578,7 +581,7 @@ public class ManagementTestBase extends DistributedTestCase {
SystemManagementService service = (SystemManagementService) getManagementService();
Region region = cache.getRegion(parentRegionPath);
- getLogWriter().info("Creating Sub Region");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Creating Sub Region");
region.createSubregion(subregionName, region.getAttributes());
}
@@ -621,7 +624,7 @@ public class ManagementTestBase extends DistributedTestCase {
SystemManagementService service = (SystemManagementService) getManagementService();
RegionFactory rf = cache.createRegionFactory(RegionShortcut.REPLICATE);
- getLogWriter().info("Creating Dist Region");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Creating Dist Region");
rf.create(regionName);
}
@@ -643,7 +646,7 @@ public class ManagementTestBase extends DistributedTestCase {
SystemManagementService service = (SystemManagementService) getManagementService();
RegionFactory rf = cache
.createRegionFactory(RegionShortcut.PARTITION_REDUNDANT);
- getLogWriter().info("Creating Par Region");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Creating Par Region");
rf.create(partitionRegionName);
}
@@ -662,7 +665,7 @@ public class ManagementTestBase extends DistributedTestCase {
public void run() {
GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
- getLogWriter().info("Closing Dist Region");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Closing Dist Region");
Region region = cache.getRegion(regionPath);
region.close();
@@ -678,7 +681,7 @@ public class ManagementTestBase extends DistributedTestCase {
assertNotNull(service.getDistributedSystemMXBean());
- waitForCriterion(new WaitCriterion() {
+ Wait.waitForCriterion(new WaitCriterion() {
public String description() {
return "Waiting All members to intimate DistributedSystemMBean";
}
@@ -686,7 +689,7 @@ public class ManagementTestBase extends DistributedTestCase {
public boolean done() {
if (bean.listMemberObjectNames() != null) {
- getLogWriter().info(
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info(
"Member Length " + bean.listMemberObjectNames().length);
}
@@ -710,7 +713,7 @@ public class ManagementTestBase extends DistributedTestCase {
final long currentTime = System.currentTimeMillis();
- waitForCriterion(new WaitCriterion() {
+ Wait.waitForCriterion(new WaitCriterion() {
int actualRefreshCount = 0;
long lastRefreshTime = service.getLastUpdateTime(objectName);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/management/MemberMBeanAttributesDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/MemberMBeanAttributesDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/MemberMBeanAttributesDUnitTest.java
index 50db569..cd36547 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/MemberMBeanAttributesDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/MemberMBeanAttributesDUnitTest.java
@@ -26,6 +26,7 @@ import com.gemstone.gemfire.internal.NanoTimer;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.process.PidUnavailableException;
import com.gemstone.gemfire.internal.process.ProcessUtils;
+import com.gemstone.gemfire.test.dunit.LogWriterSupport;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -112,7 +113,7 @@ public class MemberMBeanAttributesDUnitTest extends ManagementTestBase {
public void run() {
GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
RegionFactory rf = cache.createRegionFactory(RegionShortcut.REPLICATE);
- getLogWriter().info("Creating Dist Region");
+ LogWriterSupport.getLogWriter().info("Creating Dist Region");
rf.create("testRegion1");
rf.create("testRegion2");
rf.create("testRegion3");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.java
index 4e2c278..70f2c29 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.java
@@ -44,6 +44,8 @@ import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
/**
* Tests the off-heap additions to the RegionMXBean and MemberMXBean JMX interfaces.
@@ -927,7 +929,7 @@ public class OffHeapManagementDUnitTest extends CacheTestCase {
vm.invoke(new SerializableRunnable() {
@Override
public void run() {
- waitForCriterion(new WaitCriterion() {
+ Wait.waitForCriterion(new WaitCriterion() {
@Override
public boolean done() {
return (notificationListener.getNotificationSize() > 0);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/management/QueryDataDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/QueryDataDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/QueryDataDUnitTest.java
index f55511f..9eba2e0 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/QueryDataDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/QueryDataDUnitTest.java
@@ -53,9 +53,10 @@ import com.gemstone.gemfire.management.internal.cli.json.TypedJson;
import com.gemstone.gemfire.pdx.PdxInstance;
import com.gemstone.gemfire.pdx.PdxInstanceFactory;
import com.gemstone.gemfire.pdx.internal.PdxInstanceFactoryImpl;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.LogWriterSupport;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase.WaitCriterion;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
import org.json.JSONArray;
import org.json.JSONException;
@@ -171,7 +172,7 @@ public class QueryDataDUnitTest extends ManagementTestBase {
Region region = cache.getRegion(regionName);
for (int j = from; j < to; j++)
region.put(new Integer(j), portfolio[j]);
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRPuts: Inserted Portfolio data on Region "
+ regionName);
@@ -406,7 +407,7 @@ public class QueryDataDUnitTest extends ManagementTestBase {
if (jsonString1.contains("result")) {
JSONObject jsonObj = new JSONObject(jsonString1);
} else {
- getLogWriter().info("Failed Test String" + queriesForRR[i] + " is = " + jsonString1);
+ LogWriterSupport.getLogWriter().info("Failed Test String" + queriesForRR[i] + " is = " + jsonString1);
fail("Join on Replicated did not work.");
}
}
@@ -785,7 +786,7 @@ public class QueryDataDUnitTest extends ManagementTestBase {
final DistributedRegionMXBean regionMBean = MBeanUtil.getDistributedRegionMbean("/"
+ PartitionedRegionName6, 3);
- DistributedTestCase.waitForCriterion(new WaitCriterion() {
+ Wait.waitForCriterion(new WaitCriterion() {
public String description() {
return "Waiting for all entries to get reflected at managing node";
@@ -799,19 +800,19 @@ public class QueryDataDUnitTest extends ManagementTestBase {
}, MAX_WAIT, 1000, true);
- getLogWriter().info("member1RealData is = " + member1RealData);
- getLogWriter().info("member2RealData is = " + member2RealData);
- getLogWriter().info("member3RealData is = " + member3RealData);
+ LogWriterSupport.getLogWriter().info("member1RealData is = " + member1RealData);
+ LogWriterSupport.getLogWriter().info("member2RealData is = " + member2RealData);
+ LogWriterSupport.getLogWriter().info("member3RealData is = " + member3RealData);
String member1Result = bean.queryData(query, member1.getId(), 0);
- getLogWriter().info("member1Result " + query + " is = " + member1Result);
+ LogWriterSupport.getLogWriter().info("member1Result " + query + " is = " + member1Result);
String member2Result = bean.queryData(query, member2.getId(), 0);
- getLogWriter().info("member2Result " + query + " is = " + member2Result);
+ LogWriterSupport.getLogWriter().info("member2Result " + query + " is = " + member2Result);
String member3Result = bean.queryData(query, member3.getId(), 0);
- getLogWriter().info("member3Result " + query + " is = " + member3Result);
+ LogWriterSupport.getLogWriter().info("member3Result " + query + " is = " + member3Result);
for (String val : member1RealData) {
assertTrue(member1Result.contains(val));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/management/RegionManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/RegionManagementDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/RegionManagementDUnitTest.java
index 691527a..69bfd84 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/RegionManagementDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/RegionManagementDUnitTest.java
@@ -50,8 +50,11 @@ import com.gemstone.gemfire.internal.cache.partitioned.fixed.SingleHopQuarterPar
import com.gemstone.gemfire.management.internal.MBeanJMXAdapter;
import com.gemstone.gemfire.management.internal.SystemManagementService;
import com.gemstone.gemfire.test.dunit.Assert;
+import com.gemstone.gemfire.test.dunit.LogWriterSupport;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
/**
* This class checks and verifies various data and operations exposed through
@@ -440,7 +443,7 @@ public class RegionManagementDUnitTest extends ManagementTestBase {
region.put(new Integer(total), array);
}
assertTrue(bean.getEntrySize() > 0);
- getLogWriter().info("DEBUG: EntrySize =" + bean.getEntrySize());
+ LogWriterSupport.getLogWriter().info("DEBUG: EntrySize =" + bean.getEntrySize());
@@ -471,7 +474,7 @@ public class RegionManagementDUnitTest extends ManagementTestBase {
assertNotNull(bean);
assertTrue(bean.getEntrySize() > 0);
- getLogWriter().info("DEBUG: EntrySize =" + bean.getEntrySize());
+ LogWriterSupport.getLogWriter().info("DEBUG: EntrySize =" + bean.getEntrySize());
}
});
@@ -674,14 +677,14 @@ public class RegionManagementDUnitTest extends ManagementTestBase {
attr.setPartitionAttributes(paf.create());
fixedPrRegion = cache.createRegion(FIXED_PR_NAME, attr.create());
assertNotNull(fixedPrRegion);
- getLogWriter().info(
+ LogWriterSupport.getLogWriter().info(
"Partitioned Region " + FIXED_PR_NAME + " created Successfully :"
+ fixedPrRegion.toString());
RegionMXBean bean = service.getLocalRegionMBean(FIXED_PR_PATH);
RegionAttributes regAttrs = fixedPrRegion.getAttributes();
- getLogWriter().info(
+ LogWriterSupport.getLogWriter().info(
"FixedPartitionAttribute From GemFire :"
+ regAttrs.getPartitionAttributes().getFixedPartitionAttributes());
@@ -698,7 +701,7 @@ public class RegionManagementDUnitTest extends ManagementTestBase {
assertEquals(3, fixedPrData.length);
for (int i = 0; i < fixedPrData.length; i++) {
- getLogWriter().info(
+ LogWriterSupport.getLogWriter().info(
"<ExpectedString> Fixed PR Data is " + fixedPrData[i]
+ "</ExpectedString> ");
}
@@ -732,7 +735,7 @@ public class RegionManagementDUnitTest extends ManagementTestBase {
assertNotNull(fixedPrData);
assertEquals(3, fixedPrData.length);
for (int i = 0; i < fixedPrData.length; i++) {
- getLogWriter().info(
+ LogWriterSupport.getLogWriter().info(
"<ExpectedString> Remote PR Data is " + fixedPrData[i]
+ "</ExpectedString> ");
}
@@ -771,7 +774,7 @@ public class RegionManagementDUnitTest extends ManagementTestBase {
Set<ObjectName> names = service.queryMBeanNames(member);
if(names != null){
for(ObjectName name : names){
- getLogWriter().info(
+ LogWriterSupport.getLogWriter().info(
"<ExpectedString> ObjectNames arr" + name
+ "</ExpectedString> ");
}
@@ -845,7 +848,7 @@ public class RegionManagementDUnitTest extends ManagementTestBase {
RegionMXBean bean = null;
try {
- waitForCriterion(new WaitCriterion() {
+ Wait.waitForCriterion(new WaitCriterion() {
RegionMXBean bean = null;
@@ -906,10 +909,10 @@ public class RegionManagementDUnitTest extends ManagementTestBase {
EvictionAttributesData evictionData = bean.listEvictionAttributes();
assertNotNull(membershipData);
assertNotNull(evictionData);
- getLogWriter().info(
+ LogWriterSupport.getLogWriter().info(
"<ExpectedString> Membership Data is "
+ membershipData.toString() + "</ExpectedString> ");
- getLogWriter().info(
+ LogWriterSupport.getLogWriter().info(
"<ExpectedString> Eviction Data is " + membershipData.toString()
+ "</ExpectedString> ");
@@ -943,7 +946,7 @@ public class RegionManagementDUnitTest extends ManagementTestBase {
if (expectedMembers == 0) {
try {
- waitForCriterion(new WaitCriterion() {
+ Wait.waitForCriterion(new WaitCriterion() {
RegionMXBean bean = null;
@@ -984,15 +987,15 @@ public class RegionManagementDUnitTest extends ManagementTestBase {
// Check Stats related Data
// Add Mock testing
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"<ExpectedString> CacheListenerCallsAvgLatency is "
+ bean.getCacheListenerCallsAvgLatency()
+ "</ExpectedString> ");
- getLogWriter().info(
+ LogWriterSupport.getLogWriter().info(
"<ExpectedString> CacheWriterCallsAvgLatency is "
+ bean.getCacheWriterCallsAvgLatency() + "</ExpectedString> ");
- getLogWriter().info(
+ LogWriterSupport.getLogWriter().info(
"<ExpectedString> CreatesRate is " + bean.getCreatesRate()
+ "</ExpectedString> ");
@@ -1093,10 +1096,10 @@ public class RegionManagementDUnitTest extends ManagementTestBase {
EvictionAttributesData evictionData = bean.listEvictionAttributes();
assertNotNull(membershipData);
assertNotNull(evictionData);
- getLogWriter().info(
+ LogWriterSupport.getLogWriter().info(
"<ExpectedString> Membership Data is " + membershipData.toString()
+ "</ExpectedString> ");
- getLogWriter().info(
+ LogWriterSupport.getLogWriter().info(
"<ExpectedString> Eviction Data is " + membershipData.toString()
+ "</ExpectedString> ");
}
@@ -1144,7 +1147,7 @@ public class RegionManagementDUnitTest extends ManagementTestBase {
try {
bean = service.getLocalRegionMBean(REGION_PATH);
} catch (ManagementException mgtEx) {
- getLogWriter().info(
+ LogWriterSupport.getLogWriter().info(
"<ExpectedString> Expected Exception "
+ mgtEx.getLocalizedMessage() + "</ExpectedString> ");
}
@@ -1169,12 +1172,12 @@ public class RegionManagementDUnitTest extends ManagementTestBase {
public void run() {
GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
ManagementService service = getManagementService();
- getLogWriter().info("Closing Par Region");
+ LogWriterSupport.getLogWriter().info("Closing Par Region");
RegionMXBean bean = null;
try {
bean = service.getLocalRegionMBean(PARTITIONED_REGION_PATH);
} catch (ManagementException mgtEx) {
- getLogWriter().info(
+ LogWriterSupport.getLogWriter().info(
"<ExpectedString> Expected Exception "
+ mgtEx.getLocalizedMessage() + "</ExpectedString> ");
}
@@ -1195,14 +1198,14 @@ public class RegionManagementDUnitTest extends ManagementTestBase {
public void run() {
GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
ManagementService service = getManagementService();
- getLogWriter().info("Closing Fixed Par Region");
+ LogWriterSupport.getLogWriter().info("Closing Fixed Par Region");
Region region = cache.getRegion(FIXED_PR_PATH);
region.close();
RegionMXBean bean = null;
try {
bean = service.getLocalRegionMBean(FIXED_PR_PATH);
} catch (ManagementException mgtEx) {
- getLogWriter().info(
+ LogWriterSupport.getLogWriter().info(
"<ExpectedString> Expected Exception "
+ mgtEx.getLocalizedMessage() + "</ExpectedString> ");
}
@@ -1423,7 +1426,7 @@ public class RegionManagementDUnitTest extends ManagementTestBase {
Notification rn = notification;
assertTrue(rn.getType().equals(JMXNotificationType.REGION_CREATED)
|| rn.getType().equals(JMXNotificationType.REGION_CLOSED));
- getLogWriter().info(
+ LogWriterSupport.getLogWriter().info(
"<ExpectedString> Member Level Notifications" + rn.toString()
+ "</ExpectedString> ");
}
@@ -1442,7 +1445,7 @@ public class RegionManagementDUnitTest extends ManagementTestBase {
public void handleNotification(Notification notification, Object handback) {
assertNotNull(notification);
Notification rn = notification;
- getLogWriter().info(
+ LogWriterSupport.getLogWriter().info(
"<ExpectedString> Distributed System Notifications" + rn.toString()
+ "</ExpectedString> ");
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
index b95e5e8..c8377d2 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
@@ -50,9 +50,11 @@ import com.gemstone.gemfire.management.membership.MembershipEvent;
import com.gemstone.gemfire.management.membership.MembershipListener;
import com.gemstone.gemfire.management.membership.UniversalMembershipListenerAdapter;
import com.gemstone.gemfire.test.dunit.IgnoredException;
+import com.gemstone.gemfire.test.dunit.NetworkSupport;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
/**
* Tests the UniversalMembershipListenerAdapter.
@@ -197,7 +199,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
// duplicate join
InternalClientMembership.notifyJoined(memberA, true);
- pause(BRIEF_PAUSE_MILLIS);
+ Wait.pause(BRIEF_PAUSE_MILLIS);
assertFalse(fired[JOINED]);
assertNull(member[JOINED]);
assertNull(memberId[JOINED]);
@@ -218,7 +220,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
// duplicate left
InternalClientMembership.notifyLeft(memberA, true);
- pause(BRIEF_PAUSE_MILLIS);
+ Wait.pause(BRIEF_PAUSE_MILLIS);
assertFalse(fired[LEFT]);
assertNull(member[LEFT]);
assertNull(memberId[LEFT]);
@@ -377,7 +379,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
final int[] ports = new int[1];
// create BridgeServer in controller vm...
- getLogWriter().info("[testLonerClientEventsInServer] Create BridgeServer");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testLonerClientEventsInServer] Create BridgeServer");
getSystem();
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
@@ -391,9 +393,9 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
final DistributedMember serverMember = getDistributedMember();
final Properties serverProperties = getSystem().getProperties();
- getLogWriter().info("[testLonerClientEventsInServer] ports[0]=" + ports[0]);
- getLogWriter().info("[testLonerClientEventsInServer] serverMemberId=" + serverMemberId);
- getLogWriter().info("[testLonerClientEventsInServer] serverMember=" + serverMember);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testLonerClientEventsInServer] ports[0]=" + ports[0]);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testLonerClientEventsInServer] serverMemberId=" + serverMemberId);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testLonerClientEventsInServer] serverMember=" + serverMember);
// register the bridge listener
ClientMembership.registerClientMembershipListener(bridgeListener);
@@ -412,14 +414,14 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
new CacheSerializableRunnable("Create bridge client") {
@Override
public void run2() throws CacheException {
- getLogWriter().info("[testLonerClientEventsInServer] create bridge client");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testLonerClientEventsInServer] create bridge client");
Properties config = new Properties();
config.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
config.setProperty(DistributionConfig.LOCATORS_NAME, "");
getSystem(config);
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- ClientServerTestCase.configureConnectionPool(factory, getServerHostName(host), ports, false, -1, -1, null);
+ ClientServerTestCase.configureConnectionPool(factory, NetworkSupport.getServerHostName(host), ports, false, -1, -1, null);
createRegion(name, factory.create());
assertNotNull(getRootRegion().getSubregion(name));
}
@@ -445,7 +447,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
}
}
- getLogWriter().info("[testLonerClientEventsInServer] assert server detected client join");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testLonerClientEventsInServer] assert server detected client join");
assertTrue(firedBridge[JOINED]);
assertEquals(clientMember, memberBridge[JOINED]);
//as of 6.1 the id can change when a bridge is created or a connection pool is created
@@ -491,7 +493,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
vm0.invoke(new SerializableRunnable("Wait for client to fully connect") {
public void run() {
- getLogWriter().info("[testLonerClientEventsInServer] wait for client to fully connect");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testLonerClientEventsInServer] wait for client to fully connect");
final String pl =
getRootRegion().getSubregion(name).getAttributes().getPoolName();
PoolImpl pi = (PoolImpl)PoolManager.find(pl);
@@ -501,7 +503,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
vm0.invoke(new SerializableRunnable("Close bridge client region") {
public void run() {
- getLogWriter().info("[testLonerClientEventsInServer] close bridge client region");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testLonerClientEventsInServer] close bridge client region");
getRootRegion().getSubregion(name).close();
PoolManager.close();
}
@@ -518,7 +520,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
}
}
- getLogWriter().info("[testLonerClientEventsInServer] assert server detected client left");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testLonerClientEventsInServer] assert server detected client left");
assertFalse(firedBridge[JOINED]);
assertNull(memberIdBridge[JOINED]);
@@ -580,7 +582,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
}
}
- getLogWriter().info("[testLonerClientEventsInServer] assert server detected client re-join");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testLonerClientEventsInServer] assert server detected client re-join");
assertTrue(firedBridge[JOINED]);
assertEquals(clientMember, memberBridge[JOINED]);
assertEquals(clientMemberId, memberIdBridge[JOINED]);
@@ -625,7 +627,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
vm0.invoke(new SerializableRunnable("Wait for client to fully connect") {
public void run() {
- getLogWriter().info("[testLonerClientEventsInServer] wait for client to fully connect");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testLonerClientEventsInServer] wait for client to fully connect");
final String pl =
getRootRegion().getSubregion(name).getAttributes().getPoolName();
PoolImpl pi = (PoolImpl)PoolManager.find(pl);
@@ -637,7 +639,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
try {
vm0.invoke(new SerializableRunnable("Stop bridge client") {
public void run() {
- getLogWriter().info("[testLonerClientEventsInServer] Stop bridge client");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testLonerClientEventsInServer] Stop bridge client");
getRootRegion().getSubregion(name).close();
PoolManager.close();
}
@@ -654,7 +656,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
}
}
- getLogWriter().info("[testLonerClientEventsInServer] assert server detected client crashed");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testLonerClientEventsInServer] assert server detected client crashed");
assertFalse(firedBridge[JOINED]);
assertNull(memberIdBridge[JOINED]);
assertNull(memberBridge[JOINED]);
@@ -761,7 +763,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
new UniversalMembershipListenerAdapter() {
@Override
public synchronized void memberJoined(MembershipEvent event) {
- getLogWriter().info("[doTestSystemClientEventsInServer] memberJoined >" + event.getMemberId() + "<");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] memberJoined >" + event.getMemberId() + "<");
firedAdapterDuplicate[JOINED] = firedAdapter[JOINED];
firedAdapter[JOINED] = true;
memberAdapter[JOINED] = event.getDistributedMember();
@@ -774,7 +776,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
}
@Override
public synchronized void memberLeft(MembershipEvent event) {
- getLogWriter().info("[doTestSystemClientEventsInServer] memberLeft >" + event.getMemberId() + "<");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] memberLeft >" + event.getMemberId() + "<");
firedAdapterDuplicate[LEFT] = firedAdapter[LEFT];
firedAdapter[LEFT] = true;
memberAdapter[LEFT] = event.getDistributedMember();
@@ -787,7 +789,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
}
@Override
public synchronized void memberCrashed(MembershipEvent event) {
- getLogWriter().info("[doTestSystemClientEventsInServer] memberCrashed >" + event.getMemberId() + "<");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] memberCrashed >" + event.getMemberId() + "<");
firedAdapterDuplicate[CRASHED] = firedAdapter[CRASHED];
firedAdapter[CRASHED] = true;
memberAdapter[CRASHED] = event.getDistributedMember();
@@ -833,7 +835,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
final int[] ports = new int[1];
// create BridgeServer in controller vm...
- getLogWriter().info("[doTestSystemClientEventsInServer] Create BridgeServer");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] Create BridgeServer");
getSystem();
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
@@ -853,9 +855,9 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
serverProperties.remove(DistributionConfig.SSL_PROTOCOLS_NAME);
serverProperties.remove(DistributionConfig.SSL_REQUIRE_AUTHENTICATION_NAME);
- getLogWriter().info("[doTestSystemClientEventsInServer] ports[0]=" + ports[0]);
- getLogWriter().info("[doTestSystemClientEventsInServer] serverMemberId=" + serverMemberId);
- getLogWriter().info("[doTestSystemClientEventsInServer] serverMember=" + serverMember);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] ports[0]=" + ports[0]);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] serverMemberId=" + serverMemberId);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] serverMember=" + serverMember);
// register the bridge listener
ClientMembership.registerClientMembershipListener(bridgeListener);
@@ -874,12 +876,12 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
new CacheSerializableRunnable("Create bridge client") {
@Override
public void run2() throws CacheException {
- getLogWriter().info("[doTestSystemClientEventsInServer] create system bridge client");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] create system bridge client");
assertTrue(getSystem(serverProperties).isConnected());
assertFalse(getCache().isClosed());
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- ClientServerTestCase.configureConnectionPool(factory, getServerHostName(host), ports, false, -1, -1, null);
+ ClientServerTestCase.configureConnectionPool(factory, NetworkSupport.getServerHostName(host), ports, false, -1, -1, null);
createRegion(name, factory.create());
assertNotNull(getRootRegion().getSubregion(name));
}
@@ -909,7 +911,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
}
}
- getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client join");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client join");
assertFalse(firedSystemDuplicate);
assertFalse(firedAdapterDuplicate);
assertFalse(firedBridgeDuplicate);
@@ -958,7 +960,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
vm0.invoke(new SerializableRunnable("Wait for client to fully connect") {
public void run() {
- getLogWriter().info("[doTestSystemClientEventsInServer] wait for client to fully connect");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] wait for client to fully connect");
final String pl =
getRootRegion().getSubregion(name).getAttributes().getPoolName();
PoolImpl pi = (PoolImpl)PoolManager.find(pl);
@@ -969,7 +971,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
// close bridge client region
vm0.invoke(new SerializableRunnable("Close bridge client region") {
public void run() {
- getLogWriter().info("[doTestSystemClientEventsInServer] close bridge client region");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] close bridge client region");
getRootRegion().getSubregion(name).close();
PoolManager.close();
}
@@ -986,7 +988,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
}
}
- getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client left");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client left");
assertFalse(firedSystemDuplicate);
assertFalse(firedAdapterDuplicate);
assertFalse(firedBridgeDuplicate);
@@ -1051,7 +1053,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
}
}
- getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client re-join");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client re-join");
assertFalse(firedSystemDuplicate);
assertFalse(firedAdapterDuplicate);
assertFalse(firedBridgeDuplicate);
@@ -1100,7 +1102,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
vm0.invoke(new SerializableRunnable("Wait for client to fully connect") {
public void run() {
- getLogWriter().info("[doTestSystemClientEventsInServer] wait for client to fully connect");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] wait for client to fully connect");
final String pl =
getRootRegion().getSubregion(name).getAttributes().getPoolName();
PoolImpl pi = (PoolImpl)PoolManager.find(pl);
@@ -1111,7 +1113,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
// have bridge client disconnect from system
vm0.invoke(new SerializableRunnable("Disconnect bridge client") {
public void run() {
- getLogWriter().info("[doTestSystemClientEventsInServer] disconnect bridge client");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] disconnect bridge client");
closeCache();
disconnectFromDS();
}
@@ -1133,7 +1135,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
}
}
- getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client left");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client left");
assertFalse(firedSystemDuplicate);
assertFalse(firedAdapterDuplicate);
assertFalse(firedBridgeDuplicate);
@@ -1203,7 +1205,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
}
}
- getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client re-join");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client re-join");
assertFalse(firedSystemDuplicate);
assertFalse(firedAdapterDuplicate);
assertFalse(firedBridgeDuplicate);
@@ -1252,7 +1254,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
vm0.invoke(new SerializableRunnable("Wait for client to fully connect") {
public void run() {
- getLogWriter().info("[doTestSystemClientEventsInServer] wait for client to fully connect");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] wait for client to fully connect");
final String pl =
getRootRegion().getSubregion(name).getAttributes().getPoolName();
PoolImpl pi = (PoolImpl)PoolManager.find(pl);
@@ -1265,7 +1267,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
try {
vm0.invoke(new SerializableRunnable("Close bridge client region") {
public void run() {
- getLogWriter().info("[doTestSystemClientEventsInServer] close bridge client region");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] close bridge client region");
getRootRegion().getSubregion(name).close();
PoolManager.close();
}
@@ -1282,7 +1284,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
}
}
- getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client crashed");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client crashed");
assertFalse(firedSystemDuplicate);
assertFalse(firedAdapterDuplicate);
assertFalse(firedBridgeDuplicate);
@@ -1336,11 +1338,11 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
* Note: This probably won't work if the pool has more than one Endpoint.
*/
protected void waitForClientToFullyConnect(final PoolImpl pool) {
- getLogWriter().info("[waitForClientToFullyConnect]");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[waitForClientToFullyConnect]");
final long failMillis = System.currentTimeMillis() + JOIN_FAIL_MILLIS;
boolean fullyConnected = false;
while (!fullyConnected) {
- pause(100);
+ Wait.pause(100);
fullyConnected = pool.getConnectionCount() >= pool.getMinConnections();
assertTrue("Client failed to create "
+ pool.getMinConnections()
@@ -1349,7 +1351,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
+ " connections were created.",
System.currentTimeMillis() < failMillis);
}
- getLogWriter().info("[waitForClientToFullyConnect] fullyConnected=" + fullyConnected);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[waitForClientToFullyConnect] fullyConnected=" + fullyConnected);
}
/**
@@ -1460,7 +1462,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
new UniversalMembershipListenerAdapter() {
@Override
public synchronized void memberJoined(MembershipEvent event) {
- getLogWriter().info("[testServerEventsInSystemClient] memberJoined >" + event.getMemberId() + "<");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInSystemClient] memberJoined >" + event.getMemberId() + "<");
firedAdapterDuplicate[JOINED] = firedAdapter[JOINED];
firedAdapter[JOINED] = true;
memberAdapter[JOINED] = event.getDistributedMember();
@@ -1473,7 +1475,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
}
@Override
public synchronized void memberLeft(MembershipEvent event) {
- getLogWriter().info("[testServerEventsInSystemClient] memberLeft >" + event.getMemberId() + "<");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInSystemClient] memberLeft >" + event.getMemberId() + "<");
firedAdapterDuplicate[LEFT] = firedAdapter[LEFT];
firedAdapter[LEFT] = true;
memberAdapter[LEFT] = event.getDistributedMember();
@@ -1486,7 +1488,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
}
@Override
public synchronized void memberCrashed(MembershipEvent event) {
- getLogWriter().info("[testServerEventsInSystemClient] memberCrashed >" + event.getMemberId() + "<");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInSystemClient] memberCrashed >" + event.getMemberId() + "<");
firedAdapterDuplicate[CRASHED] = firedAdapter[CRASHED];
firedAdapter[CRASHED] = true;
memberAdapter[CRASHED] = event.getDistributedMember();
@@ -1534,7 +1536,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
assertTrue(ports[0] != 0);
// create BridgeServer in controller vm...
- getLogWriter().info("[doTestSystemClientEventsInServer] Create BridgeServer");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] Create BridgeServer");
getSystem();
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
@@ -1553,9 +1555,9 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
serverProperties.remove(DistributionConfig.SSL_PROTOCOLS_NAME);
serverProperties.remove(DistributionConfig.SSL_REQUIRE_AUTHENTICATION_NAME);
- getLogWriter().info("[testServerEventsInPeerSystem] ports[0]=" + ports[0]);
- getLogWriter().info("[testServerEventsInPeerSystem] serverMemberId=" + serverMemberId);
- getLogWriter().info("[testServerEventsInPeerSystem] serverMember=" + serverMember);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInPeerSystem] ports[0]=" + ports[0]);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInPeerSystem] serverMemberId=" + serverMemberId);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInPeerSystem] serverMember=" + serverMember);
GemFireCacheImpl cache = GemFireCacheImpl.getExisting();
assertNotNull(cache);
@@ -1571,7 +1573,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
new CacheSerializableRunnable("Create Peer Cache") {
@Override
public void run2() throws CacheException {
- getLogWriter().info("[testServerEventsInPeerSystem] Create Peer cache");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInPeerSystem] Create Peer cache");
getSystem(serverProperties);
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
@@ -1588,8 +1590,8 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
DistributedMember peerMember = (DistributedMember) vm0.invoke(
UniversalMembershipListenerAdapterDUnitTest.class, "getDistributedMember");
- getLogWriter().info("[testServerEventsInPeerSystem] peerMemberId=" + peerMemberId);
- getLogWriter().info("[testServerEventsInPeerSystem] peerMember=" + peerMember);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInPeerSystem] peerMemberId=" + peerMemberId);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInPeerSystem] peerMember=" + peerMember);
@@ -1604,7 +1606,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
}
}
- getLogWriter().info("[testServerEventsInPeerSystem] assert server detected peer join");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInPeerSystem] assert server detected peer join");
assertFalse(firedSystemDuplicate);
// TODO: sometimes get adapter duplicate since memberId isn't endpoint
// initial impl uses Endpoint.toString() for memberId of server; final
@@ -1647,12 +1649,12 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
new LocalLogWriter(InternalLogWriter.ALL_LEVEL, System.out);
bgexecLogger.info("<ExpectedException action=add>" +
"java.io.IOException" + "</ExpectedException>");
- final IgnoredException ex = IgnoredException.addExpectedException(
+ final IgnoredException ex = IgnoredException.addIgnoredException(
ServerConnectivityException.class.getName());
try {
vm0.invoke(new SerializableRunnable("Disconnect Peer server") {
public void run() {
- getLogWriter().info("[testServerEventsInPeerSystem] disconnect peer server");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInPeerSystem] disconnect peer server");
closeCache();
disconnectFromDS();
}
@@ -1675,7 +1677,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
ex.remove();
}
- getLogWriter().info("[testServerEventsInPeerSystem] assert server detected peer crashed");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInPeerSystem] assert server detected peer crashed");
assertFalse(firedSystemDuplicate);
// TODO: sometimes get adapter duplicate since memberId isn't endpoint
// initial impl uses Endpoint.toString() for memberId of server; final
@@ -1756,7 +1758,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
new UniversalMembershipListenerAdapter() {
@Override
public synchronized void memberJoined(MembershipEvent event) {
- getLogWriter().info("[testServerEventsInLonerClient] memberJoined >" + event.getMemberId() + "<");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInLonerClient] memberJoined >" + event.getMemberId() + "<");
firedAdapterDuplicate[JOINED] = firedAdapter[JOINED];
firedAdapter[JOINED] = true;
memberAdapter[JOINED] = event.getDistributedMember();
@@ -1769,7 +1771,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
}
@Override
public synchronized void memberLeft(MembershipEvent event) {
- getLogWriter().info("[testServerEventsInLonerClient] memberLeft >" + event.getMemberId() + "<");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInLonerClient] memberLeft >" + event.getMemberId() + "<");
firedAdapterDuplicate[LEFT] = firedAdapter[LEFT];
firedAdapter[LEFT] = true;
memberAdapter[LEFT] = event.getDistributedMember();
@@ -1782,7 +1784,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
}
@Override
public synchronized void memberCrashed(MembershipEvent event) {
- getLogWriter().info("[testServerEventsInLonerClient] memberCrashed >" + event.getMemberId() + "<");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInLonerClient] memberCrashed >" + event.getMemberId() + "<");
firedAdapterDuplicate[CRASHED] = firedAdapter[CRASHED];
firedAdapter[CRASHED] = true;
memberAdapter[CRASHED] = event.getDistributedMember();
@@ -1829,13 +1831,13 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
{ AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET) };
assertTrue(ports[0] != 0);
- getLogWriter().info("[testServerEventsInLonerClient] create loner bridge client");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInLonerClient] create loner bridge client");
Properties config = new Properties();
config.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
config.setProperty(DistributionConfig.LOCATORS_NAME, "");
getSystem(config);
- getLogWriter().info("[testServerEventsInLonerClient] create system bridge client");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInLonerClient] create system bridge client");
getSystem();
// register the bridge listener
@@ -1851,7 +1853,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
new CacheSerializableRunnable("Create BridgeServer") {
@Override
public void run2() throws CacheException {
- getLogWriter().info("[testServerEventsInLonerClient] Create BridgeServer");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInLonerClient] Create BridgeServer");
getSystem();
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
@@ -1862,7 +1864,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
testServerEventsInLonerClient_port = startBridgeServer(ports[0]);
}
catch (IOException e) {
- getLogWriter().error(e);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().error(e);
fail(e.getMessage());
}
}
@@ -1879,14 +1881,14 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
DistributedMember serverMember = (DistributedMember) vm0.invoke(
UniversalMembershipListenerAdapterDUnitTest.class, "getDistributedMember");
- getLogWriter().info("[testServerEventsInLonerClient] ports[0]=" + ports[0]);
- getLogWriter().info("[testServerEventsInLonerClient] serverMemberId=" + serverMemberId);
- getLogWriter().info("[testServerEventsInLonerClient] serverMember=" + serverMember);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInLonerClient] ports[0]=" + ports[0]);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInLonerClient] serverMemberId=" + serverMemberId);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInLonerClient] serverMember=" + serverMember);
// create region which connects to bridge server
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- ClientServerTestCase.configureConnectionPool(factory, getServerHostName(host), ports, false, -1, -1, null);
+ ClientServerTestCase.configureConnectionPool(factory, NetworkSupport.getServerHostName(host), ports, false, -1, -1, null);
createRegion(name, factory.create());
assertNotNull(getRootRegion().getSubregion(name));
@@ -1901,7 +1903,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
}
}
- getLogWriter().info("[testServerEventsInLonerClient] assert client detected server join");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInLonerClient] assert client detected server join");
// TODO: sometimes get adapter duplicate since memberId isn't endpoint KIRK
// initial impl uses Endpoint.toString() for memberId of server; final
// impl should have server send its real memberId to client via HandShake
@@ -1941,7 +1943,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
assertFalse(isClientAdapter[CRASHED]);
resetArraysForTesting(firedAdapter, memberAdapter, memberIdAdapter, isClientAdapter);
- getLogWriter().info("[testServerEventsInLonerClient] wait for client to fully connect");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInLonerClient] wait for client to fully connect");
final String pl =
getRootRegion().getSubregion(name).getAttributes().getPoolName();
PoolImpl pi = (PoolImpl)PoolManager.find(pl);
@@ -1970,7 +1972,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
try {
vm0.invoke(new SerializableRunnable("Disconnect bridge server") {
public void run() {
- getLogWriter().info("[testServerEventsInLonerClient] disconnect bridge server");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInLonerClient] disconnect bridge server");
closeCache();
}
});
@@ -1994,7 +1996,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
lw.info(removeExpected2);
}
- getLogWriter().info("[testServerEventsInLonerClient] assert client detected server crashed");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInLonerClient] assert client detected server crashed");
// TODO: sometimes get adapter duplicate since memberId isn't endpoint KIRK
// initial impl uses Endpoint.toString() for memberId of server; final
// impl should have server send its real memberId to client via HandShake
@@ -2050,9 +2052,9 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
serverMember = (DistributedMember) vm0.invoke(
UniversalMembershipListenerAdapterDUnitTest.class, "getDistributedMember");
- getLogWriter().info("[testServerEventsInLonerClient] ports[0]=" + ports[0]);
- getLogWriter().info("[testServerEventsInLonerClient] serverMemberId=" + serverMemberId);
- getLogWriter().info("[testServerEventsInLonerClient] serverMember=" + serverMember);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInLonerClient] ports[0]=" + ports[0]);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInLonerClient] serverMemberId=" + serverMemberId);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInLonerClient] serverMember=" + serverMember);
synchronized(adapter) {
if (!firedAdapter[JOINED]) {
@@ -2065,7 +2067,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
}
}
- getLogWriter().info("[testServerEventsInLonerClient] assert client detected server re-join");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInLonerClient] assert client detected server re-join");
// TODO: sometimes get adapter duplicate since memberId isn't endpoint KIRK
// initial impl uses Endpoint.toString() for memberId of server; final
// impl should have server send its real memberId to client via HandShake
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java
index 70f28ea..119b7ad 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java
@@ -38,11 +38,13 @@ import com.gemstone.gemfire.management.ManagementService;
import com.gemstone.gemfire.management.RegionMXBean;
import com.gemstone.gemfire.management.internal.cli.result.CommandResultException;
import com.gemstone.gemfire.test.dunit.Assert;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.LogWriterSupport;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
/**
*
@@ -163,22 +165,22 @@ public class CliUtilDUnitTest extends CacheTestCase {
checkBean(REGION_MEMBER1_GROUP2,1) &&
checkBean(REGION_MEMBER2_GROUP2,1) ;
if(!flag){
- getLogWriter().info("Still probing for mbeans");
+ LogWriterSupport.getLogWriter().info("Still probing for mbeans");
return false;
}
else{
- getLogWriter().info("All distributed region mbeans are federated to manager.");
+ LogWriterSupport.getLogWriter().info("All distributed region mbeans are federated to manager.");
return true;
}
}
private boolean checkBean(String string, int memberCount) {
DistributedRegionMXBean bean2 = service.getDistributedRegionMXBean(Region.SEPARATOR+string);
- getLogWriter().info("DistributedRegionMXBean for region=" + string + " is " + bean2);
+ LogWriterSupport.getLogWriter().info("DistributedRegionMXBean for region=" + string + " is " + bean2);
if(bean2==null)
return false;
else{
int members = bean2.getMemberCount();
- getLogWriter().info("DistributedRegionMXBean for region=" + string + " is aggregated for " + memberCount + " expected count=" + memberCount);
+ LogWriterSupport.getLogWriter().info("DistributedRegionMXBean for region=" + string + " is aggregated for " + memberCount + " expected count=" + memberCount);
if(members<memberCount){
return false;
}
@@ -193,8 +195,8 @@ public class CliUtilDUnitTest extends CacheTestCase {
}
};
- DistributedTestCase.waitForCriterion(waitForMaangerMBean, 120000, 2000, true);
- getLogWriter().info("Manager federation is complete");
+ Wait.waitForCriterion(waitForMaangerMBean, 120000, 2000, true);
+ LogWriterSupport.getLogWriter().info("Manager federation is complete");
}
private void registerFunction() {
@@ -210,7 +212,7 @@ public class CliUtilDUnitTest extends CacheTestCase {
assertNotNull(service.getMemberMXBean());
RegionMXBean bean = service.getLocalRegionMBean(Region.SEPARATOR+regionName);
assertNotNull(bean);
- getLogWriter().info("Created region=" + regionName + " Bean=" + bean);
+ LogWriterSupport.getLogWriter().info("Created region=" + regionName + " Bean=" + bean);
return region;
}
@@ -222,7 +224,7 @@ public class CliUtilDUnitTest extends CacheTestCase {
localProps.setProperty(DistributionConfig.JMX_MANAGER_START_NAME, "false");
int jmxPort = AvailablePortHelper.getRandomAvailableTCPPort();
localProps.setProperty(DistributionConfig.JMX_MANAGER_PORT_NAME, ""+jmxPort);
- getLogWriter().info("Set jmx-port="+ jmxPort);
+ LogWriterSupport.getLogWriter().info("Set jmx-port="+ jmxPort);
getSystem(localProps);
getCache();
final ManagementService service = ManagementService.getManagementService(getCache());
@@ -241,7 +243,7 @@ public class CliUtilDUnitTest extends CacheTestCase {
final VM vm1 = Host.getHost(0).getVM(0);
- getLogWriter().info("testFor - findAllMatchingMembers");
+ LogWriterSupport.getLogWriter().info("testFor - findAllMatchingMembers");
vm1.invoke(new SerializableRunnable() {
@Override
public void run() {
@@ -257,7 +259,7 @@ public class CliUtilDUnitTest extends CacheTestCase {
}
});
- getLogWriter().info("testFor - getDistributedMemberByNameOrId");
+ LogWriterSupport.getLogWriter().info("testFor - getDistributedMemberByNameOrId");
vm1.invoke(new SerializableRunnable() {
@Override
public void run() {
@@ -265,7 +267,7 @@ public class CliUtilDUnitTest extends CacheTestCase {
}
});
- getLogWriter().info("testFor - executeFunction");
+ LogWriterSupport.getLogWriter().info("testFor - executeFunction");
vm1.invoke(new SerializableRunnable() {
@Override
public void run() {
@@ -273,7 +275,7 @@ public class CliUtilDUnitTest extends CacheTestCase {
}
});
- getLogWriter().info("testFor - getRegionAssociatedMembers");
+ LogWriterSupport.getLogWriter().info("testFor - getRegionAssociatedMembers");
vm1.invoke(new SerializableRunnable() {
@Override
public void run() {
@@ -419,7 +421,7 @@ public class CliUtilDUnitTest extends CacheTestCase {
Region region = cache.getRegion(COMMON_REGION);
String id = cache.getDistributedSystem().getDistributedMember().getName();
region.put(id, object);
- getLogWriter().info("Completed executeFunction on member : " + id);
+ LogWriterSupport.getLogWriter().info("Completed executeFunction on member : " + id);
context.getResultSender().lastResult(true);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
index 4d8f8ff..a844275 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
@@ -29,6 +29,7 @@ import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.management.internal.cli.shell.Gfsh;
import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.LogWriterSupport;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
@@ -544,18 +545,18 @@ public class CliCommandTestBase extends CacheTestCase {
}
protected void info(String string) {
- getLogWriter().info(string);
+ LogWriterSupport.getLogWriter().info(string);
}
protected void debug(String string) {
- getLogWriter().fine(string);
+ LogWriterSupport.getLogWriter().fine(string);
}
protected void error(String string) {
- getLogWriter().error(string);
+ LogWriterSupport.getLogWriter().error(string);
}
protected void error(String string, Throwable e) {
- getLogWriter().error(string, e);
+ LogWriterSupport.getLogWriter().error(string, e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
index d4ac3ca..2a08e28 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
@@ -36,11 +36,14 @@ import com.gemstone.gemfire.management.internal.cli.remote.CommandProcessor;
import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
import com.gemstone.gemfire.test.dunit.Assert;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.Invoke;
+import com.gemstone.gemfire.test.dunit.LogWriterSupport;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
import org.apache.commons.io.FileUtils;
@@ -82,7 +85,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase {
public void tearDown2() throws Exception {
deleteTestFiles();
- invokeInEveryVM(new SerializableRunnable() {
+ Invoke.invokeInEveryVM(new SerializableRunnable() {
@Override
public void run() {
@@ -122,10 +125,10 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase {
RuntimeMXBean runtimeBean = ManagementFactory.getRuntimeMXBean();
List<String> jvmArgs = runtimeBean.getInputArguments();
- getLogWriter().info("#SB Actual JVM Args : ");
+ LogWriterSupport.getLogWriter().info("#SB Actual JVM Args : ");
for (String jvmArg : jvmArgs) {
- getLogWriter().info("#SB JVM " + jvmArg);
+ LogWriterSupport.getLogWriter().info("#SB JVM " + jvmArg);
}
InternalDistributedSystem system = (InternalDistributedSystem) cache.getDistributedSystem();
@@ -139,7 +142,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase {
CommandResult cmdResult = executeCommand(command);
String resultStr = commandResultToString(cmdResult);
- getLogWriter().info("#SB Hiding the defaults\n" + resultStr);
+ LogWriterSupport.getLogWriter().info("#SB Hiding the defaults\n" + resultStr);
assertEquals(true, cmdResult.getStatus().equals(Status.OK));
assertEquals(true, resultStr.contains("G1"));
@@ -149,7 +152,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase {
cmdResult = executeCommand(command + " --" + CliStrings.DESCRIBE_CONFIG__HIDE__DEFAULTS + "=false");
resultStr = commandResultToString(cmdResult);
- getLogWriter().info("#SB No hiding of defaults\n" + resultStr);
+ LogWriterSupport.getLogWriter().info("#SB No hiding of defaults\n" + resultStr);
assertEquals(true, cmdResult.getStatus().equals(Status.OK));
assertEquals(true, resultStr.contains("is-server"));
@@ -278,8 +281,8 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase {
csb.addOption(CliStrings.ALTER_RUNTIME_CONFIG__LOG__DISK__SPACE__LIMIT, "10");
CommandResult cmdResult = executeCommand(csb.getCommandString());
String resultString = commandResultToString(cmdResult);
- getLogWriter().info("Result\n");
- getLogWriter().info(resultString);
+ LogWriterSupport.getLogWriter().info("Result\n");
+ LogWriterSupport.getLogWriter().info(resultString);
assertEquals(true, cmdResult.getStatus().equals(Status.OK));
assertEquals(LogWriterImpl.INFO_LEVEL, config.getLogLevel());
assertEquals(50, config.getLogFileSizeLimit());
@@ -317,8 +320,8 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase {
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.ALTER_RUNTIME_CONFIG);
CommandResult cmdResult = executeCommand(csb.getCommandString());
String resultAsString = commandResultToString(cmdResult);
- getLogWriter().info("#SB Result\n");
- getLogWriter().info(resultAsString);
+ LogWriterSupport.getLogWriter().info("#SB Result\n");
+ LogWriterSupport.getLogWriter().info(resultAsString);
assertEquals(true, cmdResult.getStatus().equals(Status.ERROR));
assertTrue(resultAsString.contains(CliStrings.ALTER_RUNTIME_CONFIG__RELEVANT__OPTION__MESSAGE));
@@ -326,8 +329,8 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase {
csb.addOption(CliStrings.ALTER_RUNTIME_CONFIG__LOG__DISK__SPACE__LIMIT, "2000000000");
cmdResult = executeCommand(csb.getCommandString());
resultAsString = commandResultToString(cmdResult);
- getLogWriter().info("#SB Result\n");
- getLogWriter().info(resultAsString);
+ LogWriterSupport.getLogWriter().info("#SB Result\n");
+ LogWriterSupport.getLogWriter().info(resultAsString);
assertEquals(true, cmdResult.getStatus().equals(Status.ERROR));
}
@@ -362,8 +365,8 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase {
csb.addOption(CliStrings.ALTER_RUNTIME_CONFIG__LOG__DISK__SPACE__LIMIT, "10");
CommandResult cmdResult = executeCommand(csb.getCommandString());
String resultString = commandResultToString(cmdResult);
- getLogWriter().info("#SB Result\n");
- getLogWriter().info(resultString);
+ LogWriterSupport.getLogWriter().info("#SB Result\n");
+ LogWriterSupport.getLogWriter().info(resultString);
assertEquals(true, cmdResult.getStatus().equals(Status.OK));
assertEquals(LogWriterImpl.INFO_LEVEL, config.getLogLevel());
assertEquals(50, config.getLogFileSizeLimit());
@@ -416,7 +419,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase {
final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locatorPort, locatorLogFile, null,
locatorProps);
- DistributedTestCase.WaitCriterion wc = new DistributedTestCase.WaitCriterion() {
+ WaitCriterion wc = new WaitCriterion() {
@Override
public boolean done() {
return locator.isSharedConfigurationRunning();
@@ -427,7 +430,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase {
return "Waiting for shared configuration to be started";
}
};
- DistributedTestCase.waitForCriterion(wc, 5000, 500, true);
+ Wait.waitForCriterion(wc, 5000, 500, true);
} catch (IOException ioex) {
fail("Unable to create a locator with a shared configuration");
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
index c91a98f..dc8867d 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
@@ -41,11 +41,13 @@ import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
import com.gemstone.gemfire.test.dunit.Assert;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.LogWriterSupport;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
import javax.management.MBeanServer;
import javax.management.MalformedObjectNameException;
@@ -222,7 +224,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
Host.getHost(0).getVM(0).invoke(new SerializableRunnable() {
@Override
public void run() {
- DistributedTestCase.WaitCriterion wc = new DistributedTestCase.WaitCriterion() {
+ WaitCriterion wc = new WaitCriterion() {
@Override
public boolean done() {
try {
@@ -232,7 +234,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
ObjectName queryExpON = new ObjectName(queryExp);
return !(mbeanServer.queryNames(null, queryExpON).isEmpty());
} catch (MalformedObjectNameException mone) {
- getLogWriter().error(mone);
+ LogWriterSupport.getLogWriter().error(mone);
fail(mone.getMessage());
return false;
}
@@ -244,42 +246,42 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
}
};
- DistributedTestCase.waitForCriterion(wc, 5000, 500, true);
+ Wait.waitForCriterion(wc, 5000, 500, true);
}
});
// Test failure when region not found
String command = "destroy region --name=DOESNOTEXIST";
- getLogWriter().info("testDestroyRegion command=" + command);
+ LogWriterSupport.getLogWriter().info("testDestroyRegion command=" + command);
CommandResult cmdResult = executeCommand(command);
String strr = commandResultToString(cmdResult);
- getLogWriter().info("testDestroyRegion strr=" + strr);
+ LogWriterSupport.getLogWriter().info("testDestroyRegion strr=" + strr);
assertTrue(stringContainsLine(strr, "Could not find.*\"DOESNOTEXIST\".*"));
assertEquals(Result.Status.ERROR, cmdResult.getStatus());
// Test unable to destroy with co-location
command = "destroy region --name=/Customer";
- getLogWriter().info("testDestroyRegion command=" + command);
+ LogWriterSupport.getLogWriter().info("testDestroyRegion command=" + command);
cmdResult = executeCommand(command);
strr = commandResultToString(cmdResult);
- getLogWriter().info("testDestroyRegion strr=" + strr);
+ LogWriterSupport.getLogWriter().info("testDestroyRegion strr=" + strr);
assertEquals(Result.Status.ERROR, cmdResult.getStatus());
// Test success
command = "destroy region --name=/Order";
- getLogWriter().info("testDestroyRegion command=" + command);
+ LogWriterSupport.getLogWriter().info("testDestroyRegion command=" + command);
cmdResult = executeCommand(command);
strr = commandResultToString(cmdResult);
assertTrue(stringContainsLine(strr, ".*Order.*destroyed successfully.*"));
- getLogWriter().info("testDestroyRegion strr=" + strr);
+ LogWriterSupport.getLogWriter().info("testDestroyRegion strr=" + strr);
assertEquals(Result.Status.OK, cmdResult.getStatus());
command = "destroy region --name=/Customer";
- getLogWriter().info("testDestroyRegion command=" + command);
+ LogWriterSupport.getLogWriter().info("testDestroyRegion command=" + command);
cmdResult = executeCommand(command);
strr = commandResultToString(cmdResult);
assertTrue(stringContainsLine(strr, ".*Customer.*destroyed successfully.*"));
- getLogWriter().info("testDestroyRegion strr=" + strr);
+ LogWriterSupport.getLogWriter().info("testDestroyRegion strr=" + strr);
assertEquals(Result.Status.OK, cmdResult.getStatus());
}
@@ -288,19 +290,19 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
createDefaultSetup(null);
String command = CliStrings.CREATE_REGION + " --" + CliStrings.CREATE_REGION__REGION + "=" + this.region46391 + " --" + CliStrings.CREATE_REGION__REGIONSHORTCUT + "=REPLICATE";
- getLogWriter().info("testCreateRegion46391 create region command=" + command);
+ LogWriterSupport.getLogWriter().info("testCreateRegion46391 create region command=" + command);
CommandResult cmdResult = executeCommand(command);
assertEquals(Result.Status.OK, cmdResult.getStatus());
command = CliStrings.PUT + " --" + CliStrings.PUT__KEY + "=k1" + " --" + CliStrings.PUT__VALUE + "=k1" + " --" + CliStrings.PUT__REGIONNAME + "=" + this.region46391;
- getLogWriter().info("testCreateRegion46391 put command=" + command);
+ LogWriterSupport.getLogWriter().info("testCreateRegion46391 put command=" + command);
CommandResult cmdResult2 = executeCommand(command);
assertEquals(Result.Status.OK, cmdResult2.getStatus());
- getLogWriter().info("testCreateRegion46391 cmdResult2=" + commandResultToString(cmdResult2));
+ LogWriterSupport.getLogWriter().info("testCreateRegion46391 cmdResult2=" + commandResultToString(cmdResult2));
String str1 = "Result : true";
String str2 = "Key : k1";
String str3 = "Key Class : java.lang.String";
@@ -752,7 +754,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locatorPort, locatorLogFile, null,
locatorProps);
- DistributedTestCase.WaitCriterion wc = new DistributedTestCase.WaitCriterion() {
+ WaitCriterion wc = new WaitCriterion() {
@Override
public boolean done() {
return locator.isSharedConfigurationRunning();
@@ -763,7 +765,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
return "Waiting for shared configuration to be started";
}
};
- DistributedTestCase.waitForCriterion(wc, 5000, 500, true);
+ Wait.waitForCriterion(wc, 5000, 500, true);
} catch (IOException ioex) {
fail("Unable to create a locator with a shared configuration");
}
@@ -803,7 +805,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
Host.getHost(0).getVM(0).invoke(new SerializableRunnable() {
@Override
public void run() {
- DistributedTestCase.WaitCriterion wc = new DistributedTestCase.WaitCriterion() {
+ WaitCriterion wc = new WaitCriterion() {
@Override
public boolean done() {
try {
@@ -813,7 +815,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
ObjectName queryExpON = new ObjectName(queryExp);
return !(mbeanServer.queryNames(null, queryExpON).isEmpty());
} catch (MalformedObjectNameException mone) {
- getLogWriter().error(mone);
+ LogWriterSupport.getLogWriter().error(mone);
fail(mone.getMessage());
return false;
}
@@ -825,7 +827,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
}
};
- DistributedTestCase.waitForCriterion(wc, 5000, 500, true);
+ Wait.waitForCriterion(wc, 5000, 500, true);
}
});
@@ -938,7 +940,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locatorPort, locatorLogFile, null,
locatorProps);
- DistributedTestCase.WaitCriterion wc = new DistributedTestCase.WaitCriterion() {
+ WaitCriterion wc = new WaitCriterion() {
@Override
public boolean done() {
return locator.isSharedConfigurationRunning();
@@ -949,7 +951,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
return "Waiting for shared configuration to be started";
}
};
- DistributedTestCase.waitForCriterion(wc, 5000, 500, true);
+ Wait.waitForCriterion(wc, 5000, 500, true);
} catch (IOException ioex) {
fail("Unable to create a locator with a shared configuration");
}
@@ -989,7 +991,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
Host.getHost(0).getVM(0).invoke(new SerializableRunnable() {
@Override
public void run() {
- DistributedTestCase.WaitCriterion wc = new DistributedTestCase.WaitCriterion() {
+ WaitCriterion wc = new WaitCriterion() {
@Override
public boolean done() {
try {
@@ -999,7 +1001,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
ObjectName queryExpON = new ObjectName(queryExp);
return !(mbeanServer.queryNames(null, queryExpON).isEmpty());
} catch (MalformedObjectNameException mone) {
- getLogWriter().error(mone);
+ LogWriterSupport.getLogWriter().error(mone);
fail(mone.getMessage());
return false;
}
@@ -1011,7 +1013,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
}
};
- DistributedTestCase.waitForCriterion(wc, 5000, 500, true);
+ Wait.waitForCriterion(wc, 5000, 500, true);
}
});
@@ -1032,7 +1034,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
commandStringBuilder = new CommandStringBuilder(CliStrings.DESTROY_REGION);
commandStringBuilder.addOption(CliStrings.DESTROY_REGION__REGION, regionName);
cmdResult = executeCommand(commandStringBuilder.toString());
- getLogWriter().info("#SB" + commandResultToString(cmdResult));
+ LogWriterSupport.getLogWriter().info("#SB" + commandResultToString(cmdResult));
assertEquals(Result.Status.OK, cmdResult.getStatus());
// Make sure the region was removed from the shared config
@@ -1085,7 +1087,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
executeCommand("undeploy --jar=" + fileToDelete.getName());
}
} catch (IOException e) {
- getLogWriter().error("Unable to delete file", e);
+ LogWriterSupport.getLogWriter().error("Unable to delete file", e);
}
}
this.filesToBeDeleted.clear();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
index 3b70080..81f7f54 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
@@ -30,10 +30,11 @@ import com.gemstone.gemfire.management.internal.cli.remote.CommandExecutionConte
import com.gemstone.gemfire.management.internal.cli.remote.CommandProcessor;
import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.test.dunit.Assert;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
import java.io.File;
import java.io.FilenameFilter;
@@ -347,7 +348,7 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase {
final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locatorPort, locatorLogFile, null,
locatorProps);
- DistributedTestCase.WaitCriterion wc = new DistributedTestCase.WaitCriterion() {
+ WaitCriterion wc = new WaitCriterion() {
@Override
public boolean done() {
return locator.isSharedConfigurationRunning();
@@ -358,7 +359,7 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase {
return "Waiting for shared configuration to be started";
}
};
- DistributedTestCase.waitForCriterion(wc, 5000, 500, true);
+ Wait.waitForCriterion(wc, 5000, 500, true);
} catch (IOException ioex) {
fail("Unable to create a locator with a shared configuration");
}