IGNITE-45 - Fixing 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/96527d0d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/96527d0d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/96527d0d Branch: refs/heads/ignite-45 Commit: 96527d0dce935e635af8debe010eb44e2bef43e1 Parents: be685c9 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Tue Mar 17 23:29:11 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Tue Mar 17 23:29:11 2015 -0700 ---------------------------------------------------------------------- .../CacheExamplesMultiNodeSelfTest.java | 2 +- .../test/config/websession/example-cache.xml | 6 ++-- .../test/config/websession/spring-cache-1.xml | 4 --- .../test/config/websession/spring-cache-2.xml | 4 --- .../test/config/websession/spring-cache-3.xml | 4 --- .../IgniteCacheExpiryStoreLoadSelfTest.java | 5 ++- .../IgniteCacheExpiryPolicyAbstractTest.java | 7 ++-- ...ridCacheContinuousQueryAbstractSelfTest.java | 34 ++++++++------------ .../webapp/META-INF/ignite-webapp-config.xml | 7 ++-- 9 files changed, 27 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96527d0d/examples/src/test/java/org/apache/ignite/examples/CacheExamplesMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java/org/apache/ignite/examples/CacheExamplesMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/CacheExamplesMultiNodeSelfTest.java index 27bac02..93a2749 100644 --- a/examples/src/test/java/org/apache/ignite/examples/CacheExamplesMultiNodeSelfTest.java +++ b/examples/src/test/java/org/apache/ignite/examples/CacheExamplesMultiNodeSelfTest.java @@ -23,7 +23,7 @@ package org.apache.ignite.examples; public class CacheExamplesMultiNodeSelfTest extends CacheExamplesSelfTest { /** {@inheritDoc} */ @Override protected String defaultConfig() { - return "examples/config/example-cache.xml"; + return "examples/config/example-compute.xml"; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96527d0d/modules/core/src/test/config/websession/example-cache.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/websession/example-cache.xml b/modules/core/src/test/config/websession/example-cache.xml index 314f1a8..043f5c1 100644 --- a/modules/core/src/test/config/websession/example-cache.xml +++ b/modules/core/src/test/config/websession/example-cache.xml @@ -58,7 +58,6 @@ <property name="name" value="partitioned"/> <property name="cacheMode" value="PARTITIONED"/> <property name="atomicityMode" value="ATOMIC"/> - <property name="distributionMode" value="PARTITIONED_ONLY"/> <property name="backups" value="1"/> <property name="indexedTypes"> @@ -76,7 +75,6 @@ <property name="cacheMode" value="PARTITIONED"/> <property name="atomicityMode" value="ATOMIC"/> <property name="atomicWriteOrderMode" value="PRIMARY"/> - <property name="distributionMode" value="PARTITIONED_ONLY"/> <property name="backups" value="1"/> </bean> @@ -85,7 +83,9 @@ <property name="name" value="partitioned_tx"/> <property name="cacheMode" value="PARTITIONED"/> <property name="atomicityMode" value="TRANSACTIONAL"/> - <property name="distributionMode" value="NEAR_PARTITIONED"/> + <property name="nearConfiguration"> + <bean class="org.apache.ignite.configuration.NearCacheConfiguration"/> + </property> <property name="backups" value="1"/> </bean> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96527d0d/modules/core/src/test/config/websession/spring-cache-1.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/websession/spring-cache-1.xml b/modules/core/src/test/config/websession/spring-cache-1.xml index b5ca38f..0cebc76 100644 --- a/modules/core/src/test/config/websession/spring-cache-1.xml +++ b/modules/core/src/test/config/websession/spring-cache-1.xml @@ -40,8 +40,6 @@ <property name="writeSynchronizationMode" value="FULL_SYNC"/> - <property name="distributionMode" value="PARTITIONED_ONLY"/> - <property name="atomicWriteOrderMode" value="PRIMARY"/> <property name="backups" value="1"/> @@ -58,8 +56,6 @@ <property name="writeSynchronizationMode" value="FULL_SYNC"/> - <property name="distributionMode" value="PARTITIONED_ONLY"/> - <property name="atomicWriteOrderMode" value="PRIMARY"/> <property name="backups" value="1"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96527d0d/modules/core/src/test/config/websession/spring-cache-2.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/websession/spring-cache-2.xml b/modules/core/src/test/config/websession/spring-cache-2.xml index 9d07f04..0dc4855 100644 --- a/modules/core/src/test/config/websession/spring-cache-2.xml +++ b/modules/core/src/test/config/websession/spring-cache-2.xml @@ -40,8 +40,6 @@ <property name="writeSynchronizationMode" value="FULL_SYNC"/> - <property name="distributionMode" value="PARTITIONED_ONLY"/> - <property name="atomicWriteOrderMode" value="PRIMARY"/> <property name="backups" value="1"/> @@ -58,8 +56,6 @@ <property name="writeSynchronizationMode" value="FULL_SYNC"/> - <property name="distributionMode" value="PARTITIONED_ONLY"/> - <property name="atomicWriteOrderMode" value="PRIMARY"/> <property name="backups" value="1"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96527d0d/modules/core/src/test/config/websession/spring-cache-3.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/websession/spring-cache-3.xml b/modules/core/src/test/config/websession/spring-cache-3.xml index f2f316d..40674e8 100644 --- a/modules/core/src/test/config/websession/spring-cache-3.xml +++ b/modules/core/src/test/config/websession/spring-cache-3.xml @@ -40,8 +40,6 @@ <property name="writeSynchronizationMode" value="FULL_SYNC"/> - <property name="distributionMode" value="PARTITIONED_ONLY"/> - <property name="atomicWriteOrderMode" value="PRIMARY"/> <property name="backups" value="1"/> @@ -58,8 +56,6 @@ <property name="writeSynchronizationMode" value="FULL_SYNC"/> - <property name="distributionMode" value="PARTITIONED_ONLY"/> - <property name="atomicWriteOrderMode" value="PRIMARY"/> <property name="backups" value="1"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96527d0d/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java index e32e3d2..fca5132 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java @@ -22,14 +22,13 @@ import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.lang.*; +import org.apache.ignite.testframework.*; import org.jetbrains.annotations.*; import javax.cache.*; -import javax.cache.configuration.*; import javax.cache.expiry.*; import javax.cache.integration.*; import java.util.*; -import java.util.concurrent.*; import static java.util.concurrent.TimeUnit.*; import static org.apache.ignite.cache.CacheMode.*; @@ -59,7 +58,7 @@ public class IgniteCacheExpiryStoreLoadSelfTest extends GridCacheAbstractSelfTes @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { CacheConfiguration cfg = super.cacheConfiguration(gridName); - cfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(new TestStore())); + cfg.setCacheStoreFactory(GridTestUtils.storeFactory(new TestStore())); cfg.setReadThrough(true); cfg.setWriteThrough(true); cfg.setLoadPreviousValue(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96527d0d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java index 5e44b55..1ca4410 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java @@ -34,6 +34,7 @@ import javax.cache.*; import javax.cache.configuration.*; import javax.cache.expiry.*; import javax.cache.processor.*; +import java.io.*; import java.util.*; import java.util.concurrent.*; @@ -68,6 +69,8 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs @Override protected void afterTest() throws Exception { stopAllGrids(); + factory = null; + storeMap.clear(); } @@ -1033,7 +1036,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { CacheConfiguration cfg = super.cacheConfiguration(gridName); - if (nearCache && gridName.equals(getTestGridName(0))) + if (nearCache) cfg.setNearConfiguration(new NearCacheConfiguration()); cfg.setExpiryPolicyFactory(factory); @@ -1054,7 +1057,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs /** * */ - private static class TestPolicy implements ExpiryPolicy { + private static class TestPolicy implements ExpiryPolicy, Serializable { /** */ private Long create; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96527d0d/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 2bac1df..4d02fa4 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 @@ -79,18 +79,20 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo if (!gridName.equals(NO_CACHE_GRID_NAME)) { CacheConfiguration cacheCfg = defaultCacheConfiguration(); - cacheCfg.setCacheMode(cacheMode()); - cacheCfg.setAtomicityMode(atomicityMode()); - cacheCfg.setNearConfiguration(nearConfiguration()); - cacheCfg.setRebalanceMode(ASYNC); - cacheCfg.setWriteSynchronizationMode(FULL_SYNC); - cacheCfg.setCacheStoreFactory(new StoreFactory()); - cacheCfg.setReadThrough(true); - cacheCfg.setWriteThrough(true); - cacheCfg.setLoadPreviousValue(true); + cacheCfg.setCacheMode(cacheMode()); + cacheCfg.setAtomicityMode(atomicityMode()); + cacheCfg.setNearConfiguration(nearConfiguration()); + cacheCfg.setRebalanceMode(ASYNC); + cacheCfg.setWriteSynchronizationMode(FULL_SYNC); + cacheCfg.setCacheStoreFactory(new StoreFactory()); + cacheCfg.setReadThrough(true); + cacheCfg.setWriteThrough(true); + cacheCfg.setLoadPreviousValue(true); cfg.setCacheConfiguration(cacheCfg); } + else + cfg.setClientMode(true); TcpDiscoverySpi disco = new TcpDiscoverySpi(); @@ -174,7 +176,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo for (int i = 0; i < gridCount(); i++) { - GridContinuousProcessor proc = ((IgniteKernal)grid(i)).context().continuous(); + GridContinuousProcessor proc = grid(i).context().continuous(); assertEquals(String.valueOf(i), 2, ((Map)U.field(proc, "locInfos")).size()); assertEquals(String.valueOf(i), 0, ((Map)U.field(proc, "rmtInfos")).size()); @@ -184,8 +186,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo assertEquals(String.valueOf(i), 0, ((Map)U.field(proc, "waitForStopAck")).size()); assertEquals(String.valueOf(i), 0, ((Map)U.field(proc, "pending")).size()); - CacheContinuousQueryManager mgr = - ((IgniteKernal)grid(i)).context().cache().internalCache().context().continuousQueries(); + CacheContinuousQueryManager mgr = grid(i).context().cache().internalCache().context().continuousQueries(); assertEquals(0, ((Map)U.field(mgr, "lsnrs")).size()); } @@ -863,15 +864,6 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo try { try (Ignite ignite = startGrid(NO_CACHE_GRID_NAME)) { log.info("Started node without cache: " + ignite); - - try { - ignite.jcache(null); - - fail(); - } - catch (IllegalArgumentException ignore) { - // Expected exception. - } } cache.put(1, 1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96527d0d/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml b/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml index 193ad8c..7fdd559 100644 --- a/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml +++ b/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml @@ -103,9 +103,6 @@ <!-- Enable primary sync write mode. --> <property name="writeSynchronizationMode" value="PRIMARY_SYNC"/> - <!-- Disable near cache in atomic mode. --> - <property name="distributionMode" value="PARTITIONED_ONLY"/> - <!-- Initial cache size. --> <property name="startSize" value="1500000"/> @@ -131,7 +128,9 @@ <property name="atomicityMode" value="TRANSACTIONAL"/> <!-- Enable near cache to cache recently accessed data. --> - <property name="distributionMode" value="NEAR_PARTITIONED"/> + <property name="nearConfiguration"> + <bean class="org.apache.ignite.configuration.NearCacheConfiguration"/> + </property> <!-- Initial cache size. --> <property name="startSize" value="1500000"/>
