Merge branch 'sprint-2' into ignite-aop-test
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fb11bcf9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fb11bcf9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fb11bcf9 Branch: refs/heads/ignite-gg-9858 Commit: fb11bcf9243a825433ff33480474fc3920596d59 Parents: 371774a Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Mon Mar 16 12:19:05 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Mon Mar 16 12:19:05 2015 +0300 ---------------------------------------------------------------------- .../src/test/java/org/apache/ignite/gridify/AbstractAopTest.java | 2 +- .../cache/distributed/GridCacheAtomicTimeoutSelfTest.java | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fb11bcf9/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java index 5a03dfd..8a5114a 100644 --- a/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java +++ b/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java @@ -419,7 +419,7 @@ public abstract class AbstractAopTest extends GridCommonAbstractTest { assert res == 1 : "Method gridifyDefault returned wrong value [result=" + res + ", expected=1]"; - assert locDepCnt.get() == 1 : "Invalid local deployment count [expected=1, got=" + locDepCnt.get() + ']'; +` assert locDepCnt.get() == 1 : "Invalid local deployment count [expected=1, got=" + locDepCnt.get() + ']'; assert rmtDepCnt.get() == 1 : "Invalid remote deployment count [expected=1, got=" + rmtDepCnt.get() + ']'; } finally { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fb11bcf9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java index e0aa64a..0699ba2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java @@ -32,9 +32,6 @@ import org.apache.ignite.plugin.extensions.communication.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.*; import org.apache.ignite.spi.communication.tcp.*; -import org.apache.ignite.spi.discovery.tcp.*; -import org.apache.ignite.spi.discovery.tcp.ipfinder.*; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.*; import org.apache.ignite.testframework.junits.common.*;
