浏览代码

Enable additional tests

Oren Novotny 9 年之前
父节点
当前提交
1cb650beab

+ 2 - 1
Rx.NET/Source/Tests.System.Reactive/Tests/Linq/ObservableAggregateTest.cs

@@ -9,6 +9,7 @@ using System.Reactive.Linq;
 using Microsoft.Reactive.Testing;
 using Xunit;
 using ReactiveTests.Dummies;
+using System.Reflection;
 
 namespace ReactiveTests.Tests
 {
@@ -2457,7 +2458,7 @@ namespace ReactiveTests.Tests
             ReactiveAssert.Throws<OverflowException>(() => res.ForEach(_ => { }));
         }
 #endif
-#if !CRIPPLED_REFLECTION
+#if !CRIPPLED_REFLECTION || NETCOREAPP1_0
         class OverflowInjection<T> : IObservable<T>
         {
             private readonly IObservable<T> _source;

+ 2 - 2
Rx.NET/Source/Tests.System.Reactive/Tests/Linq/ObservableImperativeTest.cs

@@ -514,11 +514,11 @@ namespace ReactiveTests.Tests
 
             var s = Scheduler.Default.Catch<Exception>(err =>
             {
-                Thread.VolatileWrite(ref hasCaughtEscapingException, 1);
+                Volatile.Write(ref hasCaughtEscapingException, 1);
                 return ex == err;
             });
 
-            while (Thread.VolatileRead(ref hasCaughtEscapingException) == 0)
+            while (Volatile.Read(ref hasCaughtEscapingException) == 0)
             {
                 var xs = Observable.Create<int>(observer =>
                 {

+ 1 - 1
Rx.NET/Source/Tests.System.Reactive/Tests/Linq/ObservableMultipleTest.cs

@@ -6621,7 +6621,7 @@ namespace ReactiveTests.Tests
             res.Messages.AssertEqual(expected);
         }
 
-#if !NO_THREAD
+#if !NO_THREAD && !NETCOREAPP1_0
         [Fact]
         public void Concat_TailRecursive2()
         {

+ 1 - 1
Rx.NET/Source/Tests.System.Reactive/Tests/SystemClockTest.cs

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
-#if !NO_REMOTING
+#if !NO_REMOTING && !XUNIT
 using System;
 using System.Collections.Generic;
 using System.Reactive;

+ 7 - 8
Rx.NET/Source/Tests.System.Reactive/project.json

@@ -40,7 +40,9 @@
     "System.Reactive.Providers": { "target": "project" },
     "System.Reactive.Observable.Aliases": { "target": "project" },
     "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-build10025"
+    "dotnet-test-xunit": "1.0.0-rc2-build10025",
+    "System.Reflection.TypeExtensions": "4.1.0-rc2-24027",
+    "System.Diagnostics.StackTrace": "4.0.1-rc2-24027"
   },
   "testRunner": "xunit",
   "frameworks": {
@@ -57,10 +59,10 @@
           "HAS_APTCA",
           "NO_REMOTING",
           "NO_SERIALIZABLE",
-          "NO_THREAD",
           "CRIPPLED_REFLECTION",
           "PLIB",
-          "USE_TIMER_SELF_ROOT"
+          "USE_TIMER_SELF_ROOT",
+          "XUNIT"
         ]
       },
       "dependencies": {
@@ -80,13 +82,10 @@
           "PREFER_ASYNC",
           "HAS_AWAIT",
           "HAS_APTCA",
-          "NO_REMOTING",
-          "NO_SERIALIZABLE",
-          "NO_THREAD",
-          "CRIPPLED_REFLECTION",
           "USE_TIMER_SELF_ROOT",
           "DESKTOPCLR",
-          "DESKTOPCLR46"
+          "DESKTOPCLR46",
+          "XUNIT"
         ]
       },
       "dependencies": {