ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [01/20] ignite git commit: IGNITE-2064 More test fixes
Date Wed, 09 Dec 2015 12:13:07 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-1537 63f00fb48 -> 729c0d0cd


IGNITE-2064 More test fixes


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

Branch: refs/heads/ignite-1537
Commit: 8ca163bd0f06cc832df126733dbbe50cea35c2ac
Parents: 67ebd02
Author: Anton Vinogradov <av@apache.org>
Authored: Tue Dec 8 15:46:10 2015 +0300
Committer: Anton Vinogradov <av@apache.org>
Committed: Tue Dec 8 15:46:10 2015 +0300

----------------------------------------------------------------------
 .../GridCacheConditionalDeploymentSelfTest.java | 20 ++++++++++++--------
 .../cache/GridCacheDeploymentSelfTest.java      | 11 ++++++++---
 2 files changed, 20 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/8ca163bd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
index c03eb08..4098225 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
@@ -18,11 +18,11 @@
 package org.apache.ignite.internal.processors.cache;
 
 import org.apache.ignite.Ignite;
-import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.Ignition;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.managers.communication.GridIoMessageFactory;
+import org.apache.ignite.internal.portable.BinaryMarshaller;
 import org.apache.ignite.internal.util.IgniteUtils;
 import org.apache.ignite.internal.util.typedef.CO;
 import org.apache.ignite.plugin.extensions.communication.Message;
@@ -139,19 +139,23 @@ public class GridCacheConditionalDeploymentSelfTest extends GridCommonAbstractTe
     public void testAddedDeploymentInfo2() throws Exception {
         GridCacheContext ctx = cacheContext();
 
-        assertTrue(ctx.deploymentEnabled());
+        if (grid(0).configuration().getMarshaller() instanceof BinaryMarshaller)
+            assertFalse(ctx.deploymentEnabled());
+        else {
+            assertTrue(ctx.deploymentEnabled());
 
-        GridCacheIoManager ioMgr = cacheIoManager();
+            GridCacheIoManager ioMgr = cacheIoManager();
 
-        TestMessage msg = new TestMessage();
+            TestMessage msg = new TestMessage();
 
-        assertNull(msg.deployInfo());
+            assertNull(msg.deployInfo());
 
-        msg.addDepInfo = false;
+            msg.addDepInfo = false;
 
-        IgniteUtils.invoke(GridCacheIoManager.class, ioMgr, "onSend", msg, grid(1).cluster().localNode().id());
+            IgniteUtils.invoke(GridCacheIoManager.class, ioMgr, "onSend", msg, grid(1).cluster().localNode().id());
 
-        assertNull(msg.deployInfo());
+            assertNull(msg.deployInfo());
+        }
     }
 
     protected GridCacheContext cacheContext() {

http://git-wip-us.apache.org/repos/asf/ignite/blob/8ca163bd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
index e18520d..aa64959 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
@@ -26,6 +26,7 @@ import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.DeploymentMode;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.internal.portable.BinaryMarshaller;
 import org.apache.ignite.internal.util.typedef.T2;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
@@ -207,7 +208,9 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest
{
             }
 
             assertEquals(0, g1.cache(null).localSize());
-            assertEquals(0, g2.cache(null).localSize());
+
+            assertEquals(g2.configuration().getMarshaller() instanceof BinaryMarshaller ?
1 : 0,
+                g2.cache(null).localSize());
 
             startGrid(3);
         }
@@ -223,6 +226,10 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest
{
             depMode = CONTINUOUS;
 
             Ignite g1 = startGrid(1);
+
+            if (g1.configuration().getMarshaller() instanceof BinaryMarshaller)
+                fail("http://atlassian.gridgain.com/jira/browse/GG-10791");
+
             Ignite g2 = startGrid(2);
 
             Ignite g0 = startGrid(GRID_NAME);
@@ -250,10 +257,8 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest
{
             stopGrid(GRID_NAME);
 
             assertEquals(1, g1.cache(null).localSize(CachePeekMode.ALL));
-            assertEquals(1, g1.cache(null).localSize(CachePeekMode.ALL));
 
             assertEquals(1, g2.cache(null).localSize(CachePeekMode.ALL));
-            assertEquals(1, g2.cache(null).localSize(CachePeekMode.ALL));
 
             startGrid(3);
         }


Mime
View raw message