From 1dfa382e44bdb386136d84f3d7f67cfdb080fe16 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Tue, 11 Mar 2008 20:15:07 +0000 Subject: moving everything into OpenSim.TestSuite namespace --- OpenSim/TestSuite/BotManager.cs | 2 +- OpenSim/TestSuite/Main.cs | 105 ++++++++++++++++++++++++++++++++++++ OpenSim/TestSuite/PhysicsBot.cs | 3 +- OpenSim/TestSuite/Util.cs | 55 +++++++++++++++++++ OpenSim/TestSuite/pCampBot.cs | 114 ---------------------------------------- 5 files changed, 163 insertions(+), 116 deletions(-) create mode 100644 OpenSim/TestSuite/Main.cs create mode 100644 OpenSim/TestSuite/Util.cs delete mode 100644 OpenSim/TestSuite/pCampBot.cs (limited to 'OpenSim/TestSuite') diff --git a/OpenSim/TestSuite/BotManager.cs b/OpenSim/TestSuite/BotManager.cs index efd1613..6ef1dea 100644 --- a/OpenSim/TestSuite/BotManager.cs +++ b/OpenSim/TestSuite/BotManager.cs @@ -37,7 +37,7 @@ using System.Threading; using OpenSim.Framework; using OpenSim.Framework.Console; -namespace pCampBot +namespace OpenSim.TestSuite { /// /// Thread/Bot manager for the application diff --git a/OpenSim/TestSuite/Main.cs b/OpenSim/TestSuite/Main.cs new file mode 100644 index 0000000..c2cd7a1 --- /dev/null +++ b/OpenSim/TestSuite/Main.cs @@ -0,0 +1,105 @@ +/* +* Copyright (c) Contributors, http://opensimulator.org/ +* See CONTRIBUTORS.TXT for a full list of copyright holders. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions are met: +* * Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in the +* documentation and/or other materials provided with the distribution. +* * Neither the name of the OpenSim Project nor the +* names of its contributors may be used to endorse or promote products +* derived from this software without specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY +* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY +* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +* +*/ + +using System; +using System.Collections.Generic; +using System.Text; +using libsecondlife; +using libsecondlife.Packets; +using Nini.Config; +using log4net; +using log4net.Config; +using System.Threading; +using OpenSim.Framework.Console; + +namespace OpenSim.TestSuite +{ + /// + /// Event Types from the BOT. Add new events here + /// + public enum EventType:int + { + NONE = 0, + CONNECTED = 1, + DISCONNECTED = 2 + } + + public class TestSuite + { + public static void Main(string[] args) + { + + // TODO: config parser + + // TODO: load tests from addings + + // TODO: create base bot cloud for use in tests + + IConfig config = ParseConfig(args); + if (config.Get("help") != null || config.Get("loginuri") == null) { + Help(); + } else { + int botcount = config.GetInt("botcount", 1); + + // BotManager bm = new BotManager(); + + Utils.TestPass("Completed Startup"); + } + } + + private static IConfig ParseConfig(String[] args) + { + //Set up our nifty config.. thanks to nini + ArgvConfigSource cs = new ArgvConfigSource(args); + + cs.AddSwitch("Startup", "botcount","n"); + cs.AddSwitch("Startup", "loginuri","l"); + cs.AddSwitch("Startup", "firstname"); + cs.AddSwitch("Startup", "lastname"); + cs.AddSwitch("Startup", "password"); + cs.AddSwitch("Startup", "help","h"); + + IConfig ol = cs.Configs["Startup"]; + return ol; + } + + private static void Help() + { + System.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" + + " -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 3e12bb1..5c1d966 100644 --- a/OpenSim/TestSuite/PhysicsBot.cs +++ b/OpenSim/TestSuite/PhysicsBot.cs @@ -37,8 +37,9 @@ using System.Threading; using OpenSim.Framework; using OpenSim.Framework.Console; using Timer = System.Timers.Timer; +using log4net; -namespace pCampBot +namespace OpenSim.TestSuite { public class PhysicsBot { diff --git a/OpenSim/TestSuite/Util.cs b/OpenSim/TestSuite/Util.cs new file mode 100644 index 0000000..edc2a54 --- /dev/null +++ b/OpenSim/TestSuite/Util.cs @@ -0,0 +1,55 @@ +using System; + +namespace OpenSim.TestSuite +{ + + public class Utils + { + enum Result { + Fail = 0, + Pass = 1, + Skip = 3 + } + + private static String ResultToString(Result r) + { + if (r == Result.Pass) + { + return "PASS"; + } + else if (r == Result.Fail) + { + return "FAIL"; + } + else if (r == Result.Skip) + { + return "SKIP"; + } + else + { + return "UNKNOWN"; + } + } + + + private static void TestResult(Result r, String msg) + { + System.Console.WriteLine("[{0}]: {1}", ResultToString(r), msg); + } + + public static void TestFail(String msg) + { + TestResult(Result.Fail, msg); + } + + public static void TestPass(String msg) + { + TestResult(Result.Pass, msg); + } + + public static void TestSkip(String msg) + { + TestResult(Result.Skip, msg); + } + } +} \ No newline at end of file diff --git a/OpenSim/TestSuite/pCampBot.cs b/OpenSim/TestSuite/pCampBot.cs deleted file mode 100644 index d42d4bd..0000000 --- a/OpenSim/TestSuite/pCampBot.cs +++ /dev/null @@ -1,114 +0,0 @@ -/* -* Copyright (c) Contributors, http://opensimulator.org/ -* See CONTRIBUTORS.TXT for a full list of copyright holders. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions are met: -* * Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* * Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the distribution. -* * Neither the name of the OpenSim Project nor the -* names of its contributors may be used to endorse or promote products -* derived from this software without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY -* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY -* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -*/ - -using System; -using System.Collections.Generic; -using System.Text; -using libsecondlife; -using libsecondlife.Packets; -using Nini.Config; -using log4net; -using log4net.Config; -using System.Threading; -using OpenSim.Framework.Console; - -namespace pCampBot -{ - /// - /// Event Types from the BOT. Add new events here - /// - public enum EventType:int - { - NONE = 0, - CONNECTED = 1, - DISCONNECTED = 2 - } - - public class pCampBot - { - - private static readonly ILog m_log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); - - [STAThread] - public static void Main(string[] args) - { - // log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); - // log4net call - // BasicConfigurator.Configure(); - - IConfig config = ParseConfig(args); - if (config.Get("help") != null || config.Get("loginuri") == null) { - Help(); - } else { - int botcount = config.GetInt("botcount", 1); - - BotManager bm = new BotManager(); - - System.Console.WriteLine("Error enabled: {0}", m_log.IsErrorEnabled); - //startup specified number of bots. 1 is the default - m_log.Error("pCampBot started with " + botcount + "bots"); - -// bm.dobotStartup(botcount, config); -// while (true) -// { -// MainConsole.Instance.Prompt(); -// } - } - } - - private static IConfig ParseConfig(String[] args) - { - //Set up our nifty config.. thanks to nini - ArgvConfigSource cs = new ArgvConfigSource(args); - - cs.AddSwitch("Startup", "botcount","n"); - cs.AddSwitch("Startup", "loginuri","l"); - cs.AddSwitch("Startup", "firstname"); - cs.AddSwitch("Startup", "lastname"); - cs.AddSwitch("Startup", "password"); - cs.AddSwitch("Startup", "help","h"); - - IConfig ol = cs.Configs["Startup"]; - return ol; - } - - private static void Help() - { - System.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" + - " -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" - ); - } - } -} -- cgit v1.1