Merge pull request #1947 from stan-dev/cleanup/1886-test-util-cleanup-part2

Cleanup/1886 cleanup global space in prim tests, replace pull_msg with expect_throw_msg

Author: rok-cesnovar

runTests.py

@@ -97,7 +97,6 @@ def generateTests(j):
     else:
         doCommand('make -j%d generate-tests -s' % (j or 1))
 
-
 def makeTest(name, j):
     """Run the make command for a given single test."""
     if isWin():

test/unit/math/prim/err/check_2F1_converges_test.cpp

@@ -2,9 +2,8 @@
 #include <gtest/gtest.h>
 #include <limits>
 
-using stan::math::check_2F1_converges;
-
 TEST(passesOnConvergentArgs, Check2F1Converges) {
+  using stan::math::check_2F1_converges;
   const char* function = "check_2F1_converges";
   double a1 = 1.0;
   double a2 = 1.0;

test/unit/math/prim/err/check_3F2_converges_test.cpp

@@ -2,9 +2,8 @@
 #include <gtest/gtest.h>
 #include <limits>
 
-using stan::math::check_3F2_converges;
-
 TEST(passesOnConvergentArgs, Check3F2Converges) {
+  using stan::math::check_3F2_converges;
   const char* function = "check_3F2_converges";
   double a1 = 1.0;
   double a2 = 1.0;

test/unit/math/prim/err/check_bounded_test.cpp

@@ -2,9 +2,8 @@
 #include <gtest/gtest.h>
 #include <limits>
 
-using stan::math::check_bounded;
-
 TEST(ErrorHandlingScalar, CheckBounded_x) {
+  using stan::math::check_bounded;
   const char* function = "check_bounded";
   const char* name = "x";
   double x = 0;
@@ -51,6 +50,7 @@ TEST(ErrorHandlingScalar, CheckBounded_x) {
       << ", " << low;
 }
 TEST(ErrorHandlingScalar, CheckBounded_Low) {
+  using stan::math::check_bounded;
   const char* function = "check_bounded";
   const char* name = "x";
   double x = 0;
@@ -77,6 +77,7 @@ TEST(ErrorHandlingScalar, CheckBounded_Low) {
       << ", " << high;
 }
 TEST(ErrorHandlingScalar, CheckBounded_High) {
+  using stan::math::check_bounded;
   const char* function = "check_bounded";
   const char* name = "x";
   double x = 0;
@@ -103,6 +104,7 @@ TEST(ErrorHandlingScalar, CheckBounded_High) {
       << ", " << high;
 }
 TEST(ErrorHandlingScalar, CheckBounded_nan) {
+  using stan::math::check_bounded;
   double nan = std::numeric_limits<double>::quiet_NaN();
 
   const char* function = "check_bounded";
@@ -123,6 +125,7 @@ TEST(ErrorHandlingScalar, CheckBounded_nan) {
 }
 
 TEST(ErrorHandlingScalar, CheckBounded_size_zero_vector) {
+  using stan::math::check_bounded;
   const char* function = "check_bounded";
   const char* name = "x";
   double x = 0;

test/unit/math/prim/err/check_corr_matrix_test.cpp

@@ -3,9 +3,8 @@
 #include <limits>
 #include <string>
 
-using stan::math::check_corr_matrix;
-
 TEST(ErrorHandlingMatrix, CheckCorrMatrix) {
+  using stan::math::check_corr_matrix;
   Eigen::Matrix<double, Eigen::Dynamic, Eigen::Dynamic> y;
   y.resize(2, 2);
 
@@ -17,6 +16,7 @@ TEST(ErrorHandlingMatrix, CheckCorrMatrix) {
 }
 
 TEST(ErrorHandlingMatrix, CheckCorrMatrix_one_indexed_message) {
+  using stan::math::check_corr_matrix;
   std::string message;
   Eigen::Matrix<double, Eigen::Dynamic, Eigen::Dynamic> y;
   y.resize(2, 2);
@@ -37,6 +37,7 @@ TEST(ErrorHandlingMatrix, CheckCorrMatrix_one_indexed_message) {
 }
 
 TEST(ErrorHandlingMatrix, CheckCorrMatrix_nan) {
+  using stan::math::check_corr_matrix;
   Eigen::Matrix<double, Eigen::Dynamic, Eigen::Dynamic> y;
   y.resize(2, 2);
   double nan = std::numeric_limits<double>::quiet_NaN();

test/unit/math/prim/err/check_finite_test.cpp

@@ -4,10 +4,8 @@
 #include <string>
 #include <vector>
 
-using stan::math::check_finite;
-
-// ---------- check_finite: vector tests ----------
 TEST(ErrorHandlingArr, CheckFinite_Vector) {
+  using stan::math::check_finite;
   const char* function = "check_finite";
   std::vector<double> x = {-1, 0, 1};
   ASSERT_NO_THROW(check_finite(function, "x", x))
@@ -27,6 +25,7 @@ TEST(ErrorHandlingArr, CheckFinite_Vector) {
 }
 
 TEST(ErrorHandlingArr, CheckFinite_nan) {
+  using stan::math::check_finite;
   const char* function = "check_finite";
   double nan = std::numeric_limits<double>::quiet_NaN();
 
@@ -40,8 +39,8 @@ TEST(ErrorHandlingArr, CheckFinite_nan) {
   EXPECT_THROW(check_finite(function, "x", x), std::domain_error);
 }
 
-// ---------- check_finite: matrix tests ----------
 TEST(ErrorHandlingMat, CheckFinite_Matrix) {
+  using stan::math::check_finite;
   const char* function = "check_finite";
   Eigen::Matrix<double, Eigen::Dynamic, 1> x;
 
@@ -67,6 +66,7 @@ TEST(ErrorHandlingMat, CheckFinite_Matrix) {
 }
 
 TEST(ErrorHandlingMat, CheckFinite_Matrix_one_indexed_message) {
+  using stan::math::check_finite;
   const char* function = "check_finite";
   Eigen::Matrix<double, Eigen::Dynamic, 1> x;
   std::string message;
@@ -86,6 +86,7 @@ TEST(ErrorHandlingMat, CheckFinite_Matrix_one_indexed_message) {
 }
 
 TEST(ErrorHandlingMat, CheckFinite_nan) {
+  using stan::math::check_finite;
   const char* function = "check_finite";
   double nan = std::numeric_limits<double>::quiet_NaN();
 
@@ -101,6 +102,7 @@ TEST(ErrorHandlingMat, CheckFinite_nan) {
 }
 
 TEST(ErrorHandlingScalar, CheckFinite) {
+  using stan::math::check_finite;
   const char* function = "check_finite";
   double x = 0;
 
@@ -119,6 +121,7 @@ TEST(ErrorHandlingScalar, CheckFinite) {
 }
 
 TEST(ErrorHandlingScalar, CheckFinite_nan) {
+  using stan::math::check_finite;
   const char* function = "check_finite";
   double nan = std::numeric_limits<double>::quiet_NaN();
 

test/unit/math/prim/err/check_greater_or_equal_test.cpp

@@ -3,9 +3,8 @@
 #include <limits>
 #include <string>
 
-using stan::math::check_greater_or_equal;
-
 TEST(ErrorHandlingMat, CheckGreaterOrEqualMatrix) {
+  using stan::math::check_greater_or_equal;
   const char* function = "check_greater_or_equal";
   double x;
   double low;
@@ -120,6 +119,7 @@ TEST(ErrorHandlingMat, CheckGreaterOrEqualMatrix) {
 }
 
 TEST(ErrorHandlingMat, CheckGreaterOrEqual_Matrix_one_indexed_message) {
+  using stan::math::check_greater_or_equal;
   const char* function = "check_greater_or_equal";
   double x;
   double low;
@@ -178,6 +178,7 @@ TEST(ErrorHandlingMat, CheckGreaterOrEqual_Matrix_one_indexed_message) {
 }
 
 TEST(ErrorHandlingMat, CheckGreaterOrEqual_nan) {
+  using stan::math::check_greater_or_equal;
   const char* function = "check_greater_or_equal";
   double nan = std::numeric_limits<double>::quiet_NaN();
 
@@ -218,6 +219,7 @@ TEST(ErrorHandlingMat, CheckGreaterOrEqual_nan) {
 }
 
 TEST(ErrorHandlingScalar, CheckGreaterOrEqual) {
+  using stan::math::check_greater_or_equal;
   const char* function = "check_greater_or_equal";
   double x = 10.0;
   double lb = 0.0;
@@ -250,6 +252,7 @@ TEST(ErrorHandlingScalar, CheckGreaterOrEqual) {
 }
 
 TEST(ErrorHandlingScalar, CheckGreaterOrEqual_nan) {
+  using stan::math::check_greater_or_equal;
   const char* function = "check_greater_or_equal";
   double x = 10.0;
   double lb = 0.0;

test/unit/math/prim/err/check_greater_test.cpp

@@ -3,9 +3,8 @@
 #include <limits>
 #include <string>
 
-using stan::math::check_greater;
-
 TEST(ErrorHandlingMat, CheckGreater_Matrix) {
+  using stan::math::check_greater;
   const char* function = "check_greater";
   double x;
   double low;
@@ -110,6 +109,7 @@ TEST(ErrorHandlingMat, CheckGreater_Matrix) {
 }
 
 TEST(ErrorHandlingMat, CheckGreater_Matrix_one_indexed_message) {
+  using stan::math::check_greater;
   const char* function = "check_greater";
   double x;
   double low;
@@ -168,6 +168,7 @@ TEST(ErrorHandlingMat, CheckGreater_Matrix_one_indexed_message) {
 }
 
 TEST(ErrorHandlingMat, CheckGreater_nan) {
+  using stan::math::check_greater;
   const char* function = "check_greater";
   double x = 10.0;
   double lb = 0.0;
@@ -179,6 +180,7 @@ TEST(ErrorHandlingMat, CheckGreater_nan) {
 }
 
 TEST(ErrorHandlingScalar, CheckGreater) {
+  using stan::math::check_greater;
   const char* function = "check_greater";
   double x = 10.0;
   double lb = 0.0;
@@ -210,6 +212,7 @@ TEST(ErrorHandlingScalar, CheckGreater) {
 }
 
 TEST(ErrorHandlingScalar, CheckGreater_nan) {
+  using stan::math::check_greater;
   const char* function = "check_greater";
   double x = 10.0;
   double lb = 0.0;

test/unit/math/prim/err/check_less_or_equal_test.cpp

@@ -3,9 +3,8 @@
 #include <limits>
 #include <string>
 
-using stan::math::check_less_or_equal;
-
 TEST(ErrorHandlingMat, CheckLessOrEqual_Matrix) {
+  using stan::math::check_less_or_equal;
   const char* function = "check_less_or_equal";
   double x;
   double high;
@@ -84,6 +83,7 @@ TEST(ErrorHandlingMat, CheckLessOrEqual_Matrix) {
 }
 
 TEST(ErrorHandlingMat, CheckLessOrEqual_Matrix_one_indexed_message) {
+  using stan::math::check_less_or_equal;
   const char* function = "check_less";
   double x;
   double high;
@@ -142,6 +142,7 @@ TEST(ErrorHandlingMat, CheckLessOrEqual_Matrix_one_indexed_message) {
 }
 
 TEST(ErrorHandlingMat, CheckLessOrEqual_nan) {
+  using stan::math::check_less_or_equal;
   const char* function = "check_less_or_equal";
   double nan = std::numeric_limits<double>::quiet_NaN();
   Eigen::Matrix<double, Eigen::Dynamic, 1> x_vec(3);
@@ -181,6 +182,7 @@ TEST(ErrorHandlingMat, CheckLessOrEqual_nan) {
 }
 
 TEST(ErrorHandlingScalar, CheckLessOrEqual) {
+  using stan::math::check_less_or_equal;
   const char* function = "check_less_or_equal";
   double x = -10.0;
   double lb = 0.0;
@@ -213,6 +215,7 @@ TEST(ErrorHandlingScalar, CheckLessOrEqual) {
 }
 
 TEST(ErrorHandlingScalar, CheckLessOrEqual_nan) {
+  using stan::math::check_less_or_equal;
   const char* function = "check_less_or_equal";
   double x = 10.0;
   double lb = 0.0;

test/unit/math/prim/err/check_less_test.cpp

@@ -3,9 +3,8 @@
 #include <limits>
 #include <string>
 
-using stan::math::check_less;
-
 TEST(ErrorHandlingMat, CheckLess_Matrix) {
+  using stan::math::check_less;
   const char* function = "check_less";
   double x;
   double high;
@@ -81,6 +80,7 @@ TEST(ErrorHandlingMat, CheckLess_Matrix) {
 }
 
 TEST(ErrorHandlingMat, CheckLess_Matrix_one_indexed_message) {
+  using stan::math::check_less;
   const char* function = "check_less";
   double x;
   double high;
@@ -139,6 +139,7 @@ TEST(ErrorHandlingMat, CheckLess_Matrix_one_indexed_message) {
 }
 
 TEST(ErrorHandlingMat, CheckLess_nan) {
+  using stan::math::check_less;
   const char* function = "check_less";
   double nan = std::numeric_limits<double>::quiet_NaN();
 
@@ -176,6 +177,7 @@ TEST(ErrorHandlingMat, CheckLess_nan) {
 }
 
 TEST(ErrorHandlingScalar, CheckLess) {
+  using stan::math::check_less;
   const char* function = "check_less";
   double x = -10.0;
   double lb = 0.0;
@@ -207,6 +209,7 @@ TEST(ErrorHandlingScalar, CheckLess) {
 }
 
 TEST(ErrorHandlingScalar, CheckLess_nan) {
+  using stan::math::check_less;
   const char* function = "check_less";
   double x = 10.0;
   double lb = 0.0;