Skip to content

Commit 1ec6d6e

Browse files
authored
Merge branch 'feature/app-settings-redesign' into Bug/PublishArtifactBugFix
2 parents e11d5b8 + aac6ac9 commit 1ec6d6e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1712
-906
lines changed

src/LCT.Common.UTests/CommonHelperTest.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,20 @@ public void RemoveMultipleExcludedComponents_ReturnSuccess()
5959
ComponentsForBom.Add(new Component() { Name = "Debian", Version = "3.1.2" });
6060
ComponentsForBom.Add(new Component() { Name = "Newton", Version = "3.1.3" });
6161
ComponentsForBom.Add(new Component() { Name = "Log4t", Version = "3.1.4" });
62+
ComponentsForBom.Add(new Component() { Name = "Log4t", Version = "3.1.5",Purl= "pkg:npm/foobar@12.3.1" });
63+
ComponentsForBom.Add(new Component() { Name = "Log4t", Version = "3.1.5", Purl = "pkg:npm/foobar@12.3.2" });
6264
int noOfExcludedComponents = 0;
6365

6466
List<string> list = new List<string>();
6567
list.Add("Debian:*");
6668
list.Add("Newton:3.1.3");
69+
list.Add("pkg:npm/foobar@12.3.1");
6770

6871
//Act
6972
CommonHelper.RemoveExcludedComponents(ComponentsForBom, list, ref noOfExcludedComponents);
7073

7174
//Assert
72-
Assert.That(noOfExcludedComponents, Is.EqualTo(4), "Returns the count of excluded components");
75+
Assert.That(noOfExcludedComponents, Is.EqualTo(5), "Returns the count of excluded components");
7376

7477
}
7578

src/LCT.Common.UTests/FolderActionTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ public void CopyToTargetDirectory_PassingDirsWithFiles_ReturnSuccess()
7474
{
7575
//Arrange
7676
string sourcePath = $"{Path.GetTempPath()}\\SampleFolder";
77-
Directory.CreateDirectory(sourcePath);
78-
Directory.CreateDirectory(sourcePath +"\\SampleSubFolder");
77+
System.IO.Directory.CreateDirectory(sourcePath);
78+
System.IO.Directory.CreateDirectory(sourcePath +"\\SampleSubFolder");
7979
File.WriteAllText(sourcePath + "\\Sample.txt", "");
8080
string targetPath = $"{Path.GetTempPath()}/targetPath/";
8181
var folderAction = new FolderAction();

0 commit comments

Comments
 (0)