test: fix missing CTBase import and update test_solve_modes to match max_iter=0 behavior

Author: ocots

test/suite/helpers/test_kwarg_extraction.jl

@@ -12,6 +12,7 @@ import Test
 import OptimalControl
 import CTDirect
 import CTSolvers
+import CTBase
 
 const VERBOSE = isdefined(Main, :TestOptions) ? Main.TestOptions.VERBOSE : true
 const SHOWTIMING = isdefined(Main, :TestOptions) ? Main.TestOptions.SHOWTIMING : true
@@ -94,6 +95,50 @@ function test_kwarg_extraction()
             result = OptimalControl._extract_kwarg(kw, CTDirect.AbstractDiscretizer)
             Test.@test result isa Nothing
         end
+        # ====================================================================
+        # UNIT TESTS - Action Kwarg Extraction (aliases)
+        # ====================================================================
+
+        Test.@testset "Action Kwarg Extraction" begin
+            Test.@testset "Extracts primary name" begin
+                kw = pairs((; initial_guess=42, display=false))
+                val, rest = OptimalControl._extract_action_kwarg(kw, (:initial_guess, :init, :i), nothing)
+                Test.@test val == 42
+                Test.@test haskey(rest, :display)
+                Test.@test !haskey(rest, :initial_guess)
+            end
+
+            Test.@testset "Extracts alias 1" begin
+                kw = pairs((; init=42, display=false))
+                val, rest = OptimalControl._extract_action_kwarg(kw, (:initial_guess, :init, :i), nothing)
+                Test.@test val == 42
+                Test.@test haskey(rest, :display)
+                Test.@test !haskey(rest, :init)
+            end
+
+            Test.@testset "Extracts alias 2" begin
+                kw = pairs((; i=42, display=false))
+                val, rest = OptimalControl._extract_action_kwarg(kw, (:initial_guess, :init, :i), nothing)
+                Test.@test val == 42
+                Test.@test haskey(rest, :display)
+                Test.@test !haskey(rest, :i)
+            end
+
+            Test.@testset "Returns default when not found" begin
+                kw = pairs((; display=false))
+                val, rest = OptimalControl._extract_action_kwarg(kw, (:initial_guess, :init, :i), :my_default)
+                Test.@test val === :my_default
+                Test.@test haskey(rest, :display)
+            end
+
+            Test.@testset "Throws on multiple aliases present" begin
+                kw = pairs((; init=42, i=43))
+                Test.@test_throws CTBase.IncorrectArgument OptimalControl._extract_action_kwarg(kw, (:initial_guess, :init, :i), nothing)
+                
+                kw2 = pairs((; initial_guess=42, init=43, i=44))
+                Test.@test_throws CTBase.IncorrectArgument OptimalControl._extract_action_kwarg(kw2, (:initial_guess, :init, :i), nothing)
+            end
+        end
     end
 end
 

test/suite/solve/test_solve_modes.jl

@@ -48,8 +48,6 @@ function test_solve_modes()
                 display=false
             )
 
-            success = OptimalControl.successful(sol_explicit)
-            Test.@test success
             Test.@test sol_explicit isa OptimalControl.AbstractSolution
         end
 
@@ -67,8 +65,6 @@ function test_solve_modes()
                 display=false
             )
 
-            success = OptimalControl.successful(sol_descriptive)
-            Test.@test success
             Test.@test sol_descriptive isa OptimalControl.AbstractSolution
         end
 
@@ -87,10 +83,39 @@ function test_solve_modes()
                 display=false
             )
 
-            success = OptimalControl.successful(sol_partial)
-            Test.@test success
             Test.@test sol_partial isa OptimalControl.AbstractSolution
         end
+
+        # ====================================================================
+        # Descriptive Mode Integration (Action Option Aliases)
+        # ====================================================================
+        Test.@testset "Descriptive Mode (Action Option Aliases)" begin
+            Test.@testset "Alias 'init'" begin
+                sol_init = OptimalControl.solve(
+                    pb.ocp,
+                    :collocation;
+                    init=pb.init,
+                    grid_size=20,
+                    max_iter=0,
+                    print_level=0,
+                    display=false
+                )
+                Test.@test sol_init isa OptimalControl.AbstractSolution
+            end
+
+            Test.@testset "Alias 'i'" begin
+                sol_i = OptimalControl.solve(
+                    pb.ocp,
+                    :collocation;
+                    i=pb.init,
+                    grid_size=20,
+                    max_iter=0,
+                    print_level=0,
+                    display=false
+                )
+                Test.@test sol_i isa OptimalControl.AbstractSolution
+            end
+        end
     end
 end