stricter

Author: Alex Peck

BitFaster.Caching.UnitTests/Atomic/AtomicFactoryTests.cs

@@ -119,7 +119,9 @@ public void WhenArgObjectValuesAreSameEqualsTrue()
         [Fact]
         public async Task WhenCallersRunConcurrentlyResultIsFromWinner()
         {
-            var enter = new ManualResetEvent(false);
+            var enter1 = new ManualResetEvent(false);
+            var enter2 = new ManualResetEvent(false);
+            var factory = new ManualResetEvent(false);
             var resume = new ManualResetEvent(false);
 
             var atomicFactory = new AtomicFactory<int, int>();
@@ -128,9 +130,10 @@ public async Task WhenCallersRunConcurrentlyResultIsFromWinner()
 
             Task<int> first = Task.Run(() =>
             {
+                enter1.Set();
                 return atomicFactory.GetValue(1, k =>
                 {
-                    enter.Set();
+                    factory.Set();
                     resume.WaitOne();
 
                     result = 1;
@@ -141,9 +144,10 @@ public async Task WhenCallersRunConcurrentlyResultIsFromWinner()
 
             Task<int> second = Task.Run(() =>
             {
+                enter2.Set();
                 return atomicFactory.GetValue(1, k =>
                 {
-                    enter.Set();
+                    factory.Set();
                     resume.WaitOne();
 
                     result = 2;
@@ -152,7 +156,9 @@ public async Task WhenCallersRunConcurrentlyResultIsFromWinner()
                 });
             });
 
-            enter.WaitOne();
+            enter1.WaitOne();
+            enter2.WaitOne();
+            factory.WaitOne();
             resume.Set();
 
             (await first).Should().Be(result);
@@ -164,17 +170,20 @@ public async Task WhenCallersRunConcurrentlyResultIsFromWinner()
         [Fact]
         public async Task WhenCallersRunConcurrentlyAndFailExceptionIsPropogated()
         {
-            var enter = new ManualResetEvent(false);
+            var enter1 = new ManualResetEvent(false);
+            var enter2 = new ManualResetEvent(false);
+            var factory = new ManualResetEvent(false);
             var resume = new ManualResetEvent(false);
 
             var atomicFactory = new AtomicFactory<int, int>();
             var throwCount = 0;
 
             Task<int> first = Task.Run(() =>
             {
+                enter1.Set();
                 return atomicFactory.GetValue(1, k =>
                 {
-                    enter.Set();
+                    factory.Set();
                     resume.WaitOne();
 
                     Interlocked.Increment(ref throwCount);
@@ -184,17 +193,20 @@ public async Task WhenCallersRunConcurrentlyAndFailExceptionIsPropogated()
 
             Task<int> second = Task.Run(() =>
             {
+                enter2.Set();
                 return atomicFactory.GetValue(1, k =>
                 {
-                    enter.Set();
+                    factory.Set();
                     resume.WaitOne();
 
                     Interlocked.Increment(ref throwCount);
                     throw new Exception();
                 });
             });
 
-            enter.WaitOne();
+            enter1.WaitOne();
+            enter2.WaitOne();
+            factory.WaitOne();
             resume.Set();
 
             Func<Task> act1 = () => first;
@@ -210,32 +222,38 @@ public async Task WhenCallersRunConcurrentlyAndFailExceptionIsPropogated()
         [Fact]
         public async Task WhenCallersRunConcurrentlyAndFailNewCallerStartsClean()
         {
-            var enter = new ManualResetEvent(false);
+            var enter1 = new ManualResetEvent(false);
+            var enter2 = new ManualResetEvent(false);
+            var factory = new ManualResetEvent(false);
             var resume = new ManualResetEvent(false);
 
             var atomicFactory = new AtomicFactory<int, int>();
 
             Task<int> first = Task.Run(() =>
             {
+                enter1.Set();
                 return atomicFactory.GetValue(1, k =>
                 {
-                    enter.Set();
+                    factory.Set();
                     resume.WaitOne();
                     throw new Exception();
                 });
             });
 
             Task<int> second = Task.Run(() =>
             {
+                enter2.Set();
                 return atomicFactory.GetValue(1, k =>
                 {
-                    enter.Set();
+                    factory.Set();
                     resume.WaitOne();
                     throw new Exception();
                 });
             });
 
-            enter.WaitOne();
+            enter1.WaitOne();
+            enter2.WaitOne();
+            factory.WaitOne();
             resume.Set();
 
             Func<Task> act1 = () => first;