Skip to content

Fix export unit tests #3923

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

Open
wants to merge 3 commits into
base: importer-rework
Choose a base branch
from
+138 −116
Open

Fix export unit tests #3923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e165c3
Fixed ExportTest.RulesGenerateHtml
Elutrixx Nov 13, 2025
cae1ef1
Fixed more tests
Elutrixx Nov 15, 2025
dc3497a
Merge remote-tracking branch 'cactus/importer-rework' into Fix-RulesG…
Elutrixx Nov 15, 2025
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
4 changes: 2 additions & 2 deletions roles/lib/files/FWO.Report/ReportDevicesBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ public string DisplayReportHeaderJson()
{
report.AppendLine($"\"date of configuration shown\": \"{DateTime.Parse(Query.ReportTimeString).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssK")} (UTC)\",");
}
report.AppendLine($"# device filter: {string.Join(" ", ReportData.ManagementData.Where(mgt => !mgt.Ignore).Cast<ManagementReportController>().Select(m => m.NameAndRulebaseNames(" ")))}");
report.AppendLine($"# device filter: {string.Join(" ", ReportData.ManagementData.Where(mgt => !mgt.Ignore).Select(mgm => new ManagementReportController(mgm)).Select(m => m.NameAndRulebaseNames(" ")))}");
report.AppendLine($"\"other filters\": \"{Query.RawFilter}\",");
report.AppendLine($"\"report generator\": \"Firewall Orchestrator - https://fwo.cactus.de/en\",");
report.AppendLine($"\"data protection level\": \"For internal use only\",");
Expand All @@ -218,7 +218,7 @@ public string DisplayReportHeaderCsv()
{
report.AppendLine($"# date of configuration shown: {DateTime.Parse(Query.ReportTimeString).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssK")} (UTC)");
}
report.AppendLine($"# device filter: {string.Join(" ", ReportData.ManagementData.Where(mgt => !mgt.Ignore).Cast<ManagementReportController>().Select(m => m.NameAndRulebaseNames(" ")))}");
report.AppendLine($"# device filter: {string.Join(" ", ReportData.ManagementData.Where(mgt => !mgt.Ignore).Select(mgm => new ManagementReportController(mgm)).Select(m => m.NameAndRulebaseNames(" ")))}");
report.AppendLine($"# other filters: {Query.RawFilter}");
report.AppendLine($"# report generator: Firewall Orchestrator - https://fwo.cactus.de/en");
report.AppendLine($"# data protection level: For internal use only");
Expand Down
2 changes: 1 addition & 1 deletion roles/lib/files/FWO.Report/ReportRules.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public override async Task Generate(int elementsPerFetch, ApiConnection apiConne
TryBuildRuleTree();
}

private void TryBuildRuleTree()
protected void TryBuildRuleTree()
{
int ruleCount = 0;

Expand Down
Loading
Loading