Fixed tests that use Trace listener

ThatRendle · ThatRendle · commit 586cb43873c1 · 2013-05-21T11:24:46.000+01:00
diff --git a/Simple.Data.Mocking/Ado/MockDataReader.cs b/Simple.Data.Mocking/Ado/MockDataReader.cs
@@ -9,6 +9,7 @@ namespace Simple.Data.Mocking.Ado
     class MockDataReader : DbDataReader
     {
         private readonly IEnumerator<IDataRecord> _records;
+        private bool _isClosed = false;
 
         public MockDataReader(IEnumerable<IDataRecord> records)
         {
@@ -21,7 +22,7 @@ public MockDataReader(IEnumerable<IDataRecord> records)
         /// <filterpriority>1</filterpriority>
         public override void Close()
         {
-            
+            _isClosed = true;
         }
 
         /// <summary>
@@ -81,7 +82,7 @@ public override int Depth
         /// <exception cref="T:System.InvalidOperationException">The <see cref="T:System.Data.SqlClient.SqlDataReader"/> is closed. </exception><filterpriority>1</filterpriority>
         public override bool IsClosed
         {
-            get { throw new NotImplementedException(); }
+            get { return _isClosed; }
         }
 
         /// <summary>
diff --git a/Simple.Data.SqlTest/ProcedureTest.cs b/Simple.Data.SqlTest/ProcedureTest.cs
@@ -79,14 +79,15 @@ public void GetCustomerCountAsOutputTest()
         [Test]
         public void GetCustomerCountSecondCallExecutesNonQueryTest()
         {
+            SimpleDataTraceSources.TraceSource.Switch.Level = SourceLevels.All;
             var listener = new TestTraceListener();
-            Trace.Listeners.Add(listener);
+            SimpleDataTraceSources.TraceSource.Listeners.Add(listener);
             var db = DatabaseHelper.Open();
             db.GetCustomerCount();
             Assert.IsFalse(listener.Output.Contains("ExecuteNonQuery"));
             db.GetCustomerCount();
             Assert.IsTrue(listener.Output.Contains("ExecuteNonQuery"));
-            Trace.Listeners.Remove(listener);
+            SimpleDataTraceSources.TraceSource.Listeners.Remove(listener);
         }
 #endif
 
diff --git a/Simple.Data.SqlTest/QueryTest.cs b/Simple.Data.SqlTest/QueryTest.cs
@@ -461,14 +461,16 @@ public void SelfJoinShouldNotThrowException()
         [Test]
         public void OrderByOnJoinedColumnShouldUseJoinedColumn()
         {
+            SimpleDataTraceSources.TraceSource.Switch.Level = SourceLevels.All;
             var traceListener = new TestTraceListener();
+            SimpleDataTraceSources.TraceSource.Listeners.Add(traceListener);
             Trace.Listeners.Add(traceListener);
             var db = DatabaseHelper.Open();
 
             var q = db.Employees.Query().LeftJoin(db.Employees.As("Manager"), Id: db.Employees.ManagerId);
             q = q.Select(db.Employees.Name, q.Manager.Name.As("Manager"));
             List<dynamic> employees = q.OrderBy(q.Manager.Name).ToList();
-            Trace.Listeners.Remove(traceListener);
+            SimpleDataTraceSources.TraceSource.Listeners.Remove(traceListener);
             Assert.Greater(traceListener.Output.IndexOf("order by [manager].[name]", StringComparison.OrdinalIgnoreCase), 0);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ namespace Simple.Data.Mocking.Ado`
`9`	`9`	`class MockDataReader : DbDataReader`
`10`	`10`	`{`
`11`	`11`	`private readonly IEnumerator<IDataRecord> _records;`
	`12`	`+ private bool _isClosed = false;`
`12`	`13`
`13`	`14`	`public MockDataReader(IEnumerable<IDataRecord> records)`
`14`	`15`	`{`
`@@ -21,7 +22,7 @@ public MockDataReader(IEnumerable<IDataRecord> records)`
`21`	`22`	`/// <filterpriority>1</filterpriority>`
`22`	`23`	`public override void Close()`
`23`	`24`	`{`
`24`		`-`
	`25`	`+ _isClosed = true;`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`/// <summary>`
`@@ -81,7 +82,7 @@ public override int Depth`
`81`	`82`	`/// <exception cref="T:System.InvalidOperationException">The <see cref="T:System.Data.SqlClient.SqlDataReader"/> is closed. </exception><filterpriority>1</filterpriority>`
`82`	`83`	`public override bool IsClosed`
`83`	`84`	`{`
`84`		`- get { throw new NotImplementedException(); }`
	`85`	`+ get { return _isClosed; }`
`85`	`86`	`}`
`86`	`87`
`87`	`88`	`/// <summary>`