Merge pull request #379 from ReactiveBayes/363-use-retestitems-for-tests

Use ReTestItems for tests

Author: bvdmitri

Project.toml

@@ -80,6 +80,7 @@ Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
 BenchmarkCI = "20533458-34a3-403d-a444-e18f38190b5b"
 BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
 Coverage = "a2441757-f6aa-5fb2-8edb-039e3f45d037"
+CpuId = "adafc99b-e345-5852-983c-f28acb93d879"
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 DiffResults = "163ba53b-c6d8-5494-b064-1a9d43ac40c5"
 Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
@@ -89,9 +90,10 @@ Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
 Optimisers = "3bd65402-5787-11e9-1adc-39752487f4e2"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 PkgBenchmark = "32113eaa-f34f-5b0d-bd6c-c81e245fc73d"
+ReTestItems = "817f1d60-ba6b-4fd5-9520-3cf149f6a823"
 StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 TestSetExtensions = "98d24dd4-01ad-11ea-1b02-c9a08f80db04"
 
 [targets]
-test = ["Test", "Pkg", "Logging", "InteractiveUtils", "TestSetExtensions", "Coverage", "Dates", "Distributed", "Documenter", "BenchmarkCI", "BenchmarkTools", "PkgBenchmark", "Aqua", "StableRNGs", "Optimisers", "DiffResults"]
+test = ["Aqua", "CpuId", "ReTestItems", "Test", "Pkg", "Logging", "InteractiveUtils", "TestSetExtensions", "Coverage", "Dates", "Distributed", "Documenter", "BenchmarkCI", "BenchmarkTools", "PkgBenchmark", "StableRNGs", "Optimisers", "DiffResults"]

test/addons/test_debug.jl test/addons/debug_tests.jltest/addons/test_debug.jl renamed to test/addons/debug_tests.jl

@@ -1,8 +1,5 @@
-module ReactiveMPAddonsDebugTest
-
-using Test, ReactiveMP, Distributions, BayesBase, ExponentialFamily
-
-@testset "Debug addon" begin
+@testitem "Debug addon" begin
+    using ExponentialFamily, BayesBase
     import ReactiveMP: AddonDebug
 
     @testset "Creation" begin
@@ -20,5 +17,3 @@ using Test, ReactiveMP, Distributions, BayesBase, ExponentialFamily
         @test multiply_addons(addon, addon, NormalMeanVariance(0.0, 3.00), Missing(), Missing()) == addon
     end
 end
-
-end

test/addons/test_memory.jl test/addons/memory_tests.jltest/addons/test_memory.jl renamed to test/addons/memory_tests.jl

@@ -1,8 +1,6 @@
-module ReactiveMPAddonsMemoryTest
+@testitem "Memory addon" begin
+    using ExponentialFamily, BayesBase
 
-using Test, ReactiveMP, Distributions, BayesBase, ExponentialFamily
-
-@testset "Memory addon" begin
     import ReactiveMP: AddonMemory
 
     @testset "Creation" begin
@@ -35,5 +33,3 @@ using Test, ReactiveMP, Distributions, BayesBase, ExponentialFamily
         @test occursin("result: $(repr(result))", displayed)
     end
 end
-
-end

test/test_addons.jl test/addons_tests.jltest/test_addons.jl renamed to test/addons_tests.jl

@@ -1,11 +1,9 @@
 
-module ReactiveMPAddonsTest
+@testitem "Addons" begin
+    using ReactiveMP, BayesBase, Distributions, ExponentialFamily
 
-using Test, ReactiveMP, BayesBase, Distributions, ExponentialFamily
+    using ReactiveMP: multiply_addons
 
-using ReactiveMP: multiply_addons
-
-@testset "Addons" begin
     @testset "addonlogscale" begin
         @testset "creation" begin
             addon1 = AddonLogScale()
@@ -41,5 +39,3 @@ using ReactiveMP: multiply_addons
         end
     end
 end
-
-end

test/approximations/test_cvi.jl test/approximations/cvi_tests.jltest/approximations/test_cvi.jl renamed to test/approximations/cvi_tests.jl

@@ -1,40 +1,38 @@
-module ReactiveMPRenderCVITest
 
-using Test, ReactiveMP, Random, StableRNGs, BayesBase, Distributions, ExponentialFamily, Optimisers, DiffResults, LinearAlgebra
+@testitem "cvi:prod" begin
+    using ReactiveMP, Random, StableRNGs, BayesBase, Distributions, ExponentialFamily, Optimisers, DiffResults, LinearAlgebra
 
-import BayesBase: AbstractContinuousGenericLogPdf
-import StatsFuns: logistic, softmax
-import SpecialFunctions: polygamma
+    import BayesBase: AbstractContinuousGenericLogPdf
+    import StatsFuns: logistic, softmax
+    import SpecialFunctions: polygamma
 
-struct NoopOptimiser end
+    struct NoopOptimiser end
 
-function ReactiveMP.cvi_setup(::NoopOptimiser, λ)
-    return (NoopOptimiser(), nothing)
-end
-
-function ReactiveMP.cvi_update!(state::Tuple{NoopOptimiser, Nothing}, new_λ, λ, ∇)
-    return state, vec(λ)
-end
+    function ReactiveMP.cvi_setup(::NoopOptimiser, λ)
+        return (NoopOptimiser(), nothing)
+    end
 
-mutable struct CountingOptimizer
-    num_its::Int
-end
+    function ReactiveMP.cvi_update!(state::Tuple{NoopOptimiser, Nothing}, new_λ, λ, ∇)
+        return state, vec(λ)
+    end
 
-function ReactiveMP.cvi_setup(opt::CountingOptimizer, λ)
-    return (opt, nothing)
-end
+    mutable struct CountingOptimizer
+        num_its::Int
+    end
 
-function ReactiveMP.cvi_update!(state::Tuple{CountingOptimizer, Nothing}, new_λ, λ, ∇)
-    opt = state[1]
-    opt.num_its += 1
-    return (state, vec(λ))
-end
+    function ReactiveMP.cvi_setup(opt::CountingOptimizer, λ)
+        return (opt, nothing)
+    end
 
-function gammafisher(dist::GammaShapeRate)
-    return [polygamma(1, shape(dist)) -1/rate(dist); -1/rate(dist) shape(dist)/rate(dist)^2]
-end
+    function ReactiveMP.cvi_update!(state::Tuple{CountingOptimizer, Nothing}, new_λ, λ, ∇)
+        opt = state[1]
+        opt.num_its += 1
+        return (state, vec(λ))
+    end
 
-@testset "cvi:prod" begin
+    function gammafisher(dist::GammaShapeRate)
+        return [polygamma(1, shape(dist)) -1/rate(dist); -1/rate(dist) shape(dist)/rate(dist)^2]
+    end
 
     # These are tested in the `ExponentialFamily`, test a simple case just to be sure
     @testset "Simple check for the existence of the `fisherinformation`" begin
@@ -197,4 +195,3 @@ end
         end
     end
 end
-end

test/approximations/test_linearization.jl …st/approximations/linearization_tests.jltest/approximations/test_linearization.jl renamed to test/approximations/linearization_tests.jl test/approximations/test_linearization.jl renamed to test/approximations/linearization_tests.jl

@@ -1,11 +1,9 @@
-module ReactiveMPLinearizationApproximationTest
 
-using Test
-using ReactiveMP
+@testitem "Linearization approximation method" begin
+    using ReactiveMP
 
-import ReactiveMP: Linearization
+    import ReactiveMP: Linearization
 
-@testset "Linearization approximation method" begin
     @testset "linearization `approximate` tests" begin
         import ReactiveMP: approximate, Linearization
 
@@ -15,5 +13,3 @@ import ReactiveMP: Linearization
         @test @inferred(approximate(Linearization(), (x, y) -> x .- y, ([1.0, 2.0], [1.0, 1.0]))) == ([1.0 0.0 -1.0 0.0; 0.0 1.0 0.0 -1.0], [0.0, 0.0])
     end
 end
-
-end

test/approximations/test_shared.jl test/approximations/shared_tests.jltest/approximations/test_shared.jl renamed to test/approximations/shared_tests.jl

@@ -1,9 +1,7 @@
-module ReactiveMPSharedApproximationTest
 
-using Test
-using ReactiveMP
+@testitem "Shared approximation methods" begin
+    using ReactiveMP
 
-@testset "Shared approximation methods" begin
     @testset "__starts_at tests" begin
         import ReactiveMP: __starts_at
 
@@ -52,5 +50,3 @@ using ReactiveMP
         @test @inferred(__splitjoin([1, 0, 0, 1, 2, 1, 0, 0, 1], ((2, 2), (), (2, 2)))) == ([1 0; 0 1], 2, [1 0; 0 1])
     end
 end
-
-end

test/approximations/test_unscented.jl test/approximations/unscented_tests.jltest/approximations/test_unscented.jl renamed to test/approximations/unscented_tests.jl

@@ -1,11 +1,9 @@
-module ReactiveMPUnscentedApproximationTest
 
-using Test
-using ReactiveMP
+@testitem "Unscented approximation method" begin
+    using ReactiveMP
 
-import ReactiveMP: Unscented, unscented_statistics
+    import ReactiveMP: Unscented, unscented_statistics
 
-@testset "Unscented approximation method" begin
     @testset "Univariate `unscented_statistics`" begin
 
         # Compared against the ForneyLab implementation
@@ -78,5 +76,3 @@ import ReactiveMP: Unscented, unscented_statistics
         )
     end
 end
-
-end

test/constraints/test_factorisation.jl test/constraints/factorisation_tests.jltest/constraints/test_factorisation.jl renamed to test/constraints/factorisation_tests.jl

@@ -1,16 +1,14 @@
-module ReactiveMPFactorisationSpecTest
 
-using Test
-using ReactiveMP
+@testitem "Factorisation constraints specification" begin
+    using ReactiveMP
 
-import ReactiveMP: FunctionalIndex
-import ReactiveMP: CombinedRange, SplittedRange, is_splitted
-import ReactiveMP: __as_unit_range, __factorisation_specification_resolve_index
-import ReactiveMP: resolve_factorisation
-import ReactiveMP: DefaultConstraints, UnspecifiedConstraints
-import ReactiveMP: setanonymous!, activate!
+    import ReactiveMP: FunctionalIndex
+    import ReactiveMP: CombinedRange, SplittedRange, is_splitted
+    import ReactiveMP: __as_unit_range, __factorisation_specification_resolve_index
+    import ReactiveMP: resolve_factorisation
+    import ReactiveMP: DefaultConstraints, UnspecifiedConstraints
+    import ReactiveMP: setanonymous!, activate!
 
-@testset "Factorisation constraints specification" begin
     @testset "CombinedRange" begin
         for left in 1:3, right in 10:13
             cr = CombinedRange(left, right)
@@ -108,5 +106,3 @@ import ReactiveMP: setanonymous!, activate!
         )
     end
 end
-
-end

test/constraints/test_meta.jl test/constraints/meta_tests.jltest/constraints/test_meta.jl renamed to test/constraints/meta_tests.jl

@@ -1,11 +1,9 @@
-module ReactiveMPFactorisationSpecTest
+@testitem "Meta specification" begin
+    using ReactiveMP, BayesBase, ExponentialFamily
 
-using Test, ReactiveMP, BayesBase, ExponentialFamily
+    import ReactiveMP: MetaSpecification, MetaSpecificationOptions, MetaSpecificationEntry
+    import ReactiveMP: resolve_meta
 
-import ReactiveMP: MetaSpecification, MetaSpecificationOptions, MetaSpecificationEntry
-import ReactiveMP: resolve_meta
-
-@testset "Meta specification" begin
     @testset "resolve_meta #1" begin
         spec = MetaSpecification(
             (
@@ -80,5 +78,3 @@ import ReactiveMP: resolve_meta
         @test_throws ErrorException resolve_meta(spec, NormalMeanPrecision, (randomvar(:z), randomvar(:x)))
     end
 end
-
-end