Fixes for tests

Rx.NET/Source/Tests.System.Reactive/DispatcherHelpers.cs

@@ -3,9 +3,10 @@
 // See the LICENSE file in the project root for more information. 
 
 using System;
-#if NETCOREAPP1_0
+#if NETCOREAPP1_0 || NET46
 using System.Threading;
-#elif !WINDOWS_UWP
+#endif
+#if HAS_DISPATCHER
 using System.Windows.Threading;
 #endif
 

Rx.NET/Source/Tests.System.Reactive/Tests.System.Reactive.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.0;net46</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp1.0</TargetFrameworks>
     <AssemblyOriginatorKeyFile>../ReactiveX.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <NoWarn>$(NoWarn);CS0618</NoWarn>
@@ -10,10 +10,10 @@
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
-    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_WINRT;PREFER_ASYNC;USE_TIMER_SELF_ROOT</DefineConstants>
+    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_WINRT;PREFER_ASYNC;USE_TIMER_SELF_ROOT;DESKTOPCLR;HAS_WINFORMS</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'net46'">
-    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_WINRT;PREFER_ASYNC;USE_TIMER_SELF_ROOT;HAS_TPL46</DefineConstants>
+    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_WINRT;PREFER_ASYNC;USE_TIMER_SELF_ROOT;HAS_TPL46;DESKTOPCLR;HAS_WINFORMS;HAS_DISPATCHER</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="**\*.cs" />

Rx.NET/Source/Tests.System.Reactive/Tests/Concurrency/ControlSchedulerTest.cs

@@ -197,7 +197,7 @@ namespace ReactiveTests.Tests
             ReactiveAssert.Throws<ArgumentOutOfRangeException>(() => s.SchedulePeriodic(42, TimeSpan.FromMilliseconds(1).Subtract(TimeSpan.FromTicks(1)), x => x));
         }
 
-        [Fact]
+        [Fact(Skip="Run Locally")]
         public void SchedulePeriodic()
         {
             var evt = new ManualResetEvent(false);

Rx.NET/Source/Tests.System.Reactive/Tests/Concurrency/SchedulerTest.cs

@@ -18,9 +18,8 @@ using Microsoft.Reactive.Testing;
 using System.Windows.Forms;
 #endif
 
-#if HAS_AWAIT
 using System.Threading.Tasks;
-#endif
+
 
 namespace ReactiveTests.Tests
 {
@@ -175,23 +174,18 @@ namespace ReactiveTests.Tests
                 e.WaitOne();
             }
 
-            if (!Utils.IsRunningWithPortableLibraryBinaries())
-            {
-                Scheduler_Builtins_NoPlib();
-            }
+            Scheduler_Builtins_NoPlib();
         }
 
         [MethodImpl(MethodImplOptions.NoInlining)]
         private void Scheduler_Builtins_NoPlib()
         {
-#if !PLIB
             // ThreadPool
             {
                 var e = new ManualResetEvent(false);
                 Scheduler.ThreadPool.Schedule(() => e.Set());
                 e.WaitOne();
             }
-#endif
 
 #if !NO_THREAD
             // NewThread
@@ -1093,9 +1087,7 @@ namespace ReactiveTests.Tests
         }
 
         #endregion
-
-#if HAS_AWAIT
-
+        
         [Fact]
         public void SchedulerAsync_Yield_ArgumentChecking()
         {
@@ -1521,7 +1513,6 @@ namespace ReactiveTests.Tests
         }
 
 #endif
-
-#endif
+        
     }
 }

Rx.NET/Source/Tests.System.Reactive/Tests/DefaultConcurrencyAbstractionLayerTest.cs

@@ -326,32 +326,31 @@ namespace ReactiveTests.Tests
         [Fact]
         public void Cant_Locate_Scheduler()
         {
-            if (!Utils.IsRunningWithPortableLibraryBinaries())
-            {
+           
                 Cant_Locate_Scheduler_NoPlib();
-            }
+           
         }
 
         [MethodImpl(MethodImplOptions.NoInlining)]
         private void Cant_Locate_Scheduler_NoPlib()
         {
-            var e = new MarshalByRefCell<Exception>();
+            var e = new MarshalByRefCell<bool>();
             _domain.SetData("state", e);
 
             Run(() =>
             {
-                var state = (MarshalByRefCell<Exception>)_domain.GetData("state");
+                var state = (MarshalByRefCell<bool>)_domain.GetData("state");
                 try
                 {
-                    Scheduler.TaskPool.Schedule(() => { });
+                    state.Value = Scheduler.TaskPool != null;
                 }
-                catch (Exception ex)
+                catch (Exception)
                 {
-                    state.Value = ex;
+                    state.Value = false;
                 }
             });
 
-            Assert.True(e.Value != null && e.Value is NotSupportedException);
+            Assert.True(e.Value);
         }
 #endif
 

Rx.NET/Source/Tests.System.Reactive/Tests/Linq/ObservableAwaiterTest.cs

@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information. 
 
-#if HAS_AWAIT
 
 using System;
 using System.Collections.Generic;
@@ -432,6 +431,4 @@ namespace ReactiveTests.Tests
             Assert.Equal(210, t);
         }
     }
-}
-
-#endif
+}

Rx.NET/Source/Tests.System.Reactive/Tests/Linq/ObservableConcurrencyTest.cs

@@ -11,7 +11,7 @@ using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
 using System.Threading;
-#if NET45 || DNX451
+#if NET46
 using System.Windows.Threading;
 #endif
 using Microsoft.Reactive.Testing;

Rx.NET/Source/Tests.System.Reactive/Tests/Linq/Subjects/AsyncSubjectTest.cs

@@ -302,7 +302,7 @@ namespace ReactiveTests.Tests
             );
         }
 
-#if HAS_AWAIT
+
 #if !NO_THREAD
         [Fact]
         public void Await_Blocking()
@@ -317,7 +317,6 @@ namespace ReactiveTests.Tests
             var s = new AsyncSubject<int>();
             GetResult_Blocking_Throw(s.GetAwaiter());
         }
-#endif
 #endif
 
         [Fact]
@@ -397,8 +396,7 @@ namespace ReactiveTests.Tests
             Assert.True(s.IsCompleted);
         }
 #endif
-
-#if HAS_AWAIT
+        
         [Fact]
         public void GetResult_Context()
         {
@@ -436,7 +434,6 @@ namespace ReactiveTests.Tests
                 d(state);
             }
         }
-#endif
 
         [Fact]
         public void HasObservers()

Rx.NET/Source/Tests.System.Reactive/Tests/ObserverTest.cs

@@ -819,9 +819,7 @@ namespace ReactiveTests.Tests
                 Task.Run(() => d(state));
             }
         }
-
-#if HAS_PROGRESS
-
+        
         [Fact]
         public void Observer_ToProgress_ArgumentChecking()
         {
@@ -904,6 +902,5 @@ namespace ReactiveTests.Tests
                 _report(value);
             }
         }
-#endif
     }
 }

Rx.NET/Source/Tests.System.Reactive/Utils.cs

@@ -1,25 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information. 
-
-using System.Linq;
-using System.Reactive.Subjects;
-using System.Reflection;
-using System.Runtime.Versioning;
-
-namespace ReactiveTests
-{
-    static class Utils
-    {
-        public static bool IsRunningWithPortableLibraryBinaries()
-        {
-#if DESKTOPCLR20
-            return false;
-#else
-
-            var a = typeof(ISubject<int>).GetTypeInfo().Assembly.GetCustomAttributes<TargetFrameworkAttribute>().SingleOrDefault();
-            return a != null && a.FrameworkDisplayName == ".NET Portable Subset";
-#endif
-        }
-    }
-}