From 2dbb44087e16b6e1954ac4cbd74d2878856f5b96 Mon Sep 17 00:00:00 2001
From: Stefan Seeland <168659+stesee@users.noreply.github.com>
Date: Sat, 13 May 2023 16:39:04 +0200
Subject: [PATCH] Fixed OpenApiJson assertion

---
 PdfAValidator/PdfAValidator.cs              |  4 ++--
 PdfAValidatorWebApiTest/IntegrativeTests.cs | 14 ++++++++++----
 PdfAValidatorWebApiTest/OpenApiClient.cs    |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/PdfAValidator/PdfAValidator.cs b/PdfAValidator/PdfAValidator.cs
index a0bee2f..a1d5b3e 100644
--- a/PdfAValidator/PdfAValidator.cs
+++ b/PdfAValidator/PdfAValidator.cs
@@ -339,11 +339,11 @@ private static void ValidateVeraPdfOutputToBeXml(string outputResult, string? cu
         private static T DeserializeXml<T>(string sourceXML) where T : class
         {
             var settings = new XmlReaderSettings();
-            var serializer = new XmlSerializer(typeof(T));
+            var xmlSerializer = new XmlSerializer(typeof(T));
 
             using var reader = new StringReader(sourceXML);
             using var xmlReader = XmlReader.Create(reader, settings);
-            return (T)serializer.Deserialize(xmlReader);
+            return (T)xmlSerializer.Deserialize(xmlReader);
         }
 
         private async Task IntiPathToVeraPdfBinAndJava()
diff --git a/PdfAValidatorWebApiTest/IntegrativeTests.cs b/PdfAValidatorWebApiTest/IntegrativeTests.cs
index 5cd4a95..7e40dad 100644
--- a/PdfAValidatorWebApiTest/IntegrativeTests.cs
+++ b/PdfAValidatorWebApiTest/IntegrativeTests.cs
@@ -1,11 +1,10 @@
-using Codeuctivity;
+using Codeuctivity.PdfAValidatorWebApi;
 using Microsoft.AspNetCore.Mvc.Testing;
 using PdfAValidatorWebApi;
 using System;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
-using System.Reflection;
 using System.Threading.Tasks;
 using Xunit;
 
@@ -55,8 +54,15 @@ public async Task ShouldDownloadOpenApiDescription()
             // use to update reference
             // await File.WriteAllTextAsync("../../../OpenApi.json", actual);
 
-            var assembly = Assembly.LoadFrom("PdfAValidatorWebApiTest.dll");
-            var expected = File.ReadAllText("../../../OpenApi.json").Replace("PdfAValidator 0.0.1.0", $"PdfAValidator {assembly.GetName().Version}");
+            AssertOpenApiJsonEqualsExpected(actual);
+        }
+
+        private static void AssertOpenApiJsonEqualsExpected(string actual)
+        {
+            var assemblyVersion = typeof(Program).Assembly.GetName().Version;
+            var expected = File.ReadAllText("../../../OpenApi.json").Replace("PdfAValidator 0.0.1.0", $"PdfAValidator {assemblyVersion}");
+            expected = expected.ReplaceLineEndings();
+            actual = actual.ReplaceLineEndings();
             Assert.Equal(expected, actual);
         }
 
diff --git a/PdfAValidatorWebApiTest/OpenApiClient.cs b/PdfAValidatorWebApiTest/OpenApiClient.cs
index 2f8adf5..22991ce 100644
--- a/PdfAValidatorWebApiTest/OpenApiClient.cs
+++ b/PdfAValidatorWebApiTest/OpenApiClient.cs
@@ -14,7 +14,7 @@
 #pragma warning disable 3016 // Disable "CS3016 Arrays as attribute arguments is not CLS-compliant"
 #pragma warning disable 8603 // Disable "CS8603 Possible null reference return"
 
-namespace Codeuctivity
+namespace Codeuctivity.PdfAValidatorWebApi
 {
     using System = global::System;