aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorSean Dague2009-04-13 21:04:50 +0000
committerSean Dague2009-04-13 21:04:50 +0000
commit5ef67941658ad1481fe4e801193d4ed43f0452e6 (patch)
tree0fb8b5c51fae496e778025f4a2735d78dcd12742 /OpenSim
parent* Changed all privates to m_ scheme (diff)
downloadopensim-SC-5ef67941658ad1481fe4e801193d4ed43f0452e6.zip
opensim-SC-5ef67941658ad1481fe4e801193d4ed43f0452e6.tar.gz
opensim-SC-5ef67941658ad1481fe4e801193d4ed43f0452e6.tar.bz2
opensim-SC-5ef67941658ad1481fe4e801193d4ed43f0452e6.tar.xz
make the asserts spit out messages about their test names
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/Tests/BasicAssetTest.cs12
-rw-r--r--OpenSim/Data/Tests/BasicGridTest.cs76
-rw-r--r--OpenSim/Data/Tests/BasicInventoryTest.cs82
-rw-r--r--OpenSim/Data/Tests/BasicRegionTest.cs332
-rw-r--r--OpenSim/Data/Tests/BasicUserTest.cs254
5 files changed, 378 insertions, 378 deletions
diff --git a/OpenSim/Data/Tests/BasicAssetTest.cs b/OpenSim/Data/Tests/BasicAssetTest.cs
index 2a70711..2ab37c7 100644
--- a/OpenSim/Data/Tests/BasicAssetTest.cs
+++ b/OpenSim/Data/Tests/BasicAssetTest.cs
@@ -86,16 +86,16 @@ namespace OpenSim.Data.Tests
86 db.CreateAsset(a3); 86 db.CreateAsset(a3);
87 87
88 AssetBase a1a = db.FetchAsset(uuid1); 88 AssetBase a1a = db.FetchAsset(uuid1);
89 Assert.That(a1.ID, Is.EqualTo(a1a.ID)); 89 Assert.That(a1.ID, Is.EqualTo(a1a.ID), "Assert.That(a1.ID, Is.EqualTo(a1a.ID))");
90 Assert.That(a1.Name, Is.EqualTo(a1a.Name)); 90 Assert.That(a1.Name, Is.EqualTo(a1a.Name), "Assert.That(a1.Name, Is.EqualTo(a1a.Name))");
91 91
92 AssetBase a2a = db.FetchAsset(uuid2); 92 AssetBase a2a = db.FetchAsset(uuid2);
93 Assert.That(a2.ID, Is.EqualTo(a2a.ID)); 93 Assert.That(a2.ID, Is.EqualTo(a2a.ID), "Assert.That(a2.ID, Is.EqualTo(a2a.ID))");
94 Assert.That(a2.Name, Is.EqualTo(a2a.Name)); 94 Assert.That(a2.Name, Is.EqualTo(a2a.Name), "Assert.That(a2.Name, Is.EqualTo(a2a.Name))");
95 95
96 AssetBase a3a = db.FetchAsset(uuid3); 96 AssetBase a3a = db.FetchAsset(uuid3);
97 Assert.That(a3.ID, Is.EqualTo(a3a.ID)); 97 Assert.That(a3.ID, Is.EqualTo(a3a.ID), "Assert.That(a3.ID, Is.EqualTo(a3a.ID))");
98 Assert.That(a3.Name, Is.EqualTo(a3a.Name)); 98 Assert.That(a3.Name, Is.EqualTo(a3a.Name), "Assert.That(a3.Name, Is.EqualTo(a3a.Name))");
99 } 99 }
100 100
101 [Test] 101 [Test]
diff --git a/OpenSim/Data/Tests/BasicGridTest.cs b/OpenSim/Data/Tests/BasicGridTest.cs
index b108c68..2b5318a 100644
--- a/OpenSim/Data/Tests/BasicGridTest.cs
+++ b/OpenSim/Data/Tests/BasicGridTest.cs
@@ -130,45 +130,45 @@ namespace OpenSim.Data.Tests
130 RegionProfileData newreg = createRegion(region2, "|<Goth@m Ci1y>|"); 130 RegionProfileData newreg = createRegion(region2, "|<Goth@m Ci1y>|");
131 RegionProfileData retreg = db.GetProfileByUUID(region2); 131 RegionProfileData retreg = db.GetProfileByUUID(region2);
132 132
133 Assert.That(retreg.RegionName, Is.EqualTo(newreg.RegionName)); 133 Assert.That(retreg.RegionName, Is.EqualTo(newreg.RegionName), "Assert.That(retreg.RegionName, Is.EqualTo(newreg.RegionName))");
134 Assert.That(retreg.Uuid, Is.EqualTo(region2)); 134 Assert.That(retreg.Uuid, Is.EqualTo(region2), "Assert.That(retreg.Uuid, Is.EqualTo(region2))");
135 Assert.That(retreg.RegionHandle, Is.EqualTo(newreg.RegionHandle)); 135 Assert.That(retreg.RegionHandle, Is.EqualTo(newreg.RegionHandle), "Assert.That(retreg.RegionHandle, Is.EqualTo(newreg.RegionHandle))");
136 Assert.That(retreg.RegionLocX, Is.EqualTo(newreg.RegionLocX)); 136 Assert.That(retreg.RegionLocX, Is.EqualTo(newreg.RegionLocX), "Assert.That(retreg.RegionLocX, Is.EqualTo(newreg.RegionLocX))");
137 Assert.That(retreg.RegionLocY, Is.EqualTo(newreg.RegionLocY)); 137 Assert.That(retreg.RegionLocY, Is.EqualTo(newreg.RegionLocY), "Assert.That(retreg.RegionLocY, Is.EqualTo(newreg.RegionLocY))");
138 Assert.That(retreg.RegionLocZ, Is.EqualTo(newreg.RegionLocZ)); 138 Assert.That(retreg.RegionLocZ, Is.EqualTo(newreg.RegionLocZ), "Assert.That(retreg.RegionLocZ, Is.EqualTo(newreg.RegionLocZ))");
139 Assert.That(retreg.RegionSendKey, Is.EqualTo(newreg.RegionSendKey)); 139 Assert.That(retreg.RegionSendKey, Is.EqualTo(newreg.RegionSendKey), "Assert.That(retreg.RegionSendKey, Is.EqualTo(newreg.RegionSendKey))");
140 Assert.That(retreg.RegionRecvKey, Is.EqualTo(newreg.RegionRecvKey)); 140 Assert.That(retreg.RegionRecvKey, Is.EqualTo(newreg.RegionRecvKey), "Assert.That(retreg.RegionRecvKey, Is.EqualTo(newreg.RegionRecvKey))");
141 Assert.That(retreg.RegionSecret, Is.EqualTo(newreg.RegionSecret)); 141 Assert.That(retreg.RegionSecret, Is.EqualTo(newreg.RegionSecret), "Assert.That(retreg.RegionSecret, Is.EqualTo(newreg.RegionSecret))");
142 Assert.That(retreg.RegionOnline, Is.EqualTo(newreg.RegionOnline)); 142 Assert.That(retreg.RegionOnline, Is.EqualTo(newreg.RegionOnline), "Assert.That(retreg.RegionOnline, Is.EqualTo(newreg.RegionOnline))");
143 Assert.That(retreg.OriginUUID, Is.EqualTo(newreg.OriginUUID)); 143 Assert.That(retreg.OriginUUID, Is.EqualTo(newreg.OriginUUID), "Assert.That(retreg.OriginUUID, Is.EqualTo(newreg.OriginUUID))");
144 Assert.That(retreg.ServerIP, Is.EqualTo(newreg.ServerIP)); 144 Assert.That(retreg.ServerIP, Is.EqualTo(newreg.ServerIP), "Assert.That(retreg.ServerIP, Is.EqualTo(newreg.ServerIP))");
145 Assert.That(retreg.ServerPort, Is.EqualTo(newreg.ServerPort)); 145 Assert.That(retreg.ServerPort, Is.EqualTo(newreg.ServerPort), "Assert.That(retreg.ServerPort, Is.EqualTo(newreg.ServerPort))");
146 Assert.That(retreg.ServerURI, Is.EqualTo(newreg.ServerURI)); 146 Assert.That(retreg.ServerURI, Is.EqualTo(newreg.ServerURI), "Assert.That(retreg.ServerURI, Is.EqualTo(newreg.ServerURI))");
147 Assert.That(retreg.ServerHttpPort, Is.EqualTo(newreg.ServerHttpPort)); 147 Assert.That(retreg.ServerHttpPort, Is.EqualTo(newreg.ServerHttpPort), "Assert.That(retreg.ServerHttpPort, Is.EqualTo(newreg.ServerHttpPort))");
148 Assert.That(retreg.ServerRemotingPort, Is.EqualTo(newreg.ServerRemotingPort)); 148 Assert.That(retreg.ServerRemotingPort, Is.EqualTo(newreg.ServerRemotingPort), "Assert.That(retreg.ServerRemotingPort, Is.EqualTo(newreg.ServerRemotingPort))");
149 Assert.That(retreg.NorthOverrideHandle, Is.EqualTo(newreg.NorthOverrideHandle)); 149 Assert.That(retreg.NorthOverrideHandle, Is.EqualTo(newreg.NorthOverrideHandle), "Assert.That(retreg.NorthOverrideHandle, Is.EqualTo(newreg.NorthOverrideHandle))");
150 Assert.That(retreg.SouthOverrideHandle, Is.EqualTo(newreg.SouthOverrideHandle)); 150 Assert.That(retreg.SouthOverrideHandle, Is.EqualTo(newreg.SouthOverrideHandle), "Assert.That(retreg.SouthOverrideHandle, Is.EqualTo(newreg.SouthOverrideHandle))");
151 Assert.That(retreg.EastOverrideHandle, Is.EqualTo(newreg.EastOverrideHandle)); 151 Assert.That(retreg.EastOverrideHandle, Is.EqualTo(newreg.EastOverrideHandle), "Assert.That(retreg.EastOverrideHandle, Is.EqualTo(newreg.EastOverrideHandle))");
152 Assert.That(retreg.WestOverrideHandle, Is.EqualTo(newreg.WestOverrideHandle)); 152 Assert.That(retreg.WestOverrideHandle, Is.EqualTo(newreg.WestOverrideHandle), "Assert.That(retreg.WestOverrideHandle, Is.EqualTo(newreg.WestOverrideHandle))");
153 Assert.That(retreg.RegionDataURI, Is.EqualTo(newreg.RegionDataURI)); 153 Assert.That(retreg.RegionDataURI, Is.EqualTo(newreg.RegionDataURI), "Assert.That(retreg.RegionDataURI, Is.EqualTo(newreg.RegionDataURI))");
154 Assert.That(retreg.RegionAssetURI, Is.EqualTo(newreg.RegionAssetURI)); 154 Assert.That(retreg.RegionAssetURI, Is.EqualTo(newreg.RegionAssetURI), "Assert.That(retreg.RegionAssetURI, Is.EqualTo(newreg.RegionAssetURI))");
155 Assert.That(retreg.RegionAssetSendKey, Is.EqualTo(newreg.RegionAssetSendKey)); 155 Assert.That(retreg.RegionAssetSendKey, Is.EqualTo(newreg.RegionAssetSendKey), "Assert.That(retreg.RegionAssetSendKey, Is.EqualTo(newreg.RegionAssetSendKey))");
156 Assert.That(retreg.RegionAssetRecvKey, Is.EqualTo(newreg.RegionAssetRecvKey)); 156 Assert.That(retreg.RegionAssetRecvKey, Is.EqualTo(newreg.RegionAssetRecvKey), "Assert.That(retreg.RegionAssetRecvKey, Is.EqualTo(newreg.RegionAssetRecvKey))");
157 Assert.That(retreg.RegionUserURI, Is.EqualTo(newreg.RegionUserURI)); 157 Assert.That(retreg.RegionUserURI, Is.EqualTo(newreg.RegionUserURI), "Assert.That(retreg.RegionUserURI, Is.EqualTo(newreg.RegionUserURI))");
158 Assert.That(retreg.RegionUserSendKey, Is.EqualTo(newreg.RegionUserSendKey)); 158 Assert.That(retreg.RegionUserSendKey, Is.EqualTo(newreg.RegionUserSendKey), "Assert.That(retreg.RegionUserSendKey, Is.EqualTo(newreg.RegionUserSendKey))");
159 Assert.That(retreg.RegionUserRecvKey, Is.EqualTo(newreg.RegionUserRecvKey)); 159 Assert.That(retreg.RegionUserRecvKey, Is.EqualTo(newreg.RegionUserRecvKey), "Assert.That(retreg.RegionUserRecvKey, Is.EqualTo(newreg.RegionUserRecvKey))");
160 Assert.That(retreg.RegionMapTextureID, Is.EqualTo(newreg.RegionMapTextureID)); 160 Assert.That(retreg.RegionMapTextureID, Is.EqualTo(newreg.RegionMapTextureID), "Assert.That(retreg.RegionMapTextureID, Is.EqualTo(newreg.RegionMapTextureID))");
161 Assert.That(retreg.Owner_uuid, Is.EqualTo(newreg.Owner_uuid)); 161 Assert.That(retreg.Owner_uuid, Is.EqualTo(newreg.Owner_uuid), "Assert.That(retreg.Owner_uuid, Is.EqualTo(newreg.Owner_uuid))");
162 Assert.That(retreg.OriginUUID, Is.EqualTo(newreg.OriginUUID)); 162 Assert.That(retreg.OriginUUID, Is.EqualTo(newreg.OriginUUID), "Assert.That(retreg.OriginUUID, Is.EqualTo(newreg.OriginUUID))");
163 163
164 retreg = db.GetProfileByHandle(newreg.RegionHandle); 164 retreg = db.GetProfileByHandle(newreg.RegionHandle);
165 Assert.That(retreg.Uuid, Is.EqualTo(region2)); 165 Assert.That(retreg.Uuid, Is.EqualTo(region2), "Assert.That(retreg.Uuid, Is.EqualTo(region2))");
166 166
167 retreg = db.GetProfileByString(newreg.RegionName); 167 retreg = db.GetProfileByString(newreg.RegionName);
168 Assert.That(retreg.Uuid, Is.EqualTo(region2)); 168 Assert.That(retreg.Uuid, Is.EqualTo(region2), "Assert.That(retreg.Uuid, Is.EqualTo(region2))");
169 169
170 RegionProfileData[] retregs = db.GetProfilesInRange(newreg.RegionLocX,newreg.RegionLocY,newreg.RegionLocX,newreg.RegionLocY); 170 RegionProfileData[] retregs = db.GetProfilesInRange(newreg.RegionLocX,newreg.RegionLocY,newreg.RegionLocX,newreg.RegionLocY);
171 Assert.That(retregs[0].Uuid, Is.EqualTo(region2)); 171 Assert.That(retregs[0].Uuid, Is.EqualTo(region2), "Assert.That(retregs[0].Uuid, Is.EqualTo(region2))");
172 } 172 }
173 173
174 [Test] 174 [Test]
@@ -192,7 +192,7 @@ namespace OpenSim.Data.Tests
192 db.UpdateProfile(retreg); 192 db.UpdateProfile(retreg);
193 193
194 retreg = db.GetProfileByUUID(region2); 194 retreg = db.GetProfileByUUID(region2);
195 Assert.That(retreg.RegionName, Is.EqualTo("Gotham City")); 195 Assert.That(retreg.RegionName, Is.EqualTo("Gotham City"), "Assert.That(retreg.RegionName, Is.EqualTo(\"Gotham City\"))");
196 } 196 }
197 197
198 [Test] 198 [Test]
@@ -214,10 +214,10 @@ namespace OpenSim.Data.Tests
214 214
215 List<RegionProfileData> listreg = db.GetRegionsByName("Gotham",10); 215 List<RegionProfileData> listreg = db.GetRegionsByName("Gotham",10);
216 216
217 Assert.That(listreg.Count,Is.EqualTo(2)); 217 Assert.That(listreg.Count,Is.EqualTo(2), "Assert.That(listreg.Count,Is.EqualTo(2))");
218 Assert.That(listreg[0].Uuid,Is.Not.EqualTo(listreg[1].Uuid)); 218 Assert.That(listreg[0].Uuid,Is.Not.EqualTo(listreg[1].Uuid), "Assert.That(listreg[0].Uuid,Is.Not.EqualTo(listreg[1].Uuid))");
219 Assert.That(listreg[0].Uuid, Is.EqualTo(region1) | Is.EqualTo(region2)); 219 Assert.That(listreg[0].Uuid, Is.EqualTo(region1) | Is.EqualTo(region2), "Assert.That(listreg[0].Uuid, Is.EqualTo(region1) | Is.EqualTo(region2))");
220 Assert.That(listreg[1].Uuid, Is.EqualTo(region1) | Is.EqualTo(region2)); 220 Assert.That(listreg[1].Uuid, Is.EqualTo(region1) | Is.EqualTo(region2), "Assert.That(listreg[1].Uuid, Is.EqualTo(region1) | Is.EqualTo(region2))");
221 } 221 }
222 222
223 protected static string RandomName() 223 protected static string RandomName()
diff --git a/OpenSim/Data/Tests/BasicInventoryTest.cs b/OpenSim/Data/Tests/BasicInventoryTest.cs
index eed6cab..c614577 100644
--- a/OpenSim/Data/Tests/BasicInventoryTest.cs
+++ b/OpenSim/Data/Tests/BasicInventoryTest.cs
@@ -122,7 +122,7 @@ namespace OpenSim.Data.Tests
122 Assert.That(db.getInventoryFolder(zero), Is.Null); 122 Assert.That(db.getInventoryFolder(zero), Is.Null);
123 Assert.That(db.getInventoryItem(zero), Is.Null); 123 Assert.That(db.getInventoryItem(zero), Is.Null);
124 Assert.That(db.getUserRootFolder(zero), Is.Null); 124 Assert.That(db.getUserRootFolder(zero), Is.Null);
125 Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0)); 125 Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0))");
126 } 126 }
127 127
128 // 01x - folder tests 128 // 01x - folder tests
@@ -144,14 +144,14 @@ namespace OpenSim.Data.Tests
144 // db.updateInventoryFolder(f1); 144 // db.updateInventoryFolder(f1);
145 // InventoryFolderBase f1a = db.getUserRootFolder(owner1); 145 // InventoryFolderBase f1a = db.getUserRootFolder(owner1);
146 // Assert.That(uuid1, Is.EqualTo(f1a.ID)) 146 // Assert.That(uuid1, Is.EqualTo(f1a.ID))
147 // Assert.That(name1, Text.Matches(f1a.Name)); 147 // Assert.That(name1, Text.Matches(f1a.Name), "Assert.That(name1, Text.Matches(f1a.Name))");
148 // Assert.That(db.getUserRootFolder(owner1), Is.Null); 148 // Assert.That(db.getUserRootFolder(owner1), Is.Null);
149 149
150 // succeed with true 150 // succeed with true
151 db.addInventoryFolder(f1); 151 db.addInventoryFolder(f1);
152 InventoryFolderBase f1a = db.getUserRootFolder(owner1); 152 InventoryFolderBase f1a = db.getUserRootFolder(owner1);
153 Assert.That(folder1, Is.EqualTo(f1a.ID)); 153 Assert.That(folder1, Is.EqualTo(f1a.ID), "Assert.That(folder1, Is.EqualTo(f1a.ID))");
154 Assert.That(name1, Text.Matches(f1a.Name)); 154 Assert.That(name1, Text.Matches(f1a.Name), "Assert.That(name1, Text.Matches(f1a.Name))");
155 } 155 }
156 156
157 // we now have the following tree 157 // we now have the following tree
@@ -165,22 +165,22 @@ namespace OpenSim.Data.Tests
165 InventoryFolderBase f2 = NewFolder(folder3, folder1, owner1, name3); 165 InventoryFolderBase f2 = NewFolder(folder3, folder1, owner1, name3);
166 db.addInventoryFolder(f2); 166 db.addInventoryFolder(f2);
167 167
168 Assert.That(db.getInventoryFolders(zero).Count, Is.EqualTo(1)); 168 Assert.That(db.getInventoryFolders(zero).Count, Is.EqualTo(1), "Assert.That(db.getInventoryFolders(zero).Count, Is.EqualTo(1))");
169 Assert.That(db.getInventoryFolders(folder1).Count, Is.EqualTo(2)); 169 Assert.That(db.getInventoryFolders(folder1).Count, Is.EqualTo(2), "Assert.That(db.getInventoryFolders(folder1).Count, Is.EqualTo(2))");
170 Assert.That(db.getInventoryFolders(folder2).Count, Is.EqualTo(0)); 170 Assert.That(db.getInventoryFolders(folder2).Count, Is.EqualTo(0), "Assert.That(db.getInventoryFolders(folder2).Count, Is.EqualTo(0))");
171 Assert.That(db.getInventoryFolders(folder3).Count, Is.EqualTo(0)); 171 Assert.That(db.getInventoryFolders(folder3).Count, Is.EqualTo(0), "Assert.That(db.getInventoryFolders(folder3).Count, Is.EqualTo(0))");
172 Assert.That(db.getInventoryFolders(UUID.Random()).Count, Is.EqualTo(0)); 172 Assert.That(db.getInventoryFolders(UUID.Random()).Count, Is.EqualTo(0), "Assert.That(db.getInventoryFolders(UUID.Random()).Count, Is.EqualTo(0))");
173 173
174 } 174 }
175 175
176 [Test] 176 [Test]
177 public void T013_FolderHierarchy() 177 public void T013_FolderHierarchy()
178 { 178 {
179 Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0)); 179 Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0))");
180 Assert.That(db.getFolderHierarchy(folder1).Count, Is.EqualTo(2)); 180 Assert.That(db.getFolderHierarchy(folder1).Count, Is.EqualTo(2), "Assert.That(db.getFolderHierarchy(folder1).Count, Is.EqualTo(2))");
181 Assert.That(db.getFolderHierarchy(folder2).Count, Is.EqualTo(0)); 181 Assert.That(db.getFolderHierarchy(folder2).Count, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(folder2).Count, Is.EqualTo(0))");
182 Assert.That(db.getFolderHierarchy(folder3).Count, Is.EqualTo(0)); 182 Assert.That(db.getFolderHierarchy(folder3).Count, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(folder3).Count, Is.EqualTo(0))");
183 Assert.That(db.getFolderHierarchy(UUID.Random()).Count, Is.EqualTo(0)); 183 Assert.That(db.getFolderHierarchy(UUID.Random()).Count, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(UUID.Random()).Count, Is.EqualTo(0))");
184 } 184 }
185 185
186 186
@@ -191,31 +191,31 @@ namespace OpenSim.Data.Tests
191 f2.ParentID = folder3; 191 f2.ParentID = folder3;
192 db.moveInventoryFolder(f2); 192 db.moveInventoryFolder(f2);
193 193
194 Assert.That(db.getInventoryFolders(zero).Count, Is.EqualTo(1)); 194 Assert.That(db.getInventoryFolders(zero).Count, Is.EqualTo(1), "Assert.That(db.getInventoryFolders(zero).Count, Is.EqualTo(1))");
195 Assert.That(db.getInventoryFolders(folder1).Count, Is.EqualTo(1)); 195 Assert.That(db.getInventoryFolders(folder1).Count, Is.EqualTo(1), "Assert.That(db.getInventoryFolders(folder1).Count, Is.EqualTo(1))");
196 Assert.That(db.getInventoryFolders(folder2).Count, Is.EqualTo(0)); 196 Assert.That(db.getInventoryFolders(folder2).Count, Is.EqualTo(0), "Assert.That(db.getInventoryFolders(folder2).Count, Is.EqualTo(0))");
197 Assert.That(db.getInventoryFolders(folder3).Count, Is.EqualTo(1)); 197 Assert.That(db.getInventoryFolders(folder3).Count, Is.EqualTo(1), "Assert.That(db.getInventoryFolders(folder3).Count, Is.EqualTo(1))");
198 Assert.That(db.getInventoryFolders(UUID.Random()).Count, Is.EqualTo(0)); 198 Assert.That(db.getInventoryFolders(UUID.Random()).Count, Is.EqualTo(0), "Assert.That(db.getInventoryFolders(UUID.Random()).Count, Is.EqualTo(0))");
199 } 199 }
200 200
201 [Test] 201 [Test]
202 public void T015_FolderHierarchy() 202 public void T015_FolderHierarchy()
203 { 203 {
204 Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0)); 204 Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0))");
205 Assert.That(db.getFolderHierarchy(folder1).Count, Is.EqualTo(2)); 205 Assert.That(db.getFolderHierarchy(folder1).Count, Is.EqualTo(2), "Assert.That(db.getFolderHierarchy(folder1).Count, Is.EqualTo(2))");
206 Assert.That(db.getFolderHierarchy(folder2).Count, Is.EqualTo(0)); 206 Assert.That(db.getFolderHierarchy(folder2).Count, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(folder2).Count, Is.EqualTo(0))");
207 Assert.That(db.getFolderHierarchy(folder3).Count, Is.EqualTo(1)); 207 Assert.That(db.getFolderHierarchy(folder3).Count, Is.EqualTo(1), "Assert.That(db.getFolderHierarchy(folder3).Count, Is.EqualTo(1))");
208 Assert.That(db.getFolderHierarchy(UUID.Random()).Count, Is.EqualTo(0)); 208 Assert.That(db.getFolderHierarchy(UUID.Random()).Count, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(UUID.Random()).Count, Is.EqualTo(0))");
209 } 209 }
210 210
211 // Item tests 211 // Item tests
212 [Test] 212 [Test]
213 public void T100_NoItems() 213 public void T100_NoItems()
214 { 214 {
215 Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0)); 215 Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0))");
216 Assert.That(db.getInventoryInFolder(folder1).Count, Is.EqualTo(0)); 216 Assert.That(db.getInventoryInFolder(folder1).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(folder1).Count, Is.EqualTo(0))");
217 Assert.That(db.getInventoryInFolder(folder2).Count, Is.EqualTo(0)); 217 Assert.That(db.getInventoryInFolder(folder2).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(folder2).Count, Is.EqualTo(0))");
218 Assert.That(db.getInventoryInFolder(folder3).Count, Is.EqualTo(0)); 218 Assert.That(db.getInventoryInFolder(folder3).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(folder3).Count, Is.EqualTo(0))");
219 } 219 }
220 220
221 // TODO: Feeding a bad inventory item down the data path will 221 // TODO: Feeding a bad inventory item down the data path will
@@ -227,7 +227,7 @@ namespace OpenSim.Data.Tests
227 db.addInventoryItem(NewItem(item1, folder3, owner1, iname1, asset1)); 227 db.addInventoryItem(NewItem(item1, folder3, owner1, iname1, asset1));
228 db.addInventoryItem(NewItem(item2, folder3, owner1, iname2, asset2)); 228 db.addInventoryItem(NewItem(item2, folder3, owner1, iname2, asset2));
229 db.addInventoryItem(NewItem(item3, folder3, owner1, iname3, asset3)); 229 db.addInventoryItem(NewItem(item3, folder3, owner1, iname3, asset3));
230 Assert.That(db.getInventoryInFolder(folder3).Count, Is.EqualTo(3)); 230 Assert.That(db.getInventoryInFolder(folder3).Count, Is.EqualTo(3), "Assert.That(db.getInventoryInFolder(folder3).Count, Is.EqualTo(3))");
231 } 231 }
232 232
233 [Test] 233 [Test]
@@ -236,15 +236,15 @@ namespace OpenSim.Data.Tests
236 InventoryItemBase i1 = db.getInventoryItem(item1); 236 InventoryItemBase i1 = db.getInventoryItem(item1);
237 InventoryItemBase i2 = db.getInventoryItem(item2); 237 InventoryItemBase i2 = db.getInventoryItem(item2);
238 InventoryItemBase i3 = db.getInventoryItem(item3); 238 InventoryItemBase i3 = db.getInventoryItem(item3);
239 Assert.That(i1.Name, Is.EqualTo(iname1)); 239 Assert.That(i1.Name, Is.EqualTo(iname1), "Assert.That(i1.Name, Is.EqualTo(iname1))");
240 Assert.That(i2.Name, Is.EqualTo(iname2)); 240 Assert.That(i2.Name, Is.EqualTo(iname2), "Assert.That(i2.Name, Is.EqualTo(iname2))");
241 Assert.That(i3.Name, Is.EqualTo(iname3)); 241 Assert.That(i3.Name, Is.EqualTo(iname3), "Assert.That(i3.Name, Is.EqualTo(iname3))");
242 Assert.That(i1.Owner, Is.EqualTo(owner1)); 242 Assert.That(i1.Owner, Is.EqualTo(owner1), "Assert.That(i1.Owner, Is.EqualTo(owner1))");
243 Assert.That(i2.Owner, Is.EqualTo(owner1)); 243 Assert.That(i2.Owner, Is.EqualTo(owner1), "Assert.That(i2.Owner, Is.EqualTo(owner1))");
244 Assert.That(i3.Owner, Is.EqualTo(owner1)); 244 Assert.That(i3.Owner, Is.EqualTo(owner1), "Assert.That(i3.Owner, Is.EqualTo(owner1))");
245 Assert.That(i1.AssetID, Is.EqualTo(asset1)); 245 Assert.That(i1.AssetID, Is.EqualTo(asset1), "Assert.That(i1.AssetID, Is.EqualTo(asset1))");
246 Assert.That(i2.AssetID, Is.EqualTo(asset2)); 246 Assert.That(i2.AssetID, Is.EqualTo(asset2), "Assert.That(i2.AssetID, Is.EqualTo(asset2))");
247 Assert.That(i3.AssetID, Is.EqualTo(asset3)); 247 Assert.That(i3.AssetID, Is.EqualTo(asset3), "Assert.That(i3.AssetID, Is.EqualTo(asset3))");
248 } 248 }
249 249
250 [Test] 250 [Test]
@@ -260,9 +260,9 @@ namespace OpenSim.Data.Tests
260 db.updateInventoryItem(i1); 260 db.updateInventoryItem(i1);
261 261
262 i1 = db.getInventoryItem(item1); 262 i1 = db.getInventoryItem(item1);
263 Assert.That(i1.Name, Is.EqualTo(niname1)); 263 Assert.That(i1.Name, Is.EqualTo(niname1), "Assert.That(i1.Name, Is.EqualTo(niname1))");
264 Assert.That(i1.Description, Is.EqualTo(niname1)); 264 Assert.That(i1.Description, Is.EqualTo(niname1), "Assert.That(i1.Description, Is.EqualTo(niname1))");
265 Assert.That(i1.Owner, Is.EqualTo(owner2)); 265 Assert.That(i1.Owner, Is.EqualTo(owner2), "Assert.That(i1.Owner, Is.EqualTo(owner2))");
266 } 266 }
267 267
268 private InventoryItemBase NewItem(UUID id, UUID parent, UUID owner, string name, UUID asset) 268 private InventoryItemBase NewItem(UUID id, UUID parent, UUID owner, string name, UUID asset)
diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs
index 0e87c8c..36ab42b 100644
--- a/OpenSim/Data/Tests/BasicRegionTest.cs
+++ b/OpenSim/Data/Tests/BasicRegionTest.cs
@@ -120,9 +120,9 @@ namespace OpenSim.Data.Tests
120 List<SceneObjectGroup> objs3 = db.LoadObjects(region3); 120 List<SceneObjectGroup> objs3 = db.LoadObjects(region3);
121 List<LandData> land = db.LoadLandObjects(region1); 121 List<LandData> land = db.LoadLandObjects(region1);
122 122
123 Assert.That(objs.Count, Is.EqualTo(0)); 123 Assert.That(objs.Count, Is.EqualTo(0), "Assert.That(objs.Count, Is.EqualTo(0))");
124 Assert.That(objs3.Count, Is.EqualTo(0)); 124 Assert.That(objs3.Count, Is.EqualTo(0), "Assert.That(objs3.Count, Is.EqualTo(0))");
125 Assert.That(land.Count, Is.EqualTo(0)); 125 Assert.That(land.Count, Is.EqualTo(0), "Assert.That(land.Count, Is.EqualTo(0))");
126 } 126 }
127 127
128 // SOG round trips 128 // SOG round trips
@@ -159,7 +159,7 @@ namespace OpenSim.Data.Tests
159 // This tests the ADO.NET driver 159 // This tests the ADO.NET driver
160 List<SceneObjectGroup> objs = db.LoadObjects(region1); 160 List<SceneObjectGroup> objs = db.LoadObjects(region1);
161 161
162 Assert.That(objs.Count, Is.EqualTo(2)); 162 Assert.That(objs.Count, Is.EqualTo(2), "Assert.That(objs.Count, Is.EqualTo(2))");
163 } 163 }
164 164
165 [Test] 165 [Test]
@@ -169,8 +169,8 @@ namespace OpenSim.Data.Tests
169 foreach (SceneObjectGroup sog in objs) 169 foreach (SceneObjectGroup sog in objs)
170 { 170 {
171 SceneObjectPart p = sog.RootPart; 171 SceneObjectPart p = sog.RootPart;
172 Assert.That("", Is.Not.EqualTo(p.Name)); 172 Assert.That("", Is.Not.EqualTo(p.Name), "Assert.That(\"\", Is.Not.EqualTo(p.Name))");
173 Assert.That(p.Name, Is.EqualTo(p.Description)); 173 Assert.That(p.Name, Is.EqualTo(p.Description), "Assert.That(p.Name, Is.EqualTo(p.Description))");
174 } 174 }
175 } 175 }
176 176
@@ -191,20 +191,20 @@ namespace OpenSim.Data.Tests
191 sog.AddPart(p3); 191 sog.AddPart(p3);
192 192
193 SceneObjectPart[] parts = sog.GetParts(); 193 SceneObjectPart[] parts = sog.GetParts();
194 Assert.That(parts.Length,Is.EqualTo(4)); 194 Assert.That(parts.Length,Is.EqualTo(4), "Assert.That(parts.Length,Is.EqualTo(4))");
195 195
196 db.StoreObject(sog, newregion); 196 db.StoreObject(sog, newregion);
197 List<SceneObjectGroup> sogs = db.LoadObjects(newregion); 197 List<SceneObjectGroup> sogs = db.LoadObjects(newregion);
198 Assert.That(sogs.Count,Is.EqualTo(1)); 198 Assert.That(sogs.Count,Is.EqualTo(1), "Assert.That(sogs.Count,Is.EqualTo(1))");
199 SceneObjectGroup newsog = sogs[0]; 199 SceneObjectGroup newsog = sogs[0];
200 200
201 SceneObjectPart[] newparts = newsog.GetParts(); 201 SceneObjectPart[] newparts = newsog.GetParts();
202 Assert.That(newparts.Length,Is.EqualTo(4)); 202 Assert.That(newparts.Length,Is.EqualTo(4), "Assert.That(newparts.Length,Is.EqualTo(4))");
203 203
204 Assert.That(newsog.HasChildPrim(tmp0)); 204 Assert.That(newsog.HasChildPrim(tmp0), "Assert.That(newsog.HasChildPrim(tmp0))");
205 Assert.That(newsog.HasChildPrim(tmp1)); 205 Assert.That(newsog.HasChildPrim(tmp1), "Assert.That(newsog.HasChildPrim(tmp1))");
206 Assert.That(newsog.HasChildPrim(tmp2)); 206 Assert.That(newsog.HasChildPrim(tmp2), "Assert.That(newsog.HasChildPrim(tmp2))");
207 Assert.That(newsog.HasChildPrim(tmp3)); 207 Assert.That(newsog.HasChildPrim(tmp3), "Assert.That(newsog.HasChildPrim(tmp3))");
208 } 208 }
209 209
210 [Test] 210 [Test]
@@ -294,37 +294,37 @@ namespace OpenSim.Data.Tests
294 sop.UpdateFlag = updatef; 294 sop.UpdateFlag = updatef;
295 295
296 //Tests if local part accepted the parameters: 296 //Tests if local part accepted the parameters:
297 Assert.That(regionh,Is.EqualTo(sop.RegionHandle)); 297 Assert.That(regionh,Is.EqualTo(sop.RegionHandle), "Assert.That(regionh,Is.EqualTo(sop.RegionHandle))");
298 Assert.That(localid,Is.EqualTo(sop.LocalId)); 298 Assert.That(localid,Is.EqualTo(sop.LocalId), "Assert.That(localid,Is.EqualTo(sop.LocalId))");
299 Assert.That(groupos,Is.EqualTo(sop.GroupPosition)); 299 Assert.That(groupos,Is.EqualTo(sop.GroupPosition), "Assert.That(groupos,Is.EqualTo(sop.GroupPosition))");
300 Assert.That(name,Is.EqualTo(sop.Name)); 300 Assert.That(name,Is.EqualTo(sop.Name), "Assert.That(name,Is.EqualTo(sop.Name))");
301 Assert.That(rotoff,Is.EqualTo(sop.RotationOffset)); 301 Assert.That(rotoff,Is.EqualTo(sop.RotationOffset), "Assert.That(rotoff,Is.EqualTo(sop.RotationOffset))");
302 Assert.That(uuid,Is.EqualTo(sop.UUID)); 302 Assert.That(uuid,Is.EqualTo(sop.UUID), "Assert.That(uuid,Is.EqualTo(sop.UUID))");
303 Assert.That(creator,Is.EqualTo(sop.CreatorID)); 303 Assert.That(creator,Is.EqualTo(sop.CreatorID), "Assert.That(creator,Is.EqualTo(sop.CreatorID))");
304 // Modified in-class 304 // Modified in-class
305 // Assert.That(iserial,Is.EqualTo(sop.InventorySerial)); 305 // Assert.That(iserial,Is.EqualTo(sop.InventorySerial), "Assert.That(iserial,Is.EqualTo(sop.InventorySerial))");
306 Assert.That(dic,Is.EqualTo(sop.TaskInventory)); 306 Assert.That(dic,Is.EqualTo(sop.TaskInventory), "Assert.That(dic,Is.EqualTo(sop.TaskInventory))");
307 Assert.That(objf,Is.EqualTo(sop.ObjectFlags)); 307 Assert.That(objf,Is.EqualTo(sop.ObjectFlags), "Assert.That(objf,Is.EqualTo(sop.ObjectFlags))");
308 Assert.That(name,Is.EqualTo(sop.Name)); 308 Assert.That(name,Is.EqualTo(sop.Name), "Assert.That(name,Is.EqualTo(sop.Name))");
309 Assert.That(material,Is.EqualTo(sop.Material)); 309 Assert.That(material,Is.EqualTo(sop.Material), "Assert.That(material,Is.EqualTo(sop.Material))");
310 Assert.That(pin,Is.EqualTo(sop.ScriptAccessPin)); 310 Assert.That(pin,Is.EqualTo(sop.ScriptAccessPin), "Assert.That(pin,Is.EqualTo(sop.ScriptAccessPin))");
311 Assert.That(textani,Is.EqualTo(sop.TextureAnimation)); 311 Assert.That(textani,Is.EqualTo(sop.TextureAnimation), "Assert.That(textani,Is.EqualTo(sop.TextureAnimation))");
312 Assert.That(partsys,Is.EqualTo(sop.ParticleSystem)); 312 Assert.That(partsys,Is.EqualTo(sop.ParticleSystem), "Assert.That(partsys,Is.EqualTo(sop.ParticleSystem))");
313 Assert.That(expires,Is.EqualTo(sop.Expires)); 313 Assert.That(expires,Is.EqualTo(sop.Expires), "Assert.That(expires,Is.EqualTo(sop.Expires))");
314 Assert.That(rezzed,Is.EqualTo(sop.Rezzed)); 314 Assert.That(rezzed,Is.EqualTo(sop.Rezzed), "Assert.That(rezzed,Is.EqualTo(sop.Rezzed))");
315 Assert.That(offset,Is.EqualTo(sop.OffsetPosition)); 315 Assert.That(offset,Is.EqualTo(sop.OffsetPosition), "Assert.That(offset,Is.EqualTo(sop.OffsetPosition))");
316 Assert.That(velocity,Is.EqualTo(sop.Velocity)); 316 Assert.That(velocity,Is.EqualTo(sop.Velocity), "Assert.That(velocity,Is.EqualTo(sop.Velocity))");
317 Assert.That(angvelo,Is.EqualTo(sop.AngularVelocity)); 317 Assert.That(angvelo,Is.EqualTo(sop.AngularVelocity), "Assert.That(angvelo,Is.EqualTo(sop.AngularVelocity))");
318 Assert.That(accel,Is.EqualTo(sop.Acceleration)); 318 Assert.That(accel,Is.EqualTo(sop.Acceleration), "Assert.That(accel,Is.EqualTo(sop.Acceleration))");
319 Assert.That(description,Is.EqualTo(sop.Description)); 319 Assert.That(description,Is.EqualTo(sop.Description), "Assert.That(description,Is.EqualTo(sop.Description))");
320 Assert.That(color,Is.EqualTo(sop.Color)); 320 Assert.That(color,Is.EqualTo(sop.Color), "Assert.That(color,Is.EqualTo(sop.Color))");
321 Assert.That(text,Is.EqualTo(sop.Text)); 321 Assert.That(text,Is.EqualTo(sop.Text), "Assert.That(text,Is.EqualTo(sop.Text))");
322 Assert.That(sitname,Is.EqualTo(sop.SitName)); 322 Assert.That(sitname,Is.EqualTo(sop.SitName), "Assert.That(sitname,Is.EqualTo(sop.SitName))");
323 Assert.That(touchname,Is.EqualTo(sop.TouchName)); 323 Assert.That(touchname,Is.EqualTo(sop.TouchName), "Assert.That(touchname,Is.EqualTo(sop.TouchName))");
324 Assert.That(linknum,Is.EqualTo(sop.LinkNum)); 324 Assert.That(linknum,Is.EqualTo(sop.LinkNum), "Assert.That(linknum,Is.EqualTo(sop.LinkNum))");
325 Assert.That(clickaction,Is.EqualTo(sop.ClickAction)); 325 Assert.That(clickaction,Is.EqualTo(sop.ClickAction), "Assert.That(clickaction,Is.EqualTo(sop.ClickAction))");
326 Assert.That(scale,Is.EqualTo(sop.Scale)); 326 Assert.That(scale,Is.EqualTo(sop.Scale), "Assert.That(scale,Is.EqualTo(sop.Scale))");
327 Assert.That(updatef,Is.EqualTo(sop.UpdateFlag)); 327 Assert.That(updatef,Is.EqualTo(sop.UpdateFlag), "Assert.That(updatef,Is.EqualTo(sop.UpdateFlag))");
328 328
329 // This is necessary or object will not be inserted in DB 329 // This is necessary or object will not be inserted in DB
330 sop.ObjectFlags = 0; 330 sop.ObjectFlags = 0;
@@ -336,52 +336,52 @@ namespace OpenSim.Data.Tests
336 // Inserts group in DB 336 // Inserts group in DB
337 db.StoreObject(sog,region3); 337 db.StoreObject(sog,region3);
338 List<SceneObjectGroup> sogs = db.LoadObjects(region3); 338 List<SceneObjectGroup> sogs = db.LoadObjects(region3);
339 Assert.That(sogs.Count, Is.EqualTo(1)); 339 Assert.That(sogs.Count, Is.EqualTo(1), "Assert.That(sogs.Count, Is.EqualTo(1))");
340 // Makes sure there are no double insertions: 340 // Makes sure there are no double insertions:
341 db.StoreObject(sog,region3); 341 db.StoreObject(sog,region3);
342 sogs = db.LoadObjects(region3); 342 sogs = db.LoadObjects(region3);
343 Assert.That(sogs.Count, Is.EqualTo(1)); 343 Assert.That(sogs.Count, Is.EqualTo(1), "Assert.That(sogs.Count, Is.EqualTo(1))");
344 344
345 345
346 // Tests if the parameters were inserted correctly 346 // Tests if the parameters were inserted correctly
347 SceneObjectPart p = sogs[0].RootPart; 347 SceneObjectPart p = sogs[0].RootPart;
348 Assert.That(regionh,Is.EqualTo(p.RegionHandle)); 348 Assert.That(regionh,Is.EqualTo(p.RegionHandle), "Assert.That(regionh,Is.EqualTo(p.RegionHandle))");
349 //Assert.That(localid,Is.EqualTo(p.LocalId)); 349 //Assert.That(localid,Is.EqualTo(p.LocalId), "Assert.That(localid,Is.EqualTo(p.LocalId))");
350 Assert.That(groupos,Is.EqualTo(p.GroupPosition)); 350 Assert.That(groupos,Is.EqualTo(p.GroupPosition), "Assert.That(groupos,Is.EqualTo(p.GroupPosition))");
351 Assert.That(name,Is.EqualTo(p.Name)); 351 Assert.That(name,Is.EqualTo(p.Name), "Assert.That(name,Is.EqualTo(p.Name))");
352 Assert.That(rotoff,Is.EqualTo(p.RotationOffset)); 352 Assert.That(rotoff,Is.EqualTo(p.RotationOffset), "Assert.That(rotoff,Is.EqualTo(p.RotationOffset))");
353 Assert.That(uuid,Is.EqualTo(p.UUID)); 353 Assert.That(uuid,Is.EqualTo(p.UUID), "Assert.That(uuid,Is.EqualTo(p.UUID))");
354 Assert.That(creator,Is.EqualTo(p.CreatorID)); 354 Assert.That(creator,Is.EqualTo(p.CreatorID), "Assert.That(creator,Is.EqualTo(p.CreatorID))");
355 //Assert.That(iserial,Is.EqualTo(p.InventorySerial)); 355 //Assert.That(iserial,Is.EqualTo(p.InventorySerial), "Assert.That(iserial,Is.EqualTo(p.InventorySerial))");
356 Assert.That(dic,Is.EqualTo(p.TaskInventory)); 356 Assert.That(dic,Is.EqualTo(p.TaskInventory), "Assert.That(dic,Is.EqualTo(p.TaskInventory))");
357 //Assert.That(objf,Is.EqualTo(p.ObjectFlags)); 357 //Assert.That(objf,Is.EqualTo(p.ObjectFlags), "Assert.That(objf,Is.EqualTo(p.ObjectFlags))");
358 Assert.That(name,Is.EqualTo(p.Name)); 358 Assert.That(name,Is.EqualTo(p.Name), "Assert.That(name,Is.EqualTo(p.Name))");
359 Assert.That(material,Is.EqualTo(p.Material)); 359 Assert.That(material,Is.EqualTo(p.Material), "Assert.That(material,Is.EqualTo(p.Material))");
360 Assert.That(pin,Is.EqualTo(p.ScriptAccessPin)); 360 Assert.That(pin,Is.EqualTo(p.ScriptAccessPin), "Assert.That(pin,Is.EqualTo(p.ScriptAccessPin))");
361 Assert.That(textani,Is.EqualTo(p.TextureAnimation)); 361 Assert.That(textani,Is.EqualTo(p.TextureAnimation), "Assert.That(textani,Is.EqualTo(p.TextureAnimation))");
362 Assert.That(partsys,Is.EqualTo(p.ParticleSystem)); 362 Assert.That(partsys,Is.EqualTo(p.ParticleSystem), "Assert.That(partsys,Is.EqualTo(p.ParticleSystem))");
363 //Assert.That(expires,Is.EqualTo(p.Expires)); 363 //Assert.That(expires,Is.EqualTo(p.Expires), "Assert.That(expires,Is.EqualTo(p.Expires))");
364 //Assert.That(rezzed,Is.EqualTo(p.Rezzed)); 364 //Assert.That(rezzed,Is.EqualTo(p.Rezzed), "Assert.That(rezzed,Is.EqualTo(p.Rezzed))");
365 Assert.That(offset,Is.EqualTo(p.OffsetPosition)); 365 Assert.That(offset,Is.EqualTo(p.OffsetPosition), "Assert.That(offset,Is.EqualTo(p.OffsetPosition))");
366 Assert.That(velocity,Is.EqualTo(p.Velocity)); 366 Assert.That(velocity,Is.EqualTo(p.Velocity), "Assert.That(velocity,Is.EqualTo(p.Velocity))");
367 Assert.That(angvelo,Is.EqualTo(p.AngularVelocity)); 367 Assert.That(angvelo,Is.EqualTo(p.AngularVelocity), "Assert.That(angvelo,Is.EqualTo(p.AngularVelocity))");
368 Assert.That(accel,Is.EqualTo(p.Acceleration)); 368 Assert.That(accel,Is.EqualTo(p.Acceleration), "Assert.That(accel,Is.EqualTo(p.Acceleration))");
369 Assert.That(description,Is.EqualTo(p.Description)); 369 Assert.That(description,Is.EqualTo(p.Description), "Assert.That(description,Is.EqualTo(p.Description))");
370 Assert.That(color,Is.EqualTo(p.Color)); 370 Assert.That(color,Is.EqualTo(p.Color), "Assert.That(color,Is.EqualTo(p.Color))");
371 Assert.That(text,Is.EqualTo(p.Text)); 371 Assert.That(text,Is.EqualTo(p.Text), "Assert.That(text,Is.EqualTo(p.Text))");
372 Assert.That(sitname,Is.EqualTo(p.SitName)); 372 Assert.That(sitname,Is.EqualTo(p.SitName), "Assert.That(sitname,Is.EqualTo(p.SitName))");
373 Assert.That(touchname,Is.EqualTo(p.TouchName)); 373 Assert.That(touchname,Is.EqualTo(p.TouchName), "Assert.That(touchname,Is.EqualTo(p.TouchName))");
374 //Assert.That(linknum,Is.EqualTo(p.LinkNum)); 374 //Assert.That(linknum,Is.EqualTo(p.LinkNum), "Assert.That(linknum,Is.EqualTo(p.LinkNum))");
375 Assert.That(clickaction,Is.EqualTo(p.ClickAction)); 375 Assert.That(clickaction,Is.EqualTo(p.ClickAction), "Assert.That(clickaction,Is.EqualTo(p.ClickAction))");
376 Assert.That(scale,Is.EqualTo(p.Scale)); 376 Assert.That(scale,Is.EqualTo(p.Scale), "Assert.That(scale,Is.EqualTo(p.Scale))");
377 377
378 //Assert.That(updatef,Is.EqualTo(p.UpdateFlag)); 378 //Assert.That(updatef,Is.EqualTo(p.UpdateFlag), "Assert.That(updatef,Is.EqualTo(p.UpdateFlag))");
379 379
380 Assert.That(pbshap.PathBegin, Is.EqualTo(p.Shape.PathBegin)); 380 Assert.That(pbshap.PathBegin, Is.EqualTo(p.Shape.PathBegin), "Assert.That(pbshap.PathBegin, Is.EqualTo(p.Shape.PathBegin))");
381 Assert.That(pbshap.PathEnd, Is.EqualTo(p.Shape.PathEnd)); 381 Assert.That(pbshap.PathEnd, Is.EqualTo(p.Shape.PathEnd), "Assert.That(pbshap.PathEnd, Is.EqualTo(p.Shape.PathEnd))");
382 Assert.That(pbshap.ProfileBegin, Is.EqualTo(p.Shape.ProfileBegin)); 382 Assert.That(pbshap.ProfileBegin, Is.EqualTo(p.Shape.ProfileBegin), "Assert.That(pbshap.ProfileBegin, Is.EqualTo(p.Shape.ProfileBegin))");
383 Assert.That(pbshap.ProfileEnd, Is.EqualTo(p.Shape.ProfileEnd)); 383 Assert.That(pbshap.ProfileEnd, Is.EqualTo(p.Shape.ProfileEnd), "Assert.That(pbshap.ProfileEnd, Is.EqualTo(p.Shape.ProfileEnd))");
384 Assert.That(pbshap.ProfileHollow, Is.EqualTo(p.Shape.ProfileHollow)); 384 Assert.That(pbshap.ProfileHollow, Is.EqualTo(p.Shape.ProfileHollow), "Assert.That(pbshap.ProfileHollow, Is.EqualTo(p.Shape.ProfileHollow))");
385 } 385 }
386 386
387 [Test] 387 [Test]
@@ -393,7 +393,7 @@ namespace OpenSim.Data.Tests
393 db.StoreObject(sog, region1); 393 db.StoreObject(sog, region1);
394 394
395 sog = FindSOG("object1", region1); 395 sog = FindSOG("object1", region1);
396 Assert.That(text1, Is.EqualTo(sog.RootPart.Text)); 396 Assert.That(text1, Is.EqualTo(sog.RootPart.Text), "Assert.That(text1, Is.EqualTo(sog.RootPart.Text))");
397 397
398 // Creates random values 398 // Creates random values
399 UUID creator = new UUID(); 399 UUID creator = new UUID();
@@ -460,33 +460,33 @@ namespace OpenSim.Data.Tests
460 460
461 db.StoreObject(sog2, region3); 461 db.StoreObject(sog2, region3);
462 List<SceneObjectGroup> sogs = db.LoadObjects(region3); 462 List<SceneObjectGroup> sogs = db.LoadObjects(region3);
463 Assert.That(sogs.Count, Is.EqualTo(1)); 463 Assert.That(sogs.Count, Is.EqualTo(1), "Assert.That(sogs.Count, Is.EqualTo(1))");
464 464
465 SceneObjectGroup retsog = FindSOG("West Adam", region3); 465 SceneObjectGroup retsog = FindSOG("West Adam", region3);
466 Assert.That(retsog,Is.Not.Null); 466 Assert.That(retsog,Is.Not.Null);
467 SceneObjectPart p = retsog.RootPart; 467 SceneObjectPart p = retsog.RootPart;
468 Assert.That(regionh,Is.EqualTo(p.RegionHandle)); 468 Assert.That(regionh,Is.EqualTo(p.RegionHandle), "Assert.That(regionh,Is.EqualTo(p.RegionHandle))");
469 Assert.That(groupos,Is.EqualTo(p.GroupPosition)); 469 Assert.That(groupos,Is.EqualTo(p.GroupPosition), "Assert.That(groupos,Is.EqualTo(p.GroupPosition))");
470 Assert.That(name,Is.EqualTo(p.Name)); 470 Assert.That(name,Is.EqualTo(p.Name), "Assert.That(name,Is.EqualTo(p.Name))");
471 Assert.That(rotoff,Is.EqualTo(p.RotationOffset)); 471 Assert.That(rotoff,Is.EqualTo(p.RotationOffset), "Assert.That(rotoff,Is.EqualTo(p.RotationOffset))");
472 Assert.That(creator,Is.EqualTo(p.CreatorID)); 472 Assert.That(creator,Is.EqualTo(p.CreatorID), "Assert.That(creator,Is.EqualTo(p.CreatorID))");
473 Assert.That(dic,Is.EqualTo(p.TaskInventory)); 473 Assert.That(dic,Is.EqualTo(p.TaskInventory), "Assert.That(dic,Is.EqualTo(p.TaskInventory))");
474 Assert.That(name,Is.EqualTo(p.Name)); 474 Assert.That(name,Is.EqualTo(p.Name), "Assert.That(name,Is.EqualTo(p.Name))");
475 Assert.That(material,Is.EqualTo(p.Material)); 475 Assert.That(material,Is.EqualTo(p.Material), "Assert.That(material,Is.EqualTo(p.Material))");
476 Assert.That(pin,Is.EqualTo(p.ScriptAccessPin)); 476 Assert.That(pin,Is.EqualTo(p.ScriptAccessPin), "Assert.That(pin,Is.EqualTo(p.ScriptAccessPin))");
477 Assert.That(textani,Is.EqualTo(p.TextureAnimation)); 477 Assert.That(textani,Is.EqualTo(p.TextureAnimation), "Assert.That(textani,Is.EqualTo(p.TextureAnimation))");
478 Assert.That(partsys,Is.EqualTo(p.ParticleSystem)); 478 Assert.That(partsys,Is.EqualTo(p.ParticleSystem), "Assert.That(partsys,Is.EqualTo(p.ParticleSystem))");
479 Assert.That(offset,Is.EqualTo(p.OffsetPosition)); 479 Assert.That(offset,Is.EqualTo(p.OffsetPosition), "Assert.That(offset,Is.EqualTo(p.OffsetPosition))");
480 Assert.That(velocity,Is.EqualTo(p.Velocity)); 480 Assert.That(velocity,Is.EqualTo(p.Velocity), "Assert.That(velocity,Is.EqualTo(p.Velocity))");
481 Assert.That(angvelo,Is.EqualTo(p.AngularVelocity)); 481 Assert.That(angvelo,Is.EqualTo(p.AngularVelocity), "Assert.That(angvelo,Is.EqualTo(p.AngularVelocity))");
482 Assert.That(accel,Is.EqualTo(p.Acceleration)); 482 Assert.That(accel,Is.EqualTo(p.Acceleration), "Assert.That(accel,Is.EqualTo(p.Acceleration))");
483 Assert.That(description,Is.EqualTo(p.Description)); 483 Assert.That(description,Is.EqualTo(p.Description), "Assert.That(description,Is.EqualTo(p.Description))");
484 Assert.That(color,Is.EqualTo(p.Color)); 484 Assert.That(color,Is.EqualTo(p.Color), "Assert.That(color,Is.EqualTo(p.Color))");
485 Assert.That(text,Is.EqualTo(p.Text)); 485 Assert.That(text,Is.EqualTo(p.Text), "Assert.That(text,Is.EqualTo(p.Text))");
486 Assert.That(sitname,Is.EqualTo(p.SitName)); 486 Assert.That(sitname,Is.EqualTo(p.SitName), "Assert.That(sitname,Is.EqualTo(p.SitName))");
487 Assert.That(touchname,Is.EqualTo(p.TouchName)); 487 Assert.That(touchname,Is.EqualTo(p.TouchName), "Assert.That(touchname,Is.EqualTo(p.TouchName))");
488 Assert.That(clickaction,Is.EqualTo(p.ClickAction)); 488 Assert.That(clickaction,Is.EqualTo(p.ClickAction), "Assert.That(clickaction,Is.EqualTo(p.ClickAction))");
489 Assert.That(scale,Is.EqualTo(p.Scale)); 489 Assert.That(scale,Is.EqualTo(p.Scale), "Assert.That(scale,Is.EqualTo(p.Scale))");
490 } 490 }
491 491
492 [Test] 492 [Test]
@@ -524,12 +524,12 @@ namespace OpenSim.Data.Tests
524 for (int i=0;i<30;i++) 524 for (int i=0;i<30;i++)
525 { 525 {
526 SceneObjectPart cursop = mydic[parts[i].UUID]; 526 SceneObjectPart cursop = mydic[parts[i].UUID];
527 Assert.That(cursop.GroupPosition,Is.EqualTo(parts[i].GroupPosition)); 527 Assert.That(cursop.GroupPosition,Is.EqualTo(parts[i].GroupPosition), "Assert.That(cursop.GroupPosition,Is.EqualTo(parts[i].GroupPosition))");
528 Assert.That(cursop.RotationOffset,Is.EqualTo(parts[i].RotationOffset)); 528 Assert.That(cursop.RotationOffset,Is.EqualTo(parts[i].RotationOffset), "Assert.That(cursop.RotationOffset,Is.EqualTo(parts[i].RotationOffset))");
529 Assert.That(cursop.OffsetPosition,Is.EqualTo(parts[i].OffsetPosition)); 529 Assert.That(cursop.OffsetPosition,Is.EqualTo(parts[i].OffsetPosition), "Assert.That(cursop.OffsetPosition,Is.EqualTo(parts[i].OffsetPosition))");
530 Assert.That(cursop.Velocity,Is.EqualTo(parts[i].Velocity)); 530 Assert.That(cursop.Velocity,Is.EqualTo(parts[i].Velocity), "Assert.That(cursop.Velocity,Is.EqualTo(parts[i].Velocity))");
531 Assert.That(cursop.AngularVelocity,Is.EqualTo(parts[i].AngularVelocity)); 531 Assert.That(cursop.AngularVelocity,Is.EqualTo(parts[i].AngularVelocity), "Assert.That(cursop.AngularVelocity,Is.EqualTo(parts[i].AngularVelocity))");
532 Assert.That(cursop.Acceleration,Is.EqualTo(parts[i].Acceleration)); 532 Assert.That(cursop.Acceleration,Is.EqualTo(parts[i].Acceleration), "Assert.That(cursop.Acceleration,Is.EqualTo(parts[i].Acceleration))");
533 } 533 }
534 } 534 }
535 535
@@ -549,7 +549,7 @@ namespace OpenSim.Data.Tests
549 549
550 Assert.That(sog.AddInventoryItem(null, sog.RootPart.LocalId, i, zero), Is.True); 550 Assert.That(sog.AddInventoryItem(null, sog.RootPart.LocalId, i, zero), Is.True);
551 TaskInventoryItem t = sog.GetInventoryItem(sog.RootPart.LocalId, item1); 551 TaskInventoryItem t = sog.GetInventoryItem(sog.RootPart.LocalId, item1);
552 Assert.That(t.Name, Is.EqualTo(itemname1)); 552 Assert.That(t.Name, Is.EqualTo(itemname1), "Assert.That(t.Name, Is.EqualTo(itemname1))");
553 553
554 // TODO: seriously??? this is the way we need to loop to get this? 554 // TODO: seriously??? this is the way we need to loop to get this?
555 555
@@ -568,7 +568,7 @@ namespace OpenSim.Data.Tests
568 SceneObjectGroup sog = FindSOG("object1", region1); 568 SceneObjectGroup sog = FindSOG("object1", region1);
569 TaskInventoryItem t = sog.GetInventoryItem(sog.RootPart.LocalId, item1); 569 TaskInventoryItem t = sog.GetInventoryItem(sog.RootPart.LocalId, item1);
570 570
571 Assert.That(t.Name, Is.EqualTo(itemname1)); 571 Assert.That(t.Name, Is.EqualTo(itemname1), "Assert.That(t.Name, Is.EqualTo(itemname1))");
572 } 572 }
573 573
574 [Test] 574 [Test]
@@ -580,7 +580,7 @@ namespace OpenSim.Data.Tests
580 t.Name = "My New Name"; 580 t.Name = "My New Name";
581 sog.UpdateInventoryItem(t); 581 sog.UpdateInventoryItem(t);
582 582
583 Assert.That(t.Name, Is.EqualTo("My New Name")); 583 Assert.That(t.Name, Is.EqualTo("My New Name"), "Assert.That(t.Name, Is.EqualTo(\"My New Name\"))");
584 584
585 } 585 }
586 586
@@ -641,28 +641,28 @@ namespace OpenSim.Data.Tests
641 Assert.That(sog.AddInventoryItem(null, sog.RootPart.LocalId, i, zero), Is.True); 641 Assert.That(sog.AddInventoryItem(null, sog.RootPart.LocalId, i, zero), Is.True);
642 TaskInventoryItem t = sog.GetInventoryItem(sog.RootPart.LocalId, id); 642 TaskInventoryItem t = sog.GetInventoryItem(sog.RootPart.LocalId, id);
643 643
644 Assert.That(t.Name, Is.EqualTo(name)); 644 Assert.That(t.Name, Is.EqualTo(name), "Assert.That(t.Name, Is.EqualTo(name))");
645 Assert.That(t.AssetID,Is.EqualTo(assetid)); 645 Assert.That(t.AssetID,Is.EqualTo(assetid), "Assert.That(t.AssetID,Is.EqualTo(assetid))");
646 Assert.That(t.BasePermissions,Is.EqualTo(baseperm)); 646 Assert.That(t.BasePermissions,Is.EqualTo(baseperm), "Assert.That(t.BasePermissions,Is.EqualTo(baseperm))");
647 Assert.That(t.CreationDate,Is.EqualTo(creationd)); 647 Assert.That(t.CreationDate,Is.EqualTo(creationd), "Assert.That(t.CreationDate,Is.EqualTo(creationd))");
648 Assert.That(t.CreatorID,Is.EqualTo(creator)); 648 Assert.That(t.CreatorID,Is.EqualTo(creator), "Assert.That(t.CreatorID,Is.EqualTo(creator))");
649 Assert.That(t.Description,Is.EqualTo(name)); 649 Assert.That(t.Description,Is.EqualTo(name), "Assert.That(t.Description,Is.EqualTo(name))");
650 Assert.That(t.EveryonePermissions,Is.EqualTo(eoperm)); 650 Assert.That(t.EveryonePermissions,Is.EqualTo(eoperm), "Assert.That(t.EveryonePermissions,Is.EqualTo(eoperm))");
651 Assert.That(t.Flags,Is.EqualTo(flags)); 651 Assert.That(t.Flags,Is.EqualTo(flags), "Assert.That(t.Flags,Is.EqualTo(flags))");
652 Assert.That(t.GroupID,Is.EqualTo(sog.RootPart.GroupID)); 652 Assert.That(t.GroupID,Is.EqualTo(sog.RootPart.GroupID), "Assert.That(t.GroupID,Is.EqualTo(sog.RootPart.GroupID))");
653 // Where is this group permissions?? 653 // Where is this group permissions??
654 // Assert.That(t.GroupPermissions,Is.EqualTo()); 654 // Assert.That(t.GroupPermissions,Is.EqualTo(), "Assert.That(t.GroupPermissions,Is.EqualTo())");
655 Assert.That(t.Type,Is.EqualTo(assettype)); 655 Assert.That(t.Type,Is.EqualTo(assettype), "Assert.That(t.Type,Is.EqualTo(assettype))");
656 Assert.That(t.InvType, Is.EqualTo(invtype)); 656 Assert.That(t.InvType, Is.EqualTo(invtype), "Assert.That(t.InvType, Is.EqualTo(invtype))");
657 Assert.That(t.ItemID, Is.EqualTo(id)); 657 Assert.That(t.ItemID, Is.EqualTo(id), "Assert.That(t.ItemID, Is.EqualTo(id))");
658 Assert.That(t.LastOwnerID, Is.EqualTo(sog.RootPart.LastOwnerID)); 658 Assert.That(t.LastOwnerID, Is.EqualTo(sog.RootPart.LastOwnerID), "Assert.That(t.LastOwnerID, Is.EqualTo(sog.RootPart.LastOwnerID))");
659 Assert.That(t.NextPermissions, Is.EqualTo(nextperm)); 659 Assert.That(t.NextPermissions, Is.EqualTo(nextperm), "Assert.That(t.NextPermissions, Is.EqualTo(nextperm))");
660 // Ownership changes when you drop an object into an object 660 // Ownership changes when you drop an object into an object
661 // owned by someone else 661 // owned by someone else
662 Assert.That(t.OwnerID,Is.EqualTo(sog.RootPart.OwnerID)); 662 Assert.That(t.OwnerID,Is.EqualTo(sog.RootPart.OwnerID), "Assert.That(t.OwnerID,Is.EqualTo(sog.RootPart.OwnerID))");
663 Assert.That(t.CurrentPermissions, Is.EqualTo(curperm | 8)); 663 Assert.That(t.CurrentPermissions, Is.EqualTo(curperm | 8), "Assert.That(t.CurrentPermissions, Is.EqualTo(curperm | 8))");
664 Assert.That(t.ParentID,Is.EqualTo(sog.RootPart.FolderID)); 664 Assert.That(t.ParentID,Is.EqualTo(sog.RootPart.FolderID), "Assert.That(t.ParentID,Is.EqualTo(sog.RootPart.FolderID))");
665 Assert.That(t.ParentPartID,Is.EqualTo(sog.RootPart.UUID)); 665 Assert.That(t.ParentPartID,Is.EqualTo(sog.RootPart.UUID), "Assert.That(t.ParentPartID,Is.EqualTo(sog.RootPart.UUID))");
666 } 666 }
667 667
668 [Test] 668 [Test]
@@ -687,11 +687,11 @@ namespace OpenSim.Data.Tests
687 Assert.That(sog.AddInventoryItem(null, sog.RootPart.LocalId, ib4, zero), Is.True); 687 Assert.That(sog.AddInventoryItem(null, sog.RootPart.LocalId, ib4, zero), Is.True);
688 688
689 TaskInventoryItem t1 = sog.GetInventoryItem(sog.RootPart.LocalId, i1); 689 TaskInventoryItem t1 = sog.GetInventoryItem(sog.RootPart.LocalId, i1);
690 Assert.That(t1.Name, Is.EqualTo(ib1.Name)); 690 Assert.That(t1.Name, Is.EqualTo(ib1.Name), "Assert.That(t1.Name, Is.EqualTo(ib1.Name))");
691 TaskInventoryItem t2 = sog.GetInventoryItem(sog.RootPart.LocalId, i2); 691 TaskInventoryItem t2 = sog.GetInventoryItem(sog.RootPart.LocalId, i2);
692 Assert.That(t2.Name, Is.EqualTo(ib2.Name)); 692 Assert.That(t2.Name, Is.EqualTo(ib2.Name), "Assert.That(t2.Name, Is.EqualTo(ib2.Name))");
693 TaskInventoryItem t3 = sog.GetInventoryItem(sog.RootPart.LocalId, i3); 693 TaskInventoryItem t3 = sog.GetInventoryItem(sog.RootPart.LocalId, i3);
694 Assert.That(t3.Name, Is.EqualTo(ib3.Name)); 694 Assert.That(t3.Name, Is.EqualTo(ib3.Name), "Assert.That(t3.Name, Is.EqualTo(ib3.Name))");
695 TaskInventoryItem t4 = sog.GetInventoryItem(sog.RootPart.LocalId, i4); 695 TaskInventoryItem t4 = sog.GetInventoryItem(sog.RootPart.LocalId, i4);
696 Assert.That(t4, Is.Null); 696 Assert.That(t4, Is.Null);
697 } 697 }
@@ -709,10 +709,10 @@ namespace OpenSim.Data.Tests
709 public void T100_DefaultRegionInfo() 709 public void T100_DefaultRegionInfo()
710 { 710 {
711 RegionSettings r1 = db.LoadRegionSettings(region1); 711 RegionSettings r1 = db.LoadRegionSettings(region1);
712 Assert.That(r1.RegionUUID, Is.EqualTo(region1)); 712 Assert.That(r1.RegionUUID, Is.EqualTo(region1), "Assert.That(r1.RegionUUID, Is.EqualTo(region1))");
713 713
714 RegionSettings r2 = db.LoadRegionSettings(region2); 714 RegionSettings r2 = db.LoadRegionSettings(region2);
715 Assert.That(r2.RegionUUID, Is.EqualTo(region2)); 715 Assert.That(r2.RegionUUID, Is.EqualTo(region2), "Assert.That(r2.RegionUUID, Is.EqualTo(region2))");
716 } 716 }
717 717
718 [Test] 718 [Test]
@@ -781,7 +781,7 @@ namespace OpenSim.Data.Tests
781 db.StoreRegionSettings(r1); 781 db.StoreRegionSettings(r1);
782 782
783 RegionSettings r1a = db.LoadRegionSettings(region1); 783 RegionSettings r1a = db.LoadRegionSettings(region1);
784 Assert.That(r1a.RegionUUID, Is.EqualTo(region1)); 784 Assert.That(r1a.RegionUUID, Is.EqualTo(region1), "Assert.That(r1a.RegionUUID, Is.EqualTo(region1))");
785 Assert.That(r1a.BlockTerraform,Is.True); 785 Assert.That(r1a.BlockTerraform,Is.True);
786 Assert.That(r1a.BlockFly,Is.True); 786 Assert.That(r1a.BlockFly,Is.True);
787 Assert.That(r1a.AllowDamage,Is.True); 787 Assert.That(r1a.AllowDamage,Is.True);
@@ -789,34 +789,34 @@ namespace OpenSim.Data.Tests
789 Assert.That(r1a.AllowLandResell,Is.False); 789 Assert.That(r1a.AllowLandResell,Is.False);
790 Assert.That(r1a.AllowLandJoinDivide,Is.False); 790 Assert.That(r1a.AllowLandJoinDivide,Is.False);
791 Assert.That(r1a.BlockShowInSearch,Is.True); 791 Assert.That(r1a.BlockShowInSearch,Is.True);
792 Assert.That(r1a.AgentLimit,Is.EqualTo(agentlimit)); 792 Assert.That(r1a.AgentLimit,Is.EqualTo(agentlimit), "Assert.That(r1a.AgentLimit,Is.EqualTo(agentlimit))");
793 Assert.That(r1a.ObjectBonus,Is.EqualTo(objectbonus)); 793 Assert.That(r1a.ObjectBonus,Is.EqualTo(objectbonus), "Assert.That(r1a.ObjectBonus,Is.EqualTo(objectbonus))");
794 Assert.That(r1a.Maturity,Is.EqualTo(maturity)); 794 Assert.That(r1a.Maturity,Is.EqualTo(maturity), "Assert.That(r1a.Maturity,Is.EqualTo(maturity))");
795 Assert.That(r1a.DisableScripts,Is.True); 795 Assert.That(r1a.DisableScripts,Is.True);
796 Assert.That(r1a.DisableCollisions,Is.True); 796 Assert.That(r1a.DisableCollisions,Is.True);
797 Assert.That(r1a.DisablePhysics,Is.True); 797 Assert.That(r1a.DisablePhysics,Is.True);
798 Assert.That(r1a.TerrainTexture1,Is.EqualTo(tertex1)); 798 Assert.That(r1a.TerrainTexture1,Is.EqualTo(tertex1), "Assert.That(r1a.TerrainTexture1,Is.EqualTo(tertex1))");
799 Assert.That(r1a.TerrainTexture2,Is.EqualTo(tertex2)); 799 Assert.That(r1a.TerrainTexture2,Is.EqualTo(tertex2), "Assert.That(r1a.TerrainTexture2,Is.EqualTo(tertex2))");
800 Assert.That(r1a.TerrainTexture3,Is.EqualTo(tertex3)); 800 Assert.That(r1a.TerrainTexture3,Is.EqualTo(tertex3), "Assert.That(r1a.TerrainTexture3,Is.EqualTo(tertex3))");
801 Assert.That(r1a.TerrainTexture4,Is.EqualTo(tertex4)); 801 Assert.That(r1a.TerrainTexture4,Is.EqualTo(tertex4), "Assert.That(r1a.TerrainTexture4,Is.EqualTo(tertex4))");
802 Assert.That(r1a.Elevation1NW,Is.EqualTo(elev1nw)); 802 Assert.That(r1a.Elevation1NW,Is.EqualTo(elev1nw), "Assert.That(r1a.Elevation1NW,Is.EqualTo(elev1nw))");
803 Assert.That(r1a.Elevation2NW,Is.EqualTo(elev2nw)); 803 Assert.That(r1a.Elevation2NW,Is.EqualTo(elev2nw), "Assert.That(r1a.Elevation2NW,Is.EqualTo(elev2nw))");
804 Assert.That(r1a.Elevation1NE,Is.EqualTo(elev1ne)); 804 Assert.That(r1a.Elevation1NE,Is.EqualTo(elev1ne), "Assert.That(r1a.Elevation1NE,Is.EqualTo(elev1ne))");
805 Assert.That(r1a.Elevation2NE,Is.EqualTo(elev2ne)); 805 Assert.That(r1a.Elevation2NE,Is.EqualTo(elev2ne), "Assert.That(r1a.Elevation2NE,Is.EqualTo(elev2ne))");
806 Assert.That(r1a.Elevation1SE,Is.EqualTo(elev1se)); 806 Assert.That(r1a.Elevation1SE,Is.EqualTo(elev1se), "Assert.That(r1a.Elevation1SE,Is.EqualTo(elev1se))");
807 Assert.That(r1a.Elevation2SE,Is.EqualTo(elev2se)); 807 Assert.That(r1a.Elevation2SE,Is.EqualTo(elev2se), "Assert.That(r1a.Elevation2SE,Is.EqualTo(elev2se))");
808 Assert.That(r1a.Elevation1SW,Is.EqualTo(elev1sw)); 808 Assert.That(r1a.Elevation1SW,Is.EqualTo(elev1sw), "Assert.That(r1a.Elevation1SW,Is.EqualTo(elev1sw))");
809 Assert.That(r1a.Elevation2SW,Is.EqualTo(elev2sw)); 809 Assert.That(r1a.Elevation2SW,Is.EqualTo(elev2sw), "Assert.That(r1a.Elevation2SW,Is.EqualTo(elev2sw))");
810 Assert.That(r1a.WaterHeight,Is.EqualTo(waterh)); 810 Assert.That(r1a.WaterHeight,Is.EqualTo(waterh), "Assert.That(r1a.WaterHeight,Is.EqualTo(waterh))");
811 Assert.That(r1a.TerrainRaiseLimit,Is.EqualTo(terrainraise)); 811 Assert.That(r1a.TerrainRaiseLimit,Is.EqualTo(terrainraise), "Assert.That(r1a.TerrainRaiseLimit,Is.EqualTo(terrainraise))");
812 Assert.That(r1a.TerrainLowerLimit,Is.EqualTo(terrainlower)); 812 Assert.That(r1a.TerrainLowerLimit,Is.EqualTo(terrainlower), "Assert.That(r1a.TerrainLowerLimit,Is.EqualTo(terrainlower))");
813 Assert.That(r1a.UseEstateSun,Is.False); 813 Assert.That(r1a.UseEstateSun,Is.False);
814 Assert.That(r1a.Sandbox,Is.True); 814 Assert.That(r1a.Sandbox,Is.True);
815 Assert.That(r1a.SunVector,Is.EqualTo(sunvector)); 815 Assert.That(r1a.SunVector,Is.EqualTo(sunvector), "Assert.That(r1a.SunVector,Is.EqualTo(sunvector))");
816 //Assert.That(r1a.TerrainImageID,Is.EqualTo(terimgid)); 816 //Assert.That(r1a.TerrainImageID,Is.EqualTo(terimgid), "Assert.That(r1a.TerrainImageID,Is.EqualTo(terimgid))");
817 Assert.That(r1a.FixedSun,Is.True); 817 Assert.That(r1a.FixedSun,Is.True);
818 Assert.That(r1a.SunPosition, Is.EqualTo(sunpos)); 818 Assert.That(r1a.SunPosition, Is.EqualTo(sunpos), "Assert.That(r1a.SunPosition, Is.EqualTo(sunpos))");
819 Assert.That(r1a.Covenant, Is.EqualTo(cov)); 819 Assert.That(r1a.Covenant, Is.EqualTo(cov), "Assert.That(r1a.Covenant, Is.EqualTo(cov))");
820 820
821 } 821 }
822 822
@@ -866,10 +866,10 @@ namespace OpenSim.Data.Tests
866 [Test] 866 [Test]
867 public void T400_EmptyLand() 867 public void T400_EmptyLand()
868 { 868 {
869 Assert.That(db.LoadLandObjects(zero).Count, Is.EqualTo(0)); 869 Assert.That(db.LoadLandObjects(zero).Count, Is.EqualTo(0), "Assert.That(db.LoadLandObjects(zero).Count, Is.EqualTo(0))");
870 Assert.That(db.LoadLandObjects(region1).Count, Is.EqualTo(0)); 870 Assert.That(db.LoadLandObjects(region1).Count, Is.EqualTo(0), "Assert.That(db.LoadLandObjects(region1).Count, Is.EqualTo(0))");
871 Assert.That(db.LoadLandObjects(region2).Count, Is.EqualTo(0)); 871 Assert.That(db.LoadLandObjects(region2).Count, Is.EqualTo(0), "Assert.That(db.LoadLandObjects(region2).Count, Is.EqualTo(0))");
872 Assert.That(db.LoadLandObjects(UUID.Random()).Count, Is.EqualTo(0)); 872 Assert.That(db.LoadLandObjects(UUID.Random()).Count, Is.EqualTo(0), "Assert.That(db.LoadLandObjects(UUID.Random()).Count, Is.EqualTo(0))");
873 } 873 }
874 874
875 // TODO: we should have real land tests, but Land is so 875 // TODO: we should have real land tests, but Land is so
diff --git a/OpenSim/Data/Tests/BasicUserTest.cs b/OpenSim/Data/Tests/BasicUserTest.cs
index 82ff08b..2a5e567 100644
--- a/OpenSim/Data/Tests/BasicUserTest.cs
+++ b/OpenSim/Data/Tests/BasicUserTest.cs
@@ -139,9 +139,9 @@ namespace OpenSim.Data.Tests
139 UserProfileData u1a = db.GetUserByUUID(user1); 139 UserProfileData u1a = db.GetUserByUUID(user1);
140 UserProfileData u2a = db.GetUserByUUID(user2); 140 UserProfileData u2a = db.GetUserByUUID(user2);
141 UserProfileData u3a = db.GetUserByUUID(user3); 141 UserProfileData u3a = db.GetUserByUUID(user3);
142 Assert.That(user1,Is.EqualTo(u1a.ID)); 142 Assert.That(user1,Is.EqualTo(u1a.ID), "Assert.That(user1,Is.EqualTo(u1a.ID))");
143 Assert.That(user2,Is.EqualTo(u2a.ID)); 143 Assert.That(user2,Is.EqualTo(u2a.ID), "Assert.That(user2,Is.EqualTo(u2a.ID))");
144 Assert.That(user3,Is.EqualTo(u3a.ID)); 144 Assert.That(user3,Is.EqualTo(u3a.ID), "Assert.That(user3,Is.EqualTo(u3a.ID))");
145 145
146 // and one email test 146 // and one email test
147 Assert.That(u3.Email, Is.Null); 147 Assert.That(u3.Email, Is.Null);
@@ -153,30 +153,30 @@ namespace OpenSim.Data.Tests
153 UserProfileData u1 = db.GetUserByName(fname1,lname1); 153 UserProfileData u1 = db.GetUserByName(fname1,lname1);
154 UserProfileData u2 = db.GetUserByName(fname2,lname2); 154 UserProfileData u2 = db.GetUserByName(fname2,lname2);
155 UserProfileData u3 = db.GetUserByName(fname3,lname3); 155 UserProfileData u3 = db.GetUserByName(fname3,lname3);
156 Assert.That(user1,Is.EqualTo(u1.ID)); 156 Assert.That(user1,Is.EqualTo(u1.ID), "Assert.That(user1,Is.EqualTo(u1.ID))");
157 Assert.That(user2,Is.EqualTo(u2.ID)); 157 Assert.That(user2,Is.EqualTo(u2.ID), "Assert.That(user2,Is.EqualTo(u2.ID))");
158 Assert.That(user3,Is.EqualTo(u3.ID)); 158 Assert.That(user3,Is.EqualTo(u3.ID), "Assert.That(user3,Is.EqualTo(u3.ID))");
159 } 159 }
160 160
161 [Test] 161 [Test]
162 public void T012_UpdateUserProfile() 162 public void T012_UpdateUserProfile()
163 { 163 {
164 UserProfileData u1 = db.GetUserByUUID(user1); 164 UserProfileData u1 = db.GetUserByUUID(user1);
165 Assert.That(fname1,Is.EqualTo(u1.FirstName)); 165 Assert.That(fname1,Is.EqualTo(u1.FirstName), "Assert.That(fname1,Is.EqualTo(u1.FirstName))");
166 u1.FirstName = "Ugly"; 166 u1.FirstName = "Ugly";
167 167
168 db.UpdateUserProfile(u1); 168 db.UpdateUserProfile(u1);
169 Assert.That("Ugly",Is.EqualTo(u1.FirstName)); 169 Assert.That("Ugly",Is.EqualTo(u1.FirstName), "Assert.That(\"Ugly\",Is.EqualTo(u1.FirstName))");
170 } 170 }
171 171
172 [Test] 172 [Test]
173 public void T013_StoreUserWebKey() 173 public void T013_StoreUserWebKey()
174 { 174 {
175 UserProfileData u1 = db.GetUserByUUID(user1); 175 UserProfileData u1 = db.GetUserByUUID(user1);
176 Assert.That(u1.WebLoginKey,Is.EqualTo(zero)); 176 Assert.That(u1.WebLoginKey,Is.EqualTo(zero), "Assert.That(u1.WebLoginKey,Is.EqualTo(zero))");
177 db.StoreWebLoginKey(user1, webkey); 177 db.StoreWebLoginKey(user1, webkey);
178 u1 = db.GetUserByUUID(user1); 178 u1 = db.GetUserByUUID(user1);
179 Assert.That(u1.WebLoginKey,Is.EqualTo(webkey)); 179 Assert.That(u1.WebLoginKey,Is.EqualTo(webkey), "Assert.That(u1.WebLoginKey,Is.EqualTo(webkey))");
180 } 180 }
181 181
182 [Test] 182 [Test]
@@ -258,36 +258,36 @@ namespace OpenSim.Data.Tests
258 db.AddNewUserProfile(u); 258 db.AddNewUserProfile(u);
259 UserProfileData u1a = db.GetUserByUUID(id); 259 UserProfileData u1a = db.GetUserByUUID(id);
260 Assert.That(u1a,Is.Not.Null); 260 Assert.That(u1a,Is.Not.Null);
261 Assert.That(id,Is.EqualTo(u1a.ID)); 261 Assert.That(id,Is.EqualTo(u1a.ID), "Assert.That(id,Is.EqualTo(u1a.ID))");
262 Assert.That(homeregion,Is.EqualTo(u1a.HomeRegionID)); 262 Assert.That(homeregion,Is.EqualTo(u1a.HomeRegionID), "Assert.That(homeregion,Is.EqualTo(u1a.HomeRegionID))");
263 Assert.That(webloginkey,Is.EqualTo(u1a.WebLoginKey)); 263 Assert.That(webloginkey,Is.EqualTo(u1a.WebLoginKey), "Assert.That(webloginkey,Is.EqualTo(u1a.WebLoginKey))");
264 Assert.That(fname,Is.EqualTo(u1a.FirstName)); 264 Assert.That(fname,Is.EqualTo(u1a.FirstName), "Assert.That(fname,Is.EqualTo(u1a.FirstName))");
265 Assert.That(lname,Is.EqualTo(u1a.SurName)); 265 Assert.That(lname,Is.EqualTo(u1a.SurName), "Assert.That(lname,Is.EqualTo(u1a.SurName))");
266 Assert.That(email,Is.EqualTo(u1a.Email)); 266 Assert.That(email,Is.EqualTo(u1a.Email), "Assert.That(email,Is.EqualTo(u1a.Email))");
267 Assert.That(passhash,Is.EqualTo(u1a.PasswordHash)); 267 Assert.That(passhash,Is.EqualTo(u1a.PasswordHash), "Assert.That(passhash,Is.EqualTo(u1a.PasswordHash))");
268 Assert.That(passsalt,Is.EqualTo(u1a.PasswordSalt)); 268 Assert.That(passsalt,Is.EqualTo(u1a.PasswordSalt), "Assert.That(passsalt,Is.EqualTo(u1a.PasswordSalt))");
269 Assert.That(homeregx,Is.EqualTo(u1a.HomeRegionX)); 269 Assert.That(homeregx,Is.EqualTo(u1a.HomeRegionX), "Assert.That(homeregx,Is.EqualTo(u1a.HomeRegionX))");
270 Assert.That(homeregy,Is.EqualTo(u1a.HomeRegionY)); 270 Assert.That(homeregy,Is.EqualTo(u1a.HomeRegionY), "Assert.That(homeregy,Is.EqualTo(u1a.HomeRegionY))");
271 Assert.That(homereg,Is.EqualTo(u1a.HomeRegion)); 271 Assert.That(homereg,Is.EqualTo(u1a.HomeRegion), "Assert.That(homereg,Is.EqualTo(u1a.HomeRegion))");
272 Assert.That(homeloc,Is.EqualTo(u1a.HomeLocation)); 272 Assert.That(homeloc,Is.EqualTo(u1a.HomeLocation), "Assert.That(homeloc,Is.EqualTo(u1a.HomeLocation))");
273 Assert.That(homelookat,Is.EqualTo(u1a.HomeLookAt)); 273 Assert.That(homelookat,Is.EqualTo(u1a.HomeLookAt), "Assert.That(homelookat,Is.EqualTo(u1a.HomeLookAt))");
274 Assert.That(created,Is.EqualTo(u1a.Created)); 274 Assert.That(created,Is.EqualTo(u1a.Created), "Assert.That(created,Is.EqualTo(u1a.Created))");
275 Assert.That(lastlogin,Is.EqualTo(u1a.LastLogin)); 275 Assert.That(lastlogin,Is.EqualTo(u1a.LastLogin), "Assert.That(lastlogin,Is.EqualTo(u1a.LastLogin))");
276 // RootInventoryFolderID is not tested because it is saved in SQLite, 276 // RootInventoryFolderID is not tested because it is saved in SQLite,
277 // but not in MySQL 277 // but not in MySQL
278 Assert.That(userinvuri,Is.EqualTo(u1a.UserInventoryURI)); 278 Assert.That(userinvuri,Is.EqualTo(u1a.UserInventoryURI), "Assert.That(userinvuri,Is.EqualTo(u1a.UserInventoryURI))");
279 Assert.That(userasseturi,Is.EqualTo(u1a.UserAssetURI)); 279 Assert.That(userasseturi,Is.EqualTo(u1a.UserAssetURI), "Assert.That(userasseturi,Is.EqualTo(u1a.UserAssetURI))");
280 Assert.That(candomask,Is.EqualTo(u1a.CanDoMask)); 280 Assert.That(candomask,Is.EqualTo(u1a.CanDoMask), "Assert.That(candomask,Is.EqualTo(u1a.CanDoMask))");
281 Assert.That(wantdomask,Is.EqualTo(u1a.WantDoMask)); 281 Assert.That(wantdomask,Is.EqualTo(u1a.WantDoMask), "Assert.That(wantdomask,Is.EqualTo(u1a.WantDoMask))");
282 Assert.That(abouttext,Is.EqualTo(u1a.AboutText)); 282 Assert.That(abouttext,Is.EqualTo(u1a.AboutText), "Assert.That(abouttext,Is.EqualTo(u1a.AboutText))");
283 Assert.That(flabouttext,Is.EqualTo(u1a.FirstLifeAboutText)); 283 Assert.That(flabouttext,Is.EqualTo(u1a.FirstLifeAboutText), "Assert.That(flabouttext,Is.EqualTo(u1a.FirstLifeAboutText))");
284 Assert.That(image,Is.EqualTo(u1a.Image)); 284 Assert.That(image,Is.EqualTo(u1a.Image), "Assert.That(image,Is.EqualTo(u1a.Image))");
285 Assert.That(firstimage,Is.EqualTo(u1a.FirstLifeImage)); 285 Assert.That(firstimage,Is.EqualTo(u1a.FirstLifeImage), "Assert.That(firstimage,Is.EqualTo(u1a.FirstLifeImage))");
286 Assert.That(u1a.CurrentAgent,Is.Null); 286 Assert.That(u1a.CurrentAgent,Is.Null);
287 Assert.That(userflags,Is.EqualTo(u1a.UserFlags)); 287 Assert.That(userflags,Is.EqualTo(u1a.UserFlags), "Assert.That(userflags,Is.EqualTo(u1a.UserFlags))");
288 Assert.That(godlevel,Is.EqualTo(u1a.GodLevel)); 288 Assert.That(godlevel,Is.EqualTo(u1a.GodLevel), "Assert.That(godlevel,Is.EqualTo(u1a.GodLevel))");
289 Assert.That(customtype,Is.EqualTo(u1a.CustomType)); 289 Assert.That(customtype,Is.EqualTo(u1a.CustomType), "Assert.That(customtype,Is.EqualTo(u1a.CustomType))");
290 Assert.That(partner,Is.EqualTo(u1a.Partner)); 290 Assert.That(partner,Is.EqualTo(u1a.Partner), "Assert.That(partner,Is.EqualTo(u1a.Partner))");
291 } 291 }
292 292
293 [Test] 293 [Test]
@@ -357,36 +357,36 @@ namespace OpenSim.Data.Tests
357 db.UpdateUserProfile(u); 357 db.UpdateUserProfile(u);
358 UserProfileData u1a = db.GetUserByUUID(id); 358 UserProfileData u1a = db.GetUserByUUID(id);
359 Assert.That(u1a,Is.Not.Null); 359 Assert.That(u1a,Is.Not.Null);
360 Assert.That(id,Is.EqualTo(u1a.ID)); 360 Assert.That(id,Is.EqualTo(u1a.ID), "Assert.That(id,Is.EqualTo(u1a.ID))");
361 Assert.That(homeregionid,Is.EqualTo(u1a.HomeRegionID)); 361 Assert.That(homeregionid,Is.EqualTo(u1a.HomeRegionID), "Assert.That(homeregionid,Is.EqualTo(u1a.HomeRegionID))");
362 Assert.That(webloginkey,Is.EqualTo(u1a.WebLoginKey)); 362 Assert.That(webloginkey,Is.EqualTo(u1a.WebLoginKey), "Assert.That(webloginkey,Is.EqualTo(u1a.WebLoginKey))");
363 Assert.That(fname,Is.EqualTo(u1a.FirstName)); 363 Assert.That(fname,Is.EqualTo(u1a.FirstName), "Assert.That(fname,Is.EqualTo(u1a.FirstName))");
364 Assert.That(lname,Is.EqualTo(u1a.SurName)); 364 Assert.That(lname,Is.EqualTo(u1a.SurName), "Assert.That(lname,Is.EqualTo(u1a.SurName))");
365 Assert.That(email,Is.EqualTo(u1a.Email)); 365 Assert.That(email,Is.EqualTo(u1a.Email), "Assert.That(email,Is.EqualTo(u1a.Email))");
366 Assert.That(passhash,Is.EqualTo(u1a.PasswordHash)); 366 Assert.That(passhash,Is.EqualTo(u1a.PasswordHash), "Assert.That(passhash,Is.EqualTo(u1a.PasswordHash))");
367 Assert.That(passsalt,Is.EqualTo(u1a.PasswordSalt)); 367 Assert.That(passsalt,Is.EqualTo(u1a.PasswordSalt), "Assert.That(passsalt,Is.EqualTo(u1a.PasswordSalt))");
368 Assert.That(homereg,Is.EqualTo(u1a.HomeRegion)); 368 Assert.That(homereg,Is.EqualTo(u1a.HomeRegion), "Assert.That(homereg,Is.EqualTo(u1a.HomeRegion))");
369 Assert.That(homeregx,Is.EqualTo(u1a.HomeRegionX)); 369 Assert.That(homeregx,Is.EqualTo(u1a.HomeRegionX), "Assert.That(homeregx,Is.EqualTo(u1a.HomeRegionX))");
370 Assert.That(homeregy,Is.EqualTo(u1a.HomeRegionY)); 370 Assert.That(homeregy,Is.EqualTo(u1a.HomeRegionY), "Assert.That(homeregy,Is.EqualTo(u1a.HomeRegionY))");
371 Assert.That(homereg,Is.EqualTo(u1a.HomeRegion)); 371 Assert.That(homereg,Is.EqualTo(u1a.HomeRegion), "Assert.That(homereg,Is.EqualTo(u1a.HomeRegion))");
372 Assert.That(homeloc,Is.EqualTo(u1a.HomeLocation)); 372 Assert.That(homeloc,Is.EqualTo(u1a.HomeLocation), "Assert.That(homeloc,Is.EqualTo(u1a.HomeLocation))");
373 Assert.That(homelookat,Is.EqualTo(u1a.HomeLookAt)); 373 Assert.That(homelookat,Is.EqualTo(u1a.HomeLookAt), "Assert.That(homelookat,Is.EqualTo(u1a.HomeLookAt))");
374 Assert.That(created,Is.EqualTo(u1a.Created)); 374 Assert.That(created,Is.EqualTo(u1a.Created), "Assert.That(created,Is.EqualTo(u1a.Created))");
375 Assert.That(lastlogin,Is.EqualTo(u1a.LastLogin)); 375 Assert.That(lastlogin,Is.EqualTo(u1a.LastLogin), "Assert.That(lastlogin,Is.EqualTo(u1a.LastLogin))");
376 // RootInventoryFolderID is not tested because it is saved in SQLite, 376 // RootInventoryFolderID is not tested because it is saved in SQLite,
377 // but not in MySQL 377 // but not in MySQL
378 Assert.That(userasseturi,Is.EqualTo(u1a.UserAssetURI)); 378 Assert.That(userasseturi,Is.EqualTo(u1a.UserAssetURI), "Assert.That(userasseturi,Is.EqualTo(u1a.UserAssetURI))");
379 Assert.That(candomask,Is.EqualTo(u1a.CanDoMask)); 379 Assert.That(candomask,Is.EqualTo(u1a.CanDoMask), "Assert.That(candomask,Is.EqualTo(u1a.CanDoMask))");
380 Assert.That(wantdomask,Is.EqualTo(u1a.WantDoMask)); 380 Assert.That(wantdomask,Is.EqualTo(u1a.WantDoMask), "Assert.That(wantdomask,Is.EqualTo(u1a.WantDoMask))");
381 Assert.That(abouttext,Is.EqualTo(u1a.AboutText)); 381 Assert.That(abouttext,Is.EqualTo(u1a.AboutText), "Assert.That(abouttext,Is.EqualTo(u1a.AboutText))");
382 Assert.That(flabouttext,Is.EqualTo(u1a.FirstLifeAboutText)); 382 Assert.That(flabouttext,Is.EqualTo(u1a.FirstLifeAboutText), "Assert.That(flabouttext,Is.EqualTo(u1a.FirstLifeAboutText))");
383 Assert.That(image,Is.EqualTo(u1a.Image)); 383 Assert.That(image,Is.EqualTo(u1a.Image), "Assert.That(image,Is.EqualTo(u1a.Image))");
384 Assert.That(firstimage,Is.EqualTo(u1a.FirstLifeImage)); 384 Assert.That(firstimage,Is.EqualTo(u1a.FirstLifeImage), "Assert.That(firstimage,Is.EqualTo(u1a.FirstLifeImage))");
385 Assert.That(u1a.CurrentAgent,Is.Null); 385 Assert.That(u1a.CurrentAgent,Is.Null);
386 Assert.That(userflags,Is.EqualTo(u1a.UserFlags)); 386 Assert.That(userflags,Is.EqualTo(u1a.UserFlags), "Assert.That(userflags,Is.EqualTo(u1a.UserFlags))");
387 Assert.That(godlevel,Is.EqualTo(u1a.GodLevel)); 387 Assert.That(godlevel,Is.EqualTo(u1a.GodLevel), "Assert.That(godlevel,Is.EqualTo(u1a.GodLevel))");
388 Assert.That(customtype,Is.EqualTo(u1a.CustomType)); 388 Assert.That(customtype,Is.EqualTo(u1a.CustomType), "Assert.That(customtype,Is.EqualTo(u1a.CustomType))");
389 Assert.That(partner,Is.EqualTo(u1a.Partner)); 389 Assert.That(partner,Is.EqualTo(u1a.Partner), "Assert.That(partner,Is.EqualTo(u1a.Partner))");
390 } 390 }
391 391
392 [Test] 392 [Test]
@@ -401,12 +401,12 @@ namespace OpenSim.Data.Tests
401 UserAgentData a1a = db.GetAgentByUUID(user1); 401 UserAgentData a1a = db.GetAgentByUUID(user1);
402 UserAgentData a2a = db.GetAgentByUUID(user2); 402 UserAgentData a2a = db.GetAgentByUUID(user2);
403 UserAgentData a3a = db.GetAgentByUUID(user3); 403 UserAgentData a3a = db.GetAgentByUUID(user3);
404 Assert.That(agent1,Is.EqualTo(a1a.SessionID)); 404 Assert.That(agent1,Is.EqualTo(a1a.SessionID), "Assert.That(agent1,Is.EqualTo(a1a.SessionID))");
405 Assert.That(user1,Is.EqualTo(a1a.ProfileID)); 405 Assert.That(user1,Is.EqualTo(a1a.ProfileID), "Assert.That(user1,Is.EqualTo(a1a.ProfileID))");
406 Assert.That(agent2,Is.EqualTo(a2a.SessionID)); 406 Assert.That(agent2,Is.EqualTo(a2a.SessionID), "Assert.That(agent2,Is.EqualTo(a2a.SessionID))");
407 Assert.That(user2,Is.EqualTo(a2a.ProfileID)); 407 Assert.That(user2,Is.EqualTo(a2a.ProfileID), "Assert.That(user2,Is.EqualTo(a2a.ProfileID))");
408 Assert.That(agent3,Is.EqualTo(a3a.SessionID)); 408 Assert.That(agent3,Is.EqualTo(a3a.SessionID), "Assert.That(agent3,Is.EqualTo(a3a.SessionID))");
409 Assert.That(user3,Is.EqualTo(a3a.ProfileID)); 409 Assert.That(user3,Is.EqualTo(a3a.ProfileID), "Assert.That(user3,Is.EqualTo(a3a.ProfileID))");
410 } 410 }
411 411
412 [Test] 412 [Test]
@@ -415,8 +415,8 @@ namespace OpenSim.Data.Tests
415 String name3 = fname3 + " " + lname3; 415 String name3 = fname3 + " " + lname3;
416 UserAgentData a2 = db.GetAgentByName(fname2,lname2); 416 UserAgentData a2 = db.GetAgentByName(fname2,lname2);
417 UserAgentData a3 = db.GetAgentByName(name3); 417 UserAgentData a3 = db.GetAgentByName(name3);
418 Assert.That(user2,Is.EqualTo(a2.ProfileID)); 418 Assert.That(user2,Is.EqualTo(a2.ProfileID), "Assert.That(user2,Is.EqualTo(a2.ProfileID))");
419 Assert.That(user3,Is.EqualTo(a3.ProfileID)); 419 Assert.That(user3,Is.EqualTo(a3.ProfileID), "Assert.That(user3,Is.EqualTo(a3.ProfileID))");
420 } 420 }
421 421
422 [Test] 422 [Test]
@@ -466,18 +466,18 @@ namespace OpenSim.Data.Tests
466 db.AddNewUserAgent(a); 466 db.AddNewUserAgent(a);
467 467
468 UserAgentData a1 = db.GetAgentByUUID(user4); 468 UserAgentData a1 = db.GetAgentByUUID(user4);
469 Assert.That(user,Is.EqualTo(a1.ProfileID)); 469 Assert.That(user,Is.EqualTo(a1.ProfileID), "Assert.That(user,Is.EqualTo(a1.ProfileID))");
470 Assert.That(agent,Is.EqualTo(a1.SessionID)); 470 Assert.That(agent,Is.EqualTo(a1.SessionID), "Assert.That(agent,Is.EqualTo(a1.SessionID))");
471 Assert.That(secureagent,Is.EqualTo(a1.SecureSessionID)); 471 Assert.That(secureagent,Is.EqualTo(a1.SecureSessionID), "Assert.That(secureagent,Is.EqualTo(a1.SecureSessionID))");
472 Assert.That(agentip,Is.EqualTo(a1.AgentIP)); 472 Assert.That(agentip,Is.EqualTo(a1.AgentIP), "Assert.That(agentip,Is.EqualTo(a1.AgentIP))");
473 Assert.That(agentport,Is.EqualTo(a1.AgentPort)); 473 Assert.That(agentport,Is.EqualTo(a1.AgentPort), "Assert.That(agentport,Is.EqualTo(a1.AgentPort))");
474 Assert.That(agentonline,Is.EqualTo(a1.AgentOnline)); 474 Assert.That(agentonline,Is.EqualTo(a1.AgentOnline), "Assert.That(agentonline,Is.EqualTo(a1.AgentOnline))");
475 Assert.That(logintime,Is.EqualTo(a1.LoginTime)); 475 Assert.That(logintime,Is.EqualTo(a1.LoginTime), "Assert.That(logintime,Is.EqualTo(a1.LoginTime))");
476 Assert.That(logouttime,Is.EqualTo(a1.LogoutTime)); 476 Assert.That(logouttime,Is.EqualTo(a1.LogoutTime), "Assert.That(logouttime,Is.EqualTo(a1.LogoutTime))");
477 Assert.That(regionid,Is.EqualTo(a1.Region)); 477 Assert.That(regionid,Is.EqualTo(a1.Region), "Assert.That(regionid,Is.EqualTo(a1.Region))");
478 Assert.That(regionhandle,Is.EqualTo(a1.Handle)); 478 Assert.That(regionhandle,Is.EqualTo(a1.Handle), "Assert.That(regionhandle,Is.EqualTo(a1.Handle))");
479 Assert.That(currentpos,Is.EqualTo(a1.Position)); 479 Assert.That(currentpos,Is.EqualTo(a1.Position), "Assert.That(currentpos,Is.EqualTo(a1.Position))");
480 Assert.That(currentlookat,Is.EqualTo(a1.LookAt)); 480 Assert.That(currentlookat,Is.EqualTo(a1.LookAt), "Assert.That(currentlookat,Is.EqualTo(a1.LookAt))");
481 } 481 }
482 482
483 [Test] 483 [Test]
@@ -491,19 +491,19 @@ namespace OpenSim.Data.Tests
491 db.AddNewUserFriend(user1,user3, 2); 491 db.AddNewUserFriend(user1,user3, 2);
492 db.AddNewUserFriend(user1,user2, 4); 492 db.AddNewUserFriend(user1,user2, 4);
493 List<FriendListItem> fl1 = db.GetUserFriendList(user1); 493 List<FriendListItem> fl1 = db.GetUserFriendList(user1);
494 Assert.That(fl1.Count,Is.EqualTo(2)); 494 Assert.That(fl1.Count,Is.EqualTo(2), "Assert.That(fl1.Count,Is.EqualTo(2))");
495 perms.Add(user2,1); 495 perms.Add(user2,1);
496 perms.Add(user3,2); 496 perms.Add(user3,2);
497 for (int i = 0; i < fl1.Count; i++) 497 for (int i = 0; i < fl1.Count; i++)
498 { 498 {
499 Assert.That(user1,Is.EqualTo(fl1[i].FriendListOwner)); 499 Assert.That(user1,Is.EqualTo(fl1[i].FriendListOwner), "Assert.That(user1,Is.EqualTo(fl1[i].FriendListOwner))");
500 friends.Add(fl1[i].Friend,1); 500 friends.Add(fl1[i].Friend,1);
501 temp = perms[fl1[i].Friend]; 501 temp = perms[fl1[i].Friend];
502 Assert.That(temp,Is.EqualTo(fl1[i].FriendPerms)); 502 Assert.That(temp,Is.EqualTo(fl1[i].FriendPerms), "Assert.That(temp,Is.EqualTo(fl1[i].FriendPerms))");
503 } 503 }
504 tempu1 = friends[user2]; 504 tempu1 = friends[user2];
505 tempu2 = friends[user3]; 505 tempu2 = friends[user3];
506 Assert.That(1,Is.EqualTo(tempu1) & Is.EqualTo(tempu2)); 506 Assert.That(1,Is.EqualTo(tempu1) & Is.EqualTo(tempu2), "Assert.That(1,Is.EqualTo(tempu1) & Is.EqualTo(tempu2))");
507 } 507 }
508 508
509 [Test] 509 [Test]
@@ -513,15 +513,15 @@ namespace OpenSim.Data.Tests
513 List<FriendListItem> fl1 = db.GetUserFriendList(user1); 513 List<FriendListItem> fl1 = db.GetUserFriendList(user1);
514 List<FriendListItem> fl2 = db.GetUserFriendList(user2); 514 List<FriendListItem> fl2 = db.GetUserFriendList(user2);
515 515
516 Assert.That(fl1.Count,Is.EqualTo(2)); 516 Assert.That(fl1.Count,Is.EqualTo(2), "Assert.That(fl1.Count,Is.EqualTo(2))");
517 Assert.That(fl1[0].Friend,Is.EqualTo(user2) | Is.EqualTo(user3)); 517 Assert.That(fl1[0].Friend,Is.EqualTo(user2) | Is.EqualTo(user3), "Assert.That(fl1[0].Friend,Is.EqualTo(user2) | Is.EqualTo(user3))");
518 Assert.That(fl2[0].Friend,Is.EqualTo(user1)); 518 Assert.That(fl2[0].Friend,Is.EqualTo(user1), "Assert.That(fl2[0].Friend,Is.EqualTo(user1))");
519 db.RemoveUserFriend(user2, user1); 519 db.RemoveUserFriend(user2, user1);
520 520
521 fl1 = db.GetUserFriendList(user1); 521 fl1 = db.GetUserFriendList(user1);
522 fl2 = db.GetUserFriendList(user2); 522 fl2 = db.GetUserFriendList(user2);
523 Assert.That(fl1.Count,Is.EqualTo(1)); 523 Assert.That(fl1.Count,Is.EqualTo(1), "Assert.That(fl1.Count,Is.EqualTo(1))");
524 Assert.That(fl1[0].Friend, Is.EqualTo(user3)); 524 Assert.That(fl1[0].Friend, Is.EqualTo(user3), "Assert.That(fl1[0].Friend, Is.EqualTo(user3))");
525 Assert.That(fl2, Is.Empty); 525 Assert.That(fl2, Is.Empty);
526 } 526 }
527 527
@@ -530,11 +530,11 @@ namespace OpenSim.Data.Tests
530 // user1 has 1 friend, user3, who has permission 2 in T030. 530 // user1 has 1 friend, user3, who has permission 2 in T030.
531 { 531 {
532 List<FriendListItem> fl1 = db.GetUserFriendList(user1); 532 List<FriendListItem> fl1 = db.GetUserFriendList(user1);
533 Assert.That(fl1[0].FriendPerms,Is.EqualTo(2)); 533 Assert.That(fl1[0].FriendPerms,Is.EqualTo(2), "Assert.That(fl1[0].FriendPerms,Is.EqualTo(2))");
534 db.UpdateUserFriendPerms(user1, user3, 4); 534 db.UpdateUserFriendPerms(user1, user3, 4);
535 535
536 fl1 = db.GetUserFriendList(user1); 536 fl1 = db.GetUserFriendList(user1);
537 Assert.That(fl1[0].FriendPerms,Is.EqualTo(4)); 537 Assert.That(fl1[0].FriendPerms,Is.EqualTo(4), "Assert.That(fl1[0].FriendPerms,Is.EqualTo(4))");
538 } 538 }
539 539
540 [Test] 540 [Test]
@@ -544,7 +544,7 @@ namespace OpenSim.Data.Tests
544 appear.Owner = user1; 544 appear.Owner = user1;
545 db.UpdateUserAppearance(user1, appear); 545 db.UpdateUserAppearance(user1, appear);
546 AvatarAppearance user1app = db.GetUserAppearance(user1); 546 AvatarAppearance user1app = db.GetUserAppearance(user1);
547 Assert.That(user1,Is.EqualTo(user1app.Owner)); 547 Assert.That(user1,Is.EqualTo(user1app.Owner), "Assert.That(user1,Is.EqualTo(user1app.Owner))");
548 } 548 }
549 549
550 [Test] 550 [Test]
@@ -619,37 +619,37 @@ namespace OpenSim.Data.Tests
619 db.UpdateUserAppearance(owner, appear); 619 db.UpdateUserAppearance(owner, appear);
620 AvatarAppearance app = db.GetUserAppearance(owner); 620 AvatarAppearance app = db.GetUserAppearance(owner);
621 621
622 Assert.That(owner,Is.EqualTo(app.Owner)); 622 Assert.That(owner,Is.EqualTo(app.Owner), "Assert.That(owner,Is.EqualTo(app.Owner))");
623 Assert.That(serial,Is.EqualTo(app.Serial)); 623 Assert.That(serial,Is.EqualTo(app.Serial), "Assert.That(serial,Is.EqualTo(app.Serial))");
624 Assert.That(visualp,Is.EqualTo(app.VisualParams)); 624 Assert.That(visualp,Is.EqualTo(app.VisualParams), "Assert.That(visualp,Is.EqualTo(app.VisualParams))");
625 Assert.That(bodyitem,Is.EqualTo(app.BodyItem)); 625 Assert.That(bodyitem,Is.EqualTo(app.BodyItem), "Assert.That(bodyitem,Is.EqualTo(app.BodyItem))");
626 Assert.That(bodyasset,Is.EqualTo(app.BodyAsset)); 626 Assert.That(bodyasset,Is.EqualTo(app.BodyAsset), "Assert.That(bodyasset,Is.EqualTo(app.BodyAsset))");
627 Assert.That(skinitem,Is.EqualTo(app.SkinItem)); 627 Assert.That(skinitem,Is.EqualTo(app.SkinItem), "Assert.That(skinitem,Is.EqualTo(app.SkinItem))");
628 Assert.That(skinasset,Is.EqualTo(app.SkinAsset)); 628 Assert.That(skinasset,Is.EqualTo(app.SkinAsset), "Assert.That(skinasset,Is.EqualTo(app.SkinAsset))");
629 Assert.That(hairitem,Is.EqualTo(app.HairItem)); 629 Assert.That(hairitem,Is.EqualTo(app.HairItem), "Assert.That(hairitem,Is.EqualTo(app.HairItem))");
630 Assert.That(hairasset,Is.EqualTo(app.HairAsset)); 630 Assert.That(hairasset,Is.EqualTo(app.HairAsset), "Assert.That(hairasset,Is.EqualTo(app.HairAsset))");
631 Assert.That(eyesitem,Is.EqualTo(app.EyesItem)); 631 Assert.That(eyesitem,Is.EqualTo(app.EyesItem), "Assert.That(eyesitem,Is.EqualTo(app.EyesItem))");
632 Assert.That(eyesasset,Is.EqualTo(app.EyesAsset)); 632 Assert.That(eyesasset,Is.EqualTo(app.EyesAsset), "Assert.That(eyesasset,Is.EqualTo(app.EyesAsset))");
633 Assert.That(shirtitem,Is.EqualTo(app.ShirtItem)); 633 Assert.That(shirtitem,Is.EqualTo(app.ShirtItem), "Assert.That(shirtitem,Is.EqualTo(app.ShirtItem))");
634 Assert.That(shirtasset,Is.EqualTo(app.ShirtAsset)); 634 Assert.That(shirtasset,Is.EqualTo(app.ShirtAsset), "Assert.That(shirtasset,Is.EqualTo(app.ShirtAsset))");
635 Assert.That(pantsitem,Is.EqualTo(app.PantsItem)); 635 Assert.That(pantsitem,Is.EqualTo(app.PantsItem), "Assert.That(pantsitem,Is.EqualTo(app.PantsItem))");
636 Assert.That(pantsasset,Is.EqualTo(app.PantsAsset)); 636 Assert.That(pantsasset,Is.EqualTo(app.PantsAsset), "Assert.That(pantsasset,Is.EqualTo(app.PantsAsset))");
637 Assert.That(shoesitem,Is.EqualTo(app.ShoesItem)); 637 Assert.That(shoesitem,Is.EqualTo(app.ShoesItem), "Assert.That(shoesitem,Is.EqualTo(app.ShoesItem))");
638 Assert.That(shoesasset,Is.EqualTo(app.ShoesAsset)); 638 Assert.That(shoesasset,Is.EqualTo(app.ShoesAsset), "Assert.That(shoesasset,Is.EqualTo(app.ShoesAsset))");
639 Assert.That(socksitem,Is.EqualTo(app.SocksItem)); 639 Assert.That(socksitem,Is.EqualTo(app.SocksItem), "Assert.That(socksitem,Is.EqualTo(app.SocksItem))");
640 Assert.That(socksasset,Is.EqualTo(app.SocksAsset)); 640 Assert.That(socksasset,Is.EqualTo(app.SocksAsset), "Assert.That(socksasset,Is.EqualTo(app.SocksAsset))");
641 Assert.That(jacketitem,Is.EqualTo(app.JacketItem)); 641 Assert.That(jacketitem,Is.EqualTo(app.JacketItem), "Assert.That(jacketitem,Is.EqualTo(app.JacketItem))");
642 Assert.That(jacketasset,Is.EqualTo(app.JacketAsset)); 642 Assert.That(jacketasset,Is.EqualTo(app.JacketAsset), "Assert.That(jacketasset,Is.EqualTo(app.JacketAsset))");
643 Assert.That(glovesitem,Is.EqualTo(app.GlovesItem)); 643 Assert.That(glovesitem,Is.EqualTo(app.GlovesItem), "Assert.That(glovesitem,Is.EqualTo(app.GlovesItem))");
644 Assert.That(glovesasset,Is.EqualTo(app.GlovesAsset)); 644 Assert.That(glovesasset,Is.EqualTo(app.GlovesAsset), "Assert.That(glovesasset,Is.EqualTo(app.GlovesAsset))");
645 Assert.That(ushirtitem,Is.EqualTo(app.UnderShirtItem)); 645 Assert.That(ushirtitem,Is.EqualTo(app.UnderShirtItem), "Assert.That(ushirtitem,Is.EqualTo(app.UnderShirtItem))");
646 Assert.That(ushirtasset,Is.EqualTo(app.UnderShirtAsset)); 646 Assert.That(ushirtasset,Is.EqualTo(app.UnderShirtAsset), "Assert.That(ushirtasset,Is.EqualTo(app.UnderShirtAsset))");
647 Assert.That(upantsitem,Is.EqualTo(app.UnderPantsItem)); 647 Assert.That(upantsitem,Is.EqualTo(app.UnderPantsItem), "Assert.That(upantsitem,Is.EqualTo(app.UnderPantsItem))");
648 Assert.That(upantsasset,Is.EqualTo(app.UnderPantsAsset)); 648 Assert.That(upantsasset,Is.EqualTo(app.UnderPantsAsset), "Assert.That(upantsasset,Is.EqualTo(app.UnderPantsAsset))");
649 Assert.That(skirtitem,Is.EqualTo(app.SkirtItem)); 649 Assert.That(skirtitem,Is.EqualTo(app.SkirtItem), "Assert.That(skirtitem,Is.EqualTo(app.SkirtItem))");
650 Assert.That(skirtasset,Is.EqualTo(app.SkirtAsset)); 650 Assert.That(skirtasset,Is.EqualTo(app.SkirtAsset), "Assert.That(skirtasset,Is.EqualTo(app.SkirtAsset))");
651 Assert.That(texture.ToString(),Is.EqualTo(app.Texture.ToString())); 651 Assert.That(texture.ToString(),Is.EqualTo(app.Texture.ToString()), "Assert.That(texture.ToString(),Is.EqualTo(app.Texture.ToString()))");
652 Assert.That(avatarheight,Is.EqualTo(app.AvatarHeight)); 652 Assert.That(avatarheight,Is.EqualTo(app.AvatarHeight), "Assert.That(avatarheight,Is.EqualTo(app.AvatarHeight))");
653 } 653 }
654 654
655 public UserProfileData NewUser(UUID id,string fname,string lname) 655 public UserProfileData NewUser(UUID id,string fname,string lname)