diff options
author | Kunnis | 2009-08-16 03:35:31 -0500 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-08-16 14:34:16 -0400 |
commit | dd78c250aed0924d06e28a826c2ad565ca232045 (patch) | |
tree | 331487699d7d2fba8d00cd2a8e57b85e8f77e794 /OpenSim/Data/Tests/BasicGridTest.cs | |
parent | * More improvements to BasicAssetTest.cs (diff) | |
download | opensim-SC_OLD-dd78c250aed0924d06e28a826c2ad565ca232045.zip opensim-SC_OLD-dd78c250aed0924d06e28a826c2ad565ca232045.tar.gz opensim-SC_OLD-dd78c250aed0924d06e28a826c2ad565ca232045.tar.bz2 opensim-SC_OLD-dd78c250aed0924d06e28a826c2ad565ca232045.tar.xz |
* Added Expression based ignores to the PropertyScrambler, which makes a lot of the tests clearer because I'm not constantly resetting properties.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/Tests/BasicGridTest.cs | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/OpenSim/Data/Tests/BasicGridTest.cs b/OpenSim/Data/Tests/BasicGridTest.cs index b0ee4a0..a25b736 100644 --- a/OpenSim/Data/Tests/BasicGridTest.cs +++ b/OpenSim/Data/Tests/BasicGridTest.cs | |||
@@ -28,22 +28,18 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Text; | 30 | using System.Text; |
31 | using log4net.Config; | ||
32 | using NUnit.Framework; | 31 | using NUnit.Framework; |
33 | using NUnit.Framework.SyntaxHelpers; | 32 | using NUnit.Framework.SyntaxHelpers; |
34 | using OpenMetaverse; | 33 | using OpenMetaverse; |
35 | using log4net; | ||
36 | using System.Reflection; | ||
37 | 34 | ||
38 | namespace OpenSim.Data.Tests | 35 | namespace OpenSim.Data.Tests |
39 | { | 36 | { |
40 | public class BasicGridTest | 37 | public class BasicGridTest |
41 | { | 38 | { |
42 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 39 | public IGridDataPlugin db; |
43 | public GridDataBase db; | ||
44 | public UUID region1, region2, region3; | 40 | public UUID region1, region2, region3; |
45 | public UUID zero = UUID.Zero; | 41 | public UUID zero = UUID.Zero; |
46 | public static Random random; | 42 | public static Random random = new Random(); |
47 | 43 | ||
48 | [TearDown] | 44 | [TearDown] |
49 | public void removeAllRegions() | 45 | public void removeAllRegions() |
@@ -61,24 +57,16 @@ namespace OpenSim.Data.Tests | |||
61 | 57 | ||
62 | public void SuperInit() | 58 | public void SuperInit() |
63 | { | 59 | { |
64 | try | 60 | OpenSim.Tests.Common.TestLogging.LogToConsole(); |
65 | { | ||
66 | XmlConfigurator.Configure(); | ||
67 | } | ||
68 | catch (Exception) | ||
69 | { | ||
70 | // I don't care, just leave log4net off | ||
71 | } | ||
72 | region1 = UUID.Random(); | 61 | region1 = UUID.Random(); |
73 | region2 = UUID.Random(); | 62 | region2 = UUID.Random(); |
74 | region3 = UUID.Random(); | 63 | region3 = UUID.Random(); |
75 | random = new Random(); | ||
76 | } | 64 | } |
77 | 65 | ||
78 | protected RegionProfileData createRegion(UUID regionUUID, string regionName) | 66 | protected RegionProfileData createRegion(UUID regionUUID, string regionName) |
79 | { | 67 | { |
80 | RegionProfileData reg = new RegionProfileData(); | 68 | RegionProfileData reg = new RegionProfileData(); |
81 | ScrambleForTesting.Scramble(reg); | 69 | new PropertyScrambler<RegionProfileData>().Scramble(reg); |
82 | reg.Uuid = regionUUID; | 70 | reg.Uuid = regionUUID; |
83 | reg.RegionName = regionName; | 71 | reg.RegionName = regionName; |
84 | 72 | ||