From 6179ac80c336a5ab01e4bdbf284264ba3b73aaf6 Mon Sep 17 00:00:00 2001
From: Aldo <ealdoglielmo@gmail.com>
Date: Mon, 6 May 2024 17:22:10 +0200
Subject: [PATCH] clean names of test modules, add testsets

---
 ...identities.jl => accounting_identities.jl} |  0
 ...ration_script.jl => calibration_script.jl} |  0
 ...matching_mod.jl => search_and_matching.jl} |  0
 ... => search_and_matching_seed_stability.jl} |  0
 ...nitialise_model.jl => initialise_model.jl} |  0
 ...luations.jl => monte_carlo_evaluations.jl} |  0
 test/{test_one_epoch.jl => one_epoch.jl}      |  0
 ...onsistency.jl => one_epoch_consistency.jl} |  0
 test/runtests.jl                              | 28 +++++++++++--------
 .../{test_steady_state.jl => steady_state.jl} |  0
 test/utils/{test_epsilon.jl => epsilon.jl}    |  0
 .../{test_estimations.jl => estimations.jl}   |  0
 ...and_estimate.jl => nfvar3_and_estimate.jl} |  0
 test/utils/{test_randpl.jl => randpl.jl}      |  0
 test/utils/{test_toannual.jl => toannual.jl}  |  0
 15 files changed, 17 insertions(+), 11 deletions(-)
 rename test/{test_accounting_identities.jl => accounting_identities.jl} (100%)
 rename test/{test_calibration_script.jl => calibration_script.jl} (100%)
 rename test/markets/{test_search_and_matching_mod.jl => search_and_matching.jl} (100%)
 rename test/markets/{test_search_and_matching_seed_stability.jl => search_and_matching_seed_stability.jl} (100%)
 rename test/model_init/{test_initialise_model.jl => initialise_model.jl} (100%)
 rename test/{test_monte_carlo_evaluations.jl => monte_carlo_evaluations.jl} (100%)
 rename test/{test_one_epoch.jl => one_epoch.jl} (100%)
 rename test/{test_one_epoch_consistency.jl => one_epoch_consistency.jl} (100%)
 rename test/{test_steady_state.jl => steady_state.jl} (100%)
 rename test/utils/{test_epsilon.jl => epsilon.jl} (100%)
 rename test/utils/{test_estimations.jl => estimations.jl} (100%)
 rename test/utils/{test_nfvar3_and_estimate.jl => nfvar3_and_estimate.jl} (100%)
 rename test/utils/{test_randpl.jl => randpl.jl} (100%)
 rename test/utils/{test_toannual.jl => toannual.jl} (100%)

diff --git a/test/test_accounting_identities.jl b/test/accounting_identities.jl
similarity index 100%
rename from test/test_accounting_identities.jl
rename to test/accounting_identities.jl
diff --git a/test/test_calibration_script.jl b/test/calibration_script.jl
similarity index 100%
rename from test/test_calibration_script.jl
rename to test/calibration_script.jl
diff --git a/test/markets/test_search_and_matching_mod.jl b/test/markets/search_and_matching.jl
similarity index 100%
rename from test/markets/test_search_and_matching_mod.jl
rename to test/markets/search_and_matching.jl
diff --git a/test/markets/test_search_and_matching_seed_stability.jl b/test/markets/search_and_matching_seed_stability.jl
similarity index 100%
rename from test/markets/test_search_and_matching_seed_stability.jl
rename to test/markets/search_and_matching_seed_stability.jl
diff --git a/test/model_init/test_initialise_model.jl b/test/model_init/initialise_model.jl
similarity index 100%
rename from test/model_init/test_initialise_model.jl
rename to test/model_init/initialise_model.jl
diff --git a/test/test_monte_carlo_evaluations.jl b/test/monte_carlo_evaluations.jl
similarity index 100%
rename from test/test_monte_carlo_evaluations.jl
rename to test/monte_carlo_evaluations.jl
diff --git a/test/test_one_epoch.jl b/test/one_epoch.jl
similarity index 100%
rename from test/test_one_epoch.jl
rename to test/one_epoch.jl
diff --git a/test/test_one_epoch_consistency.jl b/test/one_epoch_consistency.jl
similarity index 100%
rename from test/test_one_epoch_consistency.jl
rename to test/one_epoch_consistency.jl
diff --git a/test/runtests.jl b/test/runtests.jl
index d2b2d40..96e589e 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -1,19 +1,25 @@
 using BeforeIT, Test
 
 #utils
-@time include("utils/test_epsilon.jl")
-include("utils/positive.jl")
-@time include("utils/test_randpl.jl")
-@time include("utils/test_nfvar3_and_estimate.jl")
+@testset "test utils" begin
+    include("utils/epsilon.jl")
+    include("utils/positive.jl")
+    include("utils/randpl.jl")
+    include("utils/nfvar3_and_estimate.jl")
+    include("utils/estimations.jl")
+end
+
 
 # one epoch
-@time include("model_init/test_initialise_model.jl")
-@time include("test_one_epoch.jl")
-@time include("utils/test_estimations.jl")
+@testset "test one epoch" begin
+    include("model_init/initialise_model.jl")
+    include("one_epoch.jl")
+    include("markets/search_and_matching.jl")
+end
+
 
-# search_and_matching
-@time include("markets/test_search_and_matching_mod.jl")
-#@time include("test_search_and_matching_seed_stability.jl")
+# search_and_matching_seed_stability
+#@time include("search_and_matching_seed_stability.jl")
 
 # agent_actions
 @testset "test agent actions" begin
@@ -24,7 +30,7 @@ include("utils/positive.jl")
 end
 
 # accounting identities
-@time include("test_accounting_identities.jl")
+include("accounting_identities.jl")
 
 # shock tests
 include("shocks/shocks.jl")
diff --git a/test/test_steady_state.jl b/test/steady_state.jl
similarity index 100%
rename from test/test_steady_state.jl
rename to test/steady_state.jl
diff --git a/test/utils/test_epsilon.jl b/test/utils/epsilon.jl
similarity index 100%
rename from test/utils/test_epsilon.jl
rename to test/utils/epsilon.jl
diff --git a/test/utils/test_estimations.jl b/test/utils/estimations.jl
similarity index 100%
rename from test/utils/test_estimations.jl
rename to test/utils/estimations.jl
diff --git a/test/utils/test_nfvar3_and_estimate.jl b/test/utils/nfvar3_and_estimate.jl
similarity index 100%
rename from test/utils/test_nfvar3_and_estimate.jl
rename to test/utils/nfvar3_and_estimate.jl
diff --git a/test/utils/test_randpl.jl b/test/utils/randpl.jl
similarity index 100%
rename from test/utils/test_randpl.jl
rename to test/utils/randpl.jl
diff --git a/test/utils/test_toannual.jl b/test/utils/toannual.jl
similarity index 100%
rename from test/utils/test_toannual.jl
rename to test/utils/toannual.jl