Reorganize tests to always use runtests.jl files (#2813)

... to group things together. Also merge `test/Experimental` content into the `experimental` directory.
oscar-system · Sep 18, 2023 · e38f9a0 · e38f9a0
1 parent 81b983d
commit e38f9a0
Show file tree

Hide file tree

Showing 19 changed files with 41 additions and 32 deletions.
diff --git a/experimental/Experimental.jl b/experimental/Experimental.jl
@@ -6,10 +6,10 @@ const expdir = joinpath(@__DIR__, "../experimental")
 const oldexppkgs = [
   "ExteriorAlgebra",
   "GModule",
-  "Matrix",
+  "MatrixGroups",
   "ModStd",
   "Rings",
-  "Schemes"
+  "Schemes",
 ]
 # DEVELOPER OPTION:
 # The following lines ensure that ToricSchemes is loaded before FTheoryTools.
@@ -44,6 +44,8 @@ include("Rings.jl")
 include("ModStd.jl")
 include("GModule.jl")
 
+include("MatrixGroups/matrix.jl")
+
 include("Schemes/Types.jl")
 include("Schemes/SpecialTypes.jl")
 include("Schemes/CoveredScheme.jl")
@@ -56,7 +58,6 @@ include("Schemes/AlgebraicCycles.jl")
 include("Schemes/WeilDivisor.jl")
 include("Schemes/CoveredProjectiveSchemes.jl")
 
-include("Matrix/matrix.jl")
 include("Schemes/SimplifiedSpec.jl")
 include("Schemes/CoherentSheaves.jl")
 include("Schemes/LazyGlueing.jl")

diff --git a/test/Experimental/ExteriorAlgebra.jl → ...rimental/ExteriorAlgebra/test/runtests.jl b/test/Experimental/ExteriorAlgebra.jl → ...rimental/ExteriorAlgebra/test/runtests.jl
diff --git a/test/Experimental/gmodule.jl → experimental/GModule/test/runtests.jl b/test/Experimental/gmodule.jl → experimental/GModule/test/runtests.jl
diff --git a/experimental/Matrix/matrix.g → experimental/MatrixGroups/matrix.g b/experimental/Matrix/matrix.g → experimental/MatrixGroups/matrix.g
diff --git a/experimental/Matrix/matrix.jl → experimental/MatrixGroups/matrix.jl b/experimental/Matrix/matrix.jl → experimental/MatrixGroups/matrix.jl
@@ -10,7 +10,7 @@ export _wrap_for_gap
 # Initialize GAP function, i.e. GAP reads the file matrix.g
 #
 function __init__()
-    GAP.Globals.Reread(GAP.GapObj(joinpath(Oscar.oscardir, "experimental", "Matrix", "matrix.g")))
+    GAP.Globals.Read(GAP.GapObj(joinpath(@__DIR__, "matrix.g")))
 end
 
 ################################################################################

diff --git a/test/Experimental/MatrixGroups.jl → experimental/MatrixGroups/test/runtests.jl b/test/Experimental/MatrixGroups.jl → experimental/MatrixGroups/test/runtests.jl
diff --git a/test/Experimental/ModStdNF.jl → experimental/ModStd/test/ModStdNF.jl b/test/Experimental/ModStdNF.jl → experimental/ModStd/test/ModStdNF.jl
diff --git a/test/Experimental/ModStdQt.jl → experimental/ModStd/test/ModStdQt.jl b/test/Experimental/ModStdQt.jl → experimental/ModStd/test/ModStdQt.jl
diff --git a/experimental/ModStd/test/runtests.jl b/experimental/ModStd/test/runtests.jl
@@ -0,0 +1,2 @@
+include("ModStdQt.jl")
+include("ModStdNF.jl")
diff --git a/experimental/runtests.jl b/experimental/runtests.jl
@@ -1,3 +1,9 @@
 for pkg in Oscar.exppkgs
   include("$pkg/test/runtests.jl")
 end
+
+# legacy files
+include("GModule/test/runtests.jl")
+include("ModStd/test/runtests.jl")
+include("MatrixGroups/test/runtests.jl")
+include("ExteriorAlgebra/test/runtests.jl")
diff --git a/test/AlgebraicGeometry/Surfaces/runtests.jl b/test/AlgebraicGeometry/Surfaces/runtests.jl
@@ -0,0 +1,4 @@
+using Oscar
+using Test
+
+include("K3Auto.jl")
diff --git a/test/Combinatorics/runtests.jl b/test/Combinatorics/runtests.jl
@@ -1,4 +1,5 @@
 using Oscar
+using Test
 
 include("SimplicialComplexes.jl")
 include("Matroids/Matroids.jl")

diff --git a/test/Data/runtests.jl b/test/Data/runtests.jl
@@ -1,4 +1,5 @@
 using Oscar
+using Test
 
 @testset "Data Loading" begin
   data_dir = joinpath(dirname(dirname(@__DIR__)), "data")

diff --git a/test/NumberTheory/runtests.jl b/test/NumberTheory/runtests.jl
@@ -0,0 +1,5 @@
+using Oscar
+using Test
+
+include("nmbthy.jl")
+include("galthy.jl")
diff --git a/test/PolyhedralGeometry/runtests.jl b/test/PolyhedralGeometry/runtests.jl
@@ -1,6 +1,7 @@
-const pm = Polymake
-
 using Oscar
+using Test
+
+const pm = Polymake
 
 include("types.jl")
 include("iterators.jl")

diff --git a/test/Rings/runtests.jl b/test/Rings/runtests.jl
@@ -1,3 +1,6 @@
+using Oscar
+using Test
+
 include("integer.jl")
 include("rational.jl")
 include("mpoly.jl")
@@ -34,3 +37,5 @@ include("FreeAssAlgIdeal.jl")
 
 include("binomial-ideals.jl")
 include("hilbert.jl")
+
+include("ReesAlgebra.jl")
diff --git a/test/Serialization/runtests.jl b/test/Serialization/runtests.jl
@@ -1,4 +1,5 @@
 using Oscar
+using Test
 
 isdefined(Main, :test_save_load_roundtrip) ||
   include(joinpath(Oscar.oscardir, "test", "Serialization", "test_save_load_roundtrip.jl"))
@@ -14,5 +15,3 @@ include("Matrices.jl")
 include("Fields.jl")
 include("TropicalGeometry.jl")
 include("QuadForm.jl")
-include("polymake/runtests.jl")
-include("upgrades/runtests.jl")
diff --git a/test/TropicalGeometry/runtests.jl b/test/TropicalGeometry/runtests.jl
@@ -1,4 +1,5 @@
 using Oscar
+using Test
 
 include("groebner_basis.jl")
 include("groebner_fan.jl")

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -105,51 +105,34 @@ end
 end
 
 testlist = [
-
   "Aqua.jl",
-
   "printing.jl",
 
   "PolyhedralGeometry/runtests.jl",
   "Combinatorics/runtests.jl",
-
   "GAP/runtests.jl",
   "Groups/runtests.jl",
-
   "Rings/runtests.jl",
-
-  "NumberTheory/nmbthy.jl",
-  "NumberTheory/galthy.jl",
-
-  "Rings/ReesAlgebra.jl",
-
+  "NumberTheory/runtests.jl",
   "Modules/runtests.jl",
-
   "InvariantTheory/runtests.jl",
 
   "AlgebraicGeometry/Schemes/runtests.jl",
   "AlgebraicGeometry/ToricVarieties/runtests.jl",
-  "AlgebraicGeometry/Surfaces/K3Auto.jl",
+  "AlgebraicGeometry/Surfaces/runtests.jl",
 
   "TropicalGeometry/runtests.jl",
 
   "Serialization/runtests.jl",
+  "Serialization/polymake/runtests.jl",
+  "Serialization/upgrades/runtests.jl",
 
-  # Will automatically include all experimental packages following our
-# guidelines.
-
+  # Automatically include tests of all experimental packages following our
+  # guidelines.
   "../experimental/runtests.jl",
 
-  "Experimental/gmodule.jl",
-  "Experimental/ModStdQt.jl",
-  "Experimental/ModStdNF.jl",
-  "Experimental/MatrixGroups.jl",
-  "Experimental/ExteriorAlgebra.jl",
-
-
   "Data/runtests.jl",
-
-  "StraightLinePrograms/runtests.jl"
+  "StraightLinePrograms/runtests.jl",
 ]
 
 # if many workers, distribute tasks across them