ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sevdoki...@apache.org
Subject [32/50] [abbrv] incubator-ignite git commit: IGNITE-45 - Fixing tests.
Date Thu, 19 Mar 2015 09:41:52 GMT
IGNITE-45 - Fixing tests.


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

Branch: refs/heads/ignite-501
Commit: dfdfc6c823230cb62ac0b70b698d4df18d2e6afb
Parents: 934d4e0
Author: Alexey Goncharuk <agoncharuk@gridgain.com>
Authored: Wed Mar 18 18:35:18 2015 -0700
Committer: Alexey Goncharuk <agoncharuk@gridgain.com>
Committed: Wed Mar 18 18:35:18 2015 -0700

----------------------------------------------------------------------
 modules/core/src/test/config/igfs-loopback.xml          |  1 -
 modules/core/src/test/config/igfs-shmem.xml             |  1 -
 .../apache/ignite/internal/GridAffinitySelfTest.java    |  2 +-
 .../affinity/GridAffinityProcessorAbstractSelfTest.java | 12 ++----------
 .../optimized/OptimizedMarshallerNodeFailoverTest.java  |  2 ++
 5 files changed, 5 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfdfc6c8/modules/core/src/test/config/igfs-loopback.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/igfs-loopback.xml b/modules/core/src/test/config/igfs-loopback.xml
index a692c72..c01fb98 100644
--- a/modules/core/src/test/config/igfs-loopback.xml
+++ b/modules/core/src/test/config/igfs-loopback.xml
@@ -111,7 +111,6 @@
                     <property name="cacheMode" value="PARTITIONED"/>
                     <property name="atomicityMode" value="TRANSACTIONAL"/>
                     <property name="writeSynchronizationMode" value="FULL_SYNC"/>
-                    <property name="distributionMode" value="PARTITIONED_ONLY"/>
                     <property name="backups" value="0"/>
                     <property name="affinityMapper">
                         <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfdfc6c8/modules/core/src/test/config/igfs-shmem.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/igfs-shmem.xml b/modules/core/src/test/config/igfs-shmem.xml
index e79d5eb..b38544f 100644
--- a/modules/core/src/test/config/igfs-shmem.xml
+++ b/modules/core/src/test/config/igfs-shmem.xml
@@ -111,7 +111,6 @@
                     <property name="cacheMode" value="PARTITIONED"/>
                     <property name="atomicityMode" value="TRANSACTIONAL"/>
                     <property name="writeSynchronizationMode" value="FULL_SYNC"/>
-                    <property name="distributionMode" value="PARTITIONED_ONLY"/>
                     <property name="backups" value="0"/>
                     <property name="affinityMapper">
                         <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfdfc6c8/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java
index 72bd65d..6735021 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java
@@ -51,7 +51,7 @@ public class GridAffinitySelfTest extends GridCommonAbstractTest {
         cfg.setDiscoverySpi(disco);
 
         if (gridName.endsWith("1"))
-            cfg.setCacheConfiguration(); // Empty cache configuration.
+            cfg.setClientMode(true);
         else {
             assert gridName.endsWith("2");
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfdfc6c8/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
index 038e26f..668bf6a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
@@ -25,11 +25,9 @@ import org.apache.ignite.internal.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.*;
 import org.apache.ignite.testframework.junits.common.*;
 
 import java.util.*;
-import java.util.concurrent.*;
 
 import static org.apache.ignite.cache.CacheMode.*;
 
@@ -70,6 +68,8 @@ public abstract class GridAffinityProcessorAbstractSelfTest extends GridCommonAb
 
             cfg.setCacheConfiguration(cacheCfg);
         }
+        else
+            cfg.setClientMode(true);
 
         return cfg;
     }
@@ -117,14 +117,6 @@ public abstract class GridAffinityProcessorAbstractSelfTest extends GridCommonAb
         assertEquals(NODES_CNT * 2, grid1.cluster().nodes().size());
         assertEquals(NODES_CNT * 2, grid2.cluster().nodes().size());
 
-        GridTestUtils.assertThrows(log, new Callable<Void>() {
-            @Override public Void call() throws Exception {
-                grid1.jcache(CACHE_NAME);
-
-                return null;
-            }
-        }, IllegalArgumentException.class, null);
-
         IgniteCache<Integer, Integer> cache = grid2.jcache(CACHE_NAME);
 
         assertNotNull(cache);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfdfc6c8/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java
b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java
index c006abb..ab215e1 100644
--- a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java
@@ -63,6 +63,8 @@ public class OptimizedMarshallerNodeFailoverTest extends GridCommonAbstractTest
 
             cfg.setCacheConfiguration(ccfg);
         }
+        else
+            cfg.setClientMode(true);
 
         return cfg;
     }


Mime
View raw message