Removed EXPECT_LEQ_ONE macro

Author: bbbales2

test/code_generator.py

@@ -145,7 +145,8 @@ def expect_leq_one(self, arg):
         
         :param arg: Argument to check
         """
-        return self._add_statement(statement_types.FunctionCall("EXPECT_LEQ_ONE", None, arg))
+        one = self._add_statement(statement_types.IntVariable("int" + self._get_next_name_suffix(), 1))
+        return self._add_statement(statement_types.FunctionCall("EXPECT_LE", None, arg, one))
 
     def function_call_assign(self, cpp_function_name, *args):
         """

test/code_generator_test.py

@@ -52,7 +52,8 @@ def test_expect_eq(self):
 
     def test_expect_leq_one(self):
         self.cg.expect_leq_one(self.int_var)
-        self.assertEqual(self.cg.cpp(), "EXPECT_LEQ_ONE(myint);")
+        self.assertEqual(self.cg.cpp(), """int int0 = 1;
+EXPECT_LE(myint,int0);""")
 
     def test_function_call_assign(self):
         self.cg.function_call_assign("stan::math::add", self.real_var1, self.real_var2)

test/expressions/expression_test_helpers.hpp

@@ -166,7 +166,6 @@ void expect_adj_eq(const std::vector<T>& a, const std::vector<T>& b,
 
 void grad(stan::math::var& a) { a.grad(); }
 
-#define EXPECT_LEQ_ONE(x) EXPECT_LE(x, 1)
 #define TO_STRING_(x) #x
 #define TO_STRING(x) TO_STRING_(x)
 #define EXPECT_STAN_EQ(a, b) \