You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ja...@apache.org on 2018/03/13 17:46:33 UTC
[geode] branch develop updated: GEODE-4814: Categorized
FunctionServiceTest (#1597)
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 5c85b4d GEODE-4814: Categorized FunctionServiceTest (#1597)
5c85b4d is described below
commit 5c85b4ddc60bd63e2ccff7d3cc0939c21d500327
Author: Jason Huynh <hu...@gmail.com>
AuthorDate: Tue Mar 13 10:46:30 2018 -0700
GEODE-4814: Categorized FunctionServiceTest (#1597)
---
.../execute/ClientFunctionTimeoutRegressionTest.java | 3 ++-
.../execute/ClientServerFunctionExecutionDUnitTest.java | 3 ++-
.../DistributedRegionFunctionExecutionDUnitTest.java | 3 ++-
.../execute/ExecuteFunctionInstanceRegressionTest.java | 3 ++-
...ctionExceptionsIncludeLocalMemberRegressionTest.java | 3 ++-
.../execute/FunctionExecutionOnLonerRegressionTest.java | 3 ++-
.../execute/FunctionExecution_ExceptionDUnitTest.java | 3 ++-
.../FunctionServiceClientAccessorPRDUnitTest.java | 3 ++-
...ServiceClientAccessorPRMultipleMembersDUnitTest.java | 3 ++-
...lientAccessorPRMultipleMembersMultihopDUnitTest.java | 3 ++-
.../FunctionServiceClientMultipleOnServerDUnitTest.java | 3 ++-
.../execute/FunctionServiceClientOnServerDUnitTest.java | 3 ++-
.../cache/execute/FunctionServiceLocalPRDUnitTest.java | 3 ++-
.../cache/execute/FunctionServiceLocalRRDUnitTest.java | 3 ++-
.../FunctionServiceMultipleOnMemberDUnitTest.java | 3 ++-
.../execute/FunctionServicePeerAccessorPRDUnitTest.java | 3 ++-
...onServicePeerAccessorPRMultipleMembersDUnitTest.java | 3 ++-
.../execute/FunctionServicePeerAccessorRRDUnitTest.java | 3 ++-
.../execute/FunctionServiceSingleOnMemberDUnitTest.java | 3 ++-
.../cache/execute/FunctionServiceStatsDUnitTest.java | 3 ++-
.../internal/cache/execute/LocalDataSetDUnitTest.java | 3 ++-
.../cache/execute/LocalDataSetIndexingDUnitTest.java | 3 ++-
.../cache/execute/LocalFunctionExecutionDUnitTest.java | 3 ++-
.../cache/execute/MemberFunctionExecutionDUnitTest.java | 3 ++-
.../execute/MultiRegionFunctionExecutionDUnitTest.java | 3 ++-
.../execute/OnGroupsFunctionExecutionDUnitTest.java | 3 ++-
.../PRClientServerFunctionExecutionNoAckDUnitTest.java | 3 ++-
.../PRClientServerRegionFunctionExecutionDUnitTest.java | 3 ++-
...tServerRegionFunctionExecutionFailoverDUnitTest.java | 3 ++-
...rverRegionFunctionExecutionNoSingleHopDUnitTest.java | 3 ++-
...onFunctionExecutionSelectorNoSingleHopDUnitTest.java | 3 ++-
...ServerRegionFunctionExecutionSingleHopDUnitTest.java | 3 ++-
.../cache/execute/PRFunctionExecutionDUnitTest.java | 3 ++-
.../PRFunctionExecutionWithResultSenderDUnitTest.java | 3 ++-
.../test/junit/categories/FunctionServiceTest.java | 17 +++--------------
gradle/test.gradle | 11 +++++++++++
36 files changed, 82 insertions(+), 48 deletions(-)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientFunctionTimeoutRegressionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientFunctionTimeoutRegressionTest.java
index 809d8fd..d709ebf 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientFunctionTimeoutRegressionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientFunctionTimeoutRegressionTest.java
@@ -61,6 +61,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FunctionServiceTest;
/**
* Server should terminate client function execution when it times out. Client sends
@@ -70,7 +71,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* TRAC #51193: The function execution connection on the server is never terminated even if the
* gemfire.CLIENT_FUNCTION_TIMEOUT property is set
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, FunctionServiceTest.class})
@RunWith(JUnitParamsRunner.class)
@SuppressWarnings("serial")
public class ClientFunctionTimeoutRegressionTest implements Serializable {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
index e6e1d8c..d66008c 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
@@ -56,8 +56,9 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FunctionServiceTest;
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({DistributedTest.class, ClientServerTest.class, FunctionServiceTest.class})
public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBase {
private static final String TEST_FUNCTION1 = TestFunction.TEST_FUNCTION1;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
index cc70f99..e0e681d 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
@@ -70,8 +70,9 @@ import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.categories.FunctionServiceTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, FunctionServiceTest.class})
public class DistributedRegionFunctionExecutionDUnitTest extends JUnit4DistributedTestCase {
VM replicate1 = null;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ExecuteFunctionInstanceRegressionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ExecuteFunctionInstanceRegressionTest.java
index d41c20f..e16063f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ExecuteFunctionInstanceRegressionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ExecuteFunctionInstanceRegressionTest.java
@@ -36,6 +36,7 @@ import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FunctionServiceTest;
/**
* TRAC #40714: Registering a function on a Java client changes the behavior when executing an
@@ -84,7 +85,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* <p>
* Extracted from {@link PRFunctionExecutionDUnitTest}.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, FunctionServiceTest.class})
public class ExecuteFunctionInstanceRegressionTest extends CacheTestCase {
private String regionName;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionExceptionsIncludeLocalMemberRegressionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionExceptionsIncludeLocalMemberRegressionTest.java
index 36036d2..542b533 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionExceptionsIncludeLocalMemberRegressionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionExceptionsIncludeLocalMemberRegressionTest.java
@@ -35,6 +35,7 @@ import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FunctionServiceTest;
/**
* TRAC #41779: InternalExecution.setWaitOnExceptionFlag(true) does not add the exception from the
@@ -43,7 +44,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* <p>
* Extracted from {@link PRFunctionExecutionDUnitTest}.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, FunctionServiceTest.class})
@SuppressWarnings("serial")
public class FunctionExceptionsIncludeLocalMemberRegressionTest extends CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionExecutionOnLonerRegressionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionExecutionOnLonerRegressionTest.java
index 55ebdb6..28add64 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionExecutionOnLonerRegressionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionExecutionOnLonerRegressionTest.java
@@ -45,6 +45,7 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.LonerDistributionManager;
+import org.apache.geode.test.junit.categories.FunctionServiceTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
@@ -58,7 +59,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* <p>
* Extracted from {@link PRFunctionExecutionDUnitTest}.
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, FunctionServiceTest.class})
public class FunctionExecutionOnLonerRegressionTest {
private Region<String, String> region;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionExecution_ExceptionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionExecution_ExceptionDUnitTest.java
index 540377f..c45fe39 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionExecution_ExceptionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionExecution_ExceptionDUnitTest.java
@@ -49,9 +49,10 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FunctionServiceTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, FunctionServiceTest.class})
@SuppressWarnings("serial")
public class FunctionExecution_ExceptionDUnitTest implements Serializable {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRDUnitTest.java
index 94dc26a..db391c7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRDUnitTest.java
@@ -18,11 +18,12 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FunctionServiceTest;
/**
* Tests function execution with a client accessing a single member with a PR using onRegion calls.
*/
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({DistributedTest.class, ClientServerTest.class, FunctionServiceTest.class})
public class FunctionServiceClientAccessorPRDUnitTest extends FunctionServiceClientAccessorPRBase {
@Override
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersDUnitTest.java
index 884f088..6f39fb3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersDUnitTest.java
@@ -21,12 +21,13 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FunctionServiceTest;
/**
* Tests function execution with a client accessing multiple members with a PR with redundancy 0
* using onRegion calls.
*/
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({DistributedTest.class, ClientServerTest.class, FunctionServiceTest.class})
public class FunctionServiceClientAccessorPRMultipleMembersDUnitTest
extends FunctionServiceClientAccessorPRBase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersMultihopDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersMultihopDUnitTest.java
index cc18592..53c2500 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersMultihopDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersMultihopDUnitTest.java
@@ -20,11 +20,12 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.client.ClientCacheFactory;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FunctionServiceTest;
/**
* Tests onRegion using multiple servers from a single client that has single hop disabled
*/
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({DistributedTest.class, ClientServerTest.class, FunctionServiceTest.class})
public class FunctionServiceClientAccessorPRMultipleMembersMultihopDUnitTest
extends FunctionServiceClientAccessorPRBase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientMultipleOnServerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientMultipleOnServerDUnitTest.java
index 701b22a..2fb639f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientMultipleOnServerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientMultipleOnServerDUnitTest.java
@@ -18,11 +18,12 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FunctionServiceTest;
/**
* Tests onServers using multiple servers from a single client.
*/
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({DistributedTest.class, ClientServerTest.class, FunctionServiceTest.class})
public class FunctionServiceClientMultipleOnServerDUnitTest
extends FunctionServiceClientOnServerBase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerDUnitTest.java
index 2f45a98..f51c215 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerDUnitTest.java
@@ -18,11 +18,12 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FunctionServiceTest;
/**
* Tests onServers using a single server from a single client.
*/
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({DistributedTest.class, ClientServerTest.class, FunctionServiceTest.class})
public class FunctionServiceClientOnServerDUnitTest extends FunctionServiceClientOnServerBase {
@Override
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceLocalPRDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceLocalPRDUnitTest.java
index 63c9250..ccb5ffb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceLocalPRDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceLocalPRDUnitTest.java
@@ -23,11 +23,12 @@ import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.cache.partition.PartitionRegionHelper;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FunctionServiceTest;
/**
* Test of the behavior of a custom ResultCollector when handling exceptions
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, FunctionServiceTest.class})
public class FunctionServiceLocalPRDUnitTest extends FunctionServiceBase {
public static final String REGION = "region";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceLocalRRDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceLocalRRDUnitTest.java
index de64e78..6e2fafe 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceLocalRRDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceLocalRRDUnitTest.java
@@ -22,11 +22,12 @@ import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FunctionServiceTest;
/**
* Test of the behavior of a custom ResultCollector when handling exceptions
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, FunctionServiceTest.class})
public class FunctionServiceLocalRRDUnitTest extends FunctionServiceBase {
public static final String REGION = "region";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceMultipleOnMemberDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceMultipleOnMemberDUnitTest.java
index c2031df..d07e13b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceMultipleOnMemberDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceMultipleOnMemberDUnitTest.java
@@ -26,11 +26,12 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FunctionServiceTest;
/**
* Test of the behavior of a custom ResultCollector when handling exceptions
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, FunctionServiceTest.class})
public class FunctionServiceMultipleOnMemberDUnitTest extends FunctionServiceBase {
private Set<DistributedMember> members = new HashSet<DistributedMember>();
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRDUnitTest.java
index 446eebb..6f6f848 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRDUnitTest.java
@@ -26,11 +26,12 @@ import org.apache.geode.cache.partition.PartitionRegionHelper;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FunctionServiceTest;
/**
* Test of the behavior of a custom ResultCollector when handling exceptions
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, FunctionServiceTest.class})
public class FunctionServicePeerAccessorPRDUnitTest extends FunctionServicePeerAccessorPRBase {
@Override
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRMultipleMembersDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRMultipleMembersDUnitTest.java
index fe695b6..8bd449b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRMultipleMembersDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRMultipleMembersDUnitTest.java
@@ -26,11 +26,12 @@ import org.apache.geode.cache.partition.PartitionRegionHelper;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FunctionServiceTest;
/**
* Test of the behavior of a custom ResultCollector when handling exceptions
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, FunctionServiceTest.class})
public class FunctionServicePeerAccessorPRMultipleMembersDUnitTest
extends FunctionServicePeerAccessorPRBase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorRRDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorRRDUnitTest.java
index fd290a8..cde5e24 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorRRDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorRRDUnitTest.java
@@ -24,11 +24,12 @@ import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FunctionServiceTest;
/**
* Test of the behavior of a custom ResultCollector when handling exceptions
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, FunctionServiceTest.class})
public class FunctionServicePeerAccessorRRDUnitTest extends FunctionServiceBase {
public static final String REGION = "region";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceSingleOnMemberDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceSingleOnMemberDUnitTest.java
index f5a841a..20a9708 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceSingleOnMemberDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceSingleOnMemberDUnitTest.java
@@ -21,11 +21,12 @@ import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FunctionServiceTest;
/**
* Test of the behavior of a custom ResultCollector when handling exceptions
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, FunctionServiceTest.class})
public class FunctionServiceSingleOnMemberDUnitTest extends FunctionServiceBase {
private DistributedMember memberId;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java
index eaef93f..cbc6894 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java
@@ -62,13 +62,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.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FunctionServiceTest;
/**
* This is DUnite Test to test the Function Execution stats under various scenarios like
* Client-Server with Region/without Region, P2P with partitioned Region/Distributed Region,member
* Execution
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, FunctionServiceTest.class})
public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase {
static Boolean isByName = null;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalDataSetDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalDataSetDUnitTest.java
index 5f67499..e1fb155 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalDataSetDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalDataSetDUnitTest.java
@@ -49,8 +49,9 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FunctionServiceTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, FunctionServiceTest.class})
public class LocalDataSetDUnitTest extends JUnit4CacheTestCase {
private static final long serialVersionUID = 1L;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalDataSetIndexingDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalDataSetIndexingDUnitTest.java
index c6d626e..3d21bfb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalDataSetIndexingDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalDataSetIndexingDUnitTest.java
@@ -52,12 +52,13 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FunctionServiceTest;
/**
*
*
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, FunctionServiceTest.class})
public class LocalDataSetIndexingDUnitTest extends JUnit4CacheTestCase {
protected static VM dataStore1 = null;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalFunctionExecutionDUnitTest.java
index 670e751..6cebb7e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalFunctionExecutionDUnitTest.java
@@ -43,8 +43,9 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FunctionServiceTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, FunctionServiceTest.class})
public class LocalFunctionExecutionDUnitTest extends JUnit4DistributedTestCase {
protected static Cache cache = null;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
index 761d78b..79cef38 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
@@ -59,8 +59,9 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FunctionServiceTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, FunctionServiceTest.class})
public class MemberFunctionExecutionDUnitTest extends JUnit4CacheTestCase {
private static final String TEST_FUNCTION6 = TestFunction.TEST_FUNCTION6;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java
index e6fccd8..5702754 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java
@@ -45,9 +45,10 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FunctionServiceTest;
@SuppressWarnings("serial")
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, FunctionServiceTest.class})
public class MultiRegionFunctionExecutionDUnitTest extends JUnit4CacheTestCase {
VM vm0 = null;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
index 4e3bb10..8590598 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
@@ -55,8 +55,9 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FunctionServiceTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, FunctionServiceTest.class})
public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCase {
@Override
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
index 22dd27c..b6cfa46 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
@@ -39,8 +39,9 @@ import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FunctionServiceTest;
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({DistributedTest.class, ClientServerTest.class, FunctionServiceTest.class})
public class PRClientServerFunctionExecutionNoAckDUnitTest extends PRClientServerTestBase {
/**
*
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
index 60a3837..7a202ab 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
@@ -66,8 +66,9 @@ import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.categories.FunctionServiceTest;
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({DistributedTest.class, ClientServerTest.class, FunctionServiceTest.class})
public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServerTestBase {
private static final String TEST_FUNCTION7 = TestFunction.TEST_FUNCTION7;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
index 11cbce6..11d47d6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
@@ -59,8 +59,9 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.categories.FunctionServiceTest;
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({DistributedTest.class, ClientServerTest.class, FunctionServiceTest.class})
public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends PRClientServerTestBase {
private static Locator locator = null;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
index 21a5328..2ba6171 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
@@ -62,8 +62,9 @@ import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.categories.FunctionServiceTest;
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({DistributedTest.class, ClientServerTest.class, FunctionServiceTest.class})
public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest
extends PRClientServerTestBase {
private static final String TEST_FUNCTION7 = TestFunction.TEST_FUNCTION7;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
index ee54394..2b16f6a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
@@ -65,8 +65,9 @@ import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.categories.FunctionServiceTest;
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({DistributedTest.class, ClientServerTest.class, FunctionServiceTest.class})
public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest
extends PRClientServerTestBase {
private static final String TEST_FUNCTION7 = TestFunction.TEST_FUNCTION7;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
index 002c1f2..cd6d47c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
@@ -61,8 +61,9 @@ import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FunctionServiceTest;
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({DistributedTest.class, ClientServerTest.class, FunctionServiceTest.class})
public class PRClientServerRegionFunctionExecutionSingleHopDUnitTest
extends PRClientServerTestBase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java
index d7cb8f1..e14cb26 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java
@@ -83,8 +83,9 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FunctionServiceTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, FunctionServiceTest.class})
public class PRFunctionExecutionDUnitTest extends CacheTestCase {
private static final String STRING_KEY = "execKey";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionWithResultSenderDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionWithResultSenderDUnitTest.java
index c111931..447fa7f 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionWithResultSenderDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionWithResultSenderDUnitTest.java
@@ -53,8 +53,9 @@ import org.apache.geode.internal.cache.functions.TestFunction;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FunctionServiceTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, FunctionServiceTest.class})
@SuppressWarnings("serial")
public class PRFunctionExecutionWithResultSenderDUnitTest extends CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerDUnitTest.java b/geode-junit/src/main/java/org/apache/geode/test/junit/categories/FunctionServiceTest.java
old mode 100644
new mode 100755
similarity index 60%
copy from geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerDUnitTest.java
copy to geode-junit/src/main/java/org/apache/geode/test/junit/categories/FunctionServiceTest.java
index 2f45a98..d08a76a
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerDUnitTest.java
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/categories/FunctionServiceTest.java
@@ -12,21 +12,10 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.geode.internal.cache.execute;
-
-import org.junit.experimental.categories.Category;
-
-import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
+package org.apache.geode.test.junit.categories;
/**
- * Tests onServers using a single server from a single client.
+ * A test category for function service-related tests
*/
-@Category({DistributedTest.class, ClientServerTest.class})
-public class FunctionServiceClientOnServerDUnitTest extends FunctionServiceClientOnServerBase {
-
- @Override
- public int numberOfExecutions() {
- return 1;
- }
+public interface FunctionServiceTest {
}
diff --git a/gradle/test.gradle b/gradle/test.gradle
index ce23b11..5121f34 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -222,6 +222,17 @@ subprojects {
reports.junitXml.destination = file "$buildDir/test-reports-oql-index"
}
+ task functionServiceTest(type:Test) {
+ useJUnit {
+ includeCategories 'org.apache.geode.test.junit.categories.FunctionServiceTest'
+ excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
+ }
+ doFirst {
+ TestPropertiesWriter.writeTestProperties(buildDir, name)
+ }
+ reports.junitXml.destination = file "$buildDir/test-reports-function-service"
+ }
+
task membershipTest(type:Test) {
useJUnit {
includeCategories 'org.apache.geode.test.junit.categories.MembershipTest'
--
To stop receiving notification emails like this one, please contact
jasonhuynh@apache.org.