From 164d4e0884049a39a231aa60ac88c5cd173e1537 Mon Sep 17 00:00:00 2001 From: gmeilen Date: Fri, 1 Jul 2016 11:46:44 -0700 Subject: [PATCH] GEODE-1452: annotate disabled tests with @Ignore and rename --- .../gemfire/modules/HibernateJUnitTest.java | 11 +- .../cache/ClientServerTimeSyncDUnitTest.java | 12 +- .../ExceptionHandlingJUnitTest.java | 6 +- .../BaseLineAndCompareQueryPerfJUnitTest.java | 1 - .../cache/query/QueryServiceJUnitTest.java | 7 +- .../QueryParamsAuthorizationDUnitTest.java | 7 +- .../CustomerOptimizationsJUnitTest.java | 23 ++-- .../query/functional/INOperatorJUnitTest.java | 5 +- .../IUMRCompositeIteratorJUnitTest.java | 5 +- .../functional/LimitClauseJUnitTest.java | 5 +- .../MultiRegionIndexUsageJUnitTest.java | 11 +- .../ResultsDataSerializabilityJUnitTest.java | 5 +- .../CompiledJunctionInternalsJUnitTest.java | 9 +- .../query/internal/QCompilerJUnitTest.java | 5 +- .../index/IndexMaintainceJUnitTest.java | 5 +- .../IndexTrackingQueryObserverDUnitTest.java | 9 +- ...PRBasicIndexCreationDeadlockDUnitTest.java | 6 +- .../transaction/QueryAndJtaJUnitTest.java | 6 +- .../ConcurrentLeaveDuringGIIDUnitTest.java | 109 ++++++++-------- .../gemfire/cache30/ReconnectDUnitTest.java | 5 +- .../DistributedLockServiceDUnitTest.java | 5 +- .../InternalDistributedSystemJUnitTest.java | 13 +- .../gemfire/disttx/DistTXDebugDUnitTest.java | 3 +- .../DistributedTransactionDUnitTest.java | 5 +- .../ClientServerTransactionDUnitTest.java | 14 ++- .../cache/GIIFlowControlDUnitTest.java | 9 +- ...IFOEvictionAlgoEnabledRegionJUnitTest.java | 5 +- .../control/RebalanceOperationDUnitTest.java | 5 +- ...erverRegionFunctionExecutionDUnitTest.java | 7 +- .../cache/execute/PRTransactionDUnitTest.java | 5 +- .../ha/BlockingHARegionQueueJUnitTest.java | 5 +- .../cache/ha/HARQAddOperationJUnitTest.java | 5 +- .../cache/partitioned/Bug51400DUnitTest.java | 8 +- .../PersistentPartitionedRegionDUnitTest.java | 7 +- .../PersistentRVVRecoveryDUnitTest.java | 5 +- .../tier/sockets/AcceptorImplJUnitTest.java | 118 ++---------------- .../CacheServerTransactionsDUnitTest.java | 5 +- .../sockets/ConnectionProxyJUnitTest.java | 21 ++-- .../InstantiatorPropagationDUnitTest.java | 2 +- .../cache/query/cq/dunit/CqPerfDUnitTest.java | 9 +- .../cq/dunit/CqPerfUsingPoolDUnitTest.java | 9 +- .../CacheServerManagementDUnitTest.java | 5 +- ...lelGatewaySenderOperation_1_DUnitTest.java | 5 +- .../ConcurrentWANPropogation_2_DUnitTest.java | 5 +- .../cache/wan/misc/PDXNewWanDUnitTest.java | 6 +- ...egion_ParallelWANPersistenceDUnitTest.java | 22 ++-- ...egion_ParallelWANPropogationDUnitTest.java | 53 ++++++-- .../wan/misc/WANConfigurationJUnitTest.java | 5 +- .../wan/misc/WanAutoDiscoveryDUnitTest.java | 11 +- .../wan/misc/WanValidationsDUnitTest.java | 46 +++---- ...sistenceEnabledGatewaySenderDUnitTest.java | 13 +- .../ParallelWANPropagationDUnitTest.java | 5 +- .../parallel/ParallelWANStatsDUnitTest.java | 4 +- ...alGatewaySenderEventListenerDUnitTest.java | 9 +- 54 files changed, 383 insertions(+), 323 deletions(-) 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 d2802c66ef55..223a33beed49 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 @@ -28,6 +28,7 @@ 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; @@ -132,7 +133,7 @@ public void testpreload() { } @Test - public void testNothing() throws Exception { + public void testSomething() throws Exception { java.util.logging.Logger.getLogger("org.hibernate").setLevel(Level.ALL); log.info("SWAP:creating session factory In hibernateTestCase"); @@ -197,7 +198,9 @@ public void testNothing() throws Exception { } - public void _testInvalidation() { + @Ignore + @Test + public void testInvalidation() { Session s = getSessionFactory(null).openSession(); } @@ -278,7 +281,9 @@ public void testRelationship() throws Exception { // log.info(aPerson.getEvents()+""); } - public void _testQueryCache() throws Exception { + @Ignore + @Test + public void testQueryCache() throws Exception { Session session = getSessionFactory(null).openSession(); Query q = session.createQuery("from Event"); q.setCacheable(true); diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java index 3267d3eb35d1..635fd65e8efd 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java @@ -46,7 +46,8 @@ public ClientServerTimeSyncDUnitTest() { } @Ignore("Bug 52327") - public void DISABLED_testClientTimeAdvances() { + @Test + public void testClientTimeAdvances() { Host host = Host.getHost(0); VM vm0 = host.getVM(0); // Server VM vm1 = host.getVM(1); // Client @@ -117,14 +118,11 @@ public String description() { vm1.invoke(() -> CacheTestCase.disconnectFromDS()); } } - - @Test - public void testNothing() { - // place-holder to keep dunit runner from barfing - } + @Ignore("not yet implemented") - public void DISABLED_testClientTimeSlowsDown() { + @Test + public void testClientTimeSlowsDown() { Host host = Host.getHost(0); VM vm0 = host.getVM(0); // Server VM vm1 = host.getVM(1); // Client 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 5ccb951713a7..e63e2672ad94 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 @@ -80,8 +80,9 @@ public void testNullPointerWithContainsValue() { } } + @Ignore @Test - public void _testNullPointerWithGet() { + public void testNullPointerWithGet() { boolean caught = false; try { testRegion.get(null); @@ -108,8 +109,9 @@ public void testNullPointerWithRemove() { } } + @Ignore @Test - public void _testNullPointerWithPut() { + public void testNullPointerWithPut() { boolean caught = false; try { testRegion.put(null,null); diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/BaseLineAndCompareQueryPerfJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/BaseLineAndCompareQueryPerfJUnitTest.java index ccfc72d30d00..58e5fd8551ca 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/BaseLineAndCompareQueryPerfJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/BaseLineAndCompareQueryPerfJUnitTest.java @@ -233,7 +233,6 @@ public void testPerf() throws Exception{ printSummary(); }//end of testPerf - //public void testPerfWithIndex(){}//end of testPerfWithIndex /** * Get the performance of Range query in an AND junction. 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 0c34de7d7655..48bff1bbe1b1 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 org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -161,8 +162,10 @@ private void runCreateIndexTests(Object testData[][]) throws Exception{ //CacheUtils.log(""); } } - - public void atestGetIndex() throws Exception{ + + @Ignore + @Test + public void testGetIndex() throws Exception{ CacheUtils.log("testGetIndex"); QueryService qs = CacheUtils.getQueryService(); Object testData[][] ={ diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java index fc8b5bfd2545..a8ef1494e12d 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java @@ -60,12 +60,9 @@ public QueryParamsAuthorizationDUnitTest() { super(); } - @Test - public void testNothing() { - // remove when Bug #51079 is fixed - } @Ignore("Bug 51079") - public void DISABLED_testQueryParamsInAuthCallback() throws Exception { + @Test + public void testQueryParamsInAuthCallback() throws Exception { final Host host = Host.getHost(0); final VM server1 = host.getVM(0); final VM client = host.getVM(1); diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/CustomerOptimizationsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/CustomerOptimizationsJUnitTest.java index 26e3affcfd6b..a31ca1ccd20d 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/CustomerOptimizationsJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/CustomerOptimizationsJUnitTest.java @@ -24,6 +24,7 @@ import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -106,8 +107,10 @@ public void afterQueryEvaluation(Object result) CacheUtils.compareResultsOfWithAndWithoutIndex(sr, this); } - - public void _testProjectionEvaluationDuringIndexResults_UNIMPLEMENTED() throws QueryException { + + @Ignore + @Test + public void testProjectionEvaluationDuringIndexResults_UNIMPLEMENTED() throws QueryException { QueryService qs = CacheUtils.getQueryService(); String[] queries = new String[] { "select p.status from /pos p, p.positions pos where p.ID > 0 " , @@ -389,8 +392,10 @@ public void afterQueryEvaluation(Object result) CacheUtils.compareResultsOfWithAndWithoutIndex(sr, this); } - - public void _testProjectionEvaluationDuringIndexResultsWithComplexWhereClause_UNIMPLEMENTED_1() throws QueryException { + + @Ignore + @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 void afterQueryEvaluation(Object result) CacheUtils.compareResultsOfWithAndWithoutIndex(sr, this); } - - public void _testProjectionEvaluationDuringIndexResultsWithComplexWhereClause_UNIMPLEMENTED_2() throws QueryException { + + @Ignore + @Test + public void testProjectionEvaluationDuringIndexResultsWithComplexWhereClause_UNIMPLEMENTED_2() throws QueryException { QueryService qs = CacheUtils.getQueryService(); Region rgn = CacheUtils.getRegion("/pos"); for(int i =100; i < 200; ++i) { @@ -1123,7 +1130,9 @@ public void afterQueryEvaluation(Object result) } //ideally rojection should have been evaluated while collecting index results - public void _testProjectionEvaluationOnORJunction_NOT_IMPLEMENTED() throws Exception{ + @Ignore + @Test + public void testProjectionEvaluationOnORJunction_NOT_IMPLEMENTED() throws Exception{ QueryService qs = CacheUtils.getQueryService(); Region rgn = CacheUtils.getRegion("/pos"); for(int i =100; i < 10000; ++i) { 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 fbc887ce0e9f..f4ba11da9d10 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 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 void tearDown() throws Exception { * Test the decomposition of IN SET(..) that gets decomposed * into ORs so an index can be used */ - public void _testInDecompositionWithFunctionalIndex() throws Exception { + @Ignore + @Test + public void testInDecompositionWithFunctionalIndex() throws Exception { } 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 7c627c129977..070d500c00cd 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 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 void testQueryWithCompositeIter1() throws Exception { } - public void _testQueryWithCompositeIter2() throws Exception { + @Ignore + @Test + public void testQueryWithCompositeIter2() throws Exception { QueryService qs; qs = CacheUtils.getQueryService(); String queries[] = { 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 5280dfb273a0..c46f9645282b 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 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 void afterIterationEvaluation(Object result) { * * Tests StructBag behaviour */ - public void xtestLimitQueryForStructBagWithRangeIndex() { + @Ignore + @Test + public void testLimitQueryForStructBagWithRangeIndex() { try { Query query; SelectResults result; 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 6097be783d88..c57cb5ca11b0 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 @@ -31,6 +31,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -202,8 +203,9 @@ public void testChangedFormClauseOrder1() throws Exception { }// end of test - //@Test - public void _testChangedFormClauseOrder2() throws Exception { + @Ignore + @Test + public void testChangedFormClauseOrder2() throws Exception { CacheUtils .log("------------- testChangedFormClauseOrder2 start------------- "); SelectResults rs[][] = new SelectResults[1][2]; @@ -601,8 +603,9 @@ public void testFunctionUse1() throws Exception { }// end of test - //@Test - public void _testFunctionUse2() throws Exception { + @Ignore + @Test + public void testFunctionUse2() throws Exception { CacheUtils.log("------------- testFunctionUse2 start------------- "); SelectResults rs[][] = new SelectResults[1][2]; // Test Case No. IUMR019 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 cb45bad86b9d..6d4a3e0e7282 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 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 void testImplementsDataSerializable() throws Exception { // network. Hence a dunit test is required for testing this functionality. /* test DataSerializability of a simple query result */ - public void _testDataSerializability() throws Exception { + @Ignore + @Test + public void testDataSerializability() throws Exception { Region region = CacheUtils.createRegion("Portfolios", Portfolio.class); for(int i = 0; i < 10000; i++) { 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 c3e1a459804a..1f45ebb98278 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 org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -1329,7 +1330,9 @@ public void testOrganizedOperandsSingleRangeJunctionCreationWithIterOperandForAN * Tests the creation of a single RangeJunction if the CompiledJunction only * contains same index condition without iter operand for OR */ - public void _testOrganizedOperandsSingleRangeJunctionCreationWithNoIterOperandForOR() { + @Ignore + @Test + public void testOrganizedOperandsSingleRangeJunctionCreationWithNoIterOperandForOR() { LogWriter logger = CacheUtils.getLogger(); try { CompiledComparison cv[] = null; @@ -2664,7 +2667,9 @@ else if (RangeJunction.isInstanceOfNotEqualConditionEvaluator(ops[2])) { * NotEqualConditionEvaluator. * */ - public void _testNotEqualCoupledWithUndefinedAndNotNull() { + @Ignore + @Test + public void testNotEqualCoupledWithUndefinedAndNotNull() { LogWriter logger = CacheUtils.getLogger(); try { ExecutionContext context = new QueryExecutionContext(null, CacheUtils 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 bcf0b658490d..96723d1d48d2 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 org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -346,7 +347,9 @@ public void testSargableRange() throws Exception{ * this the Like predicate is not transformed to compiled-junction * with > and < operator. */ - public void XtestStringConditioningForLike_2() { + @Ignore + @Test + public void testStringConditioningForLike_2() { CompiledValue var = new CompiledPath(new CompiledID("p"), "ID"); String s1 = "abc%"; CompiledLiteral literal = new CompiledLiteral(s1); 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 3ee758bcf4c8..b35dd25bad6b 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 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; @@ -219,7 +220,9 @@ public void test001AddEntry() throws Exception { // !!!: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 + @Test + public void test002UpdateEntry() throws Exception { IndexStatistics stats = index.getStatistics(); CacheUtils.log(((CompactRangeIndex) index).dump()); Portfolio p = (Portfolio) region.get("4"); diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java index 4e4d76af08f2..e03f8f6091ff 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java @@ -74,14 +74,11 @@ public class IndexTrackingQueryObserverDUnitTest extends JUnit4CacheTestCase { public IndexTrackingQueryObserverDUnitTest() { super(); } - - @Test - public void testNothing() { - - } + @Ignore("Disabled for bug 52321") - public void DISABLED_testIndexInfoOnRemotePartitionedRegion() throws Exception { + @Test + public void testIndexInfoOnRemotePartitionedRegion() throws Exception { final Host host = Host.getHost(0); VM ds0 = host.getVM(0); VM ds1 = host.getVM(1); diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicIndexCreationDeadlockDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicIndexCreationDeadlockDUnitTest.java index 20041bdd2ac3..fe1d2e7b7cf1 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicIndexCreationDeadlockDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicIndexCreationDeadlockDUnitTest.java @@ -16,6 +16,7 @@ */ package com.gemstone.gemfire.cache.query.partitioned; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import org.junit.Test; @@ -83,12 +84,9 @@ public void setCacheInVMsUsingXML(String xmlFile, VM... vms) { public static volatile boolean hook_vm1, hook_vm2; - //Dummy test method to be removed when test is fixed + @Ignore @Test public void testIndexCreationMessageDiskRecoveryDeadLock() { - } - - public void DISABLE_testIndexCreationMessageDiskRecoveryDeadLock() { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); 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 162ffb19b49c..968cd69f9cbe 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 org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -413,8 +414,9 @@ public void testIndexOnCommitForDestroy() throws Exception { /* * Enable this test when indexes are made transactional. */ - //@Test - public void _testFailedIndexUpdateOnJTACommitForPut() throws Exception { + @Ignore + @Test + public void testFailedIndexUpdateOnJTACommitForPut() throws Exception { Person.THROW_ON_INDEX = true; AttributesFactory af = new AttributesFactory(); af.setDataPolicy(DataPolicy.REPLICATE); diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ConcurrentLeaveDuringGIIDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ConcurrentLeaveDuringGIIDUnitTest.java index 19e37eb2981a..7642909c21c1 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ConcurrentLeaveDuringGIIDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ConcurrentLeaveDuringGIIDUnitTest.java @@ -1,29 +1,30 @@ -/* - * 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. - */ +/* + * 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.cache30; - -import org.junit.experimental.categories.Category; -import org.junit.Test; - -import static org.junit.Assert.*; - -import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase; -import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase; -import com.gemstone.gemfire.test.junit.categories.DistributedTest; + +import org.junit.Ignore; +import org.junit.experimental.categories.Category; +import org.junit.Test; + +import static org.junit.Assert.*; + +import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase; +import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase; +import com.gemstone.gemfire.test.junit.categories.DistributedTest; import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.RegionShortcut; @@ -33,27 +34,27 @@ import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.cache.InitialImageOperation; import com.gemstone.gemfire.internal.cache.InitialImageOperation.GIITestHook; -import com.gemstone.gemfire.internal.cache.InitialImageOperation.GIITestHookType; -import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.LogWriterUtils; -import com.gemstone.gemfire.test.dunit.SerializableCallable; -import com.gemstone.gemfire.test.dunit.SerializableRunnable; -import com.gemstone.gemfire.test.dunit.VM; -import com.gemstone.gemfire.test.dunit.Wait; -import com.gemstone.gemfire.test.dunit.WaitCriterion; +import com.gemstone.gemfire.internal.cache.InitialImageOperation.GIITestHookType; +import com.gemstone.gemfire.test.dunit.Host; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; +import com.gemstone.gemfire.test.dunit.SerializableCallable; +import com.gemstone.gemfire.test.dunit.SerializableRunnable; +import com.gemstone.gemfire.test.dunit.VM; +import com.gemstone.gemfire.test.dunit.Wait; +import com.gemstone.gemfire.test.dunit.WaitCriterion; import com.gemstone.gemfire.internal.cache.LocalRegion; import com.gemstone.gemfire.internal.cache.RegionMap; -@Category(DistributedTest.class) +@Category(DistributedTest.class) public class ConcurrentLeaveDuringGIIDUnitTest extends JUnit4CacheTestCase { public ConcurrentLeaveDuringGIIDUnitTest() { super(); } - - @Test - public void testRemoveWhenBug50988IsFixed() { - // remove this placeholder + + @Test + public void testRemoveWhenBug50988IsFixed() { + // remove this placeholder } /** * In #48962 a member X has replicated region and is updating it. Members A and B @@ -73,7 +74,9 @@ public void testRemoveWhenBug50988IsFixed() { * A is then allowed to start its GII and pulls an image from B. * */ - public void bug50988_testBug48962() throws Exception { + @Ignore + @Test + public void testBug48962() throws Exception { VM X = Host.getHost(0).getVM(1); VM A = Host.getHost(0).getVM(2); VM B = Host.getHost(0).getVM(3); @@ -129,20 +132,20 @@ public void run() { // use internal methods to get the region since it's still initializing GemFireCacheImpl cache = (GemFireCacheImpl)getCache(); final RegionMap r = cache.getRegionByPathForProcessing(regionName).getRegionMap(); - - // X's update should have been propagated to A and put into the cache. - // If this throws an assertion error then there's no point in - // continuing the test because we didn't set up the initial - // condition needed for the next step. - WaitCriterion wc = new WaitCriterion() { - public boolean done() { - return r.containsKey("keyFromX"); - } - public String description() { - return "waiting for region " + regionName + " to contain keyFromX"; - } - }; - Wait.waitForCriterion(wc, 20000, 1000, true); + + // X's update should have been propagated to A and put into the cache. + // If this throws an assertion error then there's no point in + // continuing the test because we didn't set up the initial + // condition needed for the next step. + WaitCriterion wc = new WaitCriterion() { + public boolean done() { + return r.containsKey("keyFromX"); + } + public String description() { + return "waiting for region " + regionName + " to contain keyFromX"; + } + }; + Wait.waitForCriterion(wc, 20000, 1000, true); } }); diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java index f223487a390e..59fc206490c1 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java @@ -16,6 +16,7 @@ */ package com.gemstone.gemfire.cache30; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import org.junit.Test; @@ -752,7 +753,9 @@ public static Boolean isInitialRolePlayerStarted(){ // See #50944 before enabling the test. This ticket has been closed with wontFix // for the 2014 8.0 release. - public void DISABLED_testReconnectWithRequiredRoleRegained()throws Throwable { + @Ignore + @Test + public void testReconnectWithRequiredRoleRegained()throws Throwable { final String rr1 = "RoleA"; //final String rr2 = "RoleB"; diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedLockServiceDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedLockServiceDUnitTest.java index ebd0b9573869..f09fc9acefae 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedLockServiceDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedLockServiceDUnitTest.java @@ -27,6 +27,7 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -1462,7 +1463,9 @@ public void run() { * ensures that suspend and regular locks behave as ReadWriteLocks and * processing occurs in order. */ - public void notestSuspendLockingBehaves() throws Exception { + @Ignore + @Test + public void testSuspendLockingBehaves() throws Exception { try { doTestSuspendLockingBehaves(); } 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 7cc475fa2ae8..a59262eb5f17 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 @@ -26,6 +26,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import org.junit.After; import org.junit.Assert; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -277,7 +278,9 @@ public void testLocatorSyntax() throws Exception { * * @deprecated This test creates a "loner" distributed system */ - public void _testEmptyLocators() { + @Ignore + @Test + public void testEmptyLocators() { Properties props = new Properties(); props.put(MCAST_PORT, String.valueOf(0)); props.put(LOCATORS, ""); @@ -386,7 +389,9 @@ public void testGetStatisticArchiveFile() { * gemfire.ack-wait-threshold system property is set on this VM, * thus overriding the value passed into the API. */ - public void _testGetAckWaitThreshold() { + @Ignore + @Test + public void testGetAckWaitThreshold() { String time = String.valueOf(DistributionConfig.MIN_ACK_WAIT_THRESHOLD); Properties props = new Properties(); // a loner is all this test needs @@ -402,7 +407,9 @@ public void _testGetAckWaitThreshold() { * gemfire.ack-wait-threshold system property is set on this VM, * thus overriding the value passed into the API. */ - public void _testInvalidAckWaitThreshold() { + @Ignore + @Test + public void testInvalidAckWaitThreshold() { Properties props = new Properties(); props.put(ACK_WAIT_THRESHOLD, "blah"); try { diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXDebugDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXDebugDUnitTest.java index 9f8e142ef517..cc1773a246ac 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXDebugDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXDebugDUnitTest.java @@ -47,6 +47,8 @@ import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase; import com.gemstone.gemfire.test.junit.categories.DistributedTest; + +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -879,7 +881,6 @@ public Object call() throws CacheException { // accessor.invoke(TxOps); } - public void performTXRRtestOps(boolean makeDatNodeAsCoordinator) { createCacheInAllVms(); Object[] prAttrs = new Object[] { "pregion1", 1, null, 3, null, diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java index 6d9a17252993..52fff550be77 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java @@ -24,6 +24,7 @@ import java.util.Set; import java.util.concurrent.CountDownLatch; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -1301,7 +1302,9 @@ public Object call() throws Exception { * 1. On primary, the tx op is applied first followed by non-tx * 2. On secondary, non-tx op is applied first followed by tx. */ - public void DISABLED_testConcurrentTXAndNonTXOperations() throws Exception { + @Ignore + @Test + public void testConcurrentTXAndNonTXOperations() throws Exception { Host host = Host.getHost(0); final VM server1 = host.getVM(0); final VM server2 = host.getVM(1); diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java index 69d3fe47d6fa..08953d528323 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java @@ -16,6 +16,7 @@ */ package com.gemstone.gemfire.internal.cache; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import org.junit.Test; @@ -828,8 +829,9 @@ public Object call() throws Exception { }); } - - public void disabled_testGetAllRollbackInServer() throws Exception { + @Ignore + @Test + public void testGetAllRollbackInServer() throws Exception { Host host = Host.getHost(0); VM server = host.getVM(0); createRegionsAndStartServer(server, false); @@ -859,7 +861,9 @@ public Object load(LoaderHelper helper) throws CacheLoaderException { }); } - public void disabled_testGetAllRollbackInClient() throws Exception { + @Ignore + @Test + public void testGetAllRollbackInClient() throws Exception { Host host = Host.getHost(0); VM server = host.getVM(0); VM client = host.getVM(1); @@ -1929,7 +1933,9 @@ public Object call() throws Exception { } //Disabled due to bug 47083 - public void DISABLED_testCallbacks() { + @Ignore + @Test + public void testCallbacks() { Host host = Host.getHost(0); VM datastore = host.getVM(1); VM client = host.getVM(2); diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GIIFlowControlDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GIIFlowControlDUnitTest.java index 405ff45214de..a935439b34ac 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GIIFlowControlDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GIIFlowControlDUnitTest.java @@ -16,6 +16,7 @@ */ package com.gemstone.gemfire.internal.cache; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import org.junit.Test; @@ -239,13 +240,17 @@ public void run() { // DISABLED due to high failure rate due, apparently, to problems // with the flow-control statistics. See internal ticket #52221 - public void disabledtestCloseReceiverCacheNoHang() throws Throwable { + @Ignore + @Test + public void testCloseReceiverCacheNoHang() throws Throwable { doCloseTest(false); } // DISABLED due to high failure rate due, apparently, to problems // with the flow-control statistics. See internal ticket #52221 - public void disabledtestDisconnectReceiverNoHang() throws Throwable { + @Ignore + @Test + public void testDisconnectReceiverNoHang() throws Throwable { doCloseTest(true); } 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 ef4d1f28e227..aee09f9ac175 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 @@ -23,6 +23,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -300,7 +301,9 @@ public void testEntryFaultinCount() { * 1)Verify Entry value after faultin should be byte []
*/ // not using it. added as may needed if functionality gets added - public void _testFaultInEntryValueShouldbeSerialized() { + @Ignore + @Test + public void testFaultInEntryValueShouldbeSerialized() { try { assertNotNull(cache); LocalRegion rgn = (LocalRegion)cache.getRegion(Region.SEPARATOR + regionName); diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java index f11b41b1d1cf..58436a853afa 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java @@ -40,6 +40,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -237,7 +238,9 @@ public void run() { } /** Manual test.*/ - public void z_testRedundancyLoop() { + @Ignore + @Test + public void testRedundancyLoop() { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java index 569fec768abc..695c0034e1b3 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java @@ -31,6 +31,7 @@ import java.util.List; import java.util.Set; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -142,8 +143,10 @@ public void testServerSingleKeyExecution_Bug43513_OnRegion() { createScenario_SingleConnection(); client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.serverSingleKeyExecutionOnRegion_SingleConnection()); } - - public void Bug47584_testServerSingleKeyExecution_Bug43513_OnServer() { + + @Ignore("Bug47584") + @Test + public void testServerSingleKeyExecution_Bug43513_OnServer() { createScenario_SingleConnection(); client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.serverSingleKeyExecutionOnServer_SingleConnection()); } diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRTransactionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRTransactionDUnitTest.java index b06887fe7161..85d7173a3f03 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRTransactionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRTransactionDUnitTest.java @@ -16,6 +16,7 @@ */ package com.gemstone.gemfire.internal.cache.execute; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import org.junit.Test; @@ -432,7 +433,9 @@ public static void validatePRTXInCacheListener() } } - public void BUG46661DISABLEtestCacheListenerCallbacks() { + @Ignore("BUG46661") + @Test + public void testCacheListenerCallbacks() { createPopulateAndVerifyCoLocatedPRs(1); SerializableCallable registerListeners = new SerializableCallable() { 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 ffb47714cd77..a503ea4403c9 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 java.io.IOException; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -170,7 +171,9 @@ public void run() */ //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() + @Ignore + @Test + public void testBlockingPutAndExpiry() { try { HARegionQueueAttributes hrqa = new HARegionQueueAttributes(); 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 e8bfafbaf1d2..922dd121eed3 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 @@ -27,6 +27,7 @@ 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; @@ -1054,7 +1055,9 @@ public void afterInvalidate(EntryEvent event) { * 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 + @Test + public void testDispatchedMsgsMapUpdateOnTakes() throws Exception { this.logWriter .info("HARQAddOperationJUnitTest : testDispatchedEventsMapUpdateOnTakes BEGIN"); diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java index 211e2f238754..1caae7a7aa57 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java @@ -24,6 +24,7 @@ import java.util.Properties; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -148,11 +149,10 @@ public static void verifyQueueSize(Boolean isPrimary, + (isPrimary ? "primary." : "secondary."), numOfEvents.intValue(), qSize); } + + @Ignore("ticket51932") @Test - public void testNothing() { - // remove when ticket #51932 is fixed - } - public void ticket51932_testDeadlock() throws Throwable { + public void testDeadlock() throws Throwable { int maxQSize = 5; // Set infinite ack interval so that the queue will not be drained. int ackInterval = Integer.MAX_VALUE; diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java index bc6fcebd427a..321353c4da4f 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java @@ -257,7 +257,8 @@ public void testTotalRecoverRedundancy1() throws Throwable { * async writer thread. */ @Ignore("Bug 50376") - public void DISABLED_testBadSerializationInAsyncThread() throws Throwable { + @Test + public void testBadSerializationInAsyncThread() throws Throwable { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); @@ -1227,7 +1228,9 @@ public void testBug41341() { * if we restored redundancy while * that bucket was offline. */ - public void z_testThrowAwayUneededBucket() { + @Ignore + @Test + public void testThrowAwayUneededBucket() { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java index f7c011d1301d..76a368b37078 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java @@ -16,6 +16,7 @@ */ package com.gemstone.gemfire.internal.cache.persistence; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import org.junit.Test; @@ -258,7 +259,9 @@ public void afterWriteGCRVV(DiskRegion dr) { * start expiring based on their original time-stamp, NOT the time-stamp * assigned during scheduling for expiration after recovery. */ - public void DISABLED_testLotsOfTombstonesExpiration() throws Throwable { + @Ignore + @Test + public void testLotsOfTombstonesExpiration() throws Throwable { Host host = Host.getHost(0); final VM vm0 = host.getVM(0); diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImplJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImplJUnitTest.java index b703f00cb4d8..69228afe6a0b 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImplJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImplJUnitTest.java @@ -16,22 +16,31 @@ */ package com.gemstone.gemfire.internal.cache.tier.sockets; +import com.gemstone.gemfire.cache.AttributesFactory; import com.gemstone.gemfire.cache.CacheException; import com.gemstone.gemfire.cache.CacheFactory; +import com.gemstone.gemfire.cache.Region; +import com.gemstone.gemfire.cache.client.ServerRefusedConnectionException; import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; +import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.AvailablePortHelper; +import com.gemstone.gemfire.internal.cache.EventID; import com.gemstone.gemfire.internal.cache.InternalCache; +import com.gemstone.gemfire.internal.cache.tier.Acceptor; +import com.gemstone.gemfire.internal.cache.tier.MessageType; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; import java.io.IOException; import java.net.BindException; +import java.net.Socket; import java.util.Collections; import java.util.Properties; @@ -64,7 +73,9 @@ public void tearDown() throws Exception /* * Test method for 'com.gemstone.gemfire.internal.cache.tier.sockets.AcceptorImpl(int, int, boolean, int, Cache)' */ - public void foo_testConstructor() throws CacheException, IOException + @Ignore + @Test + public void testConstructor() throws CacheException, IOException { AcceptorImpl a1 = null, a2 = null, a3 = null; try { @@ -165,109 +176,4 @@ public void foo_testConstructor() throws CacheException, IOException } } - /* - * Test method for 'com.gemstone.gemfire.internal.cache.tier.sockets.AcceptorImpl.start()' - * Since for CBB branch , the ping protocol has been modified such that the - * server connection thread exits after recieving the ping protocol, using - * a non ping message to test the conenction limit - */ - /*public void disable_testStartAndAccept() throws IOException, ServerRefusedConnectionException - { - //LogWriter log = new LocalLogWriter(LogWriterImpl.INFO_LEVEL); - //Create a temporary test region - Region temp= null; - AcceptorImpl ac = null; - Socket[] clis = null; - try{ - temp =cache.createRegion("testRoot", new AttributesFactory().create()); - }catch(Exception ignore) { - - } - // Test getting to the limit of connection - - Message putMsg= new Message(3); - try { - - int port2 = AvailablePort.getRandomAvailablePort( AvailablePort.SOCKET ); - ac = new AcceptorImpl( - port2, - null, - false, - CacheServer.DEFAULT_SOCKET_BUFFER_SIZE, - CacheServer.DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS, - this.cache, - AcceptorImpl.MINIMUM_MAX_CONNECTIONS, - CacheServer.DEFAULT_MAX_THREADS, - CacheServer.DEFAULT_MAXIMUM_MESSAGE_COUNT, - CacheServer.DEFAULT_MESSAGE_TIME_TO_LIVE,null,null); - ac.start(); - putMsg.setMessageType(MessageType.PUT); - putMsg.setTransactionId(1); - putMsg.setNumberOfParts(4); - putMsg.addStringPart("testRoot"); - putMsg.addStringOrObjPart("key1"); - putMsg.addObjPart("key1", false); - putMsg.addBytesPart(EventID.getOptimizedByteArrayForEventID(1, 1)); - - clis = new Socket[AcceptorImpl.MINIMUM_MAX_CONNECTIONS]; - for(int i=0; i" + expecteExceptions + ""); - // Test recovery of some connections using a messy close on the connection - // (An ordered close sends a message regarding the close) - for (int j=0; j<=1; j++) { - clis[j].close(); - - // Wait for an available ServerConnection thread - ac.testWaitForAvailableWorkerThread(); - - // Wait for server to begin accepting connections - // this test method no longer exists ac.testWaitForAcceptorThread(); - clis[j] = new Socket((String) null, port2); - clis[j].setSoTimeout(2000); - clis[j].getOutputStream().write(Acceptor.CLIENT_TO_SERVER); - putMsg.setComms(clis[j], ServerConnection.allocateCommBuffer(1024)); - HandShake.getHandShake().greet(clis[j], null); - putMsg.send(); - } - this.cache.getLogger().info("" + expecteExceptions + ""); - } finally { - if (ac!=null) - ac.close(); - if (clis!=null) { - for(int i=0; i CacheServerTransactionsDUnitTest.createServerCache())); diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java index 4b7afc022c8d..7a63d09da480 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java @@ -39,6 +39,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -115,20 +116,18 @@ public void tearDown() throws Exception * configured for the client
* */ - public void DISABLE_testListenerOnServerSitForever() + @Ignore + @Test + public void testListenerOnServerSitForever() throws Exception { int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); Region testRegion = null ; - try { - CacheServer server = this.cache.addCacheServer(); - server.setMaximumTimeBetweenPings(10000); - server.setPort(port3); - server.start(); - } - catch (Exception e) { - e.printStackTrace(); - fail("Failed to create server"); - } + + CacheServer server = this.cache.addCacheServer(); + server.setMaximumTimeBetweenPings(10000); + server.setPort(port3); + server.start(); + try { PoolFactory pf = PoolManager.createFactory(); pf.addServer("localhost", port3); diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java index b087f3b1e075..814ba4498778 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java @@ -769,7 +769,7 @@ public static void createClientCache_EventId(String host, Integer port1) throws */ @Ignore("TODO: disabled - the eventID received does not match the sender's eventID. Why is this a requirement anyway?") @Test - public void _testInstantiatorsEventIdVerificationClientsAndServers() throws Exception { + public void testInstantiatorsEventIdVerificationClientsAndServers() throws Exception { PORT1 = initServerCache(server1, 1); PORT2 = initServerCache(server2, 2); diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java index 20b2a52dc2ed..ef9e61bc2732 100644 --- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java @@ -16,6 +16,7 @@ */ package com.gemstone.gemfire.cache.query.cq.dunit; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import org.junit.Test; @@ -85,7 +86,9 @@ public void run() { * Tests the cq performance. * @throws Exception */ - public void perf_testCQPerf() throws Exception { + @Ignore("perf") + @Test + public void testCQPerf() throws Exception { final Host host = Host.getHost(0); VM server = host.getVM(0); @@ -897,7 +900,9 @@ public void testMatchingCQsOnDataNodeWithMultipleServers() throws Exception { * Performance test for Matching CQ optimization changes. * @throws Exception */ - public void perf_testPerformanceForMatchingCQs() throws Exception { + @Ignore("perf") + @Test + public void testPerformanceForMatchingCQs() throws Exception { final Host host = Host.getHost(0); VM server1 = host.getVM(0); VM server2 = host.getVM(1); diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java index 413230cf3be0..dcd3915c90ba 100644 --- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java @@ -16,6 +16,7 @@ */ package com.gemstone.gemfire.cache.query.cq.dunit; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import org.junit.Test; @@ -84,7 +85,9 @@ public void run() { * Tests the cq performance. * @throws Exception */ - public void perf_testCQPerf() throws Exception { + @Ignore("perf") + @Test + public void testCQPerf() throws Exception { final Host host = Host.getHost(0); VM server = host.getVM(0); @@ -854,7 +857,9 @@ public void testMatchingCQsWithMultipleServers() throws Exception { * Performance test for Matching CQ optimization changes. * @throws Exception */ - public void perf_testPerformanceForMatchingCQs() throws Exception { + @Ignore("perf") + @Test + public void testPerformanceForMatchingCQs() throws Exception { final Host host = Host.getHost(0); VM server1 = host.getVM(0); VM server2 = host.getVM(1); diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java index 0405b3c80da9..0acaa96278c0 100644 --- a/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java @@ -16,6 +16,7 @@ */ package com.gemstone.gemfire.management; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import org.junit.Test; @@ -193,7 +194,9 @@ public void testCacheClient() throws Exception { */ // renable when bug 46138 - public void DISABLEDtestBug46049() throws Exception { + @Ignore("Bug46049") + @Test + public void testBug46049() throws Exception { final Host host = Host.getHost(0); VM locator = host.getVM(0); VM server = host.getVM(1); diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java index b54ce5ae44bb..46454885c41a 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java @@ -16,6 +16,7 @@ */ package com.gemstone.gemfire.internal.cache.wan.concurrent; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import org.junit.Test; @@ -504,7 +505,9 @@ public void testParallelPropagationSenderStartAfterStop() throws Throwable { * stopped state, puts are simultaneously happening on the region by another thread. * @throws Exception */ - public void Bug47553_testParallelPropagationSenderStartAfterStop_Scenario2() throws Exception { + @Ignore("Bug47553") + @Test + public void testParallelPropagationSenderStartAfterStop_Scenario2() throws Exception { Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java index 81aa80842c6b..4b8d6bf114e7 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java @@ -16,6 +16,7 @@ */ package com.gemstone.gemfire.internal.cache.wan.concurrent; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import org.junit.Test; @@ -92,7 +93,9 @@ public void testSerialReplicatedWanWithOverflow() { getTestMethodName() + "_RR", 15, 240000 )); } - public void Bug46921_testSerialReplicatedWanWithPersistence() { + @Ignore("Bug46921") + @Test + public void testSerialReplicatedWanWithPersistence() { Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java index 5eb69335e747..0f76ce88e001 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java @@ -16,6 +16,7 @@ */ package com.gemstone.gemfire.internal.cache.wan.misc; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import org.junit.Test; @@ -708,8 +709,9 @@ public void testWANPDX_PR_MultipleVM_ParallelSenderWithFilter() { /** * When remote site bounces then we should send pdx event again. */ - - public void Bug_testWANPDX_PR_SerialSender_RemoteSite_Bounce() { + @Ignore + @Test + public void testWANPDX_PR_SerialSender_RemoteSite_Bounce() { Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java index c617ff1a6fdf..e2810f16ff20 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java @@ -16,6 +16,7 @@ */ package com.gemstone.gemfire.internal.cache.wan.misc; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import org.junit.Test; @@ -42,11 +43,6 @@ public ReplicatedRegion_ParallelWANPersistenceDUnitTest() { final String expectedExceptions = null; - @Test - public void testNothing() { - - } - /**Below test is disabled intentionally 1> In this release 8.0, for rolling upgrade support queue name is changed to old style 2>Comman parallel sender for different non colocated regions is not supported in 8.0 so no need to bother about @@ -54,7 +50,9 @@ public void testNothing() { 3> We have to enabled it in next release 4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 and version prior to 8.0*/ - public void DISABLED_test_DR_PGSPERSISTENCE_VALIDATEQUEUE_Restart_Validate_Receiver() { + @Ignore + @Test + public void test_DR_PGSPERSISTENCE_VALIDATEQUEUE_Restart_Validate_Receiver() { //create locator on local site Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); //create locator on remote site @@ -192,7 +190,9 @@ public void DISABLED_test_DR_PGSPERSISTENCE_VALIDATEQUEUE_Restart_Validate_Recei 3> We have to enabled it in next release 4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 and version prior to 8.0*/ - public void DISABLED_test_DRPERSISTENCE_PGSPERSISTENCE_VALIDATEQUEUE_Restart_Validate_Receiver() { + @Ignore + @Test + public void test_DRPERSISTENCE_PGSPERSISTENCE_VALIDATEQUEUE_Restart_Validate_Receiver() { //create locator on local site Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); //create locator on remote site @@ -343,7 +343,9 @@ public void DISABLED_test_DRPERSISTENCE_PGSPERSISTENCE_VALIDATEQUEUE_Restart_Val 3> We have to enabled it in next release 4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 and version prior to 8.0*/ - public void DISABLED_test_DRPERSISTENCE_PRPERSISTENCE_PGSPERSISTENCE_VALIDATEQUEUE_Restart_Validate_Receiver() { + @Ignore + @Test + public void test_DRPERSISTENCE_PRPERSISTENCE_PGSPERSISTENCE_VALIDATEQUEUE_Restart_Validate_Receiver() { //create locator on local site Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); //create locator on remote site @@ -557,7 +559,9 @@ public void DISABLED_test_DRPERSISTENCE_PRPERSISTENCE_PGSPERSISTENCE_VALIDATEQUE 3> We have to enabled it in next release 4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 and version prior to 8.0*/ - public void DISABLED_test_DRPERSISTENCE_PGSPERSISTENCE_4NODES_2NODESDOWN_Validate_Receiver() + @Ignore + @Test + public void test_DRPERSISTENCE_PGSPERSISTENCE_4NODES_2NODESDOWN_Validate_Receiver() throws Exception { Integer lnPort = (Integer) vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java index 5b0802cce046..afa03d5cb475 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java @@ -16,6 +16,7 @@ */ package com.gemstone.gemfire.internal.cache.wan.misc; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import org.junit.Test; @@ -118,7 +119,9 @@ public void test_DR_PGS_1Nodes_Put_Receiver() throws Exception { 4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 and version prior to 8.0 */ - public void DISABLED_test_PGS_Started_DR_CREATED_NO_RECEIVER() throws Exception { + @Ignore + @Test + public void test_PGS_Started_DR_CREATED_NO_RECEIVER() throws Exception { try { Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); @@ -161,7 +164,9 @@ public void DISABLED_test_PGS_Started_DR_CREATED_NO_RECEIVER() throws Exception 4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 and version prior to 8.0 */ - public void DISABLED_test_DR_CREATED_PGS_STARTED_NO_RECEIVER() throws Exception { + @Ignore + @Test + public void test_DR_CREATED_PGS_STARTED_NO_RECEIVER() throws Exception { try { Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); @@ -198,7 +203,9 @@ public void DISABLED_test_DR_CREATED_PGS_STARTED_NO_RECEIVER() throws Exception 3> We have to enabled it in next release 4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 and version prior to 8.0*/ - public void DISABLED_test_DR_PGS_1Node_Put_ValidateQueue_No_Receiver() throws Exception { + @Ignore + @Test + public void test_DR_PGS_1Node_Put_ValidateQueue_No_Receiver() throws Exception { try { Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); @@ -243,7 +250,9 @@ public void DISABLED_test_DR_PGS_1Node_Put_ValidateQueue_No_Receiver() throws Ex 3> We have to enabled it in next release 4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 and version prior to 8.0*/ - public void DISABLED_test_DR_PGS_2Nodes_Put_ValidateQueue_No_Receiver() throws Exception { + @Ignore + @Test + public void test_DR_PGS_2Nodes_Put_ValidateQueue_No_Receiver() throws Exception { try { Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); @@ -329,7 +338,9 @@ public void DISABLED_test_DR_PGS_2Nodes_Put_ValidateQueue_No_Receiver() throws E 3> We have to enabled it in next release 4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 and version prior to 8.0*/ - public void DISABLED_test_DR_PGS_1Nodes_Put_Receiver() throws Exception { + @Ignore + @Test + public void test_DR_PGS_1Nodes_Put_Receiver_2() throws Exception { try { Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); @@ -373,7 +384,9 @@ public void DISABLED_test_DR_PGS_1Nodes_Put_Receiver() throws Exception { 3> We have to enabled it in next release 4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 and version prior to 8.0*/ - public void DISABLED_test_DR_PGS_2Nodes_Put_Receiver() throws Exception { + @Ignore + @Test + public void test_DR_PGS_2Nodes_Put_Receiver() throws Exception { try { Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); @@ -425,7 +438,9 @@ public void DISABLED_test_DR_PGS_2Nodes_Put_Receiver() throws Exception { 3> We have to enabled it in next release 4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 and version prior to 8.0*/ - public void DISABLED_test_DR_PGS_2Nodes_EMPTY_Put_Receiver() throws Exception { + @Ignore + @Test + public void test_DR_PGS_2Nodes_EMPTY_Put_Receiver() throws Exception { try { Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); @@ -478,7 +493,9 @@ public void DISABLED_test_DR_PGS_2Nodes_EMPTY_Put_Receiver() throws Exception { 3> We have to enabled it in next release 4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 and version prior to 8.0*/ - public void DISABLED_test_DR_PR_PGS_4Nodes_Put_Receiver_2Nodes() throws Exception { + @Ignore + @Test + public void test_DR_PR_PGS_4Nodes_Put_Receiver_2Nodes() throws Exception { try { Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); @@ -576,7 +593,9 @@ public void DISABLED_test_DR_PR_PGS_4Nodes_Put_Receiver_2Nodes() throws Exceptio 3> We have to enabled it in next release 4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 and version prior to 8.0*/ - public void DISABLED_test_DR_PGS_NOMANUALSTART_4Nodes_Put_ValidateReceiver() throws Exception { + @Ignore + @Test + public void test_DR_PGS_NOMANUALSTART_4Nodes_Put_ValidateReceiver() throws Exception { try { Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); @@ -650,7 +669,9 @@ public void DISABLED_test_DR_PGS_NOMANUALSTART_4Nodes_Put_ValidateReceiver() thr 3> We have to enabled it in next release 4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 and version prior to 8.0*/ - public void DISABLED_test_DR_PGS_4Nodes_Put_CLOSE4NODESCACHE_RECREATE_PUT_ValidateReceiver() + @Ignore + @Test + public void test_DR_PGS_4Nodes_Put_CLOSE4NODESCACHE_RECREATE_PUT_ValidateReceiver() throws Exception { try { Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); @@ -772,7 +793,9 @@ public void DISABLED_test_DR_PGS_4Nodes_Put_CLOSE4NODESCACHE_RECREATE_PUT_Valida 3> We have to enabled it in next release 4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 and version prior to 8.0*/ - public void DISABLED_test_DR_NO_ACK_PGS_2Nodes_Put_ValidateQueue_Receiver() throws Exception { + @Ignore + @Test + public void test_DR_NO_ACK_PGS_2Nodes_Put_ValidateQueue_Receiver() throws Exception { try { Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); @@ -824,7 +847,9 @@ public void DISABLED_test_DR_NO_ACK_PGS_2Nodes_Put_ValidateQueue_Receiver() thro 3> We have to enabled it in next release 4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 and version prior to 8.0*/ - public void DISABLED_test_DR_PGS_2NODES_1NODESDOWN_Validate_Receiver() throws Exception { + @Ignore + @Test + public void test_DR_PGS_2NODES_1NODESDOWN_Validate_Receiver() throws Exception { Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); @@ -895,7 +920,9 @@ public void DISABLED_test_DR_PGS_2NODES_1NODESDOWN_Validate_Receiver() throws Ex 3> We have to enabled it in next release 4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 and version prior to 8.0*/ - public void DISABLED_test_DR_PGS_4NODES_2NODESDOWN_Validate_Receiver() throws Exception { + @Ignore + @Test + public void test_DR_PGS_4NODES_2NODESDOWN_Validate_Receiver() throws Exception { Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANConfigurationJUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANConfigurationJUnitTest.java index 9df768e6e10f..d6b339c893f6 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANConfigurationJUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANConfigurationJUnitTest.java @@ -31,6 +31,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import org.junit.After; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -151,7 +152,9 @@ public void test_GatewaySenderIdAndAsyncEventId() { * with parallel distribution policy * */ - public void DIABLEB_DUE_TO_BUG51491_test_GatewaySender_Parallel_DistributedRegion() { + @Ignore("Bug51491") + @Test + public void test_GatewaySender_Parallel_DistributedRegion() { cache = new CacheFactory().set(MCAST_PORT, "0").create(); GatewaySenderFactory fact = cache.createGatewaySenderFactory(); fact.setParallel(true); diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java index 851dc496a737..48cc379a2929 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java @@ -16,6 +16,7 @@ */ package com.gemstone.gemfire.internal.cache.wan.misc; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import org.junit.Test; @@ -83,7 +84,9 @@ public void test_GatewaySender_Started_Before_Locator() { * * @throws Exception */ - public void __test_AllLocatorsinDSShouldHaveDistributedSystemId() throws Exception { + @Ignore + @Test + public void test_AllLocatorsinDSShouldHaveDistributedSystemId() throws Exception { try { Integer lnLocPort1 = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId(1)); @@ -341,8 +344,10 @@ public void test_RingTopology() { vm2.invoke(() -> WANTestBase.checkAllSiteMetaDataFor3Sites( dsVsPort )); vm3.invoke(() -> WANTestBase.checkAllSiteMetaDataFor3Sites( dsVsPort )); } - - public void ___test_3Sites3Locators() { + + @Ignore + @Test + public void test_3Sites3Locators() { final Set site1LocatorsPort = new HashSet(); int site1Port1 = AvailablePortHelper.getRandomAvailablePortForDUnitSite(); site1LocatorsPort.add("localhost["+site1Port1+"]"); diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java index c97e46170f8a..a3dcb5da4a50 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java @@ -16,6 +16,7 @@ */ package com.gemstone.gemfire.internal.cache.wan.misc; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import org.junit.Test; @@ -111,7 +112,9 @@ public void testSameSerialGatewaySenderIdAcrossSameDistributedRegion() * We are gone support this configuration in upcoming releases */ - public void DISABLED_DUETO_BUG51491_testParallelGatewaySenderForDistributedRegion() throws Exception { + @Ignore("Bug51491") + @Test + public void testParallelGatewaySenderForDistributedRegion() throws Exception { try { Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); @@ -239,7 +242,9 @@ public void testSameParallelGatewaySenderIdAcrossSamePartitionedRegion() * * @throws Exception */ - public void ___testSameParallelGatewaySenderIdAcrossDifferentPartitionedRegion() + @Ignore + @Test + public void testSameParallelGatewaySenderIdAcrossDifferentPartitionedRegion() throws Exception { try { Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); @@ -696,32 +701,7 @@ public void testGatewayTransportFiltersOrder() { } } } - -// public void ___testGatewaySenderListener() { -// Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, -// "createFirstLocatorWithDSId", new Object[] { 1 }); -// -// vm1.invoke(() -> WANTestBase.createCache( lnPort )); -// vm2.invoke(() -> WANTestBase.createCache( lnPort )); -// -// vm1.invoke(() -> WANTestBase.createSenderWithListener( -// "ln", 2, false, 100, 10, false, false, null, -// true, true )); -// -// try { -// vm2.invoke(() -> WANTestBase.createSenderWithListener( -// "ln", 2, false, 100, 10, false, false, null, -// false, true )); -// fail("Expected IllegateStateException : GatewayEventFileters Should match"); -// } -// catch (Exception e) { -// if (!(e.getCause() instanceof IllegalStateException) -// || !(e.getCause().getMessage() -// .contains("because another cache has the same Gateway Sender defined with GatewaySenderEventListener"))) { -// fail("Expected IllegalStateException", e); -// } -// } -// } + @Test public void testIsDiskSynchronous() { @@ -799,8 +779,10 @@ public void test_GetCacheServersDoesNotReturnReceivers_Scenario2() { /* * We are allowing number of dispatcher threads for parallel sender to differ * on number of machines - */ - public void DISABLED_testDispatcherThreadsForParallelGatewaySender() { + */ + @Ignore + @Test + public void testDispatcherThreadsForParallelGatewaySender() { Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); createCacheInVMs(lnPort, vm1, vm2); @@ -829,7 +811,9 @@ public void DISABLED_testDispatcherThreadsForParallelGatewaySender() { * time of sender creation. policy KEY and Partition are same for PGS. Hence * disabling the tests */ - public void DISABLED_testOrderPolicyForParallelGatewaySender() { + @Ignore + @Test + public void testOrderPolicyForParallelGatewaySender() { Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); createCacheInVMs(lnPort, vm1, vm2); diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java index 855856ec128a..be3c42d7bd1f 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java @@ -16,6 +16,7 @@ */ package com.gemstone.gemfire.internal.cache.wan.parallel; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import org.junit.Test; @@ -1084,7 +1085,9 @@ public void testPersistentPR_Restart() { * NOTE: This use case is not supported yet. * For ParallelGatewaySender to start, it must be associated with a partitioned region. */ - public void NotSupported_testPersistentPartitionedRegionWithGatewaySenderPersistenceEnabled_Restart2() { + @Ignore("NotSupported") + @Test + public void testPersistentPartitionedRegionWithGatewaySenderPersistenceEnabled_Restart2() { //create locator on local site Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); //create locator on remote site @@ -1192,7 +1195,9 @@ public void NotSupported_testPersistentPartitionedRegionWithGatewaySenderPersist * NOTE: This use case is not supported for now. For persistent parallel gateway sender, * the PR to which it is attached should also be persistent. */ - public void NotSupported_testNonPersistentPartitionedRegionWithGatewaySenderPersistenceEnabled_Restart() { + @Ignore("NotSupported") + @Test + public void testNonPersistentPartitionedRegionWithGatewaySenderPersistenceEnabled_Restart() { //create locator on local site Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); //create locator on remote site @@ -1304,7 +1309,9 @@ public void NotSupported_testNonPersistentPartitionedRegionWithGatewaySenderPers * At present, customer is using this configuration and which is not recommended * since it can lead to event loss of GatewaySender events. */ - public void Bug50247_testPersistentPartitionedRegionWithGatewaySender_Restart() { + @Ignore("Bug50247") + @Test + public void testPersistentPartitionedRegionWithGatewaySender_Restart() { //create locator on local site Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); //create locator on remote site diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java index 65daa98da751..804da23c23ad 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java @@ -16,6 +16,7 @@ */ package com.gemstone.gemfire.internal.cache.wan.parallel; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import org.junit.Test; @@ -1003,7 +1004,9 @@ public void testParallelPropagationTxOperations() throws Exception { getTestMethodName() + "_PR", 3 )); } - public void disable_testParallelGatewaySenderQueueLocalSize() { + @Ignore + @Test + public void testParallelGatewaySenderQueueLocalSize() { Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java index f39133e65dea..16a5d9265979 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java @@ -16,6 +16,7 @@ */ package com.gemstone.gemfire.internal.cache.wan.parallel; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import org.junit.Test; @@ -273,7 +274,8 @@ public void testParallelPropagationHA() throws Exception { * @throws Exception */ @Category(FlakyTest.class) // GEODE-977: random ports, time sensitive, waitForCriterion - public void testParallePropagationWithRemoteRegionDestroy() throws Exception { + @Test + public void testParallePropagationWithRemoteRegionDestroy() throws Exception { addIgnoredException("RegionDestroyedException"); Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java index ca7e77a0167f..cb55a2a4a758 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java @@ -16,6 +16,7 @@ */ package com.gemstone.gemfire.internal.cache.wan.serial; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import org.junit.Test; @@ -56,7 +57,9 @@ public SerialGatewaySenderEventListenerDUnitTest() { * Test validates whether the listener attached receives all the events. * this test hangs after the Darrel's checkin 36685. Need to work with Darrel.Commenting it out so that test suit will not hang */ - public void __testGatewaySenderEventListenerInvocationWithoutLocator() { + @Ignore + @Test + public void testGatewaySenderEventListenerInvocationWithoutLocator() { int mPort = AvailablePortHelper.getRandomAvailablePortForDUnitSite(); vm4.invoke(() -> WANTestBase.createCacheWithoutLocator(mPort )); vm5.invoke(() -> WANTestBase.createCacheWithoutLocator(mPort )); @@ -233,7 +236,9 @@ public void testGatewaySenderEventListenerPoolImpl() { // Test start/stop/resume on listener invocation //this test hangs after the Darrel's checkin 36685. Need to work with Darrel.Commenting it out so that test suit will not hang - public void __testGatewaySenderEventListener_GatewayOperations() { + @Ignore + @Test + public void testGatewaySenderEventListener_GatewayOperations() { int mPort = AvailablePortHelper.getRandomAvailablePortForDUnitSite(); vm4.invoke(() -> WANTestBase.createCacheWithoutLocator(mPort ));