2 files changed, 47 insertions, 0 deletions
diff --git a/mingling_pathf/test/src/lib.rs b/mingling_pathf/test/src/lib.rs
index 6fce3b2..824cbbf 100644
--- a/mingling_pathf/test/src/lib.rs
+++ b/mingling_pathf/test/src/lib.rs
@@ -233,8 +233,11 @@ fn test_groupped_derive_analyze() {
         "::Derived1",
         "::Derived2",
         "::Derived3",
+        "::EnumDerived1",
+        "::EnumDerived2",
         "::sub::Derived1",
         "::sub::Derived3",
+        "::sub::EnumDerived1",
     ];
 
     assert_eq!(r.len(), required.len());
@@ -357,3 +360,30 @@ fn test_dispatcher_clap_analyze() {
         assert!(r.contains(*entry), "Result should contain: {}", entry);
     }
 }
+
+#[test]
+fn test_dispatcher_clap_dispatch_tree() {
+    use mingling_pathf::config::PathfinderConfig;
+    use mingling_pathf::pattern_analyzer;
+
+    let file = current_dir()
+        .unwrap()
+        .join("src/test_files/test_dispatcher_clap.rs");
+
+    // Without dispatch_tree: 26 items (same set as test_dispatcher_clap_analyze)
+    let r1 = pattern_analyzer::init().analyze_file(&file).unwrap();
+    assert_eq!(r1.len(), 26);
+
+    // With dispatch_tree: 26 + 4 __internal (root) + 3 __internal (sub, no "full") = 33
+    let r2 = pattern_analyzer::init_with_config(PathfinderConfig::with_dispatch_tree())
+        .analyze_file(&file)
+        .unwrap();
+    assert_eq!(r2.len(), 33);
+    assert!(r2.contains("::__internal_dispatcher_greet"));
+    assert!(r2.contains("::__internal_dispatcher_delete"));
+    assert!(r2.contains("::__internal_dispatcher_helpcmd"));
+    assert!(r2.contains("::__internal_dispatcher_full"));
+    assert!(r2.contains("::sub::__internal_dispatcher_greet"));
+    assert!(r2.contains("::sub::__internal_dispatcher_delete"));
+    assert!(r2.contains("::sub::__internal_dispatcher_helpcmd"));
+}
diff --git a/mingling_pathf/test/src/test_files/test_groupped_derive.rs b/mingling_pathf/test/src/test_files/test_groupped_derive.rs
index f6c6fa9..913587c 100644
--- a/mingling_pathf/test/src/test_files/test_groupped_derive.rs
+++ b/mingling_pathf/test/src/test_files/test_groupped_derive.rs
@@ -13,6 +13,18 @@ struct Derived3 {
     value: bool,
 }
 
+#[derive(Groupped)]
+enum EnumDerived1 {
+    A,
+    B,
+}
+
+#[derive(GrouppedSerialize)]
+enum EnumDerived2 {
+    X(String),
+    Y(i32),
+}
+
 pub mod sub {
     #[derive(Groupped)]
     struct Derived1 {
@@ -23,4 +35,9 @@ pub mod sub {
     struct Derived3 {
         value: bool,
     }
+
+    #[derive(Groupped)]
+    enum EnumDerived1 {
+        A,
+    }
 }