sdether
diff --git a/‎MongoDB.Net-Tests/MongoTestBase.cs
Copy file name to clipboardExpand all lines: MongoDB.Net-Tests/MongoTestBase.cs
+4-5 b/‎MongoDB.Net-Tests/MongoTestBase.cs
Copy file name to clipboardExpand all lines: MongoDB.Net-Tests/MongoTestBase.cs
+4-5
diff --git a/‎MongoDB.Net-Tests/TestCollectionSafeMode.cs
Copy file name to clipboard
+3-21 b/‎MongoDB.Net-Tests/TestCollectionSafeMode.cs
Copy file name to clipboard
+3-21
diff --git a/‎MongoDBDriver/Collection.cs
Copy file name to clipboardExpand all lines: MongoDBDriver/Collection.cs
+4-6 b/‎MongoDBDriver/Collection.cs
Copy file name to clipboardExpand all lines: MongoDBDriver/Collection.cs
+4-6
diff --git a/‎MongoDBDriver/Util/ErrorTranslator.cs
Copy file name to clipboardExpand all lines: MongoDBDriver/Util/ErrorTranslator.cs
-1 b/‎MongoDBDriver/Util/ErrorTranslator.cs
Copy file name to clipboardExpand all lines: MongoDBDriver/Util/ErrorTranslator.cs
-1
@@ -1,4 +1,3 @@
-/*
 using System;
 using NUnit.Framework;
 
@@ -19,15 +18,16 @@ public Database DB{
         /// </summary>
         public abstract string TestCollections{get;}
 
-        
-        
+
+        [TestFixtureSetUp]
         public virtual void Init(){
             this.Mongo = new Mongo();
             this.Mongo.Connect();
             cleanDB();
         }
 
 
+        [TestFixtureTearDown]
         public virtual void Dispose(){
             this.Mongo.Disconnect();
         }
@@ -39,5 +39,4 @@ protected void cleanDB(){
             }
         }
     }
-}
- */
+}
@@ -1,21 +1,14 @@
-/*using System;
+using System;
 
 using NUnit.Framework;
 
 
 namespace MongoDB.Driver
 {
     [TestFixture]
-    public class TestCollectionSafeMode
+    public class TestCollectionSafeMode : MongoTestBase
     {
-                public Mongo Mongo{get;set;}
-        public Database DB{
-            get{
-                return this.Mongo["tests"];
-            }
-        }
-        public string TestCollections {
-        //public override string TestCollections {            
+        public override string TestCollections {            
             get {
                 return "safeinsert, safeupdate, safedelete";
             }
@@ -43,16 +36,5 @@ public void TestBadInsert(){
             }
             Assert.IsTrue(thrown);
         }
-        
-        [TestFixtureSetUp]
-        public void Init(){
-            //base.Init();
-        }
-        
-        [TestFixtureTearDown]
-        public void Dispose(){
-            //base.Dispose();
-        }
     }
 }
-*/
@@ -258,6 +258,10 @@ public void Update(Document doc, Document selector, int flags){
             this.Update(doc,selector,(UpdateFlags)flags);
         }
 
+        
+        public void UpdateAll (Document doc, Document selector, bool safemode){
+            throw new System.NotImplementedException();
+        }
         /// <summary>
         /// Runs a multiple update query against the database.  It will wrap any 
         /// doc with $set if the passed in doc doesn't contain any '$' ops.
@@ -280,12 +284,6 @@ public void UpdateAll(Document doc, Document selector){
             this.Update(doc, selector, UpdateFlags.MultiUpdate);           
         }
 
-        
-        public void UpdateAll (Document doc, Document selector, bool safemode)
-        {
-            throw new System.NotImplementedException();
-        }
-        
 
         private void CheckError(bool safemode){
             if(safemode){
 
@@ -49,7 +49,6 @@ private static MongoException BuildException(string errnum, string msg, Document
                     return new MongoOperationException(msg, error);
                 }                
             }
-            return null;
         }
 
     }
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-/*`
`2`	`1`	`using System;`
`3`	`2`	`using NUnit.Framework;`
`4`	`3`
`@@ -19,15 +18,16 @@ public Database DB{`
`19`	`18`	`/// </summary>`
`20`	`19`	`public abstract string TestCollections{get;}`
`21`	`20`
`22`		`-`
`23`		`-`
	`21`	`+`
	`22`	`+ [TestFixtureSetUp]`
`24`	`23`	`public virtual void Init(){`
`25`	`24`	`this.Mongo = new Mongo();`
`26`	`25`	`this.Mongo.Connect();`
`27`	`26`	`cleanDB();`
`28`	`27`	`}`
`29`	`28`
`30`	`29`
	`30`	`+ [TestFixtureTearDown]`
`31`	`31`	`public virtual void Dispose(){`
`32`	`32`	`this.Mongo.Disconnect();`
`33`	`33`	`}`
`@@ -39,5 +39,4 @@ protected void cleanDB(){`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`	`}`
`42`		`-}`
`43`		`- */`
	`42`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,6 @@ private static MongoException BuildException(string errnum, string msg, Document`
`49`	`49`	`return new MongoOperationException(msg, error);`
`50`	`50`	`}`
`51`	`51`	`}`
`52`		`- return null;`
`53`	`52`	`}`
`54`	`53`
`55`	`54`	`}`