diff --git a/src/AritfactoryUploader.UTest/ArtifactoryUploaderTest.cs b/src/AritfactoryUploader.UTest/ArtifactoryUploaderTest.cs index 4a082184..d7341f35 100644 --- a/src/AritfactoryUploader.UTest/ArtifactoryUploaderTest.cs +++ b/src/AritfactoryUploader.UTest/ArtifactoryUploaderTest.cs @@ -145,11 +145,10 @@ public async Task UploadPackageToRepo_WhenPackageTypeIsClearedThirdPartyOrDevelo ArtfactoryUploader.jFrogService = jFrogServiceMock.Object; ArtfactoryUploader.JFrogApiCommInstance = jfrogApicommunicationMock.Object; // Act - var response = await ArtfactoryUploader.UploadPackageToRepo(component, timeout, displayPackagesInfo); + _= await ArtfactoryUploader.UploadPackageToRepo(component, timeout, displayPackagesInfo); // Assert jfrogApicommunicationMock.Verify(x => x.CopyFromRemoteRepo(component), Times.Once); - //Assert.AreEqual(HttpStatusCode.OK, response.StatusCode); } [Test] diff --git a/src/AritfactoryUploader.UTest/PackageUploadHelperTest.cs b/src/AritfactoryUploader.UTest/PackageUploadHelperTest.cs index a723fd42..5700b7a7 100644 --- a/src/AritfactoryUploader.UTest/PackageUploadHelperTest.cs +++ b/src/AritfactoryUploader.UTest/PackageUploadHelperTest.cs @@ -17,6 +17,7 @@ using System.Threading.Tasks; using System.Linq; using LCT.ArtifactoryUploader.Model; +using LCT.APICommunications; namespace AritfactoryUploader.UTest { @@ -140,7 +141,7 @@ public async Task GetComponentsToBeUploadedToArtifactory_GivenNotApprovedCompone }; //Act - List uploadList =await PackageUploadHelper.GetComponentsToBeUploadedToArtifactory(componentLists, appSettings, displayPackagesInfo); + List uploadList = await PackageUploadHelper.GetComponentsToBeUploadedToArtifactory(componentLists, appSettings, displayPackagesInfo); // Assert Assert.That(0, Is.EqualTo(uploadList.Count), "Checks for components to upload to be zero"); @@ -197,6 +198,52 @@ public void UpdateBomArtifactoryRepoUrl_GivenBomAndComponentsUploadedToArtifacto Assert.AreNotEqual("org1-npmjs-npm-remote", repoUrl); } + [Test] + public void DisplayErrorForJfrogPackages_GivenJfrogNotFoundPackages_ResultsSucess() + { + // Arrange + ComponentsToArtifactory componentsToArtifactory = new ComponentsToArtifactory(); + componentsToArtifactory.Name = "Test"; + componentsToArtifactory.Version = "0.12.3"; + List JfrogNotFoundPackages = new() { componentsToArtifactory }; + // Act + + PackageUploadHelper.DisplayErrorForJfrogPackages(JfrogNotFoundPackages); + + // Assert + } + + [Test] + public void DisplayErrorForJfrogFoundPackages_GivenJfrogNotFoundPackages_ResultsSucess() + { + // Arrange + ComponentsToArtifactory componentsToArtifactory = new ComponentsToArtifactory(); + componentsToArtifactory.Name = "Test"; + componentsToArtifactory.Version = "0.12.3"; + componentsToArtifactory.ResponseMessage = new System.Net.Http.HttpResponseMessage() + { ReasonPhrase = ApiConstant.ErrorInUpload }; + + ComponentsToArtifactory componentsToArtifactory2 = new ComponentsToArtifactory(); + componentsToArtifactory2.Name = "Test2"; + componentsToArtifactory2.Version = "0.12.32"; + componentsToArtifactory2.ResponseMessage = new System.Net.Http.HttpResponseMessage() + { ReasonPhrase = ApiConstant.PackageNotFound }; + + ComponentsToArtifactory componentsToArtifactory3 = new ComponentsToArtifactory(); + componentsToArtifactory3.Name = "Test3"; + componentsToArtifactory3.Version = "0.12.33"; + componentsToArtifactory3.ResponseMessage = new System.Net.Http.HttpResponseMessage() + { ReasonPhrase = "error" }; + + List JfrogNotFoundPackages = new() { + componentsToArtifactory, componentsToArtifactory2, componentsToArtifactory3 }; + // Act + + PackageUploadHelper.DisplayErrorForJfrogFoundPackages(JfrogNotFoundPackages); + + // Assert + } + private static List GetComponentList() { List componentLists = new List(); diff --git a/src/ArtifactoryUploader/PackageUploadHelper.cs b/src/ArtifactoryUploader/PackageUploadHelper.cs index 3f243b10..80a1baac 100644 --- a/src/ArtifactoryUploader/PackageUploadHelper.cs +++ b/src/ArtifactoryUploader/PackageUploadHelper.cs @@ -167,7 +167,7 @@ private static void DisplaySortedForeachComponents(List } - private static void DisplayErrorForJfrogFoundPackages(List JfrogFoundPackages) + public static void DisplayErrorForJfrogFoundPackages(List JfrogFoundPackages) { if (JfrogFoundPackages.Any()) @@ -196,7 +196,7 @@ private static void DisplayErrorForJfrogFoundPackages(List JfrogNotFoundPackages) + public static void DisplayErrorForJfrogPackages(List JfrogNotFoundPackages) { if (JfrogNotFoundPackages.Any()) diff --git a/src/SW360IntegrationTest/NPM/ClearingToolLoadTest.cs b/src/SW360IntegrationTest/NPM/ClearingToolLoadTest.cs index 274881f0..67b09dc5 100644 --- a/src/SW360IntegrationTest/NPM/ClearingToolLoadTest.cs +++ b/src/SW360IntegrationTest/NPM/ClearingToolLoadTest.cs @@ -11,8 +11,6 @@ namespace SW360IntegrationTest.LoadTest { - [Ignore("Load test need to run separatly")] - [TestFixture, Order(11)] public class ClearingToolLoadTest { private string OutFolderPath { get; set; } @@ -23,8 +21,6 @@ public void Setup() OutFolderPath = TestHelper.OutFolder; } - [Ignore("Load test need to run separatly")] - [Test, Order(1)] public void PerformanceTestFor130Components() { //Arrange @@ -46,8 +42,6 @@ public void PerformanceTestFor130Components() $"The actual time taken : {stopwatch.Elapsed.Minutes} is not equal to expected,which is 200 min"); } - [Ignore("Load test need to run separatly")] - [Test, Order(2)] public void PerformanceTestFor70Components() { //Arrange