diff options
author | Atsushi Eno <atsushieno@veritas-vos-liberabit.com> | 2013-01-22 13:23:34 +0400 |
---|---|---|
committer | Atsushi Eno <atsushieno@veritas-vos-liberabit.com> | 2013-01-22 13:23:34 +0400 |
commit | 90d4a9bb46192becaa2397a386c0d17ccabd4f4d (patch) | |
tree | e45b431610a47f0bfeef5bf33f6a229b952ef04a /Rx/NET/Source | |
parent | 99d14bbf95bec76eedf11aebdbaebcd38f975089 (diff) |
apply mono changes as explained in README.md.
Diffstat (limited to 'Rx/NET/Source')
58 files changed, 401 insertions, 2 deletions
diff --git a/Rx/NET/Source/Tests.System.Reactive/App.cs b/Rx/NET/Source/Tests.System.Reactive/App.cs index 4ed3c16..7744eed 100644 --- a/Rx/NET/Source/Tests.System.Reactive/App.cs +++ b/Rx/NET/Source/Tests.System.Reactive/App.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. #if SILVERLIGHT && !SILVERLIGHTM7 using System; diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/AnonymousTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/AnonymousTest.cs index 6da61bb..7c6c110 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/AnonymousTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/AnonymousTest.cs @@ -1,7 +1,14 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif using Microsoft.Reactive.Testing; using System.Reactive; diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/AsyncLockTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/AsyncLockTest.cs index 6060dae..d3256e8 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/AsyncLockTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/AsyncLockTest.cs @@ -4,7 +4,14 @@ using System; using System.Reactive.Concurrency; using System.Reflection; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif namespace ReactiveTests.Tests { diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/ConcurrencyTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/ConcurrencyTest.cs index 9079d9c..74c67be 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/ConcurrencyTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/ConcurrencyTest.cs @@ -3,7 +3,14 @@ using System; using System.Reactive.Concurrency; using System.Threading; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif namespace ReactiveTests.Tests { diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/ControlSchedulerTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/ControlSchedulerTest.cs index 5a214fd..05b0724 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/ControlSchedulerTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/ControlSchedulerTest.cs @@ -8,7 +8,14 @@ using System.Reactive.Disposables; using System.Diagnostics; using System.Threading; using System.Windows.Forms; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif using Microsoft.Reactive.Testing; namespace ReactiveTests.Tests diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/CurrentThreadSchedulerTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/CurrentThreadSchedulerTest.cs index dbef946..86c9cdb 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/CurrentThreadSchedulerTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/CurrentThreadSchedulerTest.cs @@ -4,7 +4,14 @@ using System; using System.Diagnostics; using System.Reactive.Concurrency; using System.Threading; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif using Microsoft.Reactive.Testing; namespace ReactiveTests.Tests diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/DefaultSchedulerTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/DefaultSchedulerTest.cs index 13f6e8d..fd72fed 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/DefaultSchedulerTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/DefaultSchedulerTest.cs @@ -4,7 +4,14 @@ using System; using System.Reactive.Concurrency; using System.Diagnostics; using System.Threading; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif using Microsoft.Reactive.Testing; namespace ReactiveTests.Tests diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/DispatcherSchedulerTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/DispatcherSchedulerTest.cs index a64624a..1f6854e 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/DispatcherSchedulerTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/DispatcherSchedulerTest.cs @@ -7,7 +7,14 @@ using System.Reactive.Disposables; using System.Threading; using System.Windows.Threading; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif #if SILVERLIGHT && !SILVERLIGHTM7 using Microsoft.Silverlight.Testing; diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/EventLoopSchedulerTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/EventLoopSchedulerTest.cs index f5b06f6..a4bb03e 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/EventLoopSchedulerTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/EventLoopSchedulerTest.cs @@ -6,7 +6,14 @@ using System.Diagnostics; using System.Reactive.Concurrency; using System.Threading; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif namespace ReactiveTests.Tests { diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/HistoricalSchedulerTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/HistoricalSchedulerTest.cs index cd91f92..9e416d9 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/HistoricalSchedulerTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/HistoricalSchedulerTest.cs @@ -6,7 +6,14 @@ using System.Linq; using System.Reactive; using System.Reactive.Concurrency; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif namespace ReactiveTests.Tests { diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/ImmediateSchedulerTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/ImmediateSchedulerTest.cs index dd9510e..2fe1882 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/ImmediateSchedulerTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/ImmediateSchedulerTest.cs @@ -6,7 +6,14 @@ using System.Reactive.Concurrency; using System.Reactive.Disposables; using System.Threading; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif namespace ReactiveTests.Tests { diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/NewThreadSchedulerTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/NewThreadSchedulerTest.cs index 2d6efc6..3ffde63 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/NewThreadSchedulerTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/NewThreadSchedulerTest.cs @@ -6,7 +6,14 @@ using System.Reactive.Concurrency; using System.Reactive.Disposables; using System.Threading; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif namespace ReactiveTests.Tests { diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/ScheduledItemTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/ScheduledItemTest.cs index 835cd7f..a32ff7f 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/ScheduledItemTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/ScheduledItemTest.cs @@ -5,7 +5,14 @@ using System.Collections.Generic; using System.Reactive.Concurrency; using System.Reactive.Disposables; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif namespace ReactiveTests { diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/SchedulerTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/SchedulerTest.cs index 76f704e..0b72487 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/SchedulerTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/SchedulerTest.cs @@ -9,7 +9,14 @@ using System.Reactive.Linq; using System.Reactive.PlatformServices; using System.Runtime.CompilerServices; using System.Threading; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif using Microsoft.Reactive.Testing; #if HAS_WINFORMS diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/StopwatchTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/StopwatchTest.cs index 9fed695..09ccc06 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/StopwatchTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/StopwatchTest.cs @@ -4,7 +4,14 @@ using System; using System.Reactive.Concurrency; using System.Threading; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif namespace ReactiveTests.Tests { diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/SynchronizationContextSchedulerTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/SynchronizationContextSchedulerTest.cs index a043894..60ad4e4 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/SynchronizationContextSchedulerTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/SynchronizationContextSchedulerTest.cs @@ -6,7 +6,14 @@ using System.Reactive.Concurrency; using System.Reactive.Disposables; using System.Threading; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif namespace ReactiveTests.Tests { diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/SynchronizationTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/SynchronizationTest.cs index 4c0a04f..3604048 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/SynchronizationTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/SynchronizationTest.cs @@ -4,7 +4,14 @@ using System; using System.Reactive.Concurrency; using System.Threading; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif using ReactiveTests.Dummies; namespace ReactiveTests.Tests diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/TaskPoolSchedulerTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/TaskPoolSchedulerTest.cs index ba21aae..71b038e 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/TaskPoolSchedulerTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/TaskPoolSchedulerTest.cs @@ -5,7 +5,14 @@ using System; using System.Reactive.Concurrency; using System.Threading; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif namespace ReactiveTests.Tests { diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/ThreadPoolSchedulerTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/ThreadPoolSchedulerTest.cs index 3cd87f3..839a0c4 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/ThreadPoolSchedulerTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/ThreadPoolSchedulerTest.cs @@ -8,7 +8,14 @@ using System.Reactive.Concurrency; using System.Reactive.Disposables; using System.Threading; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif namespace ReactiveTests.Tests { diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/VirtualSchedulerTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/VirtualSchedulerTest.cs index ecb6267..753aea9 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/VirtualSchedulerTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/VirtualSchedulerTest.cs @@ -6,7 +6,14 @@ using System.Diagnostics; using System.Reactive.Concurrency; using System.Threading; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif namespace ReactiveTests.Tests { diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/ConnectableObservableTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/ConnectableObservableTest.cs index 0042c54..4ed38a2 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/ConnectableObservableTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/ConnectableObservableTest.cs @@ -5,7 +5,14 @@ using System.Reactive.Concurrency; using System.Reactive.Linq; using System.Reactive.Subjects; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif using ReactiveTests.Dummies; namespace ReactiveTests.Tests diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/DefaultConcurrencyAbstractionLayerTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/DefaultConcurrencyAbstractionLayerTest.cs index a818db4..bc49c54 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/DefaultConcurrencyAbstractionLayerTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/DefaultConcurrencyAbstractionLayerTest.cs @@ -7,7 +7,14 @@ using System.Reactive.Concurrency; using System.Reactive.PlatformServices; using System.Runtime.CompilerServices; using System.Threading; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif namespace ReactiveTests.Tests { diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Disposables/DisposableTests.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Disposables/DisposableTests.cs index e5728c4..1c8c8db 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Disposables/DisposableTests.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Disposables/DisposableTests.cs @@ -8,7 +8,14 @@ using System.Reactive.Concurrency; using System.Reactive.Disposables; using System.Threading; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif namespace ReactiveTests.Tests { diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/EventPatternSourceBaseTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/EventPatternSourceBaseTest.cs index 21add27..eaac1d8 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/EventPatternSourceBaseTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/EventPatternSourceBaseTest.cs @@ -4,7 +4,14 @@ using System; using System.Reactive; using System.Reactive.Linq; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif namespace ReactiveTests.Tests { diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableAggregateTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableAggregateTest.cs index 75c41cc..c69501e 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableAggregateTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableAggregateTest.cs @@ -7,7 +7,14 @@ using System.Reactive; using System.Reactive.Concurrency; using System.Reactive.Linq; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif using ReactiveTests.Dummies; namespace ReactiveTests.Tests diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableAsyncTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableAsyncTest.cs index 2fd0590..be19f56 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableAsyncTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableAsyncTest.cs @@ -7,7 +7,14 @@ using System.Reactive.Concurrency; using System.Reactive.Linq; using System.Threading; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif #if !NO_TPL using System.Threading.Tasks; diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableAwaiterTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableAwaiterTest.cs index 346e345..10f5f00 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableAwaiterTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableAwaiterTest.cs @@ -9,7 +9,14 @@ using System.Reactive.Concurrency; using System.Reactive.Linq; using System.Reactive.Subjects; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif using ReactiveTests.Dummies; namespace ReactiveTests.Tests diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableBindingTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableBindingTest.cs index 1ee59b9..537ca6f 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableBindingTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableBindingTest.cs @@ -7,7 +7,14 @@ using System.Reactive.Disposables; using System.Reactive.Linq; using System.Reactive.Subjects; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif using ReactiveTests.Dummies; namespace ReactiveTests.Tests diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableBlockingTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableBlockingTest.cs index 48705db..7317509 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableBlockingTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableBlockingTest.cs @@ -9,7 +9,14 @@ using System.Reactive.Disposables; using System.Reactive.Linq; using System.Threading; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif using ReactiveTests.Dummies; #if !NO_TPL diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableConcurrencyTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableConcurrencyTest.cs index e8f04ad..234661a 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableConcurrencyTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableConcurrencyTest.cs @@ -11,7 +11,14 @@ using System.Reactive.Subjects; using System.Threading; using System.Windows.Threading; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif using ReactiveTests.Dummies; #if HAS_WINFORMS diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableConversionTests.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableConversionTests.cs index c29d07a..7db0bb3 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableConversionTests.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableConversionTests.cs @@ -11,7 +11,14 @@ using System.Reactive.Subjects; using System.Reflection; using System.Threading; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif using ReactiveTests.Dummies; namespace ReactiveTests.Tests diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableCreationTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableCreationTest.cs index e9f31ab..5ec8791 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableCreationTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableCreationTest.cs @@ -12,7 +12,14 @@ using System.Reactive.Linq; using System.Reflection; using System.Threading; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif using ReactiveTests.Dummies; #if !NO_TPL diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableEventsTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableEventsTest.cs index 0688f87..246861e 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableEventsTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableEventsTest.cs @@ -11,7 +11,14 @@ using System.Reactive.Linq; using System.Reflection; using System.Threading; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif namespace ReactiveTests.Tests { diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableExTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableExTest.cs index ddcc8c6..7330b18 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableExTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableExTest.cs @@ -7,7 +7,14 @@ using System.Reactive; using System.Reactive.Concurrency; using System.Reactive.Linq; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif using ReactiveTests.Dummies; namespace ReactiveTests.Tests diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableExtensionsTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableExtensionsTest.cs index c0c7abf..afb9082 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableExtensionsTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableExtensionsTest.cs @@ -6,7 +6,14 @@ using System.Reactive.Concurrency; using System.Reactive.Linq; using System.Threading; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif using System.Collections.Generic; namespace ReactiveTests.Tests diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableImperativeTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableImperativeTest.cs index 00f03c8..2084617 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableImperativeTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableImperativeTest.cs @@ -8,7 +8,14 @@ using System.Reactive.Disposables; using System.Reactive.Linq; using System.Threading; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif using ReactiveTests.Dummies; #if !NO_TPL diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableJoinsTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableJoinsTest.cs index 59c505c..9da81bc 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableJoinsTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableJoinsTest.cs @@ -5,7 +5,14 @@ using System.Collections.Generic; using System.Reactive.Joins; using System.Reactive.Linq; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif namespace ReactiveTests.Tests { diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableMultipleTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableMultipleTest.cs index 7e6003f..a91c744 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableMultipleTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableMultipleTest.cs @@ -10,7 +10,14 @@ using System.Reactive.Linq; using System.Threading; using System.Reactive.Subjects; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif using ReactiveTests.Dummies; #if !NO_TPL diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableRemotingTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableRemotingTest.cs index abeb921..2848810 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableRemotingTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableRemotingTest.cs @@ -8,7 +8,14 @@ using System.Reflection; using System.Runtime.Remoting.Lifetime; using System.Threading; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif namespace ReactiveTests.Tests { diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableSafetyTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableSafetyTest.cs index c7d67a4..48e834a 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableSafetyTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableSafetyTest.cs @@ -6,7 +6,14 @@ using System.Reactive.Concurrency; using System.Reactive.Linq; using System.Threading; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif namespace ReactiveTests.Tests { diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableSingleTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableSingleTest.cs index 7361fed..673134f 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableSingleTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableSingleTest.cs @@ -7,7 +7,14 @@ using System.Reactive; using System.Reactive.Concurrency; using System.Reactive.Linq; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif using ReactiveTests.Dummies; namespace ReactiveTests.Tests diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableStandardQueryOperatorTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableStandardQueryOperatorTest.cs index e006bc1..1a88b60 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableStandardQueryOperatorTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableStandardQueryOperatorTest.cs @@ -10,7 +10,14 @@ using System.Reactive.Linq; using System.Reactive.Subjects; using System.Text; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif using ReactiveTests.Dummies; #if !NO_TPL diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableTimeTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableTimeTest.cs index 45be1df..70a15bc 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableTimeTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableTimeTest.cs @@ -11,7 +11,14 @@ using System.Reactive.Subjects; using System.Text; using System.Threading; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif using ReactiveTests.Dummies; namespace ReactiveTests.Tests diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/QbservableExTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/QbservableExTest.cs index e8caa9a..951f94b 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/QbservableExTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/QbservableExTest.cs @@ -8,7 +8,14 @@ using System.Linq; using System.Linq.Expressions; using System.Reactive.Linq; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif namespace ReactiveTests.Tests { diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/QbservableTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/QbservableTest.cs index 63a9aa9..39ddae6 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/QbservableTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/QbservableTest.cs @@ -14,7 +14,14 @@ using System.Reactive.Subjects; using System.Reflection; using System.Runtime.CompilerServices; using System.Threading; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif using Microsoft.Reactive.Testing; namespace ReactiveTests.Tests diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/Subjects/AsyncSubjectTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/Subjects/AsyncSubjectTest.cs index 0215afc..200ed0a 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/Subjects/AsyncSubjectTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/Subjects/AsyncSubjectTest.cs @@ -5,7 +5,14 @@ using System.Reactive.Concurrency; using System.Reactive.Subjects; using System.Threading; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif namespace ReactiveTests.Tests { diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/Subjects/BehaviorSubjectTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/Subjects/BehaviorSubjectTest.cs index 4e4deaf..3fd5f95 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/Subjects/BehaviorSubjectTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/Subjects/BehaviorSubjectTest.cs @@ -4,7 +4,14 @@ using System; using System.Reactive.Concurrency; using System.Reactive.Subjects; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif namespace ReactiveTests.Tests { diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/Subjects/ReplaySubjectTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/Subjects/ReplaySubjectTest.cs index 2115927..6c9498a 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/Subjects/ReplaySubjectTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/Subjects/ReplaySubjectTest.cs @@ -4,7 +4,14 @@ using System; using System.Reactive.Concurrency; using System.Reactive.Subjects; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif using ReactiveTests.Dummies; namespace ReactiveTests.Tests diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/Subjects/SubjectTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/Subjects/SubjectTest.cs index f00b97e..bdc5519 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/Subjects/SubjectTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/Subjects/SubjectTest.cs @@ -8,7 +8,14 @@ using System.Reactive.Linq; using System.Reactive.Subjects; using System.Threading; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif namespace ReactiveTests.Tests { diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/ListObservableTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/ListObservableTest.cs index 4dd8d5d..25d86d6 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/ListObservableTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/ListObservableTest.cs @@ -7,7 +7,14 @@ using System.Reactive; using System.Reactive.Concurrency; using System.Reactive.Linq; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif namespace ReactiveTests.Tests { diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/NotificationTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/NotificationTest.cs index c05ce0b..42af17d 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/NotificationTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/NotificationTest.cs @@ -4,7 +4,14 @@ using System; using System.Reactive; using System.Threading; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif namespace ReactiveTests.Tests { diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/ObserverTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/ObserverTest.cs index bdf9be1..2df750e 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/ObserverTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/ObserverTest.cs @@ -7,7 +7,14 @@ using System.Reactive; using System.Reactive.Concurrency; using System.Threading; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif namespace ReactiveTests.Tests { diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/PrivateTypesTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/PrivateTypesTest.cs index 9332e24..d9529cf 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/PrivateTypesTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/PrivateTypesTest.cs @@ -3,7 +3,14 @@ #if !SILVERLIGHT // Reflection security restrictions using System; using System.Linq; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif using Microsoft.Reactive.Testing; using System.Reactive.Linq; diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/RegressionTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/RegressionTest.cs index 18074ec..f9165e4 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/RegressionTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/RegressionTest.cs @@ -9,7 +9,14 @@ using System.Reactive.Linq; using System.Reactive.Subjects; using System.Threading; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif namespace ReactiveTests.Tests { @@ -145,7 +152,7 @@ namespace ReactiveTests.Tests } [TestMethod] - [Timeout(1000)] + //[Timeout(1000)] public void Bug_1333() { var sema = new Semaphore(0, 1); diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/SystemClockTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/SystemClockTest.cs index 5f35383..02c5492 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/SystemClockTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/SystemClockTest.cs @@ -7,7 +7,14 @@ using System.Reactive; using System.Reactive.Concurrency; using System.Reactive.Disposables; using System.Reactive.PlatformServices; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif namespace ReactiveTests.Tests { diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/TaskObservableExtensionsTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/TaskObservableExtensionsTest.cs index 229576b..298a5a4 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/TaskObservableExtensionsTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/TaskObservableExtensionsTest.cs @@ -10,7 +10,14 @@ using System.Reactive.Threading.Tasks; using System.Threading; using System.Threading.Tasks; using Microsoft.Reactive.Testing; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif namespace ReactiveTests.Tests { diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/TimeTests.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/TimeTests.cs index e08f7f2..832d313 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/TimeTests.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/TimeTests.cs @@ -2,7 +2,14 @@ using System; using System.Reactive; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif namespace ReactiveTests.Tests { diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/UnitTest.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/UnitTest.cs index d5ea8a1..4a3a67c 100644 --- a/Rx/NET/Source/Tests.System.Reactive/Tests/UnitTest.cs +++ b/Rx/NET/Source/Tests.System.Reactive/Tests/UnitTest.cs @@ -1,7 +1,14 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System.Reactive; +#if NUNIT +using NUnit.Framework; +using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; +using TestMethodAttribute = NUnit.Framework.TestAttribute; +using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; +#else using Microsoft.VisualStudio.TestTools.UnitTesting; +#endif namespace ReactiveTests.Tests { |