Fix ordering of error tests of implicit syntax

Author: MilesCranmer

src/EvaluationHelpers.jl

@@ -57,7 +57,9 @@ end
 function (tree::Node)(X; kws...)
     ## This will be overwritten by OperatorEnumConstructionModule, and turned
     ## into a depwarn.
-    error("The `tree(X; kws...)` syntax is deprecated. Use `tree(X, operators; kws...)` instead.")
+    return error(
+        "The `tree(X; kws...)` syntax is deprecated. Use `tree(X, operators; kws...)` instead.",
+    )
 end
 
 # Gradients:
@@ -69,12 +71,14 @@ function _grad_evaluator(tree::Node, X, operators::OperatorEnum; variable=true,
     return grad
 end
 function _grad_evaluator(tree::Node, X, operators::GenericOperatorEnum; kws...)
-    error("Gradients are not implemented for `GenericOperatorEnum`.")
+    return error("Gradients are not implemented for `GenericOperatorEnum`.")
 end
 function _grad_evaluator(tree::Node, X; kws...)
     ## This will be overwritten by OperatorEnumConstructionModule, and turned
     ## into a depwarn
-    error("The `tree'(X; kws...)` syntax is deprecated. Use `tree'(X, operators; kws...)` instead.")
+    return error(
+        "The `tree'(X; kws...)` syntax is deprecated. Use `tree'(X, operators; kws...)` instead.",
+    )
 end
 
 """

test/test_error_handling.jl

@@ -1,27 +1,6 @@
 using DynamicExpressions
 using Test
 
-# Before defining OperatorEnum, calling the implicit (deprecated)
-# syntax should fail:
-tree = Node(; feature=1)
-try
-    tree([1.0 2.0]')
-    @test false
-catch e
-    @test isa(e, ErrorException)
-    expected_error_msg = "The `tree(X; kws...)` syntax is deprecated"
-    @test occursin(expected_error_msg, e.msg)
-end
-
-try
-    tree'([1.0 2.0]')
-    @test false
-catch e
-    @test isa(e, ErrorException)
-    expected_error_msg = "The `tree'(X; kws...)` syntax is deprecated"
-    @test occursin(expected_error_msg, e.msg)
-end
-
 # Test that we generate errors:
 baseT = Float64
 T = Union{baseT,Vector{baseT},Matrix{baseT}}
@@ -62,3 +41,13 @@ end
 
 # But can be overrided:
 output = tree([[1.0, 2.0, 3.0], [4.0, 5.0, 6.0]], operators; throw_errors=false)
+
+# Gradients are undefined for GenericOperatorEnum:
+try
+    tree'([[1.0, 2.0, 3.0], [4.0, 5.0, 6.0]], operators)
+    @test false
+catch e
+    @test isa(e, ErrorException)
+    expected_error_msg = "The `tree'(X; kws...)` syntax is deprecated"
+    @test occursin(expected_error_msg, e.msg)
+end

test/unittest.jl

@@ -1,5 +1,31 @@
 using SafeTestsets
 
+@safetestset "Initial error handling test" begin
+    using DynamicExpressions
+    using Test
+
+    # Before defining OperatorEnum, calling the implicit (deprecated)
+    # syntax should fail:
+    tree = Node(; feature=1)
+    try
+        tree([1.0 2.0]')
+        @test false
+    catch e
+        @test isa(e, ErrorException)
+        expected_error_msg = "The `tree(X; kws...)` syntax is deprecated"
+        @test occursin(expected_error_msg, e.msg)
+    end
+
+    try
+        tree'([1.0 2.0]')
+        @test false
+    catch e
+        @test isa(e, ErrorException)
+        expected_error_msg = ""
+        @test occursin(expected_error_msg, e.msg)
+    end
+end
+
 @safetestset "Test tree construction and scoring" begin
     include("test_tree_construction.jl")
 end