CSHARP-2867: Fix json driven tests for async

MikalaiMazurenka · MikalaiMazurenka · commit e6b3e5a9e60e · 2020-02-06T21:10:23.000+03:00
diff --git a/tests/MongoDB.Driver.Tests/JsonDrivenTests/JsonDrivenAssertDifferentLsidOnLastTwoCommandsTest.cs b/tests/MongoDB.Driver.Tests/JsonDrivenTests/JsonDrivenAssertDifferentLsidOnLastTwoCommandsTest.cs
@@ -20,6 +20,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
+using System.Threading.Tasks;
 
 namespace MongoDB.Driver.Tests.JsonDrivenTests
 {
@@ -38,7 +39,13 @@ public override void Act(CancellationToken cancellationToken)
             // do nothing
         }
 
-        public override void Assert()
+        public override Task ActAsync(CancellationToken cancellationToken)
+        {
+            // do nothing
+            return Task.FromResult(true);
+        }
+
+        protected override void AssertResult()
         {
             var lastTwoCommands = _eventCapturer
                 .Events
diff --git a/tests/MongoDB.Driver.Tests/JsonDrivenTests/JsonDrivenAssertSameLsidOnLastTwoCommandsTest.cs b/tests/MongoDB.Driver.Tests/JsonDrivenTests/JsonDrivenAssertSameLsidOnLastTwoCommandsTest.cs
@@ -20,6 +20,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
+using System.Threading.Tasks;
 
 namespace MongoDB.Driver.Tests.JsonDrivenTests
 {
@@ -38,7 +39,13 @@ public override void Act(CancellationToken cancellationToken)
             // do nothing
         }
 
-        public override void Assert()
+        public override Task ActAsync(CancellationToken cancellationToken)
+        {
+            // do nothing
+            return Task.FromResult(true);
+        }
+
+        protected override void AssertResult()
         {
             var lastTwoCommands = _eventCapturer
                 .Events
diff --git a/tests/MongoDB.Driver.Tests/JsonDrivenTests/JsonDrivenAssertSessionDirtyTest.cs b/tests/MongoDB.Driver.Tests/JsonDrivenTests/JsonDrivenAssertSessionDirtyTest.cs
@@ -15,6 +15,7 @@
 
 using System.Collections.Generic;
 using System.Threading;
+using System.Threading.Tasks;
 using FluentAssertions;
 
 namespace MongoDB.Driver.Tests.JsonDrivenTests
@@ -31,7 +32,13 @@ public override void Act(CancellationToken cancellationToken)
             // do nothing
         }
 
-        public override void Assert()
+        public override Task ActAsync(CancellationToken cancellationToken)
+        {
+            // do nothing
+            return Task.FromResult(true);
+        }
+
+        protected override void AssertResult()
         {
             CoreSession.IsDirty.Should().BeTrue();
         }
diff --git a/tests/MongoDB.Driver.Tests/JsonDrivenTests/JsonDrivenAssertSessionNotDirtyTest.cs b/tests/MongoDB.Driver.Tests/JsonDrivenTests/JsonDrivenAssertSessionNotDirtyTest.cs
@@ -15,6 +15,7 @@
 
 using System.Collections.Generic;
 using System.Threading;
+using System.Threading.Tasks;
 using FluentAssertions;
 
 namespace MongoDB.Driver.Tests.JsonDrivenTests
@@ -31,7 +32,13 @@ public override void Act(CancellationToken cancellationToken)
             // do nothing
         }
 
-        public override void Assert()
+        public override Task ActAsync(CancellationToken cancellationToken)
+        {
+            // do nothing
+            return Task.FromResult(true);
+        }
+
+        protected override void AssertResult()
         {
             CoreSession.IsDirty.Should().BeFalse();
         }
diff --git a/tests/MongoDB.Driver.Tests/JsonDrivenTests/JsonDrivenAssertSessionPinnedTest.cs b/tests/MongoDB.Driver.Tests/JsonDrivenTests/JsonDrivenAssertSessionPinnedTest.cs
@@ -15,10 +15,8 @@
 
 using System.Collections.Generic;
 using System.Threading;
+using System.Threading.Tasks;
 using FluentAssertions;
-using MongoDB.Bson;
-using MongoDB.Driver.Core.Misc;
-using MongoDB.Driver.Core.TestHelpers;
 
 namespace MongoDB.Driver.Tests.JsonDrivenTests
 {
@@ -31,9 +29,16 @@ public JsonDrivenAssertSessionPinnedTest(IJsonDrivenTestRunner testRunner, Dicti
 
         public override void Act(CancellationToken cancellationToken)
         {
+            // do nothing
         }
 
-        public override void Assert()
+        public override Task ActAsync(CancellationToken cancellationToken)
+        {
+            // do nothing
+            return Task.FromResult(true);
+        }
+
+        protected override void AssertResult()
         {
             GetPinnedServer().Should().NotBeNull();
         }
diff --git a/tests/MongoDB.Driver.Tests/JsonDrivenTests/JsonDrivenAssertSessionTransactionStateTest.cs b/tests/MongoDB.Driver.Tests/JsonDrivenTests/JsonDrivenAssertSessionTransactionStateTest.cs
@@ -45,7 +45,7 @@ public override Task ActAsync(CancellationToken cancellationToken)
             return Task.FromResult(true);
         }
 
-        public override void Assert()
+        protected override void AssertResult()
         {
             CoreSession.CurrentTransaction.State.Should().Be(_state);
         }
diff --git a/tests/MongoDB.Driver.Tests/JsonDrivenTests/JsonDrivenAssertSessionUnpinnedTest.cs b/tests/MongoDB.Driver.Tests/JsonDrivenTests/JsonDrivenAssertSessionUnpinnedTest.cs
@@ -15,10 +15,8 @@
 
 using System.Collections.Generic;
 using System.Threading;
+using System.Threading.Tasks;
 using FluentAssertions;
-using MongoDB.Bson;
-using MongoDB.Driver.Core.Misc;
-using MongoDB.Driver.Core.TestHelpers;
 
 namespace MongoDB.Driver.Tests.JsonDrivenTests
 {
@@ -31,9 +29,16 @@ public JsonDrivenAssertSessionUnpinnedTest(IJsonDrivenTestRunner testRunner, Dic
 
         public override void Act(CancellationToken cancellationToken)
         {
+            // do nothing
         }
 
-        public override void Assert()
+        public override Task ActAsync(CancellationToken cancellationToken)
+        {
+            // do nothing
+            return Task.FromResult(true);
+        }
+
+        protected override void AssertResult()
         {
             GetPinnedServer().Should().BeNull();
         }
diff --git a/tests/MongoDB.Driver.Tests/JsonDrivenTests/JsonDrivenTargetedFailPoint.cs b/tests/MongoDB.Driver.Tests/JsonDrivenTests/JsonDrivenTargetedFailPoint.cs
@@ -13,16 +13,12 @@
 * limitations under the License.
 */
 
-using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using FluentAssertions;
 using MongoDB.Bson;
 using MongoDB.Driver.Core.Bindings;
-using MongoDB.Driver.Core.Misc;
-using MongoDB.Driver.Core.Servers;
-using MongoDB.Driver.Core.TestHelpers;
 
 namespace MongoDB.Driver.Tests.JsonDrivenTests
 {
@@ -50,8 +46,9 @@ protected override Task CallMethodAsync(CancellationToken cancellationToken)
             return TestRunner.ConfigureFailPointAsync(pinnedServer, NoCoreSession.NewHandle(), _failCommand);
         }
 
-        public override void Assert()
+        protected override void AssertResult()
         {
+            // do nothing
         }
 
         protected override void SetArgument(string name, BsonValue value)

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`
`16`	`16`	`using System.Collections.Generic;`
`17`	`17`	`using System.Threading;`
	`18`	`+using System.Threading.Tasks;`
`18`	`19`	`using FluentAssertions;`
`19`	`20`
`20`	`21`	`namespace MongoDB.Driver.Tests.JsonDrivenTests`
`@@ -31,7 +32,13 @@ public override void Act(CancellationToken cancellationToken)`
`31`	`32`	`// do nothing`
`32`	`33`	`}`
`33`	`34`
`34`		`- public override void Assert()`
	`35`	`+ public override Task ActAsync(CancellationToken cancellationToken)`
	`36`	`+ {`
	`37`	`+ // do nothing`
	`38`	`+ return Task.FromResult(true);`
	`39`	`+ }`
	`40`	`+`
	`41`	`+ protected override void AssertResult()`
`35`	`42`	`{`
`36`	`43`	`CoreSession.IsDirty.Should().BeTrue();`
`37`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,8 @@`
`15`	`15`
`16`	`16`	`using System.Collections.Generic;`
`17`	`17`	`using System.Threading;`
	`18`	`+using System.Threading.Tasks;`
`18`	`19`	`using FluentAssertions;`
`19`		`-using MongoDB.Bson;`
`20`		`-using MongoDB.Driver.Core.Misc;`
`21`		`-using MongoDB.Driver.Core.TestHelpers;`
`22`	`20`
`23`	`21`	`namespace MongoDB.Driver.Tests.JsonDrivenTests`
`24`	`22`	`{`
`@@ -31,9 +29,16 @@ public JsonDrivenAssertSessionPinnedTest(IJsonDrivenTestRunner testRunner, Dicti`
`31`	`29`
`32`	`30`	`public override void Act(CancellationToken cancellationToken)`
`33`	`31`	`{`
	`32`	`+ // do nothing`
`34`	`33`	`}`
`35`	`34`
`36`		`- public override void Assert()`
	`35`	`+ public override Task ActAsync(CancellationToken cancellationToken)`
	`36`	`+ {`
	`37`	`+ // do nothing`
	`38`	`+ return Task.FromResult(true);`
	`39`	`+ }`
	`40`	`+`
	`41`	`+ protected override void AssertResult()`
`37`	`42`	`{`
`38`	`43`	`GetPinnedServer().Should().NotBeNull();`
`39`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public override Task ActAsync(CancellationToken cancellationToken)`
`45`	`45`	`return Task.FromResult(true);`
`46`	`46`	`}`
`47`	`47`
`48`		`- public override void Assert()`
	`48`	`+ protected override void AssertResult()`
`49`	`49`	`{`
`50`	`50`	`CoreSession.CurrentTransaction.State.Should().Be(_state);`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,16 +13,12 @@`
`13`	`13`	`* limitations under the License.`
`14`	`14`	`*/`
`15`	`15`
`16`		`-using System;`
`17`	`16`	`using System.Collections.Generic;`
`18`	`17`	`using System.Threading;`
`19`	`18`	`using System.Threading.Tasks;`
`20`	`19`	`using FluentAssertions;`
`21`	`20`	`using MongoDB.Bson;`
`22`	`21`	`using MongoDB.Driver.Core.Bindings;`
`23`		`-using MongoDB.Driver.Core.Misc;`
`24`		`-using MongoDB.Driver.Core.Servers;`
`25`		`-using MongoDB.Driver.Core.TestHelpers;`
`26`	`22`
`27`	`23`	`namespace MongoDB.Driver.Tests.JsonDrivenTests`
`28`	`24`	`{`
`@@ -50,8 +46,9 @@ protected override Task CallMethodAsync(CancellationToken cancellationToken)`
`50`	`46`	`return TestRunner.ConfigureFailPointAsync(pinnedServer, NoCoreSession.NewHandle(), _failCommand);`
`51`	`47`	`}`
`52`	`48`
`53`		`- public override void Assert()`
	`49`	`+ protected override void AssertResult()`
`54`	`50`	`{`
	`51`	`+ // do nothing`
`55`	`52`	`}`
`56`	`53`
`57`	`54`	`protected override void SetArgument(string name, BsonValue value)`