use SafeTestsets

Author: bgctw

test/runtests.jl

@@ -1,9 +1,3 @@
-using DistributionFits
-using Test
-using Random: Random
-using LoggingExtras
-
-
 tmpf = () -> begin
     push!(LOAD_PATH, expanduser("~/julia/devtools/")) # access local pack
     push!(LOAD_PATH, joinpath(pwd(), "test/")) # access local pack
@@ -13,60 +7,20 @@ using Test, SafeTestsets
 const GROUP = get(ENV, "GROUP", "All") # defined in in CI.yml
 @show GROUP
 
-# @time begin
-#     if GROUP == "All" || GROUP == "Basic"
-#         #@safetestset "Tests" include("test/test_plant_face_fluct.jl")
-#         @time @safetestset "plant_face_fluct" include("test_plant_face_fluct.jl")
-#     end
-#     if GROUP == "All" || GROUP == "JET"
-#         #@safetestset "Tests" include("test/test_JET.jl")
-#         @time @safetestset "test_JET" include("test_JET.jl")
-#         #@safetestset "Tests" include("test/test_aqua.jl")
-#         @time @safetestset "test_Aqua" include("test_aqua.jl")
-#     end
-# end
-
-
-#using Aqua; Aqua.test_all(DistributionFits) # ambiguities from other packages
-#using JET; JET.report_package(DistributionFits) # 
-#invalid possible error due to quantile may accept/return an Array (we pass a scalar)
-#only report problems in this module:
-#using JET; JET.report_package(DistributionFits; target_modules=(@__MODULE__,)) # 
-
-@testset "optimize error" begin
-    @test_throws Exception DistributionFits.optimize(x -> x * x, -1, 1)
-end
-using Optim: Optim, optimize
-
-DistributionFitsOptimExt = isdefined(Base, :get_extension) ?
-                           Base.get_extension(DistributionFits, :DistributionFitsOptimExt) :
-                           DistributionFits.DistributionFitsOptimExt
-
-@testset "optimize set in __init__ after using Optim" begin
-    # set in __init__
-    @test DistributionFits.df_optimizer isa DistributionFitsOptimExt.OptimOptimizer
+@time begin
+    if GROUP == "All" || GROUP == "Basic"
+        #@safetestset "Tests" include("test/test_optim.jl")
+        @time @safetestset "test_optim" include("test_optim.jl")
+        #@safetestset "Tests" include("test/fitstats.jl")
+        @time @safetestset "fitstats" include("fitstats.jl")
+        #@safetestset "Tests" include("test/univariate/test_univariate.jl")
+        @time @safetestset "test_univariate" include("univariate/test_univariate.jl")
+    end
+    if GROUP == "All" || GROUP == "JET"
+        #@safetestset "Tests" include("test/test_JET.jl")
+        @time @safetestset "test_JET" include("test_JET.jl")
+        #@safetestset "Tests" include("test/test_aqua.jl")
+        @time @safetestset "test_Aqua" include("test_aqua.jl")
+    end
 end
 
-#include("test/testutils.jl")
-include("testutils.jl")
-
-#include("test/fitstats.jl")
-include("fitstats.jl")
-
-#include("test/univariate/test_univariate.jl")
-include("univariate/test_univariate.jl")
-
-# test coverage of set_optimize (already called  in init)
-
-# print method ambiguities
-println("Potentially stale exports: ")
-display(Test.detect_ambiguities(DistributionFits))
-println()
-
-using JET: JET
-@testset "JET" begin
-    @static if VERSION ≥ v"1.9.2"
-        JET.test_package(DistributionFits; target_modules=(@__MODULE__,)) # 
-    end    
-end;
-

test/test_aqua.jl

@@ -8,7 +8,7 @@ using Aqua
             DistributionFits;
             #unbound_args = false, # does not recognize NamedTuple{K, NTuple{N,E}}
             stale_deps = (ignore = [:Requires],),
-            #ambiguities = false, # many ambiguities in Symbolic and Stats packages
+            ambiguities = false, # ambiguities in StatsBase
             piracies = false
         )
     end;

test/test_optim.jl

@@ -0,0 +1,21 @@
+using DistributionFits
+using Test
+
+# before loading Optim
+@testset "optimize error" begin
+    @test_throws Exception DistributionFits.optimize(x -> x * x, -1, 1)
+end
+
+# after loading Optim
+using Optim: Optim, optimize
+
+DistributionFitsOptimExt = isdefined(Base, :get_extension) ?
+                           Base.get_extension(DistributionFits, :DistributionFitsOptimExt) :
+                           DistributionFits.DistributionFitsOptimExt
+
+@testset "optimize set in __init__ after using Optim" begin
+    # set in __init__
+    @test DistributionFits.df_optimizer isa DistributionFitsOptimExt.OptimOptimizer
+end
+
+

test/univariate/test_univariate.jl

@@ -1,3 +1,13 @@
+using DistributionFits
+using Test
+using Random: Random
+using LoggingExtras
+using Optim
+
+pkgdir = dirname(dirname(pathof(DistributionFits)))
+testdir = joinpath(pkgdir, "test")
+include(joinpath(testdir,"testutils.jl"))
+
 function test_univariate_fits(d, D = typeof(d))
     @testset "fit moments" begin
         if !occursin("fit(::Type{D}",
@@ -110,6 +120,7 @@ function test_univariate_fits(d, D = typeof(d))
     end
 end
 
+
 const tests = [
     "weibull",
     "normal",
@@ -124,6 +135,6 @@ const tests = [
 for t in tests
     @testset "Test $t" begin
         Random.seed!(345679)
-        include("continuous/$t.jl")
+        include(joinpath(testdir,"univariate","continuous","$t.jl"))
     end
 end