http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/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 20b57cf..1860038 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) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.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) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.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) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.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) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.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) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.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) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.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 - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("EntryExistsException was thrown for key "+ j); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("EntryExistsException was thrown for key "+ j); } catch (EntryNotFoundException e) { // Do nothing let it go - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("EntryNotFoundException was thrown for key "+ j); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("EntryNotFoundException was thrown for key "+ j); } } } @@ -742,7 +742,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase } catch (QueryException e) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter() .error( "PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught QueryException while querying" + e, e); @@ -751,14 +751,14 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase } catch (RegionDestroyedException rde) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter() .info( "PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught a RegionDestroyedException while querying as expected ", rde); } catch (CancelException cce) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter() .info( "PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught a CancelException while querying as expected ", cce); @@ -869,7 +869,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase } } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter() .info( "PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Queries Executed successfully on Local region & PR Region"); @@ -885,7 +885,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase } catch (QueryException e) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter() .error( "PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught QueryException while querying" + e, e); @@ -894,14 +894,14 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase } catch (RegionDestroyedException rde) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter() .info( "PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught a RegionDestroyedException while querying as expected ", rde); } catch (CancelException cce) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter() .info( "PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught a CancelException while querying as expected ", cce); @@ -1002,7 +1002,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase } } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter() .info( "PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Queries Executed successfully on Local region & PR Region"); } @@ -1013,7 +1013,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase } catch (QueryException e) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter() .error( "PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught QueryException while querying" + e, e); @@ -1022,14 +1022,14 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase } catch (RegionDestroyedException rde) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter() .info( "PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught a RegionDestroyedException while querying as expected ", rde); } catch (CancelException cce) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.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); } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter() .info( "PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Queries Executed successfully on Local region & PR Region"); @@ -1156,7 +1156,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase } catch (QueryException e) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter() .error( "PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught QueryException while querying" + e, e); @@ -1165,14 +1165,14 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase } catch (RegionDestroyedException rde) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter() .info( "PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught a RegionDestroyedException while querying as expected ", rde); } catch (CancelException cce) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.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); } } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter() .info( "PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Queries Executed successfully on Local region & PR Region"); @@ -1284,7 +1284,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase } catch (QueryException e) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter() .error( "PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught QueryException while querying" + e, e); @@ -1293,14 +1293,14 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase } catch (RegionDestroyedException rde) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter() .info( "PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught a RegionDestroyedException while querying as expected ", rde); } catch (CancelException cce) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.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]); } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.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); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.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())) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.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 { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().error( + com.gemstone.gemfire.test.dunit.LogWriterUtils.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) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter() .info( "PRQueryDUnitHelper#compareTwoQueryResults: Both Search Results are non-zero and are of Same Size i.e. Size= " + size1 + ";j=" + j); } else { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.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) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.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); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter() .info( "PROperationWithQueryDUnitTest#getCacheSerializableRunnableForRegionClose: Closing region"); region.close(); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.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()); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.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>"); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter() .info( "PROperationWithQueryDUnitTest#getCacheSerializableRunnableForCacheClose: Closing cache"); closeCache(); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter() .info( "PROperationWithQueryDUnitTest#getCacheSerializableRunnableForCacheClose: cache Closed on VM "); cache = getCache(); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter() .info( "PROperationWithQueryDUnitTest#getCacheSerializableRunnableForCacheClose: Recreating the cache "); // Region partitionedregion = null; @@ -1822,7 +1822,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase } finally { InternalResourceManager.setResourceObserver(null); } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.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); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#getCacheSerializableRunnableForRegionClose: Destroying region " + region); @@ -1946,7 +1946,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase } long endTimeLocal=System.currentTimeMillis(); long queryTimeLocal = endTimeLocal-startTimeLocal; - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("PRQueryDUnitHelper#PRQueryingVsLocalQuerying: Time to Query Local cache "+queryTimeLocal + " ms"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.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; - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("PRQueryDUnitHelper#PRQueryingVsLocalQuerying: Time to Query PR "+queryTimePR+" ms"); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("PRQueryDUnitHelper#PRQueryingVsLocalQuerying: Time to Query PR "+queryTimePR+" ms"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter() .info( "PRQueryDUnitHelper#PRQueryingVsLocalQuerying: Queries Executed successfully on Local region & PR Region"); @@ -1969,7 +1969,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase } catch (QueryException e) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter() .error( "PRQueryDUnitHelper#PRQueryingVsLocalQuerying: Caught QueryException while querying" + e, e); @@ -2004,34 +2004,34 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase public void displayResults(){ try { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("PRQueryDUnitHelper:PerfResultsObject#displayResults"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("PRQueryDUnitHelper:PerfResultsObject#displayResults"); BufferedWriter out = new BufferedWriter(new FileWriter("PRQueryPerfDUnitTest.txt", true)); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("~~~~~~~~~~~~~~~~~~~~~~~PR Querying Performance Results~~~~~~~~~~~~~~~~~~~~~~~"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("~~~~~~~~~~~~~~~~~~~~~~~PR Querying Performance Results~~~~~~~~~~~~~~~~~~~~~~~"); out.write("~~~~~~~~~~~~~~~~~~~~~~~PR Querying Performance Results~~~~~~~~~~~~~~~~~~~~~~~\n\n"); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info(this.OperationDescription); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info(this.OperationDescription); out.write("\t"+this.OperationDescription+"\n\n"); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Scope : "+this.Scope); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("Scope : "+this.Scope); out.write("Scope : "+this.Scope+"\n\n"); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Redundancy Level : "+this.redundancy); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("Redundancy Level : "+this.redundancy); out.write("Redundancy Level : "+this.redundancy+"\n\n"); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Number of Accessor : "+this.NumberOfAccessors); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("Number of Accessor : "+this.NumberOfAccessors); out.write("Number of Accessor : "+this.NumberOfAccessors+"\n\n"); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Number of Datastore/s : "+this.NumberOfDataStores); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("Number of Datastore/s : "+this.NumberOfDataStores); out.write("Number of Datastore/s : "+this.NumberOfDataStores+"\n\n"); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("QueryingTime Local : "+this.QueryingTimeLocal+" ms"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("QueryingTime Local : "+this.QueryingTimeLocal+" ms"); out.write("QueryingTime Local : "+this.QueryingTimeLocal+" ms\n\n"); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("QueryingTime PR : "+this.QueryingTimePR+" ms"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("QueryingTime PR : "+this.QueryingTimePR+" ms"); out.write("QueryingTime PR : "+this.QueryingTimePR+" ms\n"); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.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(); } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.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) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.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) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter() .info( "PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught a RegionDestroyedException while querying as expected ", rde); } catch (CancelException cce) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.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(); } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.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) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.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) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter() .info( "PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught a RegionDestroyedException while querying as expected ", rde); } catch (CancelException cce) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.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(); } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.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) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.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) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter() .info( "PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught a RegionDestroyedException while querying as expected ", rde); } catch (CancelException cce) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.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(); } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.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) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.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) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter() .info( "PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught a RegionDestroyedException while querying as expected ", rde); } catch (CancelException cce) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter() + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter() .info( "PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught a CancelException while querying as expected ", cce);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/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 c391215..098a881 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,7 +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.LogWriterUtils; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.SerializableCallable; import com.gemstone.gemfire.test.dunit.VM; @@ -98,7 +98,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase public void testPRDAckCreationAndQuerying() throws Exception { - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Querying PR Test with DACK Started*****"); @@ -109,7 +109,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase VM vm3 = host.getVM(3); // Creating PR's on the participating VM's - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Creating PR's on VM0, VM1 , VM2 , VM3"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, @@ -120,17 +120,17 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase redundancy)); vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, redundancy)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Successfully Created PR's on VM0, VM1 , VM2 , VM3"); - LogWriterSupport.getLogWriter() + LogWriterUtils.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)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Successfully Created Local Region on VM0"); @@ -148,7 +148,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase (2 * stepSize), (3 * stepSize))); vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(name, portfolio, (3 * (stepSize)), totalDataSize)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Inserted Portfolio data across PR's"); @@ -156,14 +156,14 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(localName, portfolio, i, totalDataSize)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Inserted Portfolio data over Local Region on VM0"); // querying the VM for data vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRQueryAndCompareResults( name, localName)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : *Querying PR's with DACK Test ENDED*****"); } @@ -182,7 +182,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase public void testPRDAckCreationAndQueryingFull() throws Exception { - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Querying PR Test with DACK Started*****"); @@ -194,7 +194,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase VM vm3 = host.getVM(3); // Creating PR's on the participating VM's - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Creating PR's on VM0, VM1 , VM2 , VM3"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, @@ -205,17 +205,17 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase redundancy, valueConstraint)); vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, redundancy, valueConstraint)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Successfully Created PR's on VM0, VM1 , VM2 , VM3"); - LogWriterSupport.getLogWriter() + LogWriterUtils.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)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Successfully Created Local Region on VM0"); @@ -233,7 +233,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase (2 * stepSize), (3 * stepSize))); vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(name, portfoliosAndPositions, (3 * (stepSize)), totalDataSize)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Inserted Portfolio data across PR's"); @@ -241,14 +241,14 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(localName, portfoliosAndPositions, i, totalDataSize)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Inserted Portfolio data over Local Region on VM0"); // querying the VM for data vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRQueryAndCompareResults( name, localName, true)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : *Querying PR's with DACK Test ENDED*****"); } @@ -268,7 +268,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase public void testPRDAckCreationAndQueryingWithConstants() throws Exception { - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQueryingWithConstants : Querying PR Test with DACK Started*****"); @@ -283,7 +283,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase VM vm3 = host.getVM(3); // Creating PR's on the participating VM's - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQueryingWithConstants : Creating PR's on VM0, VM1 , VM2 , VM3"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, @@ -294,17 +294,17 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase redundancy)); vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, redundancy)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQueryingWithConstants : Successfully Created PR's on VM0, VM1 , VM2 , VM3"); - LogWriterSupport.getLogWriter() + LogWriterUtils.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)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQueryingWithConstants : Successfully Created Local Region on VM0"); @@ -322,7 +322,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase (2 * stepSize), (3 * stepSize))); vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(name, portfolio, (3 * (stepSize)), totalDataSize)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQueryingWithConstants : Inserted Portfolio data across PR's"); @@ -330,7 +330,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(localName, portfolio, i, totalDataSize)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQueryingWithConstants : Inserted Portfolio data over Local Region on VM0"); @@ -339,7 +339,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase .invoke(PRQHelp .getCacheSerializableRunnableForPRQueryWithConstantsAndComparingResults( name, localName)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQueryingWithConstants : *Querying PR's with DACK Test ENDED*****"); } @@ -524,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(); - LogWriterSupport.getLogWriter().info("PRQueryDUnitTest#testQueryResultsFromMembers : \n" + + LogWriterUtils.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()); } @@ -631,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(); - LogWriterSupport.getLogWriter().info("PRQueryDUnitTest#testQueryResultsFromMembers : \n" + + LogWriterUtils.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()); @@ -733,7 +733,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase public void testPRAccessorCreationAndQuerying() throws Exception { - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Querying PR Test with DACK Started*****"); Host host = Host.getHost(0); @@ -749,17 +749,17 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase // Creting PR's on the participating VM's // Creating Accessor node on the VM - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Creating the Accessor node in the PR"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRAccessorCreate(name, 0)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Successfully created the Accessor node in the PR"); // Creating the Datastores Nodes in the VM's - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Creating the Datastore node in the PR"); vm1.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, @@ -768,17 +768,17 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase redundancy)); vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, redundancy)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Successfully Created the Datastore node in the PR"); - LogWriterSupport.getLogWriter() + LogWriterUtils.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)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Successfully Created Local Region on VM0"); @@ -795,7 +795,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase (2 * stepSize), (3 * stepSize))); vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(name, portfolio, (3 * (stepSize)), totalDataSize)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Inserted Portfolio data across PR's"); @@ -806,7 +806,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase // querying the VM for data vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRQueryAndCompareResults( name, localName)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Querying PR's Test ENDED*****"); } @@ -827,7 +827,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase int dataSize = 10; int step = 2; - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Querying PR Test with DACK Started*****"); @@ -839,7 +839,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase VM vm3 = host.getVM(3); // Creating PR's on the participating VM's - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Creating PR's on VM0, VM1 , VM2 , VM3"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, @@ -850,17 +850,17 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase redundancy, valueConstraint)); vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, redundancy, valueConstraint)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Successfully Created PR's on VM0, VM1 , VM2 , VM3"); - LogWriterSupport.getLogWriter() + LogWriterUtils.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)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Successfully Created Local Region on VM0"); @@ -878,7 +878,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase (2 * step), (3 * step))); vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRPutsKeyValue(name, portfoliosAndPositions, (3 * (step)), dataSize)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Inserted Portfolio data across PR's"); @@ -886,14 +886,14 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPutsKeyValue(localName, portfoliosAndPositions, i, dataSize)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Inserted Portfolio data over Local Region on VM0"); // querying the VM for data vm0.invoke(PRQHelp.getCacheSerializableRunnableForPROrderByQueryAndCompareResults( name, localName)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : *Querying PR's with DACK Test ENDED*****"); } @@ -914,7 +914,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase int dataSize = 10; int step = 2; - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Querying PR Test with DACK Started*****"); @@ -926,7 +926,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase VM vm3 = host.getVM(3); // Creating PR's on the participating VM's - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Creating PR's on VM0, VM1 , VM2 , VM3"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, @@ -937,17 +937,17 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase redundancy, valueConstraint)); vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, redundancy, valueConstraint)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Successfully Created PR's on VM0, VM1 , VM2 , VM3"); - LogWriterSupport.getLogWriter() + LogWriterUtils.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)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Successfully Created Local Region on VM0"); @@ -965,7 +965,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase (2 * step), (3 * step))); vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRPutsKeyValue(name, portfoliosAndPositions, (3 * (step)), dataSize)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Inserted Portfolio data across PR's"); @@ -973,14 +973,14 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPutsKeyValue(localName, portfoliosAndPositions, i, dataSize)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Inserted Portfolio data over Local Region on VM0"); // querying the VM for data vm0.invoke(PRQHelp.getCacheSerializableRunnableForPROrderByQueryAndVerifyOrder( name, localName)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : *Querying PR's with DACK Test ENDED*****"); } @@ -1001,7 +1001,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase int step = 2; Class valueConstraint = Portfolio.class; - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Querying PR Test with DACK Started*****"); Host host = Host.getHost(0); @@ -1017,17 +1017,17 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase // Creting PR's on the participating VM's // Creating Accessor node on the VM - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Creating the Accessor node in the PR"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRAccessorCreate(name, 0, valueConstraint)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Successfully created the Accessor node in the PR"); // Creating the Datastores Nodes in the VM's - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Creating the Datastore node in the PR"); vm1.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, @@ -1036,17 +1036,17 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase redundancy, valueConstraint)); vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, redundancy, valueConstraint)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Successfully Created the Datastore node in the PR"); - LogWriterSupport.getLogWriter() + LogWriterUtils.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)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Successfully Created Local Region on VM0"); @@ -1063,7 +1063,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase (2 * step), (3 * step))); vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRPutsKeyValue(name, portfolio, (3 * (step)), dataSize)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Inserted Portfolio data across PR's"); @@ -1074,7 +1074,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase // querying the VM for data vm0.invoke(PRQHelp.getCacheSerializableRunnableForPROrderByQueryAndCompareResults( name, localName)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Querying PR's Test ENDED*****"); } @@ -1084,7 +1084,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase int dataSize = 10; int step = 2; - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Querying PR Test with DACK Started*****"); @@ -1096,7 +1096,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase VM vm3 = host.getVM(3); // Creating PR's on the participating VM's - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Creating PR's on VM0, VM1 , VM2 , VM3"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, @@ -1107,17 +1107,17 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase redundancy, valueConstraint)); vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, redundancy, valueConstraint)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Successfully Created PR's on VM0, VM1 , VM2 , VM3"); - LogWriterSupport.getLogWriter() + LogWriterUtils.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)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Successfully Created Local Region on VM0"); @@ -1135,7 +1135,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase (2 * step), (3 * step))); vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRPutsKeyValue(name, portfoliosAndPositions, (3 * (step)), dataSize)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Inserted Portfolio data across PR's"); @@ -1143,14 +1143,14 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPutsKeyValue(localName, portfoliosAndPositions, i, dataSize)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Inserted Portfolio data over Local Region on VM0"); // querying the VM for data vm0.invoke(PRQHelp.getCacheSerializableRunnableForPROrderByQueryWithLimit( name, localName)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : *Querying PR's with DACK Test ENDED*****"); } @@ -1169,7 +1169,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase public void testPRAccessorCreationAndQueryingWithNoData() throws Exception { - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRAccessorCreationAndQueryingWithNoData : Querying PR Test with No Data Started*****"); Host host = Host.getHost(0); @@ -1185,17 +1185,17 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase // Creting PR's on the participating VM's // Creating Accessor node on the VM - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRAccessorCreationAndQueryingWithNoData : Creating the Accessor node in the PR"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRAccessorCreate(name, 0)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRAccessorCreationAndQueryingWithNoData : Successfully created the Accessor node in the PR"); // Creating the Datastores Nodes in the VM's - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRAccessorCreationAndQueryingWithNoData : Creating the Datastore node in the PR"); vm1.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, @@ -1204,24 +1204,24 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase redundancy)); vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, redundancy)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRAccessorCreationAndQueryingWithNoData : Successfully Created the Datastore node in the PR"); - LogWriterSupport.getLogWriter() + LogWriterUtils.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)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRAccessorCreationAndQueryingWithNoData : Successfully Created Local Region on VM0"); // querying the VM for data vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRQueryAndCompareResults( name, localName)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRAccessorCreationAndQueryingWithNoData : Querying PR's Test No Data ENDED*****"); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/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 c55cabe..609c1a3 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 = com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter(); + LogWriter log = com.gemstone.gemfire.test.dunit.LogWriterUtils.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 = com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter(); + LogWriter log = com.gemstone.gemfire.test.dunit.LogWriterUtils.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 = com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter(); + LogWriter log = com.gemstone.gemfire.test.dunit.LogWriterUtils.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 = com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter(); + LogWriter log = com.gemstone.gemfire.test.dunit.LogWriterUtils.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 = com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter(); + LogWriter log = com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter(); log.info("BenchMarking PR Querying Test Started*****"); Host host = Host.getHost(0); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/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 479fc5f..8641f48 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 @@ -35,8 +35,8 @@ 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.Host; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; -import com.gemstone.gemfire.test.dunit.Threads; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; +import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.Wait; import com.gemstone.gemfire.internal.cache.ForceReattemptException; @@ -92,7 +92,7 @@ public class PRQueryRegionCloseDUnitTest extends PartitionedRegionDUnitTestCase { - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionCloseDUnitTest#testPRWithRegionCloseInOneDatastoreWithoutDelay: Querying PR Test with region Close PR operation*****"); Host host = Host.getHost(0); @@ -104,33 +104,33 @@ public class PRQueryRegionCloseDUnitTest extends PartitionedRegionDUnitTestCase vmList.add(vm1); vmList.add(vm2); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionCloseDUnitTest#testPRWithRegionCloseInOneDatastoreWithoutDelay: Creating Accessor node on VM0"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRAccessorCreate(name, redundancy)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionCloseDUnitTest#testPRWithRegionCloseInOneDatastoreWithoutDelay: Successfully Created Accessor node on VM0"); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionCloseDUnitTest#testPRWithRegionCloseInOneDatastoreWithoutDelay: Creating PR's across all VM1 , VM2"); vm1.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, redundancy)); vm2.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, redundancy)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionCloseDUnitTest#testPRWithRegionCloseInOneDatastoreWithoutDelay: Successfully Created PR on VM1 , VM2"); // creating a local region on one of the JVM's - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionCloseDUnitTest#testPRWithRegionCloseInOneDatastoreWithoutDelay: Creating Local Region on VM0"); vm0.invoke(PRQHelp .getCacheSerializableRunnableForLocalRegionCreation(localName)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionCloseDUnitTest#testPRWithRegionCloseInOneDatastoreWithoutDelay: Successfully Created Local Region on VM0"); @@ -140,36 +140,36 @@ public class PRQueryRegionCloseDUnitTest extends PartitionedRegionDUnitTestCase final PortfolioData[] portfolio = PRQHelp.createPortfolioData(cnt, cntDest); // Putting the data into the accessor node - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionCloseDUnitTest#testPRWithRegionCloseInOneDatastoreWithoutDelay: Inserting Portfolio data through the accessor node"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(name, portfolio, cnt, cntDest)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionCloseDUnitTest#testPRWithRegionCloseInOneDatastoreWithoutDelay: Successfully Inserted Portfolio data through the accessor node"); // Putting the same data in the local region created - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionCloseDUnitTest#testPRWithRegionCloseInOneDatastoreWithoutDelay: Inserting Portfolio data on local node VM0 for result Set Comparison"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(localName, portfolio, cnt, cntDest)); - LogWriterSupport.getLogWriter() + LogWriterUtils.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 - LogWriterSupport.getLogWriter() + LogWriterUtils.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)); - LogWriterSupport.getLogWriter() + LogWriterUtils.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++) { @@ -180,7 +180,7 @@ public class PRQueryRegionCloseDUnitTest extends PartitionedRegionDUnitTestCase Wait.pause(threadSleepTime); } } - Threads.join(async0, 30 * 1000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(async0, 30 * 1000); if (async0.exceptionOccurred()) { // for now, certain exceptions when a region is closed are acceptable @@ -200,7 +200,7 @@ public class PRQueryRegionCloseDUnitTest extends PartitionedRegionDUnitTestCase } } - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionCloseDUnitTest#testPRWithRegionCloseInOneDatastoreWithoutDelay: Querying with PR Operations ENDED*****"); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/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 9e7678c..c3a37dd 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 @@ -35,8 +35,8 @@ 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.Host; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; -import com.gemstone.gemfire.test.dunit.Threads; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; +import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.Wait; import com.gemstone.gemfire.internal.cache.ForceReattemptException; @@ -91,7 +91,7 @@ public class PRQueryRegionDestroyedDUnitTest extends PartitionedRegionDUnitTestC throws Exception { - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithRegionDestroyInOneDatastoreWithDelay: Querying with PR Destroy Region Operation Test Started"); Host host = Host.getHost(0); @@ -105,16 +105,16 @@ public class PRQueryRegionDestroyedDUnitTest extends PartitionedRegionDUnitTestC vmList.add(vm2); vmList.add(vm3); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithRegionDestroyInOneDatastoreWithDelay: Creating Accessor node on VM0"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRAccessorCreate(name, redundancy)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithRegionDestroyInOneDatastoreWithDelay: Successfully Created Accessor node on VM0"); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithRegionDestroyInOneDatastoreWithDelay: Creating PR's across all VM1 , VM2, VM3"); vm1.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, @@ -125,17 +125,17 @@ public class PRQueryRegionDestroyedDUnitTest extends PartitionedRegionDUnitTestC redundancy)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithRegionDestroyInOneDatastoreWithDelay: Successfully Created PR on VM1 , VM2, VM3"); // creating a local region on one of the JVM's - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithRegionDestroyInOneDatastoreWithDelay: Creating Local Region on VM0"); vm0.invoke(PRQHelp .getCacheSerializableRunnableForLocalRegionCreation(localName)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithRegionDestroyInOneDatastoreWithDelay: Successfully Created Local Region on VM0"); @@ -146,22 +146,22 @@ public class PRQueryRegionDestroyedDUnitTest extends PartitionedRegionDUnitTestC // Putting the data into the accessor node - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithRegionDestroyInOneDatastoreWithDelay: Inserting Portfolio data through the accessor node"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(name, portfolio, cnt, cntDest)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithRegionDestroyInOneDatastoreWithDelay: Successfully Inserted Portfolio data through the accessor node"); // Putting the same data in the local region created - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithRegionDestroyInOneDatastoreWithDelay: Inserting Portfolio data on local node VM0 for result Set Comparison"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(localName, portfolio, cnt, cntDest)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithRegionDestroyInOneDatastoreWithDelay: Successfully Inserted Portfolio data on local node VM0 for result Set Comparison"); @@ -170,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). - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithRegionDestroyInOneDatastoreWithDelay: Querying on VM0 First time"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRQueryAndCompareResults( @@ -178,7 +178,7 @@ public class PRQueryRegionDestroyedDUnitTest extends PartitionedRegionDUnitTestC // Now execute the query. And while query execution in process destroy the region // on one of the node. - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithRegionDestroyInOneDatastoreWithDelay: Querying on VM0 both on PR Region & local ,also Comparing the Results sets from both"); async0 = vm0 @@ -186,7 +186,7 @@ public class PRQueryRegionDestroyedDUnitTest extends PartitionedRegionDUnitTestC name, localName)); Wait.pause(5); - LogWriterSupport.getLogWriter() + LogWriterUtils.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 "); @@ -196,7 +196,7 @@ public class PRQueryRegionDestroyedDUnitTest extends PartitionedRegionDUnitTestC name, redundancy)); - Threads.join(async0, 30 * 1000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(async0, 30 * 1000); if (async0.exceptionOccurred()) { // for Elbe, certain exceptions when a region is destroyed are acceptable @@ -215,7 +215,7 @@ public class PRQueryRegionDestroyedDUnitTest extends PartitionedRegionDUnitTestC Assert.fail("Unexpected exception during query", async0.getException()); } } - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithRegionDestroyInOneDatastoreWithDelay: Querying with PR Destroy Region Operation Test ENDED"); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/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 1141b34..314d4a4 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.Threads; +import com.gemstone.gemfire.test.dunit.ThreadUtils; 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 "); - Threads.join(t1, 30 * 1000, null); - Threads.join(t2, 30 * 1000, null); + ThreadUtils.join(t1, 30 * 1000); + ThreadUtils.join(t2, 30 * 1000); logger .info("PRQueryRegionDestroyedJUnitTest#testQueryOnSingleDataStore: checking for any Unexpected Exception's occured");
