diff options
Diffstat (limited to 'OpenSim/Data/Tests/BasicRegionTest.cs')
-rw-r--r-- | OpenSim/Data/Tests/BasicRegionTest.cs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs index d60dadd..8e58443 100644 --- a/OpenSim/Data/Tests/BasicRegionTest.cs +++ b/OpenSim/Data/Tests/BasicRegionTest.cs | |||
@@ -29,14 +29,13 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Drawing; | 30 | using System.Drawing; |
31 | using System.Text; | 31 | using System.Text; |
32 | using log4net.Config; | ||
32 | using NUnit.Framework; | 33 | using NUnit.Framework; |
33 | using NUnit.Framework.SyntaxHelpers; | 34 | using NUnit.Framework.SyntaxHelpers; |
35 | using OpenMetaverse; | ||
34 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
35 | using OpenSim.Data; | ||
36 | using OpenSim.Region.Framework.Interfaces; | 37 | using OpenSim.Region.Framework.Interfaces; |
37 | using OpenSim.Region.Framework.Scenes; | 38 | using OpenSim.Region.Framework.Scenes; |
38 | using OpenSim.Region.CoreModules.World.Land; | ||
39 | using OpenMetaverse; | ||
40 | 39 | ||
41 | namespace OpenSim.Data.Tests | 40 | namespace OpenSim.Data.Tests |
42 | { | 41 | { |
@@ -71,7 +70,7 @@ namespace OpenSim.Data.Tests | |||
71 | { | 70 | { |
72 | try | 71 | try |
73 | { | 72 | { |
74 | log4net.Config.XmlConfigurator.Configure(); | 73 | XmlConfigurator.Configure(); |
75 | } | 74 | } |
76 | catch (Exception) | 75 | catch (Exception) |
77 | { | 76 | { |
@@ -140,7 +139,7 @@ namespace OpenSim.Data.Tests | |||
140 | } | 139 | } |
141 | catch (Exception e) | 140 | catch (Exception e) |
142 | { | 141 | { |
143 | System.Console.WriteLine("Exception in storing object {0} {1}", sog.ToString(), e); | 142 | Console.WriteLine("Exception in storing object {0} {1}", sog.ToString(), e); |
144 | Assert.Fail(); | 143 | Assert.Fail(); |
145 | } | 144 | } |
146 | 145 | ||
@@ -150,7 +149,7 @@ namespace OpenSim.Data.Tests | |||
150 | } | 149 | } |
151 | catch (Exception e) | 150 | catch (Exception e) |
152 | { | 151 | { |
153 | System.Console.WriteLine("Exception in storing object {0} {1}", sog2.ToString(), e); | 152 | Console.WriteLine("Exception in storing object {0} {1}", sog2.ToString(), e); |
154 | Assert.Fail(); | 153 | Assert.Fail(); |
155 | } | 154 | } |
156 | 155 | ||
@@ -651,7 +650,7 @@ namespace OpenSim.Data.Tests | |||
651 | } | 650 | } |
652 | 651 | ||
653 | [Test] | 652 | [Test] |
654 | [ExpectedException(typeof(System.ArgumentException))] | 653 | [ExpectedException(typeof(ArgumentException))] |
655 | public void T026_PrimInventoryMany() | 654 | public void T026_PrimInventoryMany() |
656 | { | 655 | { |
657 | UUID i1,i2,i3,i4; | 656 | UUID i1,i2,i3,i4; |