testDeployment fix
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d2977621 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d2977621 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d2977621 Branch: refs/heads/ignite-2801 Commit: d29776217b6f0eda36e3feba0564f7945904823c Parents: 8e4fb96 Author: Anton Vinogradov <[email protected]> Authored: Thu Mar 17 16:11:02 2016 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Thu Mar 17 16:11:02 2016 +0300 ---------------------------------------------------------------------- .../preloader/GridCacheReplicatedPreloadSelfTest.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d2977621/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java index 570230b..3846cf5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java @@ -35,6 +35,7 @@ import javax.cache.event.CacheEntryListener; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteMessaging; +import org.apache.ignite.binary.BinaryObject; import org.apache.ignite.cache.CacheEntryEventSerializableFilter; import org.apache.ignite.cache.CachePeekMode; import org.apache.ignite.cache.CacheRebalanceMode; @@ -47,6 +48,7 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.events.Event; import org.apache.ignite.events.EventAdapter; import org.apache.ignite.internal.IgniteKernal; +import org.apache.ignite.internal.binary.BinaryEnumObjectImpl; import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.internal.processors.cache.GridCacheAdapter; import org.apache.ignite.internal.processors.cache.GridCacheEntryEx; @@ -172,9 +174,8 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { cacheCfg.setRebalanceBatchSize(batchSize); cacheCfg.setRebalanceThreadPoolSize(poolSize); - if (extClassloadingAtCfg) { + if (extClassloadingAtCfg) loadExternalClassesToCfg(cacheCfg); - } return cacheCfg; } @@ -329,6 +330,14 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { Object e2 = cache2.get(2); + if (g1.configuration().getMarshaller() instanceof BinaryMarshaller) { + BinaryObject enumObj = (BinaryObject)cache2.withKeepBinary().get(2); + + assertEquals(0, enumObj.enumOrdinal()); + assertTrue(enumObj.type().isEnum()); + assertTrue(enumObj instanceof BinaryEnumObjectImpl); + } + assert e2 != null; assert e2.toString().equals(e1.toString()); assert !e2.getClass().getClassLoader().equals(getClass().getClassLoader());
