Merge branch 'issue-12-macros-tests-r060-stack' into release/0.6.0

Author: blackopsrepl

Cargo.lock

@@ -14,3 +14,5 @@ quote.workspace = true
 proc-macro2.workspace = true
 
 [dev-dependencies]
+solverforge = { path = "../solverforge" }
+trybuild = "1.0.114"

crates/solverforge-macros/Cargo.toml

@@ -196,6 +196,7 @@ When `#[shadow_variable_updates]` is configured, `update_entity_shadows(entity_i
 7. Entity computes (call method to compute entity fields)
 8. Post-update listener (call method once per entity)
 
-### No Tests in Crate
+## Test Coverage
 
-This is a proc-macro crate. Tests are integration-level, run via the consuming crates (examples and the facade).
+- `tests/trybuild.rs` — compile-pass and compile-fail coverage for the public macros
+- Unit tests in `planning_entity.rs` and `planning_solution.rs` — token-level golden checks for generated code shape

crates/solverforge-macros/WIREFRAME.md

@@ -223,3 +223,31 @@ pub fn expand_derive(input: DeriveInput) -> Result<TokenStream, Error> {
 
     Ok(expanded)
 }
+
+#[cfg(test)]
+mod tests {
+    use super::expand_derive;
+    use syn::parse_quote;
+
+    #[test]
+    fn golden_entity_expansion_includes_descriptor_and_planning_id() {
+        let input = parse_quote! {
+            struct Task {
+                #[planning_id]
+                id: String,
+                #[planning_variable(allows_unassigned = true, value_range_provider = "workers")]
+                worker_idx: Option<usize>,
+            }
+        };
+
+        let expanded = expand_derive(input)
+            .expect("entity expansion should succeed")
+            .to_string();
+
+        assert!(expanded.contains("impl :: solverforge :: __internal :: PlanningEntity for Task"));
+        assert!(expanded.contains("impl :: solverforge :: __internal :: PlanningId for Task"));
+        assert!(expanded.contains("with_allows_unassigned (true)"));
+        assert!(expanded.contains("with_value_range (\"workers\")"));
+        assert!(expanded.contains("pub fn entity_descriptor"));
+    }
+}

crates/solverforge-macros/src/planning_entity.rs

@@ -1170,3 +1170,42 @@ fn extract_collection_inner_type(ty: &syn::Type) -> Option<&syn::Type> {
     }
     None
 }
+
+#[cfg(test)]
+mod tests {
+    use super::expand_derive;
+    use syn::parse_quote;
+
+    #[test]
+    fn golden_solution_expansion_emits_constraint_streams_and_descriptor() {
+        let input = parse_quote! {
+            #[solverforge_constraints_path = "crate::constraints::create_constraints"]
+            #[basic_variable_config(
+                entity_collection = "tasks",
+                variable_field = "worker_idx",
+                variable_type = "usize",
+                value_range = "workers"
+            )]
+            struct Plan {
+                #[problem_fact_collection]
+                workers: Vec<Worker>,
+                #[planning_entity_collection]
+                tasks: Vec<Task>,
+                #[planning_score]
+                score: Option<HardSoftScore>,
+            }
+        };
+
+        let expanded = expand_derive(input)
+            .expect("solution expansion should succeed")
+            .to_string();
+
+        assert!(expanded.contains("impl :: solverforge :: __internal :: PlanningSolution for Plan"));
+        assert!(expanded.contains("pub trait PlanConstraintStreams"));
+        assert!(expanded.contains("pub trait TaskUnassignedFilter"));
+        assert!(expanded.contains(
+            "pub fn descriptor () -> :: solverforge :: __internal :: SolutionDescriptor"
+        ));
+        assert!(expanded.contains("create_constraints"));
+    }
+}

crates/solverforge-macros/src/planning_solution.rs

@@ -0,0 +1,6 @@
+#[test]
+fn macros_compile_and_fail_as_expected() {
+    let cases = trybuild::TestCases::new();
+    cases.pass("tests/ui/pass/*.rs");
+    cases.compile_fail("tests/ui/fail/*.rs");
+}

crates/solverforge-macros/tests/trybuild.rs

@@ -0,0 +1,6 @@
+use solverforge_macros::planning_entity;
+
+#[planning_entity]
+struct Task(String);
+
+fn main() {}

crates/solverforge-macros/tests/ui/fail/planning_entity_tuple_struct.rs

@@ -0,0 +1,5 @@
+error: expected one of `;` or `where`, found `<eof>`
+ --> tests/ui/fail/planning_entity_tuple_struct.rs:4:12
+  |
+4 | struct Task(String);
+  |            ^^^^^^^^ expected one of `;` or `where`

crates/solverforge-macros/tests/ui/fail/planning_entity_tuple_struct.stderr

@@ -0,0 +1,15 @@
+use solverforge_macros::{planning_entity, planning_solution};
+
+#[planning_entity]
+struct Task {
+    #[planning_id]
+    id: String,
+}
+
+#[planning_solution]
+struct Plan {
+    #[planning_entity_collection]
+    tasks: Vec<Task>,
+}
+
+fn main() {}

crates/solverforge-macros/tests/ui/fail/planning_solution_missing_score.rs

@@ -0,0 +1,7 @@
+error: #[planning_solution] requires a #[planning_score] field
+ --> tests/ui/fail/planning_solution_missing_score.rs:9:1
+  |
+9 | #[planning_solution]
+  | ^^^^^^^^^^^^^^^^^^^^
+  |
+  = note: this error originates in the attribute macro `planning_solution` (in Nightly builds, run with -Z macro-backtrace for more info)