From 8ed699065655ded9a89cb44dda0cdaf924b14feb Mon Sep 17 00:00:00 2001 From: Marco Bertschi Date: Wed, 27 Nov 2019 14:01:31 +0100 Subject: [PATCH 1/2] Use NUnit --- src/BBT.StructureTools.Tests/AssemblyInfo.cs | 3 - .../BBT.StructureTools.Tests.csproj | 9 +- .../ComparerWithObjectAttributeTests.cs | 56 +++++------ ...ributeWithDistinguishedComparerIntTests.cs | 74 +++++++------- ...parerWithObjectsAndValueAttributesTests.cs | 65 +++++++------ .../ComparerWithValueAttributeTests.cs | 32 +++---- .../Compare/SubComparerUsingComparerTests.cs | 40 ++++---- .../Compare/ToManyComparerTests.cs | 96 +++++++++---------- .../Convert/ConvertHelperTests.cs | 14 +-- .../ConvertRootTreeLeafWithMasterDataTests.cs | 30 +++--- .../Copy/CopierIntegrationTests.cs | 28 +++--- ...CreateToManyFromGenericStrategyIntTests.cs | 40 +++++--- ...ericStrategyWithReverseRelationIntTests.cs | 36 ++++--- ...CreateToManyWithReverseRelationIntTests.cs | 33 +++---- ...nCreateToOneWithReverseRelationIntTests.cs | 25 ++--- ...erationCrossReferenceProcessingIntTests.cs | 23 ++--- ...CopyOperationInlineValueProcessingTests.cs | 19 ++-- .../Copy/CopyOperationIntTests.cs | 27 +++--- ...OperationRegisterCreateFromFactoryTests.cs | 23 ++--- .../Copy/CopyOperationSubCopyIntTests.cs | 29 +++--- ...rationPostProcessingUsingParamsIntTests.cs | 17 ++-- ...PostProcessingWithoutUsingParamsIntTest.cs | 17 ++-- .../TestTools/IoC/IIocContainer.cs | 47 +++++++++ .../TestTools/IoC/NinjectIocContainer.cs | 68 +++++++++++++ .../TestTools/TestIocContainer.cs | 46 --------- 25 files changed, 492 insertions(+), 405 deletions(-) create mode 100644 src/BBT.StructureTools.Tests/TestTools/IoC/IIocContainer.cs create mode 100644 src/BBT.StructureTools.Tests/TestTools/IoC/NinjectIocContainer.cs delete mode 100644 src/BBT.StructureTools.Tests/TestTools/TestIocContainer.cs diff --git a/src/BBT.StructureTools.Tests/AssemblyInfo.cs b/src/BBT.StructureTools.Tests/AssemblyInfo.cs index 66e9ed0..7fdc6a7 100644 --- a/src/BBT.StructureTools.Tests/AssemblyInfo.cs +++ b/src/BBT.StructureTools.Tests/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Runtime.InteropServices; -using Xunit; // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from @@ -8,5 +7,3 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("e03aad10-b9e8-401c-9a10-d74d814bf0a6")] - -[assembly: CollectionBehavior(CollectionBehavior.CollectionPerAssembly)] diff --git a/src/BBT.StructureTools.Tests/BBT.StructureTools.Tests.csproj b/src/BBT.StructureTools.Tests/BBT.StructureTools.Tests.csproj index c3b850b..5ab6eb0 100644 --- a/src/BBT.StructureTools.Tests/BBT.StructureTools.Tests.csproj +++ b/src/BBT.StructureTools.Tests/BBT.StructureTools.Tests.csproj @@ -18,21 +18,22 @@ pdbonly + + + - - - all - all all + + all diff --git a/src/BBT.StructureTools.Tests/Compare/ComparerWithObjectAttributeTests.cs b/src/BBT.StructureTools.Tests/Compare/ComparerWithObjectAttributeTests.cs index 8c1d576..194e793 100644 --- a/src/BBT.StructureTools.Tests/Compare/ComparerWithObjectAttributeTests.cs +++ b/src/BBT.StructureTools.Tests/Compare/ComparerWithObjectAttributeTests.cs @@ -7,46 +7,46 @@ using BBT.StructureTools.Tests.Compare.Intention; using BBT.StructureTools.Tests.TestTools; using FluentAssertions; - using Ninject; - using Xunit; + using NUnit.Framework; /// /// Test for Comparer infrastructure with object attributes. /// + [TestFixture] public class ComparerWithObjectAttributeTests { #region Members, Setup - private readonly IComparer testCandidate; + private readonly IComparer testcandidate; public ComparerWithObjectAttributeTests() { - var kernel = TestIocContainer.Initialize(); + var kernel = new NinjectIocContainer(); - kernel.Bind>().To(); + kernel.RegisterSingleton, TestClassCompareRegistrations>(); - this.testCandidate = kernel.Get>(); + this.testcandidate = kernel.GetInstance>(); } #endregion - [Fact] + [Test] public void Equals_WhenSameInstance_MustReturnTrue() { // Arrange var testClass = new TestClass { // Explicit instance init on purpose - TestAttribute1 = new TestAttribute(), + TestAttribute1 = new TestObjProperty(), }; // Act - var result = this.testCandidate.Equals(testClass, testClass); + var result = this.testcandidate.Equals(testClass, testClass); // Assert result.Should().BeTrue(); } - [Fact] + [Test] public void Equals_WhenSameInstanceAndObjectAttributeNull_MustReturnTrue() { // Arrange @@ -57,64 +57,64 @@ public void Equals_WhenSameInstanceAndObjectAttributeNull_MustReturnTrue() }; // Act - var result = this.testCandidate.Equals(testClass, testClass); + var result = this.testcandidate.Equals(testClass, testClass); // Assert result.Should().BeTrue(); } - [Fact] + [Test] public void Equals_WhenAttributeObjectsEqual_MustReturnTrue() { // Arrange - var testAttribute = new TestAttribute(); + var testAttribute = new TestObjProperty(); var testClassA = new TestClass { TestAttribute1 = testAttribute }; var testClassB = new TestClass { TestAttribute1 = testAttribute }; // Act - var result = this.testCandidate.Equals(testClassA, testClassB); + var result = this.testcandidate.Equals(testClassA, testClassB); // Assert result.Should().BeTrue(); } - [Fact] + [Test] public void Equals_WhenAttributeObjectsNotEqual_MustReturnFalse() { // Arrange - var testAttribute = new TestAttribute(); - var testAttribute2 = new TestAttribute(); + var testAttribute = new TestObjProperty(); + var testAttribute2 = new TestObjProperty(); var testClassA = new TestClass { TestAttribute1 = testAttribute }; var testClassB = new TestClass { TestAttribute1 = testAttribute2 }; // Act - var result = this.testCandidate.Equals(testClassA, testClassB); + var result = this.testcandidate.Equals(testClassA, testClassB); // Assert result.Should().BeFalse(); } - [Fact] + [Test] public void Equals_WhenAttributeObjectsNotEqualButNotRegistered_MustReturnTrue() { // Arrange - var testAttribute = new TestAttribute(); + var testAttribute = new TestObjProperty(); var testClassA = new TestClass { TestAttribute2 = testAttribute }; var testClassB = new TestClass { TestAttribute2 = testAttribute }; // Act - var result = this.testCandidate.Equals(testClassA, testClassB); + var result = this.testcandidate.Equals(testClassA, testClassB); // Assert result.Should().BeTrue(); } - [Fact] + [Test] public void Equals_WhenAttributeObjectsNotEqualButExcluded_MustReturnTrue() { // Arrange - var testAttribute = new TestAttribute(); - var testAttribute2 = new TestAttribute(); + var testAttribute = new TestObjProperty(); + var testAttribute2 = new TestObjProperty(); var testClassA = new TestClass { TestAttribute1 = testAttribute }; var testClassB = new TestClass { TestAttribute1 = testAttribute2 }; var comparerExclusions = new List @@ -124,7 +124,7 @@ public void Equals_WhenAttributeObjectsNotEqualButExcluded_MustReturnTrue() }; // Act - var result = this.testCandidate.Equals(testClassA, testClassB, System.Array.Empty(), comparerExclusions); + var result = this.testcandidate.Equals(testClassA, testClassB, System.Array.Empty(), comparerExclusions); // Assert result.Should().BeTrue(); @@ -133,12 +133,12 @@ public void Equals_WhenAttributeObjectsNotEqualButExcluded_MustReturnTrue() #region private test classes and test class helpers private class TestClass { - public TestAttribute TestAttribute1 { get; set; } + public TestObjProperty TestAttribute1 { get; set; } - public TestAttribute TestAttribute2 { get; set; } + public TestObjProperty TestAttribute2 { get; set; } } - private class TestAttribute + private class TestObjProperty { } diff --git a/src/BBT.StructureTools.Tests/Compare/ComparerWithObjectAttributeWithDistinguishedComparerIntTests.cs b/src/BBT.StructureTools.Tests/Compare/ComparerWithObjectAttributeWithDistinguishedComparerIntTests.cs index 834fb59..c9fbd1d 100644 --- a/src/BBT.StructureTools.Tests/Compare/ComparerWithObjectAttributeWithDistinguishedComparerIntTests.cs +++ b/src/BBT.StructureTools.Tests/Compare/ComparerWithObjectAttributeWithDistinguishedComparerIntTests.cs @@ -8,25 +8,25 @@ using BBT.StructureTools.Tests.Compare.Intention; using BBT.StructureTools.Tests.TestTools; using FluentAssertions; - using Ninject; - using Xunit; + using NUnit.Framework; + [TestFixture] public class ComparerWithObjectAttributeWithDistinguishedComparerIntTests { #region Members, Setup - private static IComparer distinguishedComparer; - private readonly IComparer testCandidate; + private static IComparer distinguishedComparer; + private readonly IComparer testcandidate; public ComparerWithObjectAttributeWithDistinguishedComparerIntTests() { - var kernel = TestIocContainer.Initialize(); + var kernel = new NinjectIocContainer(); - kernel.Bind>().To(); - kernel.Bind>().To(); + kernel.RegisterSingleton, TestClassCompareRegistrations>(); + kernel.RegisterSingleton, TestAttributeCompareRegistrations>(); - distinguishedComparer = kernel.Get>(); - this.testCandidate = kernel.Get>(); + distinguishedComparer = kernel.GetInstance>(); + this.testcandidate = kernel.GetInstance>(); } #endregion @@ -34,18 +34,18 @@ public ComparerWithObjectAttributeWithDistinguishedComparerIntTests() /// /// Tests IComparer.Equals. /// - [Fact] + [Test] public void Equals_WhenSameInstance_MustReturnTrue() { // Arrange var testClass = new TestClass { // Explicit instance init on purpose - TestAttribute = new TestAttribute(), + TestAttribute = new TestWithProperties(), }; // Act - var result = this.testCandidate.Equals(testClass, testClass); + var result = this.testcandidate.Equals(testClass, testClass); // Assert result.Should().BeTrue(); @@ -54,7 +54,7 @@ public void Equals_WhenSameInstance_MustReturnTrue() /// /// Tests IComparer.Equals. /// - [Fact] + [Test] public void Equals_WhenSameInstanceAndObjectAttributeNull_MustReturnTrue() { // Arrange @@ -65,7 +65,7 @@ public void Equals_WhenSameInstanceAndObjectAttributeNull_MustReturnTrue() }; // Act - var result = this.testCandidate.Equals(testClass, testClass); + var result = this.testcandidate.Equals(testClass, testClass); // Assert result.Should().BeTrue(); @@ -74,16 +74,16 @@ public void Equals_WhenSameInstanceAndObjectAttributeNull_MustReturnTrue() /// /// Tests IComparer.Equals. /// - [Fact] + [Test] public void Equals_WhenAttributeObjectsEqual_MustReturnTrue() { // Arrange - var testAttribute = new TestAttribute(); + var testAttribute = new TestWithProperties(); var testClassA = new TestClass { TestAttribute = testAttribute }; var testClassB = new TestClass { TestAttribute = testAttribute }; // Act - var result = this.testCandidate.Equals(testClassA, testClassB); + var result = this.testcandidate.Equals(testClassA, testClassB); // Assert result.Should().BeTrue(); @@ -92,17 +92,17 @@ public void Equals_WhenAttributeObjectsEqual_MustReturnTrue() /// /// Tests IComparer.Equals. /// - [Fact] + [Test] public void Equals_WhenBaseModelAttributeObjectsNotEqualButHaveSameValue_MustReturnTrue() { // Arrange - var testAttribute = new TestAttribute(); - var testAttribute2 = new TestAttribute(); + var testAttribute = new TestWithProperties(); + var testAttribute2 = new TestWithProperties(); var testClassA = new TestClass { TestAttribute = testAttribute }; var testClassB = new TestClass { TestAttribute = testAttribute2 }; // Act - var result = this.testCandidate.Equals(testClassA, testClassB); + var result = this.testcandidate.Equals(testClassA, testClassB); // Assert result.Should().BeTrue(); @@ -111,17 +111,17 @@ public void Equals_WhenBaseModelAttributeObjectsNotEqualButHaveSameValue_MustRet /// /// Tests IComparer.Equals. /// - [Fact] + [Test] public void Equals_WhenBaseModelAttributeObjectsNotEqualAndHaveDifferentValue_MustReturnFalse() { // Arrange - var testAttribute = new TestAttribute { TestValue1 = 55 }; - var testAttribute2 = new TestAttribute(); + var testAttribute = new TestWithProperties { TestValue1 = 55 }; + var testAttribute2 = new TestWithProperties(); var testClassA = new TestClass { TestAttribute = testAttribute }; var testClassB = new TestClass { TestAttribute = testAttribute2 }; // Act - var result = this.testCandidate.Equals(testClassA, testClassB); + var result = this.testcandidate.Equals(testClassA, testClassB); // Assert result.Should().BeFalse(); @@ -130,17 +130,17 @@ public void Equals_WhenBaseModelAttributeObjectsNotEqualAndHaveDifferentValue_Mu /// /// Tests IComparer.Equals. /// - [Fact] + [Test] public void Equals_WhenAttributeObjectsNotEqualButNotRegistered_MustReturnTrue() { // Arrange - var testAttribute = new TestAttribute() { TestValue2 = 2 }; - var testAttribute2 = new TestAttribute() { TestValue2 = 1 }; + var testAttribute = new TestWithProperties() { TestValue2 = 2 }; + var testAttribute2 = new TestWithProperties() { TestValue2 = 1 }; var testClassA = new TestClass { TestAttribute = testAttribute }; var testClassB = new TestClass { TestAttribute = testAttribute2 }; // Act - var result = this.testCandidate.Equals(testClassA, testClassB); + var result = this.testcandidate.Equals(testClassA, testClassB); // Assert result.Should().BeTrue(); @@ -149,12 +149,12 @@ public void Equals_WhenAttributeObjectsNotEqualButNotRegistered_MustReturnTrue() /// /// Tests IComparer.Equals. /// - [Fact] + [Test] public void Equals_WhenAttributeObjectsNotEqualButExcluded_MustReturnTrue() { // Arrange - var testAttribute = new TestAttribute() { TestValue1 = 2 }; - var testAttribute2 = new TestAttribute() { TestValue1 = 1 }; + var testAttribute = new TestWithProperties() { TestValue1 = 2 }; + var testAttribute2 = new TestWithProperties() { TestValue1 = 1 }; var testClassA = new TestClass { TestAttribute = testAttribute }; var testClassB = new TestClass { TestAttribute = testAttribute2 }; var comparerExclusions = new List @@ -164,7 +164,7 @@ public void Equals_WhenAttributeObjectsNotEqualButExcluded_MustReturnTrue() }; // Act - var result = this.testCandidate.Equals(testClassA, testClassB, Array.Empty(), comparerExclusions); + var result = this.testcandidate.Equals(testClassA, testClassB, Array.Empty(), comparerExclusions); // Assert result.Should().BeTrue(); @@ -174,19 +174,19 @@ public void Equals_WhenAttributeObjectsNotEqualButExcluded_MustReturnTrue() private class TestClass { - public TestAttribute TestAttribute { get; set; } + public TestWithProperties TestAttribute { get; set; } } - private class TestAttribute + private class TestWithProperties { public int TestValue1 { get; set; } public int TestValue2 { get; set; } } - private class TestAttributeCompareRegistrations : ICompareRegistrations + private class TestAttributeCompareRegistrations : ICompareRegistrations { - public void DoRegistrations(IEqualityComparerHelperRegistration registrations) + public void DoRegistrations(IEqualityComparerHelperRegistration registrations) { registrations.Should().NotBeNull(); diff --git a/src/BBT.StructureTools.Tests/Compare/ComparerWithObjectsAndValueAttributesTests.cs b/src/BBT.StructureTools.Tests/Compare/ComparerWithObjectsAndValueAttributesTests.cs index 5e6e170..8e120e4 100644 --- a/src/BBT.StructureTools.Tests/Compare/ComparerWithObjectsAndValueAttributesTests.cs +++ b/src/BBT.StructureTools.Tests/Compare/ComparerWithObjectsAndValueAttributesTests.cs @@ -8,44 +8,43 @@ using BBT.StructureTools.Tests.Compare.Intention; using BBT.StructureTools.Tests.TestTools; using FluentAssertions; - using Ninject; - using Xunit; + using NUnit.Framework; + [TestFixture] public class ComparerWithObjectsAndValueAttributesTests { #region Members, Setup - private readonly IComparer testCandidate; + private readonly IComparer testcandidate; public ComparerWithObjectsAndValueAttributesTests() { - var kernel = TestIocContainer.Initialize(); + var kernel = new NinjectIocContainer(); + kernel.RegisterSingleton, TestClassCompareRegistrations>(); - kernel.Bind>().To(); - - this.testCandidate = kernel.Get>(); + this.testcandidate = kernel.GetInstance>(); } #endregion - [Fact] + [Test] public void Equals_WhenSameInstance_MustReturnTrue() { // Arrange var testClass = new TestClass { // Explicit instance init on purpose - TestAttribute1 = new TestAttribute(), + TestAttribute1 = new TestWithProperties(), TestValue2 = 1, }; // Act - var result = this.testCandidate.Equals(testClass, testClass); + var result = this.testcandidate.Equals(testClass, testClass); // Assert result.Should().BeTrue(); } - [Fact] + [Test] public void Equals_WhenSameInstanceAndObjectAttributeNullButValueNot_MustReturnTrue() { // Arrange @@ -57,17 +56,17 @@ public void Equals_WhenSameInstanceAndObjectAttributeNullButValueNot_MustReturnT }; // Act - var result = this.testCandidate.Equals(testClass, testClass); + var result = this.testcandidate.Equals(testClass, testClass); // Assert result.Should().BeTrue(); } - [Fact] + [Test] public void Equals_WhenAttributeObjectsAndValueEqual_MustReturnTrue() { // Arrange - var testAttribute = new TestAttribute(); + var testAttribute = new TestWithProperties(); var testClassA = new TestClass { TestAttribute1 = testAttribute, @@ -80,17 +79,17 @@ public void Equals_WhenAttributeObjectsAndValueEqual_MustReturnTrue() }; // Act - var result = this.testCandidate.Equals(testClassA, testClassB); + var result = this.testcandidate.Equals(testClassA, testClassB); // Assert result.Should().BeTrue(); } - [Fact] + [Test] public void Equals_WhenAttributeObjectsButNotValueEqual_MustReturnFalse() { // Arrange - var testAttribute = new TestAttribute(); + var testAttribute = new TestWithProperties(); var testClassA = new TestClass { TestAttribute1 = testAttribute, @@ -103,18 +102,18 @@ public void Equals_WhenAttributeObjectsButNotValueEqual_MustReturnFalse() }; // Act - var result = this.testCandidate.Equals(testClassA, testClassB); + var result = this.testcandidate.Equals(testClassA, testClassB); // Assert result.Should().BeFalse(); } - [Fact] + [Test] public void Equals_WhenAttributeObjectsNotButValueEqual_MustReturnFalse() { // Arrange - var testAttribute = new TestAttribute(); - var testAttribute2 = new TestAttribute(); + var testAttribute = new TestWithProperties(); + var testAttribute2 = new TestWithProperties(); var testClassA = new TestClass { TestAttribute1 = testAttribute, @@ -127,18 +126,18 @@ public void Equals_WhenAttributeObjectsNotButValueEqual_MustReturnFalse() }; // Act - var result = this.testCandidate.Equals(testClassA, testClassB); + var result = this.testcandidate.Equals(testClassA, testClassB); // Assert result.Should().BeFalse(); } - [Fact] + [Test] public void Equals_WhenAttributeObjectsAndValuesNotEqualButNotRegistered_MustReturnTrue() { // Arrange - var testAttribute = new TestAttribute(); - var testAttribute2 = new TestAttribute(); + var testAttribute = new TestWithProperties(); + var testAttribute2 = new TestWithProperties(); var testClassA = new TestClass { TestAttribute2 = testAttribute, @@ -151,18 +150,18 @@ public void Equals_WhenAttributeObjectsAndValuesNotEqualButNotRegistered_MustRet }; // Act - var result = this.testCandidate.Equals(testClassA, testClassB); + var result = this.testcandidate.Equals(testClassA, testClassB); // Assert result.Should().BeTrue(); } - [Fact] + [Test] public void Equals_WhenAttributeObjectsAndValuesNotEqualButExcluded_MustReturnTrue() { // Arrange - var testAttribute = new TestAttribute(); - var testAttribute2 = new TestAttribute(); + var testAttribute = new TestWithProperties(); + var testAttribute2 = new TestWithProperties(); var testClassA = new TestClass { TestAttribute1 = testAttribute, @@ -182,7 +181,7 @@ public void Equals_WhenAttributeObjectsAndValuesNotEqualButExcluded_MustReturnTr }; // Act - var result = this.testCandidate.Equals(testClassA, testClassB, Array.Empty(), comparerExclusions); + var result = this.testcandidate.Equals(testClassA, testClassB, Array.Empty(), comparerExclusions); // Assert result.Should().BeTrue(); @@ -191,16 +190,16 @@ public void Equals_WhenAttributeObjectsAndValuesNotEqualButExcluded_MustReturnTr #region private test classes and test class helpers private class TestClass { - public TestAttribute TestAttribute1 { get; set; } + public TestWithProperties TestAttribute1 { get; set; } - public TestAttribute TestAttribute2 { get; set; } + public TestWithProperties TestAttribute2 { get; set; } public int TestValue1 { get; set; } public int TestValue2 { get; set; } } - private class TestAttribute + private class TestWithProperties { } diff --git a/src/BBT.StructureTools.Tests/Compare/ComparerWithValueAttributeTests.cs b/src/BBT.StructureTools.Tests/Compare/ComparerWithValueAttributeTests.cs index 1623ed0..36f3284 100644 --- a/src/BBT.StructureTools.Tests/Compare/ComparerWithValueAttributeTests.cs +++ b/src/BBT.StructureTools.Tests/Compare/ComparerWithValueAttributeTests.cs @@ -8,36 +8,36 @@ using BBT.StructureTools.Tests.Compare.Intention; using BBT.StructureTools.Tests.TestTools; using FluentAssertions; - using Ninject; - using Xunit; + using NUnit.Framework; + [TestFixture] public class ComparerWithValueAttributeTests { - private readonly IComparer testCandidate; + private readonly IComparer testcandidate; public ComparerWithValueAttributeTests() { - var kernel = TestIocContainer.Initialize(); + var kernel = new NinjectIocContainer(); - kernel.Bind>().To(); + kernel.RegisterSingleton, TestClassCompareRegistrations>(); - this.testCandidate = kernel.Get>(); + this.testcandidate = kernel.GetInstance>(); } - [Fact] + [Test] public void Equals_WhenSameInstance_MustReturnTrue() { // Arrange var testClass = new TestClass { Value1 = 45 }; // Act - var result = this.testCandidate.Equals(testClass, testClass); + var result = this.testcandidate.Equals(testClass, testClass); // Assert result.Should().BeTrue(); } - [Fact] + [Test] public void Equals_WhenAttributeValuesEqual_MustReturnTrue() { // Arrange @@ -45,13 +45,13 @@ public void Equals_WhenAttributeValuesEqual_MustReturnTrue() var testClassB = new TestClass { Value1 = 45 }; // Act - var result = this.testCandidate.Equals(testClassA, testClassB); + var result = this.testcandidate.Equals(testClassA, testClassB); // Assert result.Should().BeTrue(); } - [Fact] + [Test] public void Equals_WhenAttributeValuesNotEqual_MustReturnFalse() { // Arrange @@ -59,13 +59,13 @@ public void Equals_WhenAttributeValuesNotEqual_MustReturnFalse() var testClassB = new TestClass { Value1 = 44 }; // Act - var result = this.testCandidate.Equals(testClassA, testClassB); + var result = this.testcandidate.Equals(testClassA, testClassB); // Assert result.Should().BeFalse(); } - [Fact] + [Test] public void Equals_WhenAttributeValuesNotEqualButNotRegistered_MustReturnTrue() { // Arrange @@ -73,13 +73,13 @@ public void Equals_WhenAttributeValuesNotEqualButNotRegistered_MustReturnTrue() var testClassB = new TestClass { Value2 = 44 }; // Act - var result = this.testCandidate.Equals(testClassA, testClassB); + var result = this.testcandidate.Equals(testClassA, testClassB); // Assert result.Should().BeTrue(); } - [Fact] + [Test] public void Equals_WhenAttributeValuesNotEqualButExcluded_MustReturnTrue() { // Arrange @@ -88,7 +88,7 @@ public void Equals_WhenAttributeValuesNotEqualButExcluded_MustReturnTrue() var comparerExclusions = new List { new PropertyComparerExclusion(x => x.Value1) }; // Act - var result = this.testCandidate.Equals(testClassA, testClassB, Array.Empty(), comparerExclusions); + var result = this.testcandidate.Equals(testClassA, testClassB, Array.Empty(), comparerExclusions); // Assert result.Should().BeTrue(); diff --git a/src/BBT.StructureTools.Tests/Compare/SubComparerUsingComparerTests.cs b/src/BBT.StructureTools.Tests/Compare/SubComparerUsingComparerTests.cs index 974ce1d..61dc2a9 100644 --- a/src/BBT.StructureTools.Tests/Compare/SubComparerUsingComparerTests.cs +++ b/src/BBT.StructureTools.Tests/Compare/SubComparerUsingComparerTests.cs @@ -8,24 +8,24 @@ using BBT.StructureTools.Tests.Compare.Intention; using BBT.StructureTools.Tests.TestTools; using FluentAssertions; - using Ninject; - using Xunit; + using NUnit.Framework; + [TestFixture] public class SubComparerUsingComparerTests { #region Members, Setup private static IComparer parentCompare; - private readonly IComparer testCandidate; + private readonly IComparer testcandidate; public SubComparerUsingComparerTests() { - var kernel = TestIocContainer.Initialize(); + var kernel = new NinjectIocContainer(); - kernel.Bind>().To(); - kernel.Bind>().To(); + kernel.RegisterSingleton, TestClassChildCompareRegistrations>(); + kernel.RegisterSingleton, TestClassParentCompareRegistrations>(); - parentCompare = kernel.Get>(); - this.testCandidate = kernel.Get>(); + parentCompare = kernel.GetInstance>(); + this.testcandidate = kernel.GetInstance>(); } #endregion @@ -33,14 +33,14 @@ public SubComparerUsingComparerTests() /// /// Tests equals. /// - [Fact] + [Test] public void Equals_SameInstance_MustReturnTrue() { // Arrange var testClass = new TestClassChild(); // Act - var result = this.testCandidate.Equals(testClass, testClass); + var result = this.testcandidate.Equals(testClass, testClass); // Assert result.Should().BeTrue(); @@ -49,7 +49,7 @@ public void Equals_SameInstance_MustReturnTrue() /// /// Tests equals. /// - [Fact] + [Test] public void Equals_DifferentInstancesSameAttributes_MustReturnTrue() { // Arrange @@ -63,7 +63,7 @@ public void Equals_DifferentInstancesSameAttributes_MustReturnTrue() }; // Act - var result = this.testCandidate.Equals(testClass, testClass2); + var result = this.testcandidate.Equals(testClass, testClass2); // Assert result.Should().BeTrue(); @@ -72,7 +72,7 @@ public void Equals_DifferentInstancesSameAttributes_MustReturnTrue() /// /// Tests equals. /// - [Fact] + [Test] public void Equals_DifferentInstancesNotSameAttributes_MustReturnFalse() { // Arrange @@ -86,7 +86,7 @@ public void Equals_DifferentInstancesNotSameAttributes_MustReturnFalse() }; // Act - var result = this.testCandidate.Equals(testClass, testClass2); + var result = this.testcandidate.Equals(testClass, testClass2); // Assert result.Should().BeFalse(); @@ -95,7 +95,7 @@ public void Equals_DifferentInstancesNotSameAttributes_MustReturnFalse() /// /// Tests equals. /// - [Fact] + [Test] public void Equals_DifferentInstancesNotSameAttributesNotRegistered_MustReturnTrue() { // Arrange @@ -109,7 +109,7 @@ public void Equals_DifferentInstancesNotSameAttributesNotRegistered_MustReturnTr }; // Act - var result = this.testCandidate.Equals(testClass, testClass2); + var result = this.testcandidate.Equals(testClass, testClass2); // Assert result.Should().BeTrue(); @@ -118,7 +118,7 @@ public void Equals_DifferentInstancesNotSameAttributesNotRegistered_MustReturnTr /// /// Tests equals. /// - [Fact] + [Test] public void Equals_DifferentInstancesNotSameAttributesButExcludedByParent_MustReturnTrue() { // Arrange @@ -137,7 +137,7 @@ public void Equals_DifferentInstancesNotSameAttributesButExcludedByParent_MustRe }; // Act - var result = this.testCandidate.Equals(testClass, testClass2, Array.Empty(), comparerExclusions); + var result = this.testcandidate.Equals(testClass, testClass2, Array.Empty(), comparerExclusions); // Assert result.Should().BeTrue(); @@ -146,7 +146,7 @@ public void Equals_DifferentInstancesNotSameAttributesButExcludedByParent_MustRe /// /// Tests equals. /// - [Fact] + [Test] public void Equals_DifferentInstancesNotSameAttributesButExcludedBySubCompareExclusion_MustReturnTrue() { // Arrange @@ -165,7 +165,7 @@ public void Equals_DifferentInstancesNotSameAttributesButExcludedBySubCompareExc }; // Act - var result = this.testCandidate.Equals(testClass, testClass2, Array.Empty(), comparerExclusions); + var result = this.testcandidate.Equals(testClass, testClass2, Array.Empty(), comparerExclusions); // Assert result.Should().BeTrue(); diff --git a/src/BBT.StructureTools.Tests/Compare/ToManyComparerTests.cs b/src/BBT.StructureTools.Tests/Compare/ToManyComparerTests.cs index 16c7878..47a6c00 100644 --- a/src/BBT.StructureTools.Tests/Compare/ToManyComparerTests.cs +++ b/src/BBT.StructureTools.Tests/Compare/ToManyComparerTests.cs @@ -7,9 +7,9 @@ using BBT.StructureTools.Tests.Compare.Intention; using BBT.StructureTools.Tests.TestTools; using FluentAssertions; - using Ninject; - using Xunit; + using NUnit.Framework; + [TestFixture] public class ToManyComparerTests { #region Members, Setup @@ -17,12 +17,12 @@ public class ToManyComparerTests public ToManyComparerTests() { - var kernel = TestIocContainer.Initialize(); + var iocContainer = new NinjectIocContainer(); - kernel.Bind>().To(); - kernel.Bind>().To(); + iocContainer.RegisterSingleton, TestClassCompareRegistrations>(); + iocContainer.RegisterSingleton, TestClassListOfChildrenItemCompareRegistrations>(); - this.comparer = kernel.Get>(); + this.comparer = iocContainer.GetInstance>(); } #endregion @@ -30,17 +30,17 @@ public ToManyComparerTests() /// /// Tests the compare infrastructure. /// - [Fact] + [Test] public void Compare_SameInstance_MustReturnTrue() { // Arrange var testClass = new TestClass() { ListOfChildren = - new List + new List { - new TestClassistOfChildrenItem(), - new TestClassistOfChildrenItem(), + new TestClassListOfChildrenItem(), + new TestClassListOfChildrenItem(), }, }; @@ -54,7 +54,7 @@ public void Compare_SameInstance_MustReturnTrue() /// /// Tests the compare infrastructure. /// - [Fact] + [Test] public void Compare_SameInstanceButistNull_MustReturnTrue() { // Arrange @@ -74,15 +74,15 @@ public void Compare_SameInstanceButistNull_MustReturnTrue() /// /// Tests the compare infrastructure. /// - [Fact] + [Test] public void Compare_DifferentInstancesSameist_MustReturnTrue() { // Arrange var listOfChildren = - new List + new List { - new TestClassistOfChildrenItem { TestValue1 = 1 }, - new TestClassistOfChildrenItem { TestValue1 = 1 }, + new TestClassListOfChildrenItem { TestValue1 = 1 }, + new TestClassListOfChildrenItem { TestValue1 = 1 }, }; var testClass = new TestClass() @@ -107,27 +107,27 @@ public void Compare_DifferentInstancesSameist_MustReturnTrue() /// /// Tests the compare infrastructure. /// - [Fact] + [Test] public void Compare_DifferentInstancesDifferentistsSameValues_MustReturnTrue() { // Arrange var testClass = new TestClass() { // Explicitly set to different ist instance - ListOfChildren = new List + ListOfChildren = new List { - new TestClassistOfChildrenItem { TestValue1 = 1 }, - new TestClassistOfChildrenItem { TestValue1 = 1 }, + new TestClassListOfChildrenItem { TestValue1 = 1 }, + new TestClassListOfChildrenItem { TestValue1 = 1 }, }, }; var testClass2 = new TestClass() { // Explicitly set to different ist instance - ListOfChildren = new List + ListOfChildren = new List { - new TestClassistOfChildrenItem { TestValue1 = 1 }, - new TestClassistOfChildrenItem { TestValue1 = 1 }, + new TestClassListOfChildrenItem { TestValue1 = 1 }, + new TestClassListOfChildrenItem { TestValue1 = 1 }, }, }; @@ -141,27 +141,27 @@ public void Compare_DifferentInstancesDifferentistsSameValues_MustReturnTrue() /// /// Tests the compare infrastructure. /// - [Fact] + [Test] public void Compare_DifferentInstancesDifferentistsSameValuesDifferentistPositions_MustReturnTrue() { // Arrange var testClass = new TestClass() { // Explicitly set to different ist instance - ListOfChildren = new List + ListOfChildren = new List { - new TestClassistOfChildrenItem { TestValue1 = 1 }, - new TestClassistOfChildrenItem { TestValue1 = 2 }, + new TestClassListOfChildrenItem { TestValue1 = 1 }, + new TestClassListOfChildrenItem { TestValue1 = 2 }, }, }; var testClass2 = new TestClass() { // Explicitly set to different ist instance - ListOfChildren = new List + ListOfChildren = new List { - new TestClassistOfChildrenItem { TestValue1 = 2 }, - new TestClassistOfChildrenItem { TestValue1 = 1 }, + new TestClassListOfChildrenItem { TestValue1 = 2 }, + new TestClassListOfChildrenItem { TestValue1 = 1 }, }, }; @@ -175,27 +175,27 @@ public void Compare_DifferentInstancesDifferentistsSameValuesDifferentistPositio /// /// Tests the compare infrastructure. /// - [Fact] + [Test] public void Compare_DifferentInstancesDifferentistsDifferentValues_MustReturnFalse() { // Arrange var testClass = new TestClass() { // Explicitly set to different ist instance - ListOfChildren = new List + ListOfChildren = new List { - new TestClassistOfChildrenItem { TestValue1 = 1 }, - new TestClassistOfChildrenItem { TestValue1 = 2 }, + new TestClassListOfChildrenItem { TestValue1 = 1 }, + new TestClassListOfChildrenItem { TestValue1 = 2 }, }, }; var testClass2 = new TestClass() { // Explicitly set to different ist instance - ListOfChildren = new List + ListOfChildren = new List { - new TestClassistOfChildrenItem { TestValue1 = 2 }, - new TestClassistOfChildrenItem { TestValue1 = 2 }, + new TestClassListOfChildrenItem { TestValue1 = 2 }, + new TestClassListOfChildrenItem { TestValue1 = 2 }, }, }; @@ -209,26 +209,26 @@ public void Compare_DifferentInstancesDifferentistsDifferentValues_MustReturnFal /// /// Tests the compare infrastructure. /// - [Fact] + [Test] public void Compare_DifferentInstancesDifferentistsDifferentValuesDifferentistCounts_MustReturnFalse() { // Arrange var testClass = new TestClass() { // Explicitly set to different ist instance - ListOfChildren = new List + ListOfChildren = new List { - new TestClassistOfChildrenItem { TestValue1 = 2 }, + new TestClassListOfChildrenItem { TestValue1 = 2 }, }, }; var testClass2 = new TestClass() { // Explicitly set to different ist instance - ListOfChildren = new List + ListOfChildren = new List { - new TestClassistOfChildrenItem { TestValue1 = 2 }, - new TestClassistOfChildrenItem { TestValue1 = 2 }, + new TestClassListOfChildrenItem { TestValue1 = 2 }, + new TestClassListOfChildrenItem { TestValue1 = 2 }, }, }; @@ -243,15 +243,15 @@ public void Compare_DifferentInstancesDifferentistsDifferentValuesDifferentistCo private class TestClass { - public List ListOfChildren { private get; set; } + public List ListOfChildren { private get; set; } - public List GetChildren() + public List GetChildren() { return this.ListOfChildren; } } - private class TestClassistOfChildrenItem + private class TestClassListOfChildrenItem { public int TestValue1 { get; set; } @@ -266,13 +266,13 @@ public void DoRegistrations(IEqualityComparerHelperRegistration regis registrations.RegisterToManyRelationship( x => x.GetChildren(), - IocHandler.Instance.IocResolver.GetInstance>()); + IocHandler.Instance.IocResolver.GetInstance>()); } } - private class TestClassistOfChildrenItecompareRegistrations : ICompareRegistrations + private class TestClassListOfChildrenItemCompareRegistrations : ICompareRegistrations { - public void DoRegistrations(IEqualityComparerHelperRegistration registrations) + public void DoRegistrations(IEqualityComparerHelperRegistration registrations) { registrations.Should().NotBeNull(); diff --git a/src/BBT.StructureTools.Tests/Convert/ConvertHelperTests.cs b/src/BBT.StructureTools.Tests/Convert/ConvertHelperTests.cs index a9a2550..00061a5 100644 --- a/src/BBT.StructureTools.Tests/Convert/ConvertHelperTests.cs +++ b/src/BBT.StructureTools.Tests/Convert/ConvertHelperTests.cs @@ -5,11 +5,11 @@ using BBT.StructureTools.Tests.Convert.TestStructure.Source; using BBT.StructureTools.Tests.Convert.TestStructure.Target; using Moq; - using Xunit; + using NUnit.Framework; public class ConvertHelperTests { - [Fact] + [Test] public void PreProcessing_WithEmptyist_Succeeds() { var testCandidate = new ConvertHelper(); @@ -21,7 +21,7 @@ public void PreProcessing_WithEmptyist_Succeeds() testCandidate.DoConvertPreProcessing(source, target, preprocessings); } - [Fact] + [Test] public void PreProcessing_ExecutesPreprocessing() { var testCandidate = new ConvertHelper(); @@ -51,7 +51,7 @@ public void PreProcessing_ExecutesPreprocessing() preprocShouldNotExecuteBecauseWrongProcessingType.Verify(x => x.DoPostProcessing(source, target), Times.Never); } - [Fact] + [Test] public void PostProcessing_WithEmptyist_Succeeds() { var testCandidate = new ConvertHelper(); @@ -63,7 +63,7 @@ public void PostProcessing_WithEmptyist_Succeeds() testCandidate.DoConvertPostProcessing(source, target, preprocessings); } - [Fact] + [Test] public void PostProcessing_ExecutesPostprocessing() { var testCandidate = new ConvertHelper(); @@ -93,7 +93,7 @@ public void PostProcessing_ExecutesPostprocessing() postprocShouldNotExecuteBecauseWrongProcessingType.Verify(x => x.DoPreProcessing(source, target), Times.Never); } - [Fact] + [Test] public void Intercept_WithEmptyist_Succeeds() { var testCandidate = new ConvertHelper(); @@ -104,7 +104,7 @@ public void Intercept_WithEmptyist_Succeeds() testCandidate.ContinueConvertProcess(source, preprocessings); } - [Fact] + [Test] public void ConvertInterception_Intercepts() { var testCandidate = new ConvertHelper(); diff --git a/src/BBT.StructureTools.Tests/Convert/ConvertRootTreeLeafWithMasterDataTests.cs b/src/BBT.StructureTools.Tests/Convert/ConvertRootTreeLeafWithMasterDataTests.cs index 12b9c9e..20d728d 100644 --- a/src/BBT.StructureTools.Tests/Convert/ConvertRootTreeLeafWithMasterDataTests.cs +++ b/src/BBT.StructureTools.Tests/Convert/ConvertRootTreeLeafWithMasterDataTests.cs @@ -12,34 +12,34 @@ using BBT.StructureTools.Tests.Convert.TestStructure.Target; using BBT.StructureTools.Tests.TestTools; using FluentAssertions; - using Ninject; - using Xunit; + using NUnit.Framework; + [TestFixture] public class ConvertRootTreeLeafWithMasterDataTests { - private readonly IConvert testCandidate; + private readonly IConvert testcandidate; public ConvertRootTreeLeafWithMasterDataTests() { - var kernel = TestIocContainer.Initialize(); + var kernel = new NinjectIocContainer(); - kernel.Bind(typeof(ITemporalDataDescriptor<>)).To(); + kernel.RegisterSingleton(typeof(ITemporalDataDescriptor<>), typeof(TemporalDataDescriptor)); - kernel.Bind>().To(); + kernel.RegisterSingleton, RootTargetRootConvertRegistrations>(); - kernel.Bind>().To(); - kernel.Bind>().To(); + kernel.RegisterSingleton, TreeTargetTreeConvertRegistrations>(); + kernel.RegisterSingleton, TreeMasterDataToTreeConvertRegistrations>(); - kernel.Bind>().To(); - kernel.Bind>().To(); - kernel.Bind>().To(); + kernel.RegisterSingleton, LeafTargetLeafConvertRegistrations>(); + kernel.RegisterSingleton, LeafMasterDataTargetLeafConvertRegistrations>(); + kernel.RegisterSingleton, TemporalLeafMasterDataTemporalLeafDatconvertRegistrations>(); - kernel.Bind>().To(); + kernel.RegisterSingleton, TemporalDatcopyRegistrations>(); - this.testCandidate = kernel.Get>(); + this.testcandidate = kernel.GetInstance>(); } - [Fact] + [Test] public void StructureFromRootToLeafIsConvertIntoTargetStructure() { // Arrange @@ -88,7 +88,7 @@ public void StructureFromRootToLeafIsConvertIntoTargetStructure() // Act var target = new TargetRoot(); - this.testCandidate.Convert(root, target, new List()); + this.testcandidate.Convert(root, target, new List()); // Assert // Find target objects diff --git a/src/BBT.StructureTools.Tests/Copy/CopierIntegrationTests.cs b/src/BBT.StructureTools.Tests/Copy/CopierIntegrationTests.cs index fd7df04..fb6bd55 100644 --- a/src/BBT.StructureTools.Tests/Copy/CopierIntegrationTests.cs +++ b/src/BBT.StructureTools.Tests/Copy/CopierIntegrationTests.cs @@ -8,23 +8,23 @@ using BBT.StructureTools.Copy.Processing; using BBT.StructureTools.Tests.TestTools; using FluentAssertions; - using Ninject; - using Xunit; + using NUnit.Framework; + [TestFixture] public class CopierIntegrationTests { #region members and setup - private readonly ICopy testCandidate; + private readonly ICopy testcandidate; public CopierIntegrationTests() { - var kernel = TestIocContainer.Initialize(); + var kernel = new NinjectIocContainer(); - kernel.Bind>().To(); - kernel.Bind>().To(); - kernel.Bind>().To(); + kernel.RegisterSingleton, TestClassCopyRegistrations>(); + kernel.RegisterSingleton, ChildTestClassCopyRegistrations>(); + kernel.RegisterSingleton, ChildTestClass2CopyRegistrations>(); - this.testCandidate = kernel.Get>(); + this.testcandidate = kernel.GetInstance>(); } #endregion @@ -32,7 +32,7 @@ public CopierIntegrationTests() /// /// Tests ICopy.Copy. /// - [Fact] + [Test] public void Copy_MustNotCopyChildrenWhenIntercepted() { // Arrange @@ -53,7 +53,7 @@ public void Copy_MustNotCopyChildrenWhenIntercepted() var testClassParentCopy = new ParentTestClass(); // Act - this.testCandidate.Copy( + this.testcandidate.Copy( testClassParentOriginal, testClassParentCopy, new List @@ -73,7 +73,7 @@ public void Copy_MustNotCopyChildrenWhenIntercepted() /// /// Tests ICopy.Copy. /// - [Fact] + [Test] public void Copy_MustCopyInheritedChildrenWhenIntercepted() { // Arrange @@ -94,7 +94,7 @@ public void Copy_MustCopyInheritedChildrenWhenIntercepted() var testClassParentCopy = new ParentTestClass(); // Act - this.testCandidate.Copy( + this.testcandidate.Copy( testClassParentOriginal, testClassParentCopy, new List @@ -119,7 +119,7 @@ public void Copy_MustCopyInheritedChildrenWhenIntercepted() /// /// Tests ICopy.Copy. /// - [Fact] + [Test] public void Copy_MustNotCopyInheritedChildrenAndChildrenWhenChildrenIntercepted() { // Arrange @@ -140,7 +140,7 @@ public void Copy_MustNotCopyInheritedChildrenAndChildrenWhenChildrenIntercepted( var testClassParentCopy = new ParentTestClass(); // Act - this.testCandidate.Copy( + this.testcandidate.Copy( testClassParentOriginal, testClassParentCopy, new List diff --git a/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToManyFromGenericStrategyIntTests.cs b/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToManyFromGenericStrategyIntTests.cs index 85f1fe7..a7559eb 100644 --- a/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToManyFromGenericStrategyIntTests.cs +++ b/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToManyFromGenericStrategyIntTests.cs @@ -9,25 +9,25 @@ using BBT.StructureTools.Copy.Strategy; using BBT.StructureTools.Tests.TestTools; using FluentAssertions; - using Ninject; - using Xunit; + using NUnit.Framework; + [TestFixture] public class CopyOperationCreateToManyFromGenericStrategyIntTests { #region setup - private readonly ICopy testCandidate; + private readonly ICopy testcandidate; public CopyOperationCreateToManyFromGenericStrategyIntTests() { - var kernel = TestIocContainer.Initialize(); + var kernel = new NinjectIocContainer(); - kernel.Bind>().To(); - kernel.Bind>().To(); - kernel.Bind>().To(); - kernel.Bind().To(); + kernel.RegisterSingleton, TestClassCopyRegistrations>(); + kernel.RegisterSingleton, ChildTestClassCopyRegistrations>(); + kernel.RegisterSingleton, TestFactory>(); + kernel.RegisterSingleton(); - this.testCandidate = kernel.Get>(); + this.testcandidate = kernel.GetInstance>(); } #endregion @@ -35,7 +35,7 @@ public CopyOperationCreateToManyFromGenericStrategyIntTests() /// /// Tests whether the strategy is actually being used during copy. /// - [Fact] + [Test] public void MustUseStrategyWhenCopying() { // Arrange @@ -47,7 +47,7 @@ public void MustUseStrategyWhenCopying() var testClassParentCopy = new ParentTestClass(); // Act - this.testCandidate.Copy( + this.testcandidate.Copy( testClassParentOriginal, testClassParentCopy, new List()); @@ -77,7 +77,7 @@ public void MustUseStrategyWhenCopying() /// /// Tests ICopy.Copy. /// - [Fact] + [Test] public void Copy_MustFailWhenChildrenistNull() { // Arrange @@ -88,7 +88,7 @@ public void Copy_MustFailWhenChildrenistNull() // Act / Assert throws Assert.Throws(() => - this.testCandidate.Copy( + this.testcandidate.Copy( testClassParentOriginal, testClassParentCopy, new List())); @@ -97,7 +97,7 @@ public void Copy_MustFailWhenChildrenistNull() /// /// Tests ICopy.Copy. /// - [Fact] + [Test] public void Copy_MustCopyEmptyCollection() { // Arrange @@ -106,7 +106,7 @@ public void Copy_MustCopyEmptyCollection() var testClassParentCopy = new ParentTestClass(); // Act - this.testCandidate.Copy( + this.testcandidate.Copy( testClassParentOriginal, testClassParentCopy, new List()); @@ -208,6 +208,10 @@ public void DoRegistrations(ICopyHelperRegistration registratio private class TestClassCopyRegistrations : ICopyRegistrations { + public TestClassCopyRegistrations() + { + } + public void DoRegistrations(ICopyHelperRegistration registrations) { registrations.Should().NotBeNull(); @@ -256,6 +260,12 @@ public void Copy(IChildTestClass source, IChildTestClass target, ICopyCallContex private class TestFactory : IGenericStrategyProvider { + public IEnumerable GetAllStrategies() + { + // Not needed for test scenario + throw new NotImplementedException(); + } + public TestStrategy GetStrategy(IChildTestClass criterion) { return new TestStrategy(); diff --git a/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToManyFromGenericStrategyWithReverseRelationIntTests.cs b/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToManyFromGenericStrategyWithReverseRelationIntTests.cs index 84dd64c..5012b7e 100644 --- a/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToManyFromGenericStrategyWithReverseRelationIntTests.cs +++ b/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToManyFromGenericStrategyWithReverseRelationIntTests.cs @@ -9,25 +9,25 @@ using BBT.StructureTools.Copy.Strategy; using BBT.StructureTools.Tests.TestTools; using FluentAssertions; - using Ninject; - using Xunit; + using NUnit.Framework; + [TestFixture] public class CopyOperationCreateToManyFromGenericStrategyWithReverseRelationIntTests { #region setup - private readonly ICopy testCandidate; + private readonly ICopy testcandidate; public CopyOperationCreateToManyFromGenericStrategyWithReverseRelationIntTests() { - var kernel = TestIocContainer.Initialize(); + var kernel = new NinjectIocContainer(); - kernel.Bind>().To(); - kernel.Bind().To(); - kernel.Bind>().To(); - kernel.Bind>().To(); + kernel.RegisterSingleton, TestFactory>(); + kernel.RegisterSingleton(); + kernel.RegisterSingleton, TestClassCopyRegistrations>(); + kernel.RegisterSingleton, ChildTestClassCopyRegistrations>(); - this.testCandidate = kernel.Get>(); + this.testcandidate = kernel.GetInstance>(); } #endregion @@ -35,7 +35,7 @@ public CopyOperationCreateToManyFromGenericStrategyWithReverseRelationIntTests() /// /// Tests whether the strategy is actually being used during copy. /// - [Fact] + [Test] public void MustUseStrategyWhenCopying() { // Arrange @@ -47,7 +47,7 @@ public void MustUseStrategyWhenCopying() var testClassParentCopy = new ParentTestClass(); // Act - this.testCandidate.Copy( + this.testcandidate.Copy( testClassParentOriginal, testClassParentCopy, new List()); @@ -83,7 +83,7 @@ public void MustUseStrategyWhenCopying() /// /// Tests ICopy.Copy. /// - [Fact] + [Test] public void Copy_MustFailWhenChildrenistNull() { // Arrange @@ -94,7 +94,7 @@ public void Copy_MustFailWhenChildrenistNull() // Act / Assert throws Assert.Throws(() => - this.testCandidate.Copy( + this.testcandidate.Copy( testClassParentOriginal, testClassParentCopy, new List())); @@ -103,7 +103,7 @@ public void Copy_MustFailWhenChildrenistNull() /// /// Tests ICopy.Copy. /// - [Fact] + [Test] public void Copy_MustCopyEmptyCollection() { // Arrange @@ -112,7 +112,7 @@ public void Copy_MustCopyEmptyCollection() var testClassParentCopy = new ParentTestClass(); // Act - this.testCandidate.Copy( + this.testcandidate.Copy( testClassParentOriginal, testClassParentCopy, new List()); @@ -263,6 +263,12 @@ public IChildTestClass Create() private class TestFactory : IGenericStrategyProvider { + public IEnumerable GetAllStrategies() + { + // Not needed for test scenario + throw new NotImplementedException(); + } + public TestStrategy GetStrategy(IChildTestClass criterion) { return new TestStrategy(); diff --git a/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToManyWithReverseRelationIntTests.cs b/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToManyWithReverseRelationIntTests.cs index 0409562..a9ddc4a 100644 --- a/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToManyWithReverseRelationIntTests.cs +++ b/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToManyWithReverseRelationIntTests.cs @@ -1,28 +1,29 @@ -namespace BBT.StructureTools.Tests.Copy +namespace BBT.Life.LiBase.ITests.General.Services.Tools.Copy { using System; using System.Collections.Generic; using System.Linq; + using BBT.StructureTools; using BBT.StructureTools.Copy; using BBT.StructureTools.Copy.Helper; using BBT.StructureTools.Tests.TestTools; using FluentAssertions; - using Ninject; - using Xunit; + using NUnit.Framework; + [TestFixture] public class CopyOperationCreateToManyWithReverseRelationIntTests { #region members and setup - private readonly ICopy testCandidate; + private readonly ICopy testcandidate; public CopyOperationCreateToManyWithReverseRelationIntTests() { - var kernel = TestIocContainer.Initialize(); + var kernel = new NinjectIocContainer(); - kernel.Bind>().To(); - kernel.Bind>().To(); + kernel.RegisterSingleton, TestClassCopyRegistrations>(); + kernel.RegisterSingleton, ChildTestClassCopyRegistrations>(); - this.testCandidate = kernel.Get>(); + this.testcandidate = kernel.GetInstance>(); } #endregion @@ -30,7 +31,7 @@ public CopyOperationCreateToManyWithReverseRelationIntTests() /// /// Tests ICopy.Copy. /// - [Fact] + [Test] public void Copy_MustCopyParentReference() { // Arrange @@ -51,7 +52,7 @@ public void Copy_MustCopyParentReference() var testClassParentCopy = new ParentTestClass(); // Act - this.testCandidate.Copy( + this.testcandidate.Copy( testClassParentOriginal, testClassParentCopy, new List()); @@ -75,7 +76,7 @@ public void Copy_MustCopyParentReference() /// /// Tests ICopy.Copy. /// - [Fact] + [Test] public void Copy_MustFailWhenChildrenistNull() { // Arrange @@ -85,11 +86,11 @@ public void Copy_MustFailWhenChildrenistNull() var testClassParentCopy = new ParentTestClass(); // Act / Assert throws - // This exception is not originating from XUnit per se, + // This exception is not originating from NUnit.Framework per se, // but from the assertion library which is itself using - // Xunit internally. + // NUnit.Framework internally. Assert.Throws(() => - this.testCandidate.Copy( + this.testcandidate.Copy( testClassParentOriginal, testClassParentCopy, new List())); @@ -98,7 +99,7 @@ public void Copy_MustFailWhenChildrenistNull() /// /// Tests ICopy.Copy. /// - [Fact] + [Test] public void Copy_MustCopyEmptyCollection() { // Arrange @@ -107,7 +108,7 @@ public void Copy_MustCopyEmptyCollection() var testClassParentCopy = new ParentTestClass(); // Act - this.testCandidate.Copy( + this.testcandidate.Copy( testClassParentOriginal, testClassParentCopy, new List()); diff --git a/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToOneWithReverseRelationIntTests.cs b/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToOneWithReverseRelationIntTests.cs index b84f8dd..17e4375 100644 --- a/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToOneWithReverseRelationIntTests.cs +++ b/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToOneWithReverseRelationIntTests.cs @@ -1,27 +1,28 @@ -namespace BBT.StructureTools.Tests.Copy +namespace BBT.Life.LiBase.ITests.General.Services.Tools.Copy { using System; using System.Collections.Generic; + using BBT.StructureTools; using BBT.StructureTools.Copy; using BBT.StructureTools.Copy.Helper; using BBT.StructureTools.Tests.TestTools; using FluentAssertions; - using Ninject; - using Xunit; + using NUnit.Framework; + [TestFixture] public class CopyOperationCreateToOneWithReverseRelationIntTests { #region members and setup - private readonly ICopy testCandidate; + private readonly ICopy testcandidate; public CopyOperationCreateToOneWithReverseRelationIntTests() { - var kernel = TestIocContainer.Initialize(); + var kernel = new NinjectIocContainer(); - kernel.Bind>().To(); - kernel.Bind>().To(); + kernel.RegisterSingleton, TestClassCopyRegistrations>(); + kernel.RegisterSingleton, ChildTestClassCopyRegistrations>(); - this.testCandidate = kernel.Get>(); + this.testcandidate = kernel.GetInstance>(); } #endregion @@ -29,7 +30,7 @@ public CopyOperationCreateToOneWithReverseRelationIntTests() /// /// Tests ICopy.Copy. /// - [Fact] + [Test] public void Copy_MustCopyParentReference() { // Arrange @@ -42,7 +43,7 @@ public void Copy_MustCopyParentReference() var testClassParentCopy = new ParentTestClass(); // Act - this.testCandidate.Copy( + this.testcandidate.Copy( testClassParentOriginal, testClassParentCopy, new List()); @@ -59,7 +60,7 @@ public void Copy_MustCopyParentReference() /// Tests if the infrastructure can handle a copy create to one with reverse relation /// where the child is null. /// - [Fact] + [Test] public void Copy_MustNotFailWhenChildIsNull() { // Arrange @@ -71,7 +72,7 @@ public void Copy_MustNotFailWhenChildIsNull() var testClassParentCopy = new ParentTestClass(); // Act - this.testCandidate.Copy( + this.testcandidate.Copy( testClassParentOriginal, testClassParentCopy, new List()); diff --git a/src/BBT.StructureTools.Tests/Copy/CopyOperationCrossReferenceProcessingIntTests.cs b/src/BBT.StructureTools.Tests/Copy/CopyOperationCrossReferenceProcessingIntTests.cs index 663f2af..cc741b5 100644 --- a/src/BBT.StructureTools.Tests/Copy/CopyOperationCrossReferenceProcessingIntTests.cs +++ b/src/BBT.StructureTools.Tests/Copy/CopyOperationCrossReferenceProcessingIntTests.cs @@ -1,32 +1,33 @@ -namespace BBT.StructureTools.Tests.Copy +namespace BBT.Life.LiBase.ITests.General.Services.Tools.Copy { using System.Collections.Generic; + using BBT.StructureTools; using BBT.StructureTools.Copy; using BBT.StructureTools.Copy.Helper; using BBT.StructureTools.Tests.TestTools; using FluentAssertions; - using Ninject; - using Xunit; + using NUnit.Framework; + [TestFixture] public class CopyOperationCrossReferenceProcessingIntTests { - private readonly ICopy testCandidate; + private readonly ICopy testcandidate; public CopyOperationCrossReferenceProcessingIntTests() { - var kernel = TestIocContainer.Initialize(); + var kernel = new NinjectIocContainer(); - kernel.Bind>().To(); - kernel.Bind>().To(); - kernel.Bind>().To(); + kernel.RegisterSingleton, TestClassCopyRegistrations>(); + kernel.RegisterSingleton, TestClassChildCopyRegistrations>(); + kernel.RegisterSingleton, TestClassCrossReferencedChildCopyRegistrations>(); - this.testCandidate = kernel.Get>(); + this.testcandidate = kernel.GetInstance>(); } /// /// Tests ICopy.Copy. /// - [Fact] + [Test] public void MustExecuteAndSetCrossReferenceRegistrations() { // Arrange @@ -42,7 +43,7 @@ public void MustExecuteAndSetCrossReferenceRegistrations() var target = new TestClass(); // Act - this.testCandidate.Copy(source, target, new List()); + this.testcandidate.Copy(source, target, new List()); // Assert crossReferenceSource.Should().NotBeSameAs(target.TestClassCrossReferencedChild); diff --git a/src/BBT.StructureTools.Tests/Copy/CopyOperationInlineValueProcessingTests.cs b/src/BBT.StructureTools.Tests/Copy/CopyOperationInlineValueProcessingTests.cs index fa8ab64..75018c6 100644 --- a/src/BBT.StructureTools.Tests/Copy/CopyOperationInlineValueProcessingTests.cs +++ b/src/BBT.StructureTools.Tests/Copy/CopyOperationInlineValueProcessingTests.cs @@ -1,31 +1,32 @@ -namespace BBT.StructureTools.Tests.Copy +namespace BBT.Life.LiBase.ITests.General.Services.Tools.Copy { using System; using System.Collections.Generic; + using BBT.StructureTools; using BBT.StructureTools.Copy; using BBT.StructureTools.Copy.Helper; using BBT.StructureTools.Tests.TestTools; using FluentAssertions; - using Ninject; - using Xunit; + using NUnit.Framework; + [TestFixture] public class CopyOperationInlineValueProcessingTests { - private readonly ICopy testCandidate; + private readonly ICopy testcandidate; public CopyOperationInlineValueProcessingTests() { - var kernel = TestIocContainer.Initialize(); + var kernel = new NinjectIocContainer(); - kernel.Bind>().To(); + kernel.RegisterSingleton, TestClassCopyRegistrations>(); - this.testCandidate = kernel.Get>(); + this.testcandidate = kernel.GetInstance>(); } /// /// Tests ICopy.Copy. /// - [Fact] + [Test] public void MustExecuteInlineCopyProcessing() { // Arrange @@ -33,7 +34,7 @@ public void MustExecuteInlineCopyProcessing() var target = new TestClass(); // Act - this.testCandidate.Copy(source, target, new List()); + this.testcandidate.Copy(source, target, new List()); // Assert target.TestGuid.Should().NotBe(Guid.Empty); diff --git a/src/BBT.StructureTools.Tests/Copy/CopyOperationIntTests.cs b/src/BBT.StructureTools.Tests/Copy/CopyOperationIntTests.cs index d73953d..6ac8bb7 100644 --- a/src/BBT.StructureTools.Tests/Copy/CopyOperationIntTests.cs +++ b/src/BBT.StructureTools.Tests/Copy/CopyOperationIntTests.cs @@ -1,31 +1,32 @@ -namespace BBT.StructureTools.Tests.Copy +namespace BBT.Life.LiBase.ITests.General.Services.Tools.Copy { using System.Collections.Generic; + using BBT.StructureTools; using BBT.StructureTools.Copy; using BBT.StructureTools.Copy.Helper; using BBT.StructureTools.Copy.Processing; using BBT.StructureTools.Tests.TestTools; using FluentAssertions; - using Ninject; - using Xunit; + using NUnit.Framework; + [TestFixture] public class CopyOperationIntTests { - private readonly ICopy testCandidate; + private readonly ICopy testcandidate; public CopyOperationIntTests() { - var kernel = TestIocContainer.Initialize(); + var kernel = new NinjectIocContainer(); - kernel.Bind>().To(); + kernel.RegisterSingleton, TestClassCopyRegistrations>(); - this.testCandidate = kernel.Get>(); + this.testcandidate = kernel.GetInstance>(); } /// /// Tests ICopy.Copy. /// - [Fact] + [Test] public void Copy_WhenAttributeRegistered_MustCopyAttribute() { // Arrange @@ -33,7 +34,7 @@ public void Copy_WhenAttributeRegistered_MustCopyAttribute() var target = new TestClass(); // Act - this.testCandidate.Copy(source, target, new List()); + this.testcandidate.Copy(source, target, new List()); // Assert target.Value1.Should().Be(42); @@ -42,7 +43,7 @@ public void Copy_WhenAttributeRegistered_MustCopyAttribute() /// /// Tests ICopy.Copy. /// - [Fact] + [Test] public void Copy_WhenAttributeNotRegistered_MustNotCopyAttribute() { // Arrange @@ -50,7 +51,7 @@ public void Copy_WhenAttributeNotRegistered_MustNotCopyAttribute() var target = new TestClass { Value2 = 35 }; // Act - this.testCandidate.Copy(source, target, new List()); + this.testcandidate.Copy(source, target, new List()); // Assert target.Value2.Should().Be(35); @@ -59,7 +60,7 @@ public void Copy_WhenAttributeNotRegistered_MustNotCopyAttribute() /// /// Tests ICopy.Copy. /// - [Fact] + [Test] public void Copy_MustExecuteAdditionalProcessings() { // Arrange @@ -72,7 +73,7 @@ public void Copy_MustExecuteAdditionalProcessings() }; // Act - this.testCandidate.Copy(source, target, additionalProcessings); + this.testcandidate.Copy(source, target, additionalProcessings); // Assert target.Value1.Should().Be(27); diff --git a/src/BBT.StructureTools.Tests/Copy/CopyOperationRegisterCreateFromFactoryTests.cs b/src/BBT.StructureTools.Tests/Copy/CopyOperationRegisterCreateFromFactoryTests.cs index 322625c..65e29ca 100644 --- a/src/BBT.StructureTools.Tests/Copy/CopyOperationRegisterCreateFromFactoryTests.cs +++ b/src/BBT.StructureTools.Tests/Copy/CopyOperationRegisterCreateFromFactoryTests.cs @@ -1,31 +1,32 @@ -namespace BBT.StructureTools.Tests.Copy +namespace BBT.Life.LiBase.ITests.General.Services.Tools.Copy { using System.Collections.Generic; + using BBT.StructureTools; using BBT.StructureTools.Copy; using BBT.StructureTools.Copy.Helper; using BBT.StructureTools.Tests.TestTools; using FluentAssertions; - using Ninject; - using Xunit; + using NUnit.Framework; + [TestFixture] public class CopyOperationRegisterCreateFromFactoryTests { - private readonly ICopy testCandidate; + private readonly ICopy testcandidate; public CopyOperationRegisterCreateFromFactoryTests() { - var kernel = TestIocContainer.Initialize(); + var kernel = new NinjectIocContainer(); - kernel.Bind>().To(); - kernel.Bind().To(); + kernel.RegisterSingleton(typeof(ICopyRegistrations), typeof(TestClassCopyRegistrations)); + kernel.RegisterSingleton(typeof(ITestFactory), typeof(TestFactory)); - this.testCandidate = kernel.Get>(); + this.testcandidate = kernel.GetInstance>(); } /// /// Tests ICopy.Copy. /// - [Fact] + [Test] public void MustExecuteInlineCopyProcessing() { // Arrange @@ -33,7 +34,7 @@ public void MustExecuteInlineCopyProcessing() var target = new TestClass(); // Act - this.testCandidate.Copy(source, target, new List()); + this.testcandidate.Copy(source, target, new List()); // Assert target.Value1.Should().Be(888); @@ -41,7 +42,7 @@ public void MustExecuteInlineCopyProcessing() } /// - /// An interface defining a factory for test values - Used with RegisterInlineIocFactoryProcessing. + /// An interface defining a Factory for test values - Used with RegisterInlineIocFactoryProcessing. /// private interface ITestFactory { diff --git a/src/BBT.StructureTools.Tests/Copy/CopyOperationSubCopyIntTests.cs b/src/BBT.StructureTools.Tests/Copy/CopyOperationSubCopyIntTests.cs index 6e53bea..fb9444c 100644 --- a/src/BBT.StructureTools.Tests/Copy/CopyOperationSubCopyIntTests.cs +++ b/src/BBT.StructureTools.Tests/Copy/CopyOperationSubCopyIntTests.cs @@ -1,32 +1,33 @@ -namespace BBT.StructureTools.Tests.Copy +namespace BBT.Life.LiBase.ITests.General.Services.Tools.Copy { using System.Collections.Generic; + using BBT.StructureTools; using BBT.StructureTools.Copy; using BBT.StructureTools.Copy.Helper; using BBT.StructureTools.Copy.Processing; using BBT.StructureTools.Tests.TestTools; using FluentAssertions; - using Ninject; - using Xunit; + using NUnit.Framework; + [TestFixture] public class CopyOperationSubCopyIntTests { - private readonly ICopy testCandidate; + private readonly ICopy testcandidate; public CopyOperationSubCopyIntTests() { - var kernel = TestIocContainer.Initialize(); + var kernel = new NinjectIocContainer(); - kernel.Bind>().To(); - kernel.Bind>().To(); + kernel.RegisterSingleton, TestClassChildCopyRegistrations>(); + kernel.RegisterSingleton, TestClassParentCopyRegistrations>(); - this.testCandidate = kernel.Get>(); + this.testcandidate = kernel.GetInstance>(); } /// /// Tests ICopy.Copy. /// - [Fact] + [Test] public void Copy_WhenAttributeRegistered_MustCopyAttribute() { // Arrange @@ -34,7 +35,7 @@ public void Copy_WhenAttributeRegistered_MustCopyAttribute() var target = new TestClassChild(); // Act - this.testCandidate.Copy(source, target, new List()); + this.testcandidate.Copy(source, target, new List()); // Assert target.Value1.Should().Be(45); @@ -43,7 +44,7 @@ public void Copy_WhenAttributeRegistered_MustCopyAttribute() /// /// Tests ICopy.Copy. /// - [Fact] + [Test] public void Copy_WhenAttributeNotRegistered_MustNotCopyAttribute() { // Arrange @@ -51,7 +52,7 @@ public void Copy_WhenAttributeNotRegistered_MustNotCopyAttribute() var target = new TestClassChild { Value2 = 35 }; // Act - this.testCandidate.Copy(source, target, new List()); + this.testcandidate.Copy(source, target, new List()); // Assert target.Value2.Should().Be(35); @@ -60,7 +61,7 @@ public void Copy_WhenAttributeNotRegistered_MustNotCopyAttribute() /// /// Tests ICopy.Copy. /// - [Fact] + [Test] public void Copy_MustExecuteAdditionalProcessings() { // Arrange @@ -73,7 +74,7 @@ public void Copy_MustExecuteAdditionalProcessings() }; // Act - this.testCandidate.Copy(source, target, additionalProcessings); + this.testcandidate.Copy(source, target, additionalProcessings); // Assert target.Value1.Should().Be(27); diff --git a/src/BBT.StructureTools.Tests/Copy/PostProcessing/CopyOperationPostProcessingUsingParamsIntTests.cs b/src/BBT.StructureTools.Tests/Copy/PostProcessing/CopyOperationPostProcessingUsingParamsIntTests.cs index 14acc5e..63a3d3d 100644 --- a/src/BBT.StructureTools.Tests/Copy/PostProcessing/CopyOperationPostProcessingUsingParamsIntTests.cs +++ b/src/BBT.StructureTools.Tests/Copy/PostProcessing/CopyOperationPostProcessingUsingParamsIntTests.cs @@ -6,22 +6,22 @@ using BBT.StructureTools.Copy.Processing; using BBT.StructureTools.Tests.TestTools; using FluentAssertions; - using Ninject; - using Xunit; + using NUnit.Framework; + [TestFixture] public sealed class CopyOperationPostProcessingUsingParamsIntTests { #region setup and members - private readonly ICopy testCandidate; + private readonly ICopy testcandidate; public CopyOperationPostProcessingUsingParamsIntTests() { - var kernel = TestIocContainer.Initialize(); + var kernel = new NinjectIocContainer(); - kernel.Bind>().To(); + kernel.RegisterSingleton(typeof(ICopyRegistrations), typeof(TestClassCopyRegistrations)); - this.testCandidate = kernel.Get>(); + this.testcandidate = kernel.GetInstance>(); } #endregion @@ -32,7 +32,7 @@ public CopyOperationPostProcessingUsingParamsIntTests() /// Tests for the execution of a single post processing which was registered via /// Copy Registrations. /// - [Fact] + [Test] public void MustExecuteRegisteredPostProcessingsWhenParamsAreUsed() { // Arrange @@ -40,7 +40,7 @@ public void MustExecuteRegisteredPostProcessingsWhenParamsAreUsed() var testClassCopy = new TestClass(); // Act - this.testCandidate.Copy(testClassOriginal, testClassCopy, new List()); + this.testcandidate.Copy(testClassOriginal, testClassCopy, new List()); // Assert testClassCopy.TestValue.Should().Be(234); @@ -48,7 +48,6 @@ public void MustExecuteRegisteredPostProcessingsWhenParamsAreUsed() } #endregion - #region Testdata /// diff --git a/src/BBT.StructureTools.Tests/Copy/PostProcessing/CopyOperationPostProcessingWithoutUsingParamsIntTest.cs b/src/BBT.StructureTools.Tests/Copy/PostProcessing/CopyOperationPostProcessingWithoutUsingParamsIntTest.cs index 99c414c..ca2181a 100644 --- a/src/BBT.StructureTools.Tests/Copy/PostProcessing/CopyOperationPostProcessingWithoutUsingParamsIntTest.cs +++ b/src/BBT.StructureTools.Tests/Copy/PostProcessing/CopyOperationPostProcessingWithoutUsingParamsIntTest.cs @@ -6,22 +6,22 @@ using BBT.StructureTools.Copy.Processing; using BBT.StructureTools.Tests.TestTools; using FluentAssertions; - using Ninject; - using Xunit; + using NUnit.Framework; + [TestFixture] public class CopyOperationPostProcessingWithoutUsingParamsIntTest { #region setup and members - private readonly ICopy testCandidate; + private readonly ICopy testcandidate; public CopyOperationPostProcessingWithoutUsingParamsIntTest() { - var kernel = TestIocContainer.Initialize(); + var kernel = new NinjectIocContainer(); - kernel.Bind>().To(); + kernel.RegisterSingleton(typeof(ICopyRegistrations), typeof(TestClassCopyRegistrations)); - this.testCandidate = kernel.Get>(); + this.testcandidate = kernel.GetInstance>(); } #endregion @@ -32,7 +32,7 @@ public CopyOperationPostProcessingWithoutUsingParamsIntTest() /// Tests for the execution of a single post processing which was registered via /// Copy Registrations. /// - [Fact] + [Test] public void MustExecuteRegisteredSinglePostProcessings() { // Arrange @@ -40,7 +40,7 @@ public void MustExecuteRegisteredSinglePostProcessings() var testClassCopy = new TestClass(); // Act - this.testCandidate.Copy(testClassOriginal, testClassCopy, new List()); + this.testcandidate.Copy(testClassOriginal, testClassCopy, new List()); // Assert testClassCopy.TestValue.Should().Be(234); @@ -48,7 +48,6 @@ public void MustExecuteRegisteredSinglePostProcessings() } #endregion - #region Testdata /// diff --git a/src/BBT.StructureTools.Tests/TestTools/IoC/IIocContainer.cs b/src/BBT.StructureTools.Tests/TestTools/IoC/IIocContainer.cs new file mode 100644 index 0000000..bbcdb6e --- /dev/null +++ b/src/BBT.StructureTools.Tests/TestTools/IoC/IIocContainer.cs @@ -0,0 +1,47 @@ +namespace BBT.StructureTools.Tests.TestTools.IoC +{ + using System; + + /// + /// Abstraction of any IoC container to be used for testing. + /// + internal interface IIocContainer + { + /// + /// Initializes the IoC container. + /// + void Initialize(); + + /// + /// Registers the for the given + /// as singleton instance. + /// + /// Abstraction (interface) type. + /// Implementation of . + void RegisterSingleton() + where TImplementation : TAbstraction; + + /// + /// Registers the for the given + /// transiently. + /// + /// Abstraction (interface) type. + /// Implementation of . + void RegisterTransient() + where TImplementation : TAbstraction; + + /// + /// Registers the for the given + /// as singleton instance. + /// + /// Abstraction (interface) type. + /// Implementation of the abstraction. + void RegisterSingleton(Type abstraction, Type implementation); + + /// + /// Returns the implementation registered for . + /// + /// Abstraction for which the implementation is returned. + T GetInstance(); + } +} diff --git a/src/BBT.StructureTools.Tests/TestTools/IoC/NinjectIocContainer.cs b/src/BBT.StructureTools.Tests/TestTools/IoC/NinjectIocContainer.cs new file mode 100644 index 0000000..5deb802 --- /dev/null +++ b/src/BBT.StructureTools.Tests/TestTools/IoC/NinjectIocContainer.cs @@ -0,0 +1,68 @@ +namespace BBT.StructureTools.Tests.TestTools +{ + using System; + using BBT.StrategyPattern; + using BBT.StructureTools.Initialization; + using BBT.StructureTools.Tests.TestTools.IoC; + using Ninject; + + /// + internal class NinjectIocContainer : IIocContainer + { + private StandardKernel ninjectKernel; + + /// + /// Initializes a new instance of the class. + /// + public NinjectIocContainer() + { + this.Initialize(); + } + + /// + public T GetInstance() + { + return this.ninjectKernel.Get(); + } + + /// + public void Initialize() + { + var settings = new NinjectSettings + { + InjectNonPublic = true, + }; + + this.ninjectKernel = new StandardKernel(settings); + + var resolver = new NinjectResolver(this.ninjectKernel); + IocHandler.Instance.IocResolver = resolver; + + // Dependencies from BBT.StrategyPattern + this.ninjectKernel.Bind(typeof(IStrategyLocator<>)).To(typeof(NinjectStrategyLocator<>)); + this.ninjectKernel.Bind(typeof(IInstanceCreator<,>)).To(typeof(GenericInstanceCreator<,>)); + + IocHandler.Instance.DoIocRegistrations(this.RegisterSingleton); + } + + /// + public void RegisterSingleton() + where TImplementation : TAbstraction + { + this.ninjectKernel.Bind().To().InSingletonScope(); + } + + /// + public void RegisterTransient() + where TImplementation : TAbstraction + { + this.ninjectKernel.Bind().To().InTransientScope(); + } + + /// + public void RegisterSingleton(Type abstraction, Type implementation) + { + this.ninjectKernel.Bind(abstraction).To(implementation).InSingletonScope(); + } + } +} diff --git a/src/BBT.StructureTools.Tests/TestTools/TestIocContainer.cs b/src/BBT.StructureTools.Tests/TestTools/TestIocContainer.cs deleted file mode 100644 index b95d1b1..0000000 --- a/src/BBT.StructureTools.Tests/TestTools/TestIocContainer.cs +++ /dev/null @@ -1,46 +0,0 @@ -namespace BBT.StructureTools.Tests.TestTools -{ - using System; - using BBT.StrategyPattern; - using BBT.StructureTools.Initialization; - using BBT.StructureTools.Tests.TestTools.IoC; - using Ninject; - - /// - /// Utilities to set up and configure for test runs. - /// - /// - /// Keep this code test framework-agnostic!. - /// - public static class TestIocContainer - { - /// - /// Register types for copy, convert, and compare with - /// Ninject and create a resolver which is assigned to the - /// . The - /// which is used within the is being - /// returned for further manipulation from within the calling test or test setup method. - /// - public static IKernel Initialize() - { - var settings = new NinjectSettings(); - - var kernel = new StandardKernel(settings); - - var resolver = new NinjectResolver(kernel); - IocHandler.Instance.IocResolver = resolver; - - // Dependencies from BBT.StrategyPattern - kernel.Bind(typeof(IStrategyLocator<>)).To(typeof(NinjectStrategyLocator<>)); - kernel.Bind(typeof(IInstanceCreator<,>)).To(typeof(GenericInstanceCreator<,>)); - - IocHandler.Instance.DoIocRegistrations( - (Type abstraction, Type implementation) => - kernel.Bind(abstraction).To(implementation), - (Type abstraction, Type implementation) => - kernel.Bind(abstraction).To(implementation).InTransientScope()); - - return kernel; - } - } -} From d4064026766042fe23f29a9fd1435d52fd66f91e Mon Sep 17 00:00:00 2001 From: Marco Bertschi Date: Thu, 28 Nov 2019 21:03:23 +0100 Subject: [PATCH 2/2] Add tests for Castle Windsor --- .../BBT.StructureTools.Tests.csproj | 4 +- .../ComparerWithObjectAttributeTests.cs | 25 ++++---- ...ributeWithDistinguishedComparerIntTests.cs | 31 ++++----- ...parerWithObjectsAndValueAttributesTests.cs | 28 +++++---- .../ComparerWithValueAttributeTests.cs | 23 +++---- .../Compare/SubComparerUsingComparerTests.cs | 29 ++++----- .../Compare/ToManyComparerTests.cs | 7 ++- .../Convert/ConvertHelperTests.cs | 1 + .../ConvertRootTreeLeafWithMasterDataTests.cs | 29 +++++---- .../Copy/CopierIntegrationTests.cs | 23 +++---- ...CreateToManyFromGenericStrategyIntTests.cs | 25 ++++---- ...ericStrategyWithReverseRelationIntTests.cs | 25 ++++---- ...CreateToManyWithReverseRelationIntTests.cs | 23 +++---- ...nCreateToOneWithReverseRelationIntTests.cs | 21 ++++--- ...erationCrossReferenceProcessingIntTests.cs | 21 ++++--- ...CopyOperationInlineValueProcessingTests.cs | 17 ++--- .../Copy/CopyOperationIntTests.cs | 21 ++++--- ...OperationRegisterCreateFromFactoryTests.cs | 19 +++--- .../Copy/CopyOperationSubCopyIntTests.cs | 23 +++---- ...rationPostProcessingUsingParamsIntTests.cs | 15 ++--- ...PostProcessingWithoutUsingParamsIntTest.cs | 15 ++--- .../TestTools/IoC/IIocContainer.cs | 4 +- ...ocator.cs => IocHandlerStrategyLocator.cs} | 2 +- .../TestTools/IoC/IocTestFixtureSource.cs | 22 +++++++ .../IoC/Vendor/CastleIocContainer.cs | 63 +++++++++++++++++++ .../TestTools/IoC/Vendor/CastleResolver.cs | 41 ++++++++++++ .../IoC/{ => Vendor}/NinjectIocContainer.cs | 21 +++---- .../IoC/{ => Vendor}/NinjectResolver.cs | 2 +- .../Strategy/CreateInstanceOfTypeStrategy.cs | 2 +- 29 files changed, 365 insertions(+), 217 deletions(-) rename src/BBT.StructureTools.Tests/TestTools/IoC/{NinjectStrategyLocator.cs => IocHandlerStrategyLocator.cs} (80%) create mode 100644 src/BBT.StructureTools.Tests/TestTools/IoC/IocTestFixtureSource.cs create mode 100644 src/BBT.StructureTools.Tests/TestTools/IoC/Vendor/CastleIocContainer.cs create mode 100644 src/BBT.StructureTools.Tests/TestTools/IoC/Vendor/CastleResolver.cs rename src/BBT.StructureTools.Tests/TestTools/IoC/{ => Vendor}/NinjectIocContainer.cs (83%) rename src/BBT.StructureTools.Tests/TestTools/IoC/{ => Vendor}/NinjectResolver.cs (93%) diff --git a/src/BBT.StructureTools.Tests/BBT.StructureTools.Tests.csproj b/src/BBT.StructureTools.Tests/BBT.StructureTools.Tests.csproj index 5ab6eb0..bfd4807 100644 --- a/src/BBT.StructureTools.Tests/BBT.StructureTools.Tests.csproj +++ b/src/BBT.StructureTools.Tests/BBT.StructureTools.Tests.csproj @@ -18,11 +18,9 @@ pdbonly - - - + diff --git a/src/BBT.StructureTools.Tests/Compare/ComparerWithObjectAttributeTests.cs b/src/BBT.StructureTools.Tests/Compare/ComparerWithObjectAttributeTests.cs index 194e793..42c96bc 100644 --- a/src/BBT.StructureTools.Tests/Compare/ComparerWithObjectAttributeTests.cs +++ b/src/BBT.StructureTools.Tests/Compare/ComparerWithObjectAttributeTests.cs @@ -5,7 +5,7 @@ using BBT.StructureTools.Compare.Exclusions; using BBT.StructureTools.Compare.Helper; using BBT.StructureTools.Tests.Compare.Intention; - using BBT.StructureTools.Tests.TestTools; + using BBT.StructureTools.Tests.TestTools.IoC; using FluentAssertions; using NUnit.Framework; @@ -13,18 +13,19 @@ /// Test for Comparer infrastructure with object attributes. /// [TestFixture] + [TestFixtureSource(typeof(IocTestFixtureSource), "IocContainers")] public class ComparerWithObjectAttributeTests { #region Members, Setup - private readonly IComparer testcandidate; + private readonly IComparer testCandidate; - public ComparerWithObjectAttributeTests() + public ComparerWithObjectAttributeTests(IIocContainer iocContainer) { - var kernel = new NinjectIocContainer(); + iocContainer.Initialize(); - kernel.RegisterSingleton, TestClassCompareRegistrations>(); + iocContainer.RegisterSingleton, TestClassCompareRegistrations>(); - this.testcandidate = kernel.GetInstance>(); + this.testCandidate = iocContainer.GetInstance>(); } #endregion @@ -40,7 +41,7 @@ public void Equals_WhenSameInstance_MustReturnTrue() }; // Act - var result = this.testcandidate.Equals(testClass, testClass); + var result = this.testCandidate.Equals(testClass, testClass); // Assert result.Should().BeTrue(); @@ -57,7 +58,7 @@ public void Equals_WhenSameInstanceAndObjectAttributeNull_MustReturnTrue() }; // Act - var result = this.testcandidate.Equals(testClass, testClass); + var result = this.testCandidate.Equals(testClass, testClass); // Assert result.Should().BeTrue(); @@ -72,7 +73,7 @@ public void Equals_WhenAttributeObjectsEqual_MustReturnTrue() var testClassB = new TestClass { TestAttribute1 = testAttribute }; // Act - var result = this.testcandidate.Equals(testClassA, testClassB); + var result = this.testCandidate.Equals(testClassA, testClassB); // Assert result.Should().BeTrue(); @@ -88,7 +89,7 @@ public void Equals_WhenAttributeObjectsNotEqual_MustReturnFalse() var testClassB = new TestClass { TestAttribute1 = testAttribute2 }; // Act - var result = this.testcandidate.Equals(testClassA, testClassB); + var result = this.testCandidate.Equals(testClassA, testClassB); // Assert result.Should().BeFalse(); @@ -103,7 +104,7 @@ public void Equals_WhenAttributeObjectsNotEqualButNotRegistered_MustReturnTrue() var testClassB = new TestClass { TestAttribute2 = testAttribute }; // Act - var result = this.testcandidate.Equals(testClassA, testClassB); + var result = this.testCandidate.Equals(testClassA, testClassB); // Assert result.Should().BeTrue(); @@ -124,7 +125,7 @@ public void Equals_WhenAttributeObjectsNotEqualButExcluded_MustReturnTrue() }; // Act - var result = this.testcandidate.Equals(testClassA, testClassB, System.Array.Empty(), comparerExclusions); + var result = this.testCandidate.Equals(testClassA, testClassB, System.Array.Empty(), comparerExclusions); // Assert result.Should().BeTrue(); diff --git a/src/BBT.StructureTools.Tests/Compare/ComparerWithObjectAttributeWithDistinguishedComparerIntTests.cs b/src/BBT.StructureTools.Tests/Compare/ComparerWithObjectAttributeWithDistinguishedComparerIntTests.cs index c9fbd1d..4fedab0 100644 --- a/src/BBT.StructureTools.Tests/Compare/ComparerWithObjectAttributeWithDistinguishedComparerIntTests.cs +++ b/src/BBT.StructureTools.Tests/Compare/ComparerWithObjectAttributeWithDistinguishedComparerIntTests.cs @@ -6,27 +6,28 @@ using BBT.StructureTools.Compare.Exclusions; using BBT.StructureTools.Compare.Helper; using BBT.StructureTools.Tests.Compare.Intention; - using BBT.StructureTools.Tests.TestTools; + using BBT.StructureTools.Tests.TestTools.IoC; using FluentAssertions; using NUnit.Framework; [TestFixture] + [TestFixtureSource(typeof(IocTestFixtureSource), "IocContainers")] public class ComparerWithObjectAttributeWithDistinguishedComparerIntTests { #region Members, Setup private static IComparer distinguishedComparer; - private readonly IComparer testcandidate; + private readonly IComparer testCandidate; - public ComparerWithObjectAttributeWithDistinguishedComparerIntTests() + public ComparerWithObjectAttributeWithDistinguishedComparerIntTests(IIocContainer iocContainer) { - var kernel = new NinjectIocContainer(); + iocContainer.Initialize(); - kernel.RegisterSingleton, TestClassCompareRegistrations>(); - kernel.RegisterSingleton, TestAttributeCompareRegistrations>(); + iocContainer.RegisterSingleton, TestClassCompareRegistrations>(); + iocContainer.RegisterSingleton, TestAttributeCompareRegistrations>(); - distinguishedComparer = kernel.GetInstance>(); - this.testcandidate = kernel.GetInstance>(); + distinguishedComparer = iocContainer.GetInstance>(); + this.testCandidate = iocContainer.GetInstance>(); } #endregion @@ -45,7 +46,7 @@ public void Equals_WhenSameInstance_MustReturnTrue() }; // Act - var result = this.testcandidate.Equals(testClass, testClass); + var result = this.testCandidate.Equals(testClass, testClass); // Assert result.Should().BeTrue(); @@ -65,7 +66,7 @@ public void Equals_WhenSameInstanceAndObjectAttributeNull_MustReturnTrue() }; // Act - var result = this.testcandidate.Equals(testClass, testClass); + var result = this.testCandidate.Equals(testClass, testClass); // Assert result.Should().BeTrue(); @@ -83,7 +84,7 @@ public void Equals_WhenAttributeObjectsEqual_MustReturnTrue() var testClassB = new TestClass { TestAttribute = testAttribute }; // Act - var result = this.testcandidate.Equals(testClassA, testClassB); + var result = this.testCandidate.Equals(testClassA, testClassB); // Assert result.Should().BeTrue(); @@ -102,7 +103,7 @@ public void Equals_WhenBaseModelAttributeObjectsNotEqualButHaveSameValue_MustRet var testClassB = new TestClass { TestAttribute = testAttribute2 }; // Act - var result = this.testcandidate.Equals(testClassA, testClassB); + var result = this.testCandidate.Equals(testClassA, testClassB); // Assert result.Should().BeTrue(); @@ -121,7 +122,7 @@ public void Equals_WhenBaseModelAttributeObjectsNotEqualAndHaveDifferentValue_Mu var testClassB = new TestClass { TestAttribute = testAttribute2 }; // Act - var result = this.testcandidate.Equals(testClassA, testClassB); + var result = this.testCandidate.Equals(testClassA, testClassB); // Assert result.Should().BeFalse(); @@ -140,7 +141,7 @@ public void Equals_WhenAttributeObjectsNotEqualButNotRegistered_MustReturnTrue() var testClassB = new TestClass { TestAttribute = testAttribute2 }; // Act - var result = this.testcandidate.Equals(testClassA, testClassB); + var result = this.testCandidate.Equals(testClassA, testClassB); // Assert result.Should().BeTrue(); @@ -164,7 +165,7 @@ public void Equals_WhenAttributeObjectsNotEqualButExcluded_MustReturnTrue() }; // Act - var result = this.testcandidate.Equals(testClassA, testClassB, Array.Empty(), comparerExclusions); + var result = this.testCandidate.Equals(testClassA, testClassB, Array.Empty(), comparerExclusions); // Assert result.Should().BeTrue(); diff --git a/src/BBT.StructureTools.Tests/Compare/ComparerWithObjectsAndValueAttributesTests.cs b/src/BBT.StructureTools.Tests/Compare/ComparerWithObjectsAndValueAttributesTests.cs index 8e120e4..1d4256d 100644 --- a/src/BBT.StructureTools.Tests/Compare/ComparerWithObjectsAndValueAttributesTests.cs +++ b/src/BBT.StructureTools.Tests/Compare/ComparerWithObjectsAndValueAttributesTests.cs @@ -6,22 +6,24 @@ using BBT.StructureTools.Compare.Exclusions; using BBT.StructureTools.Compare.Helper; using BBT.StructureTools.Tests.Compare.Intention; - using BBT.StructureTools.Tests.TestTools; + using BBT.StructureTools.Tests.TestTools.IoC; using FluentAssertions; using NUnit.Framework; [TestFixture] + [TestFixtureSource(typeof(IocTestFixtureSource), "IocContainers")] public class ComparerWithObjectsAndValueAttributesTests { #region Members, Setup - private readonly IComparer testcandidate; + private readonly IComparer testCandidate; - public ComparerWithObjectsAndValueAttributesTests() + public ComparerWithObjectsAndValueAttributesTests(IIocContainer iocContainer) { - var kernel = new NinjectIocContainer(); - kernel.RegisterSingleton, TestClassCompareRegistrations>(); + iocContainer.Initialize(); - this.testcandidate = kernel.GetInstance>(); + iocContainer.RegisterSingleton, TestClassCompareRegistrations>(); + + this.testCandidate = iocContainer.GetInstance>(); } #endregion @@ -38,7 +40,7 @@ public void Equals_WhenSameInstance_MustReturnTrue() }; // Act - var result = this.testcandidate.Equals(testClass, testClass); + var result = this.testCandidate.Equals(testClass, testClass); // Assert result.Should().BeTrue(); @@ -56,7 +58,7 @@ public void Equals_WhenSameInstanceAndObjectAttributeNullButValueNot_MustReturnT }; // Act - var result = this.testcandidate.Equals(testClass, testClass); + var result = this.testCandidate.Equals(testClass, testClass); // Assert result.Should().BeTrue(); @@ -79,7 +81,7 @@ public void Equals_WhenAttributeObjectsAndValueEqual_MustReturnTrue() }; // Act - var result = this.testcandidate.Equals(testClassA, testClassB); + var result = this.testCandidate.Equals(testClassA, testClassB); // Assert result.Should().BeTrue(); @@ -102,7 +104,7 @@ public void Equals_WhenAttributeObjectsButNotValueEqual_MustReturnFalse() }; // Act - var result = this.testcandidate.Equals(testClassA, testClassB); + var result = this.testCandidate.Equals(testClassA, testClassB); // Assert result.Should().BeFalse(); @@ -126,7 +128,7 @@ public void Equals_WhenAttributeObjectsNotButValueEqual_MustReturnFalse() }; // Act - var result = this.testcandidate.Equals(testClassA, testClassB); + var result = this.testCandidate.Equals(testClassA, testClassB); // Assert result.Should().BeFalse(); @@ -150,7 +152,7 @@ public void Equals_WhenAttributeObjectsAndValuesNotEqualButNotRegistered_MustRet }; // Act - var result = this.testcandidate.Equals(testClassA, testClassB); + var result = this.testCandidate.Equals(testClassA, testClassB); // Assert result.Should().BeTrue(); @@ -181,7 +183,7 @@ public void Equals_WhenAttributeObjectsAndValuesNotEqualButExcluded_MustReturnTr }; // Act - var result = this.testcandidate.Equals(testClassA, testClassB, Array.Empty(), comparerExclusions); + var result = this.testCandidate.Equals(testClassA, testClassB, Array.Empty(), comparerExclusions); // Assert result.Should().BeTrue(); diff --git a/src/BBT.StructureTools.Tests/Compare/ComparerWithValueAttributeTests.cs b/src/BBT.StructureTools.Tests/Compare/ComparerWithValueAttributeTests.cs index 36f3284..ded1f34 100644 --- a/src/BBT.StructureTools.Tests/Compare/ComparerWithValueAttributeTests.cs +++ b/src/BBT.StructureTools.Tests/Compare/ComparerWithValueAttributeTests.cs @@ -6,22 +6,23 @@ using BBT.StructureTools.Compare.Exclusions; using BBT.StructureTools.Compare.Helper; using BBT.StructureTools.Tests.Compare.Intention; - using BBT.StructureTools.Tests.TestTools; + using BBT.StructureTools.Tests.TestTools.IoC; using FluentAssertions; using NUnit.Framework; [TestFixture] + [TestFixtureSource(typeof(IocTestFixtureSource), "IocContainers")] public class ComparerWithValueAttributeTests { - private readonly IComparer testcandidate; + private readonly IComparer testCandidate; - public ComparerWithValueAttributeTests() + public ComparerWithValueAttributeTests(IIocContainer iocContainer) { - var kernel = new NinjectIocContainer(); + iocContainer.Initialize(); - kernel.RegisterSingleton, TestClassCompareRegistrations>(); + iocContainer.RegisterSingleton, TestClassCompareRegistrations>(); - this.testcandidate = kernel.GetInstance>(); + this.testCandidate = iocContainer.GetInstance>(); } [Test] @@ -31,7 +32,7 @@ public void Equals_WhenSameInstance_MustReturnTrue() var testClass = new TestClass { Value1 = 45 }; // Act - var result = this.testcandidate.Equals(testClass, testClass); + var result = this.testCandidate.Equals(testClass, testClass); // Assert result.Should().BeTrue(); @@ -45,7 +46,7 @@ public void Equals_WhenAttributeValuesEqual_MustReturnTrue() var testClassB = new TestClass { Value1 = 45 }; // Act - var result = this.testcandidate.Equals(testClassA, testClassB); + var result = this.testCandidate.Equals(testClassA, testClassB); // Assert result.Should().BeTrue(); @@ -59,7 +60,7 @@ public void Equals_WhenAttributeValuesNotEqual_MustReturnFalse() var testClassB = new TestClass { Value1 = 44 }; // Act - var result = this.testcandidate.Equals(testClassA, testClassB); + var result = this.testCandidate.Equals(testClassA, testClassB); // Assert result.Should().BeFalse(); @@ -73,7 +74,7 @@ public void Equals_WhenAttributeValuesNotEqualButNotRegistered_MustReturnTrue() var testClassB = new TestClass { Value2 = 44 }; // Act - var result = this.testcandidate.Equals(testClassA, testClassB); + var result = this.testCandidate.Equals(testClassA, testClassB); // Assert result.Should().BeTrue(); @@ -88,7 +89,7 @@ public void Equals_WhenAttributeValuesNotEqualButExcluded_MustReturnTrue() var comparerExclusions = new List { new PropertyComparerExclusion(x => x.Value1) }; // Act - var result = this.testcandidate.Equals(testClassA, testClassB, Array.Empty(), comparerExclusions); + var result = this.testCandidate.Equals(testClassA, testClassB, Array.Empty(), comparerExclusions); // Assert result.Should().BeTrue(); diff --git a/src/BBT.StructureTools.Tests/Compare/SubComparerUsingComparerTests.cs b/src/BBT.StructureTools.Tests/Compare/SubComparerUsingComparerTests.cs index 61dc2a9..073aa8a 100644 --- a/src/BBT.StructureTools.Tests/Compare/SubComparerUsingComparerTests.cs +++ b/src/BBT.StructureTools.Tests/Compare/SubComparerUsingComparerTests.cs @@ -6,26 +6,27 @@ using BBT.StructureTools.Compare.Exclusions; using BBT.StructureTools.Compare.Helper; using BBT.StructureTools.Tests.Compare.Intention; - using BBT.StructureTools.Tests.TestTools; + using BBT.StructureTools.Tests.TestTools.IoC; using FluentAssertions; using NUnit.Framework; [TestFixture] + [TestFixtureSource(typeof(IocTestFixtureSource), "IocContainers")] public class SubComparerUsingComparerTests { #region Members, Setup private static IComparer parentCompare; - private readonly IComparer testcandidate; + private readonly IComparer testCandidate; - public SubComparerUsingComparerTests() + public SubComparerUsingComparerTests(IIocContainer iocContainer) { - var kernel = new NinjectIocContainer(); + iocContainer.Initialize(); - kernel.RegisterSingleton, TestClassChildCompareRegistrations>(); - kernel.RegisterSingleton, TestClassParentCompareRegistrations>(); + iocContainer.RegisterSingleton, TestClassChildCompareRegistrations>(); + iocContainer.RegisterSingleton, TestClassParentCompareRegistrations>(); - parentCompare = kernel.GetInstance>(); - this.testcandidate = kernel.GetInstance>(); + parentCompare = iocContainer.GetInstance>(); + this.testCandidate = iocContainer.GetInstance>(); } #endregion @@ -40,7 +41,7 @@ public void Equals_SameInstance_MustReturnTrue() var testClass = new TestClassChild(); // Act - var result = this.testcandidate.Equals(testClass, testClass); + var result = this.testCandidate.Equals(testClass, testClass); // Assert result.Should().BeTrue(); @@ -63,7 +64,7 @@ public void Equals_DifferentInstancesSameAttributes_MustReturnTrue() }; // Act - var result = this.testcandidate.Equals(testClass, testClass2); + var result = this.testCandidate.Equals(testClass, testClass2); // Assert result.Should().BeTrue(); @@ -86,7 +87,7 @@ public void Equals_DifferentInstancesNotSameAttributes_MustReturnFalse() }; // Act - var result = this.testcandidate.Equals(testClass, testClass2); + var result = this.testCandidate.Equals(testClass, testClass2); // Assert result.Should().BeFalse(); @@ -109,7 +110,7 @@ public void Equals_DifferentInstancesNotSameAttributesNotRegistered_MustReturnTr }; // Act - var result = this.testcandidate.Equals(testClass, testClass2); + var result = this.testCandidate.Equals(testClass, testClass2); // Assert result.Should().BeTrue(); @@ -137,7 +138,7 @@ public void Equals_DifferentInstancesNotSameAttributesButExcludedByParent_MustRe }; // Act - var result = this.testcandidate.Equals(testClass, testClass2, Array.Empty(), comparerExclusions); + var result = this.testCandidate.Equals(testClass, testClass2, Array.Empty(), comparerExclusions); // Assert result.Should().BeTrue(); @@ -165,7 +166,7 @@ public void Equals_DifferentInstancesNotSameAttributesButExcludedBySubCompareExc }; // Act - var result = this.testcandidate.Equals(testClass, testClass2, Array.Empty(), comparerExclusions); + var result = this.testCandidate.Equals(testClass, testClass2, Array.Empty(), comparerExclusions); // Assert result.Should().BeTrue(); diff --git a/src/BBT.StructureTools.Tests/Compare/ToManyComparerTests.cs b/src/BBT.StructureTools.Tests/Compare/ToManyComparerTests.cs index 47a6c00..20c921b 100644 --- a/src/BBT.StructureTools.Tests/Compare/ToManyComparerTests.cs +++ b/src/BBT.StructureTools.Tests/Compare/ToManyComparerTests.cs @@ -5,19 +5,20 @@ using BBT.StructureTools.Compare.Helper; using BBT.StructureTools.Initialization; using BBT.StructureTools.Tests.Compare.Intention; - using BBT.StructureTools.Tests.TestTools; + using BBT.StructureTools.Tests.TestTools.IoC; using FluentAssertions; using NUnit.Framework; [TestFixture] + [TestFixtureSource(typeof(IocTestFixtureSource), "IocContainers")] public class ToManyComparerTests { #region Members, Setup private readonly IComparer comparer; - public ToManyComparerTests() + public ToManyComparerTests(IIocContainer iocContainer) { - var iocContainer = new NinjectIocContainer(); + iocContainer.Initialize(); iocContainer.RegisterSingleton, TestClassCompareRegistrations>(); iocContainer.RegisterSingleton, TestClassListOfChildrenItemCompareRegistrations>(); diff --git a/src/BBT.StructureTools.Tests/Convert/ConvertHelperTests.cs b/src/BBT.StructureTools.Tests/Convert/ConvertHelperTests.cs index 00061a5..e01188d 100644 --- a/src/BBT.StructureTools.Tests/Convert/ConvertHelperTests.cs +++ b/src/BBT.StructureTools.Tests/Convert/ConvertHelperTests.cs @@ -7,6 +7,7 @@ using Moq; using NUnit.Framework; + [TestFixture] public class ConvertHelperTests { [Test] diff --git a/src/BBT.StructureTools.Tests/Convert/ConvertRootTreeLeafWithMasterDataTests.cs b/src/BBT.StructureTools.Tests/Convert/ConvertRootTreeLeafWithMasterDataTests.cs index 20d728d..a17b9b9 100644 --- a/src/BBT.StructureTools.Tests/Convert/ConvertRootTreeLeafWithMasterDataTests.cs +++ b/src/BBT.StructureTools.Tests/Convert/ConvertRootTreeLeafWithMasterDataTests.cs @@ -11,32 +11,35 @@ using BBT.StructureTools.Tests.Convert.TestStructure.Source; using BBT.StructureTools.Tests.Convert.TestStructure.Target; using BBT.StructureTools.Tests.TestTools; + using BBT.StructureTools.Tests.TestTools.IoC; using FluentAssertions; using NUnit.Framework; [TestFixture] + [NonParallelizable] + [TestFixtureSource(typeof(IocTestFixtureSource), "IocContainers")] public class ConvertRootTreeLeafWithMasterDataTests { - private readonly IConvert testcandidate; + private readonly IConvert testCandidate; - public ConvertRootTreeLeafWithMasterDataTests() + public ConvertRootTreeLeafWithMasterDataTests(IIocContainer iocContainer) { - var kernel = new NinjectIocContainer(); + iocContainer.Initialize(); - kernel.RegisterSingleton(typeof(ITemporalDataDescriptor<>), typeof(TemporalDataDescriptor)); + iocContainer.RegisterSingleton(typeof(ITemporalDataDescriptor), typeof(TemporalDataDescriptor)); - kernel.RegisterSingleton, RootTargetRootConvertRegistrations>(); + iocContainer.RegisterSingleton, RootTargetRootConvertRegistrations>(); - kernel.RegisterSingleton, TreeTargetTreeConvertRegistrations>(); - kernel.RegisterSingleton, TreeMasterDataToTreeConvertRegistrations>(); + iocContainer.RegisterSingleton, TreeTargetTreeConvertRegistrations>(); + iocContainer.RegisterSingleton, TreeMasterDataToTreeConvertRegistrations>(); - kernel.RegisterSingleton, LeafTargetLeafConvertRegistrations>(); - kernel.RegisterSingleton, LeafMasterDataTargetLeafConvertRegistrations>(); - kernel.RegisterSingleton, TemporalLeafMasterDataTemporalLeafDatconvertRegistrations>(); + iocContainer.RegisterSingleton, LeafTargetLeafConvertRegistrations>(); + iocContainer.RegisterSingleton, LeafMasterDataTargetLeafConvertRegistrations>(); + iocContainer.RegisterSingleton, TemporalLeafMasterDataTemporalLeafDatconvertRegistrations>(); - kernel.RegisterSingleton, TemporalDatcopyRegistrations>(); + iocContainer.RegisterSingleton, TemporalDatcopyRegistrations>(); - this.testcandidate = kernel.GetInstance>(); + this.testCandidate = iocContainer.GetInstance>(); } [Test] @@ -88,7 +91,7 @@ public void StructureFromRootToLeafIsConvertIntoTargetStructure() // Act var target = new TargetRoot(); - this.testcandidate.Convert(root, target, new List()); + this.testCandidate.Convert(root, target, new List()); // Assert // Find target objects diff --git a/src/BBT.StructureTools.Tests/Copy/CopierIntegrationTests.cs b/src/BBT.StructureTools.Tests/Copy/CopierIntegrationTests.cs index fb6bd55..8975fab 100644 --- a/src/BBT.StructureTools.Tests/Copy/CopierIntegrationTests.cs +++ b/src/BBT.StructureTools.Tests/Copy/CopierIntegrationTests.cs @@ -6,25 +6,26 @@ using BBT.StructureTools.Copy; using BBT.StructureTools.Copy.Helper; using BBT.StructureTools.Copy.Processing; - using BBT.StructureTools.Tests.TestTools; + using BBT.StructureTools.Tests.TestTools.IoC; using FluentAssertions; using NUnit.Framework; [TestFixture] + [TestFixtureSource(typeof(IocTestFixtureSource), "IocContainers")] public class CopierIntegrationTests { #region members and setup - private readonly ICopy testcandidate; + private readonly ICopy testCandidate; - public CopierIntegrationTests() + public CopierIntegrationTests(IIocContainer iocContainer) { - var kernel = new NinjectIocContainer(); + iocContainer.Initialize(); - kernel.RegisterSingleton, TestClassCopyRegistrations>(); - kernel.RegisterSingleton, ChildTestClassCopyRegistrations>(); - kernel.RegisterSingleton, ChildTestClass2CopyRegistrations>(); + iocContainer.RegisterSingleton, TestClassCopyRegistrations>(); + iocContainer.RegisterSingleton, ChildTestClassCopyRegistrations>(); + iocContainer.RegisterSingleton, ChildTestClass2CopyRegistrations>(); - this.testcandidate = kernel.GetInstance>(); + this.testCandidate = iocContainer.GetInstance>(); } #endregion @@ -53,7 +54,7 @@ public void Copy_MustNotCopyChildrenWhenIntercepted() var testClassParentCopy = new ParentTestClass(); // Act - this.testcandidate.Copy( + this.testCandidate.Copy( testClassParentOriginal, testClassParentCopy, new List @@ -94,7 +95,7 @@ public void Copy_MustCopyInheritedChildrenWhenIntercepted() var testClassParentCopy = new ParentTestClass(); // Act - this.testcandidate.Copy( + this.testCandidate.Copy( testClassParentOriginal, testClassParentCopy, new List @@ -140,7 +141,7 @@ public void Copy_MustNotCopyInheritedChildrenAndChildrenWhenChildrenIntercepted( var testClassParentCopy = new ParentTestClass(); // Act - this.testcandidate.Copy( + this.testCandidate.Copy( testClassParentOriginal, testClassParentCopy, new List diff --git a/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToManyFromGenericStrategyIntTests.cs b/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToManyFromGenericStrategyIntTests.cs index a7559eb..b8fec25 100644 --- a/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToManyFromGenericStrategyIntTests.cs +++ b/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToManyFromGenericStrategyIntTests.cs @@ -7,27 +7,28 @@ using BBT.StructureTools.Copy; using BBT.StructureTools.Copy.Helper; using BBT.StructureTools.Copy.Strategy; - using BBT.StructureTools.Tests.TestTools; + using BBT.StructureTools.Tests.TestTools.IoC; using FluentAssertions; using NUnit.Framework; [TestFixture] + [TestFixtureSource(typeof(IocTestFixtureSource), "IocContainers")] public class CopyOperationCreateToManyFromGenericStrategyIntTests { #region setup - private readonly ICopy testcandidate; + private readonly ICopy testCandidate; - public CopyOperationCreateToManyFromGenericStrategyIntTests() + public CopyOperationCreateToManyFromGenericStrategyIntTests(IIocContainer iocContainer) { - var kernel = new NinjectIocContainer(); + iocContainer.Initialize(); - kernel.RegisterSingleton, TestClassCopyRegistrations>(); - kernel.RegisterSingleton, ChildTestClassCopyRegistrations>(); - kernel.RegisterSingleton, TestFactory>(); - kernel.RegisterSingleton(); + iocContainer.RegisterSingleton, TestClassCopyRegistrations>(); + iocContainer.RegisterSingleton, ChildTestClassCopyRegistrations>(); + iocContainer.RegisterSingleton, TestFactory>(); + iocContainer.RegisterSingleton(); - this.testcandidate = kernel.GetInstance>(); + this.testCandidate = iocContainer.GetInstance>(); } #endregion @@ -47,7 +48,7 @@ public void MustUseStrategyWhenCopying() var testClassParentCopy = new ParentTestClass(); // Act - this.testcandidate.Copy( + this.testCandidate.Copy( testClassParentOriginal, testClassParentCopy, new List()); @@ -88,7 +89,7 @@ public void Copy_MustFailWhenChildrenistNull() // Act / Assert throws Assert.Throws(() => - this.testcandidate.Copy( + this.testCandidate.Copy( testClassParentOriginal, testClassParentCopy, new List())); @@ -106,7 +107,7 @@ public void Copy_MustCopyEmptyCollection() var testClassParentCopy = new ParentTestClass(); // Act - this.testcandidate.Copy( + this.testCandidate.Copy( testClassParentOriginal, testClassParentCopy, new List()); diff --git a/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToManyFromGenericStrategyWithReverseRelationIntTests.cs b/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToManyFromGenericStrategyWithReverseRelationIntTests.cs index 5012b7e..f5276d9 100644 --- a/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToManyFromGenericStrategyWithReverseRelationIntTests.cs +++ b/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToManyFromGenericStrategyWithReverseRelationIntTests.cs @@ -7,27 +7,28 @@ using BBT.StructureTools.Copy; using BBT.StructureTools.Copy.Helper; using BBT.StructureTools.Copy.Strategy; - using BBT.StructureTools.Tests.TestTools; + using BBT.StructureTools.Tests.TestTools.IoC; using FluentAssertions; using NUnit.Framework; [TestFixture] + [TestFixtureSource(typeof(IocTestFixtureSource), "IocContainers")] public class CopyOperationCreateToManyFromGenericStrategyWithReverseRelationIntTests { #region setup - private readonly ICopy testcandidate; + private readonly ICopy testCandidate; - public CopyOperationCreateToManyFromGenericStrategyWithReverseRelationIntTests() + public CopyOperationCreateToManyFromGenericStrategyWithReverseRelationIntTests(IIocContainer iocContainer) { - var kernel = new NinjectIocContainer(); + iocContainer.Initialize(); - kernel.RegisterSingleton, TestFactory>(); - kernel.RegisterSingleton(); - kernel.RegisterSingleton, TestClassCopyRegistrations>(); - kernel.RegisterSingleton, ChildTestClassCopyRegistrations>(); + iocContainer.RegisterSingleton, TestFactory>(); + iocContainer.RegisterSingleton(); + iocContainer.RegisterSingleton, TestClassCopyRegistrations>(); + iocContainer.RegisterSingleton, ChildTestClassCopyRegistrations>(); - this.testcandidate = kernel.GetInstance>(); + this.testCandidate = iocContainer.GetInstance>(); } #endregion @@ -47,7 +48,7 @@ public void MustUseStrategyWhenCopying() var testClassParentCopy = new ParentTestClass(); // Act - this.testcandidate.Copy( + this.testCandidate.Copy( testClassParentOriginal, testClassParentCopy, new List()); @@ -94,7 +95,7 @@ public void Copy_MustFailWhenChildrenistNull() // Act / Assert throws Assert.Throws(() => - this.testcandidate.Copy( + this.testCandidate.Copy( testClassParentOriginal, testClassParentCopy, new List())); @@ -112,7 +113,7 @@ public void Copy_MustCopyEmptyCollection() var testClassParentCopy = new ParentTestClass(); // Act - this.testcandidate.Copy( + this.testCandidate.Copy( testClassParentOriginal, testClassParentCopy, new List()); diff --git a/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToManyWithReverseRelationIntTests.cs b/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToManyWithReverseRelationIntTests.cs index a9ddc4a..8770c94 100644 --- a/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToManyWithReverseRelationIntTests.cs +++ b/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToManyWithReverseRelationIntTests.cs @@ -1,4 +1,4 @@ -namespace BBT.Life.LiBase.ITests.General.Services.Tools.Copy +namespace BBT.StructureTools.Tests.Copy { using System; using System.Collections.Generic; @@ -6,24 +6,25 @@ using BBT.StructureTools; using BBT.StructureTools.Copy; using BBT.StructureTools.Copy.Helper; - using BBT.StructureTools.Tests.TestTools; + using BBT.StructureTools.Tests.TestTools.IoC; using FluentAssertions; using NUnit.Framework; [TestFixture] + [TestFixtureSource(typeof(IocTestFixtureSource), "IocContainers")] public class CopyOperationCreateToManyWithReverseRelationIntTests { #region members and setup - private readonly ICopy testcandidate; + private readonly ICopy testCandidate; - public CopyOperationCreateToManyWithReverseRelationIntTests() + public CopyOperationCreateToManyWithReverseRelationIntTests(IIocContainer iocContainer) { - var kernel = new NinjectIocContainer(); + iocContainer.Initialize(); - kernel.RegisterSingleton, TestClassCopyRegistrations>(); - kernel.RegisterSingleton, ChildTestClassCopyRegistrations>(); + iocContainer.RegisterSingleton, TestClassCopyRegistrations>(); + iocContainer.RegisterSingleton, ChildTestClassCopyRegistrations>(); - this.testcandidate = kernel.GetInstance>(); + this.testCandidate = iocContainer.GetInstance>(); } #endregion @@ -52,7 +53,7 @@ public void Copy_MustCopyParentReference() var testClassParentCopy = new ParentTestClass(); // Act - this.testcandidate.Copy( + this.testCandidate.Copy( testClassParentOriginal, testClassParentCopy, new List()); @@ -90,7 +91,7 @@ public void Copy_MustFailWhenChildrenistNull() // but from the assertion library which is itself using // NUnit.Framework internally. Assert.Throws(() => - this.testcandidate.Copy( + this.testCandidate.Copy( testClassParentOriginal, testClassParentCopy, new List())); @@ -108,7 +109,7 @@ public void Copy_MustCopyEmptyCollection() var testClassParentCopy = new ParentTestClass(); // Act - this.testcandidate.Copy( + this.testCandidate.Copy( testClassParentOriginal, testClassParentCopy, new List()); diff --git a/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToOneWithReverseRelationIntTests.cs b/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToOneWithReverseRelationIntTests.cs index 17e4375..d25ea6f 100644 --- a/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToOneWithReverseRelationIntTests.cs +++ b/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToOneWithReverseRelationIntTests.cs @@ -1,28 +1,29 @@ -namespace BBT.Life.LiBase.ITests.General.Services.Tools.Copy +namespace BBT.StructureTools.Tests.Copy { using System; using System.Collections.Generic; using BBT.StructureTools; using BBT.StructureTools.Copy; using BBT.StructureTools.Copy.Helper; - using BBT.StructureTools.Tests.TestTools; + using BBT.StructureTools.Tests.TestTools.IoC; using FluentAssertions; using NUnit.Framework; [TestFixture] + [TestFixtureSource(typeof(IocTestFixtureSource), "IocContainers")] public class CopyOperationCreateToOneWithReverseRelationIntTests { #region members and setup - private readonly ICopy testcandidate; + private readonly ICopy testCandidate; - public CopyOperationCreateToOneWithReverseRelationIntTests() + public CopyOperationCreateToOneWithReverseRelationIntTests(IIocContainer iocContainer) { - var kernel = new NinjectIocContainer(); + iocContainer.Initialize(); - kernel.RegisterSingleton, TestClassCopyRegistrations>(); - kernel.RegisterSingleton, ChildTestClassCopyRegistrations>(); + iocContainer.RegisterSingleton, TestClassCopyRegistrations>(); + iocContainer.RegisterSingleton, ChildTestClassCopyRegistrations>(); - this.testcandidate = kernel.GetInstance>(); + this.testCandidate = iocContainer.GetInstance>(); } #endregion @@ -43,7 +44,7 @@ public void Copy_MustCopyParentReference() var testClassParentCopy = new ParentTestClass(); // Act - this.testcandidate.Copy( + this.testCandidate.Copy( testClassParentOriginal, testClassParentCopy, new List()); @@ -72,7 +73,7 @@ public void Copy_MustNotFailWhenChildIsNull() var testClassParentCopy = new ParentTestClass(); // Act - this.testcandidate.Copy( + this.testCandidate.Copy( testClassParentOriginal, testClassParentCopy, new List()); diff --git a/src/BBT.StructureTools.Tests/Copy/CopyOperationCrossReferenceProcessingIntTests.cs b/src/BBT.StructureTools.Tests/Copy/CopyOperationCrossReferenceProcessingIntTests.cs index cc741b5..ad37564 100644 --- a/src/BBT.StructureTools.Tests/Copy/CopyOperationCrossReferenceProcessingIntTests.cs +++ b/src/BBT.StructureTools.Tests/Copy/CopyOperationCrossReferenceProcessingIntTests.cs @@ -1,27 +1,28 @@ -namespace BBT.Life.LiBase.ITests.General.Services.Tools.Copy +namespace BBT.StructureTools.Tests.Copy { using System.Collections.Generic; using BBT.StructureTools; using BBT.StructureTools.Copy; using BBT.StructureTools.Copy.Helper; - using BBT.StructureTools.Tests.TestTools; + using BBT.StructureTools.Tests.TestTools.IoC; using FluentAssertions; using NUnit.Framework; [TestFixture] + [TestFixtureSource(typeof(IocTestFixtureSource), "IocContainers")] public class CopyOperationCrossReferenceProcessingIntTests { - private readonly ICopy testcandidate; + private readonly ICopy testCandidate; - public CopyOperationCrossReferenceProcessingIntTests() + public CopyOperationCrossReferenceProcessingIntTests(IIocContainer iocContainer) { - var kernel = new NinjectIocContainer(); + iocContainer.Initialize(); - kernel.RegisterSingleton, TestClassCopyRegistrations>(); - kernel.RegisterSingleton, TestClassChildCopyRegistrations>(); - kernel.RegisterSingleton, TestClassCrossReferencedChildCopyRegistrations>(); + iocContainer.RegisterSingleton, TestClassCopyRegistrations>(); + iocContainer.RegisterSingleton, TestClassChildCopyRegistrations>(); + iocContainer.RegisterSingleton, TestClassCrossReferencedChildCopyRegistrations>(); - this.testcandidate = kernel.GetInstance>(); + this.testCandidate = iocContainer.GetInstance>(); } /// @@ -43,7 +44,7 @@ public void MustExecuteAndSetCrossReferenceRegistrations() var target = new TestClass(); // Act - this.testcandidate.Copy(source, target, new List()); + this.testCandidate.Copy(source, target, new List()); // Assert crossReferenceSource.Should().NotBeSameAs(target.TestClassCrossReferencedChild); diff --git a/src/BBT.StructureTools.Tests/Copy/CopyOperationInlineValueProcessingTests.cs b/src/BBT.StructureTools.Tests/Copy/CopyOperationInlineValueProcessingTests.cs index 75018c6..faca4a5 100644 --- a/src/BBT.StructureTools.Tests/Copy/CopyOperationInlineValueProcessingTests.cs +++ b/src/BBT.StructureTools.Tests/Copy/CopyOperationInlineValueProcessingTests.cs @@ -1,26 +1,27 @@ -namespace BBT.Life.LiBase.ITests.General.Services.Tools.Copy +namespace BBT.StructureTools.Tests.Copy { using System; using System.Collections.Generic; using BBT.StructureTools; using BBT.StructureTools.Copy; using BBT.StructureTools.Copy.Helper; - using BBT.StructureTools.Tests.TestTools; + using BBT.StructureTools.Tests.TestTools.IoC; using FluentAssertions; using NUnit.Framework; [TestFixture] + [TestFixtureSource(typeof(IocTestFixtureSource), "IocContainers")] public class CopyOperationInlineValueProcessingTests { - private readonly ICopy testcandidate; + private readonly ICopy testCandidate; - public CopyOperationInlineValueProcessingTests() + public CopyOperationInlineValueProcessingTests(IIocContainer iocContainer) { - var kernel = new NinjectIocContainer(); + iocContainer.Initialize(); - kernel.RegisterSingleton, TestClassCopyRegistrations>(); + iocContainer.RegisterSingleton, TestClassCopyRegistrations>(); - this.testcandidate = kernel.GetInstance>(); + this.testCandidate = iocContainer.GetInstance>(); } /// @@ -34,7 +35,7 @@ public void MustExecuteInlineCopyProcessing() var target = new TestClass(); // Act - this.testcandidate.Copy(source, target, new List()); + this.testCandidate.Copy(source, target, new List()); // Assert target.TestGuid.Should().NotBe(Guid.Empty); diff --git a/src/BBT.StructureTools.Tests/Copy/CopyOperationIntTests.cs b/src/BBT.StructureTools.Tests/Copy/CopyOperationIntTests.cs index 6ac8bb7..81028c6 100644 --- a/src/BBT.StructureTools.Tests/Copy/CopyOperationIntTests.cs +++ b/src/BBT.StructureTools.Tests/Copy/CopyOperationIntTests.cs @@ -1,26 +1,27 @@ -namespace BBT.Life.LiBase.ITests.General.Services.Tools.Copy +namespace BBT.StructureTools.Tests.Copy { using System.Collections.Generic; using BBT.StructureTools; using BBT.StructureTools.Copy; using BBT.StructureTools.Copy.Helper; using BBT.StructureTools.Copy.Processing; - using BBT.StructureTools.Tests.TestTools; + using BBT.StructureTools.Tests.TestTools.IoC; using FluentAssertions; using NUnit.Framework; [TestFixture] + [TestFixtureSource(typeof(IocTestFixtureSource), "IocContainers")] public class CopyOperationIntTests { - private readonly ICopy testcandidate; + private readonly ICopy testCandidate; - public CopyOperationIntTests() + public CopyOperationIntTests(IIocContainer iocContainer) { - var kernel = new NinjectIocContainer(); + iocContainer.Initialize(); - kernel.RegisterSingleton, TestClassCopyRegistrations>(); + iocContainer.RegisterSingleton, TestClassCopyRegistrations>(); - this.testcandidate = kernel.GetInstance>(); + this.testCandidate = iocContainer.GetInstance>(); } /// @@ -34,7 +35,7 @@ public void Copy_WhenAttributeRegistered_MustCopyAttribute() var target = new TestClass(); // Act - this.testcandidate.Copy(source, target, new List()); + this.testCandidate.Copy(source, target, new List()); // Assert target.Value1.Should().Be(42); @@ -51,7 +52,7 @@ public void Copy_WhenAttributeNotRegistered_MustNotCopyAttribute() var target = new TestClass { Value2 = 35 }; // Act - this.testcandidate.Copy(source, target, new List()); + this.testCandidate.Copy(source, target, new List()); // Assert target.Value2.Should().Be(35); @@ -73,7 +74,7 @@ public void Copy_MustExecuteAdditionalProcessings() }; // Act - this.testcandidate.Copy(source, target, additionalProcessings); + this.testCandidate.Copy(source, target, additionalProcessings); // Assert target.Value1.Should().Be(27); diff --git a/src/BBT.StructureTools.Tests/Copy/CopyOperationRegisterCreateFromFactoryTests.cs b/src/BBT.StructureTools.Tests/Copy/CopyOperationRegisterCreateFromFactoryTests.cs index 65e29ca..d3db895 100644 --- a/src/BBT.StructureTools.Tests/Copy/CopyOperationRegisterCreateFromFactoryTests.cs +++ b/src/BBT.StructureTools.Tests/Copy/CopyOperationRegisterCreateFromFactoryTests.cs @@ -1,26 +1,27 @@ -namespace BBT.Life.LiBase.ITests.General.Services.Tools.Copy +namespace BBT.StructureTools.Tests.Copy { using System.Collections.Generic; using BBT.StructureTools; using BBT.StructureTools.Copy; using BBT.StructureTools.Copy.Helper; - using BBT.StructureTools.Tests.TestTools; + using BBT.StructureTools.Tests.TestTools.IoC; using FluentAssertions; using NUnit.Framework; [TestFixture] + [TestFixtureSource(typeof(IocTestFixtureSource), "IocContainers")] public class CopyOperationRegisterCreateFromFactoryTests { - private readonly ICopy testcandidate; + private readonly ICopy testCandidate; - public CopyOperationRegisterCreateFromFactoryTests() + public CopyOperationRegisterCreateFromFactoryTests(IIocContainer iocContainer) { - var kernel = new NinjectIocContainer(); + iocContainer.Initialize(); - kernel.RegisterSingleton(typeof(ICopyRegistrations), typeof(TestClassCopyRegistrations)); - kernel.RegisterSingleton(typeof(ITestFactory), typeof(TestFactory)); + iocContainer.RegisterSingleton(typeof(ICopyRegistrations), typeof(TestClassCopyRegistrations)); + iocContainer.RegisterSingleton(typeof(ITestFactory), typeof(TestFactory)); - this.testcandidate = kernel.GetInstance>(); + this.testCandidate = iocContainer.GetInstance>(); } /// @@ -34,7 +35,7 @@ public void MustExecuteInlineCopyProcessing() var target = new TestClass(); // Act - this.testcandidate.Copy(source, target, new List()); + this.testCandidate.Copy(source, target, new List()); // Assert target.Value1.Should().Be(888); diff --git a/src/BBT.StructureTools.Tests/Copy/CopyOperationSubCopyIntTests.cs b/src/BBT.StructureTools.Tests/Copy/CopyOperationSubCopyIntTests.cs index fb9444c..095791c 100644 --- a/src/BBT.StructureTools.Tests/Copy/CopyOperationSubCopyIntTests.cs +++ b/src/BBT.StructureTools.Tests/Copy/CopyOperationSubCopyIntTests.cs @@ -1,27 +1,28 @@ -namespace BBT.Life.LiBase.ITests.General.Services.Tools.Copy +namespace BBT.StructureTools.Tests.Copy { using System.Collections.Generic; using BBT.StructureTools; using BBT.StructureTools.Copy; using BBT.StructureTools.Copy.Helper; using BBT.StructureTools.Copy.Processing; - using BBT.StructureTools.Tests.TestTools; + using BBT.StructureTools.Tests.TestTools.IoC; using FluentAssertions; using NUnit.Framework; [TestFixture] + [TestFixtureSource(typeof(IocTestFixtureSource), "IocContainers")] public class CopyOperationSubCopyIntTests { - private readonly ICopy testcandidate; + private readonly ICopy testCandidate; - public CopyOperationSubCopyIntTests() + public CopyOperationSubCopyIntTests(IIocContainer iocContainer) { - var kernel = new NinjectIocContainer(); + iocContainer.Initialize(); - kernel.RegisterSingleton, TestClassChildCopyRegistrations>(); - kernel.RegisterSingleton, TestClassParentCopyRegistrations>(); + iocContainer.RegisterSingleton, TestClassChildCopyRegistrations>(); + iocContainer.RegisterSingleton, TestClassParentCopyRegistrations>(); - this.testcandidate = kernel.GetInstance>(); + this.testCandidate = iocContainer.GetInstance>(); } /// @@ -35,7 +36,7 @@ public void Copy_WhenAttributeRegistered_MustCopyAttribute() var target = new TestClassChild(); // Act - this.testcandidate.Copy(source, target, new List()); + this.testCandidate.Copy(source, target, new List()); // Assert target.Value1.Should().Be(45); @@ -52,7 +53,7 @@ public void Copy_WhenAttributeNotRegistered_MustNotCopyAttribute() var target = new TestClassChild { Value2 = 35 }; // Act - this.testcandidate.Copy(source, target, new List()); + this.testCandidate.Copy(source, target, new List()); // Assert target.Value2.Should().Be(35); @@ -74,7 +75,7 @@ public void Copy_MustExecuteAdditionalProcessings() }; // Act - this.testcandidate.Copy(source, target, additionalProcessings); + this.testCandidate.Copy(source, target, additionalProcessings); // Assert target.Value1.Should().Be(27); diff --git a/src/BBT.StructureTools.Tests/Copy/PostProcessing/CopyOperationPostProcessingUsingParamsIntTests.cs b/src/BBT.StructureTools.Tests/Copy/PostProcessing/CopyOperationPostProcessingUsingParamsIntTests.cs index 63a3d3d..25dd872 100644 --- a/src/BBT.StructureTools.Tests/Copy/PostProcessing/CopyOperationPostProcessingUsingParamsIntTests.cs +++ b/src/BBT.StructureTools.Tests/Copy/PostProcessing/CopyOperationPostProcessingUsingParamsIntTests.cs @@ -4,24 +4,25 @@ using BBT.StructureTools.Copy; using BBT.StructureTools.Copy.Helper; using BBT.StructureTools.Copy.Processing; - using BBT.StructureTools.Tests.TestTools; + using BBT.StructureTools.Tests.TestTools.IoC; using FluentAssertions; using NUnit.Framework; [TestFixture] + [TestFixtureSource(typeof(IocTestFixtureSource), "IocContainers")] public sealed class CopyOperationPostProcessingUsingParamsIntTests { #region setup and members - private readonly ICopy testcandidate; + private readonly ICopy testCandidate; - public CopyOperationPostProcessingUsingParamsIntTests() + public CopyOperationPostProcessingUsingParamsIntTests(IIocContainer iocContainer) { - var kernel = new NinjectIocContainer(); + iocContainer.Initialize(); - kernel.RegisterSingleton(typeof(ICopyRegistrations), typeof(TestClassCopyRegistrations)); + iocContainer.RegisterSingleton(typeof(ICopyRegistrations), typeof(TestClassCopyRegistrations)); - this.testcandidate = kernel.GetInstance>(); + this.testCandidate = iocContainer.GetInstance>(); } #endregion @@ -40,7 +41,7 @@ public void MustExecuteRegisteredPostProcessingsWhenParamsAreUsed() var testClassCopy = new TestClass(); // Act - this.testcandidate.Copy(testClassOriginal, testClassCopy, new List()); + this.testCandidate.Copy(testClassOriginal, testClassCopy, new List()); // Assert testClassCopy.TestValue.Should().Be(234); diff --git a/src/BBT.StructureTools.Tests/Copy/PostProcessing/CopyOperationPostProcessingWithoutUsingParamsIntTest.cs b/src/BBT.StructureTools.Tests/Copy/PostProcessing/CopyOperationPostProcessingWithoutUsingParamsIntTest.cs index ca2181a..a03fd2e 100644 --- a/src/BBT.StructureTools.Tests/Copy/PostProcessing/CopyOperationPostProcessingWithoutUsingParamsIntTest.cs +++ b/src/BBT.StructureTools.Tests/Copy/PostProcessing/CopyOperationPostProcessingWithoutUsingParamsIntTest.cs @@ -4,24 +4,25 @@ using BBT.StructureTools.Copy; using BBT.StructureTools.Copy.Helper; using BBT.StructureTools.Copy.Processing; - using BBT.StructureTools.Tests.TestTools; + using BBT.StructureTools.Tests.TestTools.IoC; using FluentAssertions; using NUnit.Framework; [TestFixture] + [TestFixtureSource(typeof(IocTestFixtureSource), "IocContainers")] public class CopyOperationPostProcessingWithoutUsingParamsIntTest { #region setup and members - private readonly ICopy testcandidate; + private readonly ICopy testCandidate; - public CopyOperationPostProcessingWithoutUsingParamsIntTest() + public CopyOperationPostProcessingWithoutUsingParamsIntTest(IIocContainer iocContainer) { - var kernel = new NinjectIocContainer(); + iocContainer.Initialize(); - kernel.RegisterSingleton(typeof(ICopyRegistrations), typeof(TestClassCopyRegistrations)); + iocContainer.RegisterSingleton(typeof(ICopyRegistrations), typeof(TestClassCopyRegistrations)); - this.testcandidate = kernel.GetInstance>(); + this.testCandidate = iocContainer.GetInstance>(); } #endregion @@ -40,7 +41,7 @@ public void MustExecuteRegisteredSinglePostProcessings() var testClassCopy = new TestClass(); // Act - this.testcandidate.Copy(testClassOriginal, testClassCopy, new List()); + this.testCandidate.Copy(testClassOriginal, testClassCopy, new List()); // Assert testClassCopy.TestValue.Should().Be(234); diff --git a/src/BBT.StructureTools.Tests/TestTools/IoC/IIocContainer.cs b/src/BBT.StructureTools.Tests/TestTools/IoC/IIocContainer.cs index bbcdb6e..b60a49f 100644 --- a/src/BBT.StructureTools.Tests/TestTools/IoC/IIocContainer.cs +++ b/src/BBT.StructureTools.Tests/TestTools/IoC/IIocContainer.cs @@ -5,7 +5,7 @@ /// /// Abstraction of any IoC container to be used for testing. /// - internal interface IIocContainer + public interface IIocContainer { /// /// Initializes the IoC container. @@ -19,6 +19,7 @@ internal interface IIocContainer /// Abstraction (interface) type. /// Implementation of . void RegisterSingleton() + where TAbstraction : class where TImplementation : TAbstraction; /// @@ -28,6 +29,7 @@ void RegisterSingleton() /// Abstraction (interface) type. /// Implementation of . void RegisterTransient() + where TAbstraction : class where TImplementation : TAbstraction; /// diff --git a/src/BBT.StructureTools.Tests/TestTools/IoC/NinjectStrategyLocator.cs b/src/BBT.StructureTools.Tests/TestTools/IoC/IocHandlerStrategyLocator.cs similarity index 80% rename from src/BBT.StructureTools.Tests/TestTools/IoC/NinjectStrategyLocator.cs rename to src/BBT.StructureTools.Tests/TestTools/IoC/IocHandlerStrategyLocator.cs index 4b6f5d8..8395d71 100644 --- a/src/BBT.StructureTools.Tests/TestTools/IoC/NinjectStrategyLocator.cs +++ b/src/BBT.StructureTools.Tests/TestTools/IoC/IocHandlerStrategyLocator.cs @@ -4,7 +4,7 @@ using BBT.StrategyPattern; using BBT.StructureTools.Initialization; - public class NinjectStrategyLocator : IStrategyLocator + public class IocHandlerStrategyLocator : IStrategyLocator { public IEnumerable GetAllStrategies() { diff --git a/src/BBT.StructureTools.Tests/TestTools/IoC/IocTestFixtureSource.cs b/src/BBT.StructureTools.Tests/TestTools/IoC/IocTestFixtureSource.cs new file mode 100644 index 0000000..35cc239 --- /dev/null +++ b/src/BBT.StructureTools.Tests/TestTools/IoC/IocTestFixtureSource.cs @@ -0,0 +1,22 @@ +namespace BBT.StructureTools.Tests.TestTools.IoC +{ + using BBT.StructureTools.Tests.TestTools.IoC.Vendor; + + /// + /// Class is internally used to provide + /// different IoC containers to test fixtures where + /// needed. See also https://github.com/nunit/docs/wiki/TestFixtureSource-Attribute. + /// + internal class IocTestFixtureSource + { + /// + /// Gets implementations + /// for the tested IoC containers. + /// + internal static object[] IocContainers { get; } = + { + new NinjectIocContainer(), + new CastleIocContainer(), + }; + } +} diff --git a/src/BBT.StructureTools.Tests/TestTools/IoC/Vendor/CastleIocContainer.cs b/src/BBT.StructureTools.Tests/TestTools/IoC/Vendor/CastleIocContainer.cs new file mode 100644 index 0000000..4e8879f --- /dev/null +++ b/src/BBT.StructureTools.Tests/TestTools/IoC/Vendor/CastleIocContainer.cs @@ -0,0 +1,63 @@ +namespace BBT.StructureTools.Tests.TestTools.IoC.Vendor +{ + using System; + using BBT.StrategyPattern; + using BBT.StructureTools.Initialization; + using Castle.MicroKernel.Registration; + using Castle.Windsor; + + /// + internal class CastleIocContainer : IIocContainer + { + private IWindsorContainer castleContainer; + + /// + public T GetInstance() + { + return this.castleContainer.Resolve(); + } + + /// + public void Initialize() + { + this.castleContainer = new WindsorContainer(); + + var resolver = new CastleResolver(this.castleContainer); + + IocHandler.Instance.IocResolver = resolver; + + // Dependencies from BBT.StrategyPattern + this.castleContainer.Register(Component.For(typeof(IStrategyLocator<>)).ImplementedBy(typeof(IocHandlerStrategyLocator<>))); + this.castleContainer.Register(Component.For(typeof(IInstanceCreator<,>)).ImplementedBy(typeof(GenericInstanceCreator<,>))); + + IocHandler.Instance.DoIocRegistrations(this.RegisterSingleton, this.RegisterTransient); + } + + /// + public void RegisterSingleton() + where TAbstraction : class + where TImplementation : TAbstraction + { + this.castleContainer.Register(Component.For().ImplementedBy().LifestyleSingleton()); + } + + /// + public void RegisterTransient() + where TAbstraction : class + where TImplementation : TAbstraction + { + this.castleContainer.Register(Component.For().ImplementedBy().LifestyleTransient()); + } + + /// + public void RegisterSingleton(Type abstraction, Type implementation) + { + this.castleContainer.Register(Component.For(abstraction).ImplementedBy(implementation).LifestyleSingleton()); + } + + private void RegisterTransient(Type abstraction, Type implementation) + { + this.castleContainer.Register(Component.For(abstraction).ImplementedBy(implementation).LifestyleTransient()); + } + } +} diff --git a/src/BBT.StructureTools.Tests/TestTools/IoC/Vendor/CastleResolver.cs b/src/BBT.StructureTools.Tests/TestTools/IoC/Vendor/CastleResolver.cs new file mode 100644 index 0000000..0aae36c --- /dev/null +++ b/src/BBT.StructureTools.Tests/TestTools/IoC/Vendor/CastleResolver.cs @@ -0,0 +1,41 @@ +namespace BBT.StructureTools.Tests.TestTools.IoC.Vendor +{ + using System; + using System.Collections.Generic; + using BBT.StructureTools.Initialization; + using Castle.Windsor; + + /// + /// implementation for Castle Windsor. + /// + internal class CastleResolver : IIocResolver + { + private readonly IWindsorContainer windsorContainer; + + /// + /// Initializes a new instance of the class. + /// + public CastleResolver(IWindsorContainer windsorContainer) + { + this.windsorContainer = windsorContainer; + } + + /// + public IEnumerable GetAllInstances() + { + return this.windsorContainer.ResolveAll(); + } + + /// + public TService GetInstance() + { + return this.windsorContainer.Resolve(); + } + + /// + public object GetInstance(Type serviceType) + { + return this.windsorContainer.Resolve(serviceType); + } + } +} diff --git a/src/BBT.StructureTools.Tests/TestTools/IoC/NinjectIocContainer.cs b/src/BBT.StructureTools.Tests/TestTools/IoC/Vendor/NinjectIocContainer.cs similarity index 83% rename from src/BBT.StructureTools.Tests/TestTools/IoC/NinjectIocContainer.cs rename to src/BBT.StructureTools.Tests/TestTools/IoC/Vendor/NinjectIocContainer.cs index 5deb802..beceead 100644 --- a/src/BBT.StructureTools.Tests/TestTools/IoC/NinjectIocContainer.cs +++ b/src/BBT.StructureTools.Tests/TestTools/IoC/Vendor/NinjectIocContainer.cs @@ -1,4 +1,4 @@ -namespace BBT.StructureTools.Tests.TestTools +namespace BBT.StructureTools.Tests.TestTools.IoC.Vendor { using System; using BBT.StrategyPattern; @@ -11,14 +11,6 @@ internal class NinjectIocContainer : IIocContainer { private StandardKernel ninjectKernel; - /// - /// Initializes a new instance of the class. - /// - public NinjectIocContainer() - { - this.Initialize(); - } - /// public T GetInstance() { @@ -39,14 +31,15 @@ public void Initialize() IocHandler.Instance.IocResolver = resolver; // Dependencies from BBT.StrategyPattern - this.ninjectKernel.Bind(typeof(IStrategyLocator<>)).To(typeof(NinjectStrategyLocator<>)); + this.ninjectKernel.Bind(typeof(IStrategyLocator<>)).To(typeof(IocHandlerStrategyLocator<>)); this.ninjectKernel.Bind(typeof(IInstanceCreator<,>)).To(typeof(GenericInstanceCreator<,>)); - IocHandler.Instance.DoIocRegistrations(this.RegisterSingleton); + IocHandler.Instance.DoIocRegistrations(this.RegisterSingleton, this.RegisterTransient); } /// public void RegisterSingleton() + where TAbstraction : class where TImplementation : TAbstraction { this.ninjectKernel.Bind().To().InSingletonScope(); @@ -54,6 +47,7 @@ public void RegisterSingleton() /// public void RegisterTransient() + where TAbstraction : class where TImplementation : TAbstraction { this.ninjectKernel.Bind().To().InTransientScope(); @@ -64,5 +58,10 @@ public void RegisterSingleton(Type abstraction, Type implementation) { this.ninjectKernel.Bind(abstraction).To(implementation).InSingletonScope(); } + + private void RegisterTransient(Type abstraction, Type implementation) + { + this.ninjectKernel.Bind(abstraction).To(implementation).InTransientScope(); + } } } diff --git a/src/BBT.StructureTools.Tests/TestTools/IoC/NinjectResolver.cs b/src/BBT.StructureTools.Tests/TestTools/IoC/Vendor/NinjectResolver.cs similarity index 93% rename from src/BBT.StructureTools.Tests/TestTools/IoC/NinjectResolver.cs rename to src/BBT.StructureTools.Tests/TestTools/IoC/Vendor/NinjectResolver.cs index 3ac06c8..a8d5507 100644 --- a/src/BBT.StructureTools.Tests/TestTools/IoC/NinjectResolver.cs +++ b/src/BBT.StructureTools.Tests/TestTools/IoC/Vendor/NinjectResolver.cs @@ -1,4 +1,4 @@ -namespace BBT.StructureTools.Tests.TestTools.IoC +namespace BBT.StructureTools.Tests.TestTools.IoC.Vendor { using System; using System.Collections.Generic; diff --git a/src/BBT.StructureTools/Strategy/CreateInstanceOfTypeStrategy.cs b/src/BBT.StructureTools/Strategy/CreateInstanceOfTypeStrategy.cs index 74ec081..71f9703 100644 --- a/src/BBT.StructureTools/Strategy/CreateInstanceOfTypeStrategy.cs +++ b/src/BBT.StructureTools/Strategy/CreateInstanceOfTypeStrategy.cs @@ -5,7 +5,7 @@ using BBT.StructureTools.Extension; /// - internal class CreateInstanceOfTypeStrategy : ICreateInstanceOfTypeStrategy + public class CreateInstanceOfTypeStrategy : ICreateInstanceOfTypeStrategy where TBaseTypeIntf : class where TConcreteTypeIntf : class, TBaseTypeIntf where TConcreteTypeImpl : TConcreteTypeIntf, new()