Move some inclusions to setup_tests.jl

oscar-system · Jan 10, 2025 · 12a407f · 12a407f
1 parent 4d0603c
commit 12a407f
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 32 deletions.
diff --git a/test/LieTheory/WeylGroup.jl b/test/LieTheory/WeylGroup.jl
@@ -1,11 +1,3 @@
-if !isdefined(Main, :test_Group_interface)
-  import Oscar.AbstractAlgebra
-  import Oscar.AbstractAlgebra: Group
-  include(
-    joinpath(dirname(pathof(AbstractAlgebra)), "..", "test", "Groups-conformance-tests.jl")
-  )
-end
-
 @testset "LieTheory.WeylGroup" begin
   function is_in_normal_form(x::WeylGroupElem)
     return word(parent(x)(word(x))) == word(x)

diff --git a/test/LieTheory/setup_tests.jl b/test/LieTheory/setup_tests.jl
@@ -1,8 +1,15 @@
 if !isdefined(Main, :test_mutating_op_like_zero)
+  import Oscar.AbstractAlgebra
   include(
-    joinpath(
-      pathof(Oscar.Nemo.AbstractAlgebra), "..", "..", "test", "Rings-conformance-tests.jl"
-    ),
+    joinpath(pathof(AbstractAlgebra), "..", "..", "test", "Rings-conformance-tests.jl")
+  )
+end
+
+if !isdefined(Main, :test_Group_interface)
+  import Oscar.AbstractAlgebra
+  import Oscar.AbstractAlgebra: Group
+  include(
+    joinpath(pathof(AbstractAlgebra), "..", "..", "test", "Groups-conformance-tests.jl")
   )
 end
 

diff --git a/test/Rings/AbelianClosure.jl b/test/Rings/AbelianClosure.jl
@@ -1,8 +1,3 @@
-if !isdefined(Main, :test_Field_interface)
-  import Oscar.AbstractAlgebra
-  include(joinpath(pathof(AbstractAlgebra), "..", "..", "test", "Rings-conformance-tests.jl"))
-end
-
 function test_elem(K::QQAbField)
   ns = rand(1:8, 3)
   zs = map(n -> sum(rand(-10:10) * gen(K)(n)^rand(1:n) for j in 1:10), ns)

diff --git a/test/Rings/AlgClosureFp.jl b/test/Rings/AlgClosureFp.jl
@@ -1,8 +1,3 @@
-if !isdefined(Main, :test_Field_interface)
-  import Oscar.AbstractAlgebra
-  include(joinpath(pathof(AbstractAlgebra), "..", "..", "test", "Rings-conformance-tests.jl"))
-end
-
 function test_elem(K::AlgClosure{T}) where T <: FinField
   d = rand(1:8)
   F = ext_of_degree(K, d)

diff --git a/test/Rings/PBWAlgebraQuo.jl b/test/Rings/PBWAlgebraQuo.jl
@@ -1,8 +1,3 @@
-if !isdefined(Main, :test_NCRing_interface)
-  import Oscar.AbstractAlgebra
-  include(joinpath(pathof(AbstractAlgebra), "..", "..", "test", "Rings-conformance-tests.jl"))
-end
-
 function test_elem(Q::PBWAlgQuo{QQFieldElem})
   R = base_ring(Q)
   return Q(R(rand(base_ring(R), 1:4, 1:4, 1:4)))

diff --git a/test/Rings/mpoly-localizations.jl b/test/Rings/mpoly-localizations.jl
@@ -1,10 +1,4 @@
 const rng = Oscar.get_seeded_rng()
-
-if !isdefined(Main, :test_Ring_interface_recursive)
-  import Oscar.AbstractAlgebra
-  include(joinpath(pathof(AbstractAlgebra), "..", "..", "test", "Rings-conformance-tests.jl"))
-end
-
 @testset "mpoly-localizations" begin
   R, variab = ZZ[:x, :y]
   x = variab[1]

diff --git a/test/Rings/setup_tests.jl b/test/Rings/setup_tests.jl
@@ -0,0 +1,4 @@
+if !isdefined(Main, :test_Field_interface) || !isdefined(Main, :test_NCRing_interface)
+  import Oscar.AbstractAlgebra
+  include(joinpath(pathof(AbstractAlgebra), "..", "..", "test", "Rings-conformance-tests.jl"))
+end