From 3fb19e0d1749d33c0001aef8289f191c4b0aecae Mon Sep 17 00:00:00 2001 From: Ivar Nesje Date: Thu, 3 Oct 2024 15:05:33 +0200 Subject: [PATCH] Fixe issues and tests failing after merge --- .../Helpers/Serialization/ModelSerializationService.cs | 2 +- .../Infrastructure/Clients/Storage/DataClient.cs | 2 +- .../Internal/Data/CachedInstanceDataAccessor.cs | 2 +- .../Controllers/ProcessControllerTests.cs | 8 ++++++-- test/Altinn.App.Api.Tests/Mocks/DataClientMock.cs | 2 +- test/Altinn.App.Core.Tests/Helpers/MemoryAsStreamTests.cs | 2 +- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/Altinn.App.Core/Helpers/Serialization/ModelSerializationService.cs b/src/Altinn.App.Core/Helpers/Serialization/ModelSerializationService.cs index e0320d70b..f820585b6 100644 --- a/src/Altinn.App.Core/Helpers/Serialization/ModelSerializationService.cs +++ b/src/Altinn.App.Core/Helpers/Serialization/ModelSerializationService.cs @@ -84,7 +84,7 @@ public ReadOnlyMemory SerializeToXml(object model) NewLineHandling = NewLineHandling.None, }; using var memoryStream = new MemoryStream(); - XmlWriter xmlWriter = XmlWriter.Create(memoryStream, xmlWriterSettings); + using XmlWriter xmlWriter = XmlWriter.Create(memoryStream, xmlWriterSettings); XmlSerializer serializer = _xmlSerializer.GetSerializer(modelType); serializer.Serialize(xmlWriter, model); diff --git a/src/Altinn.App.Core/Infrastructure/Clients/Storage/DataClient.cs b/src/Altinn.App.Core/Infrastructure/Clients/Storage/DataClient.cs index 00fd160c1..8087202d9 100644 --- a/src/Altinn.App.Core/Infrastructure/Clients/Storage/DataClient.cs +++ b/src/Altinn.App.Core/Infrastructure/Clients/Storage/DataClient.cs @@ -105,7 +105,7 @@ Type type var (data, contentType) = _modelSerializationService.SerializeToStorage(dataToSerialize, dataType); StreamContent streamContent = new StreamContent(new MemoryAsStream(data)); - streamContent.Headers.ContentType = MediaTypeHeaderValue.Parse("application/xml"); + streamContent.Headers.ContentType = MediaTypeHeaderValue.Parse(contentType); HttpResponseMessage response = await _client.PostAsync(token, apiUrl, streamContent); if (response.IsSuccessStatusCode) diff --git a/src/Altinn.App.Core/Internal/Data/CachedInstanceDataAccessor.cs b/src/Altinn.App.Core/Internal/Data/CachedInstanceDataAccessor.cs index e4bccc4be..f7ec34928 100644 --- a/src/Altinn.App.Core/Internal/Data/CachedInstanceDataAccessor.cs +++ b/src/Altinn.App.Core/Internal/Data/CachedInstanceDataAccessor.cs @@ -193,7 +193,7 @@ public List GetDataElementChanges(bool initializeAltinnRowId) { ObjectUtils.InitializeAltinnRowId(data); } - var (currentBinary, contentType) = _modelSerializationService.SerializeToStorage(data, dataType); + var (currentBinary, _) = _modelSerializationService.SerializeToStorage(data, dataType); _binaryCache.Set(dataElementIdentifier, currentBinary); if (!currentBinary.Span.SequenceEqual(previousBinary.Span)) diff --git a/test/Altinn.App.Api.Tests/Controllers/ProcessControllerTests.cs b/test/Altinn.App.Api.Tests/Controllers/ProcessControllerTests.cs index 3f690cef5..b247bf147 100644 --- a/test/Altinn.App.Api.Tests/Controllers/ProcessControllerTests.cs +++ b/test/Altinn.App.Api.Tests/Controllers/ProcessControllerTests.cs @@ -311,7 +311,9 @@ public async Task RunProcessNext_DataFromHiddenComponents_GetsRemoved() // Mock pdf generation so that the test does not fail due to pof service not running. var pdfMock = new Mock(MockBehavior.Strict); using var pdfReturnStream = new MemoryStream(); - pdfMock.Setup(p => p.GeneratePdf(It.IsAny(), It.IsAny())).ReturnsAsync(pdfReturnStream); + pdfMock + .Setup(p => p.GeneratePdf(It.IsAny(), It.IsAny(), It.IsAny())) + .ReturnsAsync(pdfReturnStream); OverrideServicesForThisTest = (services) => { services.AddSingleton(pdfMock.Object); @@ -385,7 +387,9 @@ public async Task RunProcessNext_ShadowFields_GetsRemoved(string? saveToDataType // Mock pdf generation so that the test does not fail due to pof service not running. var pdfMock = new Mock(MockBehavior.Strict); using var pdfReturnStream = new MemoryStream(); - pdfMock.Setup(p => p.GeneratePdf(It.IsAny(), It.IsAny())).ReturnsAsync(pdfReturnStream); + pdfMock + .Setup(p => p.GeneratePdf(It.IsAny(), It.IsAny(), It.IsAny())) + .ReturnsAsync(pdfReturnStream); OverrideServicesForThisTest = (services) => { services.AddSingleton(pdfMock.Object); diff --git a/test/Altinn.App.Api.Tests/Mocks/DataClientMock.cs b/test/Altinn.App.Api.Tests/Mocks/DataClientMock.cs index 83e5c5a1c..b3c716b0e 100644 --- a/test/Altinn.App.Api.Tests/Mocks/DataClientMock.cs +++ b/test/Altinn.App.Api.Tests/Mocks/DataClientMock.cs @@ -228,7 +228,7 @@ string dataTypeString Id = dataGuid.ToString(), InstanceGuid = instanceGuid.ToString(), DataType = dataTypeString, - ContentType = "application/xml", + ContentType = contentType, }; Directory.CreateDirectory(dataPath + @"blob"); diff --git a/test/Altinn.App.Core.Tests/Helpers/MemoryAsStreamTests.cs b/test/Altinn.App.Core.Tests/Helpers/MemoryAsStreamTests.cs index ef72ae3d2..6e3d93e70 100644 --- a/test/Altinn.App.Core.Tests/Helpers/MemoryAsStreamTests.cs +++ b/test/Altinn.App.Core.Tests/Helpers/MemoryAsStreamTests.cs @@ -5,7 +5,7 @@ namespace Altinn.App.Core.Tests.Helpers; public class MemoryAsStreamTests { - private static byte[] _byteSequence = GenerateNonRepeatingByteArray(); + private static readonly byte[] _byteSequence = GenerateNonRepeatingByteArray(); /// /// For testing class we need to handle a sequence of bytes where errors are