Skip to content

Commit a824296

Browse files
authored
Simplify run_tests in each test file (#202)
1 parent b93d249 commit a824296

14 files changed

Lines changed: 46 additions & 86 deletions

test/algorithms/test_Chalmet.jl

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,9 @@ import MultiObjectiveAlgorithms: MOI
1414
include(joinpath(dirname(@__DIR__), "mock_optimizer.jl"))
1515

1616
function run_tests()
17-
for name in names(@__MODULE__; all = true)
18-
if startswith("$name", "test_")
19-
@testset "$name" begin
20-
getfield(@__MODULE__, name)()
21-
end
22-
end
17+
is_test(name) = startswith("$name", "test_")
18+
@testset "$name" for name in filter(is_test, names(@__MODULE__; all = true))
19+
getfield(@__MODULE__, name)()
2320
end
2421
return
2522
end

test/algorithms/test_Dichotomy.jl

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,9 @@ import MultiObjectiveAlgorithms: MOI
1515
include(joinpath(dirname(@__DIR__), "mock_optimizer.jl"))
1616

1717
function run_tests()
18-
for name in names(@__MODULE__; all = true)
19-
if startswith("$name", "test_")
20-
@testset "$name" begin
21-
getfield(@__MODULE__, name)()
22-
end
23-
end
18+
is_test(name) = startswith("$name", "test_")
19+
@testset "$name" for name in filter(is_test, names(@__MODULE__; all = true))
20+
getfield(@__MODULE__, name)()
2421
end
2522
return
2623
end

test/algorithms/test_DominguezRios.jl

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,9 @@ function run_tests()
1818
if Sys.WORD_SIZE == 32
1919
return # Skip on 32-bit because HiGHS fails
2020
end
21-
for name in names(@__MODULE__; all = true)
22-
if startswith("$name", "test_")
23-
@testset "$name" begin
24-
getfield(@__MODULE__, name)()
25-
end
26-
end
21+
is_test(name) = startswith("$name", "test_")
22+
@testset "$name" for name in filter(is_test, names(@__MODULE__; all = true))
23+
getfield(@__MODULE__, name)()
2724
end
2825
return
2926
end

test/algorithms/test_EpsilonConstraint.jl

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,9 @@ include(joinpath(dirname(@__DIR__), "mock_optimizer.jl"))
1616
include(joinpath(dirname(@__DIR__), "vOptLib.jl"))
1717

1818
function run_tests()
19-
for name in names(@__MODULE__; all = true)
20-
if startswith("$name", "test_")
21-
@testset "$name" begin
22-
getfield(@__MODULE__, name)()
23-
end
24-
end
19+
is_test(name) = startswith("$name", "test_")
20+
@testset "$name" for name in filter(is_test, names(@__MODULE__; all = true))
21+
getfield(@__MODULE__, name)()
2522
end
2623
return
2724
end

test/algorithms/test_Hierarchical.jl

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,9 @@ import MultiObjectiveAlgorithms as MOA
1212
import MultiObjectiveAlgorithms: MOI
1313

1414
function run_tests()
15-
for name in names(@__MODULE__; all = true)
16-
if startswith("$name", "test_")
17-
@testset "$name" begin
18-
getfield(@__MODULE__, name)()
19-
end
20-
end
15+
is_test(name) = startswith("$name", "test_")
16+
@testset "$name" for name in filter(is_test, names(@__MODULE__; all = true))
17+
getfield(@__MODULE__, name)()
2118
end
2219
return
2320
end

test/algorithms/test_KirlikSayin.jl

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,9 @@ include(joinpath(dirname(@__DIR__), "problems.jl"))
1616
include(joinpath(dirname(@__DIR__), "vOptLib.jl"))
1717

1818
function run_tests()
19-
for name in names(@__MODULE__; all = true)
20-
if startswith("$name", "test_")
21-
@testset "$name" begin
22-
getfield(@__MODULE__, name)()
23-
end
24-
end
19+
is_test(name) = startswith("$name", "test_")
20+
@testset "$name" for name in filter(is_test, names(@__MODULE__; all = true))
21+
getfield(@__MODULE__, name)()
2522
end
2623
return
2724
end

test/algorithms/test_Lexicographic.jl

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,9 @@ import MultiObjectiveAlgorithms as MOA
1212
import MultiObjectiveAlgorithms: MOI
1313

1414
function run_tests()
15-
for name in names(@__MODULE__; all = true)
16-
if startswith("$name", "test_")
17-
@testset "$name" begin
18-
getfield(@__MODULE__, name)()
19-
end
20-
end
15+
is_test(name) = startswith("$name", "test_")
16+
@testset "$name" for name in filter(is_test, names(@__MODULE__; all = true))
17+
getfield(@__MODULE__, name)()
2118
end
2219
return
2320
end

test/algorithms/test_RandomWeighting.jl

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,9 @@ import MultiObjectiveAlgorithms: MOI
1414
include(joinpath(dirname(@__DIR__), "mock_optimizer.jl"))
1515

1616
function run_tests()
17-
for name in names(@__MODULE__; all = true)
18-
if startswith("$name", "test_")
19-
@testset "$name" begin
20-
getfield(@__MODULE__, name)()
21-
end
22-
end
17+
is_test(name) = startswith("$name", "test_")
18+
@testset "$name" for name in filter(is_test, names(@__MODULE__; all = true))
19+
getfield(@__MODULE__, name)()
2320
end
2421
return
2522
end

test/algorithms/test_Sandwiching.jl

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,9 @@ import Polyhedra
1515
include(joinpath(dirname(@__DIR__), "mock_optimizer.jl"))
1616

1717
function run_tests()
18-
for name in names(@__MODULE__; all = true)
19-
if startswith("$name", "test_")
20-
@testset "$name" begin
21-
getfield(@__MODULE__, name)()
22-
end
23-
end
18+
is_test(name) = startswith("$name", "test_")
19+
@testset "$name" for name in filter(is_test, names(@__MODULE__; all = true))
20+
getfield(@__MODULE__, name)()
2421
end
2522
return
2623
end

test/algorithms/test_TambyVanderpooten.jl

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,9 @@ include(joinpath(dirname(@__DIR__), "problems.jl"))
1616
include(joinpath(dirname(@__DIR__), "vOptLib.jl"))
1717

1818
function run_tests()
19-
for name in names(@__MODULE__; all = true)
20-
if startswith("$name", "test_")
21-
@testset "$name" begin
22-
getfield(@__MODULE__, name)()
23-
end
24-
end
19+
is_test(name) = startswith("$name", "test_")
20+
@testset "$name" for name in filter(is_test, names(@__MODULE__; all = true))
21+
getfield(@__MODULE__, name)()
2522
end
2623
return
2724
end

0 commit comments

Comments
 (0)