unit test fix

siemens · Sep 29, 2024 · 99437b8 · 99437b8
1 parent b008177
commit 99437b8
Show file tree

Hide file tree

Showing 26 changed files with 90 additions and 70 deletions.
diff --git a/.gitignore b/.gitignore
@@ -334,4 +334,6 @@ ASALocalRun/
 /Build/runtime/nuget.exe
 /Build/runtime/tempNuGet.config
 /src/out/netcoreapp3.1
-/src/.sonarlint
+/src/.sonarlint
+/TestFiles/MavenTestFile/ArtifactoryUploaderTestData
+/TestFiles/IntegrationTestFiles/ArtifactoryUploaderTestData
diff --git a/src/AritfactoryUploader.UTest/ArtifactoryUploaderTest.cs b/src/AritfactoryUploader.UTest/ArtifactoryUploaderTest.cs
@@ -24,6 +24,7 @@
 
 namespace AritfactoryUploader.UTest
 {
+    [TestFixture]
     public class ArtifactoryUploader
     {
         [SetUp]

diff --git a/src/AritfactoryUploader.UTest/PackageUploadHelperTest.cs b/src/AritfactoryUploader.UTest/PackageUploadHelperTest.cs
@@ -9,7 +9,6 @@
 using LCT.APICommunications.Model;
 using LCT.ArtifactoryUploader;
 using LCT.Common.Constants;
-using Newtonsoft.Json;
 using NUnit.Framework;
 using System.Collections.Generic;
 using System.IO;
@@ -21,6 +20,7 @@
 
 namespace AritfactoryUploader.UTest
 {
+    [TestFixture]
     public class PackageUploadHelperTest
     {
 

diff --git a/src/AritfactoryUploader.UTest/PackageUploaderTest.cs b/src/AritfactoryUploader.UTest/PackageUploaderTest.cs
@@ -27,6 +27,7 @@
 
 namespace AritfactoryUploader.UTest
 {
+    [TestFixture]
     public class PackageUploaderTest
     {
         [Test]

diff --git a/src/LCT.APICommunications.UTest/DebianJfrogAPICommunicationUTest.cs b/src/LCT.APICommunications.UTest/DebianJfrogAPICommunicationUTest.cs
@@ -9,6 +9,7 @@
 
 namespace LCT.APICommunications.UTest
 {
+    [TestFixture]
     public class DebainJfrogAPICommunicationUTest
     {
         [SetUp]

diff --git a/src/LCT.APICommunications.UTest/FileInfoExtensionsUTest.cs b/src/LCT.APICommunications.UTest/FileInfoExtensionsUTest.cs
@@ -6,6 +6,7 @@
 
 namespace LCT.APICommunications.UTest
 {
+    [TestFixture]
     public class FileInfoExtensionsUTest
     {
         [SetUp]

diff --git a/src/LCT.APICommunications.UTest/JfrogApicommunicationUTest.cs b/src/LCT.APICommunications.UTest/JfrogApicommunicationUTest.cs
@@ -9,6 +9,7 @@
 
 namespace LCT.APICommunications.UTest
 {
+    [TestFixture]
     public class JfrogApicommunicationUTest
     {
         [SetUp]

diff --git a/src/LCT.APICommunications.UTest/MavenJFrogApiCommunicationUTest.cs b/src/LCT.APICommunications.UTest/MavenJFrogApiCommunicationUTest.cs
@@ -1,12 +1,14 @@
-using LCT.APICommunications.Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+// --------------------------------------------------------------------------------------------------------------------
+// SPDX-FileCopyrightText: 2024 Siemens AG
+//
+//  SPDX-License-Identifier: MIT
+// -------------------------------------------------------------------------------------------------------------------- 
+
+using LCT.APICommunications.Model;
 
 namespace LCT.APICommunications.UTest
 {
+    [TestFixture]
     public class MavenJFrogApiCommunicationUTest
     {
         [Test]

diff --git a/src/LCT.APICommunications.UTest/NPMJfrogAPICommunicationUTest.cs b/src/LCT.APICommunications.UTest/NPMJfrogAPICommunicationUTest.cs
@@ -9,6 +9,8 @@
 
 namespace LCT.APICommunications.UTest
 {
+
+    [TestFixture]
     public class NPMJfrogAPICommunicationUTest
     {
         [SetUp]

diff --git a/src/LCT.APICommunications.UTest/NugetJfrogAPICommunicationUTest.cs b/src/LCT.APICommunications.UTest/NugetJfrogAPICommunicationUTest.cs
@@ -8,6 +8,7 @@
 
 namespace LCT.APICommunications.UTest
 {
+    [TestFixture]
     public class NugetJfrogAPICommunicationUTest
     {
         [SetUp]

diff --git a/src/LCT.APICommunications.UTest/PythonJfrogApiCommunicationUTest.cs b/src/LCT.APICommunications.UTest/PythonJfrogApiCommunicationUTest.cs
@@ -1,12 +1,14 @@
-using LCT.APICommunications.Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+// --------------------------------------------------------------------------------------------------------------------
+// SPDX-FileCopyrightText: 2024 Siemens AG
+//
+//  SPDX-License-Identifier: MIT
+// -------------------------------------------------------------------------------------------------------------------- 
+
+using LCT.APICommunications.Model;
 
 namespace LCT.APICommunications.UTest
 {
+    [TestFixture]
     public class PythonJfrogApiCommunicationUTest
     {
         [Test]

diff --git a/src/LCT.APICommunications.UTest/SW360ApicommunicationUTest.cs b/src/LCT.APICommunications.UTest/SW360ApicommunicationUTest.cs
@@ -10,6 +10,7 @@
 
 namespace LCT.APICommunications.UTest
 {
+    [TestFixture]
     public class SW360ApicommunicationUTest
     {
         readonly SW360ConnectionSettings connectionSettings = new SW360ConnectionSettings();

diff --git a/src/LCT.Common.UTests/CommonHelperTest.cs b/src/LCT.Common.UTests/CommonHelperTest.cs
@@ -11,6 +11,7 @@
 
 namespace LCT.Common.UTest
 {
+    [TestFixture]
     public class CommonHelperTest
     {
 

diff --git a/src/LCT.Common.UTests/ComponentEqualityComparerTests.cs b/src/LCT.Common.UTests/ComponentEqualityComparerTests.cs
@@ -9,6 +9,7 @@
 
 namespace LCT.Common.UTests
 {
+    [TestFixture]
     public class ComponentEqualityComparerTests
     {
         [SetUp]

diff --git a/src/LCT.Common.UTests/FileOperationsTest.cs b/src/LCT.Common.UTests/FileOperationsTest.cs
@@ -11,6 +11,7 @@
 
 namespace LCT.Common.UTests
 {
+    [TestFixture]
     public class FileOperationsTest
     {
         [SetUp]

diff --git a/src/LCT.Common.UTests/FolderActionTest.cs b/src/LCT.Common.UTests/FolderActionTest.cs
@@ -9,6 +9,7 @@
 
 namespace LCT.Common.UTests
 {
+    [TestFixture]
     public class FolderActionTest
     {
 

diff --git a/src/LCT.PackageIdentifier.UTest/AlpineParserTests.cs b/src/LCT.PackageIdentifier.UTest/AlpineParserTests.cs
@@ -12,7 +12,6 @@
 using LCT.Common.Constants;
 using Moq;
 using System.Collections.Generic;
-using Microsoft.Build.Evaluation;
 
 namespace LCT.PackageIdentifier.UTest
 {

diff --git a/src/LCT.PackageIdentifier.UTest/BOMCreatorTests.cs b/src/LCT.PackageIdentifier.UTest/BOMCreatorTests.cs
@@ -13,73 +13,70 @@
 
 namespace PackageIdentifier.UTest
 {
-    public class Tests
+    [TestFixture]
+    public class BOMCreatorTest
     {
-        [TestFixture]
-        public class BOMCreatorTest
+        [Test]
+        public void WriteCycloneDXBOMToJSONFile_InputCycloneDxFile_ReturnsNoneEmptyArray()
         {
-            [Test]
-            public void WriteCycloneDXBOMToJSONFile_InputCycloneDxFile_ReturnsNoneEmptyArray()
-            {
-                string exePath = System.Reflection.Assembly.GetExecutingAssembly().Location;
-                string outFolder = Path.GetDirectoryName(exePath);
-                string CCTComparisonBomTestFile = outFolder + @"\PackageIdentifierUTTestFiles\CycloneDX_Debian.cdx.json";
+            string exePath = System.Reflection.Assembly.GetExecutingAssembly().Location;
+            string outFolder = Path.GetDirectoryName(exePath);
+            string CCTComparisonBomTestFile = outFolder + @"\PackageIdentifierUTTestFiles\CycloneDX_Debian.cdx.json";
 
-                string json = "";
-                if (File.Exists(CCTComparisonBomTestFile))
-                {
+            string json = "";
+            if (File.Exists(CCTComparisonBomTestFile))
+            {
 
-                    json = File.ReadAllText(CCTComparisonBomTestFile);
+                json = File.ReadAllText(CCTComparisonBomTestFile);
 
-                }
-                dynamic array = JsonConvert.DeserializeObject(json);
-                Assert.IsNotNull(array);
-                Assert.IsNotEmpty(array);
             }
+            dynamic array = JsonConvert.DeserializeObject(json);
+            Assert.IsNotNull(array);
+            Assert.IsNotEmpty(array);
+        }
+
 
+        [Test]
+        public void WriteToConfigurationFile()
+        {
+            string exePath = System.Reflection.Assembly.GetExecutingAssembly().Location;
+            string outFolder = Path.GetDirectoryName(exePath);
+            string filepath = outFolder + @"\PackageIdentifierUTTestFiles\SW360ProjectInfo.xml";
 
-            [Test]
-            public void WriteToConfigurationFile()
+            string expectedproject_id = "42e86178b3b4fe8b8623788052002a6c";
+            string expectedprojectname = "CCT";
+            string project_id = "", project_name = "";
+            if (File.Exists(filepath))
             {
-                string exePath = System.Reflection.Assembly.GetExecutingAssembly().Location;
-                string outFolder = Path.GetDirectoryName(exePath);
-                string filepath = outFolder + @"\PackageIdentifierUTTestFiles\SW360ProjectInfo.xml";
 
-                string expectedproject_id = "42e86178b3b4fe8b8623788052002a6c";
-                string expectedprojectname = "CCT";
-                string project_id = "", project_name = "";
-                if (File.Exists(filepath))
+                XmlDocument doc = new XmlDocument();
+                doc.Load(filepath);
+                XmlNodeList nodes = doc.DocumentElement.SelectNodes("/ProjectInfo");
+                foreach (XmlNode node in nodes)
                 {
-
-                    XmlDocument doc = new XmlDocument();
-                    doc.Load(filepath);
-                    XmlNodeList nodes = doc.DocumentElement.SelectNodes("/ProjectInfo");
-                    foreach (XmlNode node in nodes)
-                    {
-                        project_id = node.SelectSingleNode("ProjectId").InnerText;
-                        project_name = node.SelectSingleNode("ProjectName").InnerText;
-                    }
-
-                    Assert.AreEqual(expectedproject_id, project_id);
-                    Assert.AreEqual(expectedprojectname, project_name);
+                    project_id = node.SelectSingleNode("ProjectId").InnerText;
+                    project_name = node.SelectSingleNode("ProjectName").InnerText;
                 }
+
+                Assert.AreEqual(expectedproject_id, project_id);
+                Assert.AreEqual(expectedprojectname, project_name);
             }
+        }
 
-            [Test]
-            public void GetProjectSummaryLink_ProvidedProjectId_ReturnsSW360Url()
-            {
-                //Arrange
+        [Test]
+        public void GetProjectSummaryLink_ProvidedProjectId_ReturnsSW360Url()
+        {
+            //Arrange
 
-                BomHelper bomHelper = new BomHelper();
-                string url = "http:localhost:8090";
-                string expected = $"{url}{ApiConstant.Sw360ProjectUrlApiSuffix}12345";
-                //Act
-                string actual = bomHelper.GetProjectSummaryLink("12345", url);
+            BomHelper bomHelper = new BomHelper();
+            string url = "http:localhost:8090";
+            string expected = $"{url}{ApiConstant.Sw360ProjectUrlApiSuffix}12345";
+            //Act
+            string actual = bomHelper.GetProjectSummaryLink("12345", url);
 
-                //Assert
-                Assert.That(expected, Is.EqualTo(actual), "Checks the project url");
+            //Assert
+            Assert.That(expected, Is.EqualTo(actual), "Checks the project url");
 
-            }
         }
     }
 }
diff --git a/src/LCT.PackageIdentifier.UTest/CycloneBomProcessorTests.cs b/src/LCT.PackageIdentifier.UTest/CycloneBomProcessorTests.cs
@@ -10,14 +10,13 @@
 using LCT.Common.Constants;
 using LCT.Common.Model;
 using LCT.PackageIdentifier;
-using NuGet.ContentModel;
 using NUnit.Framework;
 using System.Collections.Generic;
 using System.IO;
-using System.Security.Cryptography;
 
 namespace PackageIdentifier.UTest
 {
+    [TestFixture]
     public class CycloneBomProcessorTests
     {
 

diff --git a/src/LCT.PackageIdentifier.UTest/MavenParserTests.cs b/src/LCT.PackageIdentifier.UTest/MavenParserTests.cs
@@ -20,6 +20,7 @@
 
 namespace LCT.PackageIdentifier.UTest
 {
+    [TestFixture]
     public class MavenParserTests
     {
         private MavenProcessor _mavenProcessor;

diff --git a/src/LCT.PackageIdentifier.UTest/NugetParserTests.cs b/src/LCT.PackageIdentifier.UTest/NugetParserTests.cs
@@ -20,7 +20,6 @@
 using System.Threading.Tasks;
 using System.Linq;
 using LCT.Common.Constants;
-using Markdig.Extensions.Yaml;
 
 namespace PackageIdentifier.UTest
 {

diff --git a/src/LCT.PackageIdentifier/Model/NugetModel/NugetComponent.cs b/src/LCT.PackageIdentifier/Model/NugetModel/NugetComponent.cs
@@ -5,9 +5,11 @@
 // --------------------------------------------------------------------------------------------------------------------
 
 using PackageUrl;
+using System.Diagnostics.CodeAnalysis;
 
 namespace LCT.PackageIdentifier.Model.NugetModel
 {
+    [ExcludeFromCodeCoverage]
     public class NuGetComponent : BuildInfoComponent
     {
         public NuGetComponent(string id, string version) : base(id, version)

diff --git a/src/LCT.PackageIdentifier/NugetDevDependencyParser.cs b/src/LCT.PackageIdentifier/NugetDevDependencyParser.cs
@@ -189,7 +189,8 @@ private static void GetDirectDependencies(string filePath)
                 return;
             }
 
-            IEnumerable<JProperty> listChilds = projectFramworks.Children().OfType<JProperty>() ?? new List<JProperty>();
+            IEnumerable<JProperty> listChilds = projectFramworks.Children().OfType<JProperty>();
+
             //check has values
             if (listChilds != null && listChilds.ToList()[0].HasValues)
             {

diff --git a/src/LCT.SW360PackageCreator.UTest/AlpinePackageDownloaderTest.cs b/src/LCT.SW360PackageCreator.UTest/AlpinePackageDownloaderTest.cs
@@ -10,6 +10,8 @@
 
 namespace LCT.SW360PackageCreator.UTest
 {
+
+    [TestFixture]
     class AlpinePackageDownloaderTest
     {
         [TestCase]

diff --git a/src/LCT.SW360PackageCreator.UTest/ComponentCreatorTest.cs b/src/LCT.SW360PackageCreator.UTest/ComponentCreatorTest.cs
@@ -31,6 +31,7 @@
 
 namespace NUnitTestProject1
 {
+    [TestFixture]
     public class ComponentCreatorTest
     {
         [SetUp]

diff --git a/src/SW360IntegrationTest/Python/ComponentCreatorInitialPython.cs b/src/SW360IntegrationTest/Python/ComponentCreatorInitialPython.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright company="Siemens AG">
-//   Copyright (C) Siemens AG 2023. All rights reserved. 
+//   Copyright (C) Siemens AG 2024. All rights reserved. 
 // </copyright>
 //<license>MIT</license>
 // --------------------------------------------------------------------------------------------------------------------