Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C477417AFE for ; Thu, 14 May 2015 19:54:42 +0000 (UTC) Received: (qmail 75745 invoked by uid 500); 14 May 2015 19:54:42 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 75716 invoked by uid 500); 14 May 2015 19:54:42 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 75703 invoked by uid 99); 14 May 2015 19:54:42 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 May 2015 19:54:42 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 3CD46C0B1C for ; Thu, 14 May 2015 19:54:42 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.77 X-Spam-Level: * X-Spam-Status: No, score=1.77 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id uQ1jcQqP4bXC for ; Thu, 14 May 2015 19:54:40 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 1DAC542996 for ; Thu, 14 May 2015 19:54:40 +0000 (UTC) Received: (qmail 75404 invoked by uid 99); 14 May 2015 19:54:39 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 May 2015 19:54:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 94A20E051A; Thu, 14 May 2015 19:54:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agoncharuk@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 14 May 2015 19:54:39 -0000 Message-Id: <0130502c163b4f888ed51c76edc824c7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [01/47] incubator-ignite git commit: # ignite-10151 Change FlatSpec to FunSpec in scalatests. Repository: incubator-ignite Updated Branches: refs/heads/ignite-889 41f5bb0b5 -> 93ba805a2 http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b41fbeef/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala index 320a6bb..db07543 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala @@ -34,7 +34,7 @@ import scala.collection._ /** * Unit test for 'tasks' command. */ -class VisorTasksCommandSpec extends FlatSpec with Matchers with BeforeAndAfterAll { +class VisorTasksCommandSpec extends FunSpec with Matchers with BeforeAndAfterAll { /** * Open visor and execute several tasks before all tests. */ @@ -103,78 +103,78 @@ class VisorTasksCommandSpec extends FlatSpec with Matchers with BeforeAndAfterAl Ignition.stopAll(false) } - behavior of "A 'tasks' visor command" - - it should "print tasks when called w/o arguments" in { - visor.tasks() - } + describe("A 'tasks' visor command") { + it("should print tasks when called w/o arguments") { + visor.tasks() + } - it should "print error message with incorrect argument" in { - visor.tasks("-xx") - } + it("should print error message with incorrect argument") { + visor.tasks("-xx") + } - it should "print task summary when called for specific task" in { - visor.tasks("-n=@t1") - } + it("should print task summary when called for specific task") { + visor.tasks("-n=@t1") + } - it should "print execution when called for specific execution" in { - visor.tasks("-e=@e1") - } + it("should print execution when called for specific execution") { + visor.tasks("-e=@e1") + } - it should "print all tasks" in { - visor.tasks("-l") - } + it("should print all tasks") { + visor.tasks("-l") + } - it should "print all tasks and executions" in { - visor.tasks("-l -a") - } + it("should print all tasks and executions") { + visor.tasks("-l -a") + } - it should "print tasks that started during last 5 seconds" in { - visor.tasks("-l -t=5s") - } + it("should print tasks that started during last 5 seconds") { + visor.tasks("-l -t=5s") + } - it should "print error message about invalid time period" in { - visor.tasks("-l -t=x2s") - } + it("should print error message about invalid time period") { + visor.tasks("-l -t=x2s") + } - it should "print error message about negative time period" in { - visor.tasks("-l -t=-10s") - } + it("should print error message about negative time period") { + visor.tasks("-l -t=-10s") + } - it should "print error message about invalid time period specification" in { - visor.tasks("-l -t=10x") - } + it("should print error message about invalid time period specification") { + visor.tasks("-l -t=10x") + } - it should "print task summary for the first task" in { - visor.tasks("-n=TestTask1") - } + it("should print task summary for the first task") { + visor.tasks("-n=TestTask1") + } - it should "print task summary and executions for the first task" in { - visor.tasks("-n=TestTask1 -a") - } + it("should print task summary and executions for the first task") { + visor.tasks("-n=TestTask1 -a") + } - it should "print list of tasks grouped by nodes" in { - visor.tasks("-g") - } + it("should print list of tasks grouped by nodes") { + visor.tasks("-g") + } - it should "print list of tasks that started during last 5 minutes grouped by nodes" in { - visor.tasks("-g -t=5m") - } + it("should print list of tasks that started during last 5 minutes grouped by nodes") { + visor.tasks("-g -t=5m") + } - it should "print list of tasks grouped by hosts" in { - visor.tasks("-h") - } + it("should print list of tasks grouped by hosts") { + visor.tasks("-h") + } - it should "print list of tasks that started during last 5 minutes grouped by hosts" in { - visor.tasks("-h -t=5m") - } + it("should print list of tasks that started during last 5 minutes grouped by hosts") { + visor.tasks("-h -t=5m") + } - it should "print list of tasks filtered by substring" in { - visor.tasks("-s=TestTask") - } + it("should print list of tasks filtered by substring") { + visor.tasks("-s=TestTask") + } - it should "print list of tasks and executions filtered by substring" in { - visor.tasks("-s=TestTask -a") + it("should print list of tasks and executions filtered by substring") { + visor.tasks("-s=TestTask -a") + } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b41fbeef/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommandSpec.scala index 3a3b6e5..515cf67 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommandSpec.scala @@ -24,39 +24,39 @@ import org.apache.ignite.visor.commands.top.VisorTopologyCommand._ * Unit test for topology commands. */ class VisorTopologyCommandSpec extends VisorRuntimeBaseSpec(2) { - behavior of "A 'top' visor command" + describe("A 'top' visor command") { + it("should advise to connect") { + closeVisorQuiet() - it should "advise to connect" in { - closeVisorQuiet() + visor.top() + } - visor.top() - } - - it should "print error message" in { - visor.top("-cc=eq1x") - } + it("should print error message") { + visor.top("-cc=eq1x") + } - it should "print full topology" in { - visor.top() - } + it("should print full topology") { + visor.top() + } - it should "print nodes with idle time greater than 12000ms" in { - visor.top("-it=gt12000") - } + it("should print nodes with idle time greater than 12000ms") { + visor.top("-it=gt12000") + } - it should "print nodes with idle time greater than 12sec" in { - visor.top("-it=gt12s") - } + it("should print nodes with idle time greater than 12sec") { + visor.top("-it=gt12s") + } - it should "print full information about all nodes" in { - visor.top("-a") - } + it("should print full information about all nodes") { + visor.top("-a") + } - it should "print information about nodes on localhost" in { - visor.top("-h=192.168.1.100") - } + it("should print information about nodes on localhost") { + visor.top("-h=192.168.1.100") + } - it should "print full information about nodes on localhost" in { - visor.top("-h=localhost") + it("should print full information about nodes on localhost") { + visor.top("-h=localhost") + } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b41fbeef/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/vvm/VisorVvmCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/vvm/VisorVvmCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/vvm/VisorVvmCommandSpec.scala index 969fb94..1a4bc3e 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/vvm/VisorVvmCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/vvm/VisorVvmCommandSpec.scala @@ -25,22 +25,22 @@ import org.apache.ignite.visor.commands.vvm.VisorVvmCommand._ /** * Unit test for 'vvm' command. */ -class VisorVvmCommandSpec extends FlatSpec with Matchers { - behavior of "A 'vvm' visor command" +class VisorVvmCommandSpec extends FunSpec with Matchers { + describe("A 'vvm' visor command") { + it("should print error message when not connected") { + visor.vvm() + } - it should "print error message when not connected" in { - visor.vvm() - } - - it should "open VisualVM connected to all nodes skipping ones with disabled JMX" in { - visor.open("-d") - visor.vvm() - visor.close() - } + it("should open VisualVM connected to all nodes skipping ones with disabled JMX") { + visor.open("-d") + visor.vvm() + visor.close() + } - it should "open VisualVM connected to first node if it has JMX enabled" in { - visor.open("-d") - visor.vvm("-id8=@n1") - visor.close() + it("should open VisualVM connected to first node if it has JMX enabled") { + visor.open("-d") + visor.vvm("-id8=@n1") + visor.close() + } } }