Fixed tests.

timcassell · Nov 6, 2023 · e923270 · e923270
1 parent 966b309
commit e923270
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/Package/Tests/CoreTests/APIs/ParallelForTests.cs b/Package/Tests/CoreTests/APIs/ParallelForTests.cs
@@ -211,32 +211,35 @@ public void AllItemsEnumeratedOnce_WithCaptureValue_Sync(
             }
         }
 
-        private IEnumerable<int> IterateAndAssertContext(SynchronizationContext context)
+        private IEnumerable<int> IterateAndAssertContext(SynchronizationType expectedContext, Thread mainThread)
         {
-            Assert.AreEqual(context, SynchronizationContext.Current);
+            TestHelper.AssertCallbackContext(expectedContext, expectedContext, mainThread);
             for (int i = 1; i <= 100; i++)
             {
                 yield return i;
-                Assert.AreEqual(context, SynchronizationContext.Current);
+                TestHelper.AssertCallbackContext(expectedContext, expectedContext, mainThread);
             }
         }
 
         [Test]
         public void SynchronizationContext_AllCodeExecutedOnCorrectContext_Sync(
-            [Values] bool foregroundContext)
+            [Values(SynchronizationType.Foreground, SynchronizationType.Background)] SynchronizationType syncContext)
         {
-            SynchronizationContext context = foregroundContext ?
-                TestHelper._foregroundContext :
-                (SynchronizationContext) TestHelper._backgroundContext;
+            var mainThread = Thread.CurrentThread;
+            SynchronizationContext context = syncContext == SynchronizationType.Foreground
+                ? TestHelper._foregroundContext
+                : (SynchronizationContext) TestHelper._backgroundContext;
 
-            var otherContext = new PromiseSynchronizationContext();
+            var otherContext = syncContext == SynchronizationType.Foreground
+                ? (SynchronizationContext) TestHelper._backgroundContext
+                : TestHelper._foregroundContext;
 
             var cq = new Queue<int>();
             bool isComplete = false;
 
-            Promise.ParallelForEach(IterateAndAssertContext(context), (item, cancelationToken) =>
+            Promise.ParallelForEach(IterateAndAssertContext(syncContext, mainThread), (item, cancelationToken) =>
             {
-                Assert.AreEqual(context, SynchronizationContext.Current);
+                TestHelper.AssertCallbackContext(syncContext, syncContext, mainThread);
                 return Promise.SwitchToContext(context)
                     .Then(() =>
                     {
@@ -257,7 +260,6 @@ public void SynchronizationContext_AllCodeExecutedOnCorrectContext_Sync(
             if (!SpinWait.SpinUntil(() =>
             {
                 TestHelper.ExecuteForegroundCallbacks();
-                otherContext.Execute();
                 return isComplete;
             }, TimeSpan.FromSeconds(1)))
             {