Browse Source

Make it build!

Oren Novotny 9 years ago
parent
commit
c5119405d7

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

@@ -7338,7 +7338,7 @@ namespace ReactiveTests.Tests
                 xss.Merge(scheduler)
             );
 
-            Assert.Equal(resOnNext.Count + 1, res.Messages.Count, "length");
+            Assert.True(resOnNext.Count + 1 == res.Messages.Count, "length");
             for (int i = 0; i < resOnNext.Count; i++)
             {
                 var msg = res.Messages[i];
@@ -13651,7 +13651,7 @@ namespace ReactiveTests.Tests
                 o1.Zip(o2, (x, y) => x + y)
             );
 
-            Assert.Equal(len, res.Messages.Count, "length");
+            Assert.True(len == res.Messages.Count, "length");
             for (int i = 0; i < len; i++)
             {
                 var sum = msgs1[i].Value.Value + msgs2[i].Value.Value;
@@ -13680,7 +13680,7 @@ namespace ReactiveTests.Tests
                 o1.Zip(o2, (x, y) => x + y)
             );
 
-            Assert.Equal(len, res.Messages.Count, "length");
+            Assert.True(len == res.Messages.Count, "length");
             for (int i = 0; i < len; i++)
             {
                 var sum = msgs1[i].Value.Value + msgs2[i].Value.Value;
@@ -13709,7 +13709,7 @@ namespace ReactiveTests.Tests
                 o1.Zip(o2, (x, y) => x + y)
             );
 
-            Assert.Equal(len, res.Messages.Count, "length");
+            Assert.True(len == res.Messages.Count, "length");
             for (int i = 0; i < len; i++)
             {
                 var sum = msgs1[i].Value.Value + msgs2[i].Value.Value;

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

@@ -1864,13 +1864,14 @@ namespace ReactiveTests.Tests
             Assert.Equal("***", res2);
         }
 
+#if !CRIPPLED_REFLECTION
         [Fact]
         public void Qbservable_Extensibility_Constructor()
         {
             var res1 = Qbservable.Provider.Qux(42).AsObservable().Single();
             Assert.Equal(42, res1);
         }
-
+        
         [Fact]
         public void Qbservable_Extensibility_Missing()
         {
@@ -1885,6 +1886,7 @@ namespace ReactiveTests.Tests
 
             Assert.True(false);
         }
+#endif
 
         [Fact]
         public void Qbservable_HigherOrder()

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

@@ -814,7 +814,7 @@ namespace ReactiveTests.Tests
         {
             public override void Post(SendOrPostCallback d, object state)
             {
-                Task.Run(_ => d(state), state);
+                Task.Run(() => d(state));
             }
         }
 

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

@@ -149,7 +149,7 @@ namespace ReactiveTests.Tests
 #endif
 #if !NO_THREAD
         [Fact]
-        [Timeout(1000)]
+        //[Timeout(1000)]
         public void Bug_1333()
         {
             var sema = new Semaphore(0, 1);

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

@@ -15,7 +15,7 @@ namespace ReactiveTests
             return false;
 #else
 
-            var a = typeof(ISubject<int>).GetTypeInfo().Assembly.GetCustomAttributes(typeof(TargetFrameworkAttribute), false).Cast<TargetFrameworkAttribute>().SingleOrDefault();
+            var a = typeof(ISubject<int>).GetTypeInfo().Assembly.GetCustomAttributes<TargetFrameworkAttribute>().SingleOrDefault();
             return a != null && a.FrameworkDisplayName == ".NET Portable Subset";
 #endif
         }