You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2021/02/02 17:04:44 UTC
[geode] 04/06: GEODE-8252: Rename DistributedErrorCollector (#5563)
This is an automated email from the ASF dual-hosted git repository.
klund pushed a commit to branch support/1.13
in repository https://gitbox.apache.org/repos/asf/geode.git
commit c51468f159b08e74e7a110fa9687be551c4bc595
Author: Kirk Lund <kl...@apache.org>
AuthorDate: Wed Sep 30 14:33:16 2020 -0700
GEODE-8252: Rename DistributedErrorCollector (#5563)
Rename SharedErrorCollector as DistributedErrorCollector.
(cherry picked from commit 581b68dc573f77046859c571f74e68f8b8e5ebd8)
---
.../cli/commands/StartServerCommandDUnitTest.java | 4 +--
.../ReplicateCacheListenerDistributedTest.java | 4 +--
.../apache/geode/distributed/LocatorDUnitTest.java | 4 +--
.../ClusterDistributionManagerDUnitTest.java | 4 +--
.../internal/DistributionAdvisorDUnitTest.java | 4 +--
.../cache/BucketCreationCrashRegressionTest.java | 4 +--
.../internal/cache/DeltaPropagationDUnitTest.java | 16 ++++-----
...RQueryWithPdxDuringRebalanceRegressionTest.java | 4 +--
.../PersistentRVVRecoveryDUnitTest.java | 4 +--
.../DistributedSystemMXBeanDistributedTest.java | 4 +--
...butedSystemMXBeanWithAlertsDistributedTest.java | 4 +--
...stemMXBeanWithNotificationsDistributedTest.java | 4 +--
.../management/JMXMBeanReconnectDUnitTest.java | 4 +--
...BeanFederationErrorHandlingDistributedTest.java | 4 +--
... DistributedErrorCollectorDistributedTest.java} | 42 +++++++++++-----------
...llector.java => DistributedErrorCollector.java} | 9 +++--
16 files changed, 59 insertions(+), 60 deletions(-)
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/StartServerCommandDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/StartServerCommandDUnitTest.java
index cc0362a..0123e64 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/StartServerCommandDUnitTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/StartServerCommandDUnitTest.java
@@ -68,8 +68,8 @@ import org.apache.geode.internal.process.ProcessUtils;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.management.internal.i18n.CliStrings;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.DistributedErrorCollector;
import org.apache.geode.test.dunit.rules.MemberVM;
-import org.apache.geode.test.dunit.rules.SharedErrorCollector;
import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.RequiresGeodeHome;
import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
@@ -94,7 +94,7 @@ public class StartServerCommandDUnitTest implements Serializable {
public static GfshCommandRule gfsh = new GfshCommandRule();
@Rule
- public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
@Rule
public SerializableTemporaryFolder temporaryFolder = new SerializableTemporaryFolder();
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/ReplicateCacheListenerDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/ReplicateCacheListenerDistributedTest.java
index b0e1894..e25dd2b 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/ReplicateCacheListenerDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/ReplicateCacheListenerDistributedTest.java
@@ -31,9 +31,9 @@ import org.junit.Test;
import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.test.dunit.rules.CacheRule;
+import org.apache.geode.test.dunit.rules.DistributedErrorCollector;
import org.apache.geode.test.dunit.rules.DistributedRule;
import org.apache.geode.test.dunit.rules.SharedCountersRule;
-import org.apache.geode.test.dunit.rules.SharedErrorCollector;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
/**
@@ -72,7 +72,7 @@ public class ReplicateCacheListenerDistributedTest implements Serializable {
public SharedCountersRule sharedCountersRule = new SharedCountersRule();
@Rule
- public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
@Before
public void setUp() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorDUnitTest.java
index 2a01cd6..1eb343e 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorDUnitTest.java
@@ -116,8 +116,8 @@ 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.internal.DUnitLauncher;
+import org.apache.geode.test.dunit.rules.DistributedErrorCollector;
import org.apache.geode.test.dunit.rules.DistributedRule;
-import org.apache.geode.test.dunit.rules.SharedErrorCollector;
import org.apache.geode.test.junit.categories.MembershipTest;
/**
@@ -151,7 +151,7 @@ public class LocatorDUnitTest implements Serializable {
public DistributedRule distributedRule = new DistributedRule(6);
@Rule
- public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
@Before
public void setUp() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerDUnitTest.java
index 46029b9..65c2fe8 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerDUnitTest.java
@@ -73,8 +73,8 @@ import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
+import org.apache.geode.test.dunit.rules.DistributedErrorCollector;
import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
-import org.apache.geode.test.dunit.rules.SharedErrorCollector;
import org.apache.geode.test.junit.categories.MembershipTest;
/**
@@ -98,7 +98,7 @@ public class ClusterDistributionManagerDUnitTest extends CacheTestCase {
new DistributedRestoreSystemProperties();
@Rule
- public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
private int locatorPort;
@Before
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionAdvisorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionAdvisorDUnitTest.java
index 43ec10c..8fafa22 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionAdvisorDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionAdvisorDUnitTest.java
@@ -42,7 +42,7 @@ import org.apache.geode.distributed.internal.DistributionAdvisor.Profile;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.test.dunit.DistributedTestCase;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.dunit.rules.SharedErrorCollector;
+import org.apache.geode.test.dunit.rules.DistributedErrorCollector;
import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.rules.ExecutorServiceRule;
@@ -57,7 +57,7 @@ public class DistributionAdvisorDUnitTest extends DistributedTestCase {
public ExecutorServiceRule executorServiceRule = new ExecutorServiceRule();
@Rule
- public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
@Before
public void setUp() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/BucketCreationCrashRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/BucketCreationCrashRegressionTest.java
index 762c0b6..074ab7c 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/BucketCreationCrashRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/BucketCreationCrashRegressionTest.java
@@ -57,8 +57,8 @@ import org.apache.geode.test.dunit.RMIException;
import org.apache.geode.test.dunit.SerializableRunnableIF;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
+import org.apache.geode.test.dunit.rules.DistributedErrorCollector;
import org.apache.geode.test.dunit.rules.DistributedRule;
-import org.apache.geode.test.dunit.rules.SharedErrorCollector;
import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
@@ -93,7 +93,7 @@ public class BucketCreationCrashRegressionTest implements Serializable {
public SerializableTestName testName = new SerializableTestName();
@Rule
- public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
@Before
public void setUp() throws Exception {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaPropagationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaPropagationDUnitTest.java
index 1b0efdb..c78c576 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaPropagationDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaPropagationDUnitTest.java
@@ -101,9 +101,9 @@ import org.apache.geode.internal.serialization.Version;
import org.apache.geode.internal.statistics.StatisticsClock;
import org.apache.geode.internal.tcp.ConnectionTable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.rules.DistributedErrorCollector;
import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
import org.apache.geode.test.dunit.rules.DistributedRule;
-import org.apache.geode.test.dunit.rules.SharedErrorCollector;
import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
@@ -152,7 +152,7 @@ public class DeltaPropagationDUnitTest implements Serializable {
@Rule
public SerializableTestName testName = new SerializableTestName();
@Rule
- public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
@Before
public void setUp() {
@@ -1486,9 +1486,9 @@ public class DeltaPropagationDUnitTest implements Serializable {
private static class ValidatingClientListener extends CacheListenerAdapter<String, Object> {
- private final SharedErrorCollector errorCollector;
+ private final DistributedErrorCollector errorCollector;
- private ValidatingClientListener(SharedErrorCollector errorCollector) {
+ private ValidatingClientListener(DistributedErrorCollector errorCollector) {
this.errorCollector = errorCollector;
}
@@ -1511,9 +1511,9 @@ public class DeltaPropagationDUnitTest implements Serializable {
private static class SkipThirdDeltaValue extends ValidatingClientListener {
- private final SharedErrorCollector errorCollector;
+ private final DistributedErrorCollector errorCollector;
- private SkipThirdDeltaValue(SharedErrorCollector errorCollector) {
+ private SkipThirdDeltaValue(DistributedErrorCollector errorCollector) {
super(errorCollector);
this.errorCollector = errorCollector;
}
@@ -1562,9 +1562,9 @@ public class DeltaPropagationDUnitTest implements Serializable {
private static class DurableClientListener extends CacheListenerAdapter<String, Object> {
- private final SharedErrorCollector errorCollector;
+ private final DistributedErrorCollector errorCollector;
- private DurableClientListener(SharedErrorCollector errorCollector) {
+ private DurableClientListener(DistributedErrorCollector errorCollector) {
this.errorCollector = errorCollector;
}
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRQueryWithPdxDuringRebalanceRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRQueryWithPdxDuringRebalanceRegressionTest.java
index e69f466..0efc686 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRQueryWithPdxDuringRebalanceRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRQueryWithPdxDuringRebalanceRegressionTest.java
@@ -45,8 +45,8 @@ import org.apache.geode.distributed.internal.DistributionMessageObserver;
import org.apache.geode.internal.cache.partitioned.QueryMessage;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
+import org.apache.geode.test.dunit.rules.DistributedErrorCollector;
import org.apache.geode.test.dunit.rules.DistributedRule;
-import org.apache.geode.test.dunit.rules.SharedErrorCollector;
import org.apache.geode.test.junit.categories.OQLQueryTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
@@ -79,7 +79,7 @@ public class PRQueryWithPdxDuringRebalanceRegressionTest implements Serializable
public SerializableTestName testName = new SerializableTestName();
@Rule
- public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
@Before
public void setUp() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
index 6fb4c97..86b2520 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
@@ -83,8 +83,8 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.dunit.rules.DistributedErrorCollector;
import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
-import org.apache.geode.test.dunit.rules.SharedErrorCollector;
import org.apache.geode.test.junit.categories.PersistenceTest;
@Category(PersistenceTest.class)
@@ -100,7 +100,7 @@ public class PersistentRVVRecoveryDUnitTest extends PersistentReplicatedTestBase
new DistributedRestoreSystemProperties();
@Rule
- public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
@After
public void tearDown() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/management/DistributedSystemMXBeanDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/DistributedSystemMXBeanDistributedTest.java
index 0fa6ecc..555c981 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/management/DistributedSystemMXBeanDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/management/DistributedSystemMXBeanDistributedTest.java
@@ -44,8 +44,8 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.SystemManagementService;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.rules.DistributedErrorCollector;
import org.apache.geode.test.dunit.rules.DistributedRule;
-import org.apache.geode.test.dunit.rules.SharedErrorCollector;
import org.apache.geode.test.junit.categories.ManagementTest;
/**
@@ -79,7 +79,7 @@ public class DistributedSystemMXBeanDistributedTest implements Serializable {
public DistributedRule distributedRule = new DistributedRule();
@Rule
- public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
@Before
public void setUp() throws Exception {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/management/DistributedSystemMXBeanWithAlertsDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/DistributedSystemMXBeanWithAlertsDistributedTest.java
index f23303d..2efc907 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/management/DistributedSystemMXBeanWithAlertsDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/management/DistributedSystemMXBeanWithAlertsDistributedTest.java
@@ -70,8 +70,8 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.logging.internal.log4j.api.LogService;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.rules.DistributedErrorCollector;
import org.apache.geode.test.dunit.rules.DistributedRule;
-import org.apache.geode.test.dunit.rules.SharedErrorCollector;
import org.apache.geode.test.junit.categories.AlertingTest;
import org.apache.geode.test.junit.categories.ManagementTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
@@ -119,7 +119,7 @@ public class DistributedSystemMXBeanWithAlertsDistributedTest implements Seriali
public SerializableTestName testName = new SerializableTestName();
@Rule
- public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
@Before
public void setUp() throws Exception {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/management/DistributedSystemMXBeanWithNotificationsDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/DistributedSystemMXBeanWithNotificationsDistributedTest.java
index 5fedea4..354dc51 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/management/DistributedSystemMXBeanWithNotificationsDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/management/DistributedSystemMXBeanWithNotificationsDistributedTest.java
@@ -60,8 +60,8 @@ import org.apache.geode.management.internal.SystemManagementService;
import org.apache.geode.management.internal.beans.MemberMBean;
import org.apache.geode.management.internal.beans.SequenceNumber;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.rules.DistributedErrorCollector;
import org.apache.geode.test.dunit.rules.DistributedRule;
-import org.apache.geode.test.dunit.rules.SharedErrorCollector;
import org.apache.geode.test.junit.categories.ManagementTest;
/**
@@ -113,7 +113,7 @@ public class DistributedSystemMXBeanWithNotificationsDistributedTest implements
public DistributedRule distributedRule = new DistributedRule();
@Rule
- public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
@Before
public void setUp() throws Exception {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/management/JMXMBeanReconnectDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/JMXMBeanReconnectDUnitTest.java
index 85c8629..781ffc1 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/management/JMXMBeanReconnectDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/management/JMXMBeanReconnectDUnitTest.java
@@ -72,8 +72,8 @@ import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.distributed.internal.membership.api.MemberDisconnectedException;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.rules.DistributedErrorCollector;
import org.apache.geode.test.dunit.rules.DistributedRule;
-import org.apache.geode.test.dunit.rules.SharedErrorCollector;
import org.apache.geode.test.junit.categories.JMXTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.GfshCommandRule.PortType;
@@ -119,7 +119,7 @@ public class JMXMBeanReconnectDUnitTest implements Serializable {
@Rule
public SerializableTemporaryFolder temporaryFolder = new SerializableTemporaryFolder();
@Rule
- public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
@Rule
public transient GfshCommandRule gfsh = new GfshCommandRule();
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/MBeanFederationErrorHandlingDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/MBeanFederationErrorHandlingDistributedTest.java
index 41a179a..36cc35d 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/MBeanFederationErrorHandlingDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/MBeanFederationErrorHandlingDistributedTest.java
@@ -54,9 +54,9 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.statistics.StatisticsClock;
import org.apache.geode.management.ManagementService;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.rules.DistributedErrorCollector;
import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
import org.apache.geode.test.dunit.rules.DistributedRule;
-import org.apache.geode.test.dunit.rules.SharedErrorCollector;
import org.apache.geode.test.junit.categories.JMXTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
@@ -80,7 +80,7 @@ public class MBeanFederationErrorHandlingDistributedTest implements Serializable
public DistributedRule distributedRule = new DistributedRule();
@Rule
- public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
@Rule
public DistributedRestoreSystemProperties restoreSystemProperties =
diff --git a/geode-dunit/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/SharedErrorCollectorDistributedTest.java b/geode-dunit/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/DistributedErrorCollectorDistributedTest.java
similarity index 88%
rename from geode-dunit/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/SharedErrorCollectorDistributedTest.java
rename to geode-dunit/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/DistributedErrorCollectorDistributedTest.java
index 6e1d1df..0900e03 100644
--- a/geode-dunit/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/SharedErrorCollectorDistributedTest.java
+++ b/geode-dunit/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/DistributedErrorCollectorDistributedTest.java
@@ -32,14 +32,14 @@ import org.junit.Test;
import org.junit.rules.ErrorCollector;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.rules.DistributedErrorCollector;
import org.apache.geode.test.dunit.rules.DistributedRule;
-import org.apache.geode.test.dunit.rules.SharedErrorCollector;
/**
- * Distributed tests for {@link SharedErrorCollector}.
+ * Distributed tests for {@link DistributedErrorCollector}.
*/
@SuppressWarnings("serial")
-public class SharedErrorCollectorDistributedTest {
+public class DistributedErrorCollectorDistributedTest {
private static final String MESSAGE = "Failure message";
@@ -191,7 +191,7 @@ public class SharedErrorCollectorDistributedTest {
public static class CheckThatFailsInController {
@Rule
- public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
@Test
public void assertionFailsInController() {
@@ -205,7 +205,7 @@ public class SharedErrorCollectorDistributedTest {
public static class AddErrorInController {
@Rule
- public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
@Test
public void exceptionInController() {
@@ -219,7 +219,7 @@ public class SharedErrorCollectorDistributedTest {
public static class CheckThatFailsInDUnitVM implements Serializable {
@Rule
- public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
@Test
public void assertionFailsInDUnitVM() {
@@ -233,7 +233,7 @@ public class SharedErrorCollectorDistributedTest {
public static class CheckThatFailsInEveryDUnitVM implements Serializable {
@Rule
- public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
@Test
public void assertionFailsInEveryDUnitVM() {
@@ -250,7 +250,7 @@ public class SharedErrorCollectorDistributedTest {
public static class CheckThatFailsInEveryDUnitVMAndController implements Serializable {
@Rule
- public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
@Test
public void assertionFailsInEveryDUnitVM() {
@@ -268,7 +268,7 @@ public class SharedErrorCollectorDistributedTest {
public static class CheckThatFailsInMethodInDUnitVM implements Serializable {
@Rule
- public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
@Test
public void assertionFailsInDUnitVM() {
@@ -286,7 +286,7 @@ public class SharedErrorCollectorDistributedTest {
public static class AddErrorInDUnitVM implements Serializable {
@Rule
- public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
@Test
public void exceptionInDUnitVM() {
@@ -300,7 +300,7 @@ public class SharedErrorCollectorDistributedTest {
public static class AddErrorInEveryDUnitVM implements Serializable {
@Rule
- public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
@Test
public void exceptionInEveryDUnitVM() {
@@ -317,7 +317,7 @@ public class SharedErrorCollectorDistributedTest {
public static class AddErrorInEveryDUnitVMAndController implements Serializable {
@Rule
- public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
@Test
public void exceptionInEveryDUnitVM() {
@@ -335,7 +335,7 @@ public class SharedErrorCollectorDistributedTest {
public static class AddErrorInMethodInDUnitVM implements Serializable {
@Rule
- public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
@Test
public void exceptionInDUnitVM() {
@@ -353,7 +353,7 @@ public class SharedErrorCollectorDistributedTest {
public static class AddDUnitVM implements Serializable {
@Rule
- public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
@Test
public void addDUnitVM() {
@@ -371,7 +371,7 @@ public class SharedErrorCollectorDistributedTest {
public static class AddErrorInNewDUnitVM implements Serializable {
@Rule
- public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
@Test
public void exceptionInNewDUnitVM() {
@@ -385,7 +385,7 @@ public class SharedErrorCollectorDistributedTest {
public static class BounceDUnitVM implements Serializable {
@Rule
- public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
@Test
public void addDUnitVM() {
@@ -399,7 +399,7 @@ public class SharedErrorCollectorDistributedTest {
public static class AddErrorInBouncedDUnitVM implements Serializable {
@Rule
- public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
@Test
public void exceptionInBouncedDUnitVM() {
@@ -414,7 +414,7 @@ public class SharedErrorCollectorDistributedTest {
public static class AddErrorBeforeBouncingDUnitVM implements Serializable {
@Rule
- public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
@Test
public void exceptionInBouncedDUnitVM() {
@@ -429,7 +429,7 @@ public class SharedErrorCollectorDistributedTest {
public static class AddErrorBeforeAndAfterBouncingDUnitVM implements Serializable {
@Rule
- public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
@Test
public void exceptionInBouncedDUnitVM() {
@@ -445,7 +445,7 @@ public class SharedErrorCollectorDistributedTest {
public static class CheckSucceedsDoesNotThrow implements Serializable {
@Rule
- public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
@Test
public void checkSucceeds() {
@@ -461,7 +461,7 @@ public class SharedErrorCollectorDistributedTest {
public static class CheckSucceedsThrows implements Serializable {
@Rule
- public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
@Test
public void checkSucceeds() {
diff --git a/geode-dunit/src/main/java/org/apache/geode/test/dunit/rules/SharedErrorCollector.java b/geode-dunit/src/main/java/org/apache/geode/test/dunit/rules/DistributedErrorCollector.java
similarity index 93%
rename from geode-dunit/src/main/java/org/apache/geode/test/dunit/rules/SharedErrorCollector.java
rename to geode-dunit/src/main/java/org/apache/geode/test/dunit/rules/DistributedErrorCollector.java
index 525a892..34183fa 100644
--- a/geode-dunit/src/main/java/org/apache/geode/test/dunit/rules/SharedErrorCollector.java
+++ b/geode-dunit/src/main/java/org/apache/geode/test/dunit/rules/DistributedErrorCollector.java
@@ -34,14 +34,14 @@ import org.apache.geode.test.junit.rules.accessible.AccessibleErrorCollector;
* registered in multiple DistributedTest VMs.
*
* <p>
- * {@code SharedErrorCollector} can be used in DistributedTests as a {@code Rule}:
+ * {@code DistributedErrorCollector} can be used in DistributedTests as a {@code Rule}:
*
* <pre>
* {@literal @}Rule
* public DistributedRule distributedRule = new DistributedRule();
*
* {@literal @}Rule
- * public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ * public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
*
* {@literal @}Test
* public void everyVmFailsAssertion() {
@@ -55,13 +55,13 @@ import org.apache.geode.test.junit.rules.accessible.AccessibleErrorCollector;
* For a more thorough example, please see
* {@code org.apache.geode.cache.ReplicateCacheListenerDistributedTest} in the tests of geode-core.
*/
-public class SharedErrorCollector extends AbstractDistributedRule {
+public class DistributedErrorCollector extends AbstractDistributedRule {
private static volatile AccessibleErrorCollector errorCollector;
private final Map<Integer, List<Throwable>> beforeBounceErrors = new HashMap<>();
- public SharedErrorCollector() {
+ public DistributedErrorCollector() {
// nothing
}
@@ -136,5 +136,4 @@ public class SharedErrorCollector extends AbstractDistributedRule {
private void invokeBefore() {
errorCollector = new AccessibleErrorCollector();
}
-
}