You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2014/12/16 16:12:11 UTC

[08/18] incubator-ignite git commit: GG-9141 - Fixed and enabled test.

GG-9141 - Fixed and enabled test.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/62b9617e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/62b9617e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/62b9617e

Branch: refs/heads/ignite-41
Commit: 62b9617e78e420dce512cd126f2c0851d29ae518
Parents: 1c5984f
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Sun Dec 14 11:41:03 2014 -0800
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Sun Dec 14 11:41:03 2014 -0800

----------------------------------------------------------------------
 .../distributed/near/GridCacheNearMultiNodeSelfTest.java    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/62b9617e/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
index 4a53985..e6d1dff 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
@@ -12,7 +12,6 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near;
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.affinity.*;
 import org.gridgain.grid.cache.store.*;
@@ -362,7 +361,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     @SuppressWarnings({"ConstantConditions"})
-    public void _testOptimisticWriteThrough() throws Exception { // TODO GG-9141
+    public void testOptimisticWriteThrough() throws Exception {
         GridCache<Integer, String> near = cache(0);
 
         if (transactional()) {
@@ -377,7 +376,11 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
                 assertEquals("2", near.get(2));
                 assertEquals("3", near.get(3));
 
-                assertNull(dht(primaryGrid(2)).peek(2));
+                GridDhtCacheEntry<Integer, String> entry = dht(primaryGrid(2)).peekExx(2);
+
+                if (entry != null)
+                    assertNull("Unexpected entry: " + entry, entry.rawGetOrUnmarshal(false));
+
                 assertNotNull(dht(primaryGrid(3)).peek(3));
 
                 tx.commit();