Skip to content

Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel

Fix CLI help exit handling

Yuechen Li0b67fe45e8e8
diff --git a/Aetheris.CLI.Tests/CliHelpAndUsageTests.cs b/Aetheris.CLI.Tests/CliHelpAndUsageTests.cs
index 6f981be6..ffd0acf3 100644
--- a/Aetheris.CLI.Tests/CliHelpAndUsageTests.cs
+++ b/Aetheris.CLI.Tests/CliHelpAndUsageTests.cs
@@ -9,7 +9,8 @@ public sealed class CliHelpAndUsageTests
[Theory]
[InlineData("--help")]
[InlineData("-h")]
- public void Top_Level_Help_Flags_Return_Zero_And_List_Commands(string flag)
+ [InlineData("help")]
+ public void Top_Level_Help_Requests_Return_Zero_And_List_Commands(string flag)
{
var stdout = new StringWriter();
var stderr = new StringWriter();
@@ -57,6 +58,22 @@ public sealed class CliHelpAndUsageTests
Assert.Contains("Example", text, StringComparison.Ordinal);
}
+
+ [Fact]
+ public void Invalid_Top_Level_Command_Remains_Nonzero_And_Reports_Usage()
+ {
+ var stdout = new StringWriter();
+ var stderr = new StringWriter();
+
+ var exitCode = Aetheris.CLI.CliRunner.Run(["definitely-not-a-command"], stdout, stderr);
+
+ Assert.NotEqual(0, exitCode);
+ Assert.True(string.IsNullOrWhiteSpace(stdout.ToString()));
+ var text = stderr.ToString();
+ Assert.Contains("Unknown command 'definitely-not-a-command'", text, StringComparison.Ordinal);
+ Assert.Contains("aetheris --help", text, StringComparison.Ordinal);
+ }
+
[Fact]
public void Analyze_Help_Explains_Default_Text_And_Json_Mode()
{
diff --git a/Aetheris.CLI/CliRunner.cs b/Aetheris.CLI/CliRunner.cs
index 3f5bf85c..f9a9e0e1 100644
--- a/Aetheris.CLI/CliRunner.cs
+++ b/Aetheris.CLI/CliRunner.cs
@@ -144,7 +144,7 @@ public static class CliRunner
return 1;
}
- if (IsHelpFlag(args[0]))
+ if (IsTopLevelHelpRequest(args[0]))
{
WriteTopLevelHelp(stdout);
return 0;
@@ -2142,6 +2142,10 @@ public static class CliRunner
return 1;
}
+ private static bool IsTopLevelHelpRequest(string value) =>
+ IsHelpFlag(value)
+ || string.Equals(value, "help", StringComparison.Ordinal);
+
private static bool IsHelpFlag(string value) =>
string.Equals(value, "--help", StringComparison.Ordinal)
|| string.Equals(value, "-h", StringComparison.Ordinal);