@@ -747,7 +747,7 @@ fn test_create_path_constrained_network_flow_rejects_invalid_paths() {
747747}
748748
749749#[ test]
750- fn test_create_staff_scheduling_reports_invalid_schedule_without_panic ( ) {
750+ fn test_create_staff_scheduling_rejects_ragged_schedule ( ) {
751751 let cli = Cli :: try_parse_from ( [
752752 "pred" ,
753753 "create" ,
@@ -775,14 +775,7 @@ fn test_create_staff_scheduling_reports_invalid_schedule_without_panic() {
775775 auto_json : false ,
776776 } ;
777777
778- let result = std:: panic:: catch_unwind ( || create ( & args, & out) ) ;
779- assert ! ( result. is_ok( ) , "create should return an error, not panic" ) ;
780- let err = result. unwrap ( ) . unwrap_err ( ) . to_string ( ) ;
781- // parse_bool_rows catches ragged rows before validate_staff_scheduling_args
782- assert ! (
783- err. contains( "All rows" ) || err. contains( "schedule 1 has 6 periods, expected 7" ) ,
784- "expected row-length validation error, got: {err}"
785- ) ;
778+ assert ! ( create( & args, & out) . is_err( ) ) ;
786779}
787780
788781#[ test]
@@ -955,7 +948,7 @@ fn test_create_timetable_design_outputs_problem_json() {
955948}
956949
957950#[ test]
958- fn test_create_timetable_design_reports_invalid_matrix_without_panic ( ) {
951+ fn test_create_timetable_design_rejects_invalid_matrix ( ) {
959952 let cli = Cli :: try_parse_from ( [
960953 "pred" ,
961954 "create" ,
@@ -987,13 +980,7 @@ fn test_create_timetable_design_reports_invalid_matrix_without_panic() {
987980 auto_json : false ,
988981 } ;
989982
990- let result = std:: panic:: catch_unwind ( || create ( & args, & out) ) ;
991- assert ! ( result. is_ok( ) , "create should return an error, not panic" ) ;
992- let err = result. unwrap ( ) . unwrap_err ( ) . to_string ( ) ;
993- assert ! (
994- err. contains( "--craftsman-avail" ) ,
995- "expected timetable matrix validation error, got: {err}"
996- ) ;
983+ assert ! ( create( & args, & out) . is_err( ) ) ;
997984}
998985
999986#[ test]
0 commit comments