Repository: ignite Updated Branches: refs/heads/ignite-8446 03410eff8 -> 369e5d82e
8446 Signed-off-by: Anton Vinogradov <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/369e5d82 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/369e5d82 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/369e5d82 Branch: refs/heads/ignite-8446 Commit: 369e5d82e0776e823d5768d321e5c97e0cb7b105 Parents: 03410ef Author: Anton Vinogradov <[email protected]> Authored: Mon Jul 2 16:07:34 2018 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Mon Jul 2 16:07:34 2018 +0300 ---------------------------------------------------------------------- .../TxRollbackOnIncorrectParamsTest.java | 33 +++----------------- .../transactions/TxStateChangeEventTest.java | 2 -- 2 files changed, 5 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/369e5d82/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnIncorrectParamsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnIncorrectParamsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnIncorrectParamsTest.java index 2b6e3b0..8dd777d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnIncorrectParamsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnIncorrectParamsTest.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import javax.cache.CacheException; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; -import org.apache.ignite.IgniteEvents; import org.apache.ignite.IgniteException; import org.apache.ignite.events.Event; import org.apache.ignite.events.TransactionStateChangedEvent; @@ -34,7 +33,6 @@ import org.apache.ignite.transactions.Transaction; import org.apache.ignite.transactions.TransactionConcurrency; import org.apache.ignite.transactions.TransactionIsolation; -import static org.apache.ignite.events.EventType.EVTS_TX; import static org.apache.ignite.events.EventType.EVT_TX_STARTED; /** @@ -47,11 +45,7 @@ public class TxRollbackOnIncorrectParamsTest extends GridCommonAbstractTest { public void testTimeoutSetLocalGuarantee() throws Exception { Ignite ignite = startGrid(0); - final IgniteEvents evts = ignite.events(); - - evts.enableLocal(EVTS_TX); - - evts.localListen((IgnitePredicate<Event>)e -> { + ignite.events().localListen((IgnitePredicate<Event>)e -> { assert e instanceof TransactionStateChangedEvent; TransactionStateChangedEvent evt = (TransactionStateChangedEvent)e; @@ -103,11 +97,7 @@ public class TxRollbackOnIncorrectParamsTest extends GridCommonAbstractTest { public void testLabelFilledLocalGuarantee() throws Exception { Ignite ignite = startGrid(0); - final IgniteEvents evts = ignite.events(); - - evts.enableLocal(EVTS_TX); - - evts.localListen((IgnitePredicate<Event>)e -> { + ignite.events().localListen((IgnitePredicate<Event>)e -> { assert e instanceof TransactionStateChangedEvent; TransactionStateChangedEvent evt = (TransactionStateChangedEvent)e; @@ -150,11 +140,7 @@ public class TxRollbackOnIncorrectParamsTest extends GridCommonAbstractTest { IgniteCache cacheLocal = ignite.getOrCreateCache(defaultCacheConfiguration()); IgniteCache cacheRemote = remote.getOrCreateCache(defaultCacheConfiguration()); - final IgniteEvents evts = ignite.events(); - - evts.enableLocal(EVTS_TX); - - evts.remoteListen(null, + ignite.events().remoteListen(null, (IgnitePredicate<Event>)e -> { assert e instanceof TransactionStateChangedEvent; @@ -214,11 +200,7 @@ public class TxRollbackOnIncorrectParamsTest extends GridCommonAbstractTest { IgniteCache cacheLocal = ignite.getOrCreateCache(defaultCacheConfiguration()); IgniteCache cacheRemote = remote.getOrCreateCache(defaultCacheConfiguration()); - final IgniteEvents evts = ignite.events(); - - evts.enableLocal(EVTS_TX); - - evts.remoteListen(null, + ignite.events().remoteListen(null, (IgnitePredicate<Event>)e -> { assert e instanceof TransactionStateChangedEvent; @@ -233,7 +215,6 @@ public class TxRollbackOnIncorrectParamsTest extends GridCommonAbstractTest { }, EVT_TX_STARTED); - try (Transaction tx = ignite.transactions().txStart( TransactionConcurrency.OPTIMISTIC, TransactionIsolation.REPEATABLE_READ, 100, 2)) { cacheLocal.put(1, 1); @@ -281,14 +262,10 @@ public class TxRollbackOnIncorrectParamsTest extends GridCommonAbstractTest { IgniteCache cacheLocal = ignite.getOrCreateCache(defaultCacheConfiguration()); IgniteCache cacheRemote = remote.getOrCreateCache(defaultCacheConfiguration()); - final IgniteEvents evts = ignite.events(); - - evts.enableLocal(EVTS_TX); - AtomicBoolean rollbackFailed = new AtomicBoolean(); AtomicBoolean alreadyRolledBack = new AtomicBoolean(); - evts.remoteListen( + ignite.events().remoteListen( (IgniteBiPredicate<UUID, Event>)(uuid, e) -> { assert e instanceof TransactionStateChangedEvent; http://git-wip-us.apache.org/repos/asf/ignite/blob/369e5d82/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxStateChangeEventTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxStateChangeEventTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxStateChangeEventTest.java index 9f26964..01c87ae 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxStateChangeEventTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxStateChangeEventTest.java @@ -85,8 +85,6 @@ public class TxStateChangeEventTest extends GridCommonAbstractTest { final IgniteEvents evts = loc ? ignite.events() : grid(3).events(); - evts.enableLocal(EVTS_TX); - if (loc) evts.localListen((IgnitePredicate<Event>)e -> { assert e instanceof TransactionStateChangedEvent;
