From dd658b2b8385d090985838793f41ec0b8930f89d Mon Sep 17 00:00:00 2001 From: Simon G Date: Wed, 17 Apr 2024 12:00:15 +0200 Subject: [PATCH] - adapt to nunit changes --- .../IocValidatorTest.cs | 14 ++--- .../ActionExtensionTest.cs | 5 +- .../EnumerableExtensionTest.cs | 12 ++-- .../FluentFactoryRegistrationTest.cs | 54 ++++++++-------- .../IgnoreConstructorAttributeTest.cs | 2 +- .../IocContainerInterfaceSegregationTest.cs | 63 +++++++++---------- .../IocContainerParameterRegistrationTest.cs | 26 ++++---- .../IocContainerRecursionTest.cs | 8 +-- .../IocContainerTest.cs | 48 +++++++------- .../MultiLayerResolveTest.cs | 6 +- .../MultipleMultitonRegistrationTest.cs | 28 ++++----- .../OpenGenericRegistrationTest.cs | 13 ++-- .../RegistrationBaseTest.cs | 12 ++-- .../SingleTypeRegistrationTest.cs | 6 +- 14 files changed, 146 insertions(+), 151 deletions(-) diff --git a/Test.LightweightIocContainer.Validation/IocValidatorTest.cs b/Test.LightweightIocContainer.Validation/IocValidatorTest.cs index 98ca6c8..65460cc 100644 --- a/Test.LightweightIocContainer.Validation/IocValidatorTest.cs +++ b/Test.LightweightIocContainer.Validation/IocValidatorTest.cs @@ -221,8 +221,8 @@ public class IocValidatorTest Assert.Fail($"First element of {nameof(noMatchingConstructorFoundException.InnerExceptions)} is not of type {nameof(ConstructorNotMatchingException)}."); return; } - - Assert.IsInstanceOf(iTest2CtorNotMatchingException.InnerExceptions[0]); + + Assert.That(iTest2CtorNotMatchingException.InnerExceptions[0], Is.InstanceOf()); } [Test] @@ -246,8 +246,8 @@ public class IocValidatorTest Assert.Fail($"First element of {nameof(noMatchingConstructorFoundException.InnerExceptions)} is not of type {nameof(ConstructorNotMatchingException)}."); return; } - - Assert.IsInstanceOf(iTest2CtorNotMatchingException.InnerExceptions[0]); + + Assert.That(iTest2CtorNotMatchingException.InnerExceptions[0], Is.InstanceOf()); } [Test] @@ -271,8 +271,8 @@ public class IocValidatorTest Assert.Fail($"First element of {nameof(noMatchingConstructorFoundException.InnerExceptions)} is not of type {nameof(ConstructorNotMatchingException)}."); return; } - - Assert.IsInstanceOf(iTest2CtorNotMatchingException.InnerExceptions[0]); + + Assert.That(iTest2CtorNotMatchingException.InnerExceptions[0], Is.InstanceOf()); } [Test] @@ -302,7 +302,7 @@ public class IocValidatorTest { Exception exception = aggregateException?.InnerExceptions[0]; if (exception is NoMatchingConstructorFoundException noMatchingConstructorFoundException) - Assert.AreEqual(typeof(T), noMatchingConstructorFoundException.Type); + Assert.That(noMatchingConstructorFoundException.Type, Is.EqualTo(typeof(T))); else Assert.Fail($"Exception is no {nameof(NoMatchingConstructorFoundException)}, actual type: {exception?.GetType()}"); } diff --git a/Test.LightweightIocContainer/ActionExtensionTest.cs b/Test.LightweightIocContainer/ActionExtensionTest.cs index f02cc76..0bcdbb3 100644 --- a/Test.LightweightIocContainer/ActionExtensionTest.cs +++ b/Test.LightweightIocContainer/ActionExtensionTest.cs @@ -2,6 +2,7 @@ // Created: 2019-12-11 // Copyright(c) 2019 SimonG. All Rights Reserved. +using System.Diagnostics.CodeAnalysis; using LightweightIocContainer; using NUnit.Framework; @@ -27,6 +28,7 @@ public class ActionExtensionTest [Test] + [SuppressMessage("ReSharper", "PossibleNullReferenceException")] public void TestConvert() { Action barAction = bar => bar.Throw(); @@ -36,9 +38,10 @@ public class ActionExtensionTest } [Test] + [SuppressMessage("ReSharper", "ExpressionIsAlwaysNull")] public void TestConvertActionNull() { Action barAction = null; - Assert.Null(barAction.Convert()); + Assert.That(barAction.Convert(), Is.Null); } } \ No newline at end of file diff --git a/Test.LightweightIocContainer/EnumerableExtensionTest.cs b/Test.LightweightIocContainer/EnumerableExtensionTest.cs index 6bcaafc..7f1627e 100644 --- a/Test.LightweightIocContainer/EnumerableExtensionTest.cs +++ b/Test.LightweightIocContainer/EnumerableExtensionTest.cs @@ -35,7 +35,7 @@ public class EnumerableExtensionTest public void TestFirstOrGivenNoPredicateEmpty() { List list = new(); - Assert.IsInstanceOf(list.FirstOrGiven()); + Assert.That(list.FirstOrGiven(), Is.InstanceOf()); } [Test] @@ -51,8 +51,8 @@ public class EnumerableExtensionTest ListObject listObject = list.FirstOrGiven(); - Assert.IsNotInstanceOf(listObject); - Assert.AreEqual(0, listObject.Index); + Assert.That(list.FirstOrGiven(), Is.Not.InstanceOf()); + Assert.That(listObject.Index, Is.EqualTo(0)); } [Test] @@ -60,7 +60,7 @@ public class EnumerableExtensionTest public void TestFirstOrGivenPredicateEmpty() { List list = new(); - Assert.IsInstanceOf(list.FirstOrGiven(o => o.Index == 2)); + Assert.That(list.FirstOrGiven(o => o.Index == 2), Is.InstanceOf()); } [Test] @@ -76,8 +76,8 @@ public class EnumerableExtensionTest ListObject listObject = list.FirstOrGiven(o => o.Index == 2); - Assert.IsNotInstanceOf(listObject); - Assert.AreEqual(2, listObject.Index); + Assert.That(listObject, Is.Not.InstanceOf()); + Assert.That(listObject.Index, Is.EqualTo(2)); } [Test] diff --git a/Test.LightweightIocContainer/FluentFactoryRegistrationTest.cs b/Test.LightweightIocContainer/FluentFactoryRegistrationTest.cs index 6b40e5f..30cde07 100644 --- a/Test.LightweightIocContainer/FluentFactoryRegistrationTest.cs +++ b/Test.LightweightIocContainer/FluentFactoryRegistrationTest.cs @@ -151,8 +151,8 @@ public class FluentFactoryRegistrationTest ITestFactory factory = _iocContainer.Resolve(); ITest test = factory.Create(); - Assert.IsInstanceOf(factory); - Assert.IsInstanceOf(test); + Assert.That(factory, Is.InstanceOf()); + Assert.That(test, Is.InstanceOf()); } [Test] @@ -170,8 +170,8 @@ public class FluentFactoryRegistrationTest ITestFactory factory = _iocContainer.Resolve(); ITest test = factory.Create(); - Assert.IsInstanceOf(factory); - Assert.IsInstanceOf(test); + Assert.That(factory, Is.InstanceOf()); + Assert.That(test, Is.InstanceOf()); } [Test] @@ -196,7 +196,7 @@ public class FluentFactoryRegistrationTest ITestFactory testFactory = _iocContainer.Resolve(); ITest createdTest = testFactory.Create(); - Assert.IsInstanceOf(createdTest); + Assert.That(createdTest, Is.InstanceOf()); } [Test] @@ -208,7 +208,7 @@ public class FluentFactoryRegistrationTest ITestFactory testFactory = _iocContainer.Resolve(); ITest createdTest = testFactory.Create("Test"); - Assert.IsInstanceOf(createdTest); + Assert.That(createdTest, Is.InstanceOf()); } [Test] @@ -220,7 +220,7 @@ public class FluentFactoryRegistrationTest ITestFactory testFactory = _iocContainer.Resolve(); ITest createdTest = testFactory.CreateTest(); - Assert.IsInstanceOf(createdTest); + Assert.That(createdTest, Is.InstanceOf()); } [Test] @@ -232,7 +232,7 @@ public class FluentFactoryRegistrationTest ITestFactory testFactory = _iocContainer.Resolve(); ITest createdTest = testFactory.Create(); - Assert.IsInstanceOf(createdTest); + Assert.That(createdTest, Is.InstanceOf()); } [Test] @@ -243,7 +243,7 @@ public class FluentFactoryRegistrationTest ITestFactory testFactory = _iocContainer.Resolve(); ITest createdTest = testFactory.Create(1); - Assert.IsInstanceOf(createdTest); + Assert.That(createdTest, Is.InstanceOf()); } [Test] @@ -264,10 +264,10 @@ public class FluentFactoryRegistrationTest return; } - Assert.AreSame(obj, testNull.Obj); - Assert.AreEqual(content, testNull.Content); - Assert.AreEqual(null, testNull.Optional1); - Assert.AreEqual(optional2, testNull.Optional2); + Assert.That(testNull.Obj, Is.SameAs(obj)); + Assert.That(testNull.Content, Is.EqualTo(content)); + Assert.That(testNull.Optional1, Is.Null); + Assert.That(testNull.Optional2, Is.EqualTo(optional2)); } [Test] @@ -288,11 +288,11 @@ public class FluentFactoryRegistrationTest return; } - Assert.AreSame(obj, testNull.Obj); - Assert.AreEqual(content, testNull.Content); - Assert.AreEqual(null, testNull.Optional1); - Assert.AreEqual(optional2, testNull.Optional2); - Assert.AreEqual(null, testNull.TestNullFactory); + Assert.That(testNull.Obj, Is.SameAs(obj)); + Assert.That(testNull.Content, Is.EqualTo(content)); + Assert.That(testNull.Optional1, Is.Null); + Assert.That(testNull.Optional2, Is.EqualTo(optional2)); + Assert.That(testNull.TestNullFactory, Is.Null); } [Test] @@ -309,9 +309,9 @@ public class FluentFactoryRegistrationTest ITest resolvedTest2 = testFactory.Create(scope1); ITest resolvedTest3 = testFactory.Create(scope2); - Assert.AreSame(resolvedTest1, resolvedTest2); - Assert.AreNotSame(resolvedTest1, resolvedTest3); - Assert.AreNotSame(resolvedTest2, resolvedTest3); + Assert.That(resolvedTest2, Is.SameAs(resolvedTest1)); + Assert.That(resolvedTest3, Is.Not.SameAs(resolvedTest1)); + Assert.That(resolvedTest3, Is.Not.SameAs(resolvedTest2)); } [Test] @@ -328,18 +328,18 @@ public class FluentFactoryRegistrationTest ITest resolvedTest2 = testFactory.Create(scope1); ITest resolvedTest3 = testFactory.Create(scope2); - Assert.AreSame(resolvedTest1, resolvedTest2); - Assert.AreNotSame(resolvedTest1, resolvedTest3); - Assert.AreNotSame(resolvedTest2, resolvedTest3); + Assert.That(resolvedTest2, Is.SameAs(resolvedTest1)); + Assert.That(resolvedTest3, Is.Not.SameAs(resolvedTest1)); + Assert.That(resolvedTest3, Is.Not.SameAs(resolvedTest2)); testFactory.ClearMultitonInstance(); ITest resolvedTest4 = testFactory.Create(scope1); ITest resolvedTest5 = testFactory.Create(scope2); - Assert.AreNotSame(resolvedTest1, resolvedTest4); - Assert.AreNotSame(resolvedTest2, resolvedTest4); - Assert.AreNotSame(resolvedTest3, resolvedTest5); + Assert.That(resolvedTest4, Is.Not.SameAs(resolvedTest1)); + Assert.That(resolvedTest4, Is.Not.SameAs(resolvedTest2)); + Assert.That(resolvedTest5, Is.Not.SameAs(resolvedTest3)); } [Test] diff --git a/Test.LightweightIocContainer/IgnoreConstructorAttributeTest.cs b/Test.LightweightIocContainer/IgnoreConstructorAttributeTest.cs index 22e9570..36c5c4e 100644 --- a/Test.LightweightIocContainer/IgnoreConstructorAttributeTest.cs +++ b/Test.LightweightIocContainer/IgnoreConstructorAttributeTest.cs @@ -59,7 +59,7 @@ public class IgnoreConstructorAttributeTest container.RegisterIgnoreConstructorAttribute(); ITest test = container.Resolve("name"); - Assert.IsInstanceOf(test); + Assert.That(test, Is.InstanceOf()); } [Test] diff --git a/Test.LightweightIocContainer/IocContainerInterfaceSegregationTest.cs b/Test.LightweightIocContainer/IocContainerInterfaceSegregationTest.cs index 10ad2b5..5e80803 100644 --- a/Test.LightweightIocContainer/IocContainerInterfaceSegregationTest.cs +++ b/Test.LightweightIocContainer/IocContainerInterfaceSegregationTest.cs @@ -56,10 +56,10 @@ public class IocContainerInterfaceSegregationTest _container.Register(r => r.Add().OnCreate(foo => foo.ThrowFoo())); Exception fooException = Assert.Throws(() => _container.Resolve()); - Assert.AreEqual("Foo", fooException?.Message); + Assert.That(fooException?.Message, Is.EqualTo("Foo")); Exception barException = Assert.Throws(() => _container.Resolve()); - Assert.AreEqual("Foo", barException?.Message); + Assert.That(barException?.Message, Is.EqualTo("Foo")); } [Test] @@ -68,13 +68,13 @@ public class IocContainerInterfaceSegregationTest _container.Register(r => r.Add().OnCreate(foo => foo.ThrowFoo())); Exception fooException = Assert.Throws(() => _container.Resolve()); - Assert.AreEqual("Foo", fooException?.Message); + Assert.That(fooException?.Message, Is.EqualTo("Foo")); Exception barException = Assert.Throws(() => _container.Resolve()); - Assert.AreEqual("Foo", barException?.Message); + Assert.That(barException?.Message, Is.EqualTo("Foo")); Exception anotherFooException = Assert.Throws(() => _container.Resolve()); - Assert.AreEqual("Foo", anotherFooException?.Message); + Assert.That(anotherFooException?.Message, Is.EqualTo("Foo")); } [Test] @@ -83,16 +83,16 @@ public class IocContainerInterfaceSegregationTest _container.Register(r => r.Add().OnCreate(foo => foo.ThrowFoo())); Exception fooException = Assert.Throws(() => _container.Resolve()); - Assert.AreEqual("Foo", fooException?.Message); + Assert.That(fooException?.Message, Is.EqualTo("Foo")); Exception barException = Assert.Throws(() => _container.Resolve()); - Assert.AreEqual("Foo", barException?.Message); + Assert.That(barException?.Message, Is.EqualTo("Foo")); Exception anotherFooException = Assert.Throws(() => _container.Resolve()); - Assert.AreEqual("Foo", anotherFooException?.Message); + Assert.That(anotherFooException?.Message, Is.EqualTo("Foo")); Exception anotherBarException = Assert.Throws(() => _container.Resolve()); - Assert.AreEqual("Foo", anotherBarException?.Message); + Assert.That(anotherBarException?.Message, Is.EqualTo("Foo")); } [Test] @@ -101,19 +101,19 @@ public class IocContainerInterfaceSegregationTest _container.Register(r => r.Add().OnCreate(foo => foo.ThrowFoo())); Exception fooException = Assert.Throws(() => _container.Resolve()); - Assert.AreEqual("Foo", fooException?.Message); + Assert.That(fooException?.Message, Is.EqualTo("Foo")); Exception barException = Assert.Throws(() => _container.Resolve()); - Assert.AreEqual("Foo", barException?.Message); + Assert.That(barException?.Message, Is.EqualTo("Foo")); Exception anotherFooException = Assert.Throws(() => _container.Resolve()); - Assert.AreEqual("Foo", anotherFooException?.Message); + Assert.That(anotherFooException?.Message, Is.EqualTo("Foo")); Exception anotherBarException = Assert.Throws(() => _container.Resolve()); - Assert.AreEqual("Foo", anotherBarException?.Message); + Assert.That(anotherBarException?.Message, Is.EqualTo("Foo")); Exception anotherOneException = Assert.Throws(() => _container.Resolve()); - Assert.AreEqual("Foo", anotherOneException?.Message); + Assert.That(anotherOneException?.Message, Is.EqualTo("Foo")); } [Test] @@ -126,11 +126,11 @@ public class IocContainerInterfaceSegregationTest IAnotherBar anotherBar = _container.Resolve(); IAnotherOne anotherOne = _container.Resolve(); - Assert.IsInstanceOf(foo); - Assert.IsInstanceOf(bar); - Assert.IsInstanceOf(anotherFoo); - Assert.IsInstanceOf(anotherBar); - Assert.IsInstanceOf(anotherOne); + Assert.That(foo, Is.InstanceOf()); + Assert.That(bar, Is.InstanceOf()); + Assert.That(anotherFoo, Is.InstanceOf()); + Assert.That(anotherBar, Is.InstanceOf()); + Assert.That(anotherOne, Is.InstanceOf()); } [Test] @@ -143,20 +143,15 @@ public class IocContainerInterfaceSegregationTest IAnotherBar anotherBar = _container.Resolve(); IAnotherOne anotherOne = _container.Resolve(); - Assert.IsInstanceOf(foo); - Assert.IsInstanceOf(bar); - Assert.IsInstanceOf(anotherFoo); - Assert.IsInstanceOf(anotherBar); - Assert.IsInstanceOf(anotherOne); - - Assert.AreEqual(foo, bar); - Assert.AreEqual(foo, anotherFoo); - Assert.AreEqual(foo, anotherBar); - Assert.AreEqual(foo, anotherOne); - - Assert.AreSame(foo, bar); - Assert.AreSame(foo, anotherFoo); - Assert.AreSame(foo, anotherBar); - Assert.AreSame(foo, anotherOne); + Assert.That(foo, Is.InstanceOf()); + Assert.That(bar, Is.InstanceOf()); + Assert.That(anotherFoo, Is.InstanceOf()); + Assert.That(anotherBar, Is.InstanceOf()); + Assert.That(anotherOne, Is.InstanceOf()); + + Assert.That(bar, Is.SameAs(foo)); + Assert.That(anotherFoo, Is.SameAs(foo)); + Assert.That(anotherBar, Is.SameAs(foo)); + Assert.That(anotherOne, Is.SameAs(foo)); } } \ No newline at end of file diff --git a/Test.LightweightIocContainer/IocContainerParameterRegistrationTest.cs b/Test.LightweightIocContainer/IocContainerParameterRegistrationTest.cs index 09080d3..2152c34 100644 --- a/Test.LightweightIocContainer/IocContainerParameterRegistrationTest.cs +++ b/Test.LightweightIocContainer/IocContainerParameterRegistrationTest.cs @@ -107,8 +107,8 @@ public class IocContainerParameterRegistrationTest _iocContainer.Register(r => r.Add().WithParameters(b, c)); IA a = _iocContainer.Resolve(); - Assert.AreSame(b, a.B); - Assert.AreSame(c, a.C); + Assert.That(a.B, Is.SameAs(b)); + Assert.That(a.C, Is.SameAs(c)); } [Test] @@ -120,8 +120,8 @@ public class IocContainerParameterRegistrationTest _iocContainer.Register(r => r.Add().WithParameters(b)); IA a = _iocContainer.Resolve(c); - Assert.AreSame(b, a.B); - Assert.AreSame(c, a.C); + Assert.That(a.B, Is.SameAs(b)); + Assert.That(a.C, Is.SameAs(c)); } [Test] @@ -136,11 +136,11 @@ public class IocContainerParameterRegistrationTest _iocContainer.Register(r => r.Add().WithParameters((0, a), (2, a3), (3, b), (4, c))); ID d = _iocContainer.Resolve(a2); - Assert.AreSame(a, d.A); - Assert.AreSame(a2, d.A2); - Assert.AreSame(a3, d.A3); - Assert.AreSame(b, d.B); - Assert.AreSame(c, d.C); + Assert.That(d.A, Is.SameAs(a)); + Assert.That(d.A2, Is.SameAs(a2)); + Assert.That(d.A3, Is.SameAs(a3)); + Assert.That(d.B, Is.SameAs(b)); + Assert.That(d.C, Is.SameAs(c)); } [Test] @@ -158,9 +158,9 @@ public class IocContainerParameterRegistrationTest ID d = _iocContainer.Resolve(a); - Assert.AreSame(a, d.A2); - Assert.AreSame(a2, d.A); - Assert.AreNotSame(a, d.A3); - Assert.AreNotSame(a2, d.A3); + Assert.That(d.A2, Is.SameAs(a)); + Assert.That(d.A, Is.SameAs(a2)); + Assert.That(d.A3, Is.Not.SameAs(a)); + Assert.That(d.A3, Is.Not.SameAs(a2)); } } \ No newline at end of file diff --git a/Test.LightweightIocContainer/IocContainerRecursionTest.cs b/Test.LightweightIocContainer/IocContainerRecursionTest.cs index d034bee..25bb906 100644 --- a/Test.LightweightIocContainer/IocContainerRecursionTest.cs +++ b/Test.LightweightIocContainer/IocContainerRecursionTest.cs @@ -119,8 +119,8 @@ public class IocContainerRecursionTest CircularDependencyException exception = (CircularDependencyException) barConstructorNotMatchingException?.InnerExceptions[0]; - Assert.AreEqual(typeof(IFoo), exception?.ResolvingType); - Assert.AreEqual(2, exception.ResolveStack.Count); + Assert.That(exception?.ResolvingType, Is.EqualTo(typeof(IFoo))); + Assert.That(exception?.ResolveStack.Count, Is.EqualTo(2)); string message = $"Circular dependency has been detected when trying to resolve `{typeof(IFoo)}`.\n" + "Resolve stack that resulted in the circular dependency:\n" + @@ -128,7 +128,7 @@ public class IocContainerRecursionTest $"\t`{typeof(IBar)}` resolved as dependency of\n" + $"\t`{typeof(IFoo)}` which is the root type being resolved."; - Assert.AreEqual(message, exception.Message); + Assert.That(exception.Message, Is.EqualTo(message)); } [Test] @@ -139,7 +139,7 @@ public class IocContainerRecursionTest _iocContainer.Register(r => r.Add()); IA a = _iocContainer.Resolve(); - Assert.IsNotNull(a); + Assert.That(a, Is.Not.Null); } [Test] diff --git a/Test.LightweightIocContainer/IocContainerTest.cs b/Test.LightweightIocContainer/IocContainerTest.cs index ebc4a0a..899d5f2 100644 --- a/Test.LightweightIocContainer/IocContainerTest.cs +++ b/Test.LightweightIocContainer/IocContainerTest.cs @@ -124,7 +124,7 @@ public class IocContainerTest installerMock.Received(1).Install(Arg.Any()); - Assert.AreEqual(_iocContainer, returnedContainer); + Assert.That(returnedContainer, Is.EqualTo(_iocContainer)); } [Test] @@ -140,7 +140,7 @@ public class IocContainerTest installer2Mock.Received(1).Install(Arg.Any()); installer3Mock.Received(1).Install(Arg.Any()); - Assert.AreEqual(_iocContainer, returnedContainer); + Assert.That(returnedContainer, Is.EqualTo(_iocContainer)); } [Test] @@ -160,7 +160,7 @@ public class IocContainerTest { _iocContainer.Register(r => r.Add()); MultipleRegistrationException exception = Assert.Throws(() => _iocContainer.Register(r => r.Add())); - Assert.AreEqual(typeof(ITest), exception?.Type); + Assert.That(exception?.Type, Is.EqualTo(typeof(ITest))); } [Test] @@ -181,7 +181,7 @@ public class IocContainerTest public void TestResolveNotRegistered() { TypeNotRegisteredException exception = Assert.Throws(() => _iocContainer.Resolve()); - Assert.AreEqual(typeof(ITest), exception?.Type); + Assert.That(exception?.Type, Is.EqualTo(typeof(ITest))); } [Test] @@ -191,7 +191,7 @@ public class IocContainerTest ITest resolvedTest = _iocContainer.Resolve(); - Assert.IsInstanceOf(resolvedTest); + Assert.That(resolvedTest, Is.InstanceOf()); } [Test] @@ -201,7 +201,7 @@ public class IocContainerTest Test resolvedTest = _iocContainer.Resolve(); - Assert.IsInstanceOf(resolvedTest); + Assert.That(resolvedTest, Is.InstanceOf()); } [Test] @@ -218,7 +218,7 @@ public class IocContainerTest Test resolvedTest = _iocContainer.Resolve(); - Assert.IsInstanceOf(resolvedTest); + Assert.That(resolvedTest, Is.InstanceOf()); } [Test] @@ -228,7 +228,7 @@ public class IocContainerTest ITest resolvedTest = _iocContainer.Resolve("Test", new Test()); - Assert.IsInstanceOf(resolvedTest); + Assert.That(resolvedTest, Is.InstanceOf()); } [Test] @@ -239,7 +239,7 @@ public class IocContainerTest ITest resolvedTest = _iocContainer.Resolve("Test"); - Assert.IsInstanceOf(resolvedTest); + Assert.That(resolvedTest, Is.InstanceOf()); } [Test] @@ -250,7 +250,7 @@ public class IocContainerTest ITest resolvedTest = _iocContainer.Resolve(); ITest secondResolvedTest = _iocContainer.Resolve(); - Assert.AreEqual(resolvedTest, secondResolvedTest); + Assert.That(secondResolvedTest, Is.EqualTo(resolvedTest)); } [Test] @@ -265,9 +265,9 @@ public class IocContainerTest ITest resolvedTest2 = _iocContainer.Resolve(scope1); ITest resolvedTest3 = _iocContainer.Resolve(scope2); - Assert.AreSame(resolvedTest1, resolvedTest2); - Assert.AreNotSame(resolvedTest1, resolvedTest3); - Assert.AreNotSame(resolvedTest2, resolvedTest3); + Assert.That(resolvedTest2, Is.SameAs(resolvedTest1)); + Assert.That(resolvedTest3, Is.Not.SameAs(resolvedTest1)); + Assert.That(resolvedTest3, Is.Not.SameAs(resolvedTest2)); } [Test] @@ -276,7 +276,7 @@ public class IocContainerTest _iocContainer.Register(r => r.AddMultiton()); MultitonResolveException exception = Assert.Throws(() => _iocContainer.Resolve()); - Assert.AreEqual(typeof(ITest), exception?.Type); + Assert.That(exception?.Type, Is.EqualTo(typeof(ITest))); } [Test] @@ -285,7 +285,7 @@ public class IocContainerTest _iocContainer.Register(r => r.AddMultiton()); MultitonResolveException exception = Assert.Throws(() => _iocContainer.Resolve(new object())); - Assert.AreEqual(typeof(ITest), exception?.Type); + Assert.That(exception?.Type, Is.EqualTo(typeof(ITest))); } [Test] @@ -296,7 +296,7 @@ public class IocContainerTest ITest resolvedTest = _iocContainer.Resolve(); ITest secondResolvedTest = _iocContainer.Resolve(); - Assert.AreNotEqual(resolvedTest, secondResolvedTest); + Assert.That(secondResolvedTest, Is.Not.EqualTo(resolvedTest)); } [Test] @@ -304,7 +304,7 @@ public class IocContainerTest { _iocContainer.Register(r => r.Add()); NoMatchingConstructorFoundException exception = Assert.Throws(() => _iocContainer.Resolve()); - Assert.AreEqual(typeof(TestConstructor), exception?.Type); + Assert.That(exception?.Type, Is.EqualTo(typeof(TestConstructor))); } [Test] @@ -319,7 +319,7 @@ public class IocContainerTest { _iocContainer.Register(r => r.Add()); NoPublicConstructorFoundException exception = Assert.Throws(() => _iocContainer.Resolve()); - Assert.AreEqual(typeof(TestPrivateConstructor), exception?.Type); + Assert.That(exception?.Type, Is.EqualTo(typeof(TestPrivateConstructor))); } [Test] @@ -330,7 +330,7 @@ public class IocContainerTest ITest test = _iocContainer.Resolve(); - Assert.NotNull(test); + Assert.That(test, Is.Not.Null); } [Test] @@ -340,8 +340,8 @@ public class IocContainerTest _iocContainer.Register(r => r.Add().WithParameters("TestString")); ITest test = _iocContainer.Resolve("testName"); - - Assert.IsInstanceOf(test); + + Assert.That(test, Is.InstanceOf()); } [Test] @@ -363,12 +363,12 @@ public class IocContainerTest [Test] public void TestIsTypeRegistered() { - Assert.False(_iocContainer.IsTypeRegistered()); + Assert.That(_iocContainer.IsTypeRegistered(), Is.False); _iocContainer.Register(r => r.Add()); - Assert.True(_iocContainer.IsTypeRegistered()); + Assert.That(_iocContainer.IsTypeRegistered(), Is.True); _iocContainer.Register(r => r.Add()); - Assert.True(_iocContainer.IsTypeRegistered()); + Assert.That(_iocContainer.IsTypeRegistered(), Is.True); } } \ No newline at end of file diff --git a/Test.LightweightIocContainer/MultiLayerResolveTest.cs b/Test.LightweightIocContainer/MultiLayerResolveTest.cs index 16505c3..8d92484 100644 --- a/Test.LightweightIocContainer/MultiLayerResolveTest.cs +++ b/Test.LightweightIocContainer/MultiLayerResolveTest.cs @@ -79,7 +79,7 @@ public class MultiLayerResolveTest IAFactory aFactory = container.Resolve(); IA a = aFactory.Create(); - Assert.IsInstanceOf(a); + Assert.That(a, Is.InstanceOf()); } [Test] @@ -92,7 +92,7 @@ public class MultiLayerResolveTest IBFactory bFactory = container.Resolve(); IB b = bFactory.Create(); - Assert.IsInstanceOf(b); + Assert.That(b, Is.InstanceOf()); } [Test] @@ -104,6 +104,6 @@ public class MultiLayerResolveTest container.Register(r => r.Add(Lifestyle.Singleton).WithParameters("test")); OtherA a = container.Resolve(); - Assert.AreEqual(a.BProperty.C, a.SecondB.C); + Assert.That(a.SecondB.C, Is.EqualTo(a.BProperty.C)); } } \ No newline at end of file diff --git a/Test.LightweightIocContainer/MultipleMultitonRegistrationTest.cs b/Test.LightweightIocContainer/MultipleMultitonRegistrationTest.cs index da0c169..cbd16ac 100644 --- a/Test.LightweightIocContainer/MultipleMultitonRegistrationTest.cs +++ b/Test.LightweightIocContainer/MultipleMultitonRegistrationTest.cs @@ -58,12 +58,11 @@ public class MultipleMultitonRegistrationTest MultitonScope scope = new(); ITest test = _iocContainer.Resolve(scope); - Assert.NotNull(test); + Assert.That(test, Is.Not.Null); IProvider provider = _iocContainer.Resolve(scope); - Assert.NotNull(provider); - Assert.AreEqual(test, provider); - Assert.AreSame(test, provider); + Assert.That(provider, Is.Not.Null); + Assert.That(provider, Is.SameAs(test)); } [Test] @@ -75,13 +74,13 @@ public class MultipleMultitonRegistrationTest MultitonScope differentScope = new(); ITest test = _iocContainer.Resolve(scope); - Assert.NotNull(test); + Assert.That(test, Is.Not.Null); IProvider provider = _iocContainer.Resolve(differentScope); - Assert.NotNull(provider); - - Assert.AreNotEqual(test, provider); - Assert.AreNotSame(test, provider); + Assert.That(provider, Is.Not.Null); + + Assert.That(provider, Is.Not.SameAs(test)); + Assert.That(provider, Is.Not.EqualTo(test)); } [Test] @@ -92,14 +91,13 @@ public class MultipleMultitonRegistrationTest MultitonScope scope = new(); ITest test = _iocContainer.Resolve(scope); - Assert.NotNull(test); - Assert.AreEqual(1, test.Number); + Assert.That(test, Is.Not.Null); + Assert.That(test.Number, Is.EqualTo(1)); IProvider provider = _iocContainer.Resolve(scope); - Assert.NotNull(provider); - Assert.AreEqual(1, provider.Number); + Assert.That(provider, Is.Not.Null); + Assert.That(provider.Number, Is.EqualTo(1)); - Assert.AreEqual(test, provider); - Assert.AreSame(test, provider); + Assert.That(provider, Is.SameAs(test)); } } \ No newline at end of file diff --git a/Test.LightweightIocContainer/OpenGenericRegistrationTest.cs b/Test.LightweightIocContainer/OpenGenericRegistrationTest.cs index 03665e6..016e36f 100644 --- a/Test.LightweightIocContainer/OpenGenericRegistrationTest.cs +++ b/Test.LightweightIocContainer/OpenGenericRegistrationTest.cs @@ -73,7 +73,7 @@ public class OpenGenericRegistrationTest _iocContainer.Register(r => r.AddOpenGenerics(typeof(ITest<>), typeof(Test<>))); ITest test = _iocContainer.Resolve>(); - Assert.NotNull(test); + Assert.That(test, Is.Not.Null); } [Test] @@ -82,13 +82,12 @@ public class OpenGenericRegistrationTest _iocContainer.Register(r => r.AddOpenGenerics(typeof(ITest<>), typeof(Test<>), Lifestyle.Singleton)); ITest test = _iocContainer.Resolve>(); - Assert.NotNull(test); + Assert.That(test, Is.Not.Null); ITest secondTest = _iocContainer.Resolve>(); - Assert.NotNull(secondTest); + Assert.That(secondTest, Is.Not.Null); - Assert.AreEqual(test, secondTest); - Assert.AreSame(test, secondTest); + Assert.That(secondTest, Is.SameAs(test)); } [Test] @@ -105,7 +104,7 @@ public class OpenGenericRegistrationTest _iocContainer.Register(r => r.AddOpenGenerics(typeof(ITest<>), typeof(Test<>)).WithFactory()); ITestFactory testFactory = _iocContainer.Resolve(); ITest test = testFactory.Create(); - Assert.IsInstanceOf>(test); + Assert.That(test, Is.InstanceOf>()); } [Test] @@ -114,6 +113,6 @@ public class OpenGenericRegistrationTest _iocContainer.Register(r => r.AddOpenGenerics(typeof(ITest<>), typeof(CtorTest<>)).WithFactory()); ICtorTestFactory testFactory = _iocContainer.Resolve(); ITest test = testFactory.Create(new Constraint()); - Assert.IsInstanceOf>(test); + Assert.That(test, Is.InstanceOf>()); } } \ No newline at end of file diff --git a/Test.LightweightIocContainer/RegistrationBaseTest.cs b/Test.LightweightIocContainer/RegistrationBaseTest.cs index ce587ce..5038785 100644 --- a/Test.LightweightIocContainer/RegistrationBaseTest.cs +++ b/Test.LightweightIocContainer/RegistrationBaseTest.cs @@ -60,8 +60,8 @@ public class RegistrationBaseTest RegistrationBase testRegistration = (RegistrationBase) registrationFactory.Register(Lifestyle.Transient).WithParameters(bar, test); - Assert.AreEqual(bar, testRegistration.Parameters![0]); - Assert.AreEqual(test, testRegistration.Parameters[1]); + Assert.That(testRegistration.Parameters![0], Is.EqualTo(bar)); + Assert.That(testRegistration.Parameters[1], Is.EqualTo(test)); } [Test] @@ -74,10 +74,10 @@ public class RegistrationBaseTest RegistrationBase testRegistration = (RegistrationBase) registrationFactory.Register(Lifestyle.Transient).WithParameters((0, bar), (3, test), (2, "SomeString")); - Assert.AreEqual(bar, testRegistration.Parameters![0]); - Assert.IsInstanceOf(testRegistration.Parameters[1]); - Assert.AreEqual("SomeString", testRegistration.Parameters[2]); - Assert.AreEqual(test, testRegistration.Parameters[3]); + Assert.That(testRegistration.Parameters![0], Is.EqualTo(bar)); + Assert.That(testRegistration.Parameters[1], Is.InstanceOf()); + Assert.That(testRegistration.Parameters[2], Is.EqualTo("SomeString")); + Assert.That(testRegistration.Parameters[3], Is.EqualTo(test)); } [Test] diff --git a/Test.LightweightIocContainer/SingleTypeRegistrationTest.cs b/Test.LightweightIocContainer/SingleTypeRegistrationTest.cs index 7f2beff..9f97823 100644 --- a/Test.LightweightIocContainer/SingleTypeRegistrationTest.cs +++ b/Test.LightweightIocContainer/SingleTypeRegistrationTest.cs @@ -52,7 +52,7 @@ public class SingleTypeRegistrationTest ISingleTypeRegistration registration = registrationFactory.Register(Lifestyle.Transient).WithFactoryMethod(c => new Foo(c.Resolve())); IFoo foo = registration.FactoryMethod!(iocContainerMock); - Assert.AreEqual(bar, foo.Bar); + Assert.That(foo.Bar, Is.EqualTo(bar)); } [Test] @@ -65,7 +65,7 @@ public class SingleTypeRegistrationTest IFoo foo = container.Resolve(); - Assert.IsInstanceOf(foo); - Assert.AreEqual(bar, foo.Bar); + Assert.That(foo, Is.InstanceOf()); + Assert.That(foo.Bar, Is.EqualTo(bar)); } } \ No newline at end of file