ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [43/53] [abbrv] ignite git commit: ignite-3477-master fix GridCacheConditionalDeploymentSelfTest.testAddedDeploymentInfo
Date Mon, 10 Apr 2017 15:55:50 GMT
ignite-3477-master fix GridCacheConditionalDeploymentSelfTest.testAddedDeploymentInfo


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

Branch: refs/heads/ignite-3477-master
Commit: 782ff0a39b154ab03b698155717a5cbaf6e3865b
Parents: 973f335
Author: Dmitriy Govorukhin <dgovorukhin@gridgain.com>
Authored: Mon Apr 10 13:00:32 2017 +0300
Committer: Dmitriy Govorukhin <dgovorukhin@gridgain.com>
Committed: Mon Apr 10 13:00:32 2017 +0300

----------------------------------------------------------------------
 .../GridCacheConditionalDeploymentSelfTest.java  | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/782ff0a3/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 8fdd752..b26b582 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
@@ -29,6 +29,7 @@ import org.apache.ignite.plugin.extensions.communication.Message;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.config.GridTestProperties;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -122,17 +123,23 @@ public class GridCacheConditionalDeploymentSelfTest extends GridCommonAbstractTe
      * @throws Exception In case of error.
      */
     public void testAddedDeploymentInfo() throws Exception {
-        GridCacheIoManager ioMgr = cacheIoManager();
+        GridCacheContext ctx = cacheContext();
 
-        TestMessage msg = new TestMessage();
+        if (grid(0).configuration().getMarshaller() instanceof BinaryMarshaller)
+            assertFalse(ctx.deploymentEnabled());
+        else {
+            GridCacheIoManager ioMgr = cacheIoManager();
 
-        assertNull(msg.deployInfo());
+            TestMessage msg = new TestMessage();
 
-        msg.addDepInfo = true;
+            assertNull(msg.deployInfo());
 
-        IgniteUtils.invoke(GridCacheIoManager.class, ioMgr, "onSend", msg, grid(1).cluster().localNode().id());
+            msg.addDepInfo = true;
 
-        assertNotNull(msg.deployInfo());
+            IgniteUtils.invoke(GridCacheIoManager.class, ioMgr, "onSend", msg, grid(1).cluster().localNode().id());
+
+            assertNotNull(msg.deployInfo());
+        }
     }
 
     /**


Mime
View raw message