From 259ddcfe1a655638f8e87f8b3dfec6d9c006140f Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Mon, 19 May 2008 13:26:42 +0000 Subject: Update svn properties. Minor formatting cleanup. --- OpenSim/TestSuite/BotManager.cs | 2 +- OpenSim/TestSuite/Main.cs | 20 ++++++++++---------- OpenSim/TestSuite/PhysicsBot.cs | 6 ------ OpenSim/TestSuite/Util.cs | 3 ++- 4 files changed, 13 insertions(+), 18 deletions(-) (limited to 'OpenSim/TestSuite') diff --git a/OpenSim/TestSuite/BotManager.cs b/OpenSim/TestSuite/BotManager.cs index 77e9044..a431a43 100644 --- a/OpenSim/TestSuite/BotManager.cs +++ b/OpenSim/TestSuite/BotManager.cs @@ -153,7 +153,7 @@ namespace OpenSim.TestSuite m_log.Info("[ " + callbot.firstname + " " + callbot.lastname + "]: Disconnected"); m_td[m_lBot.IndexOf(callbot)].Abort(); numbots--; - if (numbots >1) + if (numbots > 1) Environment.Exit(0); break; } diff --git a/OpenSim/TestSuite/Main.cs b/OpenSim/TestSuite/Main.cs index 1a9aa0e..b944304 100644 --- a/OpenSim/TestSuite/Main.cs +++ b/OpenSim/TestSuite/Main.cs @@ -33,7 +33,7 @@ namespace OpenSim.TestSuite /// /// Event Types from the BOT. Add new events here /// - public enum EventType:int + public enum EventType : int { NONE = 0, CONNECTED = 1, @@ -84,15 +84,15 @@ namespace OpenSim.TestSuite private static void Help() { Console.WriteLine( - "usage: pCampBot <-loginuri loginuri> [OPTIONS]\n" + - "Spawns a set of bots to test an OpenSim region\n\n" + - " -l, -loginuri loginuri for sim to log into (required)\n" + - // TODO: unused: " -n, -botcount number of bots to start (default: 1)\n" + - " -firstname first name for the bot(s) (default: random string)\n" + - " -lastname lastname for the bot(s) (default: random string)\n" + - " -password password for the bots(s) (default: random string)\n" + - " -h, -help show this message" - ); + "usage: pCampBot <-loginuri loginuri> [OPTIONS]\n" + + "Spawns a set of bots to test an OpenSim region\n\n" + + " -l, -loginuri loginuri for sim to log into (required)\n" + + // TODO: unused: " -n, -botcount number of bots to start (default: 1)\n" + + " -firstname first name for the bot(s) (default: random string)\n" + + " -lastname lastname for the bot(s) (default: random string)\n" + + " -password password for the bots(s) (default: random string)\n" + + " -h, -help show this message" + ); } } } diff --git a/OpenSim/TestSuite/PhysicsBot.cs b/OpenSim/TestSuite/PhysicsBot.cs index a7bbe80..0e02aef 100644 --- a/OpenSim/TestSuite/PhysicsBot.cs +++ b/OpenSim/TestSuite/PhysicsBot.cs @@ -54,7 +54,6 @@ namespace OpenSim.TestSuite protected Random somthing = new Random(Environment.TickCount);// We do stuff randomly here - //New instance of a SecondLife client public SecondLife client = new SecondLife(); @@ -104,7 +103,6 @@ namespace OpenSim.TestSuite client.Self.Chat(randomf, 0, ChatType.Normal); //Thread.Sleep(somthing.Next(1, 10)); // Apparently its better without it right now. - } /// @@ -116,9 +114,6 @@ namespace OpenSim.TestSuite lastname = startupConfig.GetString("lastname", "random"); password = startupConfig.GetString("password", "12345"); loginURI = startupConfig.GetString("loginuri"); - - - } /// @@ -148,7 +143,6 @@ namespace OpenSim.TestSuite m_action.Start(); OnConnected(this, EventType.CONNECTED); client.Self.Jump(); - } } else diff --git a/OpenSim/TestSuite/Util.cs b/OpenSim/TestSuite/Util.cs index 5823af4..fc8a5c4 100644 --- a/OpenSim/TestSuite/Util.cs +++ b/OpenSim/TestSuite/Util.cs @@ -31,7 +31,8 @@ namespace OpenSim.TestSuite { public class Utils { - enum Result { + enum Result + { Fail = 0, Pass = 1, Skip = 3 -- cgit v1.1