[mlpack-git] master: Change file name for test tools. (d4a0f71)
gitdub at mlpack.org
gitdub at mlpack.org
Wed Jun 22 14:09:07 EDT 2016
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/a9f5622c8a14409111f2d71bf5c0f8aaa8ad4ae1...37fda23945b4f998cd5fa6ec011ae345236c8552
>---------------------------------------------------------------
commit d4a0f71f125b9ed09749ad9026f3922d6bff2010
Author: MarcosPividori <marcos.pividori at gmail.com>
Date: Thu Jun 9 16:33:45 2016 -0300
Change file name for test tools.
>---------------------------------------------------------------
d4a0f71f125b9ed09749ad9026f3922d6bff2010
src/mlpack/tests/activation_functions_test.cpp | 2 +-
src/mlpack/tests/ada_delta_test.cpp | 2 +-
src/mlpack/tests/adaboost_test.cpp | 2 +-
src/mlpack/tests/adam_test.cpp | 2 +-
src/mlpack/tests/akfn_test.cpp | 2 +-
src/mlpack/tests/aknn_test.cpp | 2 +-
src/mlpack/tests/arma_extend_test.cpp | 2 +-
src/mlpack/tests/armadillo_svd_test.cpp | 2 +-
src/mlpack/tests/aug_lagrangian_test.cpp | 2 +-
src/mlpack/tests/binarize_test.cpp | 2 +-
src/mlpack/tests/cf_test.cpp | 2 +-
src/mlpack/tests/cli_test.cpp | 2 +-
src/mlpack/tests/convolution_test.cpp | 2 +-
src/mlpack/tests/convolutional_network_test.cpp | 2 +-
src/mlpack/tests/cosine_tree_test.cpp | 2 +-
src/mlpack/tests/decision_stump_test.cpp | 2 +-
src/mlpack/tests/det_test.cpp | 2 +-
src/mlpack/tests/distribution_test.cpp | 2 +-
src/mlpack/tests/emst_test.cpp | 2 +-
src/mlpack/tests/fastmks_test.cpp | 2 +-
src/mlpack/tests/feedforward_network_test.cpp | 2 +-
src/mlpack/tests/gmm_test.cpp | 2 +-
src/mlpack/tests/hmm_test.cpp | 2 +-
src/mlpack/tests/hoeffding_tree_test.cpp | 2 +-
src/mlpack/tests/ind2sub_test.cpp | 2 +-
src/mlpack/tests/init_rules_test.cpp | 2 +-
src/mlpack/tests/kernel_pca_test.cpp | 2 +-
src/mlpack/tests/kernel_test.cpp | 2 +-
src/mlpack/tests/kernel_traits_test.cpp | 2 +-
src/mlpack/tests/kfn_test.cpp | 2 +-
src/mlpack/tests/kmeans_test.cpp | 2 +-
src/mlpack/tests/knn_test.cpp | 2 +-
src/mlpack/tests/krann_search_test.cpp | 2 +-
src/mlpack/tests/lars_test.cpp | 2 +-
src/mlpack/tests/layer_traits_test.cpp | 2 +-
src/mlpack/tests/lbfgs_test.cpp | 2 +-
src/mlpack/tests/lin_alg_test.cpp | 2 +-
src/mlpack/tests/linear_regression_test.cpp | 2 +-
src/mlpack/tests/load_save_test.cpp | 2 +-
src/mlpack/tests/local_coordinate_coding_test.cpp | 2 +-
src/mlpack/tests/log_test.cpp | 2 +-
src/mlpack/tests/logistic_regression_test.cpp | 2 +-
src/mlpack/tests/lrsdp_test.cpp | 2 +-
src/mlpack/tests/lsh_test.cpp | 2 +-
src/mlpack/tests/lstm_peephole_test.cpp | 2 +-
src/mlpack/tests/math_test.cpp | 2 +-
src/mlpack/tests/matrix_completion_test.cpp | 2 +-
src/mlpack/tests/maximal_inputs_test.cpp | 2 +-
src/mlpack/tests/mean_shift_test.cpp | 2 +-
src/mlpack/tests/metric_test.cpp | 2 +-
src/mlpack/tests/minibatch_sgd_test.cpp | 2 +-
src/mlpack/tests/mlpack_test.cpp | 2 +-
src/mlpack/tests/nbc_test.cpp | 2 +-
src/mlpack/tests/nca_test.cpp | 2 +-
src/mlpack/tests/network_util_test.cpp | 2 +-
src/mlpack/tests/nmf_test.cpp | 2 +-
src/mlpack/tests/nystroem_method_test.cpp | 2 +-
src/mlpack/tests/pca_test.cpp | 2 +-
src/mlpack/tests/perceptron_test.cpp | 2 +-
src/mlpack/tests/performance_functions_test.cpp | 2 +-
src/mlpack/tests/pooling_rules_test.cpp | 2 +-
src/mlpack/tests/quic_svd_test.cpp | 2 +-
src/mlpack/tests/radical_test.cpp | 2 +-
src/mlpack/tests/range_search_test.cpp | 2 +-
src/mlpack/tests/rectangle_tree_test.cpp | 2 +-
src/mlpack/tests/recurrent_network_test.cpp | 2 +-
src/mlpack/tests/regularized_svd_test.cpp | 2 +-
src/mlpack/tests/rmsprop_test.cpp | 2 +-
src/mlpack/tests/sa_test.cpp | 2 +-
src/mlpack/tests/sdp_primal_dual_test.cpp | 2 +-
src/mlpack/tests/serialization.hpp | 2 +-
src/mlpack/tests/serialization_test.cpp | 2 +-
src/mlpack/tests/sgd_test.cpp | 2 +-
src/mlpack/tests/softmax_regression_test.cpp | 2 +-
src/mlpack/tests/sort_policy_test.cpp | 2 +-
src/mlpack/tests/sparse_autoencoder_test.cpp | 2 +-
src/mlpack/tests/sparse_coding_test.cpp | 2 +-
src/mlpack/tests/split_data_test.cpp | 2 +-
src/mlpack/tests/svd_batch_test.cpp | 2 +-
src/mlpack/tests/svd_incremental_test.cpp | 2 +-
src/mlpack/tests/termination_policy_test.cpp | 2 +-
.../tests/{old_boost_test_definitions.hpp => test_tools.hpp} | 9 ++++-----
src/mlpack/tests/tree_test.cpp | 2 +-
src/mlpack/tests/tree_traits_test.cpp | 2 +-
src/mlpack/tests/union_find_test.cpp | 2 +-
85 files changed, 88 insertions(+), 89 deletions(-)
diff --git a/src/mlpack/tests/activation_functions_test.cpp b/src/mlpack/tests/activation_functions_test.cpp
index 34ec009..9f32f8d 100644
--- a/src/mlpack/tests/activation_functions_test.cpp
+++ b/src/mlpack/tests/activation_functions_test.cpp
@@ -25,7 +25,7 @@
#include <mlpack/methods/ann/layer/hard_tanh_layer.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::ann;
diff --git a/src/mlpack/tests/ada_delta_test.cpp b/src/mlpack/tests/ada_delta_test.cpp
index 3471821..483ce62 100644
--- a/src/mlpack/tests/ada_delta_test.cpp
+++ b/src/mlpack/tests/ada_delta_test.cpp
@@ -12,7 +12,7 @@
#include <mlpack/methods/logistic_regression/logistic_regression.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace arma;
using namespace mlpack::optimization;
diff --git a/src/mlpack/tests/adaboost_test.cpp b/src/mlpack/tests/adaboost_test.cpp
index fd5680d..9edc57a 100644
--- a/src/mlpack/tests/adaboost_test.cpp
+++ b/src/mlpack/tests/adaboost_test.cpp
@@ -8,7 +8,7 @@
#include <mlpack/methods/adaboost/adaboost.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
#include "serialization.hpp"
using namespace arma;
diff --git a/src/mlpack/tests/adam_test.cpp b/src/mlpack/tests/adam_test.cpp
index df36980..6daa5cb 100644
--- a/src/mlpack/tests/adam_test.cpp
+++ b/src/mlpack/tests/adam_test.cpp
@@ -11,7 +11,7 @@
#include <mlpack/methods/logistic_regression/logistic_regression.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace arma;
using namespace mlpack::optimization;
diff --git a/src/mlpack/tests/akfn_test.cpp b/src/mlpack/tests/akfn_test.cpp
index 350e41e..3621916 100644
--- a/src/mlpack/tests/akfn_test.cpp
+++ b/src/mlpack/tests/akfn_test.cpp
@@ -7,7 +7,7 @@
#include <mlpack/methods/neighbor_search/neighbor_search.hpp>
#include <mlpack/core/tree/cover_tree.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::neighbor;
diff --git a/src/mlpack/tests/aknn_test.cpp b/src/mlpack/tests/aknn_test.cpp
index be14bf1..8d865ba 100644
--- a/src/mlpack/tests/aknn_test.cpp
+++ b/src/mlpack/tests/aknn_test.cpp
@@ -10,7 +10,7 @@
#include <mlpack/core/tree/cover_tree.hpp>
#include <mlpack/core/tree/example_tree.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::neighbor;
diff --git a/src/mlpack/tests/arma_extend_test.cpp b/src/mlpack/tests/arma_extend_test.cpp
index 076a02f..79fd0e9 100644
--- a/src/mlpack/tests/arma_extend_test.cpp
+++ b/src/mlpack/tests/arma_extend_test.cpp
@@ -7,7 +7,7 @@
#include <mlpack/core.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace arma;
diff --git a/src/mlpack/tests/armadillo_svd_test.cpp b/src/mlpack/tests/armadillo_svd_test.cpp
index cb945b3..5cfc156 100644
--- a/src/mlpack/tests/armadillo_svd_test.cpp
+++ b/src/mlpack/tests/armadillo_svd_test.cpp
@@ -2,7 +2,7 @@
#include <mlpack/methods/cf/svd_wrapper.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
BOOST_AUTO_TEST_SUITE(ArmadilloSVDTest);
diff --git a/src/mlpack/tests/aug_lagrangian_test.cpp b/src/mlpack/tests/aug_lagrangian_test.cpp
index 9507899..fd6ce6d 100644
--- a/src/mlpack/tests/aug_lagrangian_test.cpp
+++ b/src/mlpack/tests/aug_lagrangian_test.cpp
@@ -10,7 +10,7 @@
#include <mlpack/core/optimizers/aug_lagrangian/aug_lagrangian.hpp>
#include <mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_test_functions.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::optimization;
diff --git a/src/mlpack/tests/binarize_test.cpp b/src/mlpack/tests/binarize_test.cpp
index d0488a2..ea2638b 100644
--- a/src/mlpack/tests/binarize_test.cpp
+++ b/src/mlpack/tests/binarize_test.cpp
@@ -9,7 +9,7 @@
#include <mlpack/core/math/random.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace arma;
diff --git a/src/mlpack/tests/cf_test.cpp b/src/mlpack/tests/cf_test.cpp
index 834e326..6a1f1a6 100644
--- a/src/mlpack/tests/cf_test.cpp
+++ b/src/mlpack/tests/cf_test.cpp
@@ -10,7 +10,7 @@
#include <iostream>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
#include "serialization.hpp"
BOOST_AUTO_TEST_SUITE(CFTest);
diff --git a/src/mlpack/tests/cli_test.cpp b/src/mlpack/tests/cli_test.cpp
index d0ebbd3..e6cbc64 100644
--- a/src/mlpack/tests/cli_test.cpp
+++ b/src/mlpack/tests/cli_test.cpp
@@ -22,7 +22,7 @@
#define DEFAULT_INT 42
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
#define BASH_RED "\033[0;31m"
#define BASH_GREEN "\033[0;32m"
diff --git a/src/mlpack/tests/convolution_test.cpp b/src/mlpack/tests/convolution_test.cpp
index 368f32d..b273330 100644
--- a/src/mlpack/tests/convolution_test.cpp
+++ b/src/mlpack/tests/convolution_test.cpp
@@ -13,7 +13,7 @@
#include <mlpack/methods/ann/convolution_rules/svd_convolution.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::ann;
diff --git a/src/mlpack/tests/convolutional_network_test.cpp b/src/mlpack/tests/convolutional_network_test.cpp
index baa2dff..1ca68c2 100644
--- a/src/mlpack/tests/convolutional_network_test.cpp
+++ b/src/mlpack/tests/convolutional_network_test.cpp
@@ -23,7 +23,7 @@
#include <mlpack/methods/ann/cnn.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::ann;
diff --git a/src/mlpack/tests/cosine_tree_test.cpp b/src/mlpack/tests/cosine_tree_test.cpp
index 925684f..6a8c586 100644
--- a/src/mlpack/tests/cosine_tree_test.cpp
+++ b/src/mlpack/tests/cosine_tree_test.cpp
@@ -9,7 +9,7 @@
#include <mlpack/core/tree/cosine_tree/cosine_tree.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
BOOST_AUTO_TEST_SUITE(CosineTreeTest);
diff --git a/src/mlpack/tests/decision_stump_test.cpp b/src/mlpack/tests/decision_stump_test.cpp
index 36c83f7..dae9875 100644
--- a/src/mlpack/tests/decision_stump_test.cpp
+++ b/src/mlpack/tests/decision_stump_test.cpp
@@ -8,7 +8,7 @@
#include <mlpack/methods/decision_stump/decision_stump.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::decision_stump;
diff --git a/src/mlpack/tests/det_test.cpp b/src/mlpack/tests/det_test.cpp
index 9e4e91e..7e32def 100644
--- a/src/mlpack/tests/det_test.cpp
+++ b/src/mlpack/tests/det_test.cpp
@@ -7,7 +7,7 @@
*/
#include <mlpack/core.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
// This trick does not work on Windows. We will have to comment out the tests
// that depend on it.
diff --git a/src/mlpack/tests/distribution_test.cpp b/src/mlpack/tests/distribution_test.cpp
index 0ca0dfd..d0261dd 100644
--- a/src/mlpack/tests/distribution_test.cpp
+++ b/src/mlpack/tests/distribution_test.cpp
@@ -7,7 +7,7 @@
#include <mlpack/core.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::distribution;
diff --git a/src/mlpack/tests/emst_test.cpp b/src/mlpack/tests/emst_test.cpp
index b477658..9e8831a 100644
--- a/src/mlpack/tests/emst_test.cpp
+++ b/src/mlpack/tests/emst_test.cpp
@@ -6,7 +6,7 @@
#include <mlpack/core.hpp>
#include <mlpack/methods/emst/dtb.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
#include <mlpack/core/tree/cover_tree.hpp>
diff --git a/src/mlpack/tests/fastmks_test.cpp b/src/mlpack/tests/fastmks_test.cpp
index 973da37..a7b20e9 100644
--- a/src/mlpack/tests/fastmks_test.cpp
+++ b/src/mlpack/tests/fastmks_test.cpp
@@ -9,7 +9,7 @@
#include <mlpack/methods/fastmks/fastmks_model.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
#include "serialization.hpp"
using namespace mlpack;
diff --git a/src/mlpack/tests/feedforward_network_test.cpp b/src/mlpack/tests/feedforward_network_test.cpp
index 6ae92d4..e1412b4 100644
--- a/src/mlpack/tests/feedforward_network_test.cpp
+++ b/src/mlpack/tests/feedforward_network_test.cpp
@@ -24,7 +24,7 @@
#include <mlpack/core/optimizers/rmsprop/rmsprop.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::ann;
diff --git a/src/mlpack/tests/gmm_test.cpp b/src/mlpack/tests/gmm_test.cpp
index 83b9fd3..561c261 100644
--- a/src/mlpack/tests/gmm_test.cpp
+++ b/src/mlpack/tests/gmm_test.cpp
@@ -15,7 +15,7 @@
#include <mlpack/methods/gmm/eigenvalue_ratio_constraint.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::gmm;
diff --git a/src/mlpack/tests/hmm_test.cpp b/src/mlpack/tests/hmm_test.cpp
index 762090f..7ea6403 100644
--- a/src/mlpack/tests/hmm_test.cpp
+++ b/src/mlpack/tests/hmm_test.cpp
@@ -8,7 +8,7 @@
#include <mlpack/methods/gmm/gmm.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::hmm;
diff --git a/src/mlpack/tests/hoeffding_tree_test.cpp b/src/mlpack/tests/hoeffding_tree_test.cpp
index c060267..1c6a678 100644
--- a/src/mlpack/tests/hoeffding_tree_test.cpp
+++ b/src/mlpack/tests/hoeffding_tree_test.cpp
@@ -12,7 +12,7 @@
#include <mlpack/methods/hoeffding_trees/binary_numeric_split.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
#include "serialization.hpp"
#include <stack>
diff --git a/src/mlpack/tests/ind2sub_test.cpp b/src/mlpack/tests/ind2sub_test.cpp
index ef1014b..7f3518f 100644
--- a/src/mlpack/tests/ind2sub_test.cpp
+++ b/src/mlpack/tests/ind2sub_test.cpp
@@ -6,7 +6,7 @@
*/
#include <mlpack/core.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
BOOST_AUTO_TEST_SUITE(ind2subTest);
diff --git a/src/mlpack/tests/init_rules_test.cpp b/src/mlpack/tests/init_rules_test.cpp
index 3d09c26..5ef4b99 100644
--- a/src/mlpack/tests/init_rules_test.cpp
+++ b/src/mlpack/tests/init_rules_test.cpp
@@ -14,7 +14,7 @@
#include <mlpack/methods/ann/init_rules/zero_init.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::ann;
diff --git a/src/mlpack/tests/kernel_pca_test.cpp b/src/mlpack/tests/kernel_pca_test.cpp
index dae716f..e154630 100644
--- a/src/mlpack/tests/kernel_pca_test.cpp
+++ b/src/mlpack/tests/kernel_pca_test.cpp
@@ -10,7 +10,7 @@
#include <mlpack/methods/kernel_pca/kernel_pca.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
BOOST_AUTO_TEST_SUITE(KernelPCATest);
diff --git a/src/mlpack/tests/kernel_test.cpp b/src/mlpack/tests/kernel_test.cpp
index f21835c..1c32019 100644
--- a/src/mlpack/tests/kernel_test.cpp
+++ b/src/mlpack/tests/kernel_test.cpp
@@ -19,7 +19,7 @@
#include <mlpack/core/metrics/mahalanobis_distance.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::kernel;
diff --git a/src/mlpack/tests/kernel_traits_test.cpp b/src/mlpack/tests/kernel_traits_test.cpp
index f9eb88d..408df4b 100644
--- a/src/mlpack/tests/kernel_traits_test.cpp
+++ b/src/mlpack/tests/kernel_traits_test.cpp
@@ -9,7 +9,7 @@
#include <mlpack/core.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::kernel;
diff --git a/src/mlpack/tests/kfn_test.cpp b/src/mlpack/tests/kfn_test.cpp
index 2701a6a..1fc536a 100644
--- a/src/mlpack/tests/kfn_test.cpp
+++ b/src/mlpack/tests/kfn_test.cpp
@@ -7,7 +7,7 @@
#include <mlpack/methods/neighbor_search/neighbor_search.hpp>
#include <mlpack/core/tree/cover_tree.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::neighbor;
diff --git a/src/mlpack/tests/kmeans_test.cpp b/src/mlpack/tests/kmeans_test.cpp
index 3089a3e..9353557 100644
--- a/src/mlpack/tests/kmeans_test.cpp
+++ b/src/mlpack/tests/kmeans_test.cpp
@@ -18,7 +18,7 @@
#include <mlpack/methods/neighbor_search/neighbor_search.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::kmeans;
diff --git a/src/mlpack/tests/knn_test.cpp b/src/mlpack/tests/knn_test.cpp
index 51a854a..aa169b7 100644
--- a/src/mlpack/tests/knn_test.cpp
+++ b/src/mlpack/tests/knn_test.cpp
@@ -10,7 +10,7 @@
#include <mlpack/core/tree/cover_tree.hpp>
#include <mlpack/core/tree/example_tree.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::neighbor;
diff --git a/src/mlpack/tests/krann_search_test.cpp b/src/mlpack/tests/krann_search_test.cpp
index 37e9b35..805adb3 100644
--- a/src/mlpack/tests/krann_search_test.cpp
+++ b/src/mlpack/tests/krann_search_test.cpp
@@ -10,7 +10,7 @@
#include <mlpack/core/tree/cover_tree.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
#include <mlpack/methods/rann/ra_search.hpp>
#include <mlpack/methods/rann/ra_model.hpp>
diff --git a/src/mlpack/tests/lars_test.cpp b/src/mlpack/tests/lars_test.cpp
index 83bd0a8..5b410fe 100644
--- a/src/mlpack/tests/lars_test.cpp
+++ b/src/mlpack/tests/lars_test.cpp
@@ -10,7 +10,7 @@
#include <mlpack/methods/lars/lars.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::regression;
diff --git a/src/mlpack/tests/layer_traits_test.cpp b/src/mlpack/tests/layer_traits_test.cpp
index 0a0e3cc..373d878 100644
--- a/src/mlpack/tests/layer_traits_test.cpp
+++ b/src/mlpack/tests/layer_traits_test.cpp
@@ -13,7 +13,7 @@
#include <mlpack/methods/ann/layer/multiclass_classification_layer.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::ann;
diff --git a/src/mlpack/tests/lbfgs_test.cpp b/src/mlpack/tests/lbfgs_test.cpp
index ea111f9..f16803c 100644
--- a/src/mlpack/tests/lbfgs_test.cpp
+++ b/src/mlpack/tests/lbfgs_test.cpp
@@ -10,7 +10,7 @@
#include <mlpack/core/optimizers/lbfgs/test_functions.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack::optimization;
using namespace mlpack::optimization::test;
diff --git a/src/mlpack/tests/lin_alg_test.cpp b/src/mlpack/tests/lin_alg_test.cpp
index afb8876..6d11b36 100644
--- a/src/mlpack/tests/lin_alg_test.cpp
+++ b/src/mlpack/tests/lin_alg_test.cpp
@@ -10,7 +10,7 @@
#include <mlpack/core/math/lin_alg.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace arma;
using namespace mlpack;
diff --git a/src/mlpack/tests/linear_regression_test.cpp b/src/mlpack/tests/linear_regression_test.cpp
index 6a0e868..7f175c9 100644
--- a/src/mlpack/tests/linear_regression_test.cpp
+++ b/src/mlpack/tests/linear_regression_test.cpp
@@ -7,7 +7,7 @@
#include <mlpack/methods/linear_regression/linear_regression.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::regression;
diff --git a/src/mlpack/tests/load_save_test.cpp b/src/mlpack/tests/load_save_test.cpp
index 3917aea..4eb8f12 100644
--- a/src/mlpack/tests/load_save_test.cpp
+++ b/src/mlpack/tests/load_save_test.cpp
@@ -9,7 +9,7 @@
#include <mlpack/core.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::data;
diff --git a/src/mlpack/tests/local_coordinate_coding_test.cpp b/src/mlpack/tests/local_coordinate_coding_test.cpp
index 2e51d90..cc293b3 100644
--- a/src/mlpack/tests/local_coordinate_coding_test.cpp
+++ b/src/mlpack/tests/local_coordinate_coding_test.cpp
@@ -10,7 +10,7 @@
#include <mlpack/methods/local_coordinate_coding/lcc.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
#include "serialization.hpp"
using namespace arma;
diff --git a/src/mlpack/tests/log_test.cpp b/src/mlpack/tests/log_test.cpp
index 09a56c2..3a5a43d 100644
--- a/src/mlpack/tests/log_test.cpp
+++ b/src/mlpack/tests/log_test.cpp
@@ -8,7 +8,7 @@
#include <mlpack/core.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
diff --git a/src/mlpack/tests/logistic_regression_test.cpp b/src/mlpack/tests/logistic_regression_test.cpp
index 7881bb2..60acb1c 100644
--- a/src/mlpack/tests/logistic_regression_test.cpp
+++ b/src/mlpack/tests/logistic_regression_test.cpp
@@ -9,7 +9,7 @@
#include <mlpack/core/optimizers/sgd/sgd.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::regression;
diff --git a/src/mlpack/tests/lrsdp_test.cpp b/src/mlpack/tests/lrsdp_test.cpp
index 1fe0f77..5a7b1ce 100644
--- a/src/mlpack/tests/lrsdp_test.cpp
+++ b/src/mlpack/tests/lrsdp_test.cpp
@@ -8,7 +8,7 @@
#include <mlpack/core/optimizers/sdp/lrsdp.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::optimization;
diff --git a/src/mlpack/tests/lsh_test.cpp b/src/mlpack/tests/lsh_test.cpp
index 65d1d78..8844972 100644
--- a/src/mlpack/tests/lsh_test.cpp
+++ b/src/mlpack/tests/lsh_test.cpp
@@ -6,7 +6,7 @@
#include <mlpack/core.hpp>
#include <mlpack/core/metrics/lmetric.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
#include <mlpack/methods/lsh/lsh_search.hpp>
#include <mlpack/methods/neighbor_search/neighbor_search.hpp>
diff --git a/src/mlpack/tests/lstm_peephole_test.cpp b/src/mlpack/tests/lstm_peephole_test.cpp
index 6192e64..fef1196 100644
--- a/src/mlpack/tests/lstm_peephole_test.cpp
+++ b/src/mlpack/tests/lstm_peephole_test.cpp
@@ -9,7 +9,7 @@
#include <mlpack/methods/ann/layer/lstm_layer.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::ann;
diff --git a/src/mlpack/tests/math_test.cpp b/src/mlpack/tests/math_test.cpp
index d5f80e8..c68441d 100644
--- a/src/mlpack/tests/math_test.cpp
+++ b/src/mlpack/tests/math_test.cpp
@@ -8,7 +8,7 @@
#include <mlpack/core/math/random.hpp>
#include <mlpack/core/math/range.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace math;
diff --git a/src/mlpack/tests/matrix_completion_test.cpp b/src/mlpack/tests/matrix_completion_test.cpp
index df7020f..697e809 100644
--- a/src/mlpack/tests/matrix_completion_test.cpp
+++ b/src/mlpack/tests/matrix_completion_test.cpp
@@ -8,7 +8,7 @@
#include <mlpack/methods/matrix_completion/matrix_completion.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::matrix_completion;
diff --git a/src/mlpack/tests/maximal_inputs_test.cpp b/src/mlpack/tests/maximal_inputs_test.cpp
index 62062e1..c6e8c10 100644
--- a/src/mlpack/tests/maximal_inputs_test.cpp
+++ b/src/mlpack/tests/maximal_inputs_test.cpp
@@ -9,7 +9,7 @@
#include <mlpack/methods/sparse_autoencoder/maximal_inputs.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
diff --git a/src/mlpack/tests/mean_shift_test.cpp b/src/mlpack/tests/mean_shift_test.cpp
index e777e15..e7577d7 100644
--- a/src/mlpack/tests/mean_shift_test.cpp
+++ b/src/mlpack/tests/mean_shift_test.cpp
@@ -8,7 +8,7 @@
#include <mlpack/methods/mean_shift/mean_shift.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::meanshift;
diff --git a/src/mlpack/tests/metric_test.cpp b/src/mlpack/tests/metric_test.cpp
index 7eff0bb..10952fe 100644
--- a/src/mlpack/tests/metric_test.cpp
+++ b/src/mlpack/tests/metric_test.cpp
@@ -6,7 +6,7 @@
#include <mlpack/core.hpp>
#include <mlpack/core/metrics/lmetric.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace std;
using namespace mlpack::metric;
diff --git a/src/mlpack/tests/minibatch_sgd_test.cpp b/src/mlpack/tests/minibatch_sgd_test.cpp
index 90e5b58..410d4e3 100644
--- a/src/mlpack/tests/minibatch_sgd_test.cpp
+++ b/src/mlpack/tests/minibatch_sgd_test.cpp
@@ -13,7 +13,7 @@
#include <mlpack/methods/logistic_regression/logistic_regression.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace std;
using namespace arma;
diff --git a/src/mlpack/tests/mlpack_test.cpp b/src/mlpack/tests/mlpack_test.cpp
index 5b9f7a8..b10486e 100644
--- a/src/mlpack/tests/mlpack_test.cpp
+++ b/src/mlpack/tests/mlpack_test.cpp
@@ -17,7 +17,7 @@
#endif
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
/**
* Provide a global fixture for each test.
diff --git a/src/mlpack/tests/nbc_test.cpp b/src/mlpack/tests/nbc_test.cpp
index a3e43cd..dc96f8d 100644
--- a/src/mlpack/tests/nbc_test.cpp
+++ b/src/mlpack/tests/nbc_test.cpp
@@ -7,7 +7,7 @@
#include <mlpack/methods/naive_bayes/naive_bayes_classifier.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace naive_bayes;
diff --git a/src/mlpack/tests/nca_test.cpp b/src/mlpack/tests/nca_test.cpp
index d1c00c5..34b1a39 100644
--- a/src/mlpack/tests/nca_test.cpp
+++ b/src/mlpack/tests/nca_test.cpp
@@ -11,7 +11,7 @@
#include <mlpack/core/optimizers/lbfgs/lbfgs.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::metric;
diff --git a/src/mlpack/tests/network_util_test.cpp b/src/mlpack/tests/network_util_test.cpp
index 766ed85..30d6331 100644
--- a/src/mlpack/tests/network_util_test.cpp
+++ b/src/mlpack/tests/network_util_test.cpp
@@ -12,7 +12,7 @@
#include <mlpack/methods/ann/init_rules/random_init.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::ann;
diff --git a/src/mlpack/tests/nmf_test.cpp b/src/mlpack/tests/nmf_test.cpp
index 605ce39..f50b10a 100644
--- a/src/mlpack/tests/nmf_test.cpp
+++ b/src/mlpack/tests/nmf_test.cpp
@@ -12,7 +12,7 @@
#include <mlpack/methods/amf/update_rules/nmf_mult_dist.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
BOOST_AUTO_TEST_SUITE(NMFTest);
diff --git a/src/mlpack/tests/nystroem_method_test.cpp b/src/mlpack/tests/nystroem_method_test.cpp
index f705439..241d971 100644
--- a/src/mlpack/tests/nystroem_method_test.cpp
+++ b/src/mlpack/tests/nystroem_method_test.cpp
@@ -8,7 +8,7 @@
#include <mlpack/core.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
#include <mlpack/methods/nystroem_method/ordered_selection.hpp>
#include <mlpack/methods/nystroem_method/random_selection.hpp>
diff --git a/src/mlpack/tests/pca_test.cpp b/src/mlpack/tests/pca_test.cpp
index d7a78c8..e4f3b6a 100644
--- a/src/mlpack/tests/pca_test.cpp
+++ b/src/mlpack/tests/pca_test.cpp
@@ -8,7 +8,7 @@
#include <mlpack/methods/pca/pca.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
BOOST_AUTO_TEST_SUITE(PCATest);
diff --git a/src/mlpack/tests/perceptron_test.cpp b/src/mlpack/tests/perceptron_test.cpp
index 8f2de1e..4fc1c8b 100644
--- a/src/mlpack/tests/perceptron_test.cpp
+++ b/src/mlpack/tests/perceptron_test.cpp
@@ -8,7 +8,7 @@
#include <mlpack/methods/perceptron/perceptron.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace arma;
diff --git a/src/mlpack/tests/performance_functions_test.cpp b/src/mlpack/tests/performance_functions_test.cpp
index 84839a1..9ad9342 100644
--- a/src/mlpack/tests/performance_functions_test.cpp
+++ b/src/mlpack/tests/performance_functions_test.cpp
@@ -11,7 +11,7 @@
#include <mlpack/methods/ann/performance_functions/sse_function.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::ann;
diff --git a/src/mlpack/tests/pooling_rules_test.cpp b/src/mlpack/tests/pooling_rules_test.cpp
index b85f3e8..9909316 100644
--- a/src/mlpack/tests/pooling_rules_test.cpp
+++ b/src/mlpack/tests/pooling_rules_test.cpp
@@ -10,7 +10,7 @@
#include <mlpack/methods/ann/pooling_rules/mean_pooling.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::ann;
diff --git a/src/mlpack/tests/quic_svd_test.cpp b/src/mlpack/tests/quic_svd_test.cpp
index f859e21..218bfff 100644
--- a/src/mlpack/tests/quic_svd_test.cpp
+++ b/src/mlpack/tests/quic_svd_test.cpp
@@ -9,7 +9,7 @@
#include <mlpack/methods/quic_svd/quic_svd.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
BOOST_AUTO_TEST_SUITE(QUICSVDTest);
diff --git a/src/mlpack/tests/radical_test.cpp b/src/mlpack/tests/radical_test.cpp
index c5dc323..c14f449 100644
--- a/src/mlpack/tests/radical_test.cpp
+++ b/src/mlpack/tests/radical_test.cpp
@@ -7,7 +7,7 @@
#include <mlpack/core.hpp>
#include <mlpack/methods/radical/radical.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
BOOST_AUTO_TEST_SUITE(RadicalTest);
diff --git a/src/mlpack/tests/range_search_test.cpp b/src/mlpack/tests/range_search_test.cpp
index 84cfed8..8842971 100644
--- a/src/mlpack/tests/range_search_test.cpp
+++ b/src/mlpack/tests/range_search_test.cpp
@@ -9,7 +9,7 @@
#include <mlpack/core/tree/cover_tree.hpp>
#include <mlpack/methods/range_search/rs_model.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::range;
diff --git a/src/mlpack/tests/rectangle_tree_test.cpp b/src/mlpack/tests/rectangle_tree_test.cpp
index f9278c5..92595c6 100644
--- a/src/mlpack/tests/rectangle_tree_test.cpp
+++ b/src/mlpack/tests/rectangle_tree_test.cpp
@@ -12,7 +12,7 @@
#include <mlpack/methods/neighbor_search/neighbor_search.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::neighbor;
diff --git a/src/mlpack/tests/recurrent_network_test.cpp b/src/mlpack/tests/recurrent_network_test.cpp
index 355aa81..0ec1bcf 100644
--- a/src/mlpack/tests/recurrent_network_test.cpp
+++ b/src/mlpack/tests/recurrent_network_test.cpp
@@ -20,7 +20,7 @@
#include <mlpack/methods/ann/init_rules/nguyen_widrow_init.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::ann;
diff --git a/src/mlpack/tests/regularized_svd_test.cpp b/src/mlpack/tests/regularized_svd_test.cpp
index 1cbb741..b29fe84 100644
--- a/src/mlpack/tests/regularized_svd_test.cpp
+++ b/src/mlpack/tests/regularized_svd_test.cpp
@@ -8,7 +8,7 @@
#include <mlpack/methods/regularized_svd/regularized_svd.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::svd;
diff --git a/src/mlpack/tests/rmsprop_test.cpp b/src/mlpack/tests/rmsprop_test.cpp
index 6fb3e74..b62d77f 100644
--- a/src/mlpack/tests/rmsprop_test.cpp
+++ b/src/mlpack/tests/rmsprop_test.cpp
@@ -20,7 +20,7 @@
#include <mlpack/methods/ann/layer/base_layer.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace arma;
using namespace mlpack;
diff --git a/src/mlpack/tests/sa_test.cpp b/src/mlpack/tests/sa_test.cpp
index 05e7d9f..3d87e5d 100644
--- a/src/mlpack/tests/sa_test.cpp
+++ b/src/mlpack/tests/sa_test.cpp
@@ -14,7 +14,7 @@
#include <mlpack/core/metrics/mahalanobis_distance.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace std;
using namespace arma;
diff --git a/src/mlpack/tests/sdp_primal_dual_test.cpp b/src/mlpack/tests/sdp_primal_dual_test.cpp
index f3ed242..0c42ea1 100644
--- a/src/mlpack/tests/sdp_primal_dual_test.cpp
+++ b/src/mlpack/tests/sdp_primal_dual_test.cpp
@@ -9,7 +9,7 @@
#include <mlpack/methods/neighbor_search/neighbor_search.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::optimization;
diff --git a/src/mlpack/tests/serialization.hpp b/src/mlpack/tests/serialization.hpp
index 39cf1d8..a53a6e8 100644
--- a/src/mlpack/tests/serialization.hpp
+++ b/src/mlpack/tests/serialization.hpp
@@ -17,7 +17,7 @@
#include <mlpack/core.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
namespace mlpack {
diff --git a/src/mlpack/tests/serialization_test.cpp b/src/mlpack/tests/serialization_test.cpp
index 5dbb9aa..49a913f 100644
--- a/src/mlpack/tests/serialization_test.cpp
+++ b/src/mlpack/tests/serialization_test.cpp
@@ -7,7 +7,7 @@
#include <mlpack/core.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
#include "serialization.hpp"
#include <mlpack/core/dists/regression_distribution.hpp>
diff --git a/src/mlpack/tests/sgd_test.cpp b/src/mlpack/tests/sgd_test.cpp
index 1b273dc..a8f389b 100644
--- a/src/mlpack/tests/sgd_test.cpp
+++ b/src/mlpack/tests/sgd_test.cpp
@@ -10,7 +10,7 @@
#include <mlpack/core/optimizers/sgd/test_function.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace std;
using namespace arma;
diff --git a/src/mlpack/tests/softmax_regression_test.cpp b/src/mlpack/tests/softmax_regression_test.cpp
index d7ed969..4fe8568 100644
--- a/src/mlpack/tests/softmax_regression_test.cpp
+++ b/src/mlpack/tests/softmax_regression_test.cpp
@@ -8,7 +8,7 @@
#include <mlpack/methods/softmax_regression/softmax_regression.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::regression;
diff --git a/src/mlpack/tests/sort_policy_test.cpp b/src/mlpack/tests/sort_policy_test.cpp
index c6fcf5b..e336a76 100644
--- a/src/mlpack/tests/sort_policy_test.cpp
+++ b/src/mlpack/tests/sort_policy_test.cpp
@@ -12,7 +12,7 @@
#include <mlpack/methods/neighbor_search/sort_policies/furthest_neighbor_sort.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::neighbor;
diff --git a/src/mlpack/tests/sparse_autoencoder_test.cpp b/src/mlpack/tests/sparse_autoencoder_test.cpp
index 03d4e72..24d0cc6 100644
--- a/src/mlpack/tests/sparse_autoencoder_test.cpp
+++ b/src/mlpack/tests/sparse_autoencoder_test.cpp
@@ -8,7 +8,7 @@
#include <mlpack/methods/sparse_autoencoder/sparse_autoencoder.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::nn;
diff --git a/src/mlpack/tests/sparse_coding_test.cpp b/src/mlpack/tests/sparse_coding_test.cpp
index eab0b9c..6815405 100644
--- a/src/mlpack/tests/sparse_coding_test.cpp
+++ b/src/mlpack/tests/sparse_coding_test.cpp
@@ -11,7 +11,7 @@
#include <mlpack/methods/sparse_coding/sparse_coding.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
#include "serialization.hpp"
using namespace arma;
diff --git a/src/mlpack/tests/split_data_test.cpp b/src/mlpack/tests/split_data_test.cpp
index bbc529b..1c52f63 100644
--- a/src/mlpack/tests/split_data_test.cpp
+++ b/src/mlpack/tests/split_data_test.cpp
@@ -8,7 +8,7 @@
#include <mlpack/core/data/split_data.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace arma;
diff --git a/src/mlpack/tests/svd_batch_test.cpp b/src/mlpack/tests/svd_batch_test.cpp
index 36f3544..45f9a12 100644
--- a/src/mlpack/tests/svd_batch_test.cpp
+++ b/src/mlpack/tests/svd_batch_test.cpp
@@ -7,7 +7,7 @@
#include <mlpack/methods/amf/termination_policies/simple_tolerance_termination.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
BOOST_AUTO_TEST_SUITE(SVDBatchTest);
diff --git a/src/mlpack/tests/svd_incremental_test.cpp b/src/mlpack/tests/svd_incremental_test.cpp
index 2def227..4fdd4e4 100644
--- a/src/mlpack/tests/svd_incremental_test.cpp
+++ b/src/mlpack/tests/svd_incremental_test.cpp
@@ -9,7 +9,7 @@
#include <mlpack/methods/amf/termination_policies/validation_RMSE_termination.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
BOOST_AUTO_TEST_SUITE(SVDIncrementalTest);
diff --git a/src/mlpack/tests/termination_policy_test.cpp b/src/mlpack/tests/termination_policy_test.cpp
index da51afb..945d82c 100644
--- a/src/mlpack/tests/termination_policy_test.cpp
+++ b/src/mlpack/tests/termination_policy_test.cpp
@@ -10,7 +10,7 @@
#include <mlpack/methods/amf/update_rules/nmf_mult_div.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
BOOST_AUTO_TEST_SUITE(TerminationPolicyTest);
diff --git a/src/mlpack/tests/old_boost_test_definitions.hpp b/src/mlpack/tests/test_tools.hpp
similarity index 79%
rename from src/mlpack/tests/old_boost_test_definitions.hpp
rename to src/mlpack/tests/test_tools.hpp
index 1586f62..2d4e56e 100644
--- a/src/mlpack/tests/old_boost_test_definitions.hpp
+++ b/src/mlpack/tests/test_tools.hpp
@@ -1,12 +1,11 @@
/**
- * @file old_boost_test_definitions.hpp
+ * @file test_tools.hpp
* @author Ryan Curtin
*
- * Ancient Boost.Test versions don't act how we expect. This file includes the
- * things we need to fix that.
+ * This file includes some useful macros for tests.
*/
-#ifndef MLPACK_TESTS_OLD_BOOST_TEST_DEFINITIONS_HPP
-#define MLPACK_TESTS_OLD_BOOST_TEST_DEFINITIONS_HPP
+#ifndef MLPACK_TESTS_TEST_TOOLS_HPP
+#define MLPACK_TESTS_TEST_TOOLS_HPP
#include <boost/version.hpp>
diff --git a/src/mlpack/tests/tree_test.cpp b/src/mlpack/tests/tree_test.cpp
index 14b2f51..81a9446 100644
--- a/src/mlpack/tests/tree_test.cpp
+++ b/src/mlpack/tests/tree_test.cpp
@@ -14,7 +14,7 @@
#include <stack>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::math;
diff --git a/src/mlpack/tests/tree_traits_test.cpp b/src/mlpack/tests/tree_traits_test.cpp
index e7b4925..cf0395d 100644
--- a/src/mlpack/tests/tree_traits_test.cpp
+++ b/src/mlpack/tests/tree_traits_test.cpp
@@ -15,7 +15,7 @@
#include <mlpack/core/tree/rectangle_tree.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::tree;
diff --git a/src/mlpack/tests/union_find_test.cpp b/src/mlpack/tests/union_find_test.cpp
index 8468a2a..89e78ea 100644
--- a/src/mlpack/tests/union_find_test.cpp
+++ b/src/mlpack/tests/union_find_test.cpp
@@ -8,7 +8,7 @@
#include <mlpack/core.hpp>
#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
+#include "test_tools.hpp"
using namespace mlpack;
using namespace mlpack::emst;
More information about the mlpack-git
mailing list