This is an automated email from the ASF dual-hosted git repository. jasonhuynh pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push: new 5d53952 GEODE-4780: Categorized cq tests under ClientSubscriptionTest (#1558) 5d53952 is described below commit 5d53952df957a5868ddfb67ce7a4ce69762e05ac Author: Jason Huynh <huyn...@gmail.com> AuthorDate: Tue Mar 6 10:06:12 2018 -0800 GEODE-4780: Categorized cq tests under ClientSubscriptionTest (#1558) --- .../org/apache/geode/cache/query/cq/CQDistributedTest.java | 3 ++- .../java/org/apache/geode/cache/query/cq/CQJUnitTest.java | 3 ++- .../apache/geode/cache/query/cq/dunit/CqDataDUnitTest.java | 3 ++- .../cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java | 3 ++- .../geode/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java | 3 ++- .../cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java | 3 ++- .../apache/geode/cache/query/cq/dunit/CqPerfDUnitTest.java | 3 ++- .../geode/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java | 3 ++- .../apache/geode/cache/query/cq/dunit/CqQueryDUnitTest.java | 3 ++- .../query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java | 3 ++- .../geode/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java | 3 ++- .../cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java | 3 ++- .../cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java | 3 ++- .../dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java | 3 ++- .../apache/geode/cache/query/cq/dunit/CqStateDUnitTest.java | 3 ++- .../apache/geode/cache/query/cq/dunit/CqStatsDUnitTest.java | 3 ++- .../query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java | 3 ++- .../geode/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java | 3 ++- .../cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java | 3 ++- .../query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java | 3 ++- .../PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java | 3 ++- .../geode/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java | 3 ++- .../cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java | 3 ++- gradle/test.gradle | 11 +++++++++++ 24 files changed, 57 insertions(+), 23 deletions(-) diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/CQDistributedTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/CQDistributedTest.java index ce193f9..53383e5 100644 --- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/CQDistributedTest.java +++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/CQDistributedTest.java @@ -39,10 +39,11 @@ import org.apache.geode.cache.query.QueryService; import org.apache.geode.cache.query.data.Portfolio; import org.apache.geode.test.dunit.rules.ClusterStartupRule; import org.apache.geode.test.dunit.rules.MemberVM; +import org.apache.geode.test.junit.categories.ClientSubscriptionTest; import org.apache.geode.test.junit.categories.DistributedTest; -@Category(DistributedTest.class) +@Category({DistributedTest.class, ClientSubscriptionTest.class}) public class CQDistributedTest implements Serializable { private MemberVM locator; diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/CQJUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/CQJUnitTest.java index a72fa3a..c3f0217 100644 --- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/CQJUnitTest.java +++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/CQJUnitTest.java @@ -33,9 +33,10 @@ import org.apache.geode.cache.query.CqAttributesFactory; import org.apache.geode.cache.query.QueryInvalidException; import org.apache.geode.cache.query.QueryService; import org.apache.geode.distributed.DistributedSystem; +import org.apache.geode.test.junit.categories.ClientSubscriptionTest; import org.apache.geode.test.junit.categories.IntegrationTest; -@Category(IntegrationTest.class) +@Category({IntegrationTest.class, ClientSubscriptionTest.class}) public class CQJUnitTest { private DistributedSystem ds; diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataDUnitTest.java index 2cca736..09a0a7b 100644 --- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataDUnitTest.java +++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataDUnitTest.java @@ -54,6 +54,7 @@ import org.apache.geode.test.dunit.VM; import org.apache.geode.test.dunit.Wait; import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase; import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase; +import org.apache.geode.test.junit.categories.ClientSubscriptionTest; import org.apache.geode.test.junit.categories.DistributedTest; /** @@ -61,7 +62,7 @@ import org.apache.geode.test.junit.categories.DistributedTest; * data activities. * */ -@Category(DistributedTest.class) +@Category({DistributedTest.class, ClientSubscriptionTest.class}) public class CqDataDUnitTest extends JUnit4CacheTestCase { protected CqQueryDUnitTest cqDUnitTest = new CqQueryDUnitTest(); diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java index d412b52..7d29626 100644 --- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java +++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java @@ -25,13 +25,14 @@ import org.apache.geode.test.dunit.Invoke; import org.apache.geode.test.dunit.SerializableRunnable; import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase; import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase; +import org.apache.geode.test.junit.categories.ClientSubscriptionTest; import org.apache.geode.test.junit.categories.DistributedTest; /** * Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag * */ -@Category(DistributedTest.class) +@Category({DistributedTest.class, ClientSubscriptionTest.class}) public class CqDataOptimizedExecuteDUnitTest extends CqDataDUnitTest { public CqDataOptimizedExecuteDUnitTest() { diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java index 2755934..c554ab1 100644 --- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java +++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java @@ -77,13 +77,14 @@ import org.apache.geode.test.dunit.VM; import org.apache.geode.test.dunit.Wait; import org.apache.geode.test.dunit.WaitCriterion; import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase; +import org.apache.geode.test.junit.categories.ClientSubscriptionTest; import org.apache.geode.test.junit.categories.DistributedTest; /** * This class tests the ContinuousQuery mechanism in GemFire. This includes the test with different * data activities. */ -@Category(DistributedTest.class) +@Category({DistributedTest.class, ClientSubscriptionTest.class}) public class CqDataUsingPoolDUnitTest extends JUnit4CacheTestCase { protected CqQueryUsingPoolDUnitTest cqDUnitTest = new CqQueryUsingPoolDUnitTest(); // TODO: don't diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java index faa5097..73bab14 100644 --- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java +++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java @@ -25,13 +25,14 @@ import org.apache.geode.test.dunit.Invoke; import org.apache.geode.test.dunit.SerializableRunnable; import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase; import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase; +import org.apache.geode.test.junit.categories.ClientSubscriptionTest; import org.apache.geode.test.junit.categories.DistributedTest; /** * Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag * */ -@Category(DistributedTest.class) +@Category({DistributedTest.class, ClientSubscriptionTest.class}) public class CqDataUsingPoolOptimizedExecuteDUnitTest extends CqDataUsingPoolDUnitTest { public CqDataUsingPoolOptimizedExecuteDUnitTest() { diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqPerfDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqPerfDUnitTest.java index 923b2f0..6207388 100644 --- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqPerfDUnitTest.java +++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqPerfDUnitTest.java @@ -50,6 +50,7 @@ import org.apache.geode.test.dunit.VM; import org.apache.geode.test.dunit.Wait; import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase; import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase; +import org.apache.geode.test.junit.categories.ClientSubscriptionTest; import org.apache.geode.test.junit.categories.DistributedTest; import org.apache.geode.test.junit.categories.FlakyTest; @@ -57,7 +58,7 @@ import org.apache.geode.test.junit.categories.FlakyTest; * This class tests the ContiunousQuery mechanism in GemFire. This includes the test with diffetent * data activities. */ -@Category(DistributedTest.class) +@Category({DistributedTest.class, ClientSubscriptionTest.class}) public class CqPerfDUnitTest extends JUnit4CacheTestCase { protected CqQueryDUnitTest cqDUnitTest = new CqQueryDUnitTest(); diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java index 9d9d37d..a08307f 100644 --- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java +++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java @@ -52,13 +52,14 @@ import org.apache.geode.test.dunit.VM; import org.apache.geode.test.dunit.Wait; import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase; import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase; +import org.apache.geode.test.junit.categories.ClientSubscriptionTest; import org.apache.geode.test.junit.categories.DistributedTest; /** * This class tests the ContiunousQuery mechanism in GemFire. This includes the test with diffetent * data activities. */ -@Category(DistributedTest.class) +@Category({DistributedTest.class, ClientSubscriptionTest.class}) public class CqPerfUsingPoolDUnitTest extends JUnit4CacheTestCase { protected CqQueryUsingPoolDUnitTest cqDUnitTest = new CqQueryUsingPoolDUnitTest(); // TODO: get diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryDUnitTest.java index 711316b..6369ae7 100644 --- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryDUnitTest.java +++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryDUnitTest.java @@ -76,6 +76,7 @@ import org.apache.geode.test.dunit.VM; import org.apache.geode.test.dunit.Wait; import org.apache.geode.test.dunit.WaitCriterion; import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase; +import org.apache.geode.test.junit.categories.ClientSubscriptionTest; import org.apache.geode.test.junit.categories.DistributedTest; /** @@ -83,7 +84,7 @@ import org.apache.geode.test.junit.categories.DistributedTest; * with a cache and a pre-defined region and a data loader. The client creates the same region and * attaches the connection pool. */ -@Category(DistributedTest.class) +@Category({DistributedTest.class, ClientSubscriptionTest.class}) @SuppressWarnings("serial") public class CqQueryDUnitTest extends JUnit4CacheTestCase { diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java index d7e6868..602f101 100644 --- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java +++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java @@ -31,13 +31,14 @@ import org.apache.geode.internal.cache.GemFireCacheImpl; import org.apache.geode.test.dunit.*; import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase; import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase; +import org.apache.geode.test.junit.categories.ClientSubscriptionTest; import org.apache.geode.test.junit.categories.DistributedTest; /** * Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag * */ -@Category(DistributedTest.class) +@Category({DistributedTest.class, ClientSubscriptionTest.class}) public class CqQueryOptimizedExecuteDUnitTest extends CqQueryDUnitTest { public CqQueryOptimizedExecuteDUnitTest() { diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java index c002cb2..ede247f 100644 --- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java +++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java @@ -80,6 +80,7 @@ import org.apache.geode.test.dunit.VM; import org.apache.geode.test.dunit.Wait; import org.apache.geode.test.dunit.WaitCriterion; import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase; +import org.apache.geode.test.junit.categories.ClientSubscriptionTest; import org.apache.geode.test.junit.categories.DistributedTest; /** @@ -87,7 +88,7 @@ import org.apache.geode.test.junit.categories.DistributedTest; * with a cache and a pre-defined region and a data loader. The client creates the same region and * attaches the connection pool. */ -@Category(DistributedTest.class) +@Category({DistributedTest.class, ClientSubscriptionTest.class}) public class CqQueryUsingPoolDUnitTest extends JUnit4CacheTestCase { /** The port on which the bridge server was started in this VM */ diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java index ec661c4..5724430 100644 --- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java +++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java @@ -24,13 +24,14 @@ import org.apache.geode.test.dunit.Invoke; import org.apache.geode.test.dunit.SerializableRunnable; import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase; import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase; +import org.apache.geode.test.junit.categories.ClientSubscriptionTest; import org.apache.geode.test.junit.categories.DistributedTest; /** * Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag * */ -@Category(DistributedTest.class) +@Category({DistributedTest.class, ClientSubscriptionTest.class}) public class CqQueryUsingPoolOptimizedExecuteDUnitTest extends CqQueryUsingPoolDUnitTest { public CqQueryUsingPoolOptimizedExecuteDUnitTest() { diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java index d5830bb..e941025 100644 --- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java +++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java @@ -44,6 +44,7 @@ import org.apache.geode.test.dunit.VM; import org.apache.geode.test.dunit.Wait; import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase; import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase; +import org.apache.geode.test.junit.categories.ClientSubscriptionTest; import org.apache.geode.test.junit.categories.DistributedTest; import org.apache.geode.test.junit.categories.FlakyTest; @@ -51,7 +52,7 @@ import org.apache.geode.test.junit.categories.FlakyTest; * This class tests the ContinuousQuery mechanism in GemFire. * */ -@Category(DistributedTest.class) +@Category({DistributedTest.class, ClientSubscriptionTest.class}) public class CqResultSetUsingPoolDUnitTest extends JUnit4CacheTestCase { protected CqQueryUsingPoolDUnitTest cqDUnitTest = new CqQueryUsingPoolDUnitTest(); diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java index d764e7e..ceeb447 100644 --- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java +++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java @@ -43,9 +43,10 @@ import org.apache.geode.test.dunit.VM; import org.apache.geode.test.dunit.Wait; import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase; import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase; +import org.apache.geode.test.junit.categories.ClientSubscriptionTest; import org.apache.geode.test.junit.categories.DistributedTest; -@Category(DistributedTest.class) +@Category({DistributedTest.class, ClientSubscriptionTest.class}) public class CqResultSetUsingPoolOptimizedExecuteDUnitTest extends CqResultSetUsingPoolDUnitTest { public CqResultSetUsingPoolOptimizedExecuteDUnitTest() { diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStateDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStateDUnitTest.java index cbf08f5..a45465e 100644 --- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStateDUnitTest.java +++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStateDUnitTest.java @@ -38,9 +38,10 @@ import org.apache.geode.test.dunit.ThreadUtils; import org.apache.geode.test.dunit.VM; import org.apache.geode.test.dunit.Wait; import org.apache.geode.test.dunit.WaitCriterion; +import org.apache.geode.test.junit.categories.ClientSubscriptionTest; import org.apache.geode.test.junit.categories.DistributedTest; -@Category(DistributedTest.class) +@Category({DistributedTest.class, ClientSubscriptionTest.class}) public class CqStateDUnitTest extends HelperTestCase { // this test is disabled due to a 25% failure rate in diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsDUnitTest.java index 138fafc..7333b51 100644 --- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsDUnitTest.java +++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsDUnitTest.java @@ -44,13 +44,14 @@ import org.apache.geode.test.dunit.SerializableRunnable; import org.apache.geode.test.dunit.VM; import org.apache.geode.test.dunit.Wait; import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase; +import org.apache.geode.test.junit.categories.ClientSubscriptionTest; import org.apache.geode.test.junit.categories.DistributedTest; /** * This class tests the ContinuousQuery mechanism in GemFire. This includes the test with different * data activities. */ -@Category(DistributedTest.class) +@Category({DistributedTest.class, ClientSubscriptionTest.class}) public class CqStatsDUnitTest extends JUnit4CacheTestCase { // TODO: delete this use of CqQueryDUnitTest diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java index b6e0fae..421d163 100644 --- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java +++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java @@ -25,12 +25,13 @@ import org.apache.geode.test.dunit.Invoke; import org.apache.geode.test.dunit.SerializableRunnable; import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase; import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase; +import org.apache.geode.test.junit.categories.ClientSubscriptionTest; import org.apache.geode.test.junit.categories.DistributedTest; /** * Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag */ -@Category(DistributedTest.class) +@Category({DistributedTest.class, ClientSubscriptionTest.class}) public class CqStatsOptimizedExecuteDUnitTest extends CqStatsDUnitTest { public CqStatsOptimizedExecuteDUnitTest() { diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java index aec1258..63706f7 100644 --- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java +++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java @@ -46,13 +46,14 @@ import org.apache.geode.test.dunit.SerializableRunnable; import org.apache.geode.test.dunit.VM; import org.apache.geode.test.dunit.Wait; import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase; +import org.apache.geode.test.junit.categories.ClientSubscriptionTest; import org.apache.geode.test.junit.categories.DistributedTest; /** * This class tests the ContinuousQuery mechanism in GemFire. This includes the test with different * data activities. */ -@Category(DistributedTest.class) +@Category({DistributedTest.class, ClientSubscriptionTest.class}) public class CqStatsUsingPoolDUnitTest extends JUnit4CacheTestCase { // TODO: delete this use of CqQueryUsingPoolDUnitTest diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java index 992d012..3c98e3f 100644 --- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java +++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java @@ -19,12 +19,13 @@ import org.junit.experimental.categories.Category; import org.apache.geode.cache.query.internal.cq.CqServiceImpl; import org.apache.geode.test.dunit.Invoke; import org.apache.geode.test.dunit.SerializableRunnable; +import org.apache.geode.test.junit.categories.ClientSubscriptionTest; import org.apache.geode.test.junit.categories.DistributedTest; /** * Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag */ -@Category(DistributedTest.class) +@Category({DistributedTest.class, ClientSubscriptionTest.class}) public class CqStatsUsingPoolOptimizedExecuteDUnitTest extends CqStatsUsingPoolDUnitTest { public CqStatsUsingPoolOptimizedExecuteDUnitTest() { diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java index 8189114..4f24b8a 100644 --- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java +++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java @@ -55,6 +55,7 @@ import org.apache.geode.test.dunit.SerializableRunnable; import org.apache.geode.test.dunit.VM; import org.apache.geode.test.dunit.Wait; import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase; +import org.apache.geode.test.junit.categories.ClientSubscriptionTest; import org.apache.geode.test.junit.categories.DistributedTest; /** @@ -62,7 +63,7 @@ import org.apache.geode.test.junit.categories.DistributedTest; * * @since GemFire 5.5 */ -@Category(DistributedTest.class) +@Category({DistributedTest.class, ClientSubscriptionTest.class}) public class PartitionedRegionCqQueryDUnitTest extends JUnit4CacheTestCase { public static final String[] regions = new String[] {"regionA", "regionB"}; diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java index 64b5b83..4c85160 100644 --- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java +++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java @@ -30,9 +30,10 @@ import org.apache.geode.internal.cache.GemFireCacheImpl; import org.apache.geode.test.dunit.*; import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase; import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase; +import org.apache.geode.test.junit.categories.ClientSubscriptionTest; import org.apache.geode.test.junit.categories.DistributedTest; -@Category(DistributedTest.class) +@Category({DistributedTest.class, ClientSubscriptionTest.class}) public class PartitionedRegionCqQueryOptimizedExecuteDUnitTest extends PartitionedRegionCqQueryDUnitTest { diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java index 5c8cba4..18b19e6 100644 --- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java +++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java @@ -52,6 +52,7 @@ import org.apache.geode.test.dunit.SerializableRunnable; import org.apache.geode.test.dunit.VM; import org.apache.geode.test.dunit.Wait; import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase; +import org.apache.geode.test.junit.categories.ClientSubscriptionTest; import org.apache.geode.test.junit.categories.DistributedTest; import org.apache.geode.test.junit.categories.FlakyTest; @@ -60,7 +61,7 @@ import org.apache.geode.test.junit.categories.FlakyTest; * * @since GemFire 5.5 */ -@Category(DistributedTest.class) +@Category({DistributedTest.class, ClientSubscriptionTest.class}) public class PrCqUsingPoolDUnitTest extends JUnit4CacheTestCase { public PrCqUsingPoolDUnitTest() { diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java index af0cec9..1beb461 100644 --- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java +++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java @@ -24,13 +24,14 @@ import org.apache.geode.test.dunit.Invoke; import org.apache.geode.test.dunit.SerializableRunnable; import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase; import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase; +import org.apache.geode.test.junit.categories.ClientSubscriptionTest; import org.apache.geode.test.junit.categories.DistributedTest; /** * Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag * */ -@Category(DistributedTest.class) +@Category({DistributedTest.class, ClientSubscriptionTest.class}) public class PrCqUsingPoolOptimizedExecuteDUnitTest extends PrCqUsingPoolDUnitTest { public PrCqUsingPoolOptimizedExecuteDUnitTest() { diff --git a/gradle/test.gradle b/gradle/test.gradle index 66546a1..e362d13 100644 --- a/gradle/test.gradle +++ b/gradle/test.gradle @@ -190,6 +190,17 @@ subprojects { reports.junitXml.destination = file "$buildDir/test-reports-backwardcompatibility" } + task clientSubscriptionTest(type:Test) { + useJUnit { + includeCategories 'org.apache.geode.test.junit.categories.ClientSubscriptionTest' + excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest' + } + doFirst { + TestPropertiesWriter.writeTestProperties(buildDir, name) + } + reports.junitXml.destination = file "$buildDir/test-reports-client-subscription" + } + task membershipTest(type:Test) { useJUnit { includeCategories 'org.apache.geode.test.junit.categories.MembershipTest' -- To stop receiving notification emails like this one, please contact jasonhu...@apache.org.