Merge pull request #184 from ks-no/FO-99

Replace NLOG with Microsofts ILogger
ks-no · Oct 1, 2024 · 423ccef · 423ccef
2 parents eb023a5 + 170a9f9
commit 423ccef
Show file tree

Hide file tree

Showing 15 changed files with 618 additions and 678 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,4 +1,5 @@
 dotnetLibPipeline {
   componentTestProject = "asice-testsuite"
   dtProjectId = "646513e9-342d-47d7-a290-8b26a5712680"
+  dotnetVersion = "8.0"
 }
diff --git a/KS.Fiks.ASiC-E.Test/AsiceBuilderTest.cs b/KS.Fiks.ASiC-E.Test/AsiceBuilderTest.cs
@@ -7,61 +7,51 @@
 using Moq;
 using Xunit;
 
-namespace KS.Fiks.ASiC_E.Test
+namespace KS.Fiks.ASiC_E.Test;
+
+public class AsiceBuilderTest
 {
-    public class AsiceBuilderTest : IClassFixture<LogFixture>
+    [Fact(DisplayName = "Try to create builder using non-writable stream")]
+    public void TestNotWritableStream()
     {
+        var zipStream = new Mock<Stream>();
+        var certificate = new Mock<ICertificateHolder>();
+        Action createFunction = () =>
+            AsiceBuilder.Create(zipStream.Object, MessageDigestAlgorithm.SHA512, certificate.Object);
+        createFunction.Should().Throw<ArgumentException>();
+        zipStream.VerifyGet(s => s.CanWrite);
+        zipStream.VerifyNoOtherCalls();
+    }
 
-        private readonly LogFixture logFixture;
-
-        public AsiceBuilderTest(LogFixture logFixture)
-        {
-            this.logFixture = logFixture;
-        }
-
-        [Fact(DisplayName = "Try to create builder using non-writable stream")]
-        public void TestNotWritableStream()
-        {
-            var zipStream = new Mock<Stream>();
-            var certificate = new Mock<ICertificateHolder>();
-            Action createFunction = () =>
-                AsiceBuilder.Create(zipStream.Object, MessageDigestAlgorithm.SHA512, certificate.Object);
-            createFunction.Should().Throw<ArgumentException>();
-            zipStream.VerifyGet(s => s.CanWrite);
-            zipStream.VerifyNoOtherCalls();
-        }
+    [Fact]
+    public void TestAddFileStream()
+    {
+        byte[] zippedBytes;
 
-        [Fact]
-        public void TestAddFileStream()
+        var signingCertificates = TestdataLoader.ReadCertificatesForTest();
+        using (var zipStream = new MemoryStream())
+        using (var fileStream = File.OpenRead("small.pdf"))
         {
-            byte[] zippedBytes;
-
-            var signingCertificates = TestdataLoader.ReadCertificatesForTest();
-            using (var zipStream = new MemoryStream())
-            using (var fileStream = File.OpenRead("small.pdf"))
+            using (var asiceBuilder =
+                   AsiceBuilder.Create(zipStream, MessageDigestAlgorithm.SHA256, signingCertificates))
             {
-                using (var asiceBuilder =
-                    AsiceBuilder.Create(zipStream, MessageDigestAlgorithm.SHA256, signingCertificates))
-                {
-                    asiceBuilder.Should().NotBeNull();
+                asiceBuilder.Should().NotBeNull();
 
-                    asiceBuilder.AddFile(fileStream).Should().NotBeNull().And.BeOfType<AsiceBuilder>();
+                asiceBuilder.AddFile(fileStream).Should().NotBeNull().And.BeOfType<AsiceBuilder>();
 
-                    var asiceArchive = asiceBuilder.Build();
-                    asiceArchive.Should().NotBeNull();
-                }
-
-                zippedBytes = zipStream.ToArray();
+                var asiceArchive = asiceBuilder.Build();
+                asiceArchive.Should().NotBeNull();
             }
 
-            LogFixture.GetLog<AsiceBuilderTest>().Info($"Created zip containing {zippedBytes.Length} bytes");
-            zippedBytes.Should().HaveCountGreaterThan(0);
+            zippedBytes = zipStream.ToArray();
+        }
+
+        zippedBytes.Should().HaveCountGreaterThan(0);
 
-            using (var zipStream = new MemoryStream(zippedBytes))
-            using (var zipArchive = new ZipArchive(zipStream, ZipArchiveMode.Read))
-            {
-                zipArchive.Entries.Count.Should().Be(4);
-            }
+        using (var zipStream = new MemoryStream(zippedBytes))
+        using (var zipArchive = new ZipArchive(zipStream, ZipArchiveMode.Read))
+        {
+            zipArchive.Entries.Count.Should().Be(4);
         }
     }
 }
diff --git a/KS.Fiks.ASiC-E.Test/KS.Fiks.ASiC-E.Test.csproj b/KS.Fiks.ASiC-E.Test/KS.Fiks.ASiC-E.Test.csproj
@@ -4,16 +4,16 @@
     <RootNamespace>KS.Fiks.ASiC_E.Test</RootNamespace>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <IsPackable>false</IsPackable>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
+    <LangVersion>default</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="KS.Fiks.QA" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
-    <PackageReference Include="Moq" Version="4.20.71" />
-    <PackageReference Include="NLog" Version="5.3.3" />
-    <PackageReference Include="xunit" Version="2.9.0" />
+    <PackageReference Include="FluentAssertions" Version="6.12.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Moq" Version="4.20.72" />
+    <PackageReference Include="xunit" Version="2.9.1" />
     <PackageReference Include="xunit.analyzers" Version="1.16.0" PrivateAssets="All" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>

diff --git a/KS.Fiks.ASiC-E.Test/LogFixture.cs b/KS.Fiks.ASiC-E.Test/LogFixture.cs