nuclex-shared-dotnet/Nuclex.Support
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Removed UNITTEST constant from most files; tried switching to Moq, but encountered some InternalsVisibleTo() problems; ripped out NuGet again because it is so very bad

Browse source
This commit is contained in:
Markus Ewald 2024-07-24 17:42:17 +02:00 • committed by cygon
parent 8b011981d9
commit 090b1375c0
26 changed files with 31 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Tests/Collections/ConstantsTest.cs
View file

@ -17,8 +17,6 @@ limitations under the License.
*/
#endregion // Apache License 2.0
#if UNITTEST
using System;
using System.Collections.Specialized;
@ -48,5 +46,3 @@ namespace Nuclex.Support.Collections {
}
} // namespace Nuclex.Support.Collections
#endif // UNITTEST

4
Tests/Collections/DequeTest.cs
View file

@ -17,8 +17,6 @@ limitations under the License.
*/
#endregion // Apache License 2.0
#if UNITTEST
using System;
using System.Collections;
using System.Collections.Generic;
@ -706,5 +704,3 @@ namespace Nuclex.Support.Collections {
}
} // namespace Nuclex.Support.Collections
#endif // UNITTEST

4
Tests/Collections/IListExtensionsTest.cs
View file

@ -21,8 +21,6 @@ using System;
using System.Collections.Generic;
using System.IO;
#if UNITTEST
using NUnit.Framework;
namespace Nuclex.Support.Collections {
@ -132,5 +130,3 @@ namespace Nuclex.Support.Collections {
}
} // namespace Nuclex.Support.Collections
#endif // UNITTEST

4
Tests/Collections/ItemEventArgsTest.cs
View file

@ -17,8 +17,6 @@ limitations under the License.
*/
#endregion // Apache License 2.0
#if UNITTEST
using System;
using System.Collections.Generic;
@ -51,5 +49,3 @@ namespace Nuclex.Support.Collections {
}
} // namespace Nuclex.Support.Collections
#endif // UNITTEST

4
Tests/Collections/ItemReplaceEventArgsTest.cs
View file

@ -17,8 +17,6 @@ limitations under the License.
*/
#endregion // Apache License 2.0
#if UNITTEST
using System;
using System.Collections.Generic;
@ -53,5 +51,3 @@ namespace Nuclex.Support.Collections {
}
} // namespace Nuclex.Support.Collections
#endif // UNITTEST

4
Tests/Collections/ListSegmentTest.cs
View file

@ -21,8 +21,6 @@ using System;
using System.Collections.Generic;
using System.IO;
#if UNITTEST
using NUnit.Framework;
namespace Nuclex.Support.Collections {
@ -252,5 +250,3 @@ namespace Nuclex.Support.Collections {
}
} // namespace Nuclex.Support.Collections
#endif // UNITTEST

5
Tests/Collections/MultiDictionaryTest.cs
View file

@ -17,13 +17,10 @@ limitations under the License.
*/
#endregion // Apache License 2.0
#if UNITTEST
using System;
using System.Collections.Generic;
using NUnit.Framework;
using NMock;
namespace Nuclex.Support.Collections {
@ -386,5 +383,3 @@ namespace Nuclex.Support.Collections {
}
} // namespace Nuclex.Support.Collections
#endif // UNITTEST

35
Tests/Collections/ObservableCollectionTest.cs
View file

@ -17,16 +17,12 @@ limitations under the License.
*/
#endregion // Apache License 2.0
#if !NO_NMOCK
using System;
using System.Collections.Generic;
#if UNITTEST
using NUnit.Framework;
using NMock;
using Moq;
namespace Nuclex.Support.Collections {
/// <summary>Unit Test for the observable collection class</summary>
@ -65,35 +61,32 @@ namespace Nuclex.Support.Collections {
/// <summary>Initialization routine executed before each test is run</summary>
[SetUp]
public void Setup() {
this.mockery = new MockFactory();
this.mockedSubscriber = this.mockery.CreateMock<IObservableCollectionSubscriber>();
this.mockedSubscriber = new Mock<IObservableCollectionSubscriber>();
this.observedCollection = new ObservableCollection<int>();
this.observedCollection.Clearing += new EventHandler(
this.mockedSubscriber.MockObject.Clearing
this.mockedSubscriber.Object.Clearing
);
this.observedCollection.Cleared += new EventHandler(
this.mockedSubscriber.MockObject.Cleared
this.mockedSubscriber.Object.Cleared
);
this.observedCollection.ItemAdded += new EventHandler<ItemEventArgs<int>>(
this.mockedSubscriber.MockObject.ItemAdded
this.mockedSubscriber.Object.ItemAdded
);
this.observedCollection.ItemRemoved += new EventHandler<ItemEventArgs<int>>(
this.mockedSubscriber.MockObject.ItemRemoved
this.mockedSubscriber.Object.ItemRemoved
);
}
/// <summary>Tests whether the Clearing event is fired</summary>
[Test]
public void TestClearingEvent() {
this.mockedSubscriber.Expects.One.Method(m => m.Clearing(null, null)).WithAnyArguments();
this.mockedSubscriber.Expects.One.Method(m => m.Cleared(null, null)).WithAnyArguments();
this.observedCollection.Clear();
this.mockery.VerifyAllExpectationsHaveBeenMet();
this.mockedSubscriber.Verify(c => c.Clearing(null, null), Times.Once);
this.mockedSubscriber.Verify(c => c.Cleared(null, null), Times.Once);
}
/*
/// <summary>Tests whether the ItemAdded event is fired</summary>
[Test]
public void TestItemAddedEvent() {
@ -127,9 +120,7 @@ namespace Nuclex.Support.Collections {
CollectionAssert.AreEqual(integers, testCollection);
}
/// <summary>Mock object factory</summary>
private MockFactory mockery;
*/
/// <summary>The mocked observable collection subscriber</summary>
private Mock<IObservableCollectionSubscriber> mockedSubscriber;
/// <summary>An observable collection to which a mock will be subscribed</summary>
@ -138,7 +129,3 @@ namespace Nuclex.Support.Collections {
}
} // namespace Nuclex.Support.Collections
#endif // UNITTEST
#endif // !NO_NMOCK