Repository: incubator-ignite Updated Branches: refs/heads/ignite-373 561353bc4 -> 33637a1b9
#ignite-373: Revert changes in GridCommonAbstractTest Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/33637a1b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/33637a1b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/33637a1b Branch: refs/heads/ignite-373 Commit: 33637a1b9dddb9ab47c2527267ebc45c9ab26b37 Parents: 561353b Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri May 8 12:34:55 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri May 8 12:34:55 2015 +0300 ---------------------------------------------------------------------- .../CacheContinuousQueryRestartSelfTest.java | 2 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 35 ++++++++++++++++++ .../junits/common/GridCommonAbstractTest.java | 37 -------------------- 3 files changed, 36 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/33637a1b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRestartSelfTest.java index 039d184..bd03489 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRestartSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRestartSelfTest.java @@ -61,7 +61,7 @@ public class CacheContinuousQueryRestartSelfTest extends GridCommonAbstractTest cacheCfg.setWriteSynchronizationMode(FULL_SYNC); cacheCfg.setReadThrough(true); cacheCfg.setWriteThrough(true); - cacheCfg.setCacheStoreFactory(new StoreFactory()); + cacheCfg.setCacheStoreFactory(new GridCacheContinuousQueryAbstractSelfTest.StoreFactory()); cacheCfg.setLoadPreviousValue(true); cfg.setCacheConfiguration(cacheCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/33637a1b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java index d652cba..86f6c9c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java @@ -989,4 +989,39 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo } } } + + /** + * + */ + public static class StoreFactory implements Factory<CacheStore> { + @Override public CacheStore create() { + return new TestStore(); + } + } + + /** + * Store. + */ + public static class TestStore extends CacheStoreAdapter<Object, Object> { + /** {@inheritDoc} */ + @Override public void loadCache(IgniteBiInClosure<Object, Object> clo, Object... args) { + for (int i = 0; i < 10; i++) + clo.apply(i, i); + } + + /** {@inheritDoc} */ + @Nullable @Override public Object load(Object key) { + return null; + } + + /** {@inheritDoc} */ + @Override public void write(javax.cache.Cache.Entry<?, ?> entry) throws CacheWriterException { + // No-op. + } + + /** {@inheritDoc} */ + @Override public void delete(Object key) throws CacheWriterException { + // No-op. + } + } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/33637a1b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java index 8022a7a..5533897 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java @@ -20,7 +20,6 @@ package org.apache.ignite.testframework.junits.common; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; -import org.apache.ignite.cache.store.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; @@ -39,7 +38,6 @@ import org.apache.ignite.testframework.junits.*; import org.jetbrains.annotations.*; import javax.cache.*; -import javax.cache.configuration.*; import javax.cache.integration.*; import javax.net.ssl.*; import java.util.*; @@ -860,39 +858,4 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { ccfg.getAtomicWriteOrderMode() == CacheAtomicWriteOrderMode.CLOCK) U.sleep(50); } - - /** - * - */ - public static class StoreFactory implements Factory<CacheStore> { - @Override public CacheStore create() { - return new TestStore(); - } - } - - /** - * Store. - */ - public static class TestStore extends CacheStoreAdapter<Object, Object> { - /** {@inheritDoc} */ - @Override public void loadCache(IgniteBiInClosure<Object, Object> clo, Object... args) { - for (int i = 0; i < 10; i++) - clo.apply(i, i); - } - - /** {@inheritDoc} */ - @Nullable @Override public Object load(Object key) { - return null; - } - - /** {@inheritDoc} */ - @Override public void write(javax.cache.Cache.Entry<?, ?> entry) throws CacheWriterException { - // No-op. - } - - /** {@inheritDoc} */ - @Override public void delete(Object key) throws CacheWriterException { - // No-op. - } - } }
