aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-01-29 04:26:26 +0000
committerJustin Clark-Casey (justincc)2013-01-29 04:26:47 +0000
commite0f4e91d224c7a3f478a1bdea3d563ce97bb07c0 (patch)
treef436110bec2f12a0aea6a134039c2700f2f2bdd9 /OpenSim/Region
parentminor: Tidy up disabled logging on AssetTransactionModule for future use. Ma... (diff)
downloadopensim-SC_OLD-e0f4e91d224c7a3f478a1bdea3d563ce97bb07c0.zip
opensim-SC_OLD-e0f4e91d224c7a3f478a1bdea3d563ce97bb07c0.tar.gz
opensim-SC_OLD-e0f4e91d224c7a3f478a1bdea3d563ce97bb07c0.tar.bz2
opensim-SC_OLD-e0f4e91d224c7a3f478a1bdea3d563ce97bb07c0.tar.xz
Try ignoring json tests if they can't be run due to being on <=.net 3.5
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs23
1 files changed, 17 insertions, 6 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs
index 397dd93..5b2931e 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs
@@ -59,8 +59,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
59 { 59 {
60 base.SetUp(); 60 base.SetUp();
61 61
62 TestHelpers.EnableLogging();
63
64 IConfigSource configSource = new IniConfigSource(); 62 IConfigSource configSource = new IniConfigSource();
65 IConfig jsonStoreConfig = configSource.AddConfig("JsonStore"); 63 IConfig jsonStoreConfig = configSource.AddConfig("JsonStore");
66 jsonStoreConfig.Set("Enabled", "true"); 64 jsonStoreConfig.Set("Enabled", "true");
@@ -72,9 +70,20 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
72 70
73 m_scene = new SceneHelpers().SetupScene(); 71 m_scene = new SceneHelpers().SetupScene();
74 SceneHelpers.SetupSceneModules(m_scene, configSource, m_engine, m_smcm, jsm, jssm); 72 SceneHelpers.SetupSceneModules(m_scene, configSource, m_engine, m_smcm, jsm, jssm);
73
74 try
75 {
76 m_smcm.RegisterScriptInvocation(this, "DummyTestMethod");
77 }
78 catch (ArgumentException)
79 {
80 Assert.Ignore("Ignoring test since running on .NET 3.5 or earlier.");
81 }
82
83 // XXX: Unfortunately, ICommsModule currently has no way of deregistering methods.
75 } 84 }
76 85
77// [Test] 86 [Test]
78 public void TestJsonCreateStore() 87 public void TestJsonCreateStore()
79 { 88 {
80 TestHelpers.InMethod(); 89 TestHelpers.InMethod();
@@ -85,7 +94,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
85 Assert.That(storeId, Is.Not.EqualTo(UUID.Zero)); 94 Assert.That(storeId, Is.Not.EqualTo(UUID.Zero));
86 } 95 }
87 96
88// [Test] 97 [Test]
89 public void TestJsonGetValue() 98 public void TestJsonGetValue()
90 { 99 {
91 TestHelpers.InMethod(); 100 TestHelpers.InMethod();
@@ -102,7 +111,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
102 Assert.That(value, Is.EqualTo("World")); 111 Assert.That(value, Is.EqualTo("World"));
103 } 112 }
104 113
105// [Test] 114 [Test]
106 public void TestJsonTestPath() 115 public void TestJsonTestPath()
107 { 116 {
108 TestHelpers.InMethod(); 117 TestHelpers.InMethod();
@@ -119,7 +128,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
119 Assert.That(result, Is.EqualTo(1)); 128 Assert.That(result, Is.EqualTo(1));
120 } 129 }
121 130
122// [Test] 131 [Test]
123 public void TestJsonSetValue() 132 public void TestJsonSetValue()
124 { 133 {
125 TestHelpers.InMethod(); 134 TestHelpers.InMethod();
@@ -141,5 +150,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
141 150
142 Assert.That(value, Is.EqualTo("World")); 151 Assert.That(value, Is.EqualTo("World"));
143 } 152 }
153
154 public object DummyTestMethod(object o1, object o2, object o3, object o4, object o5) { return null; }
144 } 155 }
145} \ No newline at end of file 156} \ No newline at end of file