Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/rx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAtsushi Eno <atsushieno@veritas-vos-liberabit.com>2012-11-21 11:47:28 +0400
committerAtsushi Eno <atsushieno@veritas-vos-liberabit.com>2012-11-21 11:47:28 +0400
commit5a5928b163e13a0d0366de2f899e7ce83ccca7e2 (patch)
tree725deb77d42d30d32cd8d33b6951d1714853019c
parent7c59a20c72adc9b4c7568ce0395fe33e0a4bf8ea (diff)
Add mobile-specific build condition.
-rw-r--r--Rx.NET/Tests.System.Reactive/DispatcherHelpers.cs3
-rw-r--r--Rx.NET/Tests.System.Reactive/Tests/DispatcherSchedulerTest.cs3
-rw-r--r--Rx.NET/Tests.System.Reactive/Tests/ObservableConcurrencyTest.cs11
-rw-r--r--Rx.NET/Tests.System.Reactive/Tests/QbservableExTest.cs2
-rw-r--r--Rx.NET/Tests.System.Reactive/Tests/QbservableTest.cs4
-rw-r--r--Rx.NET/Tests.System.Reactive/Tests/SchedulerTest.cs2
6 files changed, 23 insertions, 2 deletions
diff --git a/Rx.NET/Tests.System.Reactive/DispatcherHelpers.cs b/Rx.NET/Tests.System.Reactive/DispatcherHelpers.cs
index 2eefed5..79c236f 100644
--- a/Rx.NET/Tests.System.Reactive/DispatcherHelpers.cs
+++ b/Rx.NET/Tests.System.Reactive/DispatcherHelpers.cs
@@ -1,5 +1,6 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
+#if !NO_WINDOWS_THREADING
using System;
using System.Threading;
using System.Windows.Threading;
@@ -66,3 +67,5 @@ namespace ReactiveTests
}
}
}
+
+#endif
diff --git a/Rx.NET/Tests.System.Reactive/Tests/DispatcherSchedulerTest.cs b/Rx.NET/Tests.System.Reactive/Tests/DispatcherSchedulerTest.cs
index 231bfe2..18b0491 100644
--- a/Rx.NET/Tests.System.Reactive/Tests/DispatcherSchedulerTest.cs
+++ b/Rx.NET/Tests.System.Reactive/Tests/DispatcherSchedulerTest.cs
@@ -1,4 +1,5 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
+#if !NO_WINDOWS_THREADING
using System;
using System.Diagnostics;
@@ -265,3 +266,5 @@ namespace ReactiveTests.Tests
#endif
}
}
+
+#endif
diff --git a/Rx.NET/Tests.System.Reactive/Tests/ObservableConcurrencyTest.cs b/Rx.NET/Tests.System.Reactive/Tests/ObservableConcurrencyTest.cs
index da51467..16e7bf8 100644
--- a/Rx.NET/Tests.System.Reactive/Tests/ObservableConcurrencyTest.cs
+++ b/Rx.NET/Tests.System.Reactive/Tests/ObservableConcurrencyTest.cs
@@ -9,7 +9,9 @@ using System.Reactive.Disposables;
using System.Reactive.Linq;
using System.Reactive.Subjects;
using System.Threading;
+#if !NO_WINDOWS_THREADING
using System.Windows.Threading;
+#endif
using Microsoft.Reactive.Testing;
#if NUNIT
using NUnit.Framework;
@@ -49,6 +51,7 @@ namespace ReactiveTests.Tests
ReactiveAssert.Throws<ArgumentNullException>(() => ControlObservable.ObserveOn<int>(someObservable, default(Label)));
#endif
+#if !NO_WINDOWS_THREADING
#if USE_SL_DISPATCHER
ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ObserveOn<int>(default(IObservable<int>), new DispatcherScheduler(System.Windows.Deployment.Current.Dispatcher)));
#else
@@ -62,11 +65,11 @@ namespace ReactiveTests.Tests
ReactiveAssert.Throws<ArgumentNullException>(() => DispatcherObservable.ObserveOn<int>(default(IObservable<int>), Dispatcher.CurrentDispatcher));
#endif
ReactiveAssert.Throws<ArgumentNullException>(() => DispatcherObservable.ObserveOn<int>(someObservable, default(Dispatcher)));
-
ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ObserveOn<int>(default(IObservable<int>), new SynchronizationContext()));
ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ObserveOn<int>(someObservable, default(SynchronizationContext)));
ReactiveAssert.Throws<ArgumentNullException>(() => DispatcherObservable.ObserveOnDispatcher<int>(default(IObservable<int>)));
+#endif
}
#if HAS_WINFORMS
@@ -129,6 +132,7 @@ namespace ReactiveTests.Tests
}
#endif
+#if !NO_WINDOWS_THREADING
[TestMethod]
[Asynchronous]
public void ObserveOn_Dispatcher()
@@ -228,6 +232,7 @@ namespace ReactiveTests.Tests
}));
});
}
+#endif
#endregion
@@ -246,6 +251,7 @@ namespace ReactiveTests.Tests
ReactiveAssert.Throws<ArgumentNullException>(() => ControlObservable.SubscribeOn<int>(someObservable, default(Label)));
#endif
+#if !NO_WINDOWS_THREADING
#if USE_SL_DISPATCHER
ReactiveAssert.Throws<ArgumentNullException>(() => Observable.SubscribeOn<int>(default(IObservable<int>), new DispatcherScheduler(System.Windows.Deployment.Current.Dispatcher)));
#else
@@ -264,6 +270,7 @@ namespace ReactiveTests.Tests
ReactiveAssert.Throws<ArgumentNullException>(() => Observable.SubscribeOn<int>(someObservable, default(SynchronizationContext)));
ReactiveAssert.Throws<ArgumentNullException>(() => DispatcherObservable.SubscribeOnDispatcher<int>(default(IObservable<int>)));
+#endif
}
#if HAS_WINFORMS
@@ -332,6 +339,7 @@ namespace ReactiveTests.Tests
}
#endif
+#if !NO_WINDOWS_THREADING
[TestMethod]
[Asynchronous]
public void SubscribeOn_Dispatcher()
@@ -428,6 +436,7 @@ namespace ReactiveTests.Tests
}));
});
}
+#endif
#endregion
diff --git a/Rx.NET/Tests.System.Reactive/Tests/QbservableExTest.cs b/Rx.NET/Tests.System.Reactive/Tests/QbservableExTest.cs
index e5a27fc..6b9e42b 100644
--- a/Rx.NET/Tests.System.Reactive/Tests/QbservableExTest.cs
+++ b/Rx.NET/Tests.System.Reactive/Tests/QbservableExTest.cs
@@ -1,5 +1,6 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
+#if !NO_REFLECTION_EMIT
#if !SILVERLIGHTM7
using System;
@@ -77,4 +78,5 @@ namespace ReactiveTests.Tests
}
}
+#endif
#endif \ No newline at end of file
diff --git a/Rx.NET/Tests.System.Reactive/Tests/QbservableTest.cs b/Rx.NET/Tests.System.Reactive/Tests/QbservableTest.cs
index 6856afb..f08b024 100644
--- a/Rx.NET/Tests.System.Reactive/Tests/QbservableTest.cs
+++ b/Rx.NET/Tests.System.Reactive/Tests/QbservableTest.cs
@@ -1,5 +1,6 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
+#if !NO_REFLECTION_EMIT
#if !SILVERLIGHTM7
using System;
@@ -2118,4 +2119,5 @@ namespace ReactiveTests.Tests
}
}
-#endif \ No newline at end of file
+#endif
+#endif
diff --git a/Rx.NET/Tests.System.Reactive/Tests/SchedulerTest.cs b/Rx.NET/Tests.System.Reactive/Tests/SchedulerTest.cs
index 930ca9a..d49dd7c 100644
--- a/Rx.NET/Tests.System.Reactive/Tests/SchedulerTest.cs
+++ b/Rx.NET/Tests.System.Reactive/Tests/SchedulerTest.cs
@@ -57,9 +57,11 @@ namespace ReactiveTests.Tests
ReactiveAssert.Throws<ArgumentNullException>(() => Scheduler.CurrentThread.Schedule(default(Action)));
ReactiveAssert.Throws<ArgumentNullException>(() => Scheduler.CurrentThread.Schedule(TimeSpan.Zero, default(Action)));
ReactiveAssert.Throws<ArgumentNullException>(() => Scheduler.CurrentThread.Schedule(DateTimeOffset.MaxValue, default(Action)));
+#if !NO_WINDOWS_THREADING
ReactiveAssert.Throws<ArgumentNullException>(() => DispatcherScheduler.Instance.Schedule(default(Action)));
ReactiveAssert.Throws<ArgumentNullException>(() => DispatcherScheduler.Instance.Schedule(TimeSpan.Zero, default(Action)));
ReactiveAssert.Throws<ArgumentNullException>(() => DispatcherScheduler.Instance.Schedule(DateTimeOffset.MaxValue, default(Action)));
+#endif
ReactiveAssert.Throws<ArgumentNullException>(() => Scheduler.Immediate.Schedule(default(Action)));
ReactiveAssert.Throws<ArgumentNullException>(() => Scheduler.Immediate.Schedule(TimeSpan.Zero, default(Action)));
ReactiveAssert.Throws<ArgumentNullException>(() => Scheduler.Immediate.Schedule(DateTimeOffset.MaxValue, default(Action)));