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/3065b0ba Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3065b0ba Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3065b0ba Branch: refs/heads/ignite-501 Commit: 3065b0ba03402252423a127a45e748e50689316f Parents: 5ac2673 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Wed Mar 18 16:54:12 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Wed Mar 18 16:54:12 2015 -0700 ---------------------------------------------------------------------- examples/config/example-cache.xml | 3 --- .../GridCacheAtomicReferenceApiSelfAbstractTest.java | 2 +- .../datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java | 2 +- .../cache/datastructures/IgniteAtomicLongApiAbstractSelfTest.java | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3065b0ba/examples/config/example-cache.xml ---------------------------------------------------------------------- diff --git a/examples/config/example-cache.xml b/examples/config/example-cache.xml index 706f959..21b4ba0 100644 --- a/examples/config/example-cache.xml +++ b/examples/config/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"> @@ -88,7 +87,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> @@ -97,7 +95,6 @@ <property name="name" value="partitioned_tx"/> <property name="cacheMode" value="PARTITIONED"/> <property name="atomicityMode" value="TRANSACTIONAL"/> - <property name="distributionMode" value="NEAR_PARTITIONED"/> <property name="backups" value="1"/> </bean> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3065b0ba/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java index aaf6ca5..0f21a55 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java @@ -63,7 +63,7 @@ public abstract class GridCacheAtomicReferenceApiSelfAbstractTest extends Ignite fail(); } - catch (IllegalStateException e) { + catch (IllegalStateException | IgniteException e) { info("Caught expected exception: " + e.getMessage()); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3065b0ba/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java index 71d5469..9e48ac2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java @@ -63,7 +63,7 @@ public abstract class GridCacheAtomicStampedApiSelfAbstractTest extends IgniteAt fail(); } - catch (IllegalStateException e) { + catch (IllegalStateException | IgniteException e) { info("Caught expected exception: " + e.getMessage()); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3065b0ba/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicLongApiAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicLongApiAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicLongApiAbstractSelfTest.java index 6550e91..319fad1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicLongApiAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicLongApiAbstractSelfTest.java @@ -90,7 +90,7 @@ public abstract class IgniteAtomicLongApiAbstractSelfTest extends IgniteAtomicsA fail(); } - catch (IllegalStateException e) { + catch (IllegalStateException | IgniteException e) { info("Caught expected exception: " + e.getMessage()); } }
