Fixe issues and tests failing after merge

Altinn · Oct 3, 2024 · 3fb19e0 · 3fb19e0
1 parent cc73fd4
commit 3fb19e0
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/src/Altinn.App.Core/Helpers/Serialization/ModelSerializationService.cs b/src/Altinn.App.Core/Helpers/Serialization/ModelSerializationService.cs
@@ -84,7 +84,7 @@ public ReadOnlyMemory<byte> 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
@@ -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
@@ -193,7 +193,7 @@ public List<DataElementChange> 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
@@ -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<IPdfGeneratorClient>(MockBehavior.Strict);
         using var pdfReturnStream = new MemoryStream();
-        pdfMock.Setup(p => p.GeneratePdf(It.IsAny<Uri>(), It.IsAny<CancellationToken>())).ReturnsAsync(pdfReturnStream);
+        pdfMock
+            .Setup(p => p.GeneratePdf(It.IsAny<Uri>(), It.IsAny<string?>(), It.IsAny<CancellationToken>()))
+            .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<IPdfGeneratorClient>(MockBehavior.Strict);
         using var pdfReturnStream = new MemoryStream();
-        pdfMock.Setup(p => p.GeneratePdf(It.IsAny<Uri>(), It.IsAny<CancellationToken>())).ReturnsAsync(pdfReturnStream);
+        pdfMock
+            .Setup(p => p.GeneratePdf(It.IsAny<Uri>(), It.IsAny<string?>(), It.IsAny<CancellationToken>()))
+            .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
@@ -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
@@ -5,7 +5,7 @@ namespace Altinn.App.Core.Tests.Helpers;
 
 public class MemoryAsStreamTests
 {
-    private static byte[] _byteSequence = GenerateNonRepeatingByteArray();
+    private static readonly byte[] _byteSequence = GenerateNonRepeatingByteArray();
 
     /// <summary>
     /// For testing <see cref="MemoryAsStream"/> class we need to handle a sequence of bytes where errors are