master - fixed SPI test
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/862d8af0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/862d8af0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/862d8af0 Branch: refs/heads/ignite-1561-1 Commit: 862d8af0a27974eec76665a8d336a4be4c08361a Parents: 3565e4e Author: Dmitriy Govorukhin <dmitriy.govoruk...@gmail.com> Authored: Tue Apr 18 15:42:54 2017 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Tue Apr 18 15:45:56 2017 +0300 ---------------------------------------------------------------------- .../GridInternalTasksLoadBalancingSelfTest.java | 21 ++++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/862d8af0/modules/core/src/test/java/org/apache/ignite/spi/loadbalancing/internal/GridInternalTasksLoadBalancingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/loadbalancing/internal/GridInternalTasksLoadBalancingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/loadbalancing/internal/GridInternalTasksLoadBalancingSelfTest.java index 80e76bd..f9d74b4 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/loadbalancing/internal/GridInternalTasksLoadBalancingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/loadbalancing/internal/GridInternalTasksLoadBalancingSelfTest.java @@ -17,6 +17,11 @@ package org.apache.ignite.spi.loadbalancing.internal; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.UUID; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteException; import org.apache.ignite.cluster.ClusterNode; @@ -27,9 +32,9 @@ import org.apache.ignite.compute.ComputeTaskSession; import org.apache.ignite.compute.ComputeTaskSplitAdapter; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.processors.task.GridInternal; -import org.apache.ignite.internal.util.lang.GridTuple3; import org.apache.ignite.internal.visor.VisorTaskArgument; import org.apache.ignite.internal.visor.node.VisorNodePingTask; +import org.apache.ignite.internal.visor.node.VisorNodePingTaskResult; import org.apache.ignite.spi.IgniteSpiAdapter; import org.apache.ignite.spi.IgniteSpiException; import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport; @@ -37,12 +42,6 @@ import org.apache.ignite.spi.loadbalancing.LoadBalancingSpi; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jetbrains.annotations.Nullable; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.UUID; - /** * Test that will start two nodes with custom load balancing SPI and execute {@link GridInternal} task on it. */ @@ -93,10 +92,10 @@ public class GridInternalTasksLoadBalancingSelfTest extends GridCommonAbstractTe // Visor task should pass. UUID nid = ignite.cluster().localNode().id(); - GridTuple3<Boolean, Long, Long> ping = ignite.compute() + VisorNodePingTaskResult ping = ignite.compute() .execute(VisorNodePingTask.class.getName(), new VisorTaskArgument<>(nid, nid, false)); - assertTrue(ping.get1()); + assertTrue(ping.isAlive()); // Custom task should fail, because special test load balancer SPI returns null as balanced node. try { @@ -123,10 +122,10 @@ public class GridInternalTasksLoadBalancingSelfTest extends GridCommonAbstractTe // Visor task should pass. UUID nid = ignite.cluster().localNode().id(); - GridTuple3<Boolean, Long, Long> ping = ignite.compute() + VisorNodePingTaskResult ping = ignite.compute() .execute(VisorNodePingTask.class.getName(), new VisorTaskArgument<>(nid, nid, false)); - assertTrue(ping.get1()); + assertTrue(ping.isAlive()); // Custom task should pass. assertEquals(TASK_RESULT, ignite.compute().execute(CustomTestTask.class.getName(), null));
