fix tests on nightly (#283)

JuliaStats · Mar 14, 2023 · 98f7fb6 · 98f7fb6 · kleinschmidt · Mar 14, 2023
1 parent 63d72c4
commit 98f7fb6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/schema.jl b/src/schema.jl
@@ -215,6 +215,11 @@ function concrete_term(t::Term, xs::AbstractArray, contrasts::AbstractContrasts)
     CategoricalTerm(t.sym, contrmat)
 end
 
+# this catches early when someone provides `:x => DummyCoding` as a hint
+function concrete_term(t::Term, xs::AbstractArray, ::Type{T}) where {T<:AbstractContrasts}
+    throw(ArgumentError("contrast types must be instantiated (use $T() instead of $T)"))
+end
+
 """
     apply_schema(t, schema::StatsModels.Schema[, Mod::Type = Nothing])
 

diff --git a/test/contrasts.jl b/test/contrasts.jl
@@ -198,7 +198,7 @@
 
     # contrasts types must be instantiated (should throw ArgumentError, currently
     # MethodError on apply_schema)
-    @test_broken setcontrasts!(mf, x = DummyCoding)
+    @test_throws ArgumentError setcontrasts!(mf, x = DummyCoding)
 
     @testset "hypothesis coding" begin
 

diff --git a/test/formula.jl b/test/formula.jl
@@ -118,8 +118,9 @@
         @formula(foo ~ bar + baz)
 
     # drop_term no longer checks for whether term is found...
-    @test_broken drop_term(@formula(foo ~ bar + baz), term(0))
-    @test_broken drop_term(@formula(foo ~ bar + baz), term(:boz))
+    f = @formula(foo ~ bar + baz)
+    @test drop_term(f, term(0)) == f
+    @test drop_term(f, term(:boz)) == f
 
     form = @formula(foo ~ 1 + bar + baz)
     @test form == @formula(foo ~ 1 + bar + baz)