2 files changed, 69 insertions, 0 deletions

diff --git a/mingling_pathf/test/src/lib.rs b/mingling_pathf/test/src/lib.rs
index 51e19a6..6fce3b2 100644
--- a/mingling_pathf/test/src/lib.rs
+++ b/mingling_pathf/test/src/lib.rs
@@ -315,12 +315,41 @@ fn test_dispatcher_clap_analyze() {
 
     let r = analyzer.analyze_file(file).unwrap();
     let required: Vec<&str> = vec![
+        // Root: entry types (bare dispatcher_clap, no params)
         "::EntryClap1",
         "::EntryClap2",
         "::EntryClap3",
         "::EntryClap4",
+        // Root: with CMD type
+        "::EntryWithCmd",
+        "::CMDGreet",
+        // Root: with CMD + error
+        "::EntryWithError",
+        "::CMDDelete",
+        "::ErrorDelete",
+        // Root: with CMD + help
+        "::EntryWithHelp",
+        "::CMDHelp",
+        "::__internal_help_cmdhelp_help",
+        // Root: with CMD + error + help
+        "::EntryFull",
+        "::CMDFull",
+        "::ErrorFull",
+        "::__internal_help_cmdfull_help",
+        // Sub: entry types (bare dispatcher_clap)
         "::sub::EntryClap1",
         "::sub::EntryClap3",
+        // Sub: with CMD type
+        "::sub::EntryWithCmd",
+        "::sub::CMDGreet",
+        // Sub: with CMD + error
+        "::sub::EntryWithError",
+        "::sub::CMDDelete",
+        "::sub::ErrorDelete",
+        // Sub: with CMD + help
+        "::sub::EntryWithHelp",
+        "::sub::CMDHelp",
+        "::sub::__internal_help_cmdhelp_help",
     ];
 
     assert_eq!(r.len(), required.len());
diff --git a/mingling_pathf/test/src/test_files/test_dispatcher_clap.rs b/mingling_pathf/test/src/test_files/test_dispatcher_clap.rs
index 0ba884d..33d86e0 100644
--- a/mingling_pathf/test/src/test_files/test_dispatcher_clap.rs
+++ b/mingling_pathf/test/src/test_files/test_dispatcher_clap.rs
@@ -1,3 +1,4 @@
+// Basic: entry type only (no CMD type specified)
 #[mingling::macros::dispatcher_clap]
 struct EntryClap1 {
     name: String,
@@ -20,6 +21,30 @@ pub struct EntryClap4 {
     value: i32,
 }
 
+// With CMD type
+#[dispatcher_clap("greet", CMDGreet)]
+struct EntryWithCmd {
+    name: String,
+}
+
+// With CMD + error
+#[dispatcher_clap("delete", CMDDelete, error = ErrorDelete)]
+struct EntryWithError {
+    id: u64,
+}
+
+// With CMD + help
+#[dispatcher_clap("helpcmd", CMDHelp, help = true)]
+struct EntryWithHelp {
+    verbose: bool,
+}
+
+// With CMD + error + help
+#[dispatcher_clap("full", CMDFull, error = ErrorFull, help = true)]
+struct EntryFull {
+    all: bool,
+}
+
 pub mod sub {
     #[mingling::macros::dispatcher_clap]
     struct EntryClap1 {
@@ -30,4 +55,19 @@ pub mod sub {
     struct EntryClap3 {
         value: String,
     }
+
+    #[dispatcher_clap("greet", CMDGreet)]
+    struct EntryWithCmd {
+        name: String,
+    }
+
+    #[dispatcher_clap("delete", CMDDelete, error = ErrorDelete)]
+    struct EntryWithError {
+        id: u64,
+    }
+
+    #[dispatcher_clap("helpcmd", CMDHelp, help = true)]
+    struct EntryWithHelp {
+        verbose: bool,
+    }
 }