#Fixed ExecutionContext 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/d683fbe4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d683fbe4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d683fbe4 Branch: refs/heads/ignite-409 Commit: d683fbe4daade5ffbec805e009f1e182ddeb6144 Parents: 0a7176f Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Wed Mar 18 18:47:20 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Wed Mar 18 18:47:20 2015 +0300 ---------------------------------------------------------------------- .../cache/context/IgniteCacheAbstractExecutionContextTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d683fbe4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAbstractExecutionContextTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAbstractExecutionContextTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAbstractExecutionContextTest.java index 7575c7a..b681ab1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAbstractExecutionContextTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAbstractExecutionContextTest.java @@ -74,8 +74,11 @@ public abstract class IgniteCacheAbstractExecutionContextTest extends IgniteCach for (int i = 0; i < ITER_CNT; i++) { int idx = i % gridCount(); + // Check that entry was loaded by user's classloader. if (idx == 0) - assertEquals(jcache.get(i).getClass().getClassLoader(), testClassLdr); + // Or testClassLdr either classloader from cache configuration. + assertTrue(grid(0).configuration().getClassLoader() == jcache.get(i).getClass().getClassLoader() + || jcache.get(i).getClass().getClassLoader() == testClassLdr); else assertEquals(grid(idx).jcache(null).get(i).getClass().getClassLoader(), grid(idx).configuration().getClassLoader());
