From 3f891b45c9873bacedfe4ff4b00d6339fd22af55 Mon Sep 17 00:00:00 2001 From: Simon G Date: Tue, 10 Nov 2020 16:08:41 +0100 Subject: [PATCH] #25: fix tests --- .../XmlDataHandlerLocalIntegrationTest.cs | 22 +-- Test.GBase/DataHandling/XmlDataHandlerTest.cs | 143 +++++------------- Test.GBase/GBaseTableIntegrationTest.cs | 13 +- 3 files changed, 60 insertions(+), 118 deletions(-) diff --git a/Test.GBase/DataHandling/XmlDataHandlerLocalIntegrationTest.cs b/Test.GBase/DataHandling/XmlDataHandlerLocalIntegrationTest.cs index 0b56644..db09cfc 100644 --- a/Test.GBase/DataHandling/XmlDataHandlerLocalIntegrationTest.cs +++ b/Test.GBase/DataHandling/XmlDataHandlerLocalIntegrationTest.cs @@ -3,6 +3,7 @@ // Copyright(c) 2020 SimonG. All Rights Reserved. using System; +using System.IO; using System.Threading; using System.Threading.Tasks; using GBase.DataHandling; @@ -31,8 +32,8 @@ namespace Test.GBase.DataHandling .Returns(new XmlDataWriter()); Mock dataReaderFactoryMock = new Mock(); - dataReaderFactoryMock.Setup(r => r.Create(It.IsAny())) - .Returns((string path) => new XmlDataReader(path)); + dataReaderFactoryMock.Setup(r => r.Create()) + .Returns(new XmlDataReader()); Mock dataHandlerCachePropertyEntryFactoryMock = new Mock(); dataHandlerCachePropertyEntryFactoryMock.Setup(p => p.Create(It.IsAny(), It.IsAny())) @@ -48,21 +49,22 @@ namespace Test.GBase.DataHandling .Returns((IXmlDataReader xmlDataReader) => new XmlDataHandlerCache(xmlDataReader, dataHandlerCacheEntryFactoryMock.Object, dataHandlerCachePropertyEntryFactoryMock.Object)); - IXmlDataHandler xmlDataHandler = new XmlDataHandler("TestXml.xml", dataReaderFactoryMock.Object, dataWriterFactoryMock.Object, - dataHandlerCacheFactoryMock.Object); + IXmlDataHandler xmlDataHandler = new XmlDataHandler(dataReaderFactoryMock.Object, dataWriterFactoryMock.Object, dataHandlerCacheFactoryMock.Object); - await xmlDataHandler.Init(false, new CancellationToken()); - // + xmlDataHandler.Init(false); + + FileStream file = null; //FixMe: init this correctly if you want to run this test + //await xmlDataHandler.SetValue(nameof(TestProperty), TestProperty); //await xmlDataHandler.SetValue(nameof(TestProperty), "empty"); - await xmlDataHandler.SetValue(TODO, nameof(TestProperty), "test", TODO); + await xmlDataHandler.SetValue(file, nameof(TestProperty), "test", new CancellationToken()); //await xmlDataHandler.SetValue(nameof(TestProperty), "OverwrittenString"); // - await xmlDataHandler.SetValue(TODO, nameof(TestInt), 1, TODO); + await xmlDataHandler.SetValue(file, nameof(TestInt), 1, new CancellationToken()); //await xmlDataHandler.SetValue(nameof(TestInt), 2); //await xmlDataHandler.SetValue(nameof(TestInt), 3); - TestProperty = await xmlDataHandler.GetValue(nameof(TestProperty)); - TestInt = await xmlDataHandler.GetValue(nameof(TestInt)); + TestProperty = await xmlDataHandler.GetValue(file, nameof(TestProperty), new CancellationToken()); + TestInt = await xmlDataHandler.GetValue(file, nameof(TestInt), new CancellationToken()); } } } \ No newline at end of file diff --git a/Test.GBase/DataHandling/XmlDataHandlerTest.cs b/Test.GBase/DataHandling/XmlDataHandlerTest.cs index b8d9384..475d5b8 100644 --- a/Test.GBase/DataHandling/XmlDataHandlerTest.cs +++ b/Test.GBase/DataHandling/XmlDataHandlerTest.cs @@ -19,42 +19,13 @@ namespace Test.GBase.DataHandling public class XmlDataHandlerTest { [Test] - public async Task TestInit() + public void TestInit() { Mock xmlDataReaderMock = new Mock(); - xmlDataReaderMock.Setup(r => r.Init(It.IsAny())).ReturnsAsync(true); - - Mock xmlDataReaderFactoryMock = new Mock(); - xmlDataReaderFactoryMock.Setup(r => r.Create(It.IsAny())).Returns(xmlDataReaderMock.Object); - - Mock xmlDataWriterMock = new Mock(); - xmlDataWriterMock.Setup(w => w.InitFile(TODO, TODO, It.IsAny())).ReturnsAsync(true); - - Mock xmlDataWriterFactoryMock = new Mock(); - xmlDataWriterFactoryMock.Setup(w => w.Create()).Returns(xmlDataWriterMock.Object); - - Mock xmlDataHandlerCacheMock = new Mock(); - Mock xmlDataHandlerCacheFactoryMock = new Mock(); - xmlDataHandlerCacheFactoryMock.Setup(c => c.Create(It.IsAny())).Returns(xmlDataHandlerCacheMock.Object); - - XmlDataHandler xmlDataHandler = new XmlDataHandler("path", xmlDataReaderFactoryMock.Object, - xmlDataWriterFactoryMock.Object, xmlDataHandlerCacheFactoryMock.Object); - - Assert.True(await xmlDataHandler.Init(false, CancellationToken.None)); - } - - [Test] - public async Task TestInitFailedTriedTwice() - { - Mock xmlDataReaderMock = new Mock(); - xmlDataReaderMock.Setup(r => r.Init(It.IsAny())).ReturnsAsync(true); - Mock xmlDataReaderFactoryMock = new Mock(); - xmlDataReaderFactoryMock.Setup(r => r.Create(It.IsAny())).Returns(xmlDataReaderMock.Object); + xmlDataReaderFactoryMock.Setup(r => r.Create()).Returns(xmlDataReaderMock.Object); Mock xmlDataWriterMock = new Mock(); - xmlDataWriterMock.Setup(w => w.InitFile(TODO, TODO, It.IsAny())).ReturnsAsync(true); - Mock xmlDataWriterFactoryMock = new Mock(); xmlDataWriterFactoryMock.Setup(w => w.Create()).Returns(xmlDataWriterMock.Object); @@ -62,50 +33,20 @@ namespace Test.GBase.DataHandling Mock xmlDataHandlerCacheFactoryMock = new Mock(); xmlDataHandlerCacheFactoryMock.Setup(c => c.Create(It.IsAny())).Returns(xmlDataHandlerCacheMock.Object); - XmlDataHandler xmlDataHandler = new XmlDataHandler("path", xmlDataReaderFactoryMock.Object, - xmlDataWriterFactoryMock.Object, xmlDataHandlerCacheFactoryMock.Object); + XmlDataHandler xmlDataHandler = new XmlDataHandler(xmlDataReaderFactoryMock.Object, xmlDataWriterFactoryMock.Object, xmlDataHandlerCacheFactoryMock.Object); - Assert.True(await xmlDataHandler.Init(false, CancellationToken.None)); - Assert.False(await xmlDataHandler.Init(false, CancellationToken.None)); + Assert.True(xmlDataHandler.Init(false)); } [Test] - public async Task TestInitFailedInitReaderFailed() + public void TestInitFailedTriedTwice() { Mock xmlDataReaderMock = new Mock(); - xmlDataReaderMock.Setup(r => r.Init(It.IsAny())).ReturnsAsync(false); Mock xmlDataReaderFactoryMock = new Mock(); - xmlDataReaderFactoryMock.Setup(r => r.Create(It.IsAny())).Returns(xmlDataReaderMock.Object); + xmlDataReaderFactoryMock.Setup(r => r.Create()).Returns(xmlDataReaderMock.Object); Mock xmlDataWriterMock = new Mock(); - xmlDataWriterMock.Setup(w => w.InitFile(TODO, TODO, It.IsAny())).ReturnsAsync(true); - - Mock xmlDataWriterFactoryMock = new Mock(); - xmlDataWriterFactoryMock.Setup(w => w.Create()).Returns(xmlDataWriterMock.Object); - - Mock xmlDataHandlerCacheMock = new Mock(); - Mock xmlDataHandlerCacheFactoryMock = new Mock(); - xmlDataHandlerCacheFactoryMock.Setup(c => c.Create(It.IsAny())).Returns(xmlDataHandlerCacheMock.Object); - - XmlDataHandler xmlDataHandler = new XmlDataHandler("path", xmlDataReaderFactoryMock.Object, - xmlDataWriterFactoryMock.Object, xmlDataHandlerCacheFactoryMock.Object); - - Assert.False(await xmlDataHandler.Init(false, CancellationToken.None)); - } - - [Test] - public async Task TestInitFailedInitWriterFailed() - { - Mock xmlDataReaderMock = new Mock(); - xmlDataReaderMock.Setup(r => r.Init(It.IsAny())).ReturnsAsync(true); - - Mock xmlDataReaderFactoryMock = new Mock(); - xmlDataReaderFactoryMock.Setup(r => r.Create(It.IsAny())).Returns(xmlDataReaderMock.Object); - - Mock xmlDataWriterMock = new Mock(); - xmlDataWriterMock.Setup(w => w.InitFile(TODO, TODO, It.IsAny())).ReturnsAsync(false); - Mock xmlDataWriterFactoryMock = new Mock(); xmlDataWriterFactoryMock.Setup(w => w.Create()).Returns(xmlDataWriterMock.Object); @@ -113,10 +54,10 @@ namespace Test.GBase.DataHandling Mock xmlDataHandlerCacheFactoryMock = new Mock(); xmlDataHandlerCacheFactoryMock.Setup(c => c.Create(It.IsAny())).Returns(xmlDataHandlerCacheMock.Object); - XmlDataHandler xmlDataHandler = new XmlDataHandler("path", xmlDataReaderFactoryMock.Object, - xmlDataWriterFactoryMock.Object, xmlDataHandlerCacheFactoryMock.Object); + XmlDataHandler xmlDataHandler = new XmlDataHandler(xmlDataReaderFactoryMock.Object, xmlDataWriterFactoryMock.Object, xmlDataHandlerCacheFactoryMock.Object); - Assert.False(await xmlDataHandler.Init(false, CancellationToken.None)); + Assert.True(xmlDataHandler.Init(false)); + Assert.False(xmlDataHandler.Init(false)); } [Test] @@ -124,7 +65,7 @@ namespace Test.GBase.DataHandling { Mock xmlDataReaderMock = new Mock(); Mock xmlDataReaderFactoryMock = new Mock(); - xmlDataReaderFactoryMock.Setup(r => r.Create(It.IsAny())).Returns(xmlDataReaderMock.Object); + xmlDataReaderFactoryMock.Setup(r => r.Create()).Returns(xmlDataReaderMock.Object); Mock xmlDataWriterMock = new Mock(); Mock xmlDataWriterFactoryMock = new Mock(); @@ -134,13 +75,12 @@ namespace Test.GBase.DataHandling Mock xmlDataHandlerCacheFactoryMock = new Mock(); xmlDataHandlerCacheFactoryMock.Setup(c => c.Create(It.IsAny())).Returns(xmlDataHandlerCacheMock.Object); - XmlDataHandler xmlDataHandler = new XmlDataHandler("path", xmlDataReaderFactoryMock.Object, - xmlDataWriterFactoryMock.Object, xmlDataHandlerCacheFactoryMock.Object); + XmlDataHandler xmlDataHandler = new XmlDataHandler(xmlDataReaderFactoryMock.Object, xmlDataWriterFactoryMock.Object, xmlDataHandlerCacheFactoryMock.Object); - await xmlDataHandler.SetValue(TODO, "property", "SomeString", TODO); + await xmlDataHandler.SetValue(null, "property", "SomeString", new CancellationToken()); xmlDataHandlerCacheMock.Verify(c => c.SetValue("property", "SomeString", false), Times.Once); - xmlDataWriterMock.Verify(w => w.Write(TODO, "property", "SomeString", TODO, false, TODO), Times.Once); + xmlDataWriterMock.Verify(w => w.Write(null, "property", "SomeString", false, It.IsAny()), Times.Once); } [Test] @@ -148,7 +88,7 @@ namespace Test.GBase.DataHandling { Mock xmlDataReaderMock = new Mock(); Mock xmlDataReaderFactoryMock = new Mock(); - xmlDataReaderFactoryMock.Setup(r => r.Create(It.IsAny())).Returns(xmlDataReaderMock.Object); + xmlDataReaderFactoryMock.Setup(r => r.Create()).Returns(xmlDataReaderMock.Object); Mock xmlDataWriterMock = new Mock(); Mock xmlDataWriterFactoryMock = new Mock(); @@ -158,14 +98,13 @@ namespace Test.GBase.DataHandling Mock xmlDataHandlerCacheFactoryMock = new Mock(); xmlDataHandlerCacheFactoryMock.Setup(c => c.Create(It.IsAny())).Returns(xmlDataHandlerCacheMock.Object); - XmlDataHandler xmlDataHandler = new XmlDataHandler("path", xmlDataReaderFactoryMock.Object, - xmlDataWriterFactoryMock.Object, xmlDataHandlerCacheFactoryMock.Object); + XmlDataHandler xmlDataHandler = new XmlDataHandler(xmlDataReaderFactoryMock.Object, xmlDataWriterFactoryMock.Object, xmlDataHandlerCacheFactoryMock.Object); List stringList = new List() {"string", "secondString", "thirdString"}; - await xmlDataHandler.SetValue>(TODO, "property", stringList, TODO); + await xmlDataHandler.SetValue>(null, "property", stringList, new CancellationToken()); xmlDataHandlerCacheMock.Verify(c => c.SetValue>("property", stringList, false), Times.Once); - xmlDataWriterMock.Verify(w => w.Write>(TODO, "property", $"{stringList[0]},{stringList[1]},{stringList[2]}", TODO, false, TODO), Times.Once); + xmlDataWriterMock.Verify(w => w.Write>(null, "property", $"{stringList[0]},{stringList[1]},{stringList[2]}",false, It.IsAny()), Times.Once); } [Test] @@ -173,7 +112,7 @@ namespace Test.GBase.DataHandling { Mock xmlDataReaderMock = new Mock(); Mock xmlDataReaderFactoryMock = new Mock(); - xmlDataReaderFactoryMock.Setup(r => r.Create(It.IsAny())).Returns(xmlDataReaderMock.Object); + xmlDataReaderFactoryMock.Setup(r => r.Create()).Returns(xmlDataReaderMock.Object); Mock xmlDataWriterMock = new Mock(); Mock xmlDataWriterFactoryMock = new Mock(); @@ -183,13 +122,12 @@ namespace Test.GBase.DataHandling Mock xmlDataHandlerCacheFactoryMock = new Mock(); xmlDataHandlerCacheFactoryMock.Setup(c => c.Create(It.IsAny())).Returns(xmlDataHandlerCacheMock.Object); - XmlDataHandler xmlDataHandler = new XmlDataHandler("path", xmlDataReaderFactoryMock.Object, - xmlDataWriterFactoryMock.Object, xmlDataHandlerCacheFactoryMock.Object); + XmlDataHandler xmlDataHandler = new XmlDataHandler(xmlDataReaderFactoryMock.Object, xmlDataWriterFactoryMock.Object, xmlDataHandlerCacheFactoryMock.Object); - await xmlDataHandler.SetValue(TODO, "property", null, TODO); + await xmlDataHandler.SetValue(null, "property", null, new CancellationToken()); xmlDataHandlerCacheMock.Verify(c => c.SetValue(It.IsAny(), It.IsAny(), It.IsAny()), Times.Never); - xmlDataWriterMock.Verify(w => w.Write(TODO, It.IsAny(), It.IsAny(), TODO, It.IsAny(), TODO), Times.Never); + xmlDataWriterMock.Verify(w => w.Write(null, It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny()), Times.Never); } [Test] @@ -197,7 +135,7 @@ namespace Test.GBase.DataHandling { Mock xmlDataReaderMock = new Mock(); Mock xmlDataReaderFactoryMock = new Mock(); - xmlDataReaderFactoryMock.Setup(r => r.Create(It.IsAny())).Returns(xmlDataReaderMock.Object); + xmlDataReaderFactoryMock.Setup(r => r.Create()).Returns(xmlDataReaderMock.Object); Mock xmlDataWriterMock = new Mock(); Mock xmlDataWriterFactoryMock = new Mock(); @@ -207,13 +145,12 @@ namespace Test.GBase.DataHandling Mock xmlDataHandlerCacheFactoryMock = new Mock(); xmlDataHandlerCacheFactoryMock.Setup(c => c.Create(It.IsAny())).Returns(xmlDataHandlerCacheMock.Object); - XmlDataHandler xmlDataHandler = new XmlDataHandler("path", xmlDataReaderFactoryMock.Object, - xmlDataWriterFactoryMock.Object, xmlDataHandlerCacheFactoryMock.Object); + XmlDataHandler xmlDataHandler = new XmlDataHandler(xmlDataReaderFactoryMock.Object, xmlDataWriterFactoryMock.Object, xmlDataHandlerCacheFactoryMock.Object); - await xmlDataHandler.RemoveValue(TODO, "property", "SomeString", TODO); + await xmlDataHandler.RemoveValue(null, "property", "SomeString", new CancellationToken()); xmlDataHandlerCacheMock.Verify(c => c.TryRemoveValue("property", "SomeString"), Times.Once); - xmlDataWriterMock.Verify(w => w.Remove(TODO, "property", "SomeString", TODO), Times.Once); + xmlDataWriterMock.Verify(w => w.Remove(null, "property", "SomeString", It.IsAny()), Times.Once); } [Test] @@ -221,7 +158,7 @@ namespace Test.GBase.DataHandling { Mock xmlDataReaderMock = new Mock(); Mock xmlDataReaderFactoryMock = new Mock(); - xmlDataReaderFactoryMock.Setup(r => r.Create(It.IsAny())).Returns(xmlDataReaderMock.Object); + xmlDataReaderFactoryMock.Setup(r => r.Create()).Returns(xmlDataReaderMock.Object); Mock xmlDataWriterMock = new Mock(); Mock xmlDataWriterFactoryMock = new Mock(); @@ -231,14 +168,13 @@ namespace Test.GBase.DataHandling Mock xmlDataHandlerCacheFactoryMock = new Mock(); xmlDataHandlerCacheFactoryMock.Setup(c => c.Create(It.IsAny())).Returns(xmlDataHandlerCacheMock.Object); - XmlDataHandler xmlDataHandler = new XmlDataHandler("path", xmlDataReaderFactoryMock.Object, - xmlDataWriterFactoryMock.Object, xmlDataHandlerCacheFactoryMock.Object); + XmlDataHandler xmlDataHandler = new XmlDataHandler(xmlDataReaderFactoryMock.Object, xmlDataWriterFactoryMock.Object, xmlDataHandlerCacheFactoryMock.Object); List stringList = new List() { "string", "secondString", "thirdString" }; - await xmlDataHandler.RemoveValue>(TODO, "property", stringList, TODO); + await xmlDataHandler.RemoveValue>(null, "property", stringList, new CancellationToken()); xmlDataHandlerCacheMock.Verify(c => c.TryRemoveValue>("property", stringList), Times.Once); - xmlDataWriterMock.Verify(w => w.Remove>(TODO, "property", $"{stringList[0]},{stringList[1]},{stringList[2]}", TODO), Times.Once); + xmlDataWriterMock.Verify(w => w.Remove>(null, "property", $"{stringList[0]},{stringList[1]},{stringList[2]}", It.IsAny()), Times.Once); } [Test] @@ -246,7 +182,7 @@ namespace Test.GBase.DataHandling { Mock xmlDataReaderMock = new Mock(); Mock xmlDataReaderFactoryMock = new Mock(); - xmlDataReaderFactoryMock.Setup(r => r.Create(It.IsAny())).Returns(xmlDataReaderMock.Object); + xmlDataReaderFactoryMock.Setup(r => r.Create()).Returns(xmlDataReaderMock.Object); Mock xmlDataWriterMock = new Mock(); Mock xmlDataWriterFactoryMock = new Mock(); @@ -256,13 +192,12 @@ namespace Test.GBase.DataHandling Mock xmlDataHandlerCacheFactoryMock = new Mock(); xmlDataHandlerCacheFactoryMock.Setup(c => c.Create(It.IsAny())).Returns(xmlDataHandlerCacheMock.Object); - XmlDataHandler xmlDataHandler = new XmlDataHandler("path", xmlDataReaderFactoryMock.Object, - xmlDataWriterFactoryMock.Object, xmlDataHandlerCacheFactoryMock.Object); + XmlDataHandler xmlDataHandler = new XmlDataHandler(xmlDataReaderFactoryMock.Object, xmlDataWriterFactoryMock.Object, xmlDataHandlerCacheFactoryMock.Object); - await xmlDataHandler.RemoveValue(TODO, "property", null, TODO); + await xmlDataHandler.RemoveValue(null, "property", null, new CancellationToken()); xmlDataHandlerCacheMock.Verify(c => c.TryRemoveValue(It.IsAny(), It.IsAny()), Times.Never); - xmlDataWriterMock.Verify(w => w.Remove(TODO, It.IsAny(), It.IsAny(), TODO), Times.Never); + xmlDataWriterMock.Verify(w => w.Remove(null, It.IsAny(), It.IsAny(), It.IsAny()), Times.Never); } [Test] @@ -274,7 +209,7 @@ namespace Test.GBase.DataHandling //xmlDataReaderMock.Setup(r => r.Read("property")).ReturnsAsync>(values); Mock xmlDataReaderFactoryMock = new Mock(); - xmlDataReaderFactoryMock.Setup(r => r.Create(It.IsAny())).Returns(xmlDataReaderMock.Object); + xmlDataReaderFactoryMock.Setup(r => r.Create()).Returns(xmlDataReaderMock.Object); Mock xmlDataWriterMock = new Mock(); Mock xmlDataWriterFactoryMock = new Mock(); @@ -284,8 +219,7 @@ namespace Test.GBase.DataHandling Mock xmlDataHandlerCacheFactoryMock = new Mock(); xmlDataHandlerCacheFactoryMock.Setup(c => c.Create(It.IsAny())).Returns(xmlDataHandlerCacheMock.Object); - XmlDataHandler xmlDataHandler = new XmlDataHandler("path", xmlDataReaderFactoryMock.Object, - xmlDataWriterFactoryMock.Object, xmlDataHandlerCacheFactoryMock.Object); + XmlDataHandler xmlDataHandler = new XmlDataHandler(xmlDataReaderFactoryMock.Object, xmlDataWriterFactoryMock.Object, xmlDataHandlerCacheFactoryMock.Object); } [Test] @@ -297,7 +231,7 @@ namespace Test.GBase.DataHandling //xmlDataReaderMock.Setup(r => r.Read("property")).ReturnsAsync>(values); Mock xmlDataReaderFactoryMock = new Mock(); - xmlDataReaderFactoryMock.Setup(r => r.Create(It.IsAny())).Returns(xmlDataReaderMock.Object); + xmlDataReaderFactoryMock.Setup(r => r.Create()).Returns(xmlDataReaderMock.Object); Mock xmlDataWriterMock = new Mock(); Mock xmlDataWriterFactoryMock = new Mock(); @@ -307,10 +241,9 @@ namespace Test.GBase.DataHandling Mock xmlDataHandlerCacheFactoryMock = new Mock(); xmlDataHandlerCacheFactoryMock.Setup(c => c.Create(It.IsAny())).Returns(xmlDataHandlerCacheMock.Object); - XmlDataHandler xmlDataHandler = new XmlDataHandler("path", xmlDataReaderFactoryMock.Object, - xmlDataWriterFactoryMock.Object, xmlDataHandlerCacheFactoryMock.Object); + XmlDataHandler xmlDataHandler = new XmlDataHandler(xmlDataReaderFactoryMock.Object, xmlDataWriterFactoryMock.Object, xmlDataHandlerCacheFactoryMock.Object); - IEnumerable> readValues = await xmlDataHandler.GetValues>("property"); + IEnumerable> readValues = await xmlDataHandler.GetValues>(null, "property", new CancellationToken()); } } } \ No newline at end of file diff --git a/Test.GBase/GBaseTableIntegrationTest.cs b/Test.GBase/GBaseTableIntegrationTest.cs index 0bb97ff..692f4d9 100644 --- a/Test.GBase/GBaseTableIntegrationTest.cs +++ b/Test.GBase/GBaseTableIntegrationTest.cs @@ -4,9 +4,11 @@ using System.Threading; using GBase; +using GBase.DataHandling.Pool; using GBase.Factories; using GBase.FileHandling.Factories; using GBase.Interfaces; +using GBase.Interfaces.DataHandling.Pool; using GBase.Interfaces.FileHandling; using Moq; using NUnit.Framework; @@ -22,11 +24,16 @@ namespace Test.GBase { Mock fileHandlerFactoryMock = new Mock(); fileHandlerFactoryMock.Setup(f => f.Create()).Returns(new Mock().Object); - + + IGBaseColumn gBaseColumn = null; Mock gBaseColumnFactoryMock = new Mock(); - gBaseColumnFactoryMock.Setup(c => c.Create()).Returns(new GBaseColumn()); + gBaseColumnFactoryMock.Setup(c => c.Create(It.IsAny())) + .Callback(name => { gBaseColumn = new GBaseColumn(name); }) + .Returns(gBaseColumn); - IGBaseTable table = new GBaseTable(fileHandlerFactoryMock.Object, gBaseColumnFactoryMock.Object); + Mock dataHandlerPoolMock = new Mock(); + + IGBaseTable table = new GBaseTable(fileHandlerFactoryMock.Object, dataHandlerPoolMock.Object, gBaseColumnFactoryMock.Object); table.Init(typeof(Foo), "", "", CancellationToken.None); CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();