fix all the tests

rafaqz · Mar 3, 2024 · 692b95b · 692b95b
1 parent d8dcbb1
commit 692b95b
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 10 deletions.
diff --git a/BaseInterfaces/test/runtests.jl b/BaseInterfaces/test/runtests.jl
@@ -6,7 +6,7 @@ using Test
 @implements SetInterface{(:empty,:emptymutable,:hasfastin,:intersect,:union,:sizehint!)} Test.GenericSet [Test.GenericSet(Set((1, 2)))]
 @implements DictInterface Test.GenericDict [Arguments(d=Test.GenericDict(Dict(:a => 1, :b => 2)), k=:c, v=3)]
 
-@test "inheritance" begin
+@testset "inheritance" begin
     # Inherited interfaces are stored in the second parameter of the supertype
     @test supertype(ArrayInterface) <: Interfaces.Interface{<:Any,IterationInterface{(:reverse, :indexing)}}
     @test supertype(DictInterface) <: Interfaces.Interface{<:Any,IterationInterface{(:reverse,)}}

diff --git a/src/implements.jl b/src/implements.jl
@@ -103,9 +103,6 @@ _user_optional_keys(::Type{<:Interface}) = ()
 _all_in(items::Tuple, collection) = all(map(in(collection), items))
 _all_in(item::Symbol, collection) = in(item, collection)
 
-_as_tuple(xs::Tuple) = xs
-_as_tuple(x) = (x,)
-
 struct Implemented{T<:Interface} end
 struct NotImplemented{T<:Interface} end
 

diff --git a/src/interface.jl b/src/interface.jl
@@ -30,17 +30,12 @@ function _flatten_inheritance(::Type{T}) where T
     else
         T
     end
-    @show T t
-    println()
-    println()
     return t
 end
 function _flatten_inheritance(
     ::Type{T}
 ) where T<:Interface{Options,Inherited} where {Options,Inherited}
     t = Inherited <: Nothing ? T : Union{T,Inherited}
-    @show T t
-    println()
     return t
 end
 

diff --git a/src/test.jl b/src/test.jl
@@ -144,7 +144,7 @@ function test(::Type{T}; show=true, kw...) where T
     results = map(methodlist) do m
         t = m.sig.parameters[2].var.ub
         t isa UnionAll || return true
-        interface = t.body.name.wrapper
+        interface = t.body.body.name.wrapper
         # If T implements it, test that
         if implements(interface, T)
             interface, test(interface, T; show, kw...)