Return-Path: X-Original-To: apmail-geode-commits-archive@minotaur.apache.org Delivered-To: apmail-geode-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AF6BA18C3B for ; Tue, 9 Feb 2016 18:44:49 +0000 (UTC) Received: (qmail 62294 invoked by uid 500); 9 Feb 2016 18:44:49 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 62263 invoked by uid 500); 9 Feb 2016 18:44:49 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 62254 invoked by uid 99); 9 Feb 2016 18:44:49 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Feb 2016 18:44:49 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id E3935C0D3A for ; Tue, 9 Feb 2016 18:44:48 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.649 X-Spam-Level: X-Spam-Status: No, score=-3.649 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.429] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id WyDujckutEYY for ; Tue, 9 Feb 2016 18:44:22 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id CB7A823046 for ; Tue, 9 Feb 2016 18:44:12 +0000 (UTC) Received: (qmail 57402 invoked by uid 99); 9 Feb 2016 18:44:12 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Feb 2016 18:44:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A37D5E6995; Tue, 9 Feb 2016 18:44:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: klund@apache.org To: commits@geode.incubator.apache.org Date: Tue, 09 Feb 2016 18:44:55 -0000 Message-Id: In-Reply-To: <0d0ea98460444feb979efa764ed9f510@git.apache.org> References: <0d0ea98460444feb979efa764ed9f510@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [45/51] [partial] incubator-geode git commit: GEODE-773: Extract static methods from DistributedTestCase http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java index c812e72..e6b17e7 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java @@ -54,7 +54,10 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegion; import com.gemstone.gemfire.internal.cache.PartitionedRegionDUnitTestCase; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.test.dunit.Host; +import com.gemstone.gemfire.test.dunit.IgnoredException; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.VM; +import com.gemstone.gemfire.test.dunit.Wait; /** * @author shobhit @@ -99,40 +102,40 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase Host host = Host.getHost(0); VM vm0 = host.getVM(0); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR Test with DACK Started"); // Creting PR's on the participating VM's // Creating DataStore node on the VM0. - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Creating the DataStore node in the PR"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, redundancy, Portfolio.class)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully created the DataStore node in the PR"); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully Created PR's across all VM's"); // Creating Colocated Region DataStore node on the VM0. - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Creating the Colocated DataStore node in the PR"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRColocatedCreate(coloName, redundancy, name)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully created the Colocated DataStore node in the PR"); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully Created PR's across all VM's"); @@ -158,7 +161,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(coloName, newPortfolio, cnt, cntDest)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Inserted Portfolio data across PR's"); @@ -167,40 +170,40 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase // querying the VM for data vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRColocatedDataSetQueryAndCompareResults(name, coloName, localName, coloLocalName)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR's Test ENDED"); } public void testNonColocatedPRLocalQuerying() throws Exception { - addExpectedException("UnsupportedOperationException"); + IgnoredException.addIgnoredException("UnsupportedOperationException"); Host host = Host.getHost(0); VM vm0 = host.getVM(0); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR Test with DACK Started"); // Creting PR's on the participating VM's // Creating DataStore node on the VM0. - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Creating the DataStore node in the PR"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, redundancy, Portfolio.class)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully created the DataStore node in the PR"); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully Created PR's across all VM's"); // Creating Colocated Region DataStore node on the VM0. - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Creating the Colocated DataStore node in the PR"); @@ -224,7 +227,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase partitionedregion = cache.createRegion(coloName, attr.create()); } catch (IllegalStateException ex) { - getLogWriter() + LogWriterUtils.getLogWriter() .warning( "PRQueryDUnitHelper#getCacheSerializableRunnableForPRCreateWithRedundancy: Creation caught IllegalStateException", ex); @@ -241,11 +244,11 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase } }); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully created the Colocated DataStore node in the PR"); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully Created PR's across all VM's"); @@ -271,7 +274,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(coloName, newPortfolio, cnt, cntDest)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Inserted Portfolio data across PR's"); @@ -357,7 +360,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase } catch (FunctionException e) { if (e.getCause() instanceof UnsupportedOperationException) { - getLogWriter().info("Query received FunctionException successfully while using QueryService."); + LogWriterUtils.getLogWriter().info("Query received FunctionException successfully while using QueryService."); } else { fail("UnsupportedOperationException must be thrown here"); } @@ -365,7 +368,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase } }); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR's Test ENDED"); } @@ -382,13 +385,13 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase Host host = Host.getHost(0); VM vm0 = host.getVM(0); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR Test with DACK Started"); // Creting PR's on the participating VM's // Creating DataStore node on the VM0. - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Creating the DataStore node in the PR"); @@ -397,16 +400,16 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(name, "IdIndex1", "r1.ID", "/"+name+" r1", null)); //vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(name, "IdIndex11", "r1.status", "/"+name+" r1", null)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully created the DataStore node in the PR"); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully Created PR's across all VM's"); // Creating Colocated Region DataStore node on the VM0. - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Creating the Colocated DataStore node in the PR"); @@ -415,11 +418,11 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(coloName, "IdIndex2", "r2.id", "/"+coloName+" r2", null)); //vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(coloName, "IdIndex22", "r2.status", "/"+coloName+" r2", null)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully created the Colocated DataStore node in the PR"); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully Created PR's across all VM's"); @@ -445,7 +448,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(coloName, newPortfolio, cnt, cntDest)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Inserted Portfolio data across PR's"); @@ -454,7 +457,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase // querying the VM for data vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRColocatedDataSetQueryAndCompareResults(name, coloName, localName, coloLocalName)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR's Test ENDED"); } @@ -471,13 +474,13 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase Host host = Host.getHost(0); VM vm0 = host.getVM(0); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR Test with DACK Started"); // Creting PR's on the participating VM's // Creating DataStore node on the VM0. - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Creating the DataStore node in the PR"); @@ -486,27 +489,27 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(name, "IdIndex1", "r1.ID", "/"+name+" r1", null)); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(name, "IdIndex11", "r1.status", "/"+name+" r1", null)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully created the DataStore node in the PR"); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully Created PR's across all VM's"); // Creating Colocated Region DataStore node on the VM0. - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Creating the Colocated DataStore node in the PR"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRColocatedCreate(coloName, redundancy, name)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully created the Colocated DataStore node in the PR"); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully Created PR's across all VM's"); @@ -532,7 +535,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(coloName, newPortfolio, cnt, cntDest)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Inserted Portfolio data across PR's"); @@ -541,7 +544,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase // querying the VM for data vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRColocatedDataSetQueryAndCompareResults(name, coloName, localName, coloLocalName)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR's Test ENDED"); } @@ -558,39 +561,39 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase Host host = Host.getHost(0); VM vm0 = host.getVM(0); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR Test with DACK Started"); // Creting PR's on the participating VM's // Creating DataStore node on the VM0. - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Creating the DataStore node in the PR"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, redundancy, Portfolio.class)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully created the DataStore node in the PR"); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully Created PR's across all VM's"); // Creating Colocated Region DataStore node on the VM0. - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Creating the Colocated DataStore node in the PR"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForLocalRegionCreation(coloName, NewPortfolio.class)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully created the Colocated DataStore node in the PR"); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully Created PR's across all VM's"); @@ -616,7 +619,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(coloName, newPortfolio, cnt, cntDest)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Inserted Portfolio data across PR's"); @@ -625,7 +628,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase // querying the VM for data vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRColocatedDataSetQueryAndCompareResults(name, coloName, localName, coloLocalName)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR's Test ENDED"); } @@ -642,13 +645,13 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase Host host = Host.getHost(0); VM vm0 = host.getVM(0); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR Test with DACK Started"); // Creting PR's on the participating VM's // Creating DataStore node on the VM0. - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Creating the DataStore node in the PR"); @@ -657,16 +660,16 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(name, "IdIndex1", "r1.ID", "/"+name+" r1", null)); //vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(name, "IdIndex11", "r1.status", "/"+name+" r1", null)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully created the DataStore node in the PR"); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully Created PR's across all VM's"); // Creating Colocated Region DataStore node on the VM0. - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Creating the Colocated DataStore node in the PR"); @@ -675,11 +678,11 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(coloName, "IdIndex2", "r2.id", "/"+coloName+" r2", null)); //vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(coloName, "IdIndex22", "r2.status", "/"+coloName+" r2", null)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully created the Colocated DataStore node in the PR"); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully Created PR's across all VM's"); @@ -705,7 +708,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(coloName, newPortfolio, cnt, cntDest)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Inserted Portfolio data across PR's"); @@ -714,7 +717,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase // querying the VM for data vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRColocatedDataSetQueryAndCompareResults(name, coloName, localName, coloLocalName)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR's Test ENDED"); } @@ -731,13 +734,13 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase Host host = Host.getHost(0); VM vm0 = host.getVM(0); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR Test with DACK Started"); // Creting PR's on the participating VM's // Creating DataStore node on the VM0. - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Creating the DataStore node in the PR"); @@ -746,26 +749,26 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(name, "IdIndex1", "r1.ID", "/"+name+" r1", null)); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(name, "IdIndex11", "r1.status", "/"+name+" r1", null)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully created the DataStore node in the PR"); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully Created PR's across all VM's"); // Creating Colocated Region DataStore node on the VM0. - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Creating the Colocated DataStore node in the PR"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForLocalRegionCreation(coloName, NewPortfolio.class)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully created the Colocated DataStore node in the PR"); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully Created PR's across all VM's"); @@ -791,7 +794,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(coloName, newPortfolio, cnt, cntDest)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Inserted Portfolio data across PR's"); @@ -800,7 +803,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase // querying the VM for data vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRColocatedDataSetQueryAndCompareResults(name, coloName, localName, coloLocalName)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR's Test ENDED"); } @@ -817,39 +820,39 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase Host host = Host.getHost(0); VM vm0 = host.getVM(0); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR Test with DACK Started"); // Creting PR's on the participating VM's // Creating DataStore node on the VM0. - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Creating the DataStore node in the PR"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(coloName, redundancy, NewPortfolio.class)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully created the DataStore node in the PR"); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully Created PR's across all VM's"); // Creating Colocated Region DataStore node on the VM0. - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Creating the Colocated DataStore node in the PR"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForLocalRegionCreation(name, Portfolio.class)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully created the Colocated DataStore node in the PR"); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully Created PR's across all VM's"); @@ -875,7 +878,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(coloName, newPortfolio, cnt, cntDest)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Inserted Portfolio data across PR's"); @@ -884,7 +887,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase // querying the VM for data vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRColocatedDataSetQueryAndCompareResults(name, coloName, localName, coloLocalName)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR's Test ENDED"); } @@ -901,13 +904,13 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase Host host = Host.getHost(0); VM vm0 = host.getVM(0); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR Test with DACK Started"); // Creting PR's on the participating VM's // Creating DataStore node on the VM0. - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Creating the DataStore node in the PR"); @@ -915,16 +918,16 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase redundancy, NewPortfolio.class)); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(coloName, "IdIndex1", "r2.id", "/"+coloName+" r2", null)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully created the DataStore node in the PR"); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully Created PR's across all VM's"); // Creating Colocated Region DataStore node on the VM0. - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Creating the Colocated DataStore node in the PR"); @@ -932,11 +935,11 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(name, "IdIndex2", "r1.ID", "/"+name+" r1", null)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully created the Colocated DataStore node in the PR"); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully Created PR's across all VM's"); @@ -962,7 +965,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(coloName, newPortfolio, cnt, cntDest)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Inserted Portfolio data across PR's"); @@ -971,7 +974,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase // querying the VM for data vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRColocatedDataSetQueryAndCompareResults(name, coloName, localName, coloLocalName)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR's Test ENDED"); } @@ -988,29 +991,29 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase Host host = Host.getHost(0); VM vm0 = host.getVM(0); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR Test with DACK Started"); // Creting PR's on the participating VM's // Creating DataStore node on the VM0. - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Creating the DataStore node in the PR"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(coloName, redundancy, NewPortfolio.class)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully created the DataStore node in the PR"); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully Created PR's across all VM's"); // Creating Colocated Region DataStore node on the VM0. - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Creating the Colocated DataStore node in the PR"); @@ -1018,11 +1021,11 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(name, "IdIndex1", "r1.ID", "/"+name+" r1", null)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully created the Colocated DataStore node in the PR"); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully Created PR's across all VM's"); @@ -1048,7 +1051,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(coloName, newPortfolio, cnt, cntDest)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Inserted Portfolio data across PR's"); @@ -1057,7 +1060,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase // querying the VM for data vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRColocatedDataSetQueryAndCompareResults(name, coloName, localName, coloLocalName)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR's Test ENDED"); } @@ -1075,13 +1078,13 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR Test with DACK Started"); // Creting PR's on the participating VM's // Creating DataStore node on the VM0. - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Creating the DataStore node in the PR"); @@ -1089,16 +1092,16 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase redundancy, Portfolio.class)); vm1.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, redundancy, Portfolio.class)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully created the DataStore node in the PR"); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully Created PR's across all VM's"); // Creating Colocated Region DataStore node on the VM0. - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Creating the Colocated DataStore node in the PR"); @@ -1106,11 +1109,11 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase redundancy, name)); vm1.invoke(PRQHelp.getCacheSerializableRunnableForPRColocatedCreate(coloName, redundancy, name)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully created the Colocated DataStore node in the PR"); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully Created PR's across all VM's"); @@ -1136,7 +1139,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(coloName, newPortfolio, cnt, cntDest)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Inserted Portfolio data across PR's"); @@ -1198,7 +1201,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase "PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught unexpected query exception", e); } catch (QueryException e) { - getLogWriter() + LogWriterUtils.getLogWriter() .error( "PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught QueryException while querying" + e, e); @@ -1206,11 +1209,11 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase "PRQueryDUnitHelper#getCacheSerializableRunnableForPRQueryAndCompareResults: Caught unexpected query exception", e); } catch (UnsupportedOperationException uso) { - getLogWriter().info(uso.getMessage()); + LogWriterUtils.getLogWriter().info(uso.getMessage()); if (!uso.getMessage().equalsIgnoreCase(LocalizedStrings.DefaultQuery_A_QUERY_ON_A_PARTITIONED_REGION_0_MAY_NOT_REFERENCE_ANY_OTHER_REGION_1.toLocalizedString(new Object[] {name, "/"+coloName}))) { fail("Query did not throw UnsupportedOperationException while using QueryService instead of LocalQueryService"); } else { - getLogWriter().info("Query received UnsupportedOperationException successfully while using QueryService."); + LogWriterUtils.getLogWriter().info("Query received UnsupportedOperationException successfully while using QueryService."); } } finally { for (int i = 0; i < expectedExceptions.length; i++) { @@ -1222,7 +1225,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase } }); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR's Test ENDED"); } @@ -1232,13 +1235,13 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase Host host = Host.getHost(0); VM vm0 = host.getVM(0); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR Test with DACK Started"); // Creting PR's on the participating VM's // Creating DataStore node on the VM0. - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Creating the DataStore node in the PR"); @@ -1247,16 +1250,16 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(name, "IdIndex1", "r1.ID", "/"+name+" r1", null)); //vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(name, "IdIndex11", "r1.status", "/"+name+" r1", null)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully created the DataStore node in the PR"); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully Created PR's across all VM's"); // Creating Colocated Region DataStore node on the VM0. - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Creating the Colocated DataStore node in the PR"); @@ -1265,11 +1268,11 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(coloName, "IdIndex2", "r2.id", "/"+coloName+" r2, r2.positions.values pos2", null)); //vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(coloName, "IdIndex22", "r2.status", "/"+coloName+" r2", null)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully created the Colocated DataStore node in the PR"); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully Created PR's across all VM's"); @@ -1295,7 +1298,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(coloName, newPortfolio, cnt, cntDest)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Inserted Portfolio data across PR's"); @@ -1304,7 +1307,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase // querying the VM for data vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRAndRRQueryAndCompareResults(name, coloName, localName, coloLocalName)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR's Test ENDED"); } @@ -1315,13 +1318,13 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase Host host = Host.getHost(0); VM vm0 = host.getVM(0); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR Test with DACK Started"); // Creting PR's on the participating VM's // Creating DataStore node on the VM0. - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Creating the DataStore node in the PR"); @@ -1330,16 +1333,16 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(coloName, "IdIndex1", "r2.id", "/"+coloName+" r2", null)); //vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(name, "IdIndex11", "r1.status", "/"+name+" r1", null)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully created the DataStore node in the PR"); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully Created PR's across all VM's"); // Creating Colocated Region DataStore node on the VM0. - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Creating the Colocated DataStore node in the PR"); @@ -1348,11 +1351,11 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(name, "IdIndex2", "r1.ID", "/"+name+" r1, r1.positions.values pos1", null)); //vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(coloName, "IdIndex22", "r2.status", "/"+coloName+" r2", null)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully created the Colocated DataStore node in the PR"); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully Created PR's across all VM's"); @@ -1378,7 +1381,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(coloName, newPortfolio, cnt, cntDest)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Inserted Portfolio data across PR's"); @@ -1387,7 +1390,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase // querying the VM for data vm0.invoke(PRQHelp.getCacheSerializableRunnableForRRAndPRQueryAndCompareResults(name, coloName, localName, coloLocalName)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR's Test ENDED"); } @@ -1397,13 +1400,13 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase Host host = Host.getHost(0); VM vm0 = host.getVM(0); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR Test with DACK Started"); // Creting PR's on the participating VM's // Creating DataStore node on the VM0. - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Creating the DataStore node in the PR"); @@ -1412,16 +1415,16 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(name, "IdIndex1", "r1.ID", "/"+name+" r1", null)); //vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(name, "IdIndex11", "r1.status", "/"+name+" r1", null)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully created the DataStore node in the PR"); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully Created PR's across all VM's"); // Creating Colocated Region DataStore node on the VM0. - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Creating the Colocated DataStore node in the PR"); @@ -1430,11 +1433,11 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(coloName, "IdIndex2", "pos2.id", "/"+coloName+" r2, r2.positions.values pos2", null)); //vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(coloName, "IdIndex22", "r2.status", "/"+coloName+" r2", null)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully created the Colocated DataStore node in the PR"); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully Created PR's across all VM's"); @@ -1460,7 +1463,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(coloName, newPortfolio, cnt, cntDest)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Inserted Portfolio data across PR's"); @@ -1469,7 +1472,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase // querying the VM for data vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRAndRRQueryWithCompactAndRangeIndexAndCompareResults(name, coloName, localName, coloLocalName)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR's Test ENDED"); } @@ -1479,13 +1482,13 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase Host host = Host.getHost(0); VM vm0 = host.getVM(0); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR Test with DACK Started"); // Creting PR's on the participating VM's // Creating DataStore node on the VM0. - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Creating the DataStore node in the PR"); @@ -1494,16 +1497,16 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(name, "IdIndex1", "r1.ID", "/"+name+" r1", null)); //vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(name, "IdIndex11", "r1.status", "/"+name+" r1", null)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully created the DataStore node in the PR"); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully Created PR's across all VM's"); // Creating Colocated Region DataStore node on the VM0. - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Creating the Colocated DataStore node in the PR"); @@ -1512,11 +1515,11 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(coloName, "IdIndex2", "r2.id", "/"+coloName+" r2", null)); //vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(coloName, "IdIndex22", "r2.status", "/"+coloName+" r2", null)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully created the Colocated DataStore node in the PR"); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully Created PR's across all VM's"); @@ -1545,19 +1548,19 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(coloName, newPortfolio, cnt, cntDest)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Inserted Portfolio data across PR's"); //Let async index updates be finished. - pause(5000); + Wait.pause(5000); // querying the VM for data and comparing the result with query result of // local region. // querying the VM for data vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRAndRRQueryAndCompareResults(name, coloName, localName, coloLocalName)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR's Test ENDED"); } @@ -1576,13 +1579,13 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR Test with DACK Started"); // Creting PR's on the participating VM's // Creating DataStore node on the VM0. - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Creating the DataStore node in the PR"); @@ -1590,22 +1593,22 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase 0, Portfolio.class)); vm1.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, 0, Portfolio.class)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully created the DataStore node in the PR"); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully Created PR's across all VM's"); // Creating Colocated Region DataStore node on the VM0. - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Creating the Colocated DataStore node in the RR"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForLocalRegionCreation(coloName, NewPortfolio.class)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully Created PR's across all VM's"); @@ -1618,7 +1621,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(coloName, newPortfolio, cnt, cntDest)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Inserted Portfolio data across PR's"); @@ -1704,7 +1707,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase } catch (FunctionException e) { if (e.getCause() instanceof RegionNotFoundException) { - getLogWriter().info("Query received FunctionException successfully while using QueryService."); + LogWriterUtils.getLogWriter().info("Query received FunctionException successfully while using QueryService."); } else { fail("RegionNotFoundException must be thrown here"); } @@ -1712,7 +1715,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase } }); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR's Test ENDED"); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRInvalidQueryDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRInvalidQueryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRInvalidQueryDUnitTest.java index 2028ff7..aa7f1fe 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRInvalidQueryDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRInvalidQueryDUnitTest.java @@ -25,6 +25,7 @@ package com.gemstone.gemfire.cache.query.partitioned; import com.gemstone.gemfire.cache.query.data.PortfolioData; import com.gemstone.gemfire.internal.cache.PartitionedRegionDUnitTestCase; import com.gemstone.gemfire.test.dunit.Host; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.VM; public class PRInvalidQueryDUnitTest extends PartitionedRegionDUnitTestCase @@ -63,7 +64,7 @@ public class PRInvalidQueryDUnitTest extends PartitionedRegionDUnitTestCase public void testPRDAckCreationAndQueryingWithInvalidQuery() throws Exception { - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRInvalidQueryDUnitTest#testPRDAckCreationAndQueryingWithInvalidQuery: Querying PR Test with Expected InvalidQueryException*****"); Host host = Host.getHost(0); @@ -76,17 +77,17 @@ public class PRInvalidQueryDUnitTest extends PartitionedRegionDUnitTestCase // Creting PR's on the participating VM's // Creating Accessor node on the VM - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRInvalidQueryDUnitTest#testPRDAckCreationAndQueryingWithInvalidQuery: Creating the Accessor node in the PR"); vm0.invoke(prq.getCacheSerializableRunnableForPRAccessorCreate(name, redundancy)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRInvalidQueryDUnitTest#testPRDAckCreationAndQueryingWithInvalidQuery: Successfully created the Accessor node in the PR"); // Creating the Datastores Nodes in the VM's - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRInvalidQueryDUnitTest#testPRDAckCreationAndQueryingWithInvalidQuery: Creating the Datastore node in the PR"); vm1.invoke(prq.getCacheSerializableRunnableForPRCreate(name, @@ -95,11 +96,11 @@ public class PRInvalidQueryDUnitTest extends PartitionedRegionDUnitTestCase redundancy)); vm3.invoke(prq.getCacheSerializableRunnableForPRCreate(name, redundancy)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRInvalidQueryDUnitTest#testPRDAckCreationAndQueryingWithInvalidQuery: Successfully Created the Datastore node in the PR"); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRInvalidQueryDUnitTest#testPRDAckCreationAndQueryingWithInvalidQuery: Successfully Created PR's across all VM's"); @@ -117,7 +118,7 @@ public class PRInvalidQueryDUnitTest extends PartitionedRegionDUnitTestCase + (2 * step), i + (3 * step))); vm3.invoke(prq.getCacheSerializableRunnableForPRPuts(name, portfolio, i + (3 * step), cntDest)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRInvalidQueryDUnitTest#testPRDAckCreationAndQueryingWithInvalidQuery: Successfully Inserted Portfolio data across PR's"); @@ -125,7 +126,7 @@ public class PRInvalidQueryDUnitTest extends PartitionedRegionDUnitTestCase // querying the VM for data vm0.invoke(prq.getCacheSerializableRunnableForPRInvalidQuery(name, invalidQuery)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRInvalidQueryDUnitTest#testPRDAckCreationAndQueryingWithInvalidQuery: *****Querying PR's Test with Expected Invalid Query Exception *****"); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryCacheCloseDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryCacheCloseDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryCacheCloseDUnitTest.java index dd12b21..6c6c36f 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryCacheCloseDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryCacheCloseDUnitTest.java @@ -34,10 +34,13 @@ import java.util.Random; import com.gemstone.gemfire.cache.query.data.PortfolioData; import com.gemstone.gemfire.internal.cache.ForceReattemptException; 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.LogWriterUtils; +import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.dunit.VM; +import com.gemstone.gemfire.test.dunit.Wait; public class PRQueryCacheCloseDUnitTest extends PartitionedRegionDUnitTestCase { @@ -88,7 +91,7 @@ public class PRQueryCacheCloseDUnitTest extends PartitionedRegionDUnitTestCase public void testPRWithCacheCloseInOneDatastoreWithDelay() throws Exception { - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryCacheCloseDUnitTest#testPRWithCacheCloseInOneDatastoreWithDelay: Querying PR Test with cache Close PR operation*****"); Host host = Host.getHost(0); @@ -103,33 +106,33 @@ public class PRQueryCacheCloseDUnitTest extends PartitionedRegionDUnitTestCase // Creting PR's on the participating VM's // Creting Accessor PR's on the participating VM's - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryCacheCloseDUnitTest#testPRWithCacheCloseInOneDatastoreWithDelay: Creating Accessor node on VM0"); accessor.invoke(PRQHelp.getCacheSerializableRunnableForPRAccessorCreate(name, redundancy)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryCacheCloseDUnitTest#testPRWithCacheCloseInOneDatastoreWithDelay: Successfully Created Accessor node on VM0"); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryCacheCloseDUnitTest#testPRWithCacheCloseInOneDatastoreWithDelay: Creating PR's across all VM1 , VM2"); datastore1.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, redundancy)); datastore2.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, redundancy)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryCacheCloseDUnitTest#testPRWithCacheCloseInOneDatastoreWithDelay: Successfully Created PR on VM1 , VM2"); // creating a local region on one of the JVM's - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryCacheCloseDUnitTest#testPRWithCacheCloseInOneDatastoreWithDelay: Creating Local Region on VM0"); accessor.invoke(PRQHelp .getCacheSerializableRunnableForLocalRegionCreation(localName)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryCacheCloseDUnitTest#testPRWithCacheCloseInOneDatastoreWithDelay: Successfully Created Local Region on VM0"); @@ -139,45 +142,45 @@ public class PRQueryCacheCloseDUnitTest extends PartitionedRegionDUnitTestCase final PortfolioData[] portfolio = PRQHelp.createPortfolioData(cnt, cntDest); // Putting the data into the accessor node - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryCacheCloseDUnitTest#testPRWithCacheCloseInOneDatastoreWithDelay: Inserting Portfolio data through the accessor node"); accessor.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(name, portfolio, cnt, cntDest)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryCacheCloseDUnitTest#testPRWithCacheCloseInOneDatastoreWithDelay: Successfully Inserted Portfolio data through the accessor node"); // Putting the same data in the local region created - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryCacheCloseDUnitTest#testPRWithCacheCloseInOneDatastoreWithDelay: Inserting Portfolio data on local node VM0 for result Set Comparison"); accessor.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(localName, portfolio, cnt, cntDest)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryCacheCloseDUnitTest#testPRWithCacheCloseInOneDatastoreWithDelay: Successfully Inserted Portfolio data on local node VM0 for result Set Comparison"); Random random = new Random(); AsyncInvocation async0; // querying the VM for data - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryCacheCloseDUnitTest#testPRWithCacheCloseInOneDatastoreWithDelay: Querying on VM0 both on PR Region & local ,also Comparing the Results sets from both"); async0 = accessor .invokeAsync(PRQHelp.getCacheSerializableRunnableForPRQueryAndCompareResults( name, localName)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryCacheCloseDUnitTest#testPRWithCacheCloseInOneDatastoreWithDelay: Calling for cache 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++) { int k = (random.nextInt(vmList.size())); ((VM)(vmList.get(k))).invoke(PRQHelp.getCacheSerializableRunnableForCacheClose( name, redundancy)); - pause(threadSleepTime); + Wait.pause(threadSleepTime); } - DistributedTestCase.join(async0, 5 * 60 * 1000, getLogWriter()); + ThreadUtils.join(async0, 5 * 60 * 1000); if (async0.exceptionOccurred()) { // for now, certain exceptions when a region is closed are acceptable @@ -193,11 +196,11 @@ public class PRQueryCacheCloseDUnitTest extends PartitionedRegionDUnitTestCase } while (t != null); if (!isForceReattempt) { - fail("Unexpected exception during query", async0.getException()); + Assert.fail("Unexpected exception during query", async0.getException()); } } - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryCacheCloseDUnitTest#testPRWithCacheCloseInOneDatastoreWithDelay: Querying with PR Operations ENDED*****"); } @@ -216,7 +219,7 @@ public class PRQueryCacheCloseDUnitTest extends PartitionedRegionDUnitTestCase */ public void testPRWithCacheCloseInOneDatastoreWithoutDelay() throws Exception { - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryCacheCloseDUnitTest#testPRWithCacheCloseInOneDatastoreWithoutDelay: Querying PR Test with cache Close PR operation without delay*****"); Host host = Host.getHost(0); @@ -229,39 +232,39 @@ public class PRQueryCacheCloseDUnitTest extends PartitionedRegionDUnitTestCase vmList.add(vm2); // Creting PR's on the participating VM's - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryCacheCloseDUnitTest#testPRWithCacheCloseInOneDatastoreWithoutDelay: Creating Accessor node on VM0"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRAccessorCreate(name, redundancy)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryCacheCloseDUnitTest#testPRWithCacheCloseInOneDatastoreWithoutDelay: Successfully Created Accessor node on VM0"); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryCacheCloseDUnitTest#testPRWithCacheCloseInOneDatastoreWithoutDelay: Creating PR's across all VM1 , VM2"); vm1.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, redundancy)); vm2.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, redundancy)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryCacheCloseDUnitTest#testPRWithCacheCloseInOneDatastoreWithoutDelay: Successfully Created PR on VM1 , VM2"); // creating a local region on one of the JVM's - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryCacheCloseDUnitTest#testPRWithCacheCloseInOneDatastoreWithoutDelay: Creating Local Region on VM0"); vm0.invoke(PRQHelp .getCacheSerializableRunnableForLocalRegionCreation(localName)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryCacheCloseDUnitTest#testPRWithCacheCloseInOneDatastoreWithoutDelay: Successfully Created Local Region on VM0"); - getLogWriter().info("Successfully Created PR's across all VM's"); + LogWriterUtils.getLogWriter().info("Successfully Created PR's across all VM's"); // creating a local region on one of the JVM's - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryCacheCloseDUnitTest#testPRWithCacheCloseInOneDatastoreWithoutDelay: Successfully Created Local Region on VM0"); @@ -270,22 +273,22 @@ public class PRQueryCacheCloseDUnitTest extends PartitionedRegionDUnitTestCase final PortfolioData[] portfolio = PRQHelp.createPortfolioData(cnt, cntDest); // Putting the data into the accessor node - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryCacheCloseDUnitTest#testPRWithCacheCloseInOneDatastoreWithoutDelay: Inserting Portfolio data through the accessor node"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(name, portfolio, cnt, cntDest)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryCacheCloseDUnitTest#testPRWithCacheCloseInOneDatastoreWithoutDelay: Successfully Inserted Portfolio data through the accessor node"); // Putting the same data in the local region created - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryCacheCloseDUnitTest#testPRWithCacheCloseInOneDatastoreWithoutDelay: Inserting Portfolio data on local node VM0 for result Set Comparison"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(localName, portfolio, cnt, cntDest)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryCacheCloseDUnitTest#testPRWithCacheCloseInOneDatastoreWithoutDelay: Successfully Inserted Portfolio data on local node VM0 for result Set Comparison"); @@ -293,14 +296,14 @@ public class PRQueryCacheCloseDUnitTest extends PartitionedRegionDUnitTestCase AsyncInvocation async0; // querying the VM for data - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryCacheCloseDUnitTest#testPRWithCacheCloseInOneDatastoreWithoutDelay: Querying on VM0 both on PR Region & local ,also Comparing the Results sets from both"); async0 = vm0 .invokeAsync(PRQHelp.getCacheSerializableRunnableForPRQueryAndCompareResults( name, localName)); - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryCacheCloseDUnitTest#testPRWithCacheCloseInOneDatastoreWithoutDelay: Calling for cache close on either of the Datastores VM1 , VM2 at random and then recreating the cache, with no delay "); for (int j = 0; j < queryTestCycle; j++) { @@ -309,7 +312,7 @@ public class PRQueryCacheCloseDUnitTest extends PartitionedRegionDUnitTestCase name, redundancy)); } - DistributedTestCase.join(async0, 5 * 60 * 1000, getLogWriter()); + ThreadUtils.join(async0, 5 * 60 * 1000); if (async0.exceptionOccurred()) { // for now, certain exceptions when a region is closed are acceptable @@ -325,11 +328,11 @@ public class PRQueryCacheCloseDUnitTest extends PartitionedRegionDUnitTestCase } while (t != null); if (!isForceReattempt) { - fail("Unexpected exception during query", async0.getException()); + Assert.fail("Unexpected exception during query", async0.getException()); } } - getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryCacheCloseDUnitTest#testPRWithCacheCloseInOneDatastoreWithoutDelay: Querying with PR Operations without delay ENDED*****"); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryCacheClosedJUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryCacheClosedJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryCacheClosedJUnitTest.java index 620caa3..da64daf 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryCacheClosedJUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryCacheClosedJUnitTest.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.ThreadUtils; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; /** @@ -222,8 +222,8 @@ public class PRQueryCacheClosedJUnitTest logger .info("PRQueryCacheClosedJUnitTest#testQueryOnSingleDataStoreWithCacheClose: Waiting for the Threads to join "); - DistributedTestCase.join(t1, 30 * 1000, null); - DistributedTestCase.join(t2, 30 * 1000, null); + ThreadUtils.join(t1, 30 * 1000); + ThreadUtils.join(t2, 30 * 1000); logger .info("PRQueryCacheClosedJUnitTest#testQueryOnSingleDataStoreWithCacheClose: checking for any Unexpected Exception's occured");