Fix testS

aclai-lab · Nov 25, 2024 · e56a684 · e56a684
1 parent aba2fb2
commit e56a684
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/src/scalar/conditions.jl b/src/scalar/conditions.jl
@@ -242,7 +242,7 @@ function parsecondition(
     kwargs...
 ) where {U,FT<:AbstractFeature,C<:ScalarCondition{U,FT}}
     if !isnothing(featuretype) && featuretype != FT
-        throw(ValueError("Cannot parse condition of type $(C) with " *
+        throw(ArgumentError("Cannot parse condition of type $(C) with " *
             "featuretype = $(featuretype). (expr = $(repr(expr)))"))
     end
     _parsecondition(C, expr; kwargs...)
@@ -257,7 +257,7 @@ function _parsecondition(
     slices = match(r, expr)
 
     if isnothing(slices) || length(slices) != 3
-        throw(ValueError("Could not parse ScalarCondition from " *
+        throw(ArgumentError("Could not parse ScalarCondition from " *
             "expression $(repr(expr)). Regex slices = $(slices)"))
     end
 
@@ -650,7 +650,7 @@ function _parsecondition(
     # r = Regex("^\\s*(\\S+)\\s*([^\\s\\d]+)\\s*(\\[|\\()\\s*(\\S+)\\s*,\\s*(\\S+)\\s*(\\]|\\))\\s*\$")
     slices = match(r, expr)
     if isnothing(slices) || length(slices) != 5
-        throw(ValueError("Could not parse ScalarCondition from " *
+        throw(ArgumentError("Could not parse ScalarCondition from " *
             "expression $(repr(expr)). Regex slices = $(slices)"))
     end
 

diff --git a/test/parse.jl b/test/parse.jl
@@ -29,8 +29,8 @@ C = ScalarCondition
 @test_nowarn parsecondition(C, "min[V1] <= 32"; featvaltype = Float64, featuretype = AbstractUnivariateFeature)
 @test_nowarn parsecondition(C, "max[V2] <= 435"; featvaltype = Float64, featuretype = AbstractUnivariateFeature)
 @test_nowarn parsecondition(C, "minimum[V6]    > 250.631"; featvaltype = Float64, featuretype = AbstractUnivariateFeature)
-@test_throws AssertionError parsecondition(C, "   minimum   [V7]    > 11.2"; featvaltype = Float64, featuretype = AbstractUnivariateFeature)
-@test_throws AssertionError parsecondition(C, "avg [V8]    > 63.2  "; featvaltype = Float64, featuretype = AbstractUnivariateFeature)
+@test_throws ArgumentError parsecondition(C, "   minimum   [V7]    > 11.2"; featvaltype = Float64, featuretype = AbstractUnivariateFeature)
+@test_throws ArgumentError parsecondition(C, "avg [V8]    > 63.2  "; featvaltype = Float64, featuretype = AbstractUnivariateFeature)
 @test_nowarn parsecondition(C, "mean[V9] <= 1.0e100"; featvaltype = Float64, featuretype = AbstractUnivariateFeature)
 
 @test_nowarn parsecondition(C, "max{3] <= 12"; featvaltype = Float64, opening_parenthesis="{", variable_name_prefix = "", featuretype = AbstractUnivariateFeature)
@@ -46,10 +46,10 @@ C = ScalarCondition
 @test_nowarn parsecondition(C, "max[V15] <= 723"; featvaltype = Float64, featuretype = AbstractUnivariateFeature)
 @test_nowarn parsecondition(C, "mean[V16] == 54.2"; featvaltype = Float64, featuretype = AbstractUnivariateFeature)
 
-@test_throws ValueError parsecondition(C, "5345.4 < avg [V13]    < 32.2 < 12.2"; featuretype = AbstractUnivariateFeature)
-@test_throws ValueError parsecondition(C, "avg [V14] < 12.2 <= 6127.2"; featuretype = AbstractUnivariateFeature)
-@test_throws ValueError parsecondition(C, "mean189]    > 113.2"; featuretype = AbstractUnivariateFeature)
-@test_throws ValueError parsecondition(C, "123.4 < avg [V12]    > 777.2  "; featuretype = AbstractUnivariateFeature)
-@test_throws ValueError parsecondition(C, "mimimum [V17] < 23.2 <= 156.2"; featuretype = AbstractUnivariateFeature)
-@test_throws ValueError parsecondition(C, "max[V3} <= 12"; opening_parenthesis="{", featuretype = AbstractUnivariateFeature)
-@test_throws ValueError parsecondition(C, "max{18] <= 12"; opening_parenthesis="}", variable_name_prefix = "", featuretype = AbstractUnivariateFeature)
+@test_throws ArgumentError parsecondition(C, "5345.4 < avg [V13]    < 32.2 < 12.2"; featuretype = AbstractUnivariateFeature)
+@test_throws ArgumentError parsecondition(C, "avg [V14] < 12.2 <= 6127.2"; featuretype = AbstractUnivariateFeature)
+@test_throws ArgumentError parsecondition(C, "mean189]    > 113.2"; featuretype = AbstractUnivariateFeature)
+@test_throws ArgumentError parsecondition(C, "123.4 < avg [V12]    > 777.2  "; featuretype = AbstractUnivariateFeature)
+@test_throws ArgumentError parsecondition(C, "mimimum [V17] < 23.2 <= 156.2"; featuretype = AbstractUnivariateFeature)
+@test_throws ArgumentError parsecondition(C, "max[V3} <= 12"; opening_parenthesis="{", featuretype = AbstractUnivariateFeature)
+@test_throws ArgumentError parsecondition(C, "max{18] <= 12"; opening_parenthesis="}", variable_name_prefix = "", featuretype = AbstractUnivariateFeature)