瀏覽代碼

Merge pull request #372 from Reactive-Extensions/RemoveRemainingSymbols

Removing a few conditional compilation symbols
Bart J.F. De Smet 8 年之前
父節點
當前提交
cef0b01c33

+ 0 - 6
Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/SynchronizationTest.cs

@@ -19,11 +19,8 @@ namespace ReactiveTests.Tests
         {
             ReactiveAssert.Throws<ArgumentNullException>(() => Synchronization.SubscribeOn(default(IObservable<int>), Scheduler.Immediate));
             ReactiveAssert.Throws<ArgumentNullException>(() => Synchronization.SubscribeOn(DummyObservable<int>.Instance, default(IScheduler)));
-
-#if !NO_SYNCCTX
             ReactiveAssert.Throws<ArgumentNullException>(() => Synchronization.SubscribeOn(default(IObservable<int>), new MySyncCtx()));
             ReactiveAssert.Throws<ArgumentNullException>(() => Synchronization.SubscribeOn(DummyObservable<int>.Instance, default(SynchronizationContext)));
-#endif
         }
 
         [Fact]
@@ -31,11 +28,8 @@ namespace ReactiveTests.Tests
         {
             ReactiveAssert.Throws<ArgumentNullException>(() => Synchronization.ObserveOn(default(IObservable<int>), Scheduler.Immediate));
             ReactiveAssert.Throws<ArgumentNullException>(() => Synchronization.ObserveOn(DummyObservable<int>.Instance, default(IScheduler)));
-
-#if !NO_SYNCCTX
             ReactiveAssert.Throws<ArgumentNullException>(() => Synchronization.ObserveOn(default(IObservable<int>), new MySyncCtx()));
             ReactiveAssert.Throws<ArgumentNullException>(() => Synchronization.ObserveOn(DummyObservable<int>.Instance, default(SynchronizationContext)));
-#endif
         }
 
         [Fact]

+ 0 - 6
Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/ObservableConcurrencyTest.cs

@@ -931,7 +931,6 @@ namespace ReactiveTests.Tests
         }
 #endif
 
-#if !NO_SYNCCTX
         [Fact]
         public void ObserveOn_SynchronizationContext_Simple()
         {
@@ -963,7 +962,6 @@ namespace ReactiveTests.Tests
                 Subscribe(200, 531)
             );
         }
-#endif
 
         #endregion
 
@@ -1067,7 +1065,6 @@ namespace ReactiveTests.Tests
             );
         }
 
-#if !NO_SYNCCTX
         [Fact]
         public void SubscribeOn_SynchronizationContext_Simple()
         {
@@ -1099,13 +1096,11 @@ namespace ReactiveTests.Tests
                 Subscribe(201, 531)
             );
         }
-#endif
 
         #endregion
 
         #region |> Helpers <|
 
-#if !NO_SYNCCTX
         class MyCtx : SynchronizationContext
         {
             private IScheduler scheduler;
@@ -1120,7 +1115,6 @@ namespace ReactiveTests.Tests
                 scheduler.Schedule(state, (self, s) => { d(s); return Disposable.Empty; });
             }
         }
-#endif
 
         #endregion
     }

+ 0 - 3
Rx.NET/Source/tests/Tests.System.Reactive/Tests/ObserverTest.cs

@@ -725,11 +725,8 @@ namespace ReactiveTests.Tests
         {
             ReactiveAssert.Throws<ArgumentNullException>(() => Observer.NotifyOn(default(IObserver<int>), Scheduler.Immediate));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observer.NotifyOn(new MyObserver(), default(IScheduler)));
-
-#if !NO_SYNCCTX
             ReactiveAssert.Throws<ArgumentNullException>(() => Observer.NotifyOn(default(IObserver<int>), new MySyncCtx()));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observer.NotifyOn(new MyObserver(), default(SynchronizationContext)));
-#endif
         }
 
 #if !NO_THREAD