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 2017/08/01 21:03:00 UTC
[06/50] [abbrv] geode git commit: GEODE-240: Remove deprecated
methods on TransactionEvent
GEODE-240: Remove deprecated methods on TransactionEvent
Removed deprecated methods getCreateEvents, getDestroyEvents, getPutEvents, getInvalidateEvents from the TransactionEvent.
Removed implementation for methods getCreateEvents, getDestroyEvents, getPutEvents, getInvalidateEvents from TxEvent and TxRmtEvent.
Added utility methods getCreateEvents, getDestroyEvents, getPutEvents, getInvalidateEvents in TxEventTestUtil.
Changed tests to use the new utilty methods from TxEventTestUtil.
Signed-off-by: Shankar <sh...@ampool.io>
This closes #515
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/eb7d2eaa
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/eb7d2eaa
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/eb7d2eaa
Branch: refs/heads/feature/GEODE-3299
Commit: eb7d2eaa7c7047eec5c8a88f54a07d2d4822574c
Parents: 09dd45f
Author: shankarh <sh...@apache.org>
Authored: Tue May 16 08:17:05 2017 +0530
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Tue Jul 25 16:52:09 2017 -0700
----------------------------------------------------------------------
.../apache/geode/cache/TransactionEvent.java | 39 --
.../apache/geode/internal/cache/TXEvent.java | 79 ----
.../apache/geode/internal/cache/TXRmtEvent.java | 78 ----
.../test/java/org/apache/geode/TXJUnitTest.java | 363 ++++++++++---------
.../geode/cache/util/TxEventTestUtil.java | 88 +++++
.../geode/cache30/MultiVMRegionTestCase.java | 67 ++--
6 files changed, 304 insertions(+), 410 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/eb7d2eaa/geode-core/src/main/java/org/apache/geode/cache/TransactionEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/TransactionEvent.java b/geode-core/src/main/java/org/apache/geode/cache/TransactionEvent.java
index cb15f1b..b589611 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/TransactionEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/TransactionEvent.java
@@ -56,45 +56,6 @@ public interface TransactionEvent {
public TransactionId getTransactionId();
/**
- * Gets all "create" EntryEvents for this transaction; <code>Region.create</code> and/or
- * <code>Region.put</code>
- *
- * @return <code>List</code> of <code>EntryEvents</code> or <code>Collections.EMPTY_LIST</code>
- * @deprecated as of GemFire 5.0, use {@link #getEvents} instead
- */
- @Deprecated
- public List<EntryEvent<?, ?>> getCreateEvents();
-
- /**
- * Gets all "destroy" EntryEvents for this transaction; <code>Region.destroy</code> and
- * <code>Region.localDestroy</code>.
- *
- * @return <code>List</code> of <code>EntryEvents</code> or <code>Collections.EMPTY_LIST</code>
- * @deprecated as of GemFire 5.0, use {@link #getEvents} instead
- */
- @Deprecated
- public List<EntryEvent<?, ?>> getDestroyEvents();
-
- /**
- * Gets all <code>Region.put</code> EntryEvents for this transaction.
- *
- * @return <code>List</code> of <code>EntryEvents</code> or <code>Collections.EMPTY_LIST</code>
- * @deprecated as of GemFire 5.0, use {@link #getEvents} instead
- */
- @Deprecated
- public List<EntryEvent<?, ?>> getPutEvents();
-
- /**
- * Gets all "invalidate" EntryEvents for this transaction; <code>Region.invalidate</code> and
- * <code>Region.localInvalidate</code>.
- *
- * @return <code>List</code> of <code>EntryEvents</code> or <code>Collections.EMPTY_LIST</code>
- * @deprecated as of GemFire 5.0, use {@link #getEvents} instead
- */
- @Deprecated
- public List<EntryEvent<?, ?>> getInvalidateEvents();
-
- /**
* Returns an ordered list of every {@link CacheEvent} for this transaction. The event order is
* consistent with the order in which the operations were performed during the transaction.
*
http://git-wip-us.apache.org/repos/asf/geode/blob/eb7d2eaa/geode-core/src/main/java/org/apache/geode/internal/cache/TXEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEvent.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEvent.java
index 8acc63b..777eea5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEvent.java
@@ -27,10 +27,6 @@ public class TXEvent implements TransactionEvent, Releasable {
private final TXStateInterface localTxState;
private List events;
- private List createEvents = null;
- private List putEvents = null;
- private List invalidateEvents = null;
- private List destroyEvents = null;
final private Cache cache;
TXEvent(TXStateInterface localTxState, Cache cache) {
@@ -43,81 +39,6 @@ public class TXEvent implements TransactionEvent, Releasable {
return this.localTxState.getTransactionId();
}
- public synchronized List getCreateEvents() {
- if (this.createEvents == null) {
- ArrayList result = new ArrayList();
- Iterator it = getEvents().iterator();
- while (it.hasNext()) {
- CacheEvent ce = (CacheEvent) it.next();
- if (ce.getOperation().isCreate()) {
- result.add(ce);
- }
- }
- if (result.isEmpty()) {
- this.createEvents = Collections.EMPTY_LIST;
- } else {
- this.createEvents = Collections.unmodifiableList(result);
- }
- }
- return this.createEvents;
- }
-
- public synchronized List getPutEvents() {
- if (this.putEvents == null) {
- ArrayList result = new ArrayList();
- Iterator it = getEvents().iterator();
- while (it.hasNext()) {
- CacheEvent ce = (CacheEvent) it.next();
- if (ce.getOperation().isUpdate()) {
- result.add(ce);
- }
- }
- if (result.isEmpty()) {
- this.putEvents = Collections.EMPTY_LIST;
- } else {
- this.putEvents = Collections.unmodifiableList(result);
- }
- }
- return this.putEvents;
- }
-
- public synchronized List getInvalidateEvents() {
- if (this.invalidateEvents == null) {
- ArrayList result = new ArrayList();
- Iterator it = getEvents().iterator();
- while (it.hasNext()) {
- CacheEvent ce = (CacheEvent) it.next();
- if (ce.getOperation().isInvalidate()) {
- result.add(ce);
- }
- }
- if (result.isEmpty()) {
- this.invalidateEvents = Collections.EMPTY_LIST;
- } else {
- this.invalidateEvents = Collections.unmodifiableList(result);
- }
- }
- return this.invalidateEvents;
- }
-
- public synchronized List getDestroyEvents() {
- if (this.destroyEvents == null) {
- ArrayList result = new ArrayList();
- Iterator it = getEvents().iterator();
- while (it.hasNext()) {
- CacheEvent ce = (CacheEvent) it.next();
- if (ce.getOperation().isDestroy()) {
- result.add(ce);
- }
- }
- if (result.isEmpty()) {
- this.destroyEvents = Collections.EMPTY_LIST;
- } else {
- this.destroyEvents = Collections.unmodifiableList(result);
- }
- }
- return this.destroyEvents;
- }
public synchronized List getEvents() {
if (this.events == null) {
http://git-wip-us.apache.org/repos/asf/geode/blob/eb7d2eaa/geode-core/src/main/java/org/apache/geode/internal/cache/TXRmtEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXRmtEvent.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXRmtEvent.java
index 92e4b8b..f41ae16 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXRmtEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXRmtEvent.java
@@ -103,85 +103,7 @@ public class TXRmtEvent implements TransactionEvent {
return true;
}
- public List getCreateEvents() {
- if (this.events == null) {
- return Collections.EMPTY_LIST;
- } else {
- ArrayList result = new ArrayList(this.events.size());
- Iterator it = this.events.iterator();
- while (it.hasNext()) {
- CacheEvent ce = (CacheEvent) it.next();
- if (ce.getOperation().isCreate() && isEventUserVisible(ce)) {
- result.add(ce);
- }
- }
- if (result.isEmpty()) {
- return Collections.EMPTY_LIST;
- } else {
- return Collections.unmodifiableList(result);
- }
- }
- }
-
- public List getPutEvents() {
- if (this.events == null) {
- return Collections.EMPTY_LIST;
- } else {
- ArrayList result = new ArrayList(this.events.size());
- Iterator it = this.events.iterator();
- while (it.hasNext()) {
- CacheEvent ce = (CacheEvent) it.next();
- if (ce.getOperation().isUpdate() && isEventUserVisible(ce)) {
- result.add(ce);
- }
- }
- if (result.isEmpty()) {
- return Collections.EMPTY_LIST;
- } else {
- return Collections.unmodifiableList(result);
- }
- }
- }
- public List getInvalidateEvents() {
- if (this.events == null) {
- return Collections.EMPTY_LIST;
- } else {
- ArrayList result = new ArrayList(this.events.size());
- Iterator it = this.events.iterator();
- while (it.hasNext()) {
- CacheEvent ce = (CacheEvent) it.next();
- if (ce.getOperation().isInvalidate() && isEventUserVisible(ce)) {
- result.add(ce);
- }
- }
- if (result.isEmpty()) {
- return Collections.EMPTY_LIST;
- } else {
- return Collections.unmodifiableList(result);
- }
- }
- }
-
- public List getDestroyEvents() {
- if (this.events == null) {
- return Collections.EMPTY_LIST;
- } else {
- ArrayList result = new ArrayList(this.events.size());
- Iterator it = this.events.iterator();
- while (it.hasNext()) {
- CacheEvent ce = (CacheEvent) it.next();
- if (ce.getOperation().isDestroy() && isEventUserVisible(ce)) {
- result.add(ce);
- }
- }
- if (result.isEmpty()) {
- return Collections.EMPTY_LIST;
- } else {
- return Collections.unmodifiableList(result);
- }
- }
- }
public boolean isEmpty() {
return (events == null) || events.isEmpty();
http://git-wip-us.apache.org/repos/asf/geode/blob/eb7d2eaa/geode-core/src/test/java/org/apache/geode/TXJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/TXJUnitTest.java b/geode-core/src/test/java/org/apache/geode/TXJUnitTest.java
index 5a72cf9..733b31c 100644
--- a/geode-core/src/test/java/org/apache/geode/TXJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/TXJUnitTest.java
@@ -29,6 +29,7 @@ import java.util.Set;
import javax.transaction.Synchronization;
+import org.apache.geode.cache.util.TxEventTestUtil;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
@@ -470,7 +471,7 @@ public class TXJUnitTest {
assertEquals("value2", reg2.get("key2"));
assertEquals(txCommitChanges + 2, stats.getTxCommitChanges());
{
- List<EntryEvent<?, ?>> creates = this.te.getCreateEvents();
+ List<EntryEvent<?, ?>> creates = TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(2, creates.size());
@@ -536,13 +537,13 @@ public class TXJUnitTest {
reg1.create("key1", "value1");
this.txMgr.rollback();
assertEquals(1, this.te.getEvents().size());
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
{
Cache teCache = this.te.getCache();
assertEquals(teCache, this.cache);
- List<EntryEvent<?, ?>> creates = this.te.getCreateEvents();
+ List<EntryEvent<?, ?>> creates = TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, creates.size());
@@ -568,13 +569,13 @@ public class TXJUnitTest {
reg1.put("key1", "value1");
this.txMgr.rollback();
assertEquals(1, this.te.getEvents().size());
- assertEquals(0, this.te.getCreateEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
+ assertEquals(0, TxEventTestUtil.getCreateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
{
Cache teCache = this.te.getCache();
assertEquals(teCache, this.cache);
- List<EntryEvent<?, ?>> creates = this.te.getPutEvents();
+ List<EntryEvent<?, ?>> creates = TxEventTestUtil.getPutEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, creates.size());
@@ -600,13 +601,13 @@ public class TXJUnitTest {
reg1.put("key1", "value0");
this.txMgr.rollback();
assertEquals(1, this.te.getEvents().size());
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
{
Cache teCache = this.te.getCache();
assertEquals(teCache, this.cache);
- List<EntryEvent<?, ?>> creates = this.te.getCreateEvents();
+ List<EntryEvent<?, ?>> creates = TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, creates.size());
@@ -632,13 +633,13 @@ public class TXJUnitTest {
reg1.invalidate("key1");
this.txMgr.rollback();
assertEquals(1, this.te.getEvents().size());
- assertEquals(0, this.te.getCreateEvents().size());
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
+ assertEquals(0, TxEventTestUtil.getCreateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
{
Cache teCache = this.te.getCache();
assertEquals(teCache, this.cache);
- List<EntryEvent<?, ?>> creates = this.te.getInvalidateEvents();
+ List<EntryEvent<?, ?>> creates = TxEventTestUtil.getInvalidateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, creates.size());
@@ -665,13 +666,13 @@ public class TXJUnitTest {
reg1.localInvalidate("key1");
this.txMgr.rollback();
assertEquals(1, this.te.getEvents().size());
- assertEquals(0, this.te.getCreateEvents().size());
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
+ assertEquals(0, TxEventTestUtil.getCreateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
{
Cache teCache = this.te.getCache();
assertEquals(teCache, this.cache);
- List<EntryEvent<?, ?>> creates = this.te.getInvalidateEvents();
+ List<EntryEvent<?, ?>> creates = TxEventTestUtil.getInvalidateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, creates.size());
@@ -699,13 +700,13 @@ public class TXJUnitTest {
reg1.destroy("key1");
this.txMgr.rollback();
assertEquals(1, this.te.getEvents().size());
- assertEquals(0, this.te.getCreateEvents().size());
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
+ assertEquals(0, TxEventTestUtil.getCreateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
{
Cache teCache = this.te.getCache();
assertEquals(teCache, this.cache);
- List<EntryEvent<?, ?>> creates = this.te.getDestroyEvents();
+ List<EntryEvent<?, ?>> creates = TxEventTestUtil.getDestroyEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, creates.size());
@@ -732,13 +733,13 @@ public class TXJUnitTest {
reg1.localDestroy("key1");
this.txMgr.rollback();
assertEquals(1, this.te.getEvents().size());
- assertEquals(0, this.te.getCreateEvents().size());
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
+ assertEquals(0, TxEventTestUtil.getCreateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
{
Cache teCache = this.te.getCache();
assertEquals(teCache, this.cache);
- List<EntryEvent<?, ?>> creates = this.te.getDestroyEvents();
+ List<EntryEvent<?, ?>> creates = TxEventTestUtil.getDestroyEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, creates.size());
@@ -1141,11 +1142,11 @@ public class TXJUnitTest {
callbackVal.reAssert();
assertEquals("value2", reg1.getEntry("key1").getValue());
assertEquals(1, this.te.getEvents().size());
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
{
- List<EntryEvent<?, ?>> events = this.te.getCreateEvents();
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -1182,11 +1183,11 @@ public class TXJUnitTest {
assertTrue(reg1.containsKey("key1"));
assertTrue(!reg1.containsValueForKey("key1"));
assertEquals(1, this.te.getEvents().size());
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
{
- List<EntryEvent<?, ?>> events = this.te.getCreateEvents();
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -1227,10 +1228,10 @@ public class TXJUnitTest {
callbackVal.reAssert();
assertTrue(!reg1.containsKey("key1"));
assertEquals(0, this.te.getEvents().size());
- assertEquals(0, this.te.getCreateEvents().size());
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
+ assertEquals(0, TxEventTestUtil.getCreateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
// Check C + LI -> C
callbackVal.reset();
@@ -1247,12 +1248,12 @@ public class TXJUnitTest {
callbackVal.reAssert();
assertTrue(reg1.containsKey("key1"));
assertTrue(!reg1.containsValueForKey("key1"));
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<?, ?>> events = this.te.getCreateEvents();
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -1298,12 +1299,12 @@ public class TXJUnitTest {
callbackVal.reAssert();
assertTrue(reg1.containsKey("key1"));
assertEquals("value2", reg1.getEntry("key1").getValue());
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<?, ?>> events = this.te.getCreateEvents();
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -1338,10 +1339,10 @@ public class TXJUnitTest {
callbackVal.assertDestroyListenerCnt(0);
callbackVal.reAssert();
assertTrue(!reg1.containsKey("key1"));
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
- assertEquals(0, this.te.getCreateEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getCreateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(0, this.te.getEvents().size());
// Check C + LI + DD -> NOOP
@@ -1359,10 +1360,10 @@ public class TXJUnitTest {
callbackVal.assertCreateListenerCnt(0);
callbackVal.reAssert();
assertTrue(!reg1.containsKey("key1"));
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
- assertEquals(0, this.te.getCreateEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getCreateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(0, this.te.getEvents().size());
// check C + LD -> NOOP
@@ -1378,10 +1379,10 @@ public class TXJUnitTest {
callbackVal.assertLocalDestroyListenerCnt(0);
callbackVal.reAssert();
assertTrue(!reg1.containsKey("key1"));
- assertEquals(0, this.te.getCreateEvents().size());
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
+ assertEquals(0, TxEventTestUtil.getCreateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(0, this.te.getEvents().size());
// check C + LD + D -> EX
@@ -1426,12 +1427,12 @@ public class TXJUnitTest {
callbackVal.assertCreateListenerCnt(1);
callbackVal.reAssert();
assertEquals("value3", reg1.getEntry("key1").getValue());
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<?, ?>> events = this.te.getCreateEvents();
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -1467,12 +1468,12 @@ public class TXJUnitTest {
callbackVal.assertUpdateListenerCnt(0);
callbackVal.reAssert();
assertEquals("value3", reg1.getEntry("key1").getValue());
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<?, ?>> events = this.te.getCreateEvents();
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -1516,12 +1517,12 @@ public class TXJUnitTest {
callbackVal.assertUpdateListenerCnt(1);
callbackVal.reAssert();
assertEquals("value3", reg1.getEntry("key1").getValue());
- assertEquals(0, this.te.getCreateEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
+ assertEquals(0, TxEventTestUtil.getCreateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<?, ?>> events = this.te.getPutEvents();
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getPutEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -1558,12 +1559,12 @@ public class TXJUnitTest {
callbackVal.reAssert();
assertTrue(reg1.containsKey("key1"));
assertTrue(!reg1.containsValueForKey("key1"));
- assertEquals(0, this.te.getCreateEvents().size());
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
+ assertEquals(0, TxEventTestUtil.getCreateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<?, ?>> events = this.te.getInvalidateEvents();
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getInvalidateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -1599,12 +1600,12 @@ public class TXJUnitTest {
callbackVal.assertDestroyListenerCnt(1);
callbackVal.reAssert();
assertTrue(!reg1.containsKey("key1"));
- assertEquals(0, this.te.getCreateEvents().size());
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
+ assertEquals(0, TxEventTestUtil.getCreateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<?, ?>> events = this.te.getDestroyEvents();
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getDestroyEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -1640,12 +1641,12 @@ public class TXJUnitTest {
assertTrue(reg1.containsKey("key1"));
assertEquals(null, reg1.getEntry("key1").getValue());
assertTrue(!reg1.containsValueForKey("key1"));
- assertEquals(0, this.te.getCreateEvents().size());
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
+ assertEquals(0, TxEventTestUtil.getCreateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<?, ?>> events = this.te.getInvalidateEvents();
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getInvalidateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -1691,12 +1692,12 @@ public class TXJUnitTest {
callbackVal.reAssert();
assertTrue(reg1.containsKey("key1"));
assertEquals("value2", reg1.getEntry("key1").getValue());
- assertEquals(0, this.te.getCreateEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
+ assertEquals(0, TxEventTestUtil.getCreateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<?, ?>> events = this.te.getPutEvents();
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getPutEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -1734,12 +1735,12 @@ public class TXJUnitTest {
callbackVal.assertLocalDestroyListenerCnt(1);
callbackVal.reAssert();
assertTrue(!reg1.containsKey("key1"));
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
- assertEquals(0, this.te.getCreateEvents().size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getCreateEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<?, ?>> events = this.te.getDestroyEvents();
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getDestroyEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -1775,12 +1776,12 @@ public class TXJUnitTest {
callbackVal.assertDestroyListenerCnt(1);
callbackVal.reAssert();
assertTrue(!reg1.containsKey("key1"));
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
- assertEquals(0, this.te.getCreateEvents().size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getCreateEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<?, ?>> events = this.te.getDestroyEvents();
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getDestroyEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -1815,12 +1816,12 @@ public class TXJUnitTest {
callbackVal.assertLocalDestroyListenerCnt(1);
callbackVal.reAssert();
assertTrue(!reg1.containsKey("key1"));
- assertEquals(0, this.te.getCreateEvents().size());
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
+ assertEquals(0, TxEventTestUtil.getCreateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<?, ?>> events = this.te.getDestroyEvents();
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getDestroyEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -1883,12 +1884,12 @@ public class TXJUnitTest {
callbackVal.assertUpdateListenerCnt(1);
callbackVal.reAssert();
assertEquals("value3", reg1.getEntry("key1").getValue());
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<?, ?>> events = this.te.getCreateEvents();
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -1925,12 +1926,12 @@ public class TXJUnitTest {
callbackVal.assertUpdateListenerCnt(1);
callbackVal.reAssert();
assertEquals("value3", reg1.getEntry("key1").getValue());
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<?, ?>> events = this.te.getCreateEvents();
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -1971,12 +1972,12 @@ public class TXJUnitTest {
callbackVal.assertUpdateListenerCnt(1);
callbackVal.reAssert();
assertEquals("value2", reg1.getEntry("key1").getValue());
- assertEquals(0, this.te.getCreateEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
+ assertEquals(0, TxEventTestUtil.getCreateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<?, ?>> events = this.te.getPutEvents();
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getPutEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -2010,12 +2011,12 @@ public class TXJUnitTest {
callbackVal.assertDestroyListenerCnt(1);
callbackVal.reAssert();
assertTrue(!reg1.containsKey("key1"));
- assertEquals(0, this.te.getCreateEvents().size());
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
+ assertEquals(0, TxEventTestUtil.getCreateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<?, ?>> events = this.te.getDestroyEvents();
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getDestroyEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -2049,12 +2050,12 @@ public class TXJUnitTest {
callbackVal.assertLocalDestroyListenerCnt(1);
callbackVal.reAssert();
assertTrue(!reg1.containsKey("key1"));
- assertEquals(0, this.te.getCreateEvents().size());
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
+ assertEquals(0, TxEventTestUtil.getCreateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<?, ?>> events = this.te.getDestroyEvents();
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getDestroyEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -2120,12 +2121,12 @@ public class TXJUnitTest {
callbackVal.assertUpdateListenerCnt(1);
callbackVal.reAssert();
assertEquals("value3", reg1.getEntry("key1").getValue());
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<?, ?>> events = this.te.getCreateEvents();
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -2164,12 +2165,12 @@ public class TXJUnitTest {
callbackVal.assertUpdateListenerCnt(1);
callbackVal.reAssert();
assertEquals("value3", reg1.getEntry("key1").getValue());
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<?, ?>> events = this.te.getCreateEvents();
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -2211,12 +2212,12 @@ public class TXJUnitTest {
callbackVal.assertInvalidateCnt(0);
callbackVal.reAssert();
assertEquals("value2", reg1.getEntry("key1").getValue());
- assertEquals(0, this.te.getCreateEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
+ assertEquals(0, TxEventTestUtil.getCreateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<?, ?>> events = this.te.getPutEvents();
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getPutEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -2251,12 +2252,12 @@ public class TXJUnitTest {
callbackVal.assertDestroyListenerCnt(1);
callbackVal.reAssert();
assertTrue(!reg1.containsKey("key1"));
- assertEquals(0, this.te.getCreateEvents().size());
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
+ assertEquals(0, TxEventTestUtil.getCreateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<?, ?>> events = this.te.getDestroyEvents();
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getDestroyEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -2290,12 +2291,12 @@ public class TXJUnitTest {
callbackVal.assertLocalDestroyListenerCnt(1);
callbackVal.reAssert();
assertTrue(!reg1.containsKey("key1"));
- assertEquals(0, this.te.getCreateEvents().size());
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
+ assertEquals(0, TxEventTestUtil.getCreateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<?, ?>> events = this.te.getDestroyEvents();
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getDestroyEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -2361,12 +2362,12 @@ public class TXJUnitTest {
callbackVal.assertUpdateListenerCnt(1);
callbackVal.reAssert();
assertEquals("value3", reg1.getEntry("key1").getValue());
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<?, ?>> events = this.te.getCreateEvents();
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -2405,12 +2406,12 @@ public class TXJUnitTest {
callbackVal.assertUpdateListenerCnt(1);
callbackVal.reAssert();
assertEquals("value3", reg1.getEntry("key1").getValue());
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<?, ?>> events = this.te.getCreateEvents();
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -2451,12 +2452,12 @@ public class TXJUnitTest {
LocalRegion.NonTXEntry nonTXe = (LocalRegion.NonTXEntry) reg1.getEntry("key1");
assertTrue(nonTXe.getRegionEntry().isInvalid());
}
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
- assertEquals(0, this.te.getCreateEvents().size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getCreateEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<?, ?>> events = this.te.getInvalidateEvents();
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getInvalidateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -2495,12 +2496,12 @@ public class TXJUnitTest {
LocalRegion.NonTXEntry nonTXe = (LocalRegion.NonTXEntry) reg1.getEntry("key1");
assertTrue(nonTXe.getRegionEntry().isInvalid());
}
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
- assertEquals(0, this.te.getCreateEvents().size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getCreateEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<?, ?>> events = this.te.getInvalidateEvents();
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getInvalidateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -2536,12 +2537,12 @@ public class TXJUnitTest {
callbackVal.assertUpdateListenerCnt(1);
callbackVal.reAssert();
assertEquals("value1", reg1.getEntry("key1").getValue());
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<?, ?>> events = this.te.getCreateEvents();
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -2577,12 +2578,12 @@ public class TXJUnitTest {
callbackVal.assertUpdateListenerCnt(1);
callbackVal.reAssert();
assertEquals("value1", reg1.getEntry("key1").getValue());
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<?, ?>> events = this.te.getCreateEvents();
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -2618,12 +2619,12 @@ public class TXJUnitTest {
callbackVal.assertUpdateListenerCnt(1);
callbackVal.reAssert();
assertEquals("value1", reg1.getEntry("key1").getValue());
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<?, ?>> events = this.te.getCreateEvents();
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -2659,12 +2660,12 @@ public class TXJUnitTest {
callbackVal.assertUpdateListenerCnt(1);
callbackVal.reAssert();
assertEquals("value1", reg1.getEntry("key1").getValue());
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<?, ?>> events = this.te.getCreateEvents();
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -2858,10 +2859,10 @@ public class TXJUnitTest {
assertEquals(0, this.listenerAfterRollback);
this.txMgr.rollback();
assertEquals(1, this.listenerAfterRollback);
- assertEquals(0, this.te.getCreateEvents().size());
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
+ assertEquals(0, TxEventTestUtil.getCreateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(0, this.te.getEvents().size());
assertEquals(myTxId, this.te.getTransactionId());
@@ -2874,10 +2875,10 @@ public class TXJUnitTest {
fail("did not expect " + unexpected);
}
assertEquals(1, this.listenerAfterCommit);
- assertEquals(0, this.te.getCreateEvents().size());
- assertEquals(0, this.te.getPutEvents().size());
- assertEquals(0, this.te.getInvalidateEvents().size());
- assertEquals(0, this.te.getDestroyEvents().size());
+ assertEquals(0, TxEventTestUtil.getCreateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(0, this.te.getEvents().size());
assertEquals(myTxId, this.te.getTransactionId());
http://git-wip-us.apache.org/repos/asf/geode/blob/eb7d2eaa/geode-core/src/test/java/org/apache/geode/cache/util/TxEventTestUtil.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/util/TxEventTestUtil.java b/geode-core/src/test/java/org/apache/geode/cache/util/TxEventTestUtil.java
new file mode 100644
index 0000000..dad18d7
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/cache/util/TxEventTestUtil.java
@@ -0,0 +1,88 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.cache.util;
+
+import org.apache.geode.cache.CacheEvent;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Utilty class for getting Transaction events for create, invalidate, put, destroy operations.
+ */
+public class TxEventTestUtil {
+
+ /**
+ * Retrieves the cache events with operation create
+ *
+ * @return list of cache events
+ */
+ public static List getCreateEvents(List<CacheEvent<?, ?>> events) {
+ if (events != null && !events.isEmpty()) {
+ List<CacheEvent<?, ?>> result =
+ events.stream().filter(ce -> ce.getOperation().isCreate()).collect(Collectors.toList());
+ return result;
+ } else {
+ return Collections.EMPTY_LIST;
+ }
+ }
+
+ /**
+ * Retrieves the cache events with operation update
+ *
+ * @return list of cache events
+ */
+ public static List getPutEvents(List<CacheEvent<?, ?>> events) {
+ if (events != null && !events.isEmpty()) {
+ List<CacheEvent<?, ?>> result =
+ events.stream().filter(ce -> ce.getOperation().isUpdate()).collect(Collectors.toList());
+ return result;
+ } else {
+ return Collections.EMPTY_LIST;
+ }
+ }
+
+ /**
+ * Retrieves the cache events with operation invalidate
+ *
+ * @return list of cache events
+ */
+ public static List getInvalidateEvents(List<CacheEvent<?, ?>> events) {
+ if (events != null && !events.isEmpty()) {
+ List<CacheEvent<?, ?>> result = events.stream().filter(ce -> ce.getOperation().isInvalidate())
+ .collect(Collectors.toList());
+ return result;
+ } else {
+ return Collections.EMPTY_LIST;
+ }
+ }
+
+ /**
+ * Retrieves the cache events with operation destroy
+ *
+ * @return list of cache events
+ */
+ public static List getDestroyEvents(List<CacheEvent<?, ?>> events) {
+ if (events != null && !events.isEmpty()) {
+ List<CacheEvent<?, ?>> result =
+ events.stream().filter(ce -> ce.getOperation().isDestroy()).collect(Collectors.toList());
+ return result;
+ } else {
+ return Collections.EMPTY_LIST;
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/eb7d2eaa/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java b/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
index ff996a2..34cf1ca 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
@@ -40,6 +40,7 @@ import java.util.Random;
import java.util.Set;
import java.util.concurrent.LinkedBlockingQueue;
+import org.apache.geode.cache.util.TxEventTestUtil;
import org.apache.logging.log4j.Logger;
import org.junit.AfterClass;
import org.junit.Ignore;
@@ -6089,9 +6090,9 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
Collection events;
RegionAttributes attr = getRegionAttributes();
if (!attr.getDataPolicy().withReplication() || attr.getConcurrencyChecksEnabled()) {
- events = tl.lastEvent.getPutEvents();
+ events = TxEventTestUtil.getPutEvents(tl.lastEvent.getEvents());
} else {
- events = tl.lastEvent.getCreateEvents();
+ events = TxEventTestUtil.getCreateEvents(tl.lastEvent.getEvents());
}
assertEquals(1, events.size());
EntryEvent ev = (EntryEvent) events.iterator().next();
@@ -6136,7 +6137,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
tl.checkAfterCommitCount(2);
assertEquals(rgn1.getCache(), tl.lastEvent.getCache());
{
- Collection events = tl.lastEvent.getPutEvents();
+ Collection events = TxEventTestUtil.getPutEvents(tl.lastEvent.getEvents());
assertEquals(1, events.size());
EntryEvent ev = (EntryEvent) events.iterator().next();
assertEquals(tl.expectedTxId, ev.getTransactionId());
@@ -6182,7 +6183,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
tl.checkAfterCommitCount(3);
assertEquals(rgn1.getCache(), tl.lastEvent.getCache());
{
- Collection events = tl.lastEvent.getInvalidateEvents();
+ Collection events = TxEventTestUtil.getInvalidateEvents(tl.lastEvent.getEvents());
assertEquals(1, events.size());
EntryEvent ev = (EntryEvent) events.iterator().next();
assertEquals(tl.expectedTxId, ev.getTransactionId());
@@ -6226,7 +6227,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
tl.checkAfterCommitCount(4);
assertEquals(rgn1.getCache(), tl.lastEvent.getCache());
{
- Collection events = tl.lastEvent.getDestroyEvents();
+ Collection events = TxEventTestUtil.getDestroyEvents(tl.lastEvent.getEvents());
assertEquals(1, events.size());
EntryEvent ev = (EntryEvent) events.iterator().next();
assertEquals(tl.expectedTxId, ev.getTransactionId());
@@ -6354,7 +6355,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
getSystem().getLogWriter().info("testTXUpdateLoadNoConflict: did commit");
assertEquals("txValue", rgn.getEntry("key").getValue());
{
- Collection events = tl.lastEvent.getCreateEvents();
+ Collection events = TxEventTestUtil.getCreateEvents(tl.lastEvent.getEvents());
assertEquals(1, events.size());
EntryEvent ev = (EntryEvent) events.iterator().next();
assertEquals(myTXId, ev.getTransactionId());
@@ -6403,7 +6404,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
getSystem().getLogWriter().info("testTXUpdateLoadNoConflict: did commit");
assertEquals("txValue3", rgn.getEntry("key3").getValue());
{
- Collection events = tl.lastEvent.getCreateEvents();
+ Collection events = TxEventTestUtil.getCreateEvents(tl.lastEvent.getEvents());
assertEquals(1, events.size());
EntryEvent ev = (EntryEvent) events.iterator().next();
assertEquals(myTXId, ev.getTransactionId());
@@ -6462,7 +6463,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
getSystem().getLogWriter().info("testTXUpdateLoadNoConflict: did commit");
assertEquals("new txValue", rgn.getEntry("key").getValue());
{
- Collection events = tl.lastEvent.getPutEvents();
+ Collection events = TxEventTestUtil.getPutEvents(tl.lastEvent.getEvents());
assertEquals(1, events.size());
EntryEvent ev = (EntryEvent) events.iterator().next();
assertEquals(myTXId, ev.getTransactionId());
@@ -6636,9 +6637,9 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
Collection events;
RegionAttributes attr = getRegionAttributes();
if (!attr.getDataPolicy().withReplication() || attr.getConcurrencyChecksEnabled()) {
- events = tl.lastEvent.getPutEvents();
+ events = TxEventTestUtil.getPutEvents(tl.lastEvent.getEvents());
} else {
- events = tl.lastEvent.getCreateEvents();
+ events = TxEventTestUtil.getCreateEvents(tl.lastEvent.getEvents());
}
assertEquals(2, events.size());
ArrayList eventList = new ArrayList(events);
@@ -6713,9 +6714,9 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
Collection events;
RegionAttributes attr = getRegionAttributes();
if (!attr.getDataPolicy().withReplication() || attr.getConcurrencyChecksEnabled()) {
- events = tl.lastEvent.getPutEvents();
+ events = TxEventTestUtil.getPutEvents(tl.lastEvent.getEvents());
} else {
- events = tl.lastEvent.getCreateEvents();
+ events = TxEventTestUtil.getCreateEvents(tl.lastEvent.getEvents());
}
assertEquals(2, events.size());
ArrayList eventList = new ArrayList(events);
@@ -6784,9 +6785,9 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
Collection events;
RegionAttributes attr = getRegionAttributes();
if (!attr.getDataPolicy().withReplication() || attr.getConcurrencyChecksEnabled()) {
- events = tl.lastEvent.getPutEvents();
+ events = TxEventTestUtil.getPutEvents(tl.lastEvent.getEvents());
} else {
- events = tl.lastEvent.getCreateEvents();
+ events = TxEventTestUtil.getCreateEvents(tl.lastEvent.getEvents());
}
assertEquals(1, events.size());
EntryEvent ev = (EntryEvent) events.iterator().next();
@@ -6824,9 +6825,9 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
Collection events;
RegionAttributes attr = getRegionAttributes();
if (!attr.getDataPolicy().withReplication() || attr.getConcurrencyChecksEnabled()) {
- events = tl.lastEvent.getPutEvents();
+ events = TxEventTestUtil.getPutEvents(tl.lastEvent.getEvents());
} else {
- events = tl.lastEvent.getCreateEvents();
+ events = TxEventTestUtil.getCreateEvents(tl.lastEvent.getEvents());
}
assertEquals(1, events.size());
EntryEvent ev = (EntryEvent) events.iterator().next();
@@ -6864,9 +6865,9 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
Collection events;
RegionAttributes attr = getRegionAttributes();
if (!attr.getDataPolicy().withReplication() || attr.getConcurrencyChecksEnabled()) {
- events = tl.lastEvent.getPutEvents();
+ events = TxEventTestUtil.getPutEvents(tl.lastEvent.getEvents());
} else {
- events = tl.lastEvent.getCreateEvents();
+ events = TxEventTestUtil.getCreateEvents(tl.lastEvent.getEvents());
}
assertEquals(1, events.size());
EntryEvent ev = (EntryEvent) events.iterator().next();
@@ -7333,7 +7334,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
assertEquals(0, tl.closeCount);
assertEquals(rgn.getCache(), tl.lastEvent.getCache());
{
- Collection events = tl.lastEvent.getCreateEvents();
+ Collection events = TxEventTestUtil.getCreateEvents(tl.lastEvent.getEvents());
assertEquals(1, events.size());
EntryEvent ev = (EntryEvent) events.iterator().next();
// assertIndexDetailsEquals(tl.expectedTxId, ev.getTransactionId());
@@ -7366,8 +7367,8 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
assertEquals(0, tl.afterFailedCommitCount);
assertEquals(0, tl.afterRollbackCount);
assertEquals(0, tl.closeCount);
- assertEquals(0, tl.lastEvent.getCreateEvents().size());
- assertEquals(0, tl.lastEvent.getPutEvents().size());
+ assertEquals(0, TxEventTestUtil.getCreateEvents(tl.lastEvent.getEvents()).size());
+ assertEquals(0, TxEventTestUtil.getPutEvents(tl.lastEvent.getEvents()).size());
assertEquals(rgn.getCache(), tl.lastEvent.getCache());
}
};
@@ -7485,9 +7486,9 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
Collection events;
RegionAttributes attr = getRegionAttributes();
if (!attr.getDataPolicy().withReplication() || attr.getConcurrencyChecksEnabled()) {
- events = tl.lastEvent.getPutEvents();
+ events = TxEventTestUtil.getPutEvents(tl.lastEvent.getEvents());
} else {
- events = tl.lastEvent.getCreateEvents();
+ events = TxEventTestUtil.getCreateEvents(tl.lastEvent.getEvents());
}
assertEquals(1, events.size());
EntryEvent ev = (EntryEvent) events.iterator().next();
@@ -7511,7 +7512,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
assertEquals("value2", rgn.getEntry("key").getValue());
{
localTl.assertCounts(1, 0, 0, 0);
- Collection events = localTl.lastEvent.getCreateEvents();
+ Collection events = TxEventTestUtil.getCreateEvents(localTl.lastEvent.getEvents());
assertEquals(myTXId, localTl.lastEvent.getTransactionId());
assertEquals(1, events.size());
EntryEvent ev = (EntryEvent) events.iterator().next();
@@ -7564,9 +7565,9 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
Collection events;
RegionAttributes attr = getRegionAttributes();
if (!attr.getDataPolicy().withReplication() || attr.getConcurrencyChecksEnabled()) {
- events = tl.lastEvent.getPutEvents();
+ events = TxEventTestUtil.getPutEvents(tl.lastEvent.getEvents());
} else {
- events = tl.lastEvent.getCreateEvents();
+ events = TxEventTestUtil.getCreateEvents(tl.lastEvent.getEvents());
}
assertEquals(1, events.size());
EntryEvent ev = (EntryEvent) events.iterator().next();
@@ -7591,7 +7592,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
assertTrue(!rgn.containsValueForKey("key"));
localTl.assertCounts(2, 0, 0, 0);
{
- Collection events = localTl.lastEvent.getCreateEvents();
+ Collection events = TxEventTestUtil.getCreateEvents(localTl.lastEvent.getEvents());
assertEquals(myTXId, localTl.lastEvent.getTransactionId());
assertEquals(1, events.size());
EntryEvent ev = (EntryEvent) events.iterator().next();
@@ -7670,7 +7671,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
assertNull(rgn.getEntry("key").getValue());
localTl.assertCounts(3, 0, 0, 0);
{
- Collection events = localTl.lastEvent.getInvalidateEvents();
+ Collection events = TxEventTestUtil.getInvalidateEvents(localTl.lastEvent.getEvents());
assertEquals(1, events.size());
EntryEvent ev = (EntryEvent) events.iterator().next();
assertEquals(myTXId, ev.getTransactionId());
@@ -7717,7 +7718,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
assertTrue(!rgn1.containsValueForKey("key"));
tl.assertCounts(3, 0, 0, 0);
{
- Collection events = tl.lastEvent.getDestroyEvents();
+ Collection events = TxEventTestUtil.getDestroyEvents(tl.lastEvent.getEvents());
assertEquals(1, events.size());
EntryEvent ev = (EntryEvent) events.iterator().next();
// assertIndexDetailsEquals(tl.expectedTxId, ev.getTransactionId());
@@ -7781,9 +7782,9 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
Collection events;
RegionAttributes attr = getRegionAttributes();
if (!attr.getDataPolicy().withReplication() || attr.getConcurrencyChecksEnabled()) {
- events = tl.lastEvent.getPutEvents();
+ events = TxEventTestUtil.getPutEvents(tl.lastEvent.getEvents());
} else {
- events = tl.lastEvent.getCreateEvents();
+ events = TxEventTestUtil.getCreateEvents(tl.lastEvent.getEvents());
}
assertEquals(1, events.size());
EntryEvent ev = (EntryEvent) events.iterator().next();
@@ -7808,7 +7809,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
assertTrue(!rgn.containsValueForKey("key"));
localTl.assertCounts(4, 0, 0, 0);
{
- Collection events = localTl.lastEvent.getCreateEvents();
+ Collection events = TxEventTestUtil.getCreateEvents(localTl.lastEvent.getEvents());
assertEquals(myTXId, localTl.lastEvent.getTransactionId());
assertEquals(1, events.size());
EntryEvent ev = (EntryEvent) events.iterator().next();
@@ -7854,7 +7855,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
assertEquals("value2", rgn.getEntry("key").getValue());
localTl.assertCounts(5, 0, 0, 0);
{
- Collection events = localTl.lastEvent.getCreateEvents();
+ Collection events = TxEventTestUtil.getCreateEvents(localTl.lastEvent.getEvents());
assertEquals(myTXId, localTl.lastEvent.getTransactionId());
assertEquals(1, events.size());
EntryEvent ev = (EntryEvent) events.iterator().next();