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:45 UTC
[38/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/cache/query/partitioned/PRQueryDUnitHelper.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitHelper.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitHelper.java
index 822e2d9..20b57cf 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitHelper.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitHelper.java
@@ -137,7 +137,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
localRegion = cache.createRegion(regionName, attr.create());
}
catch (IllegalStateException ex) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.warning(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRCreate: Creation caught IllegalStateException",
ex);
@@ -174,7 +174,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
localRegion = cache.createRegion(regionName, attr.create());
}
catch (IllegalStateException ex) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.warning(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRCreate: Creation caught IllegalStateException",
ex);
@@ -218,7 +218,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
localRegion = cache.createRegionFactory(RegionShortcut.REPLICATE).create(regionName);
}
catch (IllegalStateException ex) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.warning(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRCreate: Creation caught IllegalStateException",
ex);
@@ -311,7 +311,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
partitionedregion = cache.createRegion(regionName, attr.create());
}
catch (IllegalStateException ex) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.warning(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRCreateWithRedundancy: Creation caught IllegalStateException",
ex);
@@ -360,7 +360,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
partitionedregion = cache.createRegion(regionName, attr.create());
}
catch (IllegalStateException ex) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.warning(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRCreateWithRedundancy: Creation caught IllegalStateException",
ex);
@@ -415,7 +415,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
partitionedregion = cache.createRegion(regionName, attr.create());
}
catch (IllegalStateException ex) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.warning(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRCreateWithRedundancy: Creation caught IllegalStateException",
ex);
@@ -533,10 +533,10 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
}
} catch (EntryExistsException e) {
// Do nothing let it go
- getLogWriter().info("EntryExistsException was thrown for key "+ j);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("EntryExistsException was thrown for key "+ j);
} catch (EntryNotFoundException e) {
// Do nothing let it go
- getLogWriter().info("EntryNotFoundException was thrown for key "+ j);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("EntryNotFoundException was thrown for key "+ j);
}
}
}
@@ -742,7 +742,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
}
catch (QueryException e) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.error(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught QueryException while querying"
+ e, e);
@@ -751,14 +751,14 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
}
catch (RegionDestroyedException rde) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught a RegionDestroyedException while querying as expected ",
rde);
}
catch (CancelException cce) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught a CancelException while querying as expected ",
cce);
@@ -869,7 +869,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
}
}
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Queries Executed successfully on Local region & PR Region");
@@ -885,7 +885,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
}
catch (QueryException e) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.error(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught QueryException while querying"
+ e, e);
@@ -894,14 +894,14 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
}
catch (RegionDestroyedException rde) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught a RegionDestroyedException while querying as expected ",
rde);
}
catch (CancelException cce) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught a CancelException while querying as expected ",
cce);
@@ -1002,7 +1002,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
}
}
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Queries Executed successfully on Local region & PR Region");
}
@@ -1013,7 +1013,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
}
catch (QueryException e) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.error(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught QueryException while querying"
+ e, e);
@@ -1022,14 +1022,14 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
}
catch (RegionDestroyedException rde) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught a RegionDestroyedException while querying as expected ",
rde);
}
catch (CancelException cce) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught a CancelException while querying as expected ",
cce);
@@ -1142,7 +1142,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
ssORrs.CompareQueryResultsWithoutAndWithIndexes(r, queries.length,true,rq);
}
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Queries Executed successfully on Local region & PR Region");
@@ -1156,7 +1156,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
}
catch (QueryException e) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.error(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught QueryException while querying"
+ e, e);
@@ -1165,14 +1165,14 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
}
catch (RegionDestroyedException rde) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught a RegionDestroyedException while querying as expected ",
rde);
}
catch (CancelException cce) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught a CancelException while querying as expected ",
cce);
@@ -1268,7 +1268,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
// "Finished executing PR query: " + qStr);
}
}
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Queries Executed successfully on Local region & PR Region");
@@ -1284,7 +1284,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
}
catch (QueryException e) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.error(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught QueryException while querying"
+ e, e);
@@ -1293,14 +1293,14 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
}
catch (RegionDestroyedException rde) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught a RegionDestroyedException while querying as expected ",
rde);
}
catch (CancelException cce) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught a CancelException while querying as expected ",
cce);
@@ -1414,7 +1414,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
r[j][1] = region.query(query[j]);
}
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryWithConstantsAndComparingResults: Queries Executed successfully on Local region & PR Region");
@@ -1424,7 +1424,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
catch (QueryException e) {
// assertTrue("caught Exception"+ e.getMessage(),false);
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.error(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryWithConstantsAndComparingResults: Caught an Exception while querying Constants"
+ e, e);
@@ -1544,7 +1544,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
"PRQueryDUnitHelper#compareTwoQueryResults: Type 2 is NULL "
+ type2, type2);
if ((type1.getClass().getName()).equals(type2.getClass().getName())) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitHelper#compareTwoQueryResults: Both Search Results are of the same Type i.e.--> "
+ ((SelectResults)r[j][0]).getCollectionType()
@@ -1552,7 +1552,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
}
else {
- getLogWriter().error(
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().error(
"PRQueryDUnitHelper#compareTwoQueryResults: Classes are : "
+ type1.getClass().getName() + " "
+ type2.getClass().getName());
@@ -1562,14 +1562,14 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
int size0 = ((SelectResults)r[j][0]).size();
int size1 = ((SelectResults)r[j][1]).size();
if (size0 == size1) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitHelper#compareTwoQueryResults: Both Search Results are non-zero and are of Same Size i.e. Size= "
+ size1 + ";j=" + j);
}
else {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.error(
"PRQueryDUnitHelper#compareTwoQueryResults: FAILED:Search resultSet size are different in both cases; size0=" +
size0 + ";size1=" + size1 + ";j=" + j);
@@ -1682,7 +1682,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
}
catch (QueryException qe) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.error(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRInvalidQuery: Caught another Exception while querying , Exception is "
+ qe, qe);
@@ -1723,11 +1723,11 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
+ "</ExpectedException>");
Region region = cache.getRegion(regionName);
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PROperationWithQueryDUnitTest#getCacheSerializableRunnableForRegionClose: Closing region");
region.close();
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PROperationWithQueryDUnitTest#getCacheSerializableRunnableForRegionClose: Region Closed on VM ");
// Region partitionedregion = null;
@@ -1741,7 +1741,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
.create();
attr.setPartitionAttributes(prAttr);
cache.createRegion(regionName, attr.create());
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PROperationWithQueryDUnitTest#getCacheSerializableRunnableForRegionClose: Region Recreated on VM ");
getCache().getLogger().info(
@@ -1782,17 +1782,17 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
"<ExpectedException action=add>" + expectedReplyException
+ "</ExpectedException>");
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PROperationWithQueryDUnitTest#getCacheSerializableRunnableForCacheClose: Closing cache");
closeCache();
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PROperationWithQueryDUnitTest#getCacheSerializableRunnableForCacheClose: cache Closed on VM ");
cache = getCache();
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PROperationWithQueryDUnitTest#getCacheSerializableRunnableForCacheClose: Recreating the cache ");
// Region partitionedregion = null;
@@ -1822,7 +1822,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
} finally {
InternalResourceManager.setResourceObserver(null);
}
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PROperationWithQueryDUnitTest#getCacheSerializableRunnableForCacheClose: cache Recreated on VM ");
getCache().getLogger().info(
@@ -1891,7 +1891,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
Region region = cache.getRegion(regionName);
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PRQueryRegionDestroyedDUnitTest#getCacheSerializableRunnableForRegionClose: Destroying region "
+ region);
@@ -1946,7 +1946,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
}
long endTimeLocal=System.currentTimeMillis();
long queryTimeLocal = endTimeLocal-startTimeLocal;
- getLogWriter().info("PRQueryDUnitHelper#PRQueryingVsLocalQuerying: Time to Query Local cache "+queryTimeLocal + " ms");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("PRQueryDUnitHelper#PRQueryingVsLocalQuerying: Time to Query Local cache "+queryTimeLocal + " ms");
long startTimePR = System.currentTimeMillis();
for (int k = 0; k < query.length; k++) {
@@ -1956,8 +1956,8 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
long endTimePR = System.currentTimeMillis();
long queryTimePR = endTimePR-startTimePR;
- getLogWriter().info("PRQueryDUnitHelper#PRQueryingVsLocalQuerying: Time to Query PR "+queryTimePR+" ms");
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("PRQueryDUnitHelper#PRQueryingVsLocalQuerying: Time to Query PR "+queryTimePR+" ms");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitHelper#PRQueryingVsLocalQuerying: Queries Executed successfully on Local region & PR Region");
@@ -1969,7 +1969,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
}
catch (QueryException e) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.error(
"PRQueryDUnitHelper#PRQueryingVsLocalQuerying: Caught QueryException while querying"
+ e, e);
@@ -2004,34 +2004,34 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
public void displayResults(){
try {
- getLogWriter().info("PRQueryDUnitHelper:PerfResultsObject#displayResults");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("PRQueryDUnitHelper:PerfResultsObject#displayResults");
BufferedWriter out = new BufferedWriter(new FileWriter("PRQueryPerfDUnitTest.txt", true));
- getLogWriter().info("~~~~~~~~~~~~~~~~~~~~~~~PR Querying Performance Results~~~~~~~~~~~~~~~~~~~~~~~");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("~~~~~~~~~~~~~~~~~~~~~~~PR Querying Performance Results~~~~~~~~~~~~~~~~~~~~~~~");
out.write("~~~~~~~~~~~~~~~~~~~~~~~PR Querying Performance Results~~~~~~~~~~~~~~~~~~~~~~~\n\n");
- getLogWriter().info(this.OperationDescription);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info(this.OperationDescription);
out.write("\t"+this.OperationDescription+"\n\n");
- getLogWriter().info("Scope : "+this.Scope);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Scope : "+this.Scope);
out.write("Scope : "+this.Scope+"\n\n");
- getLogWriter().info("Redundancy Level : "+this.redundancy);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Redundancy Level : "+this.redundancy);
out.write("Redundancy Level : "+this.redundancy+"\n\n");
- getLogWriter().info("Number of Accessor : "+this.NumberOfAccessors);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Number of Accessor : "+this.NumberOfAccessors);
out.write("Number of Accessor : "+this.NumberOfAccessors+"\n\n");
- getLogWriter().info("Number of Datastore/s : "+this.NumberOfDataStores);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Number of Datastore/s : "+this.NumberOfDataStores);
out.write("Number of Datastore/s : "+this.NumberOfDataStores+"\n\n");
- getLogWriter().info("QueryingTime Local : "+this.QueryingTimeLocal+" ms");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("QueryingTime Local : "+this.QueryingTimeLocal+" ms");
out.write("QueryingTime Local : "+this.QueryingTimeLocal+" ms\n\n");
- getLogWriter().info("QueryingTime PR : "+this.QueryingTimePR+" ms");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("QueryingTime PR : "+this.QueryingTimePR+" ms");
out.write("QueryingTime PR : "+this.QueryingTimePR+" ms\n");
- getLogWriter().info("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
out.write("\n\n~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n\n");
out.close();
} catch (IOException e) {
@@ -2546,7 +2546,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
+ " r2 where " + queries[j]).execute();
r[j][1] = r2.asList();
}
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Queries Executed successfully on Local region & PR Region");
@@ -2562,7 +2562,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught unexpected query exception",
e);
} catch (QueryException e) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.error(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught QueryException while querying"
+ e, e);
@@ -2570,13 +2570,13 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught unexpected query exception",
e);
} catch (RegionDestroyedException rde) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught a RegionDestroyedException while querying as expected ",
rde);
} catch (CancelException cce) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught a CancelException while querying as expected ",
cce);
@@ -2675,7 +2675,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
+ " r2, r2.positions.values pos2 where " + queries[j]).execute();
r[j][1] = r2.asList();
}
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Queries Executed successfully on Local region & PR Region");
@@ -2691,7 +2691,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught unexpected query exception",
e);
} catch (QueryException e) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.error(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught QueryException while querying"
+ e, e);
@@ -2699,13 +2699,13 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught unexpected query exception",
e);
} catch (RegionDestroyedException rde) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught a RegionDestroyedException while querying as expected ",
rde);
} catch (CancelException cce) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught a CancelException while querying as expected ",
cce);
@@ -2805,7 +2805,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
+ " r2, r2.positions.values pos2 where " + queries[j]).execute();
r[j][1] = r2.asList();
}
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Queries Executed successfully on Local region & PR Region");
@@ -2821,7 +2821,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught unexpected query exception",
e);
} catch (QueryException e) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.error(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught QueryException while querying"
+ e, e);
@@ -2829,13 +2829,13 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught unexpected query exception",
e);
} catch (RegionDestroyedException rde) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught a RegionDestroyedException while querying as expected ",
rde);
} catch (CancelException cce) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught a CancelException while querying as expected ",
cce);
@@ -2935,7 +2935,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
+ " r2 where " + queries[j]).execute();
r[j][1] = r2.asList();
}
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Queries Executed successfully on Local region & PR Region");
@@ -2951,7 +2951,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught unexpected query exception",
e);
} catch (QueryException e) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.error(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught QueryException while querying"
+ e, e);
@@ -2959,13 +2959,13 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught unexpected query exception",
e);
} catch (RegionDestroyedException rde) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught a RegionDestroyedException while querying as expected ",
rde);
} catch (CancelException cce) {
- getLogWriter()
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught a CancelException while querying as expected ",
cce);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitTest.java
index b43cf4f..c391215 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitTest.java
@@ -47,6 +47,7 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.PartitionedRegionDUnitTestCase;
import com.gemstone.gemfire.internal.cache.PartitionedRegionQueryEvaluator;
import com.gemstone.gemfire.test.dunit.IgnoredException;
+import com.gemstone.gemfire.test.dunit.LogWriterSupport;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -97,7 +98,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
public void testPRDAckCreationAndQuerying() throws Exception
{
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Querying PR Test with DACK Started*****");
@@ -108,7 +109,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
VM vm3 = host.getVM(3);
// Creating PR's on the participating VM's
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Creating PR's on VM0, VM1 , VM2 , VM3");
vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name,
@@ -119,17 +120,17 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
redundancy));
vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name,
redundancy));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Successfully Created PR's on VM0, VM1 , VM2 , VM3");
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Creating Local region on VM0 to compare result Sets");
// creating a local region on one of the JVM's
vm0.invoke(PRQHelp
.getCacheSerializableRunnableForLocalRegionCreation(localName));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Successfully Created Local Region on VM0");
@@ -147,7 +148,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
(2 * stepSize), (3 * stepSize)));
vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(name, portfolio,
(3 * (stepSize)), totalDataSize));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Inserted Portfolio data across PR's");
@@ -155,14 +156,14 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(localName,
portfolio, i, totalDataSize));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Inserted Portfolio data over Local Region on VM0");
// querying the VM for data
vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRQueryAndCompareResults(
name, localName));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : *Querying PR's with DACK Test ENDED*****");
}
@@ -181,7 +182,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
public void testPRDAckCreationAndQueryingFull() throws Exception
{
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Querying PR Test with DACK Started*****");
@@ -193,7 +194,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
VM vm3 = host.getVM(3);
// Creating PR's on the participating VM's
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Creating PR's on VM0, VM1 , VM2 , VM3");
vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name,
@@ -204,17 +205,17 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
redundancy, valueConstraint));
vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name,
redundancy, valueConstraint));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Successfully Created PR's on VM0, VM1 , VM2 , VM3");
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Creating Local region on VM0 to compare result Sets");
// creating a local region on one of the JVM's
vm0.invoke(PRQHelp
.getCacheSerializableRunnableForLocalRegionCreation(localName, valueConstraint));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Successfully Created Local Region on VM0");
@@ -232,7 +233,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
(2 * stepSize), (3 * stepSize)));
vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(name, portfoliosAndPositions,
(3 * (stepSize)), totalDataSize));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Inserted Portfolio data across PR's");
@@ -240,14 +241,14 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(localName,
portfoliosAndPositions, i, totalDataSize));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Inserted Portfolio data over Local Region on VM0");
// querying the VM for data
vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRQueryAndCompareResults(
name, localName, true));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : *Querying PR's with DACK Test ENDED*****");
}
@@ -267,7 +268,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
public void testPRDAckCreationAndQueryingWithConstants() throws Exception
{
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQueryingWithConstants : Querying PR Test with DACK Started*****");
@@ -282,7 +283,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
VM vm3 = host.getVM(3);
// Creating PR's on the participating VM's
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQueryingWithConstants : Creating PR's on VM0, VM1 , VM2 , VM3");
vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name,
@@ -293,17 +294,17 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
redundancy));
vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name,
redundancy));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQueryingWithConstants : Successfully Created PR's on VM0, VM1 , VM2 , VM3");
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQueryingWithConstants : Creating Local region on VM0 to compare result Sets");
// creating a local region on one of the JVM's
vm0.invoke(PRQHelp
.getCacheSerializableRunnableForLocalRegionCreation(localName));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQueryingWithConstants : Successfully Created Local Region on VM0");
@@ -321,7 +322,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
(2 * stepSize), (3 * stepSize)));
vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(name, portfolio,
(3 * (stepSize)), totalDataSize));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQueryingWithConstants : Inserted Portfolio data across PR's");
@@ -329,7 +330,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(localName,
portfolio, i, totalDataSize));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQueryingWithConstants : Inserted Portfolio data over Local Region on VM0");
@@ -338,7 +339,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
.invoke(PRQHelp
.getCacheSerializableRunnableForPRQueryWithConstantsAndComparingResults(
name, localName));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQueryingWithConstants : *Querying PR's with DACK Test ENDED*****");
}
@@ -400,7 +401,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
final MyTestHook th = new MyTestHook();
// add expected exception strings
- final IgnoredException ex = IgnoredException.addExpectedException("Data loss detected");
+ final IgnoredException ex = IgnoredException.addIgnoredException("Data loss detected");
try {
Object[] params = new Object[0];
final DefaultQuery query = (DefaultQuery)getCache().getQueryService()
@@ -523,7 +524,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
for (Object r: th.resultsPerMember.entrySet()){
Map.Entry e = (Map.Entry)r;
Integer res = (Integer)e.getValue();
- getLogWriter().info("PRQueryDUnitTest#testQueryResultsFromMembers : \n" +
+ LogWriterSupport.getLogWriter().info("PRQueryDUnitTest#testQueryResultsFromMembers : \n" +
"Query [" + queries[q] + "] Member : " + e.getKey() + " results size :" + res.intValue());
assertEquals("Query [" + queries[q] + "]: The results returned by the member does not match the query limit size : Member : " + e.getKey(), limit[q], res.intValue());
}
@@ -630,7 +631,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
for (Object r: th.resultsPerMember.entrySet()){
Map.Entry e = (Map.Entry)r;
Integer res = (Integer)e.getValue();
- getLogWriter().info("PRQueryDUnitTest#testQueryResultsFromMembers : \n" +
+ LogWriterSupport.getLogWriter().info("PRQueryDUnitTest#testQueryResultsFromMembers : \n" +
"Query [" + queries[q] + "] Member : " + e.getKey() + " results size :" + res.intValue());
if (res.intValue() != 0 /* accessor member */ || res.intValue() != limit[q]) {
assertEquals("Query [" + queries[q] + "]: The results returned by the member does not match the query limit size : Member : " + e.getKey(), limit[q], res.intValue());
@@ -683,7 +684,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
});
// add expected exception strings
- final IgnoredException ex = IgnoredException.addExpectedException("Data loss detected",
+ final IgnoredException ex = IgnoredException.addIgnoredException("Data loss detected",
accessor);
accessor.invoke(new SerializableCallable(
"Create bucket and test dataloss query") {
@@ -732,7 +733,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
public void testPRAccessorCreationAndQuerying() throws Exception
{
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Querying PR Test with DACK Started*****");
Host host = Host.getHost(0);
@@ -748,17 +749,17 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
// Creting PR's on the participating VM's
// Creating Accessor node on the VM
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Creating the Accessor node in the PR");
vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRAccessorCreate(name,
0));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Successfully created the Accessor node in the PR");
// Creating the Datastores Nodes in the VM's
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Creating the Datastore node in the PR");
vm1.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name,
@@ -767,17 +768,17 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
redundancy));
vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name,
redundancy));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Successfully Created the Datastore node in the PR");
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Successfully Created PR's across all VM's");
// creating a local region on one of the JVM's
vm0.invoke(PRQHelp
.getCacheSerializableRunnableForLocalRegionCreation(localName));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Successfully Created Local Region on VM0");
@@ -794,7 +795,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
(2 * stepSize), (3 * stepSize)));
vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(name, portfolio,
(3 * (stepSize)), totalDataSize));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Inserted Portfolio data across PR's");
@@ -805,7 +806,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
// querying the VM for data
vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRQueryAndCompareResults(
name, localName));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Querying PR's Test ENDED*****");
}
@@ -826,7 +827,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
int dataSize = 10;
int step = 2;
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Querying PR Test with DACK Started*****");
@@ -838,7 +839,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
VM vm3 = host.getVM(3);
// Creating PR's on the participating VM's
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Creating PR's on VM0, VM1 , VM2 , VM3");
vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name,
@@ -849,17 +850,17 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
redundancy, valueConstraint));
vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name,
redundancy, valueConstraint));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Successfully Created PR's on VM0, VM1 , VM2 , VM3");
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Creating Local region on VM0 to compare result Sets");
// creating a local region on one of the JVM's
vm0.invoke(PRQHelp
.getCacheSerializableRunnableForLocalRegionCreation(localName, valueConstraint));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Successfully Created Local Region on VM0");
@@ -877,7 +878,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
(2 * step), (3 * step)));
vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRPutsKeyValue(name, portfoliosAndPositions,
(3 * (step)), dataSize));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Inserted Portfolio data across PR's");
@@ -885,14 +886,14 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPutsKeyValue(localName,
portfoliosAndPositions, i, dataSize));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Inserted Portfolio data over Local Region on VM0");
// querying the VM for data
vm0.invoke(PRQHelp.getCacheSerializableRunnableForPROrderByQueryAndCompareResults(
name, localName));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : *Querying PR's with DACK Test ENDED*****");
}
@@ -913,7 +914,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
int dataSize = 10;
int step = 2;
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Querying PR Test with DACK Started*****");
@@ -925,7 +926,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
VM vm3 = host.getVM(3);
// Creating PR's on the participating VM's
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Creating PR's on VM0, VM1 , VM2 , VM3");
vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name,
@@ -936,17 +937,17 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
redundancy, valueConstraint));
vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name,
redundancy, valueConstraint));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Successfully Created PR's on VM0, VM1 , VM2 , VM3");
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Creating Local region on VM0 to compare result Sets");
// creating a local region on one of the JVM's
vm0.invoke(PRQHelp
.getCacheSerializableRunnableForLocalRegionCreation(localName, valueConstraint));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Successfully Created Local Region on VM0");
@@ -964,7 +965,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
(2 * step), (3 * step)));
vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRPutsKeyValue(name, portfoliosAndPositions,
(3 * (step)), dataSize));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Inserted Portfolio data across PR's");
@@ -972,14 +973,14 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPutsKeyValue(localName,
portfoliosAndPositions, i, dataSize));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Inserted Portfolio data over Local Region on VM0");
// querying the VM for data
vm0.invoke(PRQHelp.getCacheSerializableRunnableForPROrderByQueryAndVerifyOrder(
name, localName));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : *Querying PR's with DACK Test ENDED*****");
}
@@ -1000,7 +1001,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
int step = 2;
Class valueConstraint = Portfolio.class;
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Querying PR Test with DACK Started*****");
Host host = Host.getHost(0);
@@ -1016,17 +1017,17 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
// Creting PR's on the participating VM's
// Creating Accessor node on the VM
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Creating the Accessor node in the PR");
vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRAccessorCreate(name,
0, valueConstraint));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Successfully created the Accessor node in the PR");
// Creating the Datastores Nodes in the VM's
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Creating the Datastore node in the PR");
vm1.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name,
@@ -1035,17 +1036,17 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
redundancy, valueConstraint));
vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name,
redundancy, valueConstraint));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Successfully Created the Datastore node in the PR");
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Successfully Created PR's across all VM's");
// creating a local region on one of the JVM's
vm0.invoke(PRQHelp
.getCacheSerializableRunnableForLocalRegionCreation(localName, valueConstraint));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Successfully Created Local Region on VM0");
@@ -1062,7 +1063,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
(2 * step), (3 * step)));
vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRPutsKeyValue(name, portfolio,
(3 * (step)), dataSize));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Inserted Portfolio data across PR's");
@@ -1073,7 +1074,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
// querying the VM for data
vm0.invoke(PRQHelp.getCacheSerializableRunnableForPROrderByQueryAndCompareResults(
name, localName));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Querying PR's Test ENDED*****");
}
@@ -1083,7 +1084,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
int dataSize = 10;
int step = 2;
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Querying PR Test with DACK Started*****");
@@ -1095,7 +1096,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
VM vm3 = host.getVM(3);
// Creating PR's on the participating VM's
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Creating PR's on VM0, VM1 , VM2 , VM3");
vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name,
@@ -1106,17 +1107,17 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
redundancy, valueConstraint));
vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name,
redundancy, valueConstraint));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Successfully Created PR's on VM0, VM1 , VM2 , VM3");
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Creating Local region on VM0 to compare result Sets");
// creating a local region on one of the JVM's
vm0.invoke(PRQHelp
.getCacheSerializableRunnableForLocalRegionCreation(localName, valueConstraint));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Successfully Created Local Region on VM0");
@@ -1134,7 +1135,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
(2 * step), (3 * step)));
vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRPutsKeyValue(name, portfoliosAndPositions,
(3 * (step)), dataSize));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Inserted Portfolio data across PR's");
@@ -1142,14 +1143,14 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPutsKeyValue(localName,
portfoliosAndPositions, i, dataSize));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : Inserted Portfolio data over Local Region on VM0");
// querying the VM for data
vm0.invoke(PRQHelp.getCacheSerializableRunnableForPROrderByQueryWithLimit(
name, localName));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : *Querying PR's with DACK Test ENDED*****");
}
@@ -1168,7 +1169,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
public void testPRAccessorCreationAndQueryingWithNoData() throws Exception
{
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRAccessorCreationAndQueryingWithNoData : Querying PR Test with No Data Started*****");
Host host = Host.getHost(0);
@@ -1184,17 +1185,17 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
// Creting PR's on the participating VM's
// Creating Accessor node on the VM
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRAccessorCreationAndQueryingWithNoData : Creating the Accessor node in the PR");
vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRAccessorCreate(name,
0));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRAccessorCreationAndQueryingWithNoData : Successfully created the Accessor node in the PR");
// Creating the Datastores Nodes in the VM's
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRAccessorCreationAndQueryingWithNoData : Creating the Datastore node in the PR");
vm1.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name,
@@ -1203,24 +1204,24 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
redundancy));
vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name,
redundancy));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRAccessorCreationAndQueryingWithNoData : Successfully Created the Datastore node in the PR");
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRAccessorCreationAndQueryingWithNoData : Successfully Created PR's across all VM's");
// creating a local region on one of the JVM's
vm0.invoke(PRQHelp
.getCacheSerializableRunnableForLocalRegionCreation(localName));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRAccessorCreationAndQueryingWithNoData : Successfully Created Local Region on VM0");
// querying the VM for data
vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRQueryAndCompareResults(
name, localName));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryDUnitTest#testPRAccessorCreationAndQueryingWithNoData : Querying PR's Test No Data ENDED*****");
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryPerfDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryPerfDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryPerfDUnitTest.java
index 069ea52..c55cabe 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryPerfDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryPerfDUnitTest.java
@@ -79,7 +79,7 @@ public class PRQueryPerfDUnitTest extends PartitionedRegionDUnitTestCase {
throws Exception
{
- LogWriter log = getLogWriter();
+ LogWriter log = com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter();
log.info("BenchMarking PR Querying Test Started*****");
Host host = Host.getHost(0);
@@ -165,7 +165,7 @@ public class PRQueryPerfDUnitTest extends PartitionedRegionDUnitTestCase {
public void norun_testBenchmarkingQueryingOneAccessorTwoDS_Redundancy0()
throws Exception
{
- LogWriter log = getLogWriter();
+ LogWriter log = com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter();
log.info("BenchMarking PR Querying Test Started*****");
Host host = Host.getHost(0);
@@ -249,7 +249,7 @@ public class PRQueryPerfDUnitTest extends PartitionedRegionDUnitTestCase {
public void norun_testBenchmarkingQueryingOneAccessorTwoDS_D_ACK_Redundancy1()
throws Exception
{
- LogWriter log = getLogWriter();
+ LogWriter log = com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter();
log.info("BenchMarking PR Querying Test Started*****");
Host host = Host.getHost(0);
@@ -330,7 +330,7 @@ public class PRQueryPerfDUnitTest extends PartitionedRegionDUnitTestCase {
public void norun_testBenchmarkingQueryingOneAccessorThreeDS_Redundancy1()
throws Exception
{
- LogWriter log = getLogWriter();
+ LogWriter log = com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter();
log.info("BenchMarking PR Querying Test Started*****");
Host host = Host.getHost(0);
@@ -415,7 +415,7 @@ public class PRQueryPerfDUnitTest extends PartitionedRegionDUnitTestCase {
public void norun_testBenchmarkingQueryingOneAccessorThreeDS_Redundancy2()
throws Exception
{
- LogWriter log = getLogWriter();
+ LogWriter log = com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter();
log.info("BenchMarking PR Querying Test Started*****");
Host host = Host.getHost(0);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionCloseDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionCloseDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionCloseDUnitTest.java
index 21a6897..479fc5f 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionCloseDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionCloseDUnitTest.java
@@ -34,9 +34,11 @@ import com.gemstone.gemfire.cache.query.data.PortfolioData;
import com.gemstone.gemfire.internal.cache.PartitionedRegionDUnitTestCase;
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.LogWriterSupport;
+import com.gemstone.gemfire.test.dunit.Threads;
import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
import com.gemstone.gemfire.internal.cache.ForceReattemptException;
public class PRQueryRegionCloseDUnitTest extends PartitionedRegionDUnitTestCase
@@ -90,7 +92,7 @@ public class PRQueryRegionCloseDUnitTest extends PartitionedRegionDUnitTestCase
{
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryRegionCloseDUnitTest#testPRWithRegionCloseInOneDatastoreWithoutDelay: Querying PR Test with region Close PR operation*****");
Host host = Host.getHost(0);
@@ -102,33 +104,33 @@ public class PRQueryRegionCloseDUnitTest extends PartitionedRegionDUnitTestCase
vmList.add(vm1);
vmList.add(vm2);
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryRegionCloseDUnitTest#testPRWithRegionCloseInOneDatastoreWithoutDelay: Creating Accessor node on VM0");
vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRAccessorCreate(name,
redundancy));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryRegionCloseDUnitTest#testPRWithRegionCloseInOneDatastoreWithoutDelay: Successfully Created Accessor node on VM0");
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryRegionCloseDUnitTest#testPRWithRegionCloseInOneDatastoreWithoutDelay: Creating PR's across all VM1 , VM2");
vm1.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name,
redundancy));
vm2.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name,
redundancy));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryRegionCloseDUnitTest#testPRWithRegionCloseInOneDatastoreWithoutDelay: Successfully Created PR on VM1 , VM2");
// creating a local region on one of the JVM's
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryRegionCloseDUnitTest#testPRWithRegionCloseInOneDatastoreWithoutDelay: Creating Local Region on VM0");
vm0.invoke(PRQHelp
.getCacheSerializableRunnableForLocalRegionCreation(localName));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryRegionCloseDUnitTest#testPRWithRegionCloseInOneDatastoreWithoutDelay: Successfully Created Local Region on VM0");
@@ -138,36 +140,36 @@ public class PRQueryRegionCloseDUnitTest extends PartitionedRegionDUnitTestCase
final PortfolioData[] portfolio = PRQHelp.createPortfolioData(cnt, cntDest);
// Putting the data into the accessor node
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryRegionCloseDUnitTest#testPRWithRegionCloseInOneDatastoreWithoutDelay: Inserting Portfolio data through the accessor node");
vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(name, portfolio,
cnt, cntDest));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryRegionCloseDUnitTest#testPRWithRegionCloseInOneDatastoreWithoutDelay: Successfully Inserted Portfolio data through the accessor node");
// Putting the same data in the local region created
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryRegionCloseDUnitTest#testPRWithRegionCloseInOneDatastoreWithoutDelay: Inserting Portfolio data on local node VM0 for result Set Comparison");
vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(localName,
portfolio, cnt, cntDest));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryRegionCloseDUnitTest#testPRWithRegionCloseInOneDatastoreWithoutDelay: Successfully Inserted Portfolio data on local node VM0 for result Set Comparison");
Random random = new Random();
AsyncInvocation async0;
// querying the VM for data
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryRegionCloseDUnitTest#testPRWithRegionCloseInOneDatastoreWithoutDelay: Querying on VM0 both on PR Region & local ,also Comparing the Results sets from both");
async0 = vm0
.invokeAsync(PRQHelp.getCacheSerializableRunnableForPRQueryAndCompareResults(
name, localName));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryRegionCloseDUnitTest#testPRWithRegionCloseInOneDatastoreWithoutDelay: Calling for Region.close() on either of the Datastores VM1 , VM2 at random and then recreating the cache, with a predefined Delay ");
for (int j = 0; j < queryTestCycle; j++) {
@@ -175,10 +177,10 @@ public class PRQueryRegionCloseDUnitTest extends PartitionedRegionDUnitTestCase
if( 0 != k ) {
((VM)(vmList.get(k))).invoke(PRQHelp.getCacheSerializableRunnableForRegionClose(
name, redundancy));
- pause(threadSleepTime);
+ Wait.pause(threadSleepTime);
}
}
- DistributedTestCase.join(async0, 30 * 1000, getLogWriter());
+ Threads.join(async0, 30 * 1000, LogWriterSupport.getLogWriter());
if (async0.exceptionOccurred()) {
// for now, certain exceptions when a region is closed are acceptable
@@ -198,7 +200,7 @@ public class PRQueryRegionCloseDUnitTest extends PartitionedRegionDUnitTestCase
}
}
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryRegionCloseDUnitTest#testPRWithRegionCloseInOneDatastoreWithoutDelay: Querying with PR Operations ENDED*****");
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionDestroyedDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionDestroyedDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionDestroyedDUnitTest.java
index a6ce465..9e7678c 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionDestroyedDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionDestroyedDUnitTest.java
@@ -34,9 +34,11 @@ import com.gemstone.gemfire.cache.query.data.PortfolioData;
import com.gemstone.gemfire.internal.cache.PartitionedRegionDUnitTestCase;
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.LogWriterSupport;
+import com.gemstone.gemfire.test.dunit.Threads;
import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
import com.gemstone.gemfire.internal.cache.ForceReattemptException;
public class PRQueryRegionDestroyedDUnitTest extends PartitionedRegionDUnitTestCase
@@ -89,7 +91,7 @@ public class PRQueryRegionDestroyedDUnitTest extends PartitionedRegionDUnitTestC
throws Exception
{
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryRegionDestroyedDUnitTest#testPRWithRegionDestroyInOneDatastoreWithDelay: Querying with PR Destroy Region Operation Test Started");
Host host = Host.getHost(0);
@@ -103,16 +105,16 @@ public class PRQueryRegionDestroyedDUnitTest extends PartitionedRegionDUnitTestC
vmList.add(vm2);
vmList.add(vm3);
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryRegionDestroyedDUnitTest#testPRWithRegionDestroyInOneDatastoreWithDelay: Creating Accessor node on VM0");
vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRAccessorCreate(name,
redundancy));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryRegionDestroyedDUnitTest#testPRWithRegionDestroyInOneDatastoreWithDelay: Successfully Created Accessor node on VM0");
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryRegionDestroyedDUnitTest#testPRWithRegionDestroyInOneDatastoreWithDelay: Creating PR's across all VM1 , VM2, VM3");
vm1.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name,
@@ -123,17 +125,17 @@ public class PRQueryRegionDestroyedDUnitTest extends PartitionedRegionDUnitTestC
redundancy));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryRegionDestroyedDUnitTest#testPRWithRegionDestroyInOneDatastoreWithDelay: Successfully Created PR on VM1 , VM2, VM3");
// creating a local region on one of the JVM's
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryRegionDestroyedDUnitTest#testPRWithRegionDestroyInOneDatastoreWithDelay: Creating Local Region on VM0");
vm0.invoke(PRQHelp
.getCacheSerializableRunnableForLocalRegionCreation(localName));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryRegionDestroyedDUnitTest#testPRWithRegionDestroyInOneDatastoreWithDelay: Successfully Created Local Region on VM0");
@@ -144,22 +146,22 @@ public class PRQueryRegionDestroyedDUnitTest extends PartitionedRegionDUnitTestC
// Putting the data into the accessor node
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryRegionDestroyedDUnitTest#testPRWithRegionDestroyInOneDatastoreWithDelay: Inserting Portfolio data through the accessor node");
vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(name, portfolio,
cnt, cntDest));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryRegionDestroyedDUnitTest#testPRWithRegionDestroyInOneDatastoreWithDelay: Successfully Inserted Portfolio data through the accessor node");
// Putting the same data in the local region created
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryRegionDestroyedDUnitTest#testPRWithRegionDestroyInOneDatastoreWithDelay: Inserting Portfolio data on local node VM0 for result Set Comparison");
vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(localName,
portfolio, cnt, cntDest));
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryRegionDestroyedDUnitTest#testPRWithRegionDestroyInOneDatastoreWithDelay: Successfully Inserted Portfolio data on local node VM0 for result Set Comparison");
@@ -168,7 +170,7 @@ public class PRQueryRegionDestroyedDUnitTest extends PartitionedRegionDUnitTestC
// Execute query first time. This is to make sure all the buckets are created
// (lazy bucket creation).
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryRegionDestroyedDUnitTest#testPRWithRegionDestroyInOneDatastoreWithDelay: Querying on VM0 First time");
vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRQueryAndCompareResults(
@@ -176,15 +178,15 @@ public class PRQueryRegionDestroyedDUnitTest extends PartitionedRegionDUnitTestC
// Now execute the query. And while query execution in process destroy the region
// on one of the node.
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryRegionDestroyedDUnitTest#testPRWithRegionDestroyInOneDatastoreWithDelay: Querying on VM0 both on PR Region & local ,also Comparing the Results sets from both");
async0 = vm0
.invokeAsync(PRQHelp.getCacheSerializableRunnableForPRQueryAndCompareResults(
name, localName));
- pause(5);
- getLogWriter()
+ Wait.pause(5);
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryRegionDestroyedDUnitTest#testPRWithRegionDestroyInOneDatastoreWithDelay: Calling for Region.destroyRegion() on either of the Datastores VM1 , VM2 at random and then recreating the cache, with a predefined Delay ");
@@ -194,7 +196,7 @@ public class PRQueryRegionDestroyedDUnitTest extends PartitionedRegionDUnitTestC
name, redundancy));
- DistributedTestCase.join(async0, 30 * 1000, getLogWriter());
+ Threads.join(async0, 30 * 1000, LogWriterSupport.getLogWriter());
if (async0.exceptionOccurred()) {
// for Elbe, certain exceptions when a region is destroyed are acceptable
@@ -213,7 +215,7 @@ public class PRQueryRegionDestroyedDUnitTest extends PartitionedRegionDUnitTestC
Assert.fail("Unexpected exception during query", async0.getException());
}
}
- getLogWriter()
+ LogWriterSupport.getLogWriter()
.info(
"PRQueryRegionDestroyedDUnitTest#testPRWithRegionDestroyInOneDatastoreWithDelay: Querying with PR Destroy Region Operation Test ENDED");
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionDestroyedJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionDestroyedJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionDestroyedJUnitTest.java
index 4b9ae3d..1141b34 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionDestroyedJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionDestroyedJUnitTest.java
@@ -34,7 +34,7 @@ import com.gemstone.gemfire.cache.query.RegionNotFoundException;
import com.gemstone.gemfire.cache.query.SelectResults;
import com.gemstone.gemfire.cache.query.data.PortfolioData;
import com.gemstone.gemfire.internal.cache.PartitionedRegionTestHelper;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Threads;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
/**
@@ -216,8 +216,8 @@ public class PRQueryRegionDestroyedJUnitTest
logger
.info("PRQueryRegionDestroyedJUnitTest#testQueryOnSingleDataStore: Waiting for the Threads to join ");
- DistributedTestCase.join(t1, 30 * 1000, null);
- DistributedTestCase.join(t2, 30 * 1000, null);
+ Threads.join(t1, 30 * 1000, null);
+ Threads.join(t2, 30 * 1000, null);
logger
.info("PRQueryRegionDestroyedJUnitTest#testQueryOnSingleDataStore: checking for any Unexpected Exception's occured");