Repository: ignite
Updated Branches:
  refs/heads/ignite-3004 bcfd1c2b2 -> 4991f7099


IGNITE-3004 WIP.


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

Branch: refs/heads/ignite-3004
Commit: 4991f7099097b3263892c0c90f0a35c0fec737ad
Parents: bcfd1c2
Author: nikolay_tikhonov <[email protected]>
Authored: Fri Apr 22 13:53:27 2016 +0300
Committer: nikolay_tikhonov <[email protected]>
Committed: Fri Apr 22 13:53:27 2016 +0300

----------------------------------------------------------------------
 .../continuous/CacheContinuousQueryVariationsTest.java  | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/4991f709/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryVariationsTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryVariationsTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryVariationsTest.java
index 46c023a..61293f3 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryVariationsTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryVariationsTest.java
@@ -48,10 +48,12 @@ import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteCache;
 import org.apache.ignite.binary.BinaryObject;
 import org.apache.ignite.cache.CacheEntryEventSerializableFilter;
+import org.apache.ignite.cache.CacheMemoryMode;
 import org.apache.ignite.cache.query.ContinuousQuery;
 import org.apache.ignite.cache.query.QueryCursor;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.binary.BinaryMarshaller;
 import org.apache.ignite.internal.util.typedef.CI1;
 import org.apache.ignite.internal.util.typedef.G;
 import org.apache.ignite.internal.util.typedef.PA;
@@ -81,7 +83,7 @@ import static 
org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE;
  */
 public class CacheContinuousQueryVariationsTest extends 
IgniteCacheConfigVariationsAbstractTest {
     /** */
-    private static final int ITERATION_CNT = 20;
+    private static final int ITERATION_CNT = 10;
 
     /** */
     private static final int KEYS = 50;
@@ -102,6 +104,10 @@ public class CacheContinuousQueryVariationsTest extends 
IgniteCacheConfigVariati
      * @throws Exception If failed.
      */
     public void testRandomOperationJCacheApiKeepBinary() throws Exception {
+        if (!(getConfiguration().getMarshaller() == null
+            || getConfiguration().getMarshaller().getClass() == 
BinaryMarshaller.class))
+            return;
+
         testRandomOperation(true, false, false, false, true);
     }
 
@@ -158,6 +164,10 @@ public class CacheContinuousQueryVariationsTest extends 
IgniteCacheConfigVariati
      * @throws Exception If failed.
      */
     public void testRandomOperationWithFilterWithKeepBinary() throws Exception 
{
+        if (getConfiguration().getMarshaller() != null
+            || getConfiguration().getMarshaller().getClass() != 
BinaryMarshaller.class)
+            return;
+
         testRandomOperation(true, true, true, false, true);
     }
 

Reply via email to