From e8c21b91d46e0f0503fed6c32f4a625d514fc10b Mon Sep 17 00:00:00 2001 From: Markus Ewald Date: Mon, 21 Jul 2014 16:17:13 +0000 Subject: [PATCH] Allowed compilation and unit tests with the mono-3.5 profile and without NMock git-svn-id: file:///srv/devel/repo-conversion/nusu@311 d2e56fa2-650e-0410-a79f-9358c0239efd --- Nuclex.Support (mono-3.5).csproj | 13 +++++++++++-- Source/AffineThreadPool.Test.cs | 4 ++++ Source/Cloning/ExpressionTreeCloner.Test.cs | 4 ++++ Source/Collections/Constants.Test.cs | 4 ++++ Source/Collections/ObservableCollection.Test.cs | 4 ++++ Source/Collections/ObservableDictionary.Test.cs | 4 ++++ Source/Collections/ObservableList.Test.cs | 4 ++++ Source/Collections/ObservableSet.Test.cs | 4 ++++ Source/Collections/ReadOnlySet.Test.cs | 4 ++++ .../TransformingReadOnlyCollection.Test.cs | 4 ++++ Source/Collections/Variegator.Test.cs | 4 ++++ Source/ParallelBackgroundWorker.Test.cs | 4 ++++ 12 files changed, 55 insertions(+), 2 deletions(-) diff --git a/Nuclex.Support (mono-3.5).csproj b/Nuclex.Support (mono-3.5).csproj index 3a99642..9e806df 100644 --- a/Nuclex.Support (mono-3.5).csproj +++ b/Nuclex.Support (mono-3.5).csproj @@ -16,7 +16,7 @@ full false bin\mono-3.5\Debug\ - DEBUG;NO_SPECIALIZED_COLLECTIONS;NO_CONCURRENT_COLLECTIONS;NO_SETS + DEBUG;UNITTEST;NO_SPECIALIZED_COLLECTIONS;NO_CONCURRENT_COLLECTIONS;NO_SETS;NO_NMOCK prompt 4 false @@ -28,13 +28,22 @@ prompt 4 false - NO_SPECIALIZED_COLLECTIONS;NO_CONCURRENT_COLLECTIONS;NO_SETS + UNITTEST;NO_SPECIALIZED_COLLECTIONS;NO_CONCURRENT_COLLECTIONS;NO_SETS;NO_NMOCK + + + ..\References\nmock\mono-2.0\NMock.StrongNamed.dll + + + False + ..\References\nunit\net-2.0\framework\nunit.framework.dll + + diff --git a/Source/AffineThreadPool.Test.cs b/Source/AffineThreadPool.Test.cs index 2a11be7..3bf9b77 100644 --- a/Source/AffineThreadPool.Test.cs +++ b/Source/AffineThreadPool.Test.cs @@ -230,6 +230,8 @@ namespace Nuclex.Support { Assert.AreEqual(Environment.ProcessorCount, AffineThreadPool.MaxThreads); } +#if WINDOWS + /// /// Verifies that the ProcessThread instance for a system thread id can /// be determined using the GetProcessThread() method @@ -250,6 +252,8 @@ namespace Nuclex.Support { } } +#endif // WINDOWS + /// /// Tests whether the afine thread pool's default exception handler works /// as expected diff --git a/Source/Cloning/ExpressionTreeCloner.Test.cs b/Source/Cloning/ExpressionTreeCloner.Test.cs index 127da39..0a1d5b9 100644 --- a/Source/Cloning/ExpressionTreeCloner.Test.cs +++ b/Source/Cloning/ExpressionTreeCloner.Test.cs @@ -18,6 +18,8 @@ License along with this library */ #endregion +#if !NO_SETS + #if UNITTEST using System; @@ -220,3 +222,5 @@ namespace Nuclex.Support.Cloning { } // namespace Nuclex.Support.Cloning #endif // UNITTEST + +#endif // !NO_SETS diff --git a/Source/Collections/Constants.Test.cs b/Source/Collections/Constants.Test.cs index 23292d8..45627b9 100644 --- a/Source/Collections/Constants.Test.cs +++ b/Source/Collections/Constants.Test.cs @@ -31,6 +31,8 @@ namespace Nuclex.Support.Collections { [TestFixture] internal class ConstantsTest { +#if !NO_SPECIALIZED_COLLECTIONS + /// /// Verifies that the collection reset event arguments have 'reset' specified as /// their action @@ -42,6 +44,8 @@ namespace Nuclex.Support.Collections { ); } +#endif // !NO_SPECIALIZED_COLLECTIONS + } } // namespace Nuclex.Support.Collections diff --git a/Source/Collections/ObservableCollection.Test.cs b/Source/Collections/ObservableCollection.Test.cs index 6d31ef0..55007be 100644 --- a/Source/Collections/ObservableCollection.Test.cs +++ b/Source/Collections/ObservableCollection.Test.cs @@ -18,6 +18,8 @@ License along with this library */ #endregion +#if !NO_NMOCK + using System; using System.Collections.Generic; @@ -139,3 +141,5 @@ namespace Nuclex.Support.Collections { } // namespace Nuclex.Support.Collections #endif // UNITTEST + +#endif // !NO_NMOCK diff --git a/Source/Collections/ObservableDictionary.Test.cs b/Source/Collections/ObservableDictionary.Test.cs index afca228..31b80c2 100644 --- a/Source/Collections/ObservableDictionary.Test.cs +++ b/Source/Collections/ObservableDictionary.Test.cs @@ -18,6 +18,8 @@ License along with this library */ #endregion +#if !NO_NMOCK + #if UNITTEST using System; @@ -584,3 +586,5 @@ namespace Nuclex.Support.Collections { } // namespace Nuclex.Support.Collections #endif // UNITTEST + +#endif // !NO_NMOCK diff --git a/Source/Collections/ObservableList.Test.cs b/Source/Collections/ObservableList.Test.cs index 1f741ed..a274ab0 100644 --- a/Source/Collections/ObservableList.Test.cs +++ b/Source/Collections/ObservableList.Test.cs @@ -18,6 +18,8 @@ License along with this library */ #endregion +#if !NO_NMOCK + using System; using System.Collections.Generic; @@ -170,3 +172,5 @@ namespace Nuclex.Support.Collections { } // namespace Nuclex.Support.Collections #endif // UNITTEST + +#endif // !NO_NMOCK diff --git a/Source/Collections/ObservableSet.Test.cs b/Source/Collections/ObservableSet.Test.cs index 426b0e3..eb79c53 100644 --- a/Source/Collections/ObservableSet.Test.cs +++ b/Source/Collections/ObservableSet.Test.cs @@ -18,6 +18,8 @@ License along with this library */ #endregion +#if !NO_SETS + #if UNITTEST using System; @@ -295,3 +297,5 @@ namespace Nuclex.Support.Collections { } // namespace Nuclex.Support.Collections #endif // UNITTEST + +#endif // !NO_SETS diff --git a/Source/Collections/ReadOnlySet.Test.cs b/Source/Collections/ReadOnlySet.Test.cs index 73e9c0b..624db61 100644 --- a/Source/Collections/ReadOnlySet.Test.cs +++ b/Source/Collections/ReadOnlySet.Test.cs @@ -18,6 +18,8 @@ License along with this library */ #endregion +#if !NO_SETS + #if UNITTEST using System; @@ -202,3 +204,5 @@ namespace Nuclex.Support.Collections { } // namespace Nuclex.Support.Collections #endif // UNITTEST + +#endif // !NO_SETS diff --git a/Source/Collections/TransformingReadOnlyCollection.Test.cs b/Source/Collections/TransformingReadOnlyCollection.Test.cs index 68bcce2..4c50208 100644 --- a/Source/Collections/TransformingReadOnlyCollection.Test.cs +++ b/Source/Collections/TransformingReadOnlyCollection.Test.cs @@ -18,6 +18,8 @@ License along with this library */ #endregion +#if !NO_NMOCK + using System; using System.Collections; using System.Collections.Generic; @@ -495,3 +497,5 @@ namespace Nuclex.Support.Collections { } // namespace Nuclex.Support.Collections #endif // UNITTEST + +#endif // !NO_NMOCK diff --git a/Source/Collections/Variegator.Test.cs b/Source/Collections/Variegator.Test.cs index cf8df76..8eccedf 100644 --- a/Source/Collections/Variegator.Test.cs +++ b/Source/Collections/Variegator.Test.cs @@ -18,6 +18,8 @@ License along with this library */ #endregion +#if !NO_SETS + using System; using System.Collections.Generic; @@ -82,3 +84,5 @@ namespace Nuclex.Support.Collections { } // namespace Nuclex.Support.Collections #endif // UNITTEST + +#endif // !NO_SETS diff --git a/Source/ParallelBackgroundWorker.Test.cs b/Source/ParallelBackgroundWorker.Test.cs index a9007f1..beb5655 100644 --- a/Source/ParallelBackgroundWorker.Test.cs +++ b/Source/ParallelBackgroundWorker.Test.cs @@ -18,6 +18,8 @@ License along with this library */ #endregion +#if !NO_CONCURRENT_COLLECTIONS + using System; using System.Threading; using System.Collections.Generic; @@ -250,3 +252,5 @@ namespace Nuclex.Support { } // namespace Nuclex.Support #endif // UNITTEST + +#endif // !NO_CONCURRENT_COLLECTIONS