Skip to content

Update DefaultProcessConfigurationTests for managed entry point assembly #8023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 22, 2025
Merged

Update DefaultProcessConfigurationTests for managed entry point assembly #8023

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion ...sts/Microsoft.Diagnostics.Monitoring.WebApi.UnitTests/DefaultProcessConfigurationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,13 @@ public void ConvertProcessConfig()
Value = "arg1"
};

var filterDescriptorManagedEntryPointAssemblyName = new ProcessFilterDescriptor
{
Key = ProcessFilterKey.ManagedEntryPointAssemblyName,
MatchType = ProcessFilterType.Exact,
Value = "MyApp"
};

var filter = CreateFilterEntry(filterDescriptorPid);
ValidateProcessFilter(DiagProcessFilterCriteria.ProcessId, filterDescriptorPid.Value, filter);

Expand All @@ -90,14 +97,24 @@ public void ConvertProcessConfig()
filter = CreateFilterEntry(filterDescriptorCommandContains);
ValidateProcessFilter(DiagProcessFilterCriteria.CommandLine, filterDescriptorCommandContains.Value, DiagProcessFilterMatchType.Contains, filter);

filter = CreateFilterEntry(filterDescriptorManagedEntryPointAssemblyName);
ValidateProcessFilter(DiagProcessFilterCriteria.ManagedEntryPointAssemblyName, filterDescriptorManagedEntryPointAssemblyName.Value, filter);

//This filter doesn't make any sense but we are just testing that we can combine multiple filters
var options = CreateOptions(filterDescriptorPid, filterDescriptorName, filterDescriptorNameContains, filterDescriptorCommand, filterDescriptorCommandContains);
var options = CreateOptions(
filterDescriptorPid,
filterDescriptorName,
filterDescriptorNameContains,
filterDescriptorCommand,
filterDescriptorCommandContains,
filterDescriptorManagedEntryPointAssemblyName);

ValidateProcessFilter(DiagProcessFilterCriteria.ProcessId, filterDescriptorPid.Value, options.Filters[0]);
ValidateProcessFilter(DiagProcessFilterCriteria.ProcessName, filterDescriptorName.Value, options.Filters[1]);
ValidateProcessFilter(DiagProcessFilterCriteria.ProcessName, filterDescriptorNameContains.Value, DiagProcessFilterMatchType.Contains, options.Filters[2]);
ValidateProcessFilter(DiagProcessFilterCriteria.CommandLine, filterDescriptorCommand.Value, options.Filters[3]);
ValidateProcessFilter(DiagProcessFilterCriteria.CommandLine, filterDescriptorCommandContains.Value, DiagProcessFilterMatchType.Contains, options.Filters[4]);
ValidateProcessFilter(DiagProcessFilterCriteria.ManagedEntryPointAssemblyName, filterDescriptorManagedEntryPointAssemblyName.Value, options.Filters[5]);
}

[Fact]
Expand All @@ -115,6 +132,7 @@ public void NewCriteriaTest()
DiagProcessFilterCriteria.RuntimeId,
DiagProcessFilterCriteria.CommandLine,
DiagProcessFilterCriteria.ProcessName,
DiagProcessFilterCriteria.ManagedEntryPointAssemblyName
};

Assert.Equal(expectedValues.Length, actualValues.Length);
Expand Down