Repository: ignite Updated Branches: refs/heads/ignite-3004 c04c38711 -> bcfd1c2b2
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/bcfd1c2b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bcfd1c2b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bcfd1c2b Branch: refs/heads/ignite-3004 Commit: bcfd1c2b28f4d0367cb50654ec661de0151a00b4 Parents: c04c387 Author: nikolay_tikhonov <[email protected]> Authored: Fri Apr 22 12:32:18 2016 +0300 Committer: nikolay_tikhonov <[email protected]> Committed: Fri Apr 22 12:32:18 2016 +0300 ---------------------------------------------------------------------- .../CacheContinuousQueryVariationsTest.java | 32 ++++++++++++-------- .../IgniteConfigVariationsAbstractTest.java | 2 +- 2 files changed, 21 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/bcfd1c2b/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 0f2a185..46c023a 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 @@ -71,6 +71,7 @@ import static javax.cache.event.EventType.CREATED; import static javax.cache.event.EventType.REMOVED; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryVariationsTest.SerializableFilter.isAccepted; +import static org.apache.ignite.testframework.junits.IgniteConfigVariationsAbstractTest.DataMode.EXTERNALIZABLE; import static org.apache.ignite.transactions.TransactionIsolation.READ_COMMITTED; import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ; import static org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE; @@ -218,8 +219,8 @@ public class CacheContinuousQueryVariationsTest extends IgniteCacheConfigVariati }, withFilter ? FactoryBuilder.factoryOf( - asyncCallback ? new AsyncSerializableFilter(keepBinary) - : new SerializableFilter(keepBinary)) + asyncCallback ? new AsyncSerializableFilter(keepBinary, dataMode) + : new SerializableFilter(keepBinary, dataMode)) : null, true, syncNtf @@ -238,8 +239,8 @@ public class CacheContinuousQueryVariationsTest extends IgniteCacheConfigVariati qry.setRemoteFilterFactory(withFilter ? FactoryBuilder.factoryOf( - asyncCallback ? new AsyncSerializableFilter(keepBinary) - : new SerializableFilter(keepBinary)) + asyncCallback ? new AsyncSerializableFilter(keepBinary, dataMode) + : new SerializableFilter(keepBinary, dataMode)) : null); curs.add(jcache.query(qry)); @@ -550,7 +551,7 @@ public class CacheContinuousQueryVariationsTest extends IgniteCacheConfigVariati Object oldVal, boolean keepBinary, boolean withFilter) throws Exception { - if (val == null && oldVal == null || (withFilter && val != null && !isAccepted(val, false))) { + if (val == null && oldVal == null || (withFilter && val != null && !isAccepted(val, false, dataMode))) { checkNoEvent(evtsQueues); return; @@ -583,7 +584,7 @@ public class CacheContinuousQueryVariationsTest extends IgniteCacheConfigVariati */ private Object checkAndGetObject(@Nullable Object obj) { if (obj != null) { - assert obj instanceof BinaryObject || obj instanceof ExternalizableObject : obj; + assert obj instanceof BinaryObject || dataMode == EXTERNALIZABLE: obj; if (obj instanceof BinaryObject) obj = ((BinaryObject)obj).deserialize(); @@ -782,9 +783,10 @@ public class CacheContinuousQueryVariationsTest extends IgniteCacheConfigVariati /** * @param keepBinary Keep binary. + * @param dataMode Data mode. */ - public AsyncSerializableFilter(boolean keepBinary) { - super(keepBinary); + public AsyncSerializableFilter(boolean keepBinary, DataMode dataMode) { + super(keepBinary, dataMode); } } @@ -796,34 +798,40 @@ public class CacheContinuousQueryVariationsTest extends IgniteCacheConfigVariati private boolean keepBinary; /** */ + private DataMode dataMode; + + /** */ public SerializableFilter() { // No-op. } /** * @param keepBinary Keep binary. + * @param dataMode Data mode. */ - public SerializableFilter(boolean keepBinary) { + public SerializableFilter(boolean keepBinary, DataMode dataMode) { this.keepBinary = keepBinary; + this.dataMode = dataMode; } /** {@inheritDoc} */ @Override public boolean evaluate(CacheEntryEvent<?, ?> event) throws CacheEntryListenerException { - return isAccepted(event.getValue(), keepBinary); + return isAccepted(event.getValue(), keepBinary, dataMode); } /** * @param val Value. * @param keepBinary Keep binary. + * @param dataMode Data mode. * @return {@code True} if value is even. */ - public static boolean isAccepted(Object val, boolean keepBinary) { + public static boolean isAccepted(Object val, boolean keepBinary, DataMode dataMode) { if (val != null) { int val0 = 0; if (val instanceof TestObject) { - assert !keepBinary || val instanceof ExternalizableObject : val; + assert !keepBinary || dataMode == EXTERNALIZABLE : val; val0 = valueOf(val); } http://git-wip-us.apache.org/repos/asf/ignite/blob/bcfd1c2b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java index 1734fdb..b24c9f9 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java @@ -350,7 +350,7 @@ public abstract class IgniteConfigVariationsAbstractTest extends GridCommonAbstr /** * */ - protected static class ExternalizableObject extends TestObject implements Externalizable { + private static class ExternalizableObject extends TestObject implements Externalizable { /** * Default constructor. */
