IGNITE-7485 added execute method to override in subclasses
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5ba53445 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5ba53445 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5ba53445 Branch: refs/heads/ignite-7485-2 Commit: 5ba53445a2cc7234661a8375d459416fcd9b836d Parents: 6d926a7 Author: macrergate <[email protected]> Authored: Tue Jan 23 19:23:45 2018 +0300 Committer: macrergate <[email protected]> Committed: Tue Jan 23 19:23:45 2018 +0300 ---------------------------------------------------------------------- .../ignite/util/GridCommandHandlerTest.java | 35 ++++++++++++-------- 1 file changed, 22 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5ba53445/modules/core/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java b/modules/core/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java index b119bfa..a4e9ac1 100644 --- a/modules/core/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java +++ b/modules/core/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java @@ -96,12 +96,21 @@ public class GridCommandHandlerTest extends GridCommonAbstractTest { CommandHandler cmd = new CommandHandler(); - assertEquals(EXIT_CODE_OK, cmd.execute("--activate")); + assertEquals(EXIT_CODE_OK, execute(cmd, "--activate")); assertTrue(ignite.active()); } /** + * @param cmd CommandHandler + * @param args arguments + * @return result of execution + */ + protected int execute(CommandHandler cmd, String... args) { + return cmd.execute(args); + } + + /** * Test deactivation works via control.sh * * @throws Exception If failed. @@ -117,7 +126,7 @@ public class GridCommandHandlerTest extends GridCommonAbstractTest { CommandHandler cmd = new CommandHandler(); - assertEquals(EXIT_CODE_OK, cmd.execute("--deactivate")); + assertEquals(EXIT_CODE_OK, execute(cmd, "--deactivate")); assertFalse(ignite.active()); } @@ -134,11 +143,11 @@ public class GridCommandHandlerTest extends GridCommonAbstractTest { CommandHandler cmd = new CommandHandler(); - assertEquals(EXIT_CODE_OK, cmd.execute("--state")); + assertEquals(EXIT_CODE_OK, execute(cmd, "--state")); ignite.active(true); - assertEquals(EXIT_CODE_OK, cmd.execute("--state")); + assertEquals(EXIT_CODE_OK, execute(cmd, "--state")); } /** @@ -155,7 +164,7 @@ public class GridCommandHandlerTest extends GridCommonAbstractTest { CommandHandler cmd = new CommandHandler(); - cmd.execute("--baseline"); + assertEquals(EXIT_CODE_OK, execute(cmd, "--baseline")); assertEquals(1, ignite.cluster().currentBaselineTopology().size()); } @@ -195,8 +204,8 @@ public class GridCommandHandlerTest extends GridCommonAbstractTest { Ignite other = startGrid(2); - assertEquals(EXIT_CODE_OK, cmd.execute("--baseline", "add", consistentIds(other))); - assertEquals(EXIT_CODE_OK, cmd.execute("--baseline", "add", consistentIds(other))); + assertEquals(EXIT_CODE_OK, execute(cmd, "--baseline", "add", consistentIds(other))); + assertEquals(EXIT_CODE_OK, execute(cmd, "--baseline", "add", consistentIds(other))); assertEquals(2, ignite.cluster().currentBaselineTopology().size()); } @@ -220,8 +229,8 @@ public class GridCommandHandlerTest extends GridCommonAbstractTest { CommandHandler cmd = new CommandHandler(); - assertEquals(EXIT_CODE_OK, cmd.execute("--baseline")); - assertEquals(EXIT_CODE_OK, cmd.execute("--baseline", "remove", offlineNodeConsId)); + assertEquals(EXIT_CODE_OK, execute(cmd, "--baseline")); + assertEquals(EXIT_CODE_OK, execute(cmd, "--baseline", "remove", offlineNodeConsId)); assertEquals(1, ignite.cluster().currentBaselineTopology().size()); } @@ -242,11 +251,11 @@ public class GridCommandHandlerTest extends GridCommonAbstractTest { CommandHandler cmd = new CommandHandler(); - assertEquals(EXIT_CODE_OK, cmd.execute("--baseline", "set", consistentIds(ignite, other))); + assertEquals(EXIT_CODE_OK, execute(cmd, "--baseline", "set", consistentIds(ignite, other))); assertEquals(2, ignite.cluster().currentBaselineTopology().size()); - assertEquals(EXIT_CODE_UNEXPECTED_ERROR, cmd.execute("--baseline", "set", "invalidConsistentId")); + assertEquals(EXIT_CODE_UNEXPECTED_ERROR, execute(cmd, "--baseline", "set", "invalidConsistentId")); } /** @@ -265,9 +274,9 @@ public class GridCommandHandlerTest extends GridCommonAbstractTest { startGrid(2); - assertEquals(EXIT_CODE_OK, cmd.execute("--baseline")); + assertEquals(EXIT_CODE_OK, execute(cmd, "--baseline")); - assertEquals(EXIT_CODE_OK, cmd.execute("--baseline", "version", String.valueOf(ignite.cluster().topologyVersion()))); + assertEquals(EXIT_CODE_OK, execute(cmd, "--baseline", "version", String.valueOf(ignite.cluster().topologyVersion()))); assertEquals(2, ignite.cluster().currentBaselineTopology().size()); }
