Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B0183200B32 for ; Wed, 25 May 2016 02:17:01 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id AE6B1160A36; Wed, 25 May 2016 00:17:01 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id AF69C160A35 for ; Wed, 25 May 2016 02:16:59 +0200 (CEST) Received: (qmail 77522 invoked by uid 500); 25 May 2016 00:16:58 -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 77513 invoked by uid 99); 25 May 2016 00:16:58 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 May 2016 00:16:58 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 637541A0265 for ; Wed, 25 May 2016 00:16:58 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.221 X-Spam-Level: X-Spam-Status: No, score=-3.221 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.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id pbsUFEGNCzzp for ; Wed, 25 May 2016 00:16:49 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id D9E155F484 for ; Wed, 25 May 2016 00:16:47 +0000 (UTC) Received: (qmail 77253 invoked by uid 99); 25 May 2016 00:16:47 -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; Wed, 25 May 2016 00:16:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 03551DFC77; Wed, 25 May 2016 00:16:47 +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 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-geode git commit: Annotate disabled test methods with @Ignore and @Test Date: Wed, 25 May 2016 00:16:47 +0000 (UTC) archived-at: Wed, 25 May 2016 00:17:01 -0000 Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-1452 bd892f531 -> d22524332 Annotate disabled test methods with @Ignore and @Test * delete some tests that have no value Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/d2252433 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/d2252433 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/d2252433 Branch: refs/heads/feature/GEODE-1452 Commit: d22524332d9f7264388aacb970e59ec39f145236 Parents: bd892f5 Author: Kirk Lund Authored: Tue May 24 17:15:39 2016 -0700 Committer: Kirk Lund Committed: Tue May 24 17:16:16 2016 -0700 ---------------------------------------------------------------------- .../gemfire/modules/HibernateJUnitTest.java | 11 +- .../gemstone/gemfire/modules/SecondVMTest.java | 23 ++-- .../ExceptionHandlingJUnitTest.java | 4 +- .../cache/query/QueryServiceJUnitTest.java | 33 +---- .../CustomerOptimizationsJUnitTest.java | 25 ++-- .../query/functional/INOperatorJUnitTest.java | 5 +- .../IUMRCompositeIteratorJUnitTest.java | 5 +- .../query/functional/LimitClauseJUnitTest.java | 5 +- .../cache/query/functional/MiscJUnitTest.java | 29 ++++- .../MultiRegionIndexUsageJUnitTest.java | 11 +- .../query/functional/NestedQueryJUnitTest.java | 5 +- .../ResultsDataSerializabilityJUnitTest.java | 5 +- .../CompiledJunctionInternalsJUnitTest.java | 11 +- .../query/internal/QCompilerJUnitTest.java | 6 +- .../index/IndexMaintainceJUnitTest.java | 6 +- .../query/transaction/QueryAndJtaJUnitTest.java | 8 +- .../InternalDistributedSystemJUnitTest.java | 17 ++- .../Bug34179TooManyFilesOpenJUnitTest.java | 130 ------------------- .../LIFOEvictionAlgoEnabledRegionJUnitTest.java | 32 +---- .../gemfire/internal/cache/OplogJUnitTest.java | 56 -------- .../cache/ha/BlockingHARegionJUnitTest.java | 95 -------------- .../ha/BlockingHARegionQueueJUnitTest.java | 68 +++++----- .../cache/ha/HARQAddOperationJUnitTest.java | 9 +- .../cache/ha/HARegionQueueJUnitTest.java | 7 +- .../tier/sockets/DurableClientTestCase.java | 12 +- 25 files changed, 174 insertions(+), 444 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d2252433/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/HibernateJUnitTest.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/HibernateJUnitTest.java b/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/HibernateJUnitTest.java index 9a86f10..9b603fa 100644 --- a/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/HibernateJUnitTest.java +++ b/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/HibernateJUnitTest.java @@ -27,6 +27,7 @@ import org.hibernate.SessionFactory; import org.hibernate.cfg.AnnotationConfiguration; import org.hibernate.cfg.Configuration; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; import org.slf4j.Logger; @@ -195,7 +196,9 @@ public class HibernateJUnitTest { } - public void _testInvalidation() { + @Ignore("TODO") + @Test + public void testInvalidation() { Session s = getSessionFactory(null).openSession(); } @@ -275,8 +278,10 @@ public class HibernateJUnitTest { // log.info("loading events"); // log.info(aPerson.getEvents()+""); } - - public void _testQueryCache() throws Exception { + + @Ignore("TODO") + @Test + public void testQueryCache() throws Exception { Session session = getSessionFactory(null).openSession(); Query q = session.createQuery("from Event"); q.setCacheable(true); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d2252433/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java b/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java index e3b6480..f0f5416 100644 --- a/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java +++ b/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java @@ -21,11 +21,9 @@ import java.util.Iterator; import java.util.Properties; import java.util.logging.Level; -import com.gemstone.gemfire.test.junit.categories.IntegrationTest; -import junit.framework.TestCase; - import org.hibernate.Session; import org.junit.Ignore; +import org.junit.Test; import org.junit.experimental.categories.Category; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,17 +34,16 @@ import com.gemstone.gemfire.cache.GemFireCache; import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.Region.Entry; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; +import com.gemstone.gemfire.test.junit.categories.IntegrationTest; -@Ignore("Can this test be deleted?") @Category(IntegrationTest.class) -public class SecondVMTest extends TestCase { +public class SecondVMTest { private Logger log = LoggerFactory.getLogger(getClass()); - - public void testNoop() { - - } - public void _testStartEmptyVM() throws IOException { + + @Ignore("TODO: can this test be deleted?") + @Test + public void testStartEmptyVM() throws IOException { Properties gemfireProperties = new Properties(); gemfireProperties.setProperty("mcast-port", "5555"); gemfireProperties.setProperty("log-level", "fine"); @@ -63,8 +60,10 @@ public class SecondVMTest extends TestCase { } } } - - public void _testStartVM() throws Exception { + + @Ignore("TODO: can this test be deleted?") + @Test + public void testStartVM() throws Exception { java.util.logging.Logger.getLogger("org.hibernate").setLevel(Level.ALL); Session session = HibernateJUnitTest.getSessionFactory(null).openSession(); log.info("SWAP:new session open"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d2252433/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/ExceptionHandlingJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/ExceptionHandlingJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/ExceptionHandlingJUnitTest.java index fc3c35c..c4f3f88 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/ExceptionHandlingJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/ExceptionHandlingJUnitTest.java @@ -89,7 +89,7 @@ public class ExceptionHandlingJUnitTest { } @Test - public void _testNullPointerWithGet() { + public void testNullPointerWithGet() { boolean caught = false; try { testRegion.get(null); @@ -117,7 +117,7 @@ public class ExceptionHandlingJUnitTest { } @Test - public void _testNullPointerWithPut() { + public void testNullPointerWithPut() { boolean caught = false; try { testRegion.put(null,null); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d2252433/geode-core/src/test/java/com/gemstone/gemfire/cache/query/QueryServiceJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/QueryServiceJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/QueryServiceJUnitTest.java index 0c34de7..8693de3 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/QueryServiceJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/QueryServiceJUnitTest.java @@ -29,6 +29,7 @@ import java.util.Collection; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -36,9 +37,6 @@ import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.query.data.Portfolio; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; -/** - * - */ @Category(IntegrationTest.class) public class QueryServiceJUnitTest { @@ -77,7 +75,6 @@ public class QueryServiceJUnitTest { public void testCreateIndex() throws Exception { CacheUtils.log("testCreateIndex"); QueryService qs = CacheUtils.getQueryService(); -// DebuggerSupport.waitForJavaDebugger(CacheUtils.getLogger()); Index index = qs.createIndex("statusIndex", IndexType.FUNCTIONAL,"status","/Portfolios"); try{ @@ -134,22 +131,17 @@ public class QueryServiceJUnitTest { QueryService qs = CacheUtils.getQueryService(); qs.removeIndexes(); for(int i=0;i 0 " , @@ -389,8 +392,10 @@ public class CustomerOptimizationsJUnitTest CacheUtils.compareResultsOfWithAndWithoutIndex(sr, this); } - - public void _testProjectionEvaluationDuringIndexResultsWithComplexWhereClause_UNIMPLEMENTED_1() throws QueryException { + + @Ignore("TODO") + @Test + public void testProjectionEvaluationDuringIndexResultsWithComplexWhereClause_UNIMPLEMENTED_1() throws QueryException { QueryService qs = CacheUtils.getQueryService(); Region rgn = CacheUtils.getRegion("/pos"); for(int i =100; i < 200; ++i) { @@ -466,8 +471,10 @@ public class CustomerOptimizationsJUnitTest CacheUtils.compareResultsOfWithAndWithoutIndex(sr, this); } - - public void _testProjectionEvaluationDuringIndexResultsWithComplexWhereClause_UNIMPLEMENTED_2() throws QueryException { + + @Ignore("TODO") + @Test + public void testProjectionEvaluationDuringIndexResultsWithComplexWhereClause_UNIMPLEMENTED_2() throws QueryException { QueryService qs = CacheUtils.getQueryService(); Region rgn = CacheUtils.getRegion("/pos"); for(int i =100; i < 200; ++i) { @@ -1122,8 +1129,10 @@ public class CustomerOptimizationsJUnitTest CacheUtils.compareResultsOfWithAndWithoutIndex(sr, this); } - //ideally rojection should have been evaluated while collecting index results - public void _testProjectionEvaluationOnORJunction_NOT_IMPLEMENTED() throws Exception{ + //ideally projection should have been evaluated while collecting index results + @Ignore("TODO") + @Test + public void testProjectionEvaluationOnORJunction_NOT_IMPLEMENTED() throws Exception{ QueryService qs = CacheUtils.getQueryService(); Region rgn = CacheUtils.getRegion("/pos"); for(int i =100; i < 10000; ++i) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d2252433/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/INOperatorJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/INOperatorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/INOperatorJUnitTest.java index fbc887c..2174382 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/INOperatorJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/INOperatorJUnitTest.java @@ -30,6 +30,7 @@ import java.util.Set; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -79,7 +80,9 @@ public class INOperatorJUnitTest { * Test the decomposition of IN SET(..) that gets decomposed * into ORs so an index can be used */ - public void _testInDecompositionWithFunctionalIndex() throws Exception { + @Ignore("TODO") + @Test + public void testInDecompositionWithFunctionalIndex() throws Exception { } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d2252433/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IUMRCompositeIteratorJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IUMRCompositeIteratorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IUMRCompositeIteratorJUnitTest.java index 7c627c1..ef81c30 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IUMRCompositeIteratorJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IUMRCompositeIteratorJUnitTest.java @@ -31,6 +31,7 @@ import java.util.Set; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -165,7 +166,9 @@ public class IUMRCompositeIteratorJUnitTest { } - public void _testQueryWithCompositeIter2() throws Exception { + @Ignore("TODO") + @Test + public void testQueryWithCompositeIter2() throws Exception { QueryService qs; qs = CacheUtils.getQueryService(); String queries[] = { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d2252433/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/LimitClauseJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/LimitClauseJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/LimitClauseJUnitTest.java index 5280dfb..3a8db85 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/LimitClauseJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/LimitClauseJUnitTest.java @@ -31,6 +31,7 @@ import java.util.Set; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -512,7 +513,9 @@ public class LimitClauseJUnitTest { * * Tests StructBag behaviour */ - public void xtestLimitQueryForStructBagWithRangeIndex() { + @Ignore("TODO") + @Test + public void testLimitQueryForStructBagWithRangeIndex() { try { Query query; SelectResults result; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d2252433/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MiscJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MiscJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MiscJUnitTest.java index 4bd3258..926f940 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MiscJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MiscJUnitTest.java @@ -55,6 +55,7 @@ import java.util.List; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -77,7 +78,9 @@ public class MiscJUnitTest { CacheUtils.closeCache(); } - public void xtestNestQueryInFromClause() throws Exception { + @Ignore("TODO") + @Test + public void testNestQueryInFromClause() throws Exception { Region region = CacheUtils.createRegion("Portfolios", Portfolio.class); region.put("0", new Portfolio(0)); region.put("1", new Portfolio(1)); @@ -91,7 +94,9 @@ public class MiscJUnitTest { if (!p.status.equals("active") || p.getID() != 0) fail(query.getQueryString()); } - public void xtestNestQueryInWhereClause() throws Exception { + @Ignore("TODO") + @Test + public void testNestQueryInWhereClause() throws Exception { Region region = CacheUtils.createRegion("Portfolios", Portfolio.class); region.put("0", new Portfolio(0)); region.put("1", new Portfolio(1)); @@ -119,7 +124,9 @@ public class MiscJUnitTest { // DISTINCT * FROM /Portfolios p where p.ID = x.ID).status } - public void xtestVoidMethods() throws Exception { + @Ignore("TODO") + @Test + public void testVoidMethods() throws Exception { Region region = CacheUtils.createRegion("Data", Data.class); region.put("0", new Data()); Query query = CacheUtils.getQueryService().newQuery("SELECT DISTINCT * FROM /Data where voidMethod"); @@ -130,7 +137,9 @@ public class MiscJUnitTest { if (result.size() != 1) fail(query.getQueryString()); } - public void xtestMiscQueries() throws Exception { + @Ignore("TODO") + @Test + public void testMiscQueries() throws Exception { String testData[] = { "NULL", "UNDEFINED"}; for (int i = 0; i < testData.length; i++) { Query query = CacheUtils.getQueryService().newQuery("SELECT DISTINCT * FROM " + testData[i]); @@ -139,7 +148,9 @@ public class MiscJUnitTest { } } - public void xtestBug32763() throws FunctionDomainException, TypeMismatchException, NameResolutionException, + @Ignore("TODO") + @Test + public void testBug32763() throws FunctionDomainException, TypeMismatchException, NameResolutionException, QueryInvocationTargetException, TimeoutException, CacheWriterException { Region region = CacheUtils.createRegion("pos", Portfolio.class); @@ -352,7 +363,9 @@ public class MiscJUnitTest { * Tests the where clause formed with CompiledComparison nesting * @throws Exception */ - public void _testBug40333_InPartitionedRegion_1() throws Exception { + @Ignore("TODO") + @Test + public void testBug40333_InPartitionedRegion_1() throws Exception { CacheUtils.startCache(); final Cache cache = CacheUtils.getCache(); AttributesFactory attributesFactory = new AttributesFactory(); @@ -391,7 +404,9 @@ public class MiscJUnitTest { * Tests the where clause formed with CompiledComparison nesting with CompiledIN * @throws Exception */ - public void _testBug40333_InPartitionedRegion_2() throws Exception { + @Ignore("TODO") + @Test + public void testBug40333_InPartitionedRegion_2() throws Exception { CacheUtils.startCache(); final Cache cache = CacheUtils.getCache(); AttributesFactory attributesFactory = new AttributesFactory(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d2252433/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MultiRegionIndexUsageJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MultiRegionIndexUsageJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MultiRegionIndexUsageJUnitTest.java index 4b6071c..9520889 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MultiRegionIndexUsageJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MultiRegionIndexUsageJUnitTest.java @@ -33,6 +33,7 @@ import java.util.Set; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -223,8 +224,9 @@ public class MultiRegionIndexUsageJUnitTest { }// end of test - //@Test - public void _testChangedFormClauseOrder2() throws Exception { + @Ignore("TODO") + @Test + public void testChangedFormClauseOrder2() throws Exception { CacheUtils .log("------------- testChangedFormClauseOrder2 start------------- "); SelectResults rs[][] = new SelectResults[1][2]; @@ -622,8 +624,9 @@ public class MultiRegionIndexUsageJUnitTest { }// end of test - //@Test - public void _testFunctionUse2() throws Exception { + @Ignore("TODO") + @Test + public void testFunctionUse2() throws Exception { CacheUtils.log("------------- testFunctionUse2 start------------- "); SelectResults rs[][] = new SelectResults[1][2]; // Test Case No. IUMR019 http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d2252433/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NestedQueryJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NestedQueryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NestedQueryJUnitTest.java index 11dcb0e..528e67e 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NestedQueryJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NestedQueryJUnitTest.java @@ -37,6 +37,7 @@ import junit.framework.AssertionFailedError; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -90,7 +91,9 @@ public class NestedQueryJUnitTest { CacheUtils.closeCache(); } - public void atestQueries() throws Exception{ + @Ignore("TODO") + @Test + public void testQueries_TODO() throws Exception{ String queryString; Query query; Object result; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d2252433/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/ResultsDataSerializabilityJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/ResultsDataSerializabilityJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/ResultsDataSerializabilityJUnitTest.java index cb45bad..0327343 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/ResultsDataSerializabilityJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/ResultsDataSerializabilityJUnitTest.java @@ -35,6 +35,7 @@ import java.util.List; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -116,7 +117,9 @@ public class ResultsDataSerializabilityJUnitTest { // network. Hence a dunit test is required for testing this functionality. /* test DataSerializability of a simple query result */ - public void _testDataSerializability() throws Exception { + @Ignore("TODO") + @Test + public void testDataSerializability() throws Exception { Region region = CacheUtils.createRegion("Portfolios", Portfolio.class); for(int i = 0; i < 10000; i++) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d2252433/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/CompiledJunctionInternalsJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/CompiledJunctionInternalsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/CompiledJunctionInternalsJUnitTest.java index c3e1a45..4190b19 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/CompiledJunctionInternalsJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/CompiledJunctionInternalsJUnitTest.java @@ -36,6 +36,7 @@ import java.util.Set; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -75,7 +76,7 @@ public class CompiledJunctionInternalsJUnitTest { /************************************************* AND JUNCTION TESTS. -RangeJunction related tests when part of GroupJunction, +RangeJunction related tests when part of GroupJunction, CompositeGroupJunction or AllGroupJunction **************************************************/ @@ -1329,7 +1330,9 @@ RangeJunction related tests when part of GroupJunction, * Tests the creation of a single RangeJunction if the CompiledJunction only * contains same index condition without iter operand for OR */ - public void _testOrganizedOperandsSingleRangeJunctionCreationWithNoIterOperandForOR() { + @Ignore("TODO") + @Test + public void testOrganizedOperandsSingleRangeJunctionCreationWithNoIterOperandForOR() { LogWriter logger = CacheUtils.getLogger(); try { CompiledComparison cv[] = null; @@ -2664,7 +2667,9 @@ RangeJunction related tests when part of GroupJunction, * NotEqualConditionEvaluator. * */ - public void _testNotEqualCoupledWithUndefinedAndNotNull() { + @Ignore("TODO") + @Test + public void testNotEqualCoupledWithUndefinedAndNotNull() { LogWriter logger = CacheUtils.getLogger(); try { ExecutionContext context = new QueryExecutionContext(null, CacheUtils http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d2252433/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/QCompilerJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/QCompilerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/QCompilerJUnitTest.java index bcf0b65..5cc4acf 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/QCompilerJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/QCompilerJUnitTest.java @@ -31,6 +31,7 @@ import java.util.TreeMap; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -46,6 +47,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest; public class QCompilerJUnitTest { QueryExecutionContext context = new QueryExecutionContext(null, null); + @Test public void testStringConditioningForLike_1() { String s1 = "abc%"; @@ -346,7 +348,9 @@ public class QCompilerJUnitTest { * this the Like predicate is not transformed to compiled-junction * with > and < operator. */ - public void XtestStringConditioningForLike_2() { + @Ignore("TODO") + @Test + public void testStringConditioningForLike_2() { CompiledValue var = new CompiledPath(new CompiledID("p"), "ID"); String s1 = "abc%"; CompiledLiteral literal = new CompiledLiteral(s1); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d2252433/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexMaintainceJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexMaintainceJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexMaintainceJUnitTest.java index 3ee758b..138bb09 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexMaintainceJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexMaintainceJUnitTest.java @@ -30,6 +30,7 @@ import java.util.Collection; import org.junit.After; import org.junit.Before; import org.junit.FixMethodOrder; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runners.MethodSorters; @@ -218,8 +219,9 @@ public class IndexMaintainceJUnitTest { // !!!:ezoerner:20081030 disabled because modifying an object in place // and then putting it back into the cache breaks a CompactRangeIndex. - // @todo file a ticket on this issue - public void _test002UpdateEntry() throws Exception { + @Ignore("TODO:ezoerner:20081030 disabled because modifying an object in place and then putting it back into the cache breaks a CompactRangeIndex") + @Test + public void test002UpdateEntry() throws Exception { IndexStatistics stats = index.getStatistics(); CacheUtils.log(((CompactRangeIndex) index).dump()); Portfolio p = (Portfolio) region.get("4"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d2252433/geode-core/src/test/java/com/gemstone/gemfire/cache/query/transaction/QueryAndJtaJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/transaction/QueryAndJtaJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/transaction/QueryAndJtaJUnitTest.java index 162ffb1..9e8b7f6 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/transaction/QueryAndJtaJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/transaction/QueryAndJtaJUnitTest.java @@ -33,6 +33,7 @@ import javax.transaction.UserTransaction; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -410,11 +411,12 @@ public class QueryAndJtaJUnitTest { assertEquals(0, ((SelectResults) q.execute()).size()); } - /* + /** * Enable this test when indexes are made transactional. */ - //@Test - public void _testFailedIndexUpdateOnJTACommitForPut() throws Exception { + @Ignore("TODO") + @Test + public void testFailedIndexUpdateOnJTACommitForPut() throws Exception { Person.THROW_ON_INDEX = true; AttributesFactory af = new AttributesFactory(); af.setDataPolicy(DataPolicy.REPLICATE); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d2252433/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java index 827091f..6ad6f53 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java @@ -36,6 +36,7 @@ import java.util.logging.Level; import org.junit.After; import org.junit.Assert; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -285,7 +286,9 @@ public class InternalDistributedSystemJUnitTest * * @deprecated This test creates a "loner" distributed system */ - public void _testEmptyLocators() { + @Ignore("TODO") + @Test + public void testEmptyLocators() { Properties props = new Properties(); props.put(DistributionConfig.MCAST_PORT_NAME, String.valueOf(0)); props.put(DistributionConfig.LOCATORS_NAME, ""); @@ -390,11 +393,13 @@ public class InternalDistributedSystemJUnitTest } /** - * @deprecated This test cannot be run because the + * This test cannot be run because the * gemfire.ack-wait-threshold system property is set on this VM, * thus overriding the value passed into the API. */ - public void _testGetAckWaitThreshold() { + @Ignore("TODO: This test cannot be run because the gemfire.ack-wait-threshold system property is set on this VM, thus overriding the value passed into the API. Use ProvideSystemProperty Rule.") + @Test + public void testGetAckWaitThreshold() { String time = String.valueOf(DistributionConfig.MIN_ACK_WAIT_THRESHOLD); Properties props = new Properties(); // a loner is all this test needs @@ -406,11 +411,13 @@ public class InternalDistributedSystemJUnitTest } /** - * @deprecated This test cannot be run because the + * This test cannot be run because the * gemfire.ack-wait-threshold system property is set on this VM, * thus overriding the value passed into the API. */ - public void _testInvalidAckWaitThreshold() { + @Ignore("TODO: This test cannot be run because the gemfire.ack-wait-threshold system property is set on this VM, thus overriding the value passed into the API. Use ProvideSystemProperty Rule.") + @Test + public void testInvalidAckWaitThreshold() { Properties props = new Properties(); props.put(DistributionConfig.ACK_WAIT_THRESHOLD_NAME, "blah"); try { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d2252433/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug34179TooManyFilesOpenJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug34179TooManyFilesOpenJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug34179TooManyFilesOpenJUnitTest.java deleted file mode 100644 index 4eea76d..0000000 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug34179TooManyFilesOpenJUnitTest.java +++ /dev/null @@ -1,130 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.gemstone.gemfire.internal.cache; - -import static org.junit.Assert.fail; - -import java.io.File; -import java.util.Arrays; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import static org.junit.Assert.*; - -import com.gemstone.gemfire.LogWriter; -import com.gemstone.gemfire.test.junit.categories.IntegrationTest; - - -/** - * Disk region perf test for Persist only with Async writes and Buffer. - * Set Rolling oplog to true and setMaxOplogSize to 10240 - * - * If more than some number of files are open, an Exception is thrown. This ia JDK 1.4 bug. This - * test should be run after transition to JDK 1.5 to verify that the bug does not exceed. - * - * The disk properties will ensure that very many oplog files are created. - * - * This test is currently not being executed and is marked with an underscore - * - */ -@Category(IntegrationTest.class) -public class Bug34179TooManyFilesOpenJUnitTest extends DiskRegionTestingBase -{ - - LogWriter log = null; - - DiskRegionProperties diskProps = new DiskRegionProperties(); - - @Before - public void setUp() throws Exception - { - super.setUp(); - File file1 = new File("testingDirectory/" + getName()+ "1"); - file1.mkdir(); - file1.deleteOnExit(); - dirs = new File[1]; - dirs[0] = file1; - diskProps.setDiskDirs(dirs); - - diskProps.setPersistBackup(true); - diskProps.setTimeInterval(15000l); - diskProps.setBytesThreshold(10000l); - diskProps.setRolling(true); - //set max oplog size as 10 kb - diskProps.setMaxOplogSize(10240); - region = DiskRegionHelperFactory.getAsyncPersistOnlyRegion(cache,diskProps); - - log = ds.getLogWriter(); - } - - @After - public void tearDown() throws Exception - { - super.tearDown(); - - } - - - private static int ENTRY_SIZE = 1024; - - private static int OP_COUNT = 100000; - - /** - * currently not being executed for congo but after transition to JDK 1.5, this test should be executed. - * - */ - public void _testPopulate1kbwrites() - { - try { - final byte[] value = new byte[ENTRY_SIZE]; - Arrays.fill(value, (byte)77); - for (int i = 0; i < OP_COUNT; i++) { - region.put(new Integer(i), value); - } - closeDown(); // closes disk file which will flush all buffers - } - catch (Exception ex) { - fail("IOException occured due to " + ex); - } - - } - /** - * cleans all the directory of all the files present in them - * - */ - protected static void deleteFiles() - { - for (int i = 0; i < dirs.length; i++) { - File[] files = dirs[i].listFiles(); - for (int j = 0; j < files.length; j++) { - files[j].delete(); - } - } - } - - @Test - public void testDoNothing(){ - //dummy method to ensure at least one test is present in this file if the other tests are commented - } - - -}// end of Bug34179TooManyFilesOpenJUnitTest - http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d2252433/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java index 9df2468..8d96274 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java @@ -27,6 +27,7 @@ import java.util.Properties; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -308,35 +309,4 @@ public class LIFOEvictionAlgoEnabledRegionJUnitTest { fail("Test failed"); } } - /** - * This test does the following :
- * 1)Verify Entry value after faultin should be byte []
- */ - // not using it. added as may needed if functionality gets added - public void _testFaultInEntryValueShouldbeSerialized() { - try { - assertNotNull(cache); - LocalRegion rgn = (LocalRegion)cache.getRegion(Region.SEPARATOR + regionName); - assertNotNull(rgn); - - assertEquals("Region is not properly cleared ", 0, rgn.size()); - assertTrue("Entry count not 0 ", new Long(0).equals(new Long(lifoStats - .getCounter()))); - // put eight entries into the region - for (int i = 0; i < 8; i++) { - rgn.put(new Long(i), new Long(i)); - } - - // assert for value should be Byte Array - // here value is not delivered to client and should be get deserialized - // value in region should be serialized form - assertTrue("FaultIn Value in not a byte Array ",rgn.get(new Long(6)) instanceof byte[]); - - } - catch (Exception ex) { - ex.printStackTrace(); - fail("Test failed"); - } - } } - http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d2252433/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OplogJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OplogJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OplogJUnitTest.java index d1be04d..df11f78 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OplogJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OplogJUnitTest.java @@ -2442,62 +2442,6 @@ public class OplogJUnitTest extends DiskRegionTestingBase { } /** - * Tests if the preblowing of a file with size greater than the disk space - * available so that preblowing results in IOException , is able to recover - * without problem - * - */ - //Now we preallocate spaces for if files and also crfs and drfs. So the below test is not valid - // any more. See revision: r42359 and r42320. So disabling this test. - public void _testPreblowErrorCondition() - { - DiskStoreFactory dsf = cache.createDiskStoreFactory(); - ((DiskStoreFactoryImpl)dsf).setMaxOplogSizeInBytes(100000000L * 1024L * 1024L * 1024L); - dsf.setAutoCompact(false); - File dir = new File("testingDirectoryDefault"); - dir.mkdir(); - dir.deleteOnExit(); - File[] dirs = { dir }; - int size[] = new int[] { Integer.MAX_VALUE }; - dsf.setDiskDirsAndSizes(dirs, size); - AttributesFactory factory = new AttributesFactory(); - logWriter.info("" - + "Could not pregrow" - + ""); - try { - DiskStore ds = dsf.create("test"); - factory.setDiskStoreName(ds.getName()); - factory.setDiskSynchronous(true); - factory.setDataPolicy(DataPolicy.PERSISTENT_REPLICATE); - factory.setScope(Scope.LOCAL); - try { - region = cache.createVMRegion("test", factory.createRegionAttributes()); - } - catch (Exception e1) { - logWriter.error("Test failed due to exception", e1); - fail("Test failed due to exception " + e1); - - } - region.put("key1", new byte[900]); - byte[] val = null; - try { - val = (byte[])((LocalRegion)region).getValueOnDisk("key1"); - } - catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - fail(e.toString()); - } - assertTrue(val.length == 900); - } finally { - logWriter.info("" - + "Could not pregrow" - + ""); - } - closeDown(); - } - - /** * Tests if the byte buffer pool in asynch mode tries to contain the pool size * */ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d2252433/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/BlockingHARegionJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/BlockingHARegionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/BlockingHARegionJUnitTest.java index 4b36b79..a97b1d7 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/BlockingHARegionJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/BlockingHARegionJUnitTest.java @@ -240,101 +240,6 @@ public class BlockingHARegionJUnitTest } /** - * This test tests that the region capacity is never exceeded even in highly - * concurrent environments. The region capacity is set to 10000. Then 5 threads start doing - * put simultaneously. They will reach a state where the queue is full and they will all - * go in a wait state. the region size would be verified to be 20000 (10000 puts and 10000 DACE objects). - * then the threads are interrupted and made to quit the loop - * - *TODO: - * - */ - public void _testConcurrentPutsTakesNotExceedingLimit() - { - try { - exceptionOccured = false; - quitForLoop = false; - HARegionQueueAttributes harqa = new HARegionQueueAttributes(); - harqa.setBlockingQueueCapacity(10000); - final HARegionQueue hrq = HARegionQueue.getHARegionQueueInstance( - "BlockingHARegionJUnitTest_Region", cache, harqa, - HARegionQueue.BLOCKING_HA_QUEUE, false); - Thread thread1 = new DoPuts(hrq,40000,1); - Thread thread2 = new DoPuts(hrq,40000,2); - Thread thread3 = new DoPuts(hrq,40000,3); - Thread thread4 = new DoPuts(hrq,40000,4); - Thread thread5 = new DoPuts(hrq,40000,5); - - Thread thread6 = new DoTake(hrq,5000); - Thread thread7 = new DoTake(hrq,5000); - Thread thread8 = new DoTake(hrq,5000); - Thread thread9 = new DoTake(hrq,5000); - Thread thread10 = new DoTake(hrq,5000); - - thread1.start(); - thread2.start(); - thread3.start(); - thread4.start(); - thread5.start(); - - thread6.start(); - thread7.start(); - thread8.start(); - thread9.start(); - thread10.start(); - - ThreadUtils.join(thread6, 30 * 1000); - ThreadUtils.join(thread7, 30 * 1000); - ThreadUtils.join(thread8, 30 * 1000); - ThreadUtils.join(thread9, 30 * 1000); - ThreadUtils.join(thread10, 30 * 1000); - - WaitCriterion ev = new WaitCriterion() { - public boolean done() { - return hrq.region.size() == 20000; - } - public String description() { - return null; - } - }; - Wait.waitForCriterion(ev, 30 * 1000, 200, true); - - assertTrue(thread1.isAlive()); - assertTrue(thread2.isAlive()); - assertTrue(thread3.isAlive()); - assertTrue(thread4.isAlive()); - assertTrue(thread5.isAlive()); - - assertTrue(hrq.region.size()==20000); - - quitForLoop = true; - - Thread.sleep(2000); - - thread1.interrupt(); - thread2.interrupt(); - thread3.interrupt(); - thread4.interrupt(); - thread5.interrupt(); - - Thread.sleep(2000); - - - ThreadUtils.join(thread1, 30 * 1000); - ThreadUtils.join(thread2, 30 * 1000); - ThreadUtils.join(thread3, 30 * 1000); - ThreadUtils.join(thread4, 30 * 1000); - ThreadUtils.join(thread5, 30 * 1000); - - cache.close(); - } - catch (Exception e) { - fail(" Test encountered an exception "+e); - } - } - - - /** * Tests the bug in HARegionQueue where the take side put permit is not being * incremented when the event arriving at the queue which has optimistically * decreased the put permit, is not incrementing the take permit if the event http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d2252433/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/BlockingHARegionQueueJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/BlockingHARegionQueueJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/BlockingHARegionQueueJUnitTest.java index ffb4771..0d61bca 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/BlockingHARegionQueueJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/BlockingHARegionQueueJUnitTest.java @@ -23,6 +23,7 @@ import static org.junit.Assert.fail; import java.io.IOException; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -166,46 +167,39 @@ public class BlockingHARegionQueueJUnitTest extends HARegionQueueJUnitTest /** * Test Scenario :Blocking Queue capacity is 1. The first put should be * successful.The second put should block till the first put expires. - * */ //fix for 40314 - capacity constraint is checked for primary only and //expiry is not applicable on primary so marking this test as invalid. - public void _testBlockingPutAndExpiry() - { - try { - HARegionQueueAttributes hrqa = new HARegionQueueAttributes(); - hrqa.setBlockingQueueCapacity(1); - hrqa.setExpiryTime(4); - final HARegionQueue hrq = this.createHARegionQueue( - "testBlockingPutAndExpiry", hrqa); - - EventID id1 = new EventID(new byte[] { 1 }, 1, 1); - hrq.put(new ConflatableObject("key1", "val1", id1, false, "testing")); - Thread t1 = new Thread(new Runnable() { - public void run() - { - try { - EventID id2 = new EventID(new byte[] { 1 }, 1, 2); - hrq - .put(new ConflatableObject("key1", "val2", id2, false, - "testing")); - } - catch (Exception e) { - encounteredException = true; - } - } - }); - t1.start(); - Thread.sleep(2000); - assertTrue("put-thread expected to blocked, but was not ", t1.isAlive()); - Thread.sleep(2500); - assertFalse("Put-thread blocked unexpectedly", t1.isAlive()); - assertFalse("Exception occured in put-thread", encounteredException); + @Ignore("TODO") + @Test + public void testBlockingPutAndExpiry() throws Exception { + HARegionQueueAttributes hrqa = new HARegionQueueAttributes(); + hrqa.setBlockingQueueCapacity(1); + hrqa.setExpiryTime(4); + final HARegionQueue hrq = this.createHARegionQueue( + "testBlockingPutAndExpiry", hrqa); - } - catch (Exception e) { - e.printStackTrace(); - fail("Test failed because of exception " + e); - } + EventID id1 = new EventID(new byte[] { 1 }, 1, 1); + hrq.put(new ConflatableObject("key1", "val1", id1, false, "testing")); + Thread t1 = new Thread(new Runnable() { + public void run() + { + try { + EventID id2 = new EventID(new byte[] { 1 }, 1, 2); + hrq + .put(new ConflatableObject("key1", "val2", id2, false, + "testing")); + } + catch (Exception e) { + encounteredException = true; + } + } + }); + t1.start(); + Thread.sleep(2000); + assertTrue("put-thread expected to blocked, but was not ", t1.isAlive()); + Thread.sleep(2500); + assertFalse("Put-thread blocked unexpectedly", t1.isAlive()); + assertFalse("Exception occurred in put-thread", encounteredException); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d2252433/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQAddOperationJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQAddOperationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQAddOperationJUnitTest.java index 1c7b0d0..3d49979 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQAddOperationJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQAddOperationJUnitTest.java @@ -25,6 +25,7 @@ import java.util.Properties; import org.apache.logging.log4j.Logger; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -1144,10 +1145,10 @@ public class HARQAddOperationJUnitTest /** * Behaviour of take() has been changed for relaible messaging feature. Region queue take() * operation will no longer add to the Dispatch Message Map. Hence disabling the test - SUYOG - */ - - public void _testDispatchedMsgsMapUpdateOnTakes() throws Exception - { + */ + @Ignore("TODO") + @Test + public void testDispatchedMsgsMapUpdateOnTakes() throws Exception { this.logWriter .info("HARQAddOperationJUnitTest : testDispatchedEventsMapUpdateOnTakes BEGIN"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d2252433/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueJUnitTest.java index b7fae40..0c2e900 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueJUnitTest.java @@ -38,6 +38,7 @@ import junit.framework.Assert; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -1974,7 +1975,9 @@ public class HARegionQueueJUnitTest * Test is commented as assertion for sequence violation is removed in the * source(HARegionQueue.putObject) is removed. - Suyog */ - public void _testExceptionInPutForSequenceViolationWithoutGII() { + @Ignore("TODO") + @Test + public void testExceptionInPutForSequenceViolationWithoutGII() { DistributedSystem ds = cache.getDistributedSystem(); cache.close(); ds.disconnect(); @@ -2011,7 +2014,7 @@ public class HARegionQueueJUnitTest try{ rq.put(cf2); - fail("Test failed because asertion error was expected but there was'nt any"); + fail("Test failed because assertion error was expected but there was'nt any"); }catch(AssertionError ignore) { System.out.println("Got the right assertion failure"); }catch(Exception e) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d2252433/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java index cfe4d67..d6180a5 100755 --- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java @@ -1056,15 +1056,15 @@ public class DurableClientTestCase extends DistributedTestCase { } @Ignore("This test is failing inconsistently, see bug 51258") - public void DISABLED_testDurableNonHAFailover() throws InterruptedException - { - durableFailover(0); - durableFailoverAfterReconnect(0); + @Test + public void testDurableNonHAFailover() throws InterruptedException { + durableFailover(0); + durableFailoverAfterReconnect(0); } @Ignore("This test is failing inconsistently, see bug 51258") - public void DISABLED_testDurableHAFailover() throws InterruptedException - { + @Test + public void testDurableHAFailover() throws InterruptedException { //Clients see this when the servers disconnect IgnoredException.addIgnoredException("Could not find any server"); durableFailover(1);